diff --git a/components/lib/themes/aura/inplace/index.js b/components/lib/themes/aura/inplace/index.js
index 53a41ef21..191a8ce9d 100644
--- a/components/lib/themes/aura/inplace/index.js
+++ b/components/lib/themes/aura/inplace/index.js
@@ -1,24 +1,17 @@
 export default {
-    padding: '{form.field.padding.y} {form.field.padding.x}',
-    focusRing: {
-        width: '{focus.ring.width}',
-        style: '{focus.ring.style}',
-        color: '{focus.ring.color}',
-        offset: '{focus.ring.offset}',
-        shadow: '{focus.ring.shadow}'
-    },
-    colorScheme: {
-        light: {
-            display: {
-                hoverBackground: '{surface.100}',
-                hoverColor: '{surface.800}'
-            }
-        },
-        dark: {
-            display: {
-                hoverBackground: '{surface.800}',
-                hoverColor: '{surface.0}'
-            }
+    root: {
+        padding: '{form.field.padding.y} {form.field.padding.x}',
+        borderRadius: '{content.border.radius}',
+        focusRing: {
+            width: '{focus.ring.width}',
+            style: '{focus.ring.style}',
+            color: '{focus.ring.color}',
+            offset: '{focus.ring.offset}',
+            shadow: '{focus.ring.shadow}'
         }
+    },
+    display: {
+        hoverBackground: '{content.hover.background}',
+        hoverColor: '{content.hover.color}'
     }
 };
diff --git a/components/lib/themes/lara/inplace/index.js b/components/lib/themes/lara/inplace/index.js
index 081b06793..191a8ce9d 100644
--- a/components/lib/themes/lara/inplace/index.js
+++ b/components/lib/themes/lara/inplace/index.js
@@ -3,11 +3,11 @@ export default {
         padding: '{form.field.padding.y} {form.field.padding.x}',
         borderRadius: '{content.border.radius}',
         focusRing: {
-            width: '{form.field.focus.ring.width}',
-            style: '{form.field.focus.ring.style}',
-            color: '{form.field.focus.ring.color}',
-            offset: '{form.field.focus.ring.offset}',
-            shadow: '{form.field.focus.ring.shadow}'
+            width: '{focus.ring.width}',
+            style: '{focus.ring.style}',
+            color: '{focus.ring.color}',
+            offset: '{focus.ring.offset}',
+            shadow: '{focus.ring.shadow}'
         }
     },
     display: {
diff --git a/components/lib/themes/nora/avatar/index.js b/components/lib/themes/nora/avatar/index.js
index 7907a7bed..47cf87391 100644
--- a/components/lib/themes/nora/avatar/index.js
+++ b/components/lib/themes/nora/avatar/index.js
@@ -3,7 +3,7 @@ export default {
         width: '2rem',
         height: '2rem',
         fontSize: '1rem',
-        background: '{content.border.color}',
+        background: '{content.hover.background}',
         borderRadius: '{content.border.radius}'
     },
     group: {
diff --git a/components/lib/themes/nora/badge/index.js b/components/lib/themes/nora/badge/index.js
index 5ed3f6e46..ea29358cd 100644
--- a/components/lib/themes/nora/badge/index.js
+++ b/components/lib/themes/nora/badge/index.js
@@ -32,23 +32,23 @@ export default {
                 color: '{primary.contrast.color}'
             },
             secondary: {
-                background: '{surface.100}',
-                color: '{surface.600}'
+                background: '{surface.200}',
+                color: '{surface.700}'
             },
             success: {
-                background: '{green.500}',
+                background: '{green.600}',
                 color: '{surface.0}'
             },
             info: {
-                background: '{sky.500}',
+                background: '{sky.600}',
                 color: '{surface.0}'
             },
             warn: {
-                background: '{orange.500}',
+                background: '{orange.600}',
                 color: '{surface.0}'
             },
             danger: {
-                background: '{red.500}',
+                background: '{red.600}',
                 color: '{surface.0}'
             },
             contrast: {
@@ -62,23 +62,23 @@ export default {
                 color: '{primary.contrast.color}'
             },
             secondary: {
-                background: '{surface.800}',
-                color: '{surface.300}'
+                background: '{surface.700}',
+                color: '{surface.200}'
             },
             success: {
-                background: '{green.400}',
+                background: '{green.500}',
                 color: '{green.950}'
             },
             info: {
-                background: '{sky.400}',
+                background: '{sky.500}',
                 color: '{sky.950}'
             },
             warn: {
-                background: '{orange.400}',
+                background: '{orange.500}',
                 color: '{orange.950}'
             },
             danger: {
-                background: '{red.400}',
+                background: '{red.500}',
                 color: '{red.950}'
             },
             contrast: {
diff --git a/components/lib/themes/nora/carousel/index.js b/components/lib/themes/nora/carousel/index.js
index e0d05b7af..591717978 100644
--- a/components/lib/themes/nora/carousel/index.js
+++ b/components/lib/themes/nora/carousel/index.js
@@ -20,15 +20,15 @@ export default {
     colorScheme: {
         light: {
             indicator: {
-                background: '{surface.200}',
-                hoverBackground: '{surface.300}',
+                background: '{surface.300}',
+                hoverBackground: '{surface.400}',
                 activeBackground: '{primary.color}'
             }
         },
         dark: {
             indicator: {
-                background: '{surface.700}',
-                hoverBackground: '{surface.600}',
+                background: '{surface.600}',
+                hoverBackground: '{surface.500}',
                 activeBackground: '{primary.color}'
             }
         }
diff --git a/components/lib/themes/nora/dialog/index.js b/components/lib/themes/nora/dialog/index.js
index 235086e72..aa64dd272 100644
--- a/components/lib/themes/nora/dialog/index.js
+++ b/components/lib/themes/nora/dialog/index.js
@@ -12,7 +12,7 @@ export default {
     },
     title: {
         fontSize: '1.25rem',
-        fontWeight: '600'
+        fontWeight: '700'
     },
     content: {
         padding: '0 {overlay.modal.padding} {overlay.modal.padding} {overlay.modal.padding}'
diff --git a/components/lib/themes/nora/drawer/index.js b/components/lib/themes/nora/drawer/index.js
index c1b874642..00751ab5c 100644
--- a/components/lib/themes/nora/drawer/index.js
+++ b/components/lib/themes/nora/drawer/index.js
@@ -11,7 +11,7 @@ export default {
     },
     title: {
         fontSize: '1.5rem',
-        fontWeight: '600'
+        fontWeight: '700'
     },
     content: {
         padding: '0 {overlay.modal.padding} {overlay.modal.padding} {overlay.modal.padding}'
diff --git a/components/lib/themes/nora/galleria/index.js b/components/lib/themes/nora/galleria/index.js
index 6d100eafd..6a8bfc21e 100644
--- a/components/lib/themes/nora/galleria/index.js
+++ b/components/lib/themes/nora/galleria/index.js
@@ -103,24 +103,24 @@ export default {
     colorScheme: {
         light: {
             thumbnailNavButton: {
-                hoverBackground: '{surface.100}',
-                color: '{surface.600}',
-                hoverColor: '{surface.700}'
+                hoverBackground: '{surface.200}',
+                color: '{text.color}',
+                hoverColor: '{text.hover.color}'
             },
             indicatorButton: {
-                background: '{surface.200}',
-                hoverBackground: '{surface.300}'
+                background: '{surface.300}',
+                hoverBackground: '{surface.400}'
             }
         },
         dark: {
             thumbnailNavButton: {
                 hoverBackground: '{surface.700}',
-                color: '{surface.400}',
+                color: '{surface.0}',
                 hoverColor: '{surface.0}'
             },
             indicatorButton: {
-                background: '{surface.700}',
-                hoverBackground: '{surface.600}'
+                background: '{surface.600}',
+                hoverBackground: '{surface.500}'
             }
         }
     }
diff --git a/components/lib/themes/nora/image/index.js b/components/lib/themes/nora/image/index.js
index 9600f2332..c0a42ce18 100644
--- a/components/lib/themes/nora/image/index.js
+++ b/components/lib/themes/nora/image/index.js
@@ -19,7 +19,7 @@ export default {
         background: 'rgba(255,255,255,0.1)',
         borderColor: 'rgba(255,255,255,0.2)',
         borderWidth: '1px',
-        borderRadius: '30px',
+        borderRadius: '{content.border.radius}',
         padding: '.5rem',
         gap: '0.5rem'
     },
@@ -29,7 +29,7 @@ export default {
         hoverColor: '{surface.0}',
         size: '3rem',
         iconSize: '1.5rem',
-        borderRadius: '50%',
+        borderRadius: '{content.border.radius}',
         focusRing: {
             width: '{focus.ring.width}',
             style: '{focus.ring.style}',
diff --git a/components/lib/themes/nora/inplace/index.js b/components/lib/themes/nora/inplace/index.js
index 53a41ef21..191a8ce9d 100644
--- a/components/lib/themes/nora/inplace/index.js
+++ b/components/lib/themes/nora/inplace/index.js
@@ -1,24 +1,17 @@
 export default {
-    padding: '{form.field.padding.y} {form.field.padding.x}',
-    focusRing: {
-        width: '{focus.ring.width}',
-        style: '{focus.ring.style}',
-        color: '{focus.ring.color}',
-        offset: '{focus.ring.offset}',
-        shadow: '{focus.ring.shadow}'
-    },
-    colorScheme: {
-        light: {
-            display: {
-                hoverBackground: '{surface.100}',
-                hoverColor: '{surface.800}'
-            }
-        },
-        dark: {
-            display: {
-                hoverBackground: '{surface.800}',
-                hoverColor: '{surface.0}'
-            }
+    root: {
+        padding: '{form.field.padding.y} {form.field.padding.x}',
+        borderRadius: '{content.border.radius}',
+        focusRing: {
+            width: '{focus.ring.width}',
+            style: '{focus.ring.style}',
+            color: '{focus.ring.color}',
+            offset: '{focus.ring.offset}',
+            shadow: '{focus.ring.shadow}'
         }
+    },
+    display: {
+        hoverBackground: '{content.hover.background}',
+        hoverColor: '{content.hover.color}'
     }
 };
diff --git a/components/lib/themes/nora/panelmenu/index.js b/components/lib/themes/nora/panelmenu/index.js
index ab2b79aed..5c1c43806 100644
--- a/components/lib/themes/nora/panelmenu/index.js
+++ b/components/lib/themes/nora/panelmenu/index.js
@@ -1,6 +1,6 @@
 export default {
     root: {
-        gap: '0.5rem'
+        gap: '0'
     },
     panel: {
         background: '{content.background}',
@@ -8,13 +8,13 @@ export default {
         borderWidth: '1px',
         color: '{content.color}',
         padding: '0.25rem 0.25rem',
-        borderRadius: '{content.border.radius}',
+        borderRadius: '0',
         first: {
-            borderWidth: '1px',
+            borderWidth: '1px 1px 0 1px',
             topBorderRadius: '{content.border.radius}'
         },
         last: {
-            borderWidth: '1px',
+            borderWidth: '0 1px 1px 1px',
             bottomBorderRadius: '{content.border.radius}'
         }
     },
diff --git a/components/lib/themes/nora/skeleton/index.js b/components/lib/themes/nora/skeleton/index.js
index 07fc58365..6f93e878a 100644
--- a/components/lib/themes/nora/skeleton/index.js
+++ b/components/lib/themes/nora/skeleton/index.js
@@ -5,13 +5,13 @@ export default {
     colorScheme: {
         light: {
             root: {
-                background: '{surface.200}',
+                background: '{surface.300}',
                 animationBackground: 'rgba(255,255,255,0.4)'
             }
         },
         dark: {
             root: {
-                background: 'rgba(255, 255, 255, 0.06)',
+                background: 'rgba(255, 255, 255, 0.1)',
                 animationBackground: 'rgba(255, 255, 255, 0.04)'
             }
         }
diff --git a/components/lib/themes/nora/stepper/index.js b/components/lib/themes/nora/stepper/index.js
index e2e9d5be1..e48bac61a 100644
--- a/components/lib/themes/nora/stepper/index.js
+++ b/components/lib/themes/nora/stepper/index.js
@@ -40,7 +40,7 @@ export default {
         fontSize: '1.143rem',
         fontWeight: '500',
         borderRadius: '50%',
-        shadow: '0px 0.5px 0px 0px rgba(0, 0, 0, 0.06), 0px 1px 1px 0px rgba(0, 0, 0, 0.12)'
+        shadow: 'none'
     },
     verticalPanelContainer: {
         paddingLeft: '1rem'
diff --git a/components/lib/themes/nora/steps/index.js b/components/lib/themes/nora/steps/index.js
index e9d55a374..24dc63b4e 100644
--- a/components/lib/themes/nora/steps/index.js
+++ b/components/lib/themes/nora/steps/index.js
@@ -28,6 +28,6 @@ export default {
         fontSize: '1.143rem',
         fontWeight: '500',
         borderRadius: '50%',
-        shadow: '0px 0.5px 0px 0px rgba(0, 0, 0, 0.06), 0px 1px 1px 0px rgba(0, 0, 0, 0.12)'
+        shadow: 'none'
     }
 };
diff --git a/components/lib/themes/nora/tabmenu/index.js b/components/lib/themes/nora/tabmenu/index.js
index 9f0892a23..cb50251a0 100644
--- a/components/lib/themes/nora/tabmenu/index.js
+++ b/components/lib/themes/nora/tabmenu/index.js
@@ -5,19 +5,19 @@ export default {
         borderColor: '{content.border.color}'
     },
     item: {
-        background: 'transparent',
-        hoverBackground: 'transparent',
-        activeBackground: 'transparent',
-        borderWidth: '0 0 1px 0',
-        borderColor: '{content.border.color}',
-        hoverBorderColor: '{content.border.color}',
-        activeBorderColor: '{primary.color}',
+        background: '{content.background}',
+        hoverBackground: '{surface.200}',
+        activeBackground: '{primary.color}',
+        borderWidth: '0',
+        borderColor: 'transparent',
+        hoverBorderColor: 'transparent',
+        activeBorderColor: 'transparent',
         color: '{text.muted.color}',
         hoverColor: '{text.color}',
-        activeColor: '{primary.color}',
-        padding: '1rem 1.125rem',
-        fontWeight: '600',
-        margin: '0 0 -1px 0',
+        activeColor: '{primary.contrast.color}',
+        padding: '1rem 1.25rem',
+        fontWeight: '700',
+        margin: '0',
         gap: '0.5rem',
         focusRing: {
             width: '{focus.ring.width}',
@@ -28,13 +28,13 @@ export default {
         }
     },
     itemIcon: {
-        color: '{text.muted.color}',
+        color: '{text.color}',
         hoverColor: '{text.color}',
-        activeColor: '{primary.color}'
+        activeColor: '{primary.contrast.color}'
     },
     activeBar: {
-        height: '1px',
-        bottom: '-1px',
-        background: '{primary.color}'
+        height: '0',
+        bottom: '0',
+        background: 'transparent'
     }
 };
diff --git a/components/lib/themes/nora/tag/index.js b/components/lib/themes/nora/tag/index.js
index b6c535c19..432d686a4 100644
--- a/components/lib/themes/nora/tag/index.js
+++ b/components/lib/themes/nora/tag/index.js
@@ -13,28 +13,28 @@ export default {
     colorScheme: {
         light: {
             primary: {
-                background: '{primary.100}',
-                color: '{primary.700}'
+                background: '{primary.color}',
+                color: '{primary.contrast.color}'
             },
             secondary: {
-                background: '{surface.100}',
-                color: '{surface.600}'
+                background: '{surface.200}',
+                color: '{surface.700}'
             },
             success: {
-                background: '{green.100}',
-                color: '{green.700}'
+                background: '{green.600}',
+                color: '{surface.0}'
             },
             info: {
-                background: '{sky.100}',
-                color: '{sky.700}'
+                background: '{sky.600}',
+                color: '{surface.0}'
             },
             warn: {
-                background: '{orange.100}',
-                color: '{orange.700}'
+                background: '{orange.600}',
+                color: '{surface.0}'
             },
             danger: {
-                background: '{red.100}',
-                color: '{red.700}'
+                background: '{red.600}',
+                color: '{surface.0}'
             },
             contrast: {
                 background: '{surface.950}',
@@ -43,28 +43,28 @@ export default {
         },
         dark: {
             primary: {
-                background: 'color-mix(in srgb, {primary.500}, transparent 84%)',
-                color: '{primary.300}'
+                background: '{primary.color}',
+                color: '{primary.contrast.color}'
             },
             secondary: {
-                background: '{surface.800}',
-                color: '{surface.300}'
+                background: '{surface.700}',
+                color: '{surface.200}'
             },
             success: {
-                background: 'color-mix(in srgb, {green.500}, transparent 84%)',
-                color: '{green.300}'
+                background: '{green.500}',
+                color: '{green.950}'
             },
             info: {
-                background: 'color-mix(in srgb, {sky.500}, transparent 84%)',
-                color: '{sky.300}'
+                background: '{sky.500}',
+                color: '{sky.950}'
             },
             warn: {
-                background: 'color-mix(in srgb, {orange.500}, transparent 84%)',
-                color: '{orange.300}'
+                background: '{orange.500}',
+                color: '{orange.950}'
             },
             danger: {
-                background: 'color-mix(in srgb, {red.500}, transparent 84%)',
-                color: '{red.300}'
+                background: '{red.500}',
+                color: '{red.950}'
             },
             contrast: {
                 background: '{surface.0}',
diff --git a/components/lib/themes/nora/timeline/index.js b/components/lib/themes/nora/timeline/index.js
index 9058486e5..745713c66 100644
--- a/components/lib/themes/nora/timeline/index.js
+++ b/components/lib/themes/nora/timeline/index.js
@@ -16,13 +16,13 @@ export default {
         size: '1.125rem',
         borderRadius: '50%',
         borderWidth: '2px',
-        background: '{content.background}',
-        borderColor: '{content.border.color}',
+        background: '{primary.color}',
+        borderColor: '{primary.color}',
         content: {
             borderRadius: '50%',
             size: '0.375rem',
-            background: '{primary.color}',
-            insetShadow: '0px 0.5px 0px 0px rgba(0, 0, 0, 0.06), 0px 1px 1px 0px rgba(0, 0, 0, 0.12)'
+            background: 'transparent',
+            insetShadow: 'none'
         }
     },
     eventConnector: {
diff --git a/components/lib/themes/nora/tooltip/index.js b/components/lib/themes/nora/tooltip/index.js
index 7e5b8f050..fb160b106 100644
--- a/components/lib/themes/nora/tooltip/index.js
+++ b/components/lib/themes/nora/tooltip/index.js
@@ -9,14 +9,14 @@ export default {
     colorScheme: {
         light: {
             root: {
-                background: '{surface.700}',
+                background: '{surface.900}',
                 color: '{surface.0}'
             }
         },
         dark: {
             root: {
-                background: '{surface.700}',
-                color: '{surface.0}'
+                background: '{surface.0}',
+                color: '{surface.900}'
             }
         }
     }
diff --git a/components/lib/themes/nora/treetable/index.js b/components/lib/themes/nora/treetable/index.js
index e210bb46e..09085d2ba 100644
--- a/components/lib/themes/nora/treetable/index.js
+++ b/components/lib/themes/nora/treetable/index.js
@@ -97,7 +97,7 @@ export default {
     colorScheme: {
         light: {
             root: {
-                borderColor: '{content.border.color}'
+                borderColor: '{surface.300}'
             },
             bodyCell: {
                 selectedBorderColor: '{primary.100}'
@@ -105,7 +105,7 @@ export default {
         },
         dark: {
             root: {
-                borderColor: '{surface.800}'
+                borderColor: '{surface.700}'
             },
             bodyCell: {
                 selectedBorderColor: '{primary.900}'