diff --git a/config/bash/aliases b/config/bash/aliases
index 61654ee..b5b8acd 100644
--- a/config/bash/aliases
+++ b/config/bash/aliases
@@ -5,6 +5,8 @@ alias wtr="wt remove @"
 alias ll="eza -l -g --icons"
 alias ls="eza -al --color=always --group-directories-first"
 alias g="git"
-alias neogit="nvim +Neogit"
+alias ngit="nvim +Neogit"
 alias zdiff="nvim +Zdiff"
-alias review="nvim '+Zdiff origin/HEAD'"
+alias review="nvim +'Zdiff origin/HEAD'"
+alias wm="workmux"
+alias wmd="workmux dashboard"
diff --git a/config/bash/profile b/config/bash/profile
index cf02747..95fb793 100644
--- a/config/bash/profile
+++ b/config/bash/profile
@@ -11,30 +11,39 @@ append_path "$HOME/.local/bin"
 append_path "$HOME/.cargo/bin"
 
 export PATH
+if [ -x $(command -v bat) ]; then
+    export PAGER="bat"
+fi 
 
-if [ test -x $(command -v mise) ]; then 
+if [ -x $(command -v mise) ]; then 
     eval "$(mise activate bash)"
 fi
 
-if [ test -x $(command -v zoxide) ]; then 
+if [ -x $(command -v zoxide) ]; then 
     eval "$(zoxide init bash)"
 fi
 
-if [ test -x $(command -v fzf) ]; then 
+if [ -x $(command -v fzf) ]; then 
     eval "$(fzf --bash)"
 fi
 
-if [ -z "$SSH_CONNECTION" ]; then
-      export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
-fi 
+if [ -x $(command -v wt) ]; then 
+    eval "$(command wt config shell init bash)"; 
+fi
 
-# Create a predictable symlink pointing to the current SSH auth socket
-auth_sock="$HOME/.ssh/ssh_auth_sock"
-if [ -n "$SSH_AUTH_SOCK" ] && [ "$SSH_AUTH_SOCK" != "$auth_sock" ]; then
-    mkdir -p "$HOME/.ssh"
-    ln -sf "$SSH_AUTH_SOCK" "$auth_sock"
+if [ -n "$SSH_CONNECTION" ]; then
+    # Create a predictable symlink pointing to the current SSH auth socket
+    auth_sock="$HOME/.ssh/ssh_auth_sock"
+    if [ -n "$SSH_AUTH_SOCK" ] && [ "$SSH_AUTH_SOCK" != "$auth_sock" ]; then
+        mkdir -p "$HOME/.ssh" && ln -snf "$SSH_AUTH_SOCK" "$auth_sock"
+    fi
+else
+    export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
 fi
 
 for _f in "$HOME"/.config/herdr/plugins/github/herdr-automatic-rename-*/shell/hook.bash; do
   [ -r "$_f" ] && { source "$_f"; break; }
 done
+
+[[ -f ~/.bash_aliases ]] && . ~/.bash_aliases
+
diff --git a/config/mise/config.toml b/config/mise/config.toml
index 90bfa21..cf2a0df 100644
--- a/config/mise/config.toml
+++ b/config/mise/config.toml
@@ -50,6 +50,14 @@ run = [
     'test -x /usr/bin/pass && /usr/bin/pass show config/pi/auth.json > ~/.pi/agent/auth.json'
 ]
 
