diff --git a/eggs/foot/foot.ini b/eggs/foot/foot.ini
index b3be5bc..ab22c5a 100644
--- a/eggs/foot/foot.ini
+++ b/eggs/foot/foot.ini
@@ -12,9 +12,9 @@
 
 # font=APL386 Unicode:size=8
 # {% if device.laptop %}
-#<yolk> font=Terminus:size=12
+font=Terminus:size=12
 # {% else %}
-font=Fira Code Nerd Font:size=12
+#<yolk> font=Fira Code Nerd Font:size=12
 # {% end %}
 
 # font-bold=<bold variant of regular font>
diff --git a/eggs/git/.gitconfig b/eggs/git/.gitconfig
index 11fa16e..d0107d7 100644
--- a/eggs/git/.gitconfig
+++ b/eggs/git/.gitconfig
@@ -15,6 +15,7 @@
 	;<yolk> pager = delta
 ;<yolk> [delta]
 	;<yolk> features = side-by-side line-numbers decorations navigate
+	;<yolk> yntax-theme = gruvbox
 
 ;<yolk> [delta "line-numbers"]
 	;<yolk> line-numbers-left-style = cyan
diff --git a/eggs/gtk/.config/gtk-3.0/bookmarks b/eggs/gtk/.config/gtk-3.0/bookmarks
index 910705c..69a0c32 100644
--- a/eggs/gtk/.config/gtk-3.0/bookmarks
+++ b/eggs/gtk/.config/gtk-3.0/bookmarks
@@ -1 +1,2 @@
+file:///home/elk/Downloads Downloads
 file:///home/elk/code
