diff --git a/components/lib/themes/aura/index.js b/components/lib/themes/aura/index.js
index 2d50470da..bbe1102f5 100644
--- a/components/lib/themes/aura/index.js
+++ b/components/lib/themes/aura/index.js
@@ -202,6 +202,11 @@ export default {
                         background: '{surface.0}',
                         borderColor: '{surface.200}',
                         color: '{text.color}'
+                    },
+                    popover: {
+                        background: '{surface.0}',
+                        borderColor: '{surface.200}',
+                        color: '{text.color}'
                     }
                 },
                 list: {
@@ -302,6 +307,11 @@ export default {
                         background: '{surface.900}',
                         borderColor: '{surface.700}',
                         color: '{text.color}'
+                    },
+                    popover: {
+                        background: '{surface.900}',
+                        borderColor: '{surface.700}',
+                        color: '{text.color}'
                     }
                 },
                 list: {
diff --git a/components/lib/themes/aura/password/index.js b/components/lib/themes/aura/password/index.js
index 2467e6e52..05bb83661 100644
--- a/components/lib/themes/aura/password/index.js
+++ b/components/lib/themes/aura/password/index.js
@@ -1,39 +1,28 @@
 export default {
+    meter: {
+        borderColor: '{content.border.color}'
+    },
+    icon: {
+        color: '{form.field.icon.color}'
+    },
+    overlay: {
+        background: '{overlay.popover.background}',
+        borderColor: '{overlay.popover.border.color}',
+        color: '{overlay.popover.color}'
+    },
     colorScheme: {
         light: {
-            meter: {
-                borderColor: '{surface.200}'
-            },
-            icon: {
-                color: '{surface.500}'
-            },
             strength: {
                 weakBackground: '{red.500}',
                 mediumBackground: '{amber.500}',
                 strongBackground: '{green.500}'
-            },
-            overlay: {
-                background: '{surface.0}',
-                borderColor: '{surface.200}',
-                color: '{surface.700}'
             }
         },
         dark: {
-            meter: {
-                borderColor: '{surface.700}'
-            },
-            icon: {
-                color: '{surface.400}'
-            },
             strength: {
                 weakBackground: '{red.400}',
                 mediumBackground: '{amber.400}',
                 strongBackground: '{green.400}'
-            },
-            overlay: {
-                background: '{surface.900}',
-                borderColor: '{surface.700}',
-                color: '{surface.0}'
             }
         }
     }