diff --git a/components/lib/themes/aura/confirmpopup/index.js b/components/lib/themes/aura/confirmpopup/index.js
index bfd9c738d..ef19adc87 100644
--- a/components/lib/themes/aura/confirmpopup/index.js
+++ b/components/lib/themes/aura/confirmpopup/index.js
@@ -4,9 +4,9 @@ export default {
         borderColor: '{overlay.popover.border.color}',
         color: '{overlay.popover.color}',
         borderRadius: '{overlay.popover.border.radius}',
-        padding: '{overlay.popover.padding}',
         shadow: '{overlay.popover.shadow}',
-        gutter: '10px'
+        gutter: '10px',
+        arrowOffset: '1.25rem'
     },
     content: {
         padding: '{overlay.popover.padding}',
@@ -19,6 +19,5 @@ export default {
     footer: {
         gap: '0.5rem',
         padding: '0 {overlay.popover.padding} {overlay.popover.padding} {overlay.popover.padding}'
-    },
-    arrowOffset: '1.25rem'
+    }
 };
diff --git a/components/lib/themes/aura/popover/index.js b/components/lib/themes/aura/popover/index.js
index b99e80562..855d2ec35 100644
--- a/components/lib/themes/aura/popover/index.js
+++ b/components/lib/themes/aura/popover/index.js
@@ -5,10 +5,10 @@ export default {
         color: '{overlay.popover.color}',
         borderRadius: '{overlay.popover.border.radius}',
         shadow: '{overlay.popover.shadow}',
-        gutter: '10px'
+        gutter: '10px',
+        arrowOffset: '1.25rem'
     },
     content: {
         padding: '{overlay.popover.padding}'
-    },
-    arrowOffset: '1.25rem'
+    }
 };
diff --git a/components/lib/themes/aura/rating/index.js b/components/lib/themes/aura/rating/index.js
index d1dce4a4e..f5f5775eb 100644
--- a/components/lib/themes/aura/rating/index.js
+++ b/components/lib/themes/aura/rating/index.js
@@ -1,5 +1,7 @@
 export default {
-    gap: '0.25rem',
+    root: {
+        gap: '0.25rem',
+    },
     icon: {
         size: '1rem',
         color: '{text.muted.color}',
diff --git a/components/lib/themes/lara/confirmpopup/index.js b/components/lib/themes/lara/confirmpopup/index.js
index e48cd4c27..ef19adc87 100644
--- a/components/lib/themes/lara/confirmpopup/index.js
+++ b/components/lib/themes/lara/confirmpopup/index.js
@@ -5,7 +5,8 @@ export default {
         color: '{overlay.popover.color}',
         borderRadius: '{overlay.popover.border.radius}',
         shadow: '{overlay.popover.shadow}',
-        gutter: '10px'
+        gutter: '10px',
+        arrowOffset: '1.25rem'
     },
     content: {
         padding: '{overlay.popover.padding}',
@@ -18,6 +19,5 @@ export default {
     footer: {
         gap: '0.5rem',
         padding: '0 {overlay.popover.padding} {overlay.popover.padding} {overlay.popover.padding}'
-    },
-    arrowOffset: '1.25rem'
+    }
 };
diff --git a/components/lib/themes/lara/popover/index.js b/components/lib/themes/lara/popover/index.js
index b99e80562..855d2ec35 100644
--- a/components/lib/themes/lara/popover/index.js
+++ b/components/lib/themes/lara/popover/index.js
@@ -5,10 +5,10 @@ export default {
         color: '{overlay.popover.color}',
         borderRadius: '{overlay.popover.border.radius}',
         shadow: '{overlay.popover.shadow}',
-        gutter: '10px'
+        gutter: '10px',
+        arrowOffset: '1.25rem'
     },
     content: {
         padding: '{overlay.popover.padding}'
-    },
-    arrowOffset: '1.25rem'
+    }
 };
diff --git a/components/lib/themes/lara/rating/index.js b/components/lib/themes/lara/rating/index.js
index 449f8b847..27ce515e9 100644
--- a/components/lib/themes/lara/rating/index.js
+++ b/components/lib/themes/lara/rating/index.js
@@ -1,5 +1,7 @@
 export default {
-    gap: '0.25rem',
+    root: {
+        gap: '0.25rem',
+    },
     icon: {
         size: '1.25rem',
         color: '{text.muted.color}',
diff --git a/components/lib/themes/nora/confirmpopup/index.js b/components/lib/themes/nora/confirmpopup/index.js
index bfd9c738d..ef19adc87 100644
--- a/components/lib/themes/nora/confirmpopup/index.js
+++ b/components/lib/themes/nora/confirmpopup/index.js
@@ -4,9 +4,9 @@ export default {
         borderColor: '{overlay.popover.border.color}',
         color: '{overlay.popover.color}',
         borderRadius: '{overlay.popover.border.radius}',
-        padding: '{overlay.popover.padding}',
         shadow: '{overlay.popover.shadow}',
-        gutter: '10px'
+        gutter: '10px',
+        arrowOffset: '1.25rem'
     },
     content: {
         padding: '{overlay.popover.padding}',
@@ -19,6 +19,5 @@ export default {
     footer: {
         gap: '0.5rem',
         padding: '0 {overlay.popover.padding} {overlay.popover.padding} {overlay.popover.padding}'
-    },
-    arrowOffset: '1.25rem'
+    }
 };
diff --git a/components/lib/themes/nora/popover/index.js b/components/lib/themes/nora/popover/index.js
index b99e80562..855d2ec35 100644
--- a/components/lib/themes/nora/popover/index.js
+++ b/components/lib/themes/nora/popover/index.js
@@ -5,10 +5,10 @@ export default {
         color: '{overlay.popover.color}',
         borderRadius: '{overlay.popover.border.radius}',
         shadow: '{overlay.popover.shadow}',
-        gutter: '10px'
+        gutter: '10px',
+        arrowOffset: '1.25rem'
     },
     content: {
         padding: '{overlay.popover.padding}'
-    },
-    arrowOffset: '1.25rem'
+    }
 };
diff --git a/components/lib/themes/nora/rating/index.js b/components/lib/themes/nora/rating/index.js
index d1dce4a4e..35c50df48 100644
--- a/components/lib/themes/nora/rating/index.js
+++ b/components/lib/themes/nora/rating/index.js
@@ -1,5 +1,7 @@
 export default {
-    gap: '0.25rem',
+    root: {
+        gap: '0.25rem'
+    },
     icon: {
         size: '1rem',
         color: '{text.muted.color}',