diff --git a/eggs/niri/config.kdl b/eggs/niri/config.kdl
index 5bef9d3..c4fb87a 100644
--- a/eggs/niri/config.kdl
+++ b/eggs/niri/config.kdl
@@ -57,6 +57,7 @@ output "Philips Consumer Electronics Company PHL 345B1C 0x00008E7C" {
     //<yolk> mode "2560x1440"
     //<yolk> scale 1
     //<yolk> position x=0 y=0
+//<yolk> <<<<<<< HEAD
 //<yolk> }
 // {% end %}
 
@@ -67,6 +68,24 @@ output "Philips Consumer Electronics Company PHL 345B1C 0x00008E7C" {
     //<yolk> transform "normal"
     //<yolk> position x=0 y=1440
 //<yolk> }
+//<yolk> =======
+ //<yolk> }
+
+// {% elif device.thinkix %}
+//<yolk> output "HDMI-A-1" {
+    //<yolk> mode "1920x1080"
+    //<yolk> scale 1
+    //<yolk> position x=0 y=0
+    //<yolk> //off
+//<yolk> }
+
+//<yolk> output "eDP-1" {
+    //<yolk> mode "1920x1080@60"
+    //<yolk> scale 1.0
+    //<yolk> transform "normal"
+    //<yolk> position x=0 y=1440
+//<yolk> }
+//<yolk> >>>>>>> 4eba11c (asdf)
 // {% end %}
 
 
diff --git a/eggs/nvim/lazy-lock.json b/eggs/nvim/lazy-lock.json
index 741c373..198de78 100644
--- a/eggs/nvim/lazy-lock.json
+++ b/eggs/nvim/lazy-lock.json
@@ -1,49 +1,49 @@
 {
-  "CopilotChat.nvim": { "branch": "main", "commit": "1b375c24602680b5fe28c3c223a822111857dc37" },
-  "LazyVim": { "branch": "main", "commit": "eb8ddea8c9438c34e71db097eb77a44185dd1093" },
+  "CopilotChat.nvim": { "branch": "main", "commit": "834ba1bc71e1a146831be0ebfeb456ad252c3c56" },
+  "LazyVim": { "branch": "main", "commit": "3e8fddcd54ee57ab6c00353ff37a4e9d7df361bd" },
   "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "4244700eff0a9258b88f48b2b0d0339dea3338af" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "a2dcda8e69113008055b56a5833c96c8ab9893d6" },
   "blink-cmp-copilot": { "branch": "main", "commit": "5d4ed42c5d7d144012792bb6cc4ac7899a108169" },
-  "blink.cmp": { "branch": "main", "commit": "b6f11a0aa33e601c469a126e3ed6e35208fe3ea3" },
+  "blink.cmp": { "branch": "main", "commit": "9f32ef5c3bb44f943238bbcde0c467936475f177" },
   "catppuccin": { "branch": "main", "commit": "4965db2d6155c25db4e8417465fc2703fdf4c2b7" },
-  "copilot.lua": { "branch": "master", "commit": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9" },
-  "crates.nvim": { "branch": "main", "commit": "bd35b13e94a292ee6e32c351e05ca2202dc9f070" },
-  "dressing.nvim": { "branch": "master", "commit": "56ef6a969a4990d938c5fed40c370f65e125fc97" },
-  "dropbar.nvim": { "branch": "master", "commit": "f11b27344dc3675cdaeffa9e1e5cab0442abb0fa" },
-  "gitsigns.nvim": { "branch": "main", "commit": "9b36d497495436c135659902054ee637e0ba6021" },
+  "copilot.lua": { "branch": "master", "commit": "d3783b9283a7c35940ed8d71549030d5f5f9f980" },
+  "crates.nvim": { "branch": "main", "commit": "8bf8358ee326d5d8c11dcd7ac0bcc9ff97dbc785" },
+  "dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" },
+  "dropbar.nvim": { "branch": "master", "commit": "3afce85516c25823d5a1590f73ec19fe8553e2eb" },
+  "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
   "grug-far.nvim": { "branch": "main", "commit": "3a8690461afac34c0e5bacb0f7b4bc3066aab665" },
   "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
   "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" },
   "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "mini.ai": { "branch": "main", "commit": "640418aafb5a6e830eade483cdc2d4f0cd0e3f1a" },
+  "mini.ai": { "branch": "main", "commit": "53b4e4571e42913b94a12eff85dabe4db370d352" },
   "mini.comment": { "branch": "main", "commit": "5bd72d50d36f4c0fd531adc409715a75a2c984da" },
   "mini.hipatterns": { "branch": "main", "commit": "fbf1e2195fdd65cf1bc970316c28098257728868" },
   "mini.icons": { "branch": "main", "commit": "ec61af6e606fc89ee3b1d8f2f20166a3ca917a36" },
   "mini.move": { "branch": "main", "commit": "c8b30e92dd2668dd6e56a9a23cb7d4ee38c2266d" },
-  "mini.surround": { "branch": "main", "commit": "ceddea5fe862f13b279d9bbe81c3327a0e66d56b" },
-  "noice.nvim": { "branch": "main", "commit": "e3c68a4d2275a01268a52e2931bfccfbfb693d15" },
+  "mini.surround": { "branch": "main", "commit": "5e815557148d2c93eceaa44195c5d89953225b02" },
+  "noice.nvim": { "branch": "main", "commit": "cf758e9df66451889aab56613a21b8673f045ec2" },
   "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
-  "nvim-lint": { "branch": "master", "commit": "789b7ada1b4f00e08d026dffde410dcfa6a0ba87" },
+  "nvim-lint": { "branch": "master", "commit": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8" },
   "nvim-lsp-endhints": { "branch": "main", "commit": "a449f2f27b6b985ff216964572224ce432d94a86" },
-  "nvim-lspconfig": { "branch": "master", "commit": "00b236b795acfb79339bd6771488c155073a2889" },
+  "nvim-lspconfig": { "branch": "master", "commit": "9f2c279cf9abe584f03bfeb37c6658d68e3ff49d" },
   "nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" },
   "nvim-scrollbar": { "branch": "main", "commit": "6994eb9f73d5fdc36ee2c8717940e8c853e51a49" },
-  "nvim-treesitter": { "branch": "master", "commit": "4e701776f8824fc188a6254f57d080971ce28c92" },
+  "nvim-treesitter": { "branch": "master", "commit": "824bf8455fd670186986fb3eb46fcaa4c5460949" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
   "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
-  "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
+  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "remote-nvim.nvim": { "branch": "main", "commit": "66fc20fd259401c7bb6ac5189ecb6283c2eb65d2" },
   "render-markdown.nvim": { "branch": "main", "commit": "2a9e0ab6043bfb4996ce6a6a35594ab357e5d299" },
-  "rustaceanvim": { "branch": "master", "commit": "f03035fa03ccb36cd26d0792c946fbacba1d1a39" },
-  "snacks.nvim": { "branch": "main", "commit": "b773368f8aa6e84a68e979f0e335d23de71f405a" },
+  "rustaceanvim": { "branch": "master", "commit": "047f9c9d8cd2861745eb9de6c1570ee0875aa795" },
+  "snacks.nvim": { "branch": "main", "commit": "9e7e4b73ce627275b2f91aee83b5c3b91dc1ff77" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
-  "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" },
-  "trouble.nvim": { "branch": "main", "commit": "6f380b8826fb819c752c8fd7daaee9ef96d4c689" },
+  "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" },
+  "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" },
   "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" },
-  "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" },
+  "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" },
   "zenbones.nvim": { "branch": "main", "commit": "9ef4241c50ea24026b732512223dbc55589ce2c4" }
 }
diff --git a/yolk.rhai b/yolk.rhai
index 89d4857..7c7e05e 100644
--- a/yolk.rhai
+++ b/yolk.rhai
@@ -1,3 +1,11 @@
+export const themes = #{
+    gruvbox: #{
+        bg: "#1d2021",
+        fg: "#ebdbb2",
+    }
+};
+export const theme = themes.gruvbox;
+
 export const device = #{
     thinkix: SYSTEM.hostname == "thinkix",
     desktop: SYSTEM.hostname == "fedora.fritz.box" || SYSTEM.hostname == "fedora",