diff --git a/.config/nvim b/.config/nvim
index 4fbd8fc..603e7a2 160000
--- a/.config/nvim
+++ b/.config/nvim
@@ -1 +1 @@
-Subproject commit 4fbd8fce8334311bafef20664d1b9d5ca9a6ceb1
+Subproject commit 603e7a2b7abc1e34158e26bfa48da30ae2f9e1a1
diff --git a/.config/shell/bm-dirs b/.config/shell/bm-dirs
index 9b4ff1f..5ad217f 100644
--- a/.config/shell/bm-dirs
+++ b/.config/shell/bm-dirs
@@ -1,6 +1,8 @@
 cac ${XDG_CACHE_HOME:-$HOME/.cache}
 cf  ${XDG_CONFIG_HOME:-$HOME/.config}
 nv  ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/lua
+hy  ${XDG_CONFIG_HOME:-$HOME/.config}/hypr
+nx  ${XDG_CONFIG_HOME:-$HOME/.config}/nixos
 D   ${XDG_DOWNLOAD_DIR:-$HOME/Downloads}
 d   ${XDG_DOCUMENTS_DIR:-$HOME/Tower/Documents}
 dt  ${XDG_DATA_HOME:-$HOME/.local/share}
diff --git a/.config/shell/shortcutrc b/.config/shell/shortcutrc
index 4494172..10afb42 100644
--- a/.config/shell/shortcutrc
+++ b/.config/shell/shortcutrc
@@ -2,6 +2,8 @@
 alias cac="cd /home/chris/.cache && ls" \
 cf="cd /home/chris/.config && ls" \
 nv="cd /home/chris/.config/nvim/lua && ls" \
+hy="cd /home/chris/.config/hypr && ls" \
+nx="cd /home/chris/.config/nixos && ls" \
 D="cd /home/chris/Downloads && ls" \
 d="cd /home/chris/Tower/Documents && ls" \
 dt="cd /home/chris/.local/share && ls" \
diff --git a/.config/shell/zshnameddirrc b/.config/shell/zshnameddirrc
index f8686b2..d532a2a 100644
--- a/.config/shell/zshnameddirrc
+++ b/.config/shell/zshnameddirrc
@@ -1,6 +1,8 @@
 hash -d cac=/home/chris/.cache 
 hash -d cf=/home/chris/.config 
 hash -d nv=/home/chris/.config/nvim/lua 
+hash -d hy=/home/chris/.config/hypr 
+hash -d nx=/home/chris/.config/nixos 
 hash -d D=/home/chris/Downloads 
 hash -d d=/home/chris/Tower/Documents 
 hash -d dt=/home/chris/.local/share 
diff --git a/.config/yazi/yazi.toml b/.config/yazi/yazi.toml
index 7137bf8..36a77d3 100644
--- a/.config/yazi/yazi.toml
+++ b/.config/yazi/yazi.toml
@@ -2,11 +2,11 @@
 show_hidden = true
 
 [[plugin.prepend_fetchers]]
-id   = "git"
-name = "*"
-run  = "git"
+url   = "*"
+run   = "git"
+group = "git"
 
 [[plugin.prepend_fetchers]]
-id   = "git"
-name = "*/"
-run  = "git"
+url   = "*/"
+run   = "git"
+group = "git"
diff --git a/.local/bin/nixos-todo/shortcuts b/.local/bin/station-shortcuts
similarity index 56%
rename from .local/bin/nixos-todo/shortcuts
rename to .local/bin/station-shortcuts
index 5b1e7cc..4cc5f2b 100755
--- a/.local/bin/nixos-todo/shortcuts
+++ b/.local/bin/station-shortcuts
@@ -6,22 +6,19 @@ bmfiles="${XDG_CONFIG_HOME:-$HOME/.config}/shell/bm-files"
 # Output locations. Unactivated progs should go to /dev/null.
 shell_shortcuts="${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutrc"
 zsh_named_dirs="${XDG_CONFIG_HOME:-$HOME/.config}/shell/zshnameddirrc"
-lf_shortcuts="${XDG_CONFIG_HOME:-$HOME/.config}/lf/shortcutrc"
 
 # Remove, prepare files
-rm -f "$lf_shortcuts" "$zsh_named_dirs" 2>/dev/null
+rm -f "$zsh_named_dirs" 2>/dev/null
 printf "# vim: filetype=sh\\nalias " > "$shell_shortcuts"
 
 # Format the `directories` file in the correct syntax and sent it to all three configs.
 eval "echo \"$(cat "$bmdirs")\"" | \
 awk "!/^\s*#/ && !/^\s*\$/ {gsub(\"\\\s*#.*$\",\"\");
-    printf(\"%s=\42cd %s && ls\42 \\\\\n\",\$1,\$2)   >> \"$shell_shortcuts\" ;
-    printf(\"hash -d %s=%s \n\",\$1,\$2)                 >> \"$zsh_named_dirs\"  ;
-    printf(\"map C%s cd \42%s\42 \n\",\$1,\$2)           >> \"$lf_shortcuts\" }"
+    printf(\"%s=\42cd %s && ls\42 \\\\\n\",\$1,\$2) >> \"$shell_shortcuts\" ;
+    printf(\"hash -d %s=%s \n\",\$1,\$2) >> \"$zsh_named_dirs\"}"
 
 # Format the `files` file in the correct syntax and sent it to both configs.
 eval "echo \"$(cat "$bmfiles")\"" | \
 awk "!/^\s*#/ && !/^\s*\$/ {gsub(\"\\\s*#.*$\",\"\");
-    printf(\"%s=\42\$EDITOR %s\42 \\\\\n\",\$1,\$2)  >> \"$shell_shortcuts\" ;
-    printf(\"hash -d %s=%s \n\",\$1,\$2)             >> \"$zsh_named_dirs\"  ;
-    printf(\"map E%s \$\$EDITOR \42%s\42 \n\",\$1,\$2)   >> \"$lf_shortcuts\" }"
+    printf(\"%s=\42\$EDITOR %s\42 \\\\\n\",\$1,\$2) >> \"$shell_shortcuts\" ;
+    printf(\"hash -d %s=%s \n\",\$1,\$2) >> \"$zsh_named_dirs\"}"