diff --git a/controldeck.py b/controldeck.py
index cc516d2..fba3c35 100755
--- a/controldeck.py
+++ b/controldeck.py
@@ -140,10 +140,12 @@ class Label(QDiv):
     self.style = "width: 90px;"
     self.style += "min-height: 70px;"
     if self.wtype != 'empty':
-      self.classes = f"q-pa-sm text-blue-grey-4 text-bold text-center bg-light-blue-10"
+      self.classes = f"q-pa-sm text-blue-grey-5 text-bold text-center bg-blue-grey-10"
+      # bg-light-blue-10
       #self.style += "font-size: 14px;"
       self.style += "line-height: 1em;"
-      self.style += "border-radius: 7px;"
+      #self.style += "border-radius: 7px;"
+      self.classes += " q-btn--push"  # border-radius: 7px;
       self.text = self.text.upper()
     #print()
     #print(self)
@@ -194,7 +196,7 @@ class Button(QBtn):
 
     self.style = "width: 90px;"
     self.style += "min-height: 77px;"   # image + 2 text lines
-    self.style += "border: 1px solid #455a64;"  # #455a64 blue-grey-8
+    self.style += "border: 1px solid var(--c-blue-grey-8);"  # #455a64 blue-grey-8
     self.style += "line-height: 1em;"
 
     if self.image and path.exists(self.image):
@@ -243,8 +245,10 @@ class Button(QBtn):
         print(f"is_state_alt: {self.is_state_alt()}")
       if self.is_state_alt():
         # self.style += "border: 1px solid green;"
-        self.style += "border-bottom: 1px solid green;"
-        
+        # self.style += "border-bottom: 1px solid green;"
+        self.style += "border: 1px solid var(--c-light-blue-9);"
+        # self.style += "border-bottom: 1px solid var(--c-light-blue);"
+
 
 class Volume(Div):
   # class variables
@@ -573,6 +577,15 @@ async def application(request):
     .q-tooltip {
       white-space: pre;
     }
+
+    /* COLORS */
+    :root {
+      --c-blue-grey-8: #455a64;  /* blue-grey-8 */
+      --c-light-blue-9: #0277bd;  /* light-blue-9 */
+    }
+    .border-c-blue-grey-8 {
+      border: 1px solid var(--c-blue-grey-8) !important;
+    }
   """
 
   # quasar version installed v1.9.14
diff --git a/data/controldeck.service b/data/controldeck.service
index 54f56ad..f991212 100644
--- a/data/controldeck.service
+++ b/data/controldeck.service
@@ -7,7 +7,7 @@ After=network.target
 Environment=PYTHONUNBUFFERED=1
 TimeoutStartSec=30
 #ExecStartPre=/bin/sh -c 'source /etc/profile'
-ExecStart=/usr/bin/controldeck
+ExecStart=/usr/bin/controldeck -D
 Restart=on-failure
 RestartSec=4
 StandardOutput=journal
diff --git a/data/controldeck.service.local b/data/controldeck.service.local
index 011cefa..57a6b82 100644
--- a/data/controldeck.service.local
+++ b/data/controldeck.service.local
@@ -7,7 +7,7 @@ After=network.target
 Environment=PYTHONUNBUFFERED=1
 TimeoutStartSec=30
 ExecStartPre=/bin/sh -c 'source /etc/profile'
-ExecStart=%h/.local/bin/controldeck
+ExecStart=%h/.local/bin/controldeck -D
 Restart=on-failure
 RestartSec=4
 StandardOutput=journal