diff --git a/ades-office-control-panel.yaml b/ades-office-control-panel.yaml
index b877ea8..01b1206 100644
--- a/ades-office-control-panel.yaml
+++ b/ades-office-control-panel.yaml
@@ -309,7 +309,13 @@ lvgl:
   buffer_size: 25%
   bg_color: 0x000000
   color_filter_opa: TRANSP
+  disp_bg_color: 0x000000
   theme:
+    obj:
+      disabled:
+        bg_color: 0x000000
+        text_color: 0x004d00
+        border_color: 0x004d00
     button:
       bg_color: 0x000000
       bg_grad_color: 0x000000
@@ -335,6 +341,7 @@ lvgl:
         text_color: 0x004d00
         text_opa: COVER
         border_opa: COVER
+        opa: COVER
     buttonmatrix:
       bg_color: 0x000000
       bg_opa: COVER
@@ -367,9 +374,10 @@ lvgl:
           text_color: 0x004d00
           text_opa: COVER
           border_opa: COVER
+          opa: COVER
     switch:
-      bg_color: 0x1a1a1a
-      bg_grad_color: 0x1a1a1a
+      bg_color: 0x000000
+      bg_grad_color: 0x000000
       bg_grad_dir: VER
       bg_opa: COVER
       border_color: 0x00FF00
@@ -503,6 +511,7 @@ lvgl:
                 text_color: 0x004d00
                 text_opa: COVER
                 border_opa: COVER
+                opa: COVER
             rows:
               - buttons:
                   - id: buttonLights
@@ -631,6 +640,7 @@ lvgl:
                 text_color: 0x004d00
                 text_opa: COVER
                 border_opa: COVER
+                opa: COVER
             rows:
               - buttons:
                   - id: buttonTVArea