diff --git a/programs/sway/sway.nix b/programs/sway/sway.nix
index b1f51b5..25c6382 100644
--- a/programs/sway/sway.nix
+++ b/programs/sway/sway.nix
@@ -1,4 +1,4 @@
-{ config, nix-colors, lib }:
+{ config, lib }:
 let
   config = import ../../theming/colorScheme.nix;
   modifierKey = config.wayland.windowManager.sway.config.modifier;
@@ -28,25 +28,25 @@ in
       colors = {
         background = "${config.colorScheme.palette.base00}";
         focused = {
-          indicator = "#b30000";
-          background = "#b30000";
-          border = "#b30000";
-          childBorder = "#b30000";
-          text = "${config.colorScheme.pallete.base09}";
+          indicator = "${config.colorScheme.palette.base06}";
+          background = "${config.colorScheme.palette.base06}";
+          border = "${config.colorScheme.palette.base06}";
+          childBorder = "${config.colorScheme.palette.base06}";
+          text = "${config.colorScheme.palette.base09}";
         };
         focusedInactive = {
-          indicator = "#303030";
-          background = "#303030";
-          border = "#303030";
-          childBorder = "#303030";
-          text = "${config.colorScheme.pallete.base09}";
+          indicator = "${config.colorScheme.palette.base05}";
+          background = "${config.colorScheme.palette.base05}";
+          border = "${config.colorScheme.palette.base05}";
+          childBorder = "${config.colorScheme.palette.base05}";
+          text = "${config.colorScheme.palette.base09}";
         };
         unfocused = {
-          indicator = "#1e1e1e";
-          background = "#1e1e1e";
-          border = "#1e1e1e";
-          childBorder = "#1e1e1e";
-          text = "${config.colorScheme.pallete.base09}";
+          indicator = "${config.colorScheme.palette.base04}";
+          background = "${config.colorScheme.palette.base04}";
+          border = "${config.colorScheme.palette.base04}";
+          childBorder = "${config.colorScheme.palette.base04}";
+          text = "${config.colorScheme.palette.base09}";
         };
       };
       bars = [
diff --git a/programs/sway/waybar.nix b/programs/sway/waybar.nix
index 94ad9db..de768a7 100644
--- a/programs/sway/waybar.nix
+++ b/programs/sway/waybar.nix
@@ -1,3 +1,7 @@
+{ config }:
+let
+  config = import ../../theming/colorScheme.nix;
+in
 {
   programs.waybar = {
     enable = true;
@@ -61,21 +65,21 @@
         font-family: monospace;
       }
       window#waybar {
-        background: #242424;
-        color: #ffffff;
+        background: ${config.colorScheme.palette.base00};
+        color: ${config.colorScheme.palette.base09};
       }
       #workspaces button {
         padding: 0 5px;
-        background-color: #1e1e1e;
-        color: #ffffff;
+        background-color: ${config.colorScheme.palette.base04};
+        color: ${config.colorScheme.palette.base09};
       }
       #workspaces button:hover {
-        background: #303030;
-        color: #ffffff;
+        background: ${config.colorScheme.palette.base05};
+        color: ${config.colorScheme.palette.base09};
       }
       #workspaces button.focused {
-        background: #b30000;
-        color: #ffffff;
+        background: ${config.colorScheme.palette.base06};
+        color: ${config.colorScheme.palette.base09};
       }
     '';
   };
diff --git a/programs/sway/wofi.nix b/programs/sway/wofi.nix
index e5f94a8..208e7db 100644
--- a/programs/sway/wofi.nix
+++ b/programs/sway/wofi.nix
@@ -1,3 +1,7 @@
+{ config }:
+let
+  config = import ../../theming/colorScheme.nix;
+in
 {
   programs.wofi = {
     enable = true;
@@ -15,20 +19,20 @@
       }
 
       window {
-        background-color: #242424;
+        background-color: ${config.colorScheme.palette.base00};
       }
 
       #input {
         margin: 5px;
         border: none;
-        color: #ffffff;
-        background-color: #b30000;
+        color: ${config.colorScheme.palette.base09};
+        background-color: ${config.colorScheme.palette.base06};
       }
 
       #text {
         margin: 5px;
         border: none;
-        color: #ffffff;
+        color: ${config.colorScheme.palette.base09};
       }
 
       #entry {
@@ -40,7 +44,7 @@
       }
 
       #entry:selected {
-          background-color: #b30000;
+          background-color: ${config.colorScheme.palette.base06};
           border-radius: 5px;
           border: none;
       }