diff --git a/dotfiles/config/xmonad/src/PagerHints.hs b/dotfiles/config/xmonad/PagerHints.hs
similarity index 100%
rename from dotfiles/config/xmonad/src/PagerHints.hs
rename to dotfiles/config/xmonad/PagerHints.hs
diff --git a/dotfiles/config/xmonad/default.nix b/dotfiles/config/xmonad/default.nix
new file mode 100644
index 00000000..bd64f85a
--- /dev/null
+++ b/dotfiles/config/xmonad/default.nix
@@ -0,0 +1,6 @@
+let
+  pkgs = import <nixpkgs> { overlays = [ (import ./overlay.nix) ]; };
+  source = pkgs.lib.sourceByRegex ./. [
+    "xmonad.hs" "imalison-xmonad.cabal" "PagerHints.hs" "LICENSE"
+  ];
+in pkgs.haskellPackages.callCabal2nix "imalison-xmonad" source { }
diff --git a/dotfiles/config/xmonad/taffybar b/dotfiles/config/xmonad/taffybar
deleted file mode 120000
index 53a74d2a..00000000
--- a/dotfiles/config/xmonad/taffybar
+++ /dev/null
@@ -1 +0,0 @@
-../taffybar/taffybar
\ No newline at end of file
diff --git a/dotfiles/config/xmonad/xmonad-contrib b/dotfiles/config/xmonad/xmonad-contrib
index 9c0eb36a..f1039909 160000
--- a/dotfiles/config/xmonad/xmonad-contrib
+++ b/dotfiles/config/xmonad/xmonad-contrib
@@ -1 +1 @@
-Subproject commit 9c0eb36a4a76963a5579f95566f73475579527dc
+Subproject commit f10399096794addfd121f014b687a0298354f410
diff --git a/dotfiles/config/xmonad/xmonad.hs b/dotfiles/config/xmonad/xmonad.hs
index 2da0605d..67beee97 100644
--- a/dotfiles/config/xmonad/xmonad.hs
+++ b/dotfiles/config/xmonad/xmonad.hs
@@ -341,11 +341,13 @@ myTabConfig =
 rename newName = RN.renamed [RN.Replace newName]
 
 layoutsStart layout = (layout, [Layout layout])
+
 (|||!) (joined, layouts) newLayout =
     (joined ||| newLayout, layouts ++ [Layout newLayout])
 
 layoutInfo =
-  layoutsStart (rename "Columns" $ multiCol [1, 1] 2 0.01 (-0.5)) |||!
+  layoutsStart (rename "4 Columns" $ (multiCol [1, 1, 1] 2 0.0 (-0.5))) |||!
+  rename "3 Columns" (multiCol [1, 1] 2 0.01 (-0.5)) |||!
   rename "Large Main" (Tall 1 (3 / 100) (3 / 4)) |||!
   rename "2 Columns" (Tall 1 (3 / 100) (1 / 2)) |||!
   Accordion |||! simpleCross |||! myTabbed