diff --git a/config/new-modules/vim/vim-hm.nix b/config/new-modules/vim/vim-hm.nix
index 208f91782..820e51817 100644
--- a/config/new-modules/vim/vim-hm.nix
+++ b/config/new-modules/vim/vim-hm.nix
@@ -108,7 +108,6 @@ in
       au VimEnter * exec 'AirlineTheme wombat'
       " TODO: How can this be abstracted/configured from expressions that import this?
       colorscheme ${config.mine.vim.colorscheme or "spacecamp"}
-      " colorscheme "spacecamp"
       "}}}
 
       "" Syntastic settings {{{
diff --git a/config/new-modules/x/default.nix b/config/new-modules/x/default.nix
index f17239bb0..d60461d65 100644
--- a/config/new-modules/x/default.nix
+++ b/config/new-modules/x/default.nix
@@ -118,6 +118,18 @@ with lib;
         blurExclude = [
           "class_g = 'slop'"
         ];
+        extraOptions = ''
+          corner-radius = 10;
+          blur-method = "dual_kawase";
+          blur-strength = "10";
+          xinerama-shadow-crop = true;
+        '';
+        experimentalBackends = true;
+
+        shadowExclude = [
+          "bounding_shaped && !rounded_corners"
+        ];
+
         fade = true;
         fadeDelta = 5;
         vSync = true;
@@ -129,6 +141,14 @@ with lib;
           "100:class_g   ~=  'jetbrains'"
           "100:class_g   *?= 'slack'"
         ];
+        package = pkgs.picom.overrideAttrs(o: {
+          src = pkgs.fetchFromGitHub {
+            repo = "picom";
+            owner = "ibhagwan";
+            rev = "44b4970f70d6b23759a61a2b94d9bfb4351b41b1";
+            sha256 = "0iff4bwpc00xbjad0m000midslgx12aihs33mdvfckr75r114ylh";
+          };
+        });
       };
 
       services.unclutter = {
@@ -181,5 +201,4 @@ with lib;
 
     };
   };
-
 }
diff --git a/config/new-modules/x/terminal/default.nix b/config/new-modules/x/terminal/default.nix
index 08eb302fa..c318092f8 100644
--- a/config/new-modules/x/terminal/default.nix
+++ b/config/new-modules/x/terminal/default.nix
@@ -4,7 +4,12 @@ with lib;
 let
 
   cfg = config.mine.terminal;
-
+  spacecamp-kitty = pkgs.fetchFromGitHub {
+    owner = "sebastianks";
+    repo = "spacecamp-kitty";
+    rev = "c06cc6f56076fb04aee04bc466c7733e6234b652";
+    sha256 = "0zwvjanph8bkw2pjbicsk3cifn2gmm6c9l4x6dgr4iaf8yf8ks1b";
+  };
 in
 {
 
@@ -34,6 +39,12 @@ in
           enable = true;
           font.name = "${config.mine.font.name}";
           font.package = config.mine.font.package;
+          settings = {
+            window_padding_width = "4 8";
+          };
+          extraConfig = ''
+            include ${spacecamp-kitty}/spacecamp.conf
+          '';
         };
 
       home.file.".tmux.conf".text = ''
diff --git a/config/new-modules/x/wm/xmonad.hs b/config/new-modules/x/wm/xmonad.hs
index 4a578af15..d2db87112 100644
--- a/config/new-modules/x/wm/xmonad.hs
+++ b/config/new-modules/x/wm/xmonad.hs
@@ -193,7 +193,8 @@ tabbedConf = def
     }
 
 genericLayouts =
-    avoidStruts $ smartBorders $
+    avoidStruts $ noBorders $
+        spacingRaw True (Border 0 10 10 10) True (Border 10 10 10 10) True $
         tall
         ||| Mirror tall
         ||| tabbedLayout