diff --git a/ades-office-control-panel.yaml b/ades-office-control-panel.yaml
index dae146d..74b4080 100644
--- a/ades-office-control-panel.yaml
+++ b/ades-office-control-panel.yaml
@@ -325,6 +325,8 @@ lvgl:
         bg_grad_color: 0x004d00
         text_color: 0x00FF00
       disabled:
+        bg_color: 0x000000
+        bg_grad_color: 0x000000
         border_color: 0x004d00
         text_color: 0x004d00
     buttonmatrix:
@@ -350,6 +352,8 @@ lvgl:
           bg_grad_color: 0x004d00
           text_color: 0x00FF00
         disabled:
+          bg_color: 0x000000
+          bg_grad_color: 0x000000
           border_color: 0x004d00
           text_color: 0x004d00
     switch:
@@ -767,6 +771,7 @@ lvgl:
             width: 110
             bg_color: 0x000000
             bg_opa: COVER
+            border_width: 0
             text_color: 0x00FF00
             text_font: roboto_10
             scales:
@@ -848,6 +853,7 @@ lvgl:
             width: 110
             bg_color: 0x000000
             bg_opa: COVER
+            border_width: 0
             text_color: 0x00FF00
             text_font: roboto_10
             scales: