diff --git a/.config/yambar/config.yml b/.config/yambar/config.yml
index 79bde26..dde8162 100644
--- a/.config/yambar/config.yml
+++ b/.config/yambar/config.yml
@@ -68,7 +68,7 @@ bar:
              false:
                - string: {text: , font: *awesome}
                - string: {text: " {percent}%"}
-             true: {string: {text: , font: *awesome, foreground: bdae93ff}}
+             true: {string: {text: , font: *awesome, foreground: *accent}}
     - alsa:
        card: pulse
        mixer: Master
@@ -77,7 +77,7 @@ bar:
            on-click: /bin/sh -c "pamixer --toggle-mute"
            tag: muted
            values:
-             true: {string: {text: , font: *awesome, foreground: bdae93ff}}
+             true: {string: {text: , font: *awesome, foreground: *accent}}
              false:
                - ramp:
                    tag: volume
@@ -99,8 +99,8 @@ bar:
                - ramp:
                    tag: capacity
                    items:
-                     - string: {text: , foreground: a89984ff, font: *awesome}
-                     - string: {text: , foreground: ffa600ff, font: *awesome}
+                     - string: {text: , foreground: *accent, font: *awesome}
+                     - string: {text: , foreground: *accent, font: *awesome}
                      - string: {text: , font: *awesome}
                      - string: {text: , font: *awesome}
                      - string: {text: , font: *awesome}
@@ -108,29 +108,29 @@ bar:
                      - string: {text: , font: *awesome}
                      - string: {text: , font: *awesome}
                      - string: {text: , font: *awesome}
-                     - string: {text: , foreground: b8bb26ff, font: *awesome}
+                     - string: {text: , foreground: *accent, font: *awesome}
                - string: {text: " {capacity}% {estimate}"}
              charging:
-               - string: {text: , foreground: b8bb26ff, font: *awesome}
+               - string: {text: , foreground: *accent, font: *awesome}
                - string: {text: " {capacity}% {estimate}"}
              full:
-               - string: {text: , foreground: b8bb26ff, font: *awesome}
+               - string: {text: , foreground: *accent, font: *awesome}
                - string: {text: " {capacity}% full"}
-             not charging:
-               - ramp:
-                   tag: capacity
-                   items:
-                     - string: {text:  , foreground: a89984ff, font: *awesome}
-                     - string: {text:  , foreground: ffa600ff, font: *awesome}
-                     - string: {text:  , foreground: b8bb26ff, font: *awesome}
-                     - string: {text:  , foreground: b8bb26ff, font: *awesome}
-                     - string: {text:  , foreground: b8bb26ff, font: *awesome}
-                     - string: {text:  , foreground: b8bb26ff, font: *awesome}
-                     - string: {text:  , foreground: b8bb26ff, font: *awesome}
-                     - string: {text:  , foreground: b8bb26ff, font: *awesome}
-                     - string: {text:  , foreground: b8bb26ff, font: *awesome}
-                     - string: {text:  , foreground: b8bb26ff, font: *awesome}
-               - string: {text: " {capacity}%"}
+             # not charging:
+             #   - ramp:
+             #       tag: capacity
+             #       items:
+             #         - string: {text:  , foreground: a89984ff, font: *awesome}
+             #         - string: {text:  , foreground: ffa600ff, font: *awesome}
+             #         - string: {text:  , foreground: b8bb26ff, font: *awesome}
+             #         - string: {text:  , foreground: b8bb26ff, font: *awesome}
+             #         - string: {text:  , foreground: b8bb26ff, font: *awesome}
+             #         - string: {text:  , foreground: b8bb26ff, font: *awesome}
+             #         - string: {text:  , foreground: b8bb26ff, font: *awesome}
+             #         - string: {text:  , foreground: b8bb26ff, font: *awesome}
+             #         - string: {text:  , foreground: b8bb26ff, font: *awesome}
+             #         - string: {text:  , foreground: b8bb26ff, font: *awesome}
+             #   - string: {text: " {capacity}%"}
 
     - network:
         name: eth0
@@ -142,28 +142,28 @@ bar:
               true:
                 map:
                   tag: state
-                  default: {string: {text: , font: *awesome, foreground: bdae93ff}}
+                  default: {string: {text: , font: *awesome, foreground: *accent}}
                   values:
                     up:
                       map:
                         tag: ipv4
                         default: {string: {text: , font: *awesome}}
                         values:
-                          "": {string: {text: , font: *awesome, foreground: bdae93ff}}
+                          "": {string: {text: , font: *awesome, foreground: *accent}}
     - network:
         name: wlan0
         content:
           map:
             tag: state
-            default: {string: {text: , font: *awesome, foreground: bdae93ff}}
+            default: {string: {text: , font: *awesome, foreground: *accent}}
             values:
-              down: {string: {text: , font: *awesome, foreground: a89984ff}}
+              down: {string: {text: , font: *awesome, foreground: *accent}}
               up:
                 map:
                   tag: ipv4
                   default: {string: {text: , font: *awesome}}
                   values:
-                    "": {string: {text: , font: *awesome, foreground: bdae93ff}}
+                    "": {string: {text: , font: *awesome, foreground: *accent}}
     - clock:
         content:
           - string: {text: , font: "Font Awesome 5 Free:style=solid:size=12"}