+[tasks.setup_fish]
+run = '''
+    if [ -x /usr/bin/fish ]; then 
+        chsh -s /usr/bin/fish
+        fish -c "fisher install franciscolourenco/done"
+    fi
+'''
+
 [tasks.setup_nvim]
 run = [
     'uv tool install vectorcode'
diff --git a/applications/RampClient.desktop b/desktop/applications/RampClient.desktop
similarity index 100%
rename from applications/RampClient.desktop
rename to desktop/applications/RampClient.desktop
diff --git a/applications/alcazar-herdr.desktop b/desktop/applications/alcazar-herdr.desktop
similarity index 100%
rename from applications/alcazar-herdr.desktop
rename to desktop/applications/alcazar-herdr.desktop
diff --git a/applications/alcazar-tmux.desktop b/desktop/applications/alcazar-tmux.desktop
similarity index 100%
rename from applications/alcazar-tmux.desktop
rename to desktop/applications/alcazar-tmux.desktop
diff --git a/applications/bianca-herdr.desktop b/desktop/applications/bianca-herdr.desktop
similarity index 100%
rename from applications/bianca-herdr.desktop
rename to desktop/applications/bianca-herdr.desktop
diff --git a/applications/bianca-tmux.desktop b/desktop/applications/bianca-tmux.desktop
similarity index 100%
rename from applications/bianca-tmux.desktop
rename to desktop/applications/bianca-tmux.desktop
diff --git a/applications/caraco-herdr.desktop b/desktop/applications/caraco-herdr.desktop
similarity index 100%
rename from applications/caraco-herdr.desktop
rename to desktop/applications/caraco-herdr.desktop
diff --git a/applications/caraco-tmux.desktop b/desktop/applications/caraco-tmux.desktop
similarity index 100%
rename from applications/caraco-tmux.desktop
rename to desktop/applications/caraco-tmux.desktop
diff --git a/applications/dupont-herdr.desktop b/desktop/applications/dupont-herdr.desktop
similarity index 100%
rename from applications/dupont-herdr.desktop
rename to desktop/applications/dupont-herdr.desktop
diff --git a/applications/dupont-tmux.desktop b/desktop/applications/dupont-tmux.desktop
similarity index 100%
rename from applications/dupont-tmux.desktop
rename to desktop/applications/dupont-tmux.desktop
diff --git a/applications/emacsclient.desktop b/desktop/applications/emacsclient.desktop
similarity index 100%
rename from applications/emacsclient.desktop
rename to desktop/applications/emacsclient.desktop
diff --git a/applications/herdr.desktop b/desktop/applications/herdr.desktop
similarity index 100%
rename from applications/herdr.desktop
rename to desktop/applications/herdr.desktop
diff --git a/applications/io.github.lgse.Strata.desktop b/desktop/applications/io.github.lgse.Strata.desktop
similarity index 100%
rename from applications/io.github.lgse.Strata.desktop
rename to desktop/applications/io.github.lgse.Strata.desktop
diff --git a/applications/nca-ai-01-herdr.desktop b/desktop/applications/nca-ai-01-herdr.desktop
similarity index 100%
rename from applications/nca-ai-01-herdr.desktop
rename to desktop/applications/nca-ai-01-herdr.desktop
diff --git a/applications/nca-ai-01-tmux.desktop b/desktop/applications/nca-ai-01-tmux.desktop
similarity index 100%
rename from applications/nca-ai-01-tmux.desktop
rename to desktop/applications/nca-ai-01-tmux.desktop
diff --git a/applications/obelix-herdr.desktop b/desktop/applications/obelix-herdr.desktop
similarity index 100%
rename from applications/obelix-herdr.desktop
rename to desktop/applications/obelix-herdr.desktop
diff --git a/applications/obelix-tmux.desktop b/desktop/applications/obelix-tmux.desktop
similarity index 100%
rename from applications/obelix-tmux.desktop
rename to desktop/applications/obelix-tmux.desktop
diff --git a/applications/pi.desktop b/desktop/applications/pi.desktop
similarity index 100%
rename from applications/pi.desktop
rename to desktop/applications/pi.desktop
diff --git a/applications/rascar-herdr.desktop b/desktop/applications/rascar-herdr.desktop
similarity index 100%
rename from applications/rascar-herdr.desktop
rename to desktop/applications/rascar-herdr.desktop
diff --git a/applications/rascar-tmux.desktop b/desktop/applications/rascar-tmux.desktop
similarity index 100%
rename from applications/rascar-tmux.desktop
rename to desktop/applications/rascar-tmux.desktop
diff --git a/applications/steve-dev-herdr.desktop b/desktop/applications/steve-dev-herdr.desktop
similarity index 100%
rename from applications/steve-dev-herdr.desktop
rename to desktop/applications/steve-dev-herdr.desktop
diff --git a/applications/steve-dev-tmux.desktop b/desktop/applications/steve-dev-tmux.desktop
similarity index 100%
rename from applications/steve-dev-tmux.desktop
rename to desktop/applications/steve-dev-tmux.desktop
diff --git a/applications/terminal.desktop b/desktop/applications/terminal.desktop
similarity index 100%
rename from applications/terminal.desktop
rename to desktop/applications/terminal.desktop
diff --git a/applications/tmux.desktop b/desktop/applications/tmux.desktop
similarity index 100%
rename from applications/tmux.desktop
rename to desktop/applications/tmux.desktop
diff --git a/bin/strata b/desktop/bin/strata
similarity index 100%
rename from bin/strata
rename to desktop/bin/strata
diff --git a/bin/wallpaper-fetcher b/desktop/bin/wallpaper-fetcher
similarity index 100%
rename from bin/wallpaper-fetcher
rename to desktop/bin/wallpaper-fetcher
diff --git a/config/chromium-flags.conf b/desktop/config/chromium-flags.conf
similarity index 100%
rename from config/chromium-flags.conf
rename to desktop/config/chromium-flags.conf
diff --git a/config/fontconfig/10-monaspace-neon.conf b/desktop/config/fontconfig/10-monaspace-neon.conf
similarity index 100%
rename from config/fontconfig/10-monaspace-neon.conf
rename to desktop/config/fontconfig/10-monaspace-neon.conf
diff --git a/config/fontconfig/10-monaspace-radon.conf b/desktop/config/fontconfig/10-monaspace-radon.conf
similarity index 100%
rename from config/fontconfig/10-monaspace-radon.conf
rename to desktop/config/fontconfig/10-monaspace-radon.conf
diff --git a/config/fontconfig/10-monaspace-xenon.conf b/desktop/config/fontconfig/10-monaspace-xenon.conf
similarity index 100%
rename from config/fontconfig/10-monaspace-xenon.conf
rename to desktop/config/fontconfig/10-monaspace-xenon.conf
diff --git a/config/fontconfig/10-monaspicene-nf.conf b/desktop/config/fontconfig/10-monaspicene-nf.conf
similarity index 100%
rename from config/fontconfig/10-monaspicene-nf.conf
rename to desktop/config/fontconfig/10-monaspicene-nf.conf
diff --git a/config/fontconfig/10-monaspicern-nf.conf b/desktop/config/fontconfig/10-monaspicern-nf.conf
similarity index 100%
rename from config/fontconfig/10-monaspicern-nf.conf
rename to desktop/config/fontconfig/10-monaspicern-nf.conf
diff --git a/config/fontconfig/10-monaspicexe-nf.conf b/desktop/config/fontconfig/10-monaspicexe-nf.conf
similarity index 100%
rename from config/fontconfig/10-monaspicexe-nf.conf
rename to desktop/config/fontconfig/10-monaspicexe-nf.conf
diff --git a/config/foot/foot.ini b/desktop/config/foot/foot.ini
similarity index 100%
rename from config/foot/foot.ini
rename to desktop/config/foot/foot.ini
diff --git a/config/ghostty/config b/desktop/config/ghostty/config
similarity index 100%
rename from config/ghostty/config
rename to desktop/config/ghostty/config
diff --git a/config/hypr/.luarc.json b/desktop/config/hypr/.luarc.json
similarity index 100%
rename from config/hypr/.luarc.json
rename to desktop/config/hypr/.luarc.json
diff --git a/config/hypr/hypridle.conf b/desktop/config/hypr/hypridle.conf
similarity index 100%
rename from config/hypr/hypridle.conf
rename to desktop/config/hypr/hypridle.conf
diff --git a/config/hypr/hyprlock.conf b/desktop/config/hypr/hyprlock.conf
similarity index 100%
rename from config/hypr/hyprlock.conf
rename to desktop/config/hypr/hyprlock.conf
diff --git a/config/hypr/hyprpm.conf b/desktop/config/hypr/hyprpm.conf
similarity index 100%
rename from config/hypr/hyprpm.conf
rename to desktop/config/hypr/hyprpm.conf
diff --git a/config/hypr/sjb/autostart.lua b/desktop/config/hypr/sjb/autostart.lua
similarity index 100%
rename from config/hypr/sjb/autostart.lua
rename to desktop/config/hypr/sjb/autostart.lua
diff --git a/config/hypr/sjb/envs.lua b/desktop/config/hypr/sjb/envs.lua
similarity index 100%
rename from config/hypr/sjb/envs.lua
rename to desktop/config/hypr/sjb/envs.lua
diff --git a/config/hypr/sjb/functions.lua b/desktop/config/hypr/sjb/functions.lua
similarity index 100%
rename from config/hypr/sjb/functions.lua
rename to desktop/config/hypr/sjb/functions.lua
diff --git a/config/hypr/sjb/init.lua b/desktop/config/hypr/sjb/init.lua
similarity index 100%
rename from config/hypr/sjb/init.lua
rename to desktop/config/hypr/sjb/init.lua
diff --git a/config/hypr/sjb/monitors.lua b/desktop/config/hypr/sjb/monitors.lua
similarity index 100%
rename from config/hypr/sjb/monitors.lua
rename to desktop/config/hypr/sjb/monitors.lua
diff --git a/config/hypr/sjb/rules.lua b/desktop/config/hypr/sjb/rules.lua
similarity index 100%
rename from config/hypr/sjb/rules.lua
rename to desktop/config/hypr/sjb/rules.lua
diff --git a/config/kitty/kitty.conf b/desktop/config/kitty/kitty.conf
similarity index 100%
rename from config/kitty/kitty.conf
rename to desktop/config/kitty/kitty.conf
diff --git a/config/mako/config b/desktop/config/mako/config
similarity index 100%
rename from config/mako/config
rename to desktop/config/mako/config
diff --git a/config/ostt/ostt.toml b/desktop/config/ostt/ostt.toml
similarity index 100%
rename from config/ostt/ostt.toml
rename to desktop/config/ostt/ostt.toml
diff --git a/config/rio/config.toml b/desktop/config/rio/config.toml
similarity index 100%
rename from config/rio/config.toml
rename to desktop/config/rio/config.toml
diff --git a/config/rofi/config.rasi b/desktop/config/rofi/config.rasi
similarity index 100%
rename from config/rofi/config.rasi
rename to desktop/config/rofi/config.rasi
diff --git a/config/strata/settings.toml b/desktop/config/strata/settings.toml
similarity index 100%
rename from config/strata/settings.toml
rename to desktop/config/strata/settings.toml
diff --git a/config/uwsm/env b/desktop/config/uwsm/env
similarity index 100%
rename from config/uwsm/env
rename to desktop/config/uwsm/env
diff --git a/fonts/OTF/0xProto-Regular.otf b/desktop/fonts/OTF/0xProto-Regular.otf
similarity index 100%
rename from fonts/OTF/0xProto-Regular.otf
rename to desktop/fonts/OTF/0xProto-Regular.otf
diff --git a/fonts/OTF/Fura Code/Fura Code Bold Nerd Font Complete Mono.otf b/desktop/fonts/OTF/Fura Code/Fura Code Bold Nerd Font Complete Mono.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Code Bold Nerd Font Complete Mono.otf
rename to desktop/fonts/OTF/Fura Code/Fura Code Bold Nerd Font Complete Mono.otf
diff --git a/fonts/OTF/Fura Code/Fura Code Bold Nerd Font Complete Mono.sync-conflict-20221019-083559-BBS3QSY.otf b/desktop/fonts/OTF/Fura Code/Fura Code Bold Nerd Font Complete Mono.sync-conflict-20221019-083559-BBS3QSY.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Code Bold Nerd Font Complete Mono.sync-conflict-20221019-083559-BBS3QSY.otf
rename to desktop/fonts/OTF/Fura Code/Fura Code Bold Nerd Font Complete Mono.sync-conflict-20221019-083559-BBS3QSY.otf
diff --git a/fonts/OTF/Fura Code/Fura Code Bold Nerd Font Complete.otf b/desktop/fonts/OTF/Fura Code/Fura Code Bold Nerd Font Complete.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Code Bold Nerd Font Complete.otf
rename to desktop/fonts/OTF/Fura Code/Fura Code Bold Nerd Font Complete.otf
diff --git a/fonts/OTF/Fura Code/Fura Code Bold Nerd Font Complete.sync-conflict-20221019-083255-BBS3QSY.otf b/desktop/fonts/OTF/Fura Code/Fura Code Bold Nerd Font Complete.sync-conflict-20221019-083255-BBS3QSY.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Code Bold Nerd Font Complete.sync-conflict-20221019-083255-BBS3QSY.otf
rename to desktop/fonts/OTF/Fura Code/Fura Code Bold Nerd Font Complete.sync-conflict-20221019-083255-BBS3QSY.otf
diff --git a/fonts/OTF/Fura Code/Fura Code Light Nerd Font Complete Mono.otf b/desktop/fonts/OTF/Fura Code/Fura Code Light Nerd Font Complete Mono.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Code Light Nerd Font Complete Mono.otf
rename to desktop/fonts/OTF/Fura Code/Fura Code Light Nerd Font Complete Mono.otf
diff --git a/fonts/OTF/Fura Code/Fura Code Light Nerd Font Complete.otf b/desktop/fonts/OTF/Fura Code/Fura Code Light Nerd Font Complete.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Code Light Nerd Font Complete.otf
rename to desktop/fonts/OTF/Fura Code/Fura Code Light Nerd Font Complete.otf
diff --git a/fonts/OTF/Fura Code/Fura Code Light Nerd Font Complete.sync-conflict-20221019-083408-BBS3QSY.otf b/desktop/fonts/OTF/Fura Code/Fura Code Light Nerd Font Complete.sync-conflict-20221019-083408-BBS3QSY.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Code Light Nerd Font Complete.sync-conflict-20221019-083408-BBS3QSY.otf
rename to desktop/fonts/OTF/Fura Code/Fura Code Light Nerd Font Complete.sync-conflict-20221019-083408-BBS3QSY.otf
diff --git a/fonts/OTF/Fura Code/Fura Code Medium Nerd Font Complete Mono.otf b/desktop/fonts/OTF/Fura Code/Fura Code Medium Nerd Font Complete Mono.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Code Medium Nerd Font Complete Mono.otf
rename to desktop/fonts/OTF/Fura Code/Fura Code Medium Nerd Font Complete Mono.otf
diff --git a/fonts/OTF/Fura Code/Fura Code Medium Nerd Font Complete Mono.sync-conflict-20221019-083408-BBS3QSY.otf b/desktop/fonts/OTF/Fura Code/Fura Code Medium Nerd Font Complete Mono.sync-conflict-20221019-083408-BBS3QSY.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Code Medium Nerd Font Complete Mono.sync-conflict-20221019-083408-BBS3QSY.otf
rename to desktop/fonts/OTF/Fura Code/Fura Code Medium Nerd Font Complete Mono.sync-conflict-20221019-083408-BBS3QSY.otf
diff --git a/fonts/OTF/Fura Code/Fura Code Medium Nerd Font Complete.otf b/desktop/fonts/OTF/Fura Code/Fura Code Medium Nerd Font Complete.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Code Medium Nerd Font Complete.otf
rename to desktop/fonts/OTF/Fura Code/Fura Code Medium Nerd Font Complete.otf
diff --git a/fonts/OTF/Fura Code/Fura Code Medium Nerd Font Complete.sync-conflict-20221019-083407-BBS3QSY.otf b/desktop/fonts/OTF/Fura Code/Fura Code Medium Nerd Font Complete.sync-conflict-20221019-083407-BBS3QSY.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Code Medium Nerd Font Complete.sync-conflict-20221019-083407-BBS3QSY.otf
rename to desktop/fonts/OTF/Fura Code/Fura Code Medium Nerd Font Complete.sync-conflict-20221019-083407-BBS3QSY.otf
diff --git a/fonts/OTF/Fura Code/Fura Code Regular Nerd Font Complete Mono.otf b/desktop/fonts/OTF/Fura Code/Fura Code Regular Nerd Font Complete Mono.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Code Regular Nerd Font Complete Mono.otf
rename to desktop/fonts/OTF/Fura Code/Fura Code Regular Nerd Font Complete Mono.otf
diff --git a/fonts/OTF/Fura Code/Fura Code Regular Nerd Font Complete Mono.sync-conflict-20221019-083606-BBS3QSY.otf b/desktop/fonts/OTF/Fura Code/Fura Code Regular Nerd Font Complete Mono.sync-conflict-20221019-083606-BBS3QSY.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Code Regular Nerd Font Complete Mono.sync-conflict-20221019-083606-BBS3QSY.otf
rename to desktop/fonts/OTF/Fura Code/Fura Code Regular Nerd Font Complete Mono.sync-conflict-20221019-083606-BBS3QSY.otf
diff --git a/fonts/OTF/Fura Code/Fura Code Regular Nerd Font Complete.otf b/desktop/fonts/OTF/Fura Code/Fura Code Regular Nerd Font Complete.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Code Regular Nerd Font Complete.otf
rename to desktop/fonts/OTF/Fura Code/Fura Code Regular Nerd Font Complete.otf
diff --git a/fonts/OTF/Fura Code/Fura Code Regular Nerd Font Complete.sync-conflict-20221019-083635-BBS3QSY.otf b/desktop/fonts/OTF/Fura Code/Fura Code Regular Nerd Font Complete.sync-conflict-20221019-083635-BBS3QSY.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Code Regular Nerd Font Complete.sync-conflict-20221019-083635-BBS3QSY.otf
rename to desktop/fonts/OTF/Fura Code/Fura Code Regular Nerd Font Complete.sync-conflict-20221019-083635-BBS3QSY.otf
diff --git a/fonts/OTF/Fura Code/Fura Code Retina Nerd Font Complete Mono.otf b/desktop/fonts/OTF/Fura Code/Fura Code Retina Nerd Font Complete Mono.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Code Retina Nerd Font Complete Mono.otf
rename to desktop/fonts/OTF/Fura Code/Fura Code Retina Nerd Font Complete Mono.otf
diff --git a/fonts/OTF/Fura Code/Fura Code Retina Nerd Font Complete Mono.sync-conflict-20221019-083620-BBS3QSY.otf b/desktop/fonts/OTF/Fura Code/Fura Code Retina Nerd Font Complete Mono.sync-conflict-20221019-083620-BBS3QSY.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Code Retina Nerd Font Complete Mono.sync-conflict-20221019-083620-BBS3QSY.otf
rename to desktop/fonts/OTF/Fura Code/Fura Code Retina Nerd Font Complete Mono.sync-conflict-20221019-083620-BBS3QSY.otf
diff --git a/fonts/OTF/Fura Code/Fura Code Retina Nerd Font Complete.otf b/desktop/fonts/OTF/Fura Code/Fura Code Retina Nerd Font Complete.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Code Retina Nerd Font Complete.otf
rename to desktop/fonts/OTF/Fura Code/Fura Code Retina Nerd Font Complete.otf
diff --git a/fonts/OTF/Fura Code/Fura Code Retina Nerd Font Complete.sync-conflict-20221019-083405-BBS3QSY.otf b/desktop/fonts/OTF/Fura Code/Fura Code Retina Nerd Font Complete.sync-conflict-20221019-083405-BBS3QSY.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Code Retina Nerd Font Complete.sync-conflict-20221019-083405-BBS3QSY.otf
rename to desktop/fonts/OTF/Fura Code/Fura Code Retina Nerd Font Complete.sync-conflict-20221019-083405-BBS3QSY.otf
diff --git a/fonts/OTF/Fura Code/Fura Mono Bold Nerd Font Complete Mono.otf b/desktop/fonts/OTF/Fura Code/Fura Mono Bold Nerd Font Complete Mono.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Mono Bold Nerd Font Complete Mono.otf
rename to desktop/fonts/OTF/Fura Code/Fura Mono Bold Nerd Font Complete Mono.otf
diff --git a/fonts/OTF/Fura Code/Fura Mono Bold Nerd Font Complete Mono.sync-conflict-20221019-083427-BBS3QSY.otf b/desktop/fonts/OTF/Fura Code/Fura Mono Bold Nerd Font Complete Mono.sync-conflict-20221019-083427-BBS3QSY.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Mono Bold Nerd Font Complete Mono.sync-conflict-20221019-083427-BBS3QSY.otf
rename to desktop/fonts/OTF/Fura Code/Fura Mono Bold Nerd Font Complete Mono.sync-conflict-20221019-083427-BBS3QSY.otf
diff --git a/fonts/OTF/Fura Code/Fura Mono Bold Nerd Font Complete.otf b/desktop/fonts/OTF/Fura Code/Fura Mono Bold Nerd Font Complete.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Mono Bold Nerd Font Complete.otf
rename to desktop/fonts/OTF/Fura Code/Fura Mono Bold Nerd Font Complete.otf
diff --git a/fonts/OTF/Fura Code/Fura Mono Medium Nerd Font Complete Mono.otf b/desktop/fonts/OTF/Fura Code/Fura Mono Medium Nerd Font Complete Mono.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Mono Medium Nerd Font Complete Mono.otf
rename to desktop/fonts/OTF/Fura Code/Fura Mono Medium Nerd Font Complete Mono.otf
diff --git a/fonts/OTF/Fura Code/Fura Mono Medium Nerd Font Complete Mono.sync-conflict-20221019-083617-BBS3QSY.otf b/desktop/fonts/OTF/Fura Code/Fura Mono Medium Nerd Font Complete Mono.sync-conflict-20221019-083617-BBS3QSY.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Mono Medium Nerd Font Complete Mono.sync-conflict-20221019-083617-BBS3QSY.otf
rename to desktop/fonts/OTF/Fura Code/Fura Mono Medium Nerd Font Complete Mono.sync-conflict-20221019-083617-BBS3QSY.otf
diff --git a/fonts/OTF/Fura Code/Fura Mono Medium Nerd Font Complete.otf b/desktop/fonts/OTF/Fura Code/Fura Mono Medium Nerd Font Complete.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Mono Medium Nerd Font Complete.otf
rename to desktop/fonts/OTF/Fura Code/Fura Mono Medium Nerd Font Complete.otf
diff --git a/fonts/OTF/Fura Code/Fura Mono Medium Nerd Font Complete.sync-conflict-20221019-083430-BBS3QSY.otf b/desktop/fonts/OTF/Fura Code/Fura Mono Medium Nerd Font Complete.sync-conflict-20221019-083430-BBS3QSY.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Mono Medium Nerd Font Complete.sync-conflict-20221019-083430-BBS3QSY.otf
rename to desktop/fonts/OTF/Fura Code/Fura Mono Medium Nerd Font Complete.sync-conflict-20221019-083430-BBS3QSY.otf
diff --git a/fonts/OTF/Fura Code/Fura Mono Regular Nerd Font Complete Mono.otf b/desktop/fonts/OTF/Fura Code/Fura Mono Regular Nerd Font Complete Mono.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Mono Regular Nerd Font Complete Mono.otf
rename to desktop/fonts/OTF/Fura Code/Fura Mono Regular Nerd Font Complete Mono.otf
diff --git a/fonts/OTF/Fura Code/Fura Mono Regular Nerd Font Complete Mono.sync-conflict-20221019-083332-BBS3QSY.otf b/desktop/fonts/OTF/Fura Code/Fura Mono Regular Nerd Font Complete Mono.sync-conflict-20221019-083332-BBS3QSY.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Mono Regular Nerd Font Complete Mono.sync-conflict-20221019-083332-BBS3QSY.otf
rename to desktop/fonts/OTF/Fura Code/Fura Mono Regular Nerd Font Complete Mono.sync-conflict-20221019-083332-BBS3QSY.otf
diff --git a/fonts/OTF/Fura Code/Fura Mono Regular Nerd Font Complete.otf b/desktop/fonts/OTF/Fura Code/Fura Mono Regular Nerd Font Complete.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Mono Regular Nerd Font Complete.otf
rename to desktop/fonts/OTF/Fura Code/Fura Mono Regular Nerd Font Complete.otf
diff --git a/fonts/OTF/Fura Code/Fura Mono Regular Nerd Font Complete.sync-conflict-20221019-083425-BBS3QSY.otf b/desktop/fonts/OTF/Fura Code/Fura Mono Regular Nerd Font Complete.sync-conflict-20221019-083425-BBS3QSY.otf
similarity index 100%
rename from fonts/OTF/Fura Code/Fura Mono Regular Nerd Font Complete.sync-conflict-20221019-083425-BBS3QSY.otf
rename to desktop/fonts/OTF/Fura Code/Fura Mono Regular Nerd Font Complete.sync-conflict-20221019-083425-BBS3QSY.otf
diff --git a/fonts/OTF/TX-02/TX-02-Bold-Condensed-Oblique.otf b/desktop/fonts/OTF/TX-02/TX-02-Bold-Condensed-Oblique.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-Bold-Condensed-Oblique.otf
rename to desktop/fonts/OTF/TX-02/TX-02-Bold-Condensed-Oblique.otf
diff --git a/fonts/OTF/TX-02/TX-02-Bold-Condensed.otf b/desktop/fonts/OTF/TX-02/TX-02-Bold-Condensed.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-Bold-Condensed.otf
rename to desktop/fonts/OTF/TX-02/TX-02-Bold-Condensed.otf
diff --git a/fonts/OTF/TX-02/TX-02-Bold-Oblique.otf b/desktop/fonts/OTF/TX-02/TX-02-Bold-Oblique.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-Bold-Oblique.otf
rename to desktop/fonts/OTF/TX-02/TX-02-Bold-Oblique.otf
diff --git a/fonts/OTF/TX-02/TX-02-Bold-SemiCondensed-Oblique.otf b/desktop/fonts/OTF/TX-02/TX-02-Bold-SemiCondensed-Oblique.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-Bold-SemiCondensed-Oblique.otf
rename to desktop/fonts/OTF/TX-02/TX-02-Bold-SemiCondensed-Oblique.otf
diff --git a/fonts/OTF/TX-02/TX-02-Bold-SemiCondensed.otf b/desktop/fonts/OTF/TX-02/TX-02-Bold-SemiCondensed.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-Bold-SemiCondensed.otf
rename to desktop/fonts/OTF/TX-02/TX-02-Bold-SemiCondensed.otf
diff --git a/fonts/OTF/TX-02/TX-02-Bold.otf b/desktop/fonts/OTF/TX-02/TX-02-Bold.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-Bold.otf
rename to desktop/fonts/OTF/TX-02/TX-02-Bold.otf
diff --git a/fonts/OTF/TX-02/TX-02-Condensed-Oblique.otf b/desktop/fonts/OTF/TX-02/TX-02-Condensed-Oblique.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-Condensed-Oblique.otf
rename to desktop/fonts/OTF/TX-02/TX-02-Condensed-Oblique.otf
diff --git a/fonts/OTF/TX-02/TX-02-Condensed.otf b/desktop/fonts/OTF/TX-02/TX-02-Condensed.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-Condensed.otf
rename to desktop/fonts/OTF/TX-02/TX-02-Condensed.otf
diff --git a/fonts/OTF/TX-02/TX-02-ExtraBold-Condensed-Oblique.otf b/desktop/fonts/OTF/TX-02/TX-02-ExtraBold-Condensed-Oblique.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-ExtraBold-Condensed-Oblique.otf
rename to desktop/fonts/OTF/TX-02/TX-02-ExtraBold-Condensed-Oblique.otf
diff --git a/fonts/OTF/TX-02/TX-02-ExtraBold-Condensed.otf b/desktop/fonts/OTF/TX-02/TX-02-ExtraBold-Condensed.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-ExtraBold-Condensed.otf
rename to desktop/fonts/OTF/TX-02/TX-02-ExtraBold-Condensed.otf
diff --git a/fonts/OTF/TX-02/TX-02-ExtraBold-Oblique.otf b/desktop/fonts/OTF/TX-02/TX-02-ExtraBold-Oblique.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-ExtraBold-Oblique.otf
rename to desktop/fonts/OTF/TX-02/TX-02-ExtraBold-Oblique.otf
diff --git a/fonts/OTF/TX-02/TX-02-ExtraBold-SemiCondensed-Oblique.otf b/desktop/fonts/OTF/TX-02/TX-02-ExtraBold-SemiCondensed-Oblique.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-ExtraBold-SemiCondensed-Oblique.otf
rename to desktop/fonts/OTF/TX-02/TX-02-ExtraBold-SemiCondensed-Oblique.otf
diff --git a/fonts/OTF/TX-02/TX-02-ExtraBold-SemiCondensed.otf b/desktop/fonts/OTF/TX-02/TX-02-ExtraBold-SemiCondensed.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-ExtraBold-SemiCondensed.otf
rename to desktop/fonts/OTF/TX-02/TX-02-ExtraBold-SemiCondensed.otf
diff --git a/fonts/OTF/TX-02/TX-02-ExtraBold.otf b/desktop/fonts/OTF/TX-02/TX-02-ExtraBold.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-ExtraBold.otf
rename to desktop/fonts/OTF/TX-02/TX-02-ExtraBold.otf
diff --git a/fonts/OTF/TX-02/TX-02-Medium-Condensed-Oblique.otf b/desktop/fonts/OTF/TX-02/TX-02-Medium-Condensed-Oblique.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-Medium-Condensed-Oblique.otf
rename to desktop/fonts/OTF/TX-02/TX-02-Medium-Condensed-Oblique.otf
diff --git a/fonts/OTF/TX-02/TX-02-Medium-Condensed.otf b/desktop/fonts/OTF/TX-02/TX-02-Medium-Condensed.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-Medium-Condensed.otf
rename to desktop/fonts/OTF/TX-02/TX-02-Medium-Condensed.otf
diff --git a/fonts/OTF/TX-02/TX-02-Medium-Oblique.otf b/desktop/fonts/OTF/TX-02/TX-02-Medium-Oblique.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-Medium-Oblique.otf
rename to desktop/fonts/OTF/TX-02/TX-02-Medium-Oblique.otf
diff --git a/fonts/OTF/TX-02/TX-02-Medium-SemiCondensed-Oblique.otf b/desktop/fonts/OTF/TX-02/TX-02-Medium-SemiCondensed-Oblique.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-Medium-SemiCondensed-Oblique.otf
rename to desktop/fonts/OTF/TX-02/TX-02-Medium-SemiCondensed-Oblique.otf
diff --git a/fonts/OTF/TX-02/TX-02-Medium-SemiCondensed.otf b/desktop/fonts/OTF/TX-02/TX-02-Medium-SemiCondensed.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-Medium-SemiCondensed.otf
rename to desktop/fonts/OTF/TX-02/TX-02-Medium-SemiCondensed.otf
diff --git a/fonts/OTF/TX-02/TX-02-Medium.otf b/desktop/fonts/OTF/TX-02/TX-02-Medium.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-Medium.otf
rename to desktop/fonts/OTF/TX-02/TX-02-Medium.otf
diff --git a/fonts/OTF/TX-02/TX-02-Oblique.otf b/desktop/fonts/OTF/TX-02/TX-02-Oblique.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-Oblique.otf
rename to desktop/fonts/OTF/TX-02/TX-02-Oblique.otf
diff --git a/fonts/OTF/TX-02/TX-02-Regular.otf b/desktop/fonts/OTF/TX-02/TX-02-Regular.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-Regular.otf
rename to desktop/fonts/OTF/TX-02/TX-02-Regular.otf
diff --git a/fonts/OTF/TX-02/TX-02-Retina-Condensed-Oblique.otf b/desktop/fonts/OTF/TX-02/TX-02-Retina-Condensed-Oblique.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-Retina-Condensed-Oblique.otf
rename to desktop/fonts/OTF/TX-02/TX-02-Retina-Condensed-Oblique.otf
diff --git a/fonts/OTF/TX-02/TX-02-Retina-Condensed.otf b/desktop/fonts/OTF/TX-02/TX-02-Retina-Condensed.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-Retina-Condensed.otf
rename to desktop/fonts/OTF/TX-02/TX-02-Retina-Condensed.otf
diff --git a/fonts/OTF/TX-02/TX-02-Retina-Oblique.otf b/desktop/fonts/OTF/TX-02/TX-02-Retina-Oblique.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-Retina-Oblique.otf
rename to desktop/fonts/OTF/TX-02/TX-02-Retina-Oblique.otf
diff --git a/fonts/OTF/TX-02/TX-02-Retina-SemiCondensed-Oblique.otf b/desktop/fonts/OTF/TX-02/TX-02-Retina-SemiCondensed-Oblique.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-Retina-SemiCondensed-Oblique.otf
rename to desktop/fonts/OTF/TX-02/TX-02-Retina-SemiCondensed-Oblique.otf
diff --git a/fonts/OTF/TX-02/TX-02-Retina-SemiCondensed.otf b/desktop/fonts/OTF/TX-02/TX-02-Retina-SemiCondensed.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-Retina-SemiCondensed.otf
rename to desktop/fonts/OTF/TX-02/TX-02-Retina-SemiCondensed.otf
diff --git a/fonts/OTF/TX-02/TX-02-Retina.otf b/desktop/fonts/OTF/TX-02/TX-02-Retina.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-Retina.otf
rename to desktop/fonts/OTF/TX-02/TX-02-Retina.otf
diff --git a/fonts/OTF/TX-02/TX-02-SemiCondensed-Oblique.otf b/desktop/fonts/OTF/TX-02/TX-02-SemiCondensed-Oblique.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-SemiCondensed-Oblique.otf
rename to desktop/fonts/OTF/TX-02/TX-02-SemiCondensed-Oblique.otf
diff --git a/fonts/OTF/TX-02/TX-02-SemiCondensed.otf b/desktop/fonts/OTF/TX-02/TX-02-SemiCondensed.otf
similarity index 100%
rename from fonts/OTF/TX-02/TX-02-SemiCondensed.otf
rename to desktop/fonts/OTF/TX-02/TX-02-SemiCondensed.otf
diff --git a/fonts/TTF/Hack/Hack Bold Italic Nerd Font Complete Mono.sync-conflict-20221019-083418-BBS3QSY.ttf b/desktop/fonts/TTF/Hack/Hack Bold Italic Nerd Font Complete Mono.sync-conflict-20221019-083418-BBS3QSY.ttf
similarity index 100%
rename from fonts/TTF/Hack/Hack Bold Italic Nerd Font Complete Mono.sync-conflict-20221019-083418-BBS3QSY.ttf
rename to desktop/fonts/TTF/Hack/Hack Bold Italic Nerd Font Complete Mono.sync-conflict-20221019-083418-BBS3QSY.ttf
diff --git a/fonts/TTF/Hack/Hack Bold Italic Nerd Font Complete Mono.ttf b/desktop/fonts/TTF/Hack/Hack Bold Italic Nerd Font Complete Mono.ttf
similarity index 100%
rename from fonts/TTF/Hack/Hack Bold Italic Nerd Font Complete Mono.ttf
rename to desktop/fonts/TTF/Hack/Hack Bold Italic Nerd Font Complete Mono.ttf
diff --git a/fonts/TTF/Hack/Hack Bold Italic Nerd Font Complete.sync-conflict-20221019-083435-BBS3QSY.ttf b/desktop/fonts/TTF/Hack/Hack Bold Italic Nerd Font Complete.sync-conflict-20221019-083435-BBS3QSY.ttf
similarity index 100%
rename from fonts/TTF/Hack/Hack Bold Italic Nerd Font Complete.sync-conflict-20221019-083435-BBS3QSY.ttf
rename to desktop/fonts/TTF/Hack/Hack Bold Italic Nerd Font Complete.sync-conflict-20221019-083435-BBS3QSY.ttf
diff --git a/fonts/TTF/Hack/Hack Bold Italic Nerd Font Complete.ttf b/desktop/fonts/TTF/Hack/Hack Bold Italic Nerd Font Complete.ttf
similarity index 100%
rename from fonts/TTF/Hack/Hack Bold Italic Nerd Font Complete.ttf
rename to desktop/fonts/TTF/Hack/Hack Bold Italic Nerd Font Complete.ttf
diff --git a/fonts/TTF/Hack/Hack Bold Nerd Font Complete Mono.sync-conflict-20221019-083446-BBS3QSY.ttf b/desktop/fonts/TTF/Hack/Hack Bold Nerd Font Complete Mono.sync-conflict-20221019-083446-BBS3QSY.ttf
similarity index 100%
rename from fonts/TTF/Hack/Hack Bold Nerd Font Complete Mono.sync-conflict-20221019-083446-BBS3QSY.ttf
rename to desktop/fonts/TTF/Hack/Hack Bold Nerd Font Complete Mono.sync-conflict-20221019-083446-BBS3QSY.ttf
diff --git a/fonts/TTF/Hack/Hack Bold Nerd Font Complete Mono.ttf b/desktop/fonts/TTF/Hack/Hack Bold Nerd Font Complete Mono.ttf
similarity index 100%
rename from fonts/TTF/Hack/Hack Bold Nerd Font Complete Mono.ttf
rename to desktop/fonts/TTF/Hack/Hack Bold Nerd Font Complete Mono.ttf
diff --git a/fonts/TTF/Hack/Hack Bold Nerd Font Complete.sync-conflict-20221019-083438-BBS3QSY.ttf b/desktop/fonts/TTF/Hack/Hack Bold Nerd Font Complete.sync-conflict-20221019-083438-BBS3QSY.ttf
similarity index 100%
rename from fonts/TTF/Hack/Hack Bold Nerd Font Complete.sync-conflict-20221019-083438-BBS3QSY.ttf
rename to desktop/fonts/TTF/Hack/Hack Bold Nerd Font Complete.sync-conflict-20221019-083438-BBS3QSY.ttf
diff --git a/fonts/TTF/Hack/Hack Bold Nerd Font Complete.ttf b/desktop/fonts/TTF/Hack/Hack Bold Nerd Font Complete.ttf
similarity index 100%
rename from fonts/TTF/Hack/Hack Bold Nerd Font Complete.ttf
rename to desktop/fonts/TTF/Hack/Hack Bold Nerd Font Complete.ttf
diff --git a/fonts/TTF/Hack/Hack Italic Nerd Font Complete Mono.sync-conflict-20221019-083452-BBS3QSY.ttf b/desktop/fonts/TTF/Hack/Hack Italic Nerd Font Complete Mono.sync-conflict-20221019-083452-BBS3QSY.ttf
similarity index 100%
rename from fonts/TTF/Hack/Hack Italic Nerd Font Complete Mono.sync-conflict-20221019-083452-BBS3QSY.ttf
rename to desktop/fonts/TTF/Hack/Hack Italic Nerd Font Complete Mono.sync-conflict-20221019-083452-BBS3QSY.ttf
diff --git a/fonts/TTF/Hack/Hack Italic Nerd Font Complete Mono.ttf b/desktop/fonts/TTF/Hack/Hack Italic Nerd Font Complete Mono.ttf
similarity index 100%
rename from fonts/TTF/Hack/Hack Italic Nerd Font Complete Mono.ttf
rename to desktop/fonts/TTF/Hack/Hack Italic Nerd Font Complete Mono.ttf
diff --git a/fonts/TTF/Hack/Hack Italic Nerd Font Complete.sync-conflict-20221019-083608-BBS3QSY.ttf b/desktop/fonts/TTF/Hack/Hack Italic Nerd Font Complete.sync-conflict-20221019-083608-BBS3QSY.ttf
similarity index 100%
rename from fonts/TTF/Hack/Hack Italic Nerd Font Complete.sync-conflict-20221019-083608-BBS3QSY.ttf
rename to desktop/fonts/TTF/Hack/Hack Italic Nerd Font Complete.sync-conflict-20221019-083608-BBS3QSY.ttf
diff --git a/fonts/TTF/Hack/Hack Italic Nerd Font Complete.ttf b/desktop/fonts/TTF/Hack/Hack Italic Nerd Font Complete.ttf
similarity index 100%
rename from fonts/TTF/Hack/Hack Italic Nerd Font Complete.ttf
rename to desktop/fonts/TTF/Hack/Hack Italic Nerd Font Complete.ttf
diff --git a/fonts/TTF/Hack/Hack Regular Nerd Font Complete Mono.sync-conflict-20221019-083406-BBS3QSY.ttf b/desktop/fonts/TTF/Hack/Hack Regular Nerd Font Complete Mono.sync-conflict-20221019-083406-BBS3QSY.ttf
similarity index 100%
rename from fonts/TTF/Hack/Hack Regular Nerd Font Complete Mono.sync-conflict-20221019-083406-BBS3QSY.ttf
rename to desktop/fonts/TTF/Hack/Hack Regular Nerd Font Complete Mono.sync-conflict-20221019-083406-BBS3QSY.ttf
diff --git a/fonts/TTF/Hack/Hack Regular Nerd Font Complete Mono.ttf b/desktop/fonts/TTF/Hack/Hack Regular Nerd Font Complete Mono.ttf
similarity index 100%
rename from fonts/TTF/Hack/Hack Regular Nerd Font Complete Mono.ttf
rename to desktop/fonts/TTF/Hack/Hack Regular Nerd Font Complete Mono.ttf
diff --git a/fonts/TTF/Hack/Hack Regular Nerd Font Complete.sync-conflict-20221019-083352-BBS3QSY.ttf b/desktop/fonts/TTF/Hack/Hack Regular Nerd Font Complete.sync-conflict-20221019-083352-BBS3QSY.ttf
similarity index 100%
rename from fonts/TTF/Hack/Hack Regular Nerd Font Complete.sync-conflict-20221019-083352-BBS3QSY.ttf
rename to desktop/fonts/TTF/Hack/Hack Regular Nerd Font Complete.sync-conflict-20221019-083352-BBS3QSY.ttf
diff --git a/fonts/TTF/Hack/Hack Regular Nerd Font Complete.ttf b/desktop/fonts/TTF/Hack/Hack Regular Nerd Font Complete.ttf
similarity index 100%
rename from fonts/TTF/Hack/Hack Regular Nerd Font Complete.ttf
rename to desktop/fonts/TTF/Hack/Hack Regular Nerd Font Complete.ttf
diff --git a/fonts/TTF/all-the-icons.sync-conflict-20221019-083543-BBS3QSY.ttf b/desktop/fonts/TTF/all-the-icons.sync-conflict-20221019-083543-BBS3QSY.ttf
similarity index 100%
rename from fonts/TTF/all-the-icons.sync-conflict-20221019-083543-BBS3QSY.ttf
rename to desktop/fonts/TTF/all-the-icons.sync-conflict-20221019-083543-BBS3QSY.ttf
diff --git a/fonts/TTF/all-the-icons.ttf b/desktop/fonts/TTF/all-the-icons.ttf
similarity index 100%
rename from fonts/TTF/all-the-icons.ttf
rename to desktop/fonts/TTF/all-the-icons.ttf
diff --git a/fonts/TTF/file-icons.ttf b/desktop/fonts/TTF/file-icons.ttf
similarity index 100%
rename from fonts/TTF/file-icons.ttf
rename to desktop/fonts/TTF/file-icons.ttf
diff --git a/fonts/TTF/fontawesome.sync-conflict-20221019-083331-BBS3QSY.ttf b/desktop/fonts/TTF/fontawesome.sync-conflict-20221019-083331-BBS3QSY.ttf
similarity index 100%
rename from fonts/TTF/fontawesome.sync-conflict-20221019-083331-BBS3QSY.ttf
rename to desktop/fonts/TTF/fontawesome.sync-conflict-20221019-083331-BBS3QSY.ttf
diff --git a/fonts/TTF/fontawesome.ttf b/desktop/fonts/TTF/fontawesome.ttf
similarity index 100%
rename from fonts/TTF/fontawesome.ttf
rename to desktop/fonts/TTF/fontawesome.ttf
diff --git a/fonts/TTF/material-design-icons.ttf b/desktop/fonts/TTF/material-design-icons.ttf
similarity index 100%
rename from fonts/TTF/material-design-icons.ttf
rename to desktop/fonts/TTF/material-design-icons.ttf
diff --git a/fonts/TTF/octicons.sync-conflict-20221019-083556-BBS3QSY.ttf b/desktop/fonts/TTF/octicons.sync-conflict-20221019-083556-BBS3QSY.ttf
similarity index 100%
rename from fonts/TTF/octicons.sync-conflict-20221019-083556-BBS3QSY.ttf
rename to desktop/fonts/TTF/octicons.sync-conflict-20221019-083556-BBS3QSY.ttf
diff --git a/fonts/TTF/octicons.ttf b/desktop/fonts/TTF/octicons.ttf
similarity index 100%
rename from fonts/TTF/octicons.ttf
rename to desktop/fonts/TTF/octicons.ttf
diff --git a/fonts/TTF/weathericons.sync-conflict-20221019-083355-BBS3QSY.ttf b/desktop/fonts/TTF/weathericons.sync-conflict-20221019-083355-BBS3QSY.ttf
similarity index 100%
rename from fonts/TTF/weathericons.sync-conflict-20221019-083355-BBS3QSY.ttf
rename to desktop/fonts/TTF/weathericons.sync-conflict-20221019-083355-BBS3QSY.ttf
diff --git a/fonts/TTF/weathericons.ttf b/desktop/fonts/TTF/weathericons.ttf
similarity index 100%
rename from fonts/TTF/weathericons.ttf
rename to desktop/fonts/TTF/weathericons.ttf
diff --git a/desktop/mise.toml b/desktop/mise.toml
new file mode 100644
index 0000000..00ccdb3
--- /dev/null
+++ b/desktop/mise.toml
@@ -0,0 +1,91 @@
+[dotfiles]
+
+# Desktop files
+"~/.local/share/applications" = { source = "applications", mode = "symlink-each" }
+
+# scripts.
+"~/.local/bin/hyprland-keybindings" = { source = "script/hyprland-keybindings", mode = "symlink" }
+"~/.local/bin/hyprland-fetch-client" = { source = "script/hyprland-fetch-client", mode = "symlink" }
+"~/.local/bin/hyprland-focus-client" = { source = "script/hyprland-focus-client", mode = "symlink" }
+"~/.local/bin/terminal-launcher" = { source = "script/terminal-launcher", mode = "symlink" }
+
+"~/.local/bin/hyprland-tmux-session" = { source = "script/hyprland-tmux-session", mode = "symlink" }
+"~/.local/bin/hyprland-toggle-monitor" = { source = "script/hyprland-toggle-monitor", mode = "symlink" }
+
+"~/.local/bin/rofi-pass" = { source = "script/rofi-pass", mode = "symlink" }
+
+"~/.local/bin/screen-recorder" = { source = "script/screen-recorder", mode = "symlink" }
+
+"~/.config/ghostty" = "config/ghostty"
+
+"~/.config/ostt" = "config/ostt"
+
+"~/.config/fontconfig" = { source = "config/fontconfig", mode = "copy" }
+
+"~/.config/foot" = "config/foot"
+
+"~/.config/hypr/sjb" = "config/hypr/sjb"
+"~/.config/hypr/hypridle.conf" = { source = "config/hypr/hypridle.conf", mode = "symlink" }
+"~/.config/hypr/hyprlock.conf" = { source = "config/hypr/hyprlock.conf", mode = "symlink" }
+"~/.config/hypr/hyprpm.conf" = { source = "config/hypr/hyprpm.conf", mode = "symlink" }
+"~/.config/hypr/hyprland.lua/sjb" = { block = 'require("sjb.init")' }
+
+"~/.config/kitty" = "config/kitty"
+"~/.config/rofi" = "config/rofi"
+"~/.config/rio" = "config/rio"
+
+"~/.config/uwsm" = "config/uwsm"
+"~/.config/chromium-flags.conf" = { source = "config/chromium-flags.conf", mode = "symlink" }
+
+"~/.local/share/fonts/" = { source = "fonts", mode = "copy" }
+
+"~/.local/bin/sjb-webapp-installer" = { source = "script/sjb-webapp-installer", mode = "symlink" }
+
+"~/.local/bin/bing-wallpaper" = { source = "script/bing-wallpaper", mode = "symlink" }
+"~/.local/bin/set-wallpaper.sh" = { source = "script/set-wallpaper.sh", mode = "symlink" }
+"~/.local/bin/wallpaper-fetcher" = { source = "bin/wallpaper-fetcher", mode = "symlink" }
+
+"~/.local/bin/strata" = { source = "bin/strata", mode = "symlink" }
+"~/.config/strata/settings.toml" = { source = "config/strata/settings.toml", mode = "symlink" }
+
+[tasks.desktop]
+description = "setup gui"
+run = [
+  'xdg-settings set default-web-browser firefox.desktop',
+  'gsettings set org.gnome.desktop.interface gtk-enable-primary-paste true',
+  'id -nG sjb | grep -qw "input" && systemctl --user enable ydotool',
+  'systemctl --user enable syncthing',
+  'systemctl --user enable mako.service',
+  'systemctl --user enable hypridle.service',
+  'systemctl --user enable awww-daemon.service',
+  'systemctl --user enable gnome-keyring-daemon.service',
+  'systemctl --user enable hyprpolkitagent.service',
+  'systemctl --user enable wallpaper.timer',
+  'systemctl --user enable foot-server.service',
+  'xdg-mime default obsidian.desktop x-scheme-handler/obsidian',
+  'xdg-settings set default-url-scheme-handler obsidian obsidian.desktop',
+  'fc-cache',
+]
+
+[tasks.webapps]
+description = 'create all web application'
+run = [
+  'sjb-webapp-installer "WhatsApp" https://web.whatsapp.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/whatsapp.png',
+  'sjb-webapp-installer "Google Photos" https://photos.google.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-photos.png',
+  'sjb-webapp-installer "Google Contacts" https://contacts.google.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-contacts.png',
+  'sjb-webapp-installer "Google Messages" https://messages.google.com/web/conversations https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-messages.png',
+  'sjb-webapp-installer "ChatGPT" https://chatgpt.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/chatgpt.png',
+  'sjb-webapp-installer "YouTube" https://youtube.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/youtube.png',
+  'sjb-webapp-installer "GitHub" https://github.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/github-light.png',
+  'sjb-webapp-installer "Figma" https://figma.com/ https://www.veryicon.com/download/png/application/app-icon-7/figma-1?s=256',
+  'sjb-webapp-installer "Discord" https://discord.com/channels/@me https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/discord.png',
+  'sjb-webapp-installer "Twitch" https://twitch.tv/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/twitch.png',
+  'sjb-webapp-installer "Team" https://teams.microsoft.com/v2/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/microsoft-teams.svg',
+  'sjb-webapp-installer "Outlook" https://outlook.office.com/mail/inbox/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/microsoft-outlook.svg',
+  'sjb-webapp-installer "Slack" https://app.slack.com/client/T09M8T3BB1N/C09KZ5N0ZK9 https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/slack.svg',
+  'sjb-webapp-installer "Copilot" https://m365.cloud.microsoft https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/microsoft-copilot.svg',
+  'sjb-webapp-installer "X" https://x.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/x.png',
+]
+
+[tasks.bootstrap]
+depends = ['desktop', 'webapps']
diff --git a/script/bing-wallpaper b/desktop/script/bing-wallpaper
similarity index 100%
rename from script/bing-wallpaper
rename to desktop/script/bing-wallpaper
diff --git a/script/hyprland-fetch-client b/desktop/script/hyprland-fetch-client
similarity index 100%
rename from script/hyprland-fetch-client
rename to desktop/script/hyprland-fetch-client
diff --git a/script/hyprland-focus-client b/desktop/script/hyprland-focus-client
similarity index 100%
rename from script/hyprland-focus-client
rename to desktop/script/hyprland-focus-client
diff --git a/script/hyprland-keybindings b/desktop/script/hyprland-keybindings
similarity index 100%
rename from script/hyprland-keybindings
rename to desktop/script/hyprland-keybindings
diff --git a/script/hyprland-tmux-session b/desktop/script/hyprland-tmux-session
similarity index 100%
rename from script/hyprland-tmux-session
rename to desktop/script/hyprland-tmux-session
diff --git a/script/hyprland-toggle-monitor b/desktop/script/hyprland-toggle-monitor
similarity index 100%
rename from script/hyprland-toggle-monitor
rename to desktop/script/hyprland-toggle-monitor
diff --git a/script/rofi-pass b/desktop/script/rofi-pass
similarity index 100%
rename from script/rofi-pass
rename to desktop/script/rofi-pass
diff --git a/script/screen-recorder b/desktop/script/screen-recorder
similarity index 100%
rename from script/screen-recorder
rename to desktop/script/screen-recorder
diff --git a/script/set-wallpaper.sh b/desktop/script/set-wallpaper.sh
similarity index 100%
rename from script/set-wallpaper.sh
rename to desktop/script/set-wallpaper.sh
diff --git a/script/sjb-webapp-installer b/desktop/script/sjb-webapp-installer
similarity index 100%
rename from script/sjb-webapp-installer
rename to desktop/script/sjb-webapp-installer
diff --git a/script/terminal-launcher b/desktop/script/terminal-launcher
similarity index 100%
rename from script/terminal-launcher
rename to desktop/script/terminal-launcher
diff --git a/packages/sjb-desktop.packages b/desktop/sjb-desktop.packages
similarity index 100%
rename from packages/sjb-desktop.packages
rename to desktop/sjb-desktop.packages
diff --git a/mise.toml b/mise.toml
index 1629b23..6d2403d 100644
--- a/mise.toml
+++ b/mise.toml
@@ -13,84 +13,54 @@ dotfiles.default_mode = "symlink-each"
 
 [dotfiles]
 "~/.config/btop" = "config/btop"
+"~/.config/mise/config.toml" = { source = "config/mise/config.toml", mode = "symlink" }
+"~/.config/mise/env" = { source = "templates/dotenv.tmpl", mode = "template", template = "tera" }
 "~/.config/emacs" = "config/emacs"
 "~/.config/environment.d/generic.conf" = { source = "templates/environments.tmpl", mode = "template", template = "tera" }
 "~/.gnupg" = "config/gnupg"
 "~/.config/fish" = "config/fish"                                                                                          # check if we really need the fisher plugins
 "~/.config/gdb" = "config/gdb"
-"~/.config/ghostty" = "config/ghostty"
 "~/.config/git" = "config/git"
 "~/.config/git/local" = { source = "templates/git-local.tmpl", mode = "template", template = "tera" }
 "~/.config/goose" = "config/goose"
 "~/.config/herdr" = "config/herdr"
-"~/.config/ostt" = "config/ostt"
 "~/.config/fabric" = "config/fabric"
-"~/.config/fontconfig" = { source = "config/fontconfig", mode = "copy" }
-"~/.config/foot" = "config/foot"
-"~/.config/hypr/sjb" = "config/hypr/sjb"
-"~/.config/hypr/hypridle.conf" = { source = "config/hypr/hypridle.conf", mode = "symlink" }
-"~/.config/hypr/hyprlock.conf" = { source = "config/hypr/hyprlock.conf", mode = "symlink" }
-"~/.config/hypr/hyprpm.conf" = { source = "config/hypr/hyprpm.conf", mode = "symlink" }
-"~/.config/hypr/hyprland.lua/sjb" = { block = 'require("sjb.init")' }
 "~/.config/jj" = "config/jj"
 "~/.config/jj/conf.d/local.toml" = { source = "templates/git-local.tmpl", mode = "template", template = "tera" }
-"~/.config/kitty" = "config/kitty"
 "~/.config/mini.nvim" = "config/mini.nvim"
-"~/.config/mise/config.toml" = { source = "config/mise/config.toml", mode = "symlink" }
 "~/.config/nvim" = "config/nvim"
+
 "~/.config/opencode" = "config/opencode"
 "~/.agents" = { source = "config/agents", mode = "symlink-each" }
 "~/.config/opencode/agents" = { source = "config/agents/prompts", mode = "symlink" }
 "~/.pi" = "config/pi"
 "~/.pi-lens/config.json" = { source = "config/pi-lens/config.json", mode = "symlink" }
 "~/.pi/agent/AGENTS.md" = { source = "config/agents/AGENTS.md", mode = "symlink" }
-"~/.config/rofi" = "config/rofi"
-"~/.config/rio" = "config/rio"
 "~/.ssh" = "config/ssh"
 "~/.config/systemd" = { source = "config/systemd", mode = "copy" }
 "~/.config/environment.d" = "config/environment.d"
 "~/.config/tmux" = "config/tmux"
-"~/.config/uwsm" = "config/uwsm"
 "~/.config/worktrunk" = "config/worktrunk"
 "~/.config/workmux/config.yaml" = { source = "config/workmux/config.yaml", mode = "symlink" }
-"~/.config/chromium-flags.conf" = { source = "config/chromium-flags.conf", mode = "symlink" }
 "~/.profile" = { source = "config/bash/profile", mode = "symlink" }
 "~/.bash_aliases" = { source = "config/bash/aliases", mode = "symlink" }
+"~/.bashrc" = { source = "config/bash/profile", mode = "symlink" }
+
 "~/.config/zero" = "config/zero"
 "~/.sandboxec" = "config/sandboxec"
+"~/.local/bin/ssh-auth" = { source = "script/ssh-auth", mode = "symlink" }
 
 "~/.config/omarchy/themed" = { source = "default/themed", mode = "symlink-each" }
 
-"~/.local/share/fonts/" = { source = "fonts", mode = "copy" }
 
-# Desktop files
-"~/.local/share/applications" = { source = "applications", mode = "symlink-each" }
-
-# scripts.
-"~/.local/bin/hyprland-activeworkspace" = { source = "script/hyprland-activeworkspace", mode = "symlink" }
-"~/.local/bin/hyprland-keybindings" = { source = "script/hyprland-keybindings", mode = "symlink" }
-"~/.local/bin/hyprland-fetch-client" = { source = "script/hyprland-fetch-client", mode = "symlink" }
-"~/.local/bin/hyprland-focus-client" = { source = "script/hyprland-focus-client", mode = "symlink" }
-"~/.local/bin/terminal-launcher" = { source = "script/terminal-launcher", mode = "symlink" }
-"~/.local/bin/screen-recorder" = { source = "script/screen-recorder", mode = "symlink" }
-
-"~/.local/bin/battery" = { source = "script/battery", mode = "symlink" }
-# "~/.config/bin/ec" = { source = "script/ec", mode = "symlink" }
 "~/.local/bin/tmux-open" = { source = "script/tmux-open", mode = "symlink" }
-"~/.local/bin/active-workspace" = { source = "script/active-workspace", mode = "symlink" }
 "~/.local/bin/avr-flash" = { source = "script/avr-flash", mode = "symlink" }
 "~/.local/bin/dfu-flash" = { source = "script/dfu-flash", mode = "symlink" }
 "~/.local/bin/git-bare-clone" = { source = "script/git-bare-clone", mode = "symlink" }
 "~/.local/bin/git-churn" = { source = "script/git-churn", mode = "symlink" }
-"~/.local/bin/hyprland-tmux-session" = { source = "script/hyprland-tmux-session", mode = "symlink" }
-"~/.local/bin/hyprland-toggle-monitor" = { source = "script/hyprland-toggle-monitor", mode = "symlink" }
 "~/.local/bin/ci" = { source = "script/ci", mode = "symlink" }
-"~/.local/bin/rofi-pass" = { source = "script/rofi-pass", mode = "symlink" }
 "~/.local/bin/sharehome" = { source = "script/sharehome", mode = "symlink" }
-"~/.local/bin/sjb-orgmode-installer" = { source = "script/sjb-orgmode-installer", mode = "symlink" }
-"~/.local/bin/sjb-script-installer" = { source = "script/sjb-script-installer", mode = "symlink" }
-"~/.local/bin/sjb-update-config" = { source = "script/sjb-update-config", mode = "symlink" }
-"~/.local/bin/sjb-webapp-installer" = { source = "script/sjb-webapp-installer", mode = "symlink" }
+"~/.local/bin/battery" = { source = "script/battery", mode = "symlink" }
 "~/.local/bin/sysinfo" = { source = "script/sysinfo", mode = "symlink" }
 "~/.local/bin/s" = { source = "script/s", mode = "symlink" }
 "~/.local/bin/t" = { source = "script/t", mode = "symlink" }
@@ -99,15 +69,9 @@ dotfiles.default_mode = "symlink-each"
 "~/.local/bin/rherdr" = { source = "script/rherdr", mode = "symlink" }
 "~/.local/bin/rtmux" = { source = "script/rtmux", mode = "symlink" }
 
-"~/.local/bin/bing-wallpaper" = { source = "script/bing-wallpaper", mode = "symlink" }
-"~/.local/bin/set-wallpaper.sh" = { source = "script/set-wallpaper.sh", mode = "symlink" }
-"~/.local/bin/wallpaper-fetcher" = { source = "bin/wallpaper-fetcher", mode = "symlink" }
-
-"~/.local/bin/strata" = { source = "bin/strata", mode = "symlink" }
-"~/.config/strata/settings.toml" = { source = "config/strata/settings.toml", mode = "symlink" }
-
-[bootstrap.user]
-login_shell = "/usr/bin/fish"
+#"~/.local/bin/sjb-orgmode-installer" = { source = "script/sjb-orgmode-installer", mode = "symlink" }
+#"~/.local/bin/sjb-script-installer" = { source = "script/sjb-script-installer", mode = "symlink" }
+#"~/.local/bin/sjb-update-config" = { source = "script/sjb-update-config", mode = "symlink" }
 
 [bootstrap.packages]
 "pacman:zoxide" = "latest"
@@ -118,52 +82,17 @@ login_shell = "/usr/bin/fish"
 "pacman:harper" = "latest"
 "pacman:tree-sitter-cli" = "latest"
 
-[tasks.shells]
-description = "Script to setup some cli environment"
-run = [
-  'fish -c "fisher install franciscolourenco/done"',
-  'test -d ~/.config/tmux/plugins/tpm || git clone https://github.com/tmux-plugins/tpm  ~/.config/tmux/plugins/tpm',
-  'tmux run-shell ~/.config/tmux/plugins/tpm/bindings/install_plugins',
-  'fc-cache',
-]
+[bootstrap.mise_shell_activate] # mise activation in shell startup files   ■ This sentence does not start wit
+zprofile = "shims"
+zshrc = "activate"
 
-[tasks.desktop]
-description = "setup gui"
+[tasks.setup_theme]
 run = [
-  'xdg-settings set default-web-browser firefox.desktop',
-  'gsettings set org.gnome.desktop.interface gtk-enable-primary-paste true',
-  'id -nG sjb | grep -qw "input" && systemctl --user enable ydotool',
-  'systemctl --user enable syncthing',
-  'systemctl --user enable mako.service',
-  'systemctl --user enable hypridle.service',
-  'systemctl --user enable awww-daemon.service',
-  'systemctl --user enable gnome-keyring-daemon.service',
-  'systemctl --user enable hyprpolkitagent.service',
-  'systemctl --user enable wallpaper.timer',
-  'systemctl --user enable foot-server.service',
-  'xdg-mime default obsidian.desktop x-scheme-handler/obsidian',
-  'xdg-settings set default-url-scheme-handler obsidian obsidian.desktop',
-]
-
-[tasks.webapps]
-description = 'create all web application'
-run = [
-  'sjb-webapp-installer "WhatsApp" https://web.whatsapp.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/whatsapp.png',
-  'sjb-webapp-installer "Google Photos" https://photos.google.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-photos.png',
-  'sjb-webapp-installer "Google Contacts" https://contacts.google.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-contacts.png',
-  'sjb-webapp-installer "Google Messages" https://messages.google.com/web/conversations https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-messages.png',
-  'sjb-webapp-installer "ChatGPT" https://chatgpt.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/chatgpt.png',
-  'sjb-webapp-installer "YouTube" https://youtube.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/youtube.png',
-  'sjb-webapp-installer "GitHub" https://github.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/github-light.png',
-  'sjb-webapp-installer "Figma" https://figma.com/ https://www.veryicon.com/download/png/application/app-icon-7/figma-1?s=256',
-  'sjb-webapp-installer "Discord" https://discord.com/channels/@me https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/discord.png',
-  'sjb-webapp-installer "Twitch" https://twitch.tv/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/twitch.png',
-  'sjb-webapp-installer "Team" https://teams.microsoft.com/v2/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/microsoft-teams.svg',
-  'sjb-webapp-installer "Outlook" https://outlook.office.com/mail/inbox/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/microsoft-outlook.svg',
-  'sjb-webapp-installer "Slack" https://app.slack.com/client/T09M8T3BB1N/C09KZ5N0ZK9 https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/slack.svg',
-  'sjb-webapp-installer "Copilot" https://m365.cloud.microsoft https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/microsoft-copilot.svg',
-  'sjb-webapp-installer "X" https://x.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/x.png',
+  'test -d ~/.local/state/omarchy/current/theme || rsync -av config/omarchy/default/ $HOME/.local/state/omarchy/current/theme --mkpath',
+  'mkdir -p ~/.config/btop/themes && ln -snf ~/.local/state/omarchy/current/theme/btop.theme ~/.config/btop/themes/current.theme',
+  'mkdir -p ~/.config/nvim/plugin && ln -snf ~/.local/state/omarchy/current/theme/neovim-vimpack.lua ~/.config/nvim/plugin/theme.lua',
+  'mkdir -p ~/.config/tmux && ln -snf ~/.local/state/omarchy/current/theme/tmux ~/.config/tmux/theme',
 ]
 
 [tasks.bootstrap]
-depends = ['shells', 'desktop', 'webapps']
+depends = ['setup_theme', 'setup_shells', 'setup_tmux', 'setup_pi', 'setup_herdr', 'setup_tmux']
diff --git a/script/active-workspace b/script/active-workspace
deleted file mode 100755
index ac94e55..0000000
--- a/script/active-workspace
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-hyprctl activeworkspace -j | jq -r '@text "Workspace \(.id)"'
\ No newline at end of file
diff --git a/script/hyprland-activeworkspace b/script/hyprland-activeworkspace
deleted file mode 100755
index ac94e55..0000000
--- a/script/hyprland-activeworkspace
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-hyprctl activeworkspace -j | jq -r '@text "Workspace \(.id)"'
\ No newline at end of file
diff --git a/script/ssh-auth b/script/ssh-auth
new file mode 100755
index 0000000..2c92f5d
--- /dev/null
+++ b/script/ssh-auth
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo export SSH_AUTH_SOCK=$(fd 's.*sshd*' ~/.ssh)
diff --git a/templates/dotenv.tmpl b/templates/dotenv.tmpl
new file mode 100644
index 0000000..f46685c
--- /dev/null
+++ b/templates/dotenv.tmpl
@@ -0,0 +1,8 @@
+TERM=xterm-256color
+npm_config_prefix=$HOME/.local
+
+DOTFILES_DIR = "{{ vars.DOTFILES_DIR }}"
+USER_FULLNAME = "{{ vars.USER_FULLNAME }}"
+USER_EMAIL = "{{ vars.USER_FULLNAME }}"
+SECOND_BRAIN = "{{ vars.SECOND_BRAIN }}"
+
diff --git a/templates/dofiles.conf.tmpl b/templates/dotfiles.conf.tmpl
similarity index 100%
rename from templates/dofiles.conf.tmpl
rename to templates/dotfiles.conf.tmpl