diff --git a/frontend/src/layout/components/AppMain.vue b/frontend/src/layout/components/AppMain.vue
index 2e72540801..4651b889b7 100644
--- a/frontend/src/layout/components/AppMain.vue
+++ b/frontend/src/layout/components/AppMain.vue
@@ -37,7 +37,7 @@ export default {
 
     .ms-main-container {
         height: 100%;
-        padding: 0;
+        padding: 0 !important;
     }
 </style>
 
diff --git a/frontend/src/layout/components/Topbar.vue b/frontend/src/layout/components/Topbar.vue
index 26e432fa7a..3592055604 100644
--- a/frontend/src/layout/components/Topbar.vue
+++ b/frontend/src/layout/components/Topbar.vue
@@ -257,6 +257,14 @@ export default {
             value: val
           })
         }
+
+        if (this.uiInfo['ui.themeStr'] && this.uiInfo['ui.themeStr'].paramValue) {
+          if (this.uiInfo['ui.themeStr'].paramValue === 'dark') {
+            document.body.className = 'blackTheme'
+          } else if (this.uiInfo['ui.themeStr'].paramValue === 'light') {
+            document.body.className = ''
+          }
+        }
         this.axiosFinished = true
       })
     },
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index 23126c2d41..61c0eb804d 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -386,15 +386,31 @@ div:focus {
     }
 }
 
+.blackTheme .el-textarea__inner {
+    background-color: var(--MainBG) !important;    
+}
+.blackTheme .el-textarea__inner:not(:focus) {
+    
+    border-color: var(--border-color-input) !important;
+}
+
 .blackTheme .el-input__inner {
     background-color: var(--MainBG) !important;    
 }
 .blackTheme .el-input__inner:not(:focus) {
     
-    // border: none !important;
     border-color: var(--border-color-input) !important;
 }
 
+.blackTheme .el-input-number__decrease {
+    background-color: var(--MainBG) !important;
+    border: none !important;
+}
+.blackTheme .el-input-number__increase {
+    background-color: var(--MainBG) !important;
+    border: none !important;
+}
+
 
 .el-pagination {
     button:disabled {
diff --git a/frontend/src/styles/topbar.scss b/frontend/src/styles/topbar.scss
index f622678c94..7fe5c93b0f 100644
--- a/frontend/src/styles/topbar.scss
+++ b/frontend/src/styles/topbar.scss
@@ -25,7 +25,7 @@
   .el-menu {
     float: left;
     border: none !important;
-
+    background-color: var(--MainBG, #ffffff) !important;
     .nav-item {
       display: inline-block;
 
@@ -47,29 +47,7 @@
 
     }
   }
-/* .blackTheme .el-menu {
-    
-    .nav-item {
-      
 
-      .el-menu-item:not(.is-active) {
-
-        &:hover {
-          background-color: var(--ContentBG) !important;
-        }
-
-        &:focus {
-          background-color: var(--ContentBG) !important;
-        }
-
-      }
-      .blackTheme .el-menu-item.is-active {
-        background-color: var(--ContentBG) !important;
-        color: var(--TextActive) !important;
-      }
-
-    }
-} */
 
   .right-menu {
     float: right;
diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue
index e3f5385e06..47e1863a50 100644
--- a/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/frontend/src/views/panel/list/PanelViewShow.vue
@@ -62,7 +62,7 @@
       </el-row>
     </el-col>
     <el-col v-if="panelInfo.name.length===0" style="height: 100%;">
-      <el-row style="height: 100%;" class="custom-position">
+      <el-row style="height: 100%; background-color: var(--MainBG);" class="custom-position">
         {{ $t('panel.select_panel_from_left') }}
       </el-row>
     </el-col>