diff --git a/eggs.luau b/eggs.luau
deleted file mode 100644
index 79a70f6..0000000
--- a/eggs.luau
+++ /dev/null
@@ -1,32 +0,0 @@
-eggs = {}
-
-eggs["alacritty"] = { enabled = true, targets = "~" }
-eggs["eww"] = { enabled = true, targets = "~" }
-eggs["eww-bar"] = { enabled = true, targets = "~" }
-eggs["foot"] = { enabled = true, targets = "~", templates = { ".config/foot/foot.ini" } }
-eggs["git"] = { enabled = true, targets = "~", templates = { ".gitconfig" } }
-eggs["niri"] = { enabled = true, targets = "~", templates = { ".config/niri/*" } }
-eggs["nvim"] = { enabled = true, targets = "~" }
-eggs["other-dotfiles-stuff"] = { enabled = true, targets = "~" }
-eggs["profile"] = { enabled = true, targets = "~" }
-eggs["starship"] = { enabled = true, targets = "~" }
-eggs["sway"] = { enabled = true, targets = "~" }
-eggs["tmux"] = { enabled = true, targets = "~" }
-eggs["zed"] = { enabled = true, targets = "~" }
-eggs["zsh"] = { enabled = true, targets = "~" }
-eggs["rofi"] = { enabled = true, targets = "~" }
-eggs["gtk"] = { enabled = true, targets = "~" }
-
-eggs["powershell"] = { enabled = false, targets = "~" }
-eggs["scripts"] = { enabled = true, targets = "~" }
-eggs["sioyek"] = { enabled = false, targets = "~" }
-eggs["waybar"] = { enabled = false, targets = "~" }
-eggs["zathura"] = { enabled = false, targets = "~" }
-eggs["eww-laptop"] = { enabled = false, targets = "~" }
-eggs["hyprland"] = { enabled = false, targets = "~" }
-eggs["hyprlock"] = { enabled = false, targets = "~" }
-eggs["kakoune"] = { enabled = false, targets = "~" }
-eggs["kanata"] = { enabled = false, targets = "~" }
-eggs["karabiner"] = { enabled = false, targets = "~" }
-
-return eggs
diff --git a/eggs.rhai b/eggs.rhai
deleted file mode 100644
index 8b13789..0000000
--- a/eggs.rhai
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/eggs/alacritty/.config/alacritty/alacritty.toml b/eggs/alacritty/alacritty.toml
similarity index 100%
rename from eggs/alacritty/.config/alacritty/alacritty.toml
rename to eggs/alacritty/alacritty.toml
diff --git a/eggs/gtk/.config/gtk-3.0/settings.ini b/eggs/gtk/.config/gtk-3.0/settings.ini
index f903472..0fa26a4 100644
--- a/eggs/gtk/.config/gtk-3.0/settings.ini
+++ b/eggs/gtk/.config/gtk-3.0/settings.ini
@@ -1,7 +1,6 @@
 [Settings]
-gtk-theme-name=gruvbox-phocus
+;; gtk-theme-name=gruvbox-phocus
 gtk-icon-theme-name=oomox-materia-dark
-gtk-font-name=xos4 Terminus
 gtk-menu-images=1
 gtk-xft-hinting=1
 gtk-xft-rgba=rgb
diff --git a/eggs/niri/config.kdl b/eggs/niri/config.kdl
index 2f7c419..70ead2e 100644
--- a/eggs/niri/config.kdl
+++ b/eggs/niri/config.kdl
@@ -37,6 +37,7 @@ cursor {
 }
 
 environment {
+
     DISPLAY ":0"
     // GDK_BACKEND "x11"
 }
