diff --git a/public/themes/arya-blue/theme.css b/public/themes/arya-blue/theme.css
index 75fa3cb3f..ce4dfb3b0 100644
--- a/public/themes/arya-blue/theme.css
+++ b/public/themes/arya-blue/theme.css
@@ -1,10 +1,11 @@
 @charset "UTF-8";
 :root {
-  --surface-a: #121212;
+  --surface-a: #1e1e1e;
   --surface-b: #121212;
   --surface-c: #2b2b2b;
   --surface-d: #383838;
   --surface-e: #1e1e1e;
+  --surface-f: #1e1e1e;
   --text-color: rgba(255, 255, 255, 0.87);
   --text-color-secondary: rgba(255, 255, 255, 0.6);
   --primary-color: #64B5F6;
diff --git a/public/themes/arya-green/theme.css b/public/themes/arya-green/theme.css
index cbcf21c64..614f9f2c1 100644
--- a/public/themes/arya-green/theme.css
+++ b/public/themes/arya-green/theme.css
@@ -1,10 +1,11 @@
 @charset "UTF-8";
 :root {
-  --surface-a: #121212;
+  --surface-a: #1e1e1e;
   --surface-b: #121212;
   --surface-c: #2b2b2b;
   --surface-d: #383838;
   --surface-e: #1e1e1e;
+  --surface-f: #1e1e1e;
   --text-color: rgba(255, 255, 255, 0.87);
   --text-color-secondary: rgba(255, 255, 255, 0.6);
   --primary-color: #81C784;
diff --git a/public/themes/arya-orange/theme.css b/public/themes/arya-orange/theme.css
index 55c07410e..e9c807233 100644
--- a/public/themes/arya-orange/theme.css
+++ b/public/themes/arya-orange/theme.css
@@ -1,10 +1,11 @@
 @charset "UTF-8";
 :root {
-  --surface-a: #121212;
+  --surface-a: #1e1e1e;
   --surface-b: #121212;
   --surface-c: #2b2b2b;
   --surface-d: #383838;
   --surface-e: #1e1e1e;
+  --surface-f: #1e1e1e;
   --text-color: rgba(255, 255, 255, 0.87);
   --text-color-secondary: rgba(255, 255, 255, 0.6);
   --primary-color: #FFD54F;
diff --git a/public/themes/arya-purple/theme.css b/public/themes/arya-purple/theme.css
index 5d2099fd3..8c5aa4ce0 100644
--- a/public/themes/arya-purple/theme.css
+++ b/public/themes/arya-purple/theme.css
@@ -1,10 +1,11 @@
 @charset "UTF-8";
 :root {
-  --surface-a: #121212;
+  --surface-a: #1e1e1e;
   --surface-b: #121212;
   --surface-c: #2b2b2b;
   --surface-d: #383838;
   --surface-e: #1e1e1e;
+  --surface-f: #1e1e1e;
   --text-color: rgba(255, 255, 255, 0.87);
   --text-color-secondary: rgba(255, 255, 255, 0.6);
   --primary-color: #BA68C8;
diff --git a/public/themes/bootstrap4-dark-blue/theme.css b/public/themes/bootstrap4-dark-blue/theme.css
index 5c43924a4..74ab1aa28 100644
--- a/public/themes/bootstrap4-dark-blue/theme.css
+++ b/public/themes/bootstrap4-dark-blue/theme.css
@@ -5,6 +5,7 @@
   --surface-c: #343e4d;
   --surface-d: #3f4b5b;
   --surface-e: #2a323d;
+  --surface-f: #2a323d;
   --text-color: rgba(255, 255, 255, 0.87);
   --text-color-secondary: rgba(255, 255, 255, 0.6);
   --primary-color: #8dd0ff;
diff --git a/public/themes/bootstrap4-dark-purple/theme.css b/public/themes/bootstrap4-dark-purple/theme.css
index ae36debfc..e98f52767 100644
--- a/public/themes/bootstrap4-dark-purple/theme.css
+++ b/public/themes/bootstrap4-dark-purple/theme.css
@@ -5,6 +5,7 @@
   --surface-c: #343e4d;
   --surface-d: #3f4b5b;
   --surface-e: #2a323d;
+  --surface-f: #2a323d;
   --text-color: rgba(255, 255, 255, 0.87);
   --text-color-secondary: rgba(255, 255, 255, 0.6);
   --primary-color: #c298d8;
diff --git a/public/themes/bootstrap4-light-blue/theme.css b/public/themes/bootstrap4-light-blue/theme.css
index 0fdb0ccf8..2a1512fb3 100644
--- a/public/themes/bootstrap4-light-blue/theme.css
+++ b/public/themes/bootstrap4-light-blue/theme.css
@@ -5,6 +5,7 @@
   --surface-c: #e9ecef;
   --surface-d: rgba(0, 0, 0, 0.125);
   --surface-e: #ffffff;
+  --surface-f: #ffffff;
   --text-color: #212529;
   --text-color-secondary: $shade600;
   --primary-color: #007bff;
diff --git a/public/themes/bootstrap4-light-purple/theme.css b/public/themes/bootstrap4-light-purple/theme.css
index edf6b7a21..b01d228ad 100644
--- a/public/themes/bootstrap4-light-purple/theme.css
+++ b/public/themes/bootstrap4-light-purple/theme.css
@@ -5,6 +5,7 @@
   --surface-c: #e9ecef;
   --surface-d: rgba(0, 0, 0, 0.125);
   --surface-e: #ffffff;
+  --surface-f: #ffffff;
   --text-color: #212529;
   --text-color-secondary: $shade600;
   --primary-color: #883cae;
diff --git a/public/themes/luna-amber/theme.css b/public/themes/luna-amber/theme.css
index 021587620..869820d12 100644
--- a/public/themes/luna-amber/theme.css
+++ b/public/themes/luna-amber/theme.css
@@ -5,6 +5,7 @@
   --surface-c: #4c4c4c;
   --surface-d: #2f2f2f;
   --surface-e: #323232;
+  --surface-f: #323232;
   --text-color: #dedede;
   --text-color-secondary: #888888;
   --primary-color: #FFE082;
diff --git a/public/themes/luna-blue/theme.css b/public/themes/luna-blue/theme.css
index 7a9120e0a..5524d1d31 100644
--- a/public/themes/luna-blue/theme.css
+++ b/public/themes/luna-blue/theme.css
@@ -5,6 +5,7 @@
   --surface-c: #4c4c4c;
   --surface-d: #2f2f2f;
   --surface-e: #323232;
+  --surface-f: #323232;
   --text-color: #dedede;
   --text-color-secondary: #888888;
   --primary-color: #81D4FA;
diff --git a/public/themes/luna-green/theme.css b/public/themes/luna-green/theme.css
index 6c3f7c094..a958cbdf7 100644
--- a/public/themes/luna-green/theme.css
+++ b/public/themes/luna-green/theme.css
@@ -5,6 +5,7 @@
   --surface-c: #4c4c4c;
   --surface-d: #2f2f2f;
   --surface-e: #323232;
+  --surface-f: #323232;
   --text-color: #dedede;
   --text-color-secondary: #888888;
   --primary-color: #C5E1A5;
diff --git a/public/themes/luna-pink/theme.css b/public/themes/luna-pink/theme.css
index 1e202be35..5269f4cd4 100644
--- a/public/themes/luna-pink/theme.css
+++ b/public/themes/luna-pink/theme.css
@@ -5,6 +5,7 @@
   --surface-c: #4c4c4c;
   --surface-d: #2f2f2f;
   --surface-e: #323232;
+  --surface-f: #323232;
   --text-color: #dedede;
   --text-color-secondary: #888888;
   --primary-color: #F48FB1;
diff --git a/public/themes/md-dark-deeppurple/theme.css b/public/themes/md-dark-deeppurple/theme.css
index b2b7e0279..dfa1aa1b3 100644
--- a/public/themes/md-dark-deeppurple/theme.css
+++ b/public/themes/md-dark-deeppurple/theme.css
@@ -5,6 +5,7 @@
   --surface-c:hsla(0,0%,100%,.04);
   --surface-d:hsla(0,0%,100%,.12);
   --surface-e:#1e1e1e;
+  --surface-f:#262626;
   --text-color:rgba(255, 255, 255, 0.87);
   --text-color-secondary:textSecondaryColor;
   --primary-color:#CE93D8;
diff --git a/public/themes/md-dark-indigo/theme.css b/public/themes/md-dark-indigo/theme.css
index f85b31ee7..585874f9e 100644
--- a/public/themes/md-dark-indigo/theme.css
+++ b/public/themes/md-dark-indigo/theme.css
@@ -5,6 +5,7 @@
   --surface-c:hsla(0,0%,100%,.04);
   --surface-d:hsla(0,0%,100%,.12);
   --surface-e:#1e1e1e;
+  --surface-f:#262626;
   --text-color:rgba(255, 255, 255, 0.87);
   --text-color-secondary:textSecondaryColor;
   --primary-color:#9FA8DA;
diff --git a/public/themes/md-light-deeppurple/theme.css b/public/themes/md-light-deeppurple/theme.css
index 107558055..4be23fdc4 100644
--- a/public/themes/md-light-deeppurple/theme.css
+++ b/public/themes/md-light-deeppurple/theme.css
@@ -5,6 +5,7 @@
   --surface-c:rgba(0,0,0,.04);
   --surface-d:rgba(0,0,0,.12);
   --surface-e:#ffffff;
+  --surface-f:#ffffff;
   --text-color:#000001;
   --text-color-secondary:textSecondaryColor;
   --primary-color:#673AB7;
diff --git a/public/themes/md-light-indigo/theme.css b/public/themes/md-light-indigo/theme.css
index 1b650ce2d..9e4bb2c66 100644
--- a/public/themes/md-light-indigo/theme.css
+++ b/public/themes/md-light-indigo/theme.css
@@ -5,6 +5,7 @@
   --surface-c:rgba(0,0,0,.04);
   --surface-d:rgba(0,0,0,.12);
   --surface-e:#ffffff;
+  --surface-f:#ffffff;
   --text-color:#000001;
   --text-color-secondary:textSecondaryColor;
   --primary-color:#3F51B5;
diff --git a/public/themes/mdc-dark-deeppurple/theme.css b/public/themes/mdc-dark-deeppurple/theme.css
index 7fb6cbd76..435de5d03 100644
--- a/public/themes/mdc-dark-deeppurple/theme.css
+++ b/public/themes/mdc-dark-deeppurple/theme.css
@@ -5,6 +5,7 @@
   --surface-c:hsla(0,0%,100%,.04);
   --surface-d:hsla(0,0%,100%,.12);
   --surface-e:#1e1e1e;
+  --surface-f:#262626;
   --text-color:rgba(255, 255, 255, 0.87);
   --text-color-secondary:textSecondaryColor;
   --primary-color:#673AB7;
diff --git a/public/themes/mdc-dark-indigo/theme.css b/public/themes/mdc-dark-indigo/theme.css
index c527f3a82..ce4ffd35d 100644
--- a/public/themes/mdc-dark-indigo/theme.css
+++ b/public/themes/mdc-dark-indigo/theme.css
@@ -5,6 +5,7 @@
   --surface-c:hsla(0,0%,100%,.04);
   --surface-d:hsla(0,0%,100%,.12);
   --surface-e:#1e1e1e;
+  --surface-f:#262626;
   --text-color:rgba(255, 255, 255, 0.87);
   --text-color-secondary:textSecondaryColor;
   --primary-color:#3F51B5;
diff --git a/public/themes/mdc-light-deeppurple/theme.css b/public/themes/mdc-light-deeppurple/theme.css
index 7913edc74..d6e709841 100644
--- a/public/themes/mdc-light-deeppurple/theme.css
+++ b/public/themes/mdc-light-deeppurple/theme.css
@@ -5,6 +5,7 @@
   --surface-c:rgba(0,0,0,.04);
   --surface-d:rgba(0,0,0,.12);
   --surface-e:#ffffff;
+  --surface-f:#ffffff;
   --text-color:#000001;
   --text-color-secondary:textSecondaryColor;
   --primary-color:#673AB7;
diff --git a/public/themes/mdc-light-indigo/theme.css b/public/themes/mdc-light-indigo/theme.css
index fcb7f2fc0..04aa68596 100644
--- a/public/themes/mdc-light-indigo/theme.css
+++ b/public/themes/mdc-light-indigo/theme.css
@@ -5,6 +5,7 @@
   --surface-c:rgba(0,0,0,.04);
   --surface-d:rgba(0,0,0,.12);
   --surface-e:#ffffff;
+  --surface-f:#ffffff;
   --text-color:#000001;
   --text-color-secondary:textSecondaryColor;
   --primary-color:#3F51B5;
diff --git a/public/themes/nova-accent/theme.css b/public/themes/nova-accent/theme.css
index 729ea1993..da229a9f5 100644
--- a/public/themes/nova-accent/theme.css
+++ b/public/themes/nova-accent/theme.css
@@ -5,6 +5,7 @@
   --surface-c: #eaeaea;
   --surface-d: #c8c8c8;
   --surface-e: #ffffff;
+  --surface-f: #ffffff;
   --text-color: #333333;
   --text-color-secondary: #848484;
   --primary-color: #007ad9;
diff --git a/public/themes/nova-alt/theme.css b/public/themes/nova-alt/theme.css
index a866b362d..f5ea060e8 100644
--- a/public/themes/nova-alt/theme.css
+++ b/public/themes/nova-alt/theme.css
@@ -5,6 +5,7 @@
   --surface-c: #eaeaea;
   --surface-d: #c8c8c8;
   --surface-e: #ffffff;
+  --surface-f: #ffffff;
   --text-color: #333333;
   --text-color-secondary: #848484;
   --primary-color: #007ad9;
diff --git a/public/themes/nova-vue/theme.css b/public/themes/nova-vue/theme.css
index 1c8d151a4..2a3ff9923 100644
--- a/public/themes/nova-vue/theme.css
+++ b/public/themes/nova-vue/theme.css
@@ -5,6 +5,7 @@
   --surface-c: #eaeaea;
   --surface-d: #c8c8c8;
   --surface-e: #ffffff;
+  --surface-f: #ffffff;
   --text-color: #333333;
   --text-color-secondary: #848484;
   --primary-color: #41b883;
diff --git a/public/themes/nova/theme.css b/public/themes/nova/theme.css
index f48fdecc3..485121b61 100644
--- a/public/themes/nova/theme.css
+++ b/public/themes/nova/theme.css
@@ -5,6 +5,7 @@
   --surface-c: #eaeaea;
   --surface-d: #c8c8c8;
   --surface-e: #ffffff;
+  --surface-f: #ffffff;
   --text-color: #333333;
   --text-color-secondary: #848484;
   --primary-color: #007ad9;
diff --git a/public/themes/rhea/theme.css b/public/themes/rhea/theme.css
index f0cb7d1c0..cb18053f0 100644
--- a/public/themes/rhea/theme.css
+++ b/public/themes/rhea/theme.css
@@ -5,6 +5,7 @@
   --surface-c: #eaeaea;
   --surface-d: #dadada;
   --surface-e: #ffffff;
+  --surface-f: #ffffff;
   --text-color: #495057;
   --text-color-secondary: #6c757d;
   --primary-color: #7B95A3;
diff --git a/public/themes/saga-blue/theme.css b/public/themes/saga-blue/theme.css
index 8d02aa5f0..9715a7211 100644
--- a/public/themes/saga-blue/theme.css
+++ b/public/themes/saga-blue/theme.css
@@ -5,6 +5,7 @@
   --surface-c: #e9ecef;
   --surface-d: #dee2e6;
   --surface-e: #ffffff;
+  --surface-f: #ffffff;
   --text-color: #495057;
   --text-color-secondary: $shade600;
   --primary-color: #2196F3;
diff --git a/public/themes/saga-green/theme.css b/public/themes/saga-green/theme.css
index c5e801d24..d65290af7 100644
--- a/public/themes/saga-green/theme.css
+++ b/public/themes/saga-green/theme.css
@@ -5,6 +5,7 @@
   --surface-c: #e9ecef;
   --surface-d: #dee2e6;
   --surface-e: #ffffff;
+  --surface-f: #ffffff;
   --text-color: #495057;
   --text-color-secondary: $shade600;
   --primary-color: #4CAF50;
diff --git a/public/themes/saga-orange/theme.css b/public/themes/saga-orange/theme.css
index b3c5938d7..acee85b01 100644
--- a/public/themes/saga-orange/theme.css
+++ b/public/themes/saga-orange/theme.css
@@ -5,6 +5,7 @@
   --surface-c: #e9ecef;
   --surface-d: #dee2e6;
   --surface-e: #ffffff;
+  --surface-f: #ffffff;
   --text-color: #495057;
   --text-color-secondary: $shade600;
   --primary-color: #FFC107;
diff --git a/public/themes/vela-blue/theme.css b/public/themes/vela-blue/theme.css
index 789633b29..2a5d72ce6 100644
--- a/public/themes/vela-blue/theme.css
+++ b/public/themes/vela-blue/theme.css
@@ -1,10 +1,11 @@
 @charset "UTF-8";
 :root {
-  --surface-a: #17212f;
+  --surface-a: #1f2d40;
   --surface-b: #17212f;
   --surface-c: #283951;
   --surface-d: #304562;
   --surface-e: #1f2d40;
+  --surface-f: #1f2d40;
   --text-color: rgba(255, 255, 255, 0.87);
   --text-color-secondary: rgba(255, 255, 255, 0.6);
   --primary-color: #64B5F6;
diff --git a/public/themes/vela-green/theme.css b/public/themes/vela-green/theme.css
index c432fa3b4..b3647e023 100644
--- a/public/themes/vela-green/theme.css
+++ b/public/themes/vela-green/theme.css
@@ -1,10 +1,11 @@
 @charset "UTF-8";
 :root {
-  --surface-a: #17212f;
+  --surface-a: #1f2d40;
   --surface-b: #17212f;
   --surface-c: #283951;
   --surface-d: #304562;
   --surface-e: #1f2d40;
+  --surface-f: #1f2d40;
   --text-color: rgba(255, 255, 255, 0.87);
   --text-color-secondary: rgba(255, 255, 255, 0.6);
   --primary-color: #81C784;
diff --git a/public/themes/vela-orange/theme.css b/public/themes/vela-orange/theme.css
index 9e4dbcfec..d00b551f7 100644
--- a/public/themes/vela-orange/theme.css
+++ b/public/themes/vela-orange/theme.css
@@ -1,10 +1,11 @@
 @charset "UTF-8";
 :root {
-  --surface-a: #17212f;
+  --surface-a: #1f2d40;
   --surface-b: #17212f;
   --surface-c: #283951;
   --surface-d: #304562;
   --surface-e: #1f2d40;
+  --surface-f: #1f2d40;
   --text-color: rgba(255, 255, 255, 0.87);
   --text-color-secondary: rgba(255, 255, 255, 0.6);
   --primary-color: #FFD54F;
diff --git a/public/themes/vela-purple/theme.css b/public/themes/vela-purple/theme.css
index 29c5499fd..9ee7aeaeb 100644
--- a/public/themes/vela-purple/theme.css
+++ b/public/themes/vela-purple/theme.css
@@ -1,10 +1,11 @@
 @charset "UTF-8";
 :root {
-  --surface-a: #17212f;
+  --surface-a: #1f2d40;
   --surface-b: #17212f;
   --surface-c: #283951;
   --surface-d: #304562;
   --surface-e: #1f2d40;
+  --surface-f: #1f2d40;
   --text-color: rgba(255, 255, 255, 0.87);
   --text-color-secondary: rgba(255, 255, 255, 0.6);
   --primary-color: #BA68C8;
diff --git a/src/assets/styles/app/_config.scss b/src/assets/styles/app/_config.scss
index 769b4ce01..b69c0b6f2 100644
--- a/src/assets/styles/app/_config.scss
+++ b/src/assets/styles/app/_config.scss
@@ -28,7 +28,7 @@
         height: 100%;
         box-shadow: 0 2px 10px 0 rgba(0, 0, 0, 0.24);
         color: var(--text-color);
-        background-color: var(--surface-e);
+        background-color: var(--surface-f);
 
         .layout-config-button {
             display: block;
diff --git a/src/assets/styles/app/_core.scss b/src/assets/styles/app/_core.scss
index d15bb9625..25c2c362a 100644
--- a/src/assets/styles/app/_core.scss
+++ b/src/assets/styles/app/_core.scss
@@ -213,7 +213,7 @@ p {
     left: 285px;
     top: 15px;
     padding: .5rem;
-    z-index: 2000;
+    z-index: 997;
     border-radius: 4px;
     box-shadow: 0 2px 4px -1px rgba(0,0,0,.2), 0 4px 5px 0 rgba(0,0,0,.14), 0 1px 10px 0 rgba(0,0,0,.12);
     width: 39px;
diff --git a/src/assets/styles/app/_topbar.scss b/src/assets/styles/app/_topbar.scss
index f377d4508..5b2d2a386 100644
--- a/src/assets/styles/app/_topbar.scss
+++ b/src/assets/styles/app/_topbar.scss
@@ -95,7 +95,7 @@
                     right: 0;
                     width: 275px;
                     max-height: 400px;
-                    background-color: var(--surface-e);
+                    background-color: var(--surface-f);
                     box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.3);
                     overflow: auto;
                     list-style-type: none;