diff --git a/components/lib/theme/aura/contextmenu/index.js b/components/lib/theme/aura/contextmenu/index.js
index 6228ff2f6..f9067d1de 100644
--- a/components/lib/theme/aura/contextmenu/index.js
+++ b/components/lib/theme/aura/contextmenu/index.js
@@ -145,13 +145,13 @@ export default {
     color: var(--p-contextmenu-item-icon-color-focus);
 }
 
-.p-contextmenu .p-menuitem.p-highlight > .p-menuitem-content {
+.p-contextmenu .p-menuitem.p-menuitem-active > .p-menuitem-content {
     color: var(--p-contextmenu-item-text-color-focus);
     background: var(--p-contextmenu-item-background-focus);
 }
 
-.p-contextmenu .p-menuitem.p-highlight > .p-menuitem-content .p-menuitem-icon,
-.p-contextmenu .p-menuitem.p-highlight > .p-menuitem-content .p-submenu-icon {
+.p-contextmenu .p-menuitem.p-menuitem-active > .p-menuitem-content .p-menuitem-icon,
+.p-contextmenu .p-menuitem.p-menuitem-active > .p-menuitem-content .p-submenu-icon {
     color: var(--p-contextmenu-item-icon-color-focus);
 }
 
diff --git a/components/lib/theme/aura/megamenu/index.js b/components/lib/theme/aura/megamenu/index.js
index 024b6b227..4f9dc5629 100644
--- a/components/lib/theme/aura/megamenu/index.js
+++ b/components/lib/theme/aura/megamenu/index.js
@@ -1,11 +1,344 @@
 export default {
     variables: {
         colorScheme: {
-            light: {},
-            dark: {},
-        },
+            light: {
+                root: {
+                    background: '{surface.0}',
+                    borderColor: '{surface.200}',
+                    textColor: '{surface.700}'
+                },
+                item: {
+                    backgroundFocus: '{surface.100}',
+                    text: {
+                        color: '{surface.700}',
+                        colorFocus: '{surface.800}'
+                    },
+                    icon: {
+                        color: '{surface.400}',
+                        colorFocus: '{surface.500}'
+                    }
+                },
+                submenuHeader: {
+                    textColor: '{surface.400}'
+                },
+                separator: {
+                    borderColor: '{surface.200}'
+                },
+                toggleIcon: {
+                    color: '{surface.500}',
+                    colorHover: '{surface.600}',
+                    backgroundHover: '{surface.100}'
+                }
+            },
+            dark: {
+                root: {
+                    background: '{surface.900}',
+                    borderColor: '{surface.700}',
+                    textColor: '{surface.0}'
+                },
+                item: {
+                    backgroundFocus: '{surface.800}',
+                    text: {
+                        color: '{surface.0}',
+                        colorFocus: '{surface.0}'
+                    },
+                    icon: {
+                        color: '{surface.500}',
+                        colorFocus: '{surface.400}'
+                    }
+                },
+                submenuHeader: {
+                    textColor: '{surface.500}'
+                },
+                separator: {
+                    borderColor: '{surface.700}'
+                },
+                toggleIcon: {
+                    color: '{surface.400}',
+                    colorHover: '{surface.300}',
+                    backgroundHover: '{surface.800}'
+                }
+            }
+        }
     },
     css: `
+.p-megamenu {
+    display: flex;
+    position: relative;
+    padding: 0.5rem 0.5rem;
+    background: var(--p-megamenu-background);
+    color: var(--p-megamenu-text-color);
+    border: 1px solid var(--p-megamenu-border-color);
+    border-radius: var(--p-rounded-base);
+}
 
-`,
+.p-megamenu-root-list {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+}
+
+.p-megamenu .p-menuitem-content {
+    transition: background-color var(--p-transition-duration), color var(--p-transition-duration);
+    border-radius: var(--p-rounded-sm);
+    color: var(--p-megamenu-item-text-color);
+}
+
+.p-megamenu .p-menuitem-link {
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    text-decoration: none;
+    overflow: hidden;
+    position: relative;
+    color: inherit;
+    padding: 0.5rem 0.75rem;
+    user-select: none;
+}
+
+.p-megamenu .p-menuitem-text {
+    line-height: 1;
+}
+
+.p-megamenu .p-menuitem-icon {
+    color: var(--p-megamenu-item-icon-color);
+    margin-right: 0.5rem;
+}
+
+.p-megamenu .p-menuitem.p-focus > .p-menuitem-content {
+    color: var(--p-megamenu-item-text-color-focus);
+    background: var(--p-megamenu-item-background-focus);
+}
+
+.p-megamenu .p-menuitem.p-focus > .p-menuitem-content .p-menuitem-icon,
+.p-megamenu .p-menuitem.p-focus > .p-menuitem-content .p-submenu-icon {
+    color: var(--p-megamenu-item-icon-color-focus);
+}
+
+.p-megamenu .p-menuitem:not(.p-disabled) > .p-menuitem-content:hover {
+    color: var(--p-megamenu-item-text-color-focus);
+    background: var(--p-megamenu-item-background-focus);
+}
+
+.p-megamenu .p-menuitem:not(.p-disabled) > .p-menuitem-content:hover .p-menuitem-icon, 
+.p-megamenu .p-menuitem:not(.p-disabled) > .p-menuitem-content:hover .p-submenu-icon {
+    color: var(--p-megamenu-item-icon-color-focus);
+}
+
+.p-megamenu .p-menuitem-active > .p-menuitem-content {
+    color: var(--p-megamenu-item-text-color-focus);
+    background: var(--p-megamenu-item-background-focus);
+}
+
+.p-megamenu .p-menuitem-active > .p-menuitem-content .p-menuitem-icon,
+.p-megamenu .p-menuitem-active > .p-menuitem-content .p-submenu-icon {
+    color: var(--p-megamenu-item-icon-color-focus);
+}
+
+.p-megamenu .p-submenu-icon {
+    color: var(--p-megamenu-item-icon-color);
+    margin-left: 0.5rem;
+    font-size: 0.875rem;
+    width: 0.875rem;
+    height: 0.875rem;
+}
+
+.p-megamenu-panel {
+    display: none;
+    position: absolute;
+    width: auto;
+    z-index: 1;
+    left: 0;
+    min-width: 100%;
+    background: var(--p-megamenu-background);
+    color: var(--p-megamenu-text-color);
+    border: 1px solid var(--p-megamenu-border-color);
+    border-radius: var(--p-rounded-base);
+    box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -2px rgba(0, 0, 0, 0.1)
+}
+
+.p-megamenu-root-list > .p-menuitem-active > .p-megamenu-panel {
+    display: block;
+}
+
+.p-megamenu-submenu {
+    margin: 0;
+    list-style: none;
+    padding: 0.25rem 0.25rem;
+    min-width: 12.5rem;
+}
+
+.p-megamenu-submenu .p-menuitem {
+    margin: 2px 0;
+}
+
+.p-megamenu-submenu .p-menuitem:first-child {
+    margin-top: 0;
+}
+
+.p-megamenu-submenu .p-menuitem:last-child {
+    margin-bottom: 0;
+}
+
+.p-megamenu-submenu .p-submenu-header {
+    margin: 0;
+    padding: 0.5rem 0.75rem;
+    color: var(--p-megamenu-submenu-header-text-color);
+    font-weight: 600;
+    margin-bottom: 2px;
+}
+
+.p-megamenu-submenu .p-menuitem-separator {
+    border-top: 1px solid var(--p-megamenu-separator-border-color);
+    margin: 2px 0;
+}
+
+.p-megamenu-horizontal {
+    align-items: center;
+}
+
+.p-megamenu-horizontal .p-megamenu-root-list {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+}
+
+.p-megamenu-horizontal .p-megamenu-end {
+    margin-left: auto;
+    align-self: center;
+}
+
+.p-megamenu-vertical {
+    display: inline-flex;
+    flex-direction: column;
+    min-width: 12.5rem;
+    padding: 0.25rem 0.25rem;
+}
+
+.p-megamenu-vertical .p-megamenu-root-list {
+    flex-direction: column;
+}
+
+.p-megamenu-vertical .p-megamenu-root-list > .p-menuitem-active > .p-megamenu-panel {
+    left: 100%;
+    top: 0;
+}
+
+.p-megamenu-vertical .p-megamenu-root-list > .p-menuitem > .p-menuitem-content .p-submenu-icon {
+    margin-left: auto;
+}
+
+.p-megamenu-grid {
+    display: flex;
+}
+
+.p-megamenu-col-2,
+.p-megamenu-col-3,
+.p-megamenu-col-4,
+.p-megamenu-col-6,
+.p-megamenu-col-12 {
+    flex: 0 0 auto;
+    padding: 0.5rem;
+}
+
+.p-megamenu-col-2 {
+    width: 16.6667%;
+}
+
+.p-megamenu-col-3 {
+    width: 25%;
+}
+
+.p-megamenu-col-4 {
+    width: 33.3333%;
+}
+
+.p-megamenu-col-6 {
+    width: 50%;
+}
+
+.p-megamenu-col-12 {
+    width: 100%;
+}
+
+.p-megamenu-button {
+    display: none;
+    justify-content: center;
+    align-items: center;
+    cursor: pointer;
+    width: 1.75rem;
+    height: 1.75rem;
+    position: relative;
+    color: var(--p-megamenu-toggle-icon-color);
+    border: 0 none;
+    background: transparent;
+    border-radius: 50%;
+    transition: background-color var(--p-transition-duration), color var(--p-transition-duration), outline-color var(--p-transition-duration);
+    outline-color: transparent;
+}
+
+.p-megamenu-button:hover {
+    color: var(--p-megamenu-toggle-icon-color-hover);
+    background: var(--p-megamenu-toggle-icon-background-hover);
+}
+
+.p-megamenu-button:focus-visible {
+    outline: var(--p-focus-ring-width) var(--p-focus-ring-style) var(--p-focus-ring-color);
+    outline-offset: var(--p-focus-ring-offset);
+}
+
+.p-megamenu-mobile {
+    display: flex;
+}
+
+.p-megamenu-mobile .p-megamenu-button {
+    display: flex;
+}
+
+.p-megamenu-mobile .p-megamenu-root-list {
+    position: absolute;
+    display: none;
+    flex-direction: column;
+    top: 100%;
+    left: 0;
+    z-index: 1;
+    width: 100%;
+    padding: 0.25rem 0.25rem;
+    background: var(--p-megamenu-background);
+    border: 1px solid var(--p-megamenu-border-color);
+    box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -2px rgba(0, 0, 0, 0.1);
+    gap: 2px;
+}
+
+.p-megamenu-mobile-active .p-megamenu-root-list {
+    display: flex;
+}
+
+.p-megamenu-mobile .p-megamenu-root-list .p-menuitem {
+    width: 100%;
+    position: static;
+}
+
+.p-megamenu-mobile .p-megamenu-panel {
+    position: static;
+    border: 0 none;
+    border-radius: 0;
+    box-shadow: none;
+}
+
+.p-megamenu-mobile .p-megamenu-grid {
+    flex-wrap: wrap;
+    overflow: auto;
+    max-height: 90%;
+}
+
+.p-megamenu-mobile .p-megamenu-root-list > .p-menuitem > .p-menuitem-content .p-submenu-icon {
+    margin-left: auto;
+    transition: transform 0.2s;
+}
+
+.p-megamenu-mobile .p-megamenu-root-list > .p-menuitem.p-menuitem-active > .p-menuitem-content .p-submenu-icon {
+    transform: rotate(-180deg);
+}
+`
 };
diff --git a/components/lib/theme/aura/tieredmenu/index.js b/components/lib/theme/aura/tieredmenu/index.js
index 459998e91..6a6321e1c 100644
--- a/components/lib/theme/aura/tieredmenu/index.js
+++ b/components/lib/theme/aura/tieredmenu/index.js
@@ -144,13 +144,13 @@ export default {
     color: var(--p-tieredmenu-item-icon-color-focus);
 }
 
-.p-tieredmenu .p-menuitem.p-highlight > .p-menuitem-content {
+.p-tieredmenu .p-menuitem.p-menuitem-active > .p-menuitem-content {
     color: var(--p-tieredmenu-item-text-color-focus);
     background: var(--p-tieredmenu-item-background-focus);
 }
 
-.p-tieredmenu .p-menuitem.p-highlight > .p-menuitem-content .p-menuitem-icon,
-.p-tieredmenu .p-menuitem.p-highlight > .p-menuitem-content .p-submenu-icon {
+.p-tieredmenu .p-menuitem.p-menuitem-active > .p-menuitem-content .p-menuitem-icon,
+.p-tieredmenu .p-menuitem.p-menuitem-active > .p-menuitem-content .p-submenu-icon {
     color: var(--p-tieredmenu-item-icon-color-focus);
 }