diff --git a/modules/home-manager/kitty.nix b/modules/home-manager/kitty.nix
index 2433a68..ce3e760 100644
--- a/modules/home-manager/kitty.nix
+++ b/modules/home-manager/kitty.nix
@@ -17,14 +17,95 @@
     shellIntegration = {
       enableZshIntegration = true;
     };
-    themeFile = "gruvbox-dark";
+    #themeFile = "gruvbox-dark";
     # darwinLaunchOptions = [
     #   "--single-instance"
     # ];
     settings = {
-      background_opacity = "0.9";
-      background_blur = 5;
+      # background_opacity = "0.9";
+      # background_blur = 5;
       hide_window_decorations = "titlebar-only";
     };
+    extraConfig = ''
+      # vim:ft=kitty
+
+      ## name:     Gruber-dark
+      ## author:   ring0-rootkit
+      ## license:  MIT
+      ## upstream: https://github.com/ring0-rootkit/gruber-darker-kitty/blob/main/gruber.conf
+
+
+
+      # The basic colors
+      foreground              #e4e4e4
+      background              #181818
+      selection_foreground    #181818
+      selection_background    #F5F5F5
+
+      # Cursor colors
+      cursor                  #FFDD33
+      cursor_text_color       #000000
+
+      # URL underline color when hovering with mouse
+      url_color               #FF4F58
+
+      # Kitty window border colors
+      active_border_color     #96A6C8
+      inactive_border_color   #565F73
+      bell_border_color       #C73C3F
+
+      # OS Window titlebar colors
+      wayland_titlebar_color  #181818
+      macos_titlebar_color    #181818
+
+      # Tab bar colors
+      active_tab_foreground   #101010
+      active_tab_background   #F43841
+      inactive_tab_foreground #E4E4E4
+      inactive_tab_background #282828
+      tab_bar_background      #101010
+
+      # Colors for marks (marked text in the terminal)
+      mark1_foreground #181818
+      mark1_background #96A6C8
+      mark2_foreground #181818
+      mark2_background #F43841
+      mark3_foreground #181818
+      mark3_background #73D936
+
+      # The 16 terminal colors
+
+      # black
+      color0 #101010
+      color8 #453D41
+
+      # red
+      color1 #F43841
+      color9 #F43841
+
+      # green
+      color2 #73D936
+      color10 #73D936
+
+      # yellow
+      color3 #FFDD33
+      color11 #FFDD33
+
+      # blue
+      color4 #96A6C8
+      color12 #96A6C8
+
+      # magenta
+      color5 #9E95C7
+      color13 #9E95C7
+
+      # cyan
+      color6 #95A99F
+      color14 #95A99F
+
+      # white
+      color7 #E4E4E4
+      color15 #FFFFFF
+    '';
   };
 }
diff --git a/modules/home-manager/nixcats/default.nix b/modules/home-manager/nixcats/default.nix
index 3fa0cb2..202af1b 100644
--- a/modules/home-manager/nixcats/default.nix
+++ b/modules/home-manager/nixcats/default.nix
@@ -56,6 +56,7 @@ in {
             lzextras
             snacks-nvim
             gruvbox-nvim
+            gruber-darker-nvim
             vim-sleuth
             oil-nvim
             plenary-nvim
diff --git a/modules/home-manager/nixcats/init.lua b/modules/home-manager/nixcats/init.lua
index 4bbdd2a..39c9f58 100644
--- a/modules/home-manager/nixcats/init.lua
+++ b/modules/home-manager/nixcats/init.lua
@@ -123,7 +123,7 @@ vim.keymap.set({'n', 'v', 'x'}, '<leader>p', '"+p', { noremap = true, silent = t
 vim.keymap.set('i', '<C-p>', '<C-r><C-p>+', { noremap = true, silent = true, desc = 'Paste from clipboard from within insert mode' })
 vim.keymap.set("x", "<leader>P", '"_dP', { noremap = true, silent = true, desc = 'Paste over selection without erasing unnamed register' })
 
-vim.cmd.colorscheme('gruvbox')
+vim.cmd.colorscheme('gruber-darker')
 
 require("oil").setup()
 vim.keymap.set("n", "<leader>fe", "<cmd>Oil<CR>", { desc = 'Oil' })
diff --git a/modules/home-manager/taskwarrior.nix b/modules/home-manager/taskwarrior.nix
index b62e6f1..0968db5 100644
--- a/modules/home-manager/taskwarrior.nix
+++ b/modules/home-manager/taskwarrior.nix
@@ -3,10 +3,20 @@
   config,
   ...
 }: {
+  home.packages = with pkgs; [
+    taskwarrior-tui
+  ];
+
   programs = {
     taskwarrior = {
       enable = true;
       package = pkgs.taskwarrior3;
+      config = {
+        context.personal.read = "+personal";
+        context.personal.write = "+personal";
+        context.work.read = "+work";
+        context.work.write = "+work";
+      };
     };
   };
 }
diff --git a/modules/nix-darwin/aerospace.nix b/modules/nix-darwin/aerospace.nix
index 296ac00..ac1427c 100644
--- a/modules/nix-darwin/aerospace.nix
+++ b/modules/nix-darwin/aerospace.nix
@@ -71,12 +71,12 @@
         #                 Monitor pattern is the same as for 'workspace-to-monitor-force-assignment'.
         #                 See: https://nikitabobko.github.io/AeroSpace/guide#assign-workspaces-to-monitors
         gaps = {
-          inner.horizontal = 8;
-          inner.vertical =   8;
-          outer.left =       8;
-          outer.bottom =     8;
-          outer.top =        8;
-          outer.right =      8;
+          inner.horizontal = 0;
+          inner.vertical =   0;
+          outer.left =       0;
+          outer.bottom =     0;
+          outer.top =        0;
+          outer.right =      0;
         };
 
         mode = {