diff --git a/eggs/foot/yolk_templates b/eggs/foot/yolk_templates
deleted file mode 100644
index 1c9ef25..0000000
--- a/eggs/foot/yolk_templates
+++ /dev/null
@@ -1 +0,0 @@
-.config/foot/foot.ini
\ No newline at end of file
diff --git a/eggs/git/.gitconfig b/eggs/git/.gitconfig
index df1f52d..a453114 100644
--- a/eggs/git/.gitconfig
+++ b/eggs/git/.gitconfig
@@ -7,14 +7,13 @@
 	helper = store
 [core]
 	autocrlf = input
-
-	; {# if io::command_available("delta") #}
+	; {# if io::command_available("deltar") #}
 	;<yolk> pager = delta
 
 [pull]
-rebase = false
+    rebase = false
 [github]
-user = ElKowar
+    user = ElKowar
 
 ;[diff]
 ;external = "difft"
diff --git a/eggs/git/yolk_templates b/eggs/git/yolk_templates
deleted file mode 100644
index e717d37..0000000
--- a/eggs/git/yolk_templates
+++ /dev/null
@@ -1 +0,0 @@
-.gitconfig
\ No newline at end of file
diff --git a/eggs/niri/.config/niri/clipboardfix.sh b/eggs/niri/clipboardfix.sh
similarity index 100%
rename from eggs/niri/.config/niri/clipboardfix.sh
rename to eggs/niri/clipboardfix.sh
diff --git a/eggs/niri/.config/niri/config.kdl b/eggs/niri/config.kdl
similarity index 100%
rename from eggs/niri/.config/niri/config.kdl
rename to eggs/niri/config.kdl
diff --git a/eggs/niri/yolk_templates b/eggs/niri/yolk_templates
deleted file mode 100644
index 0604548..0000000
--- a/eggs/niri/yolk_templates
+++ /dev/null
@@ -1 +0,0 @@
-.config/niri/config.kdl
\ No newline at end of file
diff --git a/eggs/scripts/scripts/0x0.sh b/eggs/scripts/0x0.sh
similarity index 100%
rename from eggs/scripts/scripts/0x0.sh
rename to eggs/scripts/0x0.sh
diff --git a/eggs/scripts/scripts/THE_BEST_SCRIPT.sh b/eggs/scripts/THE_BEST_SCRIPT.sh
similarity index 100%
rename from eggs/scripts/scripts/THE_BEST_SCRIPT.sh
rename to eggs/scripts/THE_BEST_SCRIPT.sh
diff --git a/eggs/scripts/scripts/Theatron/.currently_playing b/eggs/scripts/Theatron/.currently_playing
similarity index 100%
rename from eggs/scripts/scripts/Theatron/.currently_playing
rename to eggs/scripts/Theatron/.currently_playing
diff --git a/eggs/scripts/scripts/Theatron/bId.txt b/eggs/scripts/Theatron/bId.txt
similarity index 100%
rename from eggs/scripts/scripts/Theatron/bId.txt
rename to eggs/scripts/Theatron/bId.txt
diff --git a/eggs/scripts/scripts/Theatron/clipit b/eggs/scripts/Theatron/clipit
similarity index 100%
rename from eggs/scripts/scripts/Theatron/clipit
rename to eggs/scripts/Theatron/clipit
diff --git a/eggs/scripts/scripts/Theatron/config b/eggs/scripts/Theatron/config
similarity index 100%
rename from eggs/scripts/scripts/Theatron/config
rename to eggs/scripts/Theatron/config
diff --git a/eggs/scripts/scripts/Theatron/oauth b/eggs/scripts/Theatron/oauth
similarity index 100%
rename from eggs/scripts/scripts/Theatron/oauth
rename to eggs/scripts/Theatron/oauth
diff --git a/eggs/scripts/scripts/Theatron/pollingservice b/eggs/scripts/Theatron/pollingservice
similarity index 100%
rename from eggs/scripts/scripts/Theatron/pollingservice
rename to eggs/scripts/Theatron/pollingservice
diff --git a/eggs/scripts/scripts/Theatron/simplewatch b/eggs/scripts/Theatron/simplewatch
similarity index 100%
rename from eggs/scripts/scripts/Theatron/simplewatch
rename to eggs/scripts/Theatron/simplewatch
diff --git a/eggs/scripts/scripts/audio-select.sh b/eggs/scripts/audio-select.sh
similarity index 100%
rename from eggs/scripts/scripts/audio-select.sh
rename to eggs/scripts/audio-select.sh
diff --git a/eggs/scripts/scripts/autocompile/plantuml.sh b/eggs/scripts/autocompile/plantuml.sh
similarity index 100%
rename from eggs/scripts/scripts/autocompile/plantuml.sh
rename to eggs/scripts/autocompile/plantuml.sh
diff --git a/eggs/scripts/scripts/autocompleteWords.sh b/eggs/scripts/autocompleteWords.sh
similarity index 100%
rename from eggs/scripts/scripts/autocompleteWords.sh
rename to eggs/scripts/autocompleteWords.sh
diff --git a/eggs/scripts/scripts/battery_indicator.sh b/eggs/scripts/battery_indicator.sh
similarity index 100%
rename from eggs/scripts/scripts/battery_indicator.sh
rename to eggs/scripts/battery_indicator.sh
diff --git a/eggs/scripts/scripts/bazecor.sh b/eggs/scripts/bazecor.sh
similarity index 100%
rename from eggs/scripts/scripts/bazecor.sh
rename to eggs/scripts/bazecor.sh
diff --git a/eggs/scripts/scripts/bookmarks/config_files b/eggs/scripts/bookmarks/config_files
similarity index 100%
rename from eggs/scripts/scripts/bookmarks/config_files
rename to eggs/scripts/bookmarks/config_files
diff --git a/eggs/scripts/scripts/bookmarks/other b/eggs/scripts/bookmarks/other
similarity index 100%
rename from eggs/scripts/scripts/bookmarks/other
rename to eggs/scripts/bookmarks/other
diff --git a/eggs/scripts/scripts/bookmarks/ssh b/eggs/scripts/bookmarks/ssh
similarity index 100%
rename from eggs/scripts/scripts/bookmarks/ssh
rename to eggs/scripts/bookmarks/ssh
diff --git a/eggs/scripts/scripts/bookmarks/websites b/eggs/scripts/bookmarks/websites
similarity index 100%
rename from eggs/scripts/scripts/bookmarks/websites
rename to eggs/scripts/bookmarks/websites
diff --git a/eggs/scripts/scripts/boshinyanyanyanfetch.sh b/eggs/scripts/boshinyanyanyanfetch.sh
similarity index 100%
rename from eggs/scripts/scripts/boshinyanyanyanfetch.sh
rename to eggs/scripts/boshinyanyanyanfetch.sh
diff --git a/eggs/scripts/scripts/casefandeamon.py b/eggs/scripts/casefandeamon.py
similarity index 100%
rename from eggs/scripts/scripts/casefandeamon.py
rename to eggs/scripts/casefandeamon.py
diff --git a/eggs/scripts/scripts/cheat b/eggs/scripts/cheat
similarity index 100%
rename from eggs/scripts/scripts/cheat
rename to eggs/scripts/cheat
diff --git a/eggs/scripts/scripts/company_distances/coordinates.json b/eggs/scripts/company_distances/coordinates.json
similarity index 100%
rename from eggs/scripts/scripts/company_distances/coordinates.json
rename to eggs/scripts/company_distances/coordinates.json
diff --git a/eggs/scripts/scripts/company_distances/distances.json b/eggs/scripts/company_distances/distances.json
similarity index 100%
rename from eggs/scripts/scripts/company_distances/distances.json
rename to eggs/scripts/company_distances/distances.json
diff --git a/eggs/scripts/scripts/company_distances/foo.sh b/eggs/scripts/company_distances/foo.sh
similarity index 100%
rename from eggs/scripts/scripts/company_distances/foo.sh
rename to eggs/scripts/company_distances/foo.sh
diff --git a/eggs/scripts/scripts/company_distances/get_coords.sh b/eggs/scripts/company_distances/get_coords.sh
similarity index 100%
rename from eggs/scripts/scripts/company_distances/get_coords.sh
rename to eggs/scripts/company_distances/get_coords.sh
diff --git a/eggs/scripts/scripts/company_distances/get_distances.sh b/eggs/scripts/company_distances/get_distances.sh
similarity index 100%
rename from eggs/scripts/scripts/company_distances/get_distances.sh
rename to eggs/scripts/company_distances/get_distances.sh
diff --git a/eggs/scripts/scripts/company_distances/links_sorted b/eggs/scripts/company_distances/links_sorted
similarity index 100%
rename from eggs/scripts/scripts/company_distances/links_sorted
rename to eggs/scripts/company_distances/links_sorted
diff --git a/eggs/scripts/scripts/company_distances/sorted.json b/eggs/scripts/company_distances/sorted.json
similarity index 100%
rename from eggs/scripts/scripts/company_distances/sorted.json
rename to eggs/scripts/company_distances/sorted.json
diff --git a/eggs/scripts/scripts/conf b/eggs/scripts/conf
similarity index 100%
rename from eggs/scripts/scripts/conf
rename to eggs/scripts/conf
diff --git a/eggs/scripts/scripts/copy-pasta.sh b/eggs/scripts/copy-pasta.sh
similarity index 100%
rename from eggs/scripts/scripts/copy-pasta.sh
rename to eggs/scripts/copy-pasta.sh
diff --git a/eggs/scripts/scripts/fetch-running-pipelines.sh b/eggs/scripts/fetch-running-pipelines.sh
similarity index 100%
rename from eggs/scripts/scripts/fetch-running-pipelines.sh
rename to eggs/scripts/fetch-running-pipelines.sh
diff --git a/eggs/scripts/scripts/findWindowInfo.sh b/eggs/scripts/findWindowInfo.sh
similarity index 100%
rename from eggs/scripts/scripts/findWindowInfo.sh
rename to eggs/scripts/findWindowInfo.sh
diff --git a/eggs/scripts/scripts/fzfimg.sh b/eggs/scripts/fzfimg.sh
similarity index 100%
rename from eggs/scripts/scripts/fzfimg.sh
rename to eggs/scripts/fzfimg.sh
diff --git a/eggs/scripts/scripts/fzfselect.sh b/eggs/scripts/fzfselect.sh
similarity index 100%
rename from eggs/scripts/scripts/fzfselect.sh
rename to eggs/scripts/fzfselect.sh
diff --git a/eggs/scripts/scripts/gpuinfo.sh b/eggs/scripts/gpuinfo.sh
similarity index 100%
rename from eggs/scripts/scripts/gpuinfo.sh
rename to eggs/scripts/gpuinfo.sh
diff --git a/eggs/scripts/scripts/hue.sh b/eggs/scripts/hue.sh
similarity index 100%
rename from eggs/scripts/scripts/hue.sh
rename to eggs/scripts/hue.sh
diff --git a/eggs/scripts/scripts/kak-attatch-session b/eggs/scripts/kak-attatch-session
similarity index 100%
rename from eggs/scripts/scripts/kak-attatch-session
rename to eggs/scripts/kak-attatch-session
diff --git a/eggs/scripts/scripts/lemonbar/like_polybar.sh b/eggs/scripts/lemonbar/like_polybar.sh
similarity index 100%
rename from eggs/scripts/scripts/lemonbar/like_polybar.sh
rename to eggs/scripts/lemonbar/like_polybar.sh
diff --git a/eggs/scripts/scripts/lemonbar/right_side.sh b/eggs/scripts/lemonbar/right_side.sh
similarity index 100%
rename from eggs/scripts/scripts/lemonbar/right_side.sh
rename to eggs/scripts/lemonbar/right_side.sh
diff --git a/eggs/scripts/scripts/lemonbar/xmonad_info.sh b/eggs/scripts/lemonbar/xmonad_info.sh
similarity index 100%
rename from eggs/scripts/scripts/lemonbar/xmonad_info.sh
rename to eggs/scripts/lemonbar/xmonad_info.sh
diff --git a/eggs/scripts/scripts/makeHaskellProject.sh b/eggs/scripts/makeHaskellProject.sh
similarity index 100%
rename from eggs/scripts/scripts/makeHaskellProject.sh
rename to eggs/scripts/makeHaskellProject.sh
diff --git a/eggs/scripts/scripts/memeaker b/eggs/scripts/memeaker
similarity index 100%
rename from eggs/scripts/scripts/memeaker
rename to eggs/scripts/memeaker
diff --git a/eggs/scripts/scripts/mkFFGH.sh b/eggs/scripts/mkFFGH.sh
similarity index 100%
rename from eggs/scripts/scripts/mkFFGH.sh
rename to eggs/scripts/mkFFGH.sh
diff --git a/eggs/scripts/scripts/nix_stash b/eggs/scripts/nix_stash
similarity index 100%
rename from eggs/scripts/scripts/nix_stash
rename to eggs/scripts/nix_stash
diff --git a/eggs/scripts/scripts/packageSizes.sh b/eggs/scripts/packageSizes.sh
similarity index 100%
rename from eggs/scripts/scripts/packageSizes.sh
rename to eggs/scripts/packageSizes.sh
diff --git a/eggs/scripts/scripts/picom b/eggs/scripts/picom
similarity index 100%
rename from eggs/scripts/scripts/picom
rename to eggs/scripts/picom
diff --git a/eggs/scripts/scripts/pinLocker-Desktop.jar b/eggs/scripts/pinLocker-Desktop.jar
similarity index 100%
rename from eggs/scripts/scripts/pinLocker-Desktop.jar
rename to eggs/scripts/pinLocker-Desktop.jar
diff --git a/eggs/scripts/scripts/preview.sh b/eggs/scripts/preview.sh
similarity index 100%
rename from eggs/scripts/scripts/preview.sh
rename to eggs/scripts/preview.sh
diff --git a/eggs/scripts/scripts/resizeGif.sh b/eggs/scripts/resizeGif.sh
similarity index 100%
rename from eggs/scripts/scripts/resizeGif.sh
rename to eggs/scripts/resizeGif.sh
diff --git a/eggs/scripts/scripts/rofi-open.sh b/eggs/scripts/rofi-open.sh
similarity index 100%
rename from eggs/scripts/scripts/rofi-open.sh
rename to eggs/scripts/rofi-open.sh
diff --git a/eggs/scripts/scripts/rofi-scripts/links.md b/eggs/scripts/rofi-scripts/links.md
similarity index 100%
rename from eggs/scripts/scripts/rofi-scripts/links.md
rename to eggs/scripts/rofi-scripts/links.md
diff --git a/eggs/scripts/scripts/rofi-scripts/open-git-project.sh b/eggs/scripts/rofi-scripts/open-git-project.sh
similarity index 100%
rename from eggs/scripts/scripts/rofi-scripts/open-git-project.sh
rename to eggs/scripts/rofi-scripts/open-git-project.sh
diff --git a/eggs/scripts/scripts/runXephyr.sh b/eggs/scripts/runXephyr.sh
similarity index 100%
rename from eggs/scripts/scripts/runXephyr.sh
rename to eggs/scripts/runXephyr.sh
diff --git a/eggs/scripts/scripts/screengif.sh b/eggs/scripts/screengif.sh
similarity index 100%
rename from eggs/scripts/scripts/screengif.sh
rename to eggs/scripts/screengif.sh
diff --git a/eggs/scripts/scripts/screenrecorder.sh b/eggs/scripts/screenrecorder.sh
similarity index 100%
rename from eggs/scripts/scripts/screenrecorder.sh
rename to eggs/scripts/screenrecorder.sh
diff --git a/eggs/scripts/scripts/screenshot.sh b/eggs/scripts/screenshot.sh
similarity index 100%
rename from eggs/scripts/scripts/screenshot.sh
rename to eggs/scripts/screenshot.sh
diff --git a/eggs/scripts/scripts/screenvideo.sh b/eggs/scripts/screenvideo.sh
similarity index 100%
rename from eggs/scripts/scripts/screenvideo.sh
rename to eggs/scripts/screenvideo.sh
diff --git a/eggs/scripts/scripts/scrotshadow.sh b/eggs/scripts/scrotshadow.sh
similarity index 100%
rename from eggs/scripts/scripts/scrotshadow.sh
rename to eggs/scripts/scrotshadow.sh
diff --git a/eggs/scripts/scripts/swallow_app.sh b/eggs/scripts/swallow_app.sh
similarity index 100%
rename from eggs/scripts/scripts/swallow_app.sh
rename to eggs/scripts/swallow_app.sh
diff --git a/eggs/scripts/scripts/timer.sh b/eggs/scripts/timer.sh
similarity index 100%
rename from eggs/scripts/scripts/timer.sh
rename to eggs/scripts/timer.sh
diff --git a/eggs/scripts/scripts/workspaces/swlab.sh b/eggs/scripts/workspaces/swlab.sh
similarity index 100%
rename from eggs/scripts/scripts/workspaces/swlab.sh
rename to eggs/scripts/workspaces/swlab.sh
diff --git a/eggs/scripts/scripts/wpms.sh b/eggs/scripts/wpms.sh
similarity index 100%
rename from eggs/scripts/scripts/wpms.sh
rename to eggs/scripts/wpms.sh
diff --git a/eggs/zed/.config/zed/keymap.json b/eggs/zed/.config/zed/keymap.json
index b9265cb..c882f76 100644
--- a/eggs/zed/.config/zed/keymap.json
+++ b/eggs/zed/.config/zed/keymap.json
@@ -68,7 +68,7 @@
       "alt-j": "editor::SelectAllMatches",
       // lsp
       "space m f": "editor::Format",
-      "space m /": "project_symbols::Toggle",
+      "space m s": "project_symbols::Toggle",
       "space m g": "editor::GoToDefinition",
       "space m d": "editor::Hover",
       "space m n": "editor::Rename",
@@ -78,7 +78,7 @@
       "space m E": "editor::GoToPrevDiagnostic",
       "space m v": "editor::ToggleCodeActions",
       "space m o": "outline::Toggle",
-      "space m s": "editor::ShowSignatureHelp",
+      "space m h": "editor::ShowSignatureHelp",
       // diagnostics
       "space e e": "diagnostics::Deploy",
       "space e w": "diagnostics::ToggleWarnings",
diff --git a/yolk.rhai b/yolk.rhai
index 3c638c9..538d953 100644
--- a/yolk.rhai
+++ b/yolk.rhai
@@ -1,43 +1,38 @@
-const themes = #{
-    gruv: "a",
-    nord: "b",
-};
-
 
 export const device = #{
     thinkix: SYSTEM.hostname == "thinkix",
     desktop: SYSTEM.hostname == "fedora.fritz.box",
     laptop: SYSTEM.hostname == "thinkix" || SYSTEM.hostname == "frissnix",
-    gruv: if LOCAL { themes.gruv } else { themes.nord }
 };
 
 
-export let 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: "~" };
+export let eggs = #{
+    "alacritty": #{ enabled: true, targets: "~" },
+    "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: "~" },
+    "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" },
 
-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: "~" };
+    "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: "~" },
+}