diff --git a/home-modules/waybar.nix b/home-modules/waybar.nix
index 1d25119..96325cf 100755
--- a/home-modules/waybar.nix
+++ b/home-modules/waybar.nix
@@ -163,7 +163,7 @@ lib.mkIf (user != "tv")
         };
       };
     };
-    style = ''
+    style = with rice.color; let f = rice.lib.hex-to-rgb-comma-string; in ''
       * {
         font-family: ${rice.font.code.name2};
         font-size: 1em;
@@ -173,10 +173,10 @@ lib.mkIf (user != "tv")
       }
 
       window#waybar {
-        background-color: rgba(${rice.lib.hex-to-rgb-comma-string rice.color.background},${builtins.toString rice.transparency});
+        background-color: rgba(${f background},${builtins.toString rice.transparency});
         transition-duration: 5s;
         transition-property: background-color;
-        /* border: ${builtins.toString rice.border-width}px solid rgb(${rice.lib.hex-to-rgb-comma-string rice.color.border}); */
+        /* border: ${builtins.toString rice.border-width}px solid rgb(${f border}); */
         /* margin: ${builtins.toString rice.gap-size}px; */
         /* border-radius: ${builtins.toString rice.rounding}px; */
       }
@@ -198,54 +198,54 @@ lib.mkIf (user != "tv")
         padding: 0px 3px;
         margin-top: 0.3em;
         border-radius: ${builtins.toString rice.rounding}px;
-        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.accent.bright});
+        color: rgb(${f accent.bright});
       }
 
       #workspaces button {
-        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.white.dark});
+        color: rgb(${f accent.base});
         padding-left: 15px;
         padding-right: 15px;
         border-radius: ${builtins.toString rice.rounding}px;
       }
 
       #workspaces button.active {
-        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.background});
-        background-color: rgba(${rice.lib.hex-to-rgb-comma-string rice.color.accent.base},${builtins.toString rice.transparency});
+        color: rgb(${f background});
+        background-color: rgba(${f accent.base},${builtins.toString rice.transparency});
       }
 
       #workspaces button:hover {
-        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.tertiary.bright});
+        color: rgb(${f tertiary.bright});
       }
 
       #workspaces button.urgent {
-        background-color: rgba(${rice.lib.hex-to-rgb-comma-string rice.color.magenta.base},${builtins.toString rice.transparency});
+        background-color: rgba(${f magenta.base},${builtins.toString rice.transparency});
       }
 
       #custom-mode {
-        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.red.base});
+        color: rgb(${f red.base});
       }
 
       #window, #custom-ctimeremaining {
         font-family: ${rice.font.base.name}, ${rice.font.code.name2};
-        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.tertiary.bright});
+        color: rgb(${f tertiary.bright});
       }
 
       #wireplumber.muted {
-        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.tertiary.bright});
+        color: rgb(${f tertiary.bright});
       }
       #wireplumber {
         padding-left: 10px;
       }
 
       #battery.warning:not(.charging) {
-        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.green.base});;
+        color: rgb(${f green.base});;
       }
 
       #battery.critical { 
-        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.red.dark});;
-        background: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.red.bright});
+        color: rgb(${f red.dark});;
+        background: rgb(${f red.bright});
       }
-      #battery.charging { color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.green.base}); }
+      #battery.charging { color: rgb(${f green.base}); }
     '';
 
       #battery.critical:not(.charging) {