diff --git a/modules/applications/alacritty.nix b/modules/applications/alacritty.nix
index 9d1557d..49e8d70 100644
--- a/modules/applications/alacritty.nix
+++ b/modules/applications/alacritty.nix
@@ -47,8 +47,8 @@ with config.deviceSpecific;
             foreground = "#${thm.base05-hex}";
           };
           cursor = {
-            text = "#${thm.base00-hex}";
-            cursor = "#${thm.base05-hex}";
+            text = "#${thm.base02-hex}";
+            cursor = "#${thm.base00-hex}";
           };
           normal = {
             black = "#${thm.base00-hex}";
diff --git a/modules/workspace/i3/default.nix b/modules/workspace/i3/default.nix
index 7510265..50d4391 100644
--- a/modules/workspace/i3/default.nix
+++ b/modules/workspace/i3/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, config, lib, ... }:
 let
   thm = config.lib.base16.theme;
   apps = config.defaultApplications;
@@ -30,43 +30,27 @@ in {
 
       bars = [ ];
 
-      colors = {
-        focused = {
-          border = "#${thm.base05-hex}";
-          background = "#${thm.base00-hex}";
-          text = "#${thm.base0D-hex}";
-          indicator = "#${thm.base0D-hex}";
-          childBorder = "#${thm.base0C-hex}";
-        };
-        focusedInactive = {
+      colors = rec {
+        background = "#${thm.base00-hex}";
+        unfocused = {
+          text = "#${thm.base02-hex}";
           border = "#${thm.base01-hex}";
+          background = "#${thm.base00-hex}";
+          childBorder = "#${thm.base01-hex}";
+          indicator = "#${thm.base07-hex}";
+        };
+        focusedInactive = unfocused;
+        urgent = unfocused // {
+          text = "#${thm.base05-hex}";
+          border = "#${thm.base09-hex}";
+          childBorder = "#${thm.base09-hex}";
+        };
+        focused = unfocused // {
+          childBorder = "#${thm.base03-hex}";
+          border = "#${thm.base03-hex}";
           background = "#${thm.base01-hex}";
           text = "#${thm.base05-hex}";
-          indicator = "#${thm.base03-hex}";
-          childBorder = "#${thm.base01-hex}";
         };
-        unfocused = {
-          border = "#${thm.base01-hex}";
-          background = "#${thm.base00-hex}";
-          text = "#${thm.base05-hex}";
-          indicator = "#${thm.base01-hex}";
-          childBorder = "#${thm.base01-hex}";
-        };
-        urgent = {
-          border = "#${thm.base08-hex}";
-          background = "#${thm.base08-hex}";
-          text = "#${thm.base00-hex}";
-          indicator = "#${thm.base08-hex}";
-          childBorder = "#${thm.base08-hex}";
-        };
-        placeholder = {
-          border = "#${thm.base00-hex}";
-          background = "#${thm.base00-hex}";
-          text = "#${thm.base05-hex}";
-          indicator = "#${thm.base00-hex}";
-          childBorder = "#${thm.base00-hex}";
-        };
-        background = "#${thm.base07-hex}";
       };
 
       gaps = {
diff --git a/modules/workspace/i3status-rust/default.nix b/modules/workspace/i3status-rust/default.nix
index d74e983..d305f76 100644
--- a/modules/workspace/i3status-rust/default.nix
+++ b/modules/workspace/i3status-rust/default.nix
@@ -16,35 +16,20 @@ in {
       position = "top";
       statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs";
       workspaceNumbers = false;
-      colors = {
+      colors = let
+        default = {
+          background = "#${thm.base00-hex}";
+          border = "#${thm.base00-hex}";
+        };
+      in {
         background = "#${thm.base00-hex}";
-        statusline = "#${thm.base02-hex}";
-        separator = "#${thm.base04-hex}";
-        focusedWorkspace = {
-          background = "#${thm.base00-hex}";
-          border = "#${thm.base00-hex}";
-          text = "#${thm.base0D-hex}";
-        };
-        activeWorkspace = {
-          background = "#${thm.base03-hex}";
-          border = "#${thm.base00-hex}";
-          text = "#${thm.base00-hex}";
-        };
-        inactiveWorkspace = {
-          background = "#${thm.base01-hex}";
-          border = "#${thm.base00-hex}";
-          text = "#${thm.base05-hex}";
-        };
-        urgentWorkspace = {
-          background = "#${thm.base00-hex}";
-          border = "#${thm.base0A-hex}";
-          text = "#${thm.base05-hex}";
-        };
-        bindingMode = {
-          background = "#${thm.base0A-hex}";
-          border = "#${thm.base00-hex}";
-          text = "#${thm.base00-hex}";
-        };
+        statusline = "#${thm.base05-hex}";
+        separator = "#${thm.base02-hex}";
+        focusedWorkspace = default // { text = "#${thm.base08-hex}"; };
+        activeWorkspace = default // { text = "#${thm.base0B-hex}"; };
+        inactiveWorkspace = default // { text = "#${thm.base05-hex}"; };
+        urgentWorkspace = default // { text = "#${thm.base09-hex}"; };
+        bindingMode = default // { text = "#${thm.base0A-hex}"; };
       };
 
     }];