@@ -137,7 +138,7 @@ animations {
             float map(float value, float min1, float max1, float min2, float max2) {
                 return min2 + (value - min1) * (max2 - min2) / (max1 - min1);
             }
-                vec4 open_color(vec3 coords_geo, vec3 size_geo) {
+            vec4 open_color(vec3 coords_geo, vec3 size_geo) {
                 float cur = niri_clamped_progress;
                 if (coords_geo.x > cur) { return vec4(0.0); }
                 vec3 coord = vec3(map(coords_geo.x,0.0, cur, 0.0, 1.0 ), coords_geo.y, coords_geo.z);
@@ -195,6 +196,13 @@ window-rule {
     match title=r#"^.* is sharing your screen.$"#;
 }
 
+// window-rule {
+//     match is-active-in-column=false;
+//     max-height 100;
+//     min-height 100;
+// }
+
+
 window-rule {
     clip-to-geometry true
     geometry-corner-radius 8
@@ -322,6 +330,39 @@ binds {
      Mod+BracketRight { consume-or-expel-window-right; }
 
     Mod+R { switch-preset-column-width; }
+    Mod+Ctrl+R { spawn "sh" "-c" r#"
+        niri msg action focus-column-right \
+        && niri msg action set-column-width 33% \
+        && niri msg action focus-column-left \
+        && niri msg action set-column-width 67%
+       "#;
+    }
+    Mod+Ctrl+Shift+R { spawn "sh" "-c" r#"
+        niri msg action set-column-width 33% \
+        && niri msg action focus-column-right \
+        && niri msg action set-column-width 67% \
+        && niri msg action focus-column-left
+       "#;
+    }
+    Mod+Ctrl+T { spawn "sh" "-c" r#"
+        niri msg action set-column-width 50% \
+        && niri msg action focus-column-right \
+        && niri msg action set-column-width 50% \
+        && niri msg action focus-column-left \
+        && niri msg action focus-column-right \
+        && niri msg action focus-column-left
+       "#;
+    }
+    Mod+Ctrl+Shift+T { spawn "sh" "-c" r#"
+        niri msg action set-column-width 34% \
+        && niri msg action focus-column-right \
+        && niri msg action set-column-width 33% \
+        && niri msg action focus-column-right \
+        && niri msg action set-column-width 33% \
+        && niri msg action focus-column-left \
+        && niri msg action focus-column-left
+       "#;
+    }
     Mod+Shift+R { reset-window-height; }
     Mod+F { maximize-column; }
     Mod+Shift+F { fullscreen-window; }
diff --git a/yolk.luau b/yolk.luau
deleted file mode 100644
index 6d4747f..0000000
--- a/yolk.luau
+++ /dev/null
@@ -1,11 +0,0 @@
-device = {
-    thinkix = function()
-        return SYSTEM.hostname == "thinkix"
-    end,
-    desktop = function()
-        return SYSTEM.hostname == "fedora.fritz.box"
-    end,
-    laptop = function()
-        return SYSTEM.hostname == "thinkix" or SYSTEM.hostname == "frissnix"
-    end,
-}
diff --git a/yolk.rhai b/yolk.rhai
index 538d953..379aa47 100644
--- a/yolk.rhai
+++ b/yolk.rhai
@@ -3,36 +3,41 @@ export const device = #{
     thinkix: SYSTEM.hostname == "thinkix",
     desktop: SYSTEM.hostname == "fedora.fritz.box",
     laptop: SYSTEM.hostname == "thinkix" || SYSTEM.hostname == "frissnix",
+    macbook: false,
 };
 
 
 export let eggs = #{
-    "alacritty": #{ enabled: true, targets: "~" },
+    "alacritty": #{ enabled: true, targets: "~/.config/alacritty" },
     "eww": #{ enabled: true, targets: "~" },
     "eww-bar": #{ enabled: true, targets: "~" },
     "foot": #{ enabled: true, targets: "~", templates: [".config/foot/foot.ini"] },
     "git": #{ enabled: true, targets: "~", templates: [".gitconfig"] },
     "niri": #{ enabled: true, targets: "~/.config/niri", templates: ["**/*.kdl"] },
-    "nvim": #{ enabled: true, targets: "~" },
-    "other-dotfiles-stuff": #{ enabled: true, targets: "~" },
+    "nvim": #{ enabled: true, targets: "~", main_file: ".config/nvim/fnl/main.fnl" },
     "profile": #{ enabled: true, targets: "~" },
     "starship": #{ enabled: true, targets: "~" },
     "sway": #{ enabled: true, targets: "~" },
-    "tmux": #{ enabled: !device.laptop, targets: "~" },
     "zed": #{ enabled: true, targets: "~" },
     "zsh": #{ enabled: true, targets: "~" },
     "rofi": #{ enabled: true, targets: "~" },
     "gtk": #{ enabled: true, targets: "~" },
     "scripts": #{ enabled: true, targets: "~/scripts" },
 
+    "hyprlock": #{ enabled: device.laptop, targets: "~" },
+    "kanata": #{ enabled: device.laptop, targets: "~" },
+    "waybar": #{ enabled: device.laptop, targets: "~" },
+
+    "karabiner": #{ enabled: device.macbook, targets: "~" },
+
     "powershell": #{ enabled: false, targets: "~" },
     "sioyek": #{ enabled: false, targets: "~" },
-    "waybar": #{ enabled: false, targets: "~" },
     "zathura": #{ enabled: false, targets: "~" },
     "eww-laptop": #{ enabled: false, targets: "~" },
     "hyprland": #{ enabled: false, targets: "~" },
-    "hyprlock": #{ enabled: false, targets: "~" },
     "kakoune": #{ enabled: false, targets: "~" },
-    "kanata": #{ enabled: false, targets: "~" },
-    "karabiner": #{ enabled: false, targets: "~" },
+    "tmux": #{ enabled: false, targets: "~" },
+
+    // This is just random files that should be in the dotfiles, but shouldn't ever be deployed
+    "other-dotfiles-stuff": #{ enabled: false, targets: "~" },
 }