diff --git a/i3/config b/i3/config
index 82ad2e2..ba00fb9 100644
--- a/i3/config
+++ b/i3/config
@@ -23,6 +23,7 @@
 #}
 
 #set $opacity 0.9
+# smart_gaps on
 
 set $mod Mod4
 set $alt Mod1
@@ -116,7 +117,7 @@ client.unfocused $col_bg $col_bg $col_ac $col_bg $col_bg
 default_border pixel 1
 #titlebar_border_thickness 2
 #titlebar_padding 2
-gaps inner 5
+# gaps inner 5
 font pango:JetBrainsMono Medium 8
 
 bar {
diff --git a/packages/system/apt/list b/packages/system/apt/list
index b77921f..280892d 100644
--- a/packages/system/apt/list
+++ b/packages/system/apt/list
@@ -53,6 +53,9 @@ xdotool
 unzip
 imagemagick
 tmux
+bat
+nnn
+exiftool
 
 # Appearance
 gnome-themes-extra
diff --git a/packages/system/apt/install-nvidia-proprietary.sh b/scripts/setup/setup-debian-nvidia-proprietary
similarity index 100%
rename from packages/system/apt/install-nvidia-proprietary.sh
rename to scripts/setup/setup-debian-nvidia-proprietary
diff --git a/packages/system/apt/install-apt-packages.sh b/scripts/setup/setup-debian-packages
similarity index 100%
rename from packages/system/apt/install-apt-packages.sh
rename to scripts/setup/setup-debian-packages
diff --git a/scripts/setup/setup-flatpak-flathub b/scripts/setup/setup-flatpak-flathub
new file mode 100755
index 0000000..692302b
--- /dev/null
+++ b/scripts/setup/setup-flatpak-flathub
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
diff --git a/packages/flatpak/install-flatpak-list.sh b/scripts/setup/setup-flatpak-packages
similarity index 100%
rename from packages/flatpak/install-flatpak-list.sh
rename to scripts/setup/setup-flatpak-packages
diff --git a/shell/profile.d/path.sh b/shell/profile.d/path.sh
new file mode 100644
index 0000000..e92b8b3
--- /dev/null
+++ b/shell/profile.d/path.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+# shellcheck disable=SC2123
+
+PATH="$HOME/.config/scripts/status${PATH:+:${PATH}}"
+PATH="$HOME/.config/scripts/menu${PATH:+:${PATH}}"
+PATH="$HOME/.config/scripts/menu/xclipmenu${PATH:+:${PATH}}"
+PATH="$HOME/.config/scripts/sway${PATH:+:${PATH}}"
+PATH="$HOME/.config/scripts/dwm${PATH:+:${PATH}}"
+PATH="$HOME/.config/wrappers${PATH:+:${PATH}}"
+PATH="$HOME/.config/scripts${PATH:+:${PATH}}"
+PATH="$HOME/.local/bin${PATH:+:${PATH}}"
+PATH="$HOME/.local/state/nix/profile/bin${PATH:+:${PATH}}"
+PATH="$HOME/.config/emacs/bin${PATH:+:${PATH}}"
+PATH="$HOME/.local/share/go/bin${PATH:+:${PATH}}"
+PATH="/usr/local/go/bin${PATH:+:${PATH}}"
+PATH="$HOME/.local/share/pyenv/shims${PATH:+:${PATH}}"
diff --git a/shell/profile.d/pyv.sh b/shell/profile.d/pyv.sh
new file mode 100644
index 0000000..460f43e
--- /dev/null
+++ b/shell/profile.d/pyv.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+for f in pyv pyv_comp.bash; do
+  if [ -f ~/.local/share/pyv/$f ]; then
+    # shellcheck disable=SC1090
+    . ~/.local/share/pyv/$f
+  fi
+done
diff --git a/shell/profile.d/shortcuts.sh b/shell/profile.d/shortcuts.sh
new file mode 100644
index 0000000..928f786
--- /dev/null
+++ b/shell/profile.d/shortcuts.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+export \
+  FJ="git@git.tavo.one:tavo" \
+  GL="git@gitlab.com:tavo-wasd" \
+  GH="git@github.com:tavo-wasd-gh" \
+  DRIVE="ssh://drive:/home/drive/drive" \
+  BOOKMARKS="$HOME/Documents/bookmarks" \
+  BIB="$HOME/Documents/bibliography"
diff --git a/shell/profile.d/xdgspec.sh b/shell/profile.d/xdgspec.sh
new file mode 100644
index 0000000..a6638ab
--- /dev/null
+++ b/shell/profile.d/xdgspec.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+export \
+  XDG_STATE_HOME="$HOME/.local/state" \
+  XDG_CACHE_HOME="$HOME/.local/cache" \
+  XDG_DATA_HOME="$HOME/.local/share" \
+  XDG_CONFIG_HOME="$HOME/.config"
+
+export \
+  _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME/java" \
+  MATHEMATICA_USERBASE="$XDG_CONFIG_HOME/mathematica" \
+  XCURSOR_PATH=/usr/share/icons:"$XDG_DATA_HOME"/icons \
+  GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0" \
+  PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store" \
+  TEXMFCONFIG="$XDG_CONFIG_HOME/texlive/texmf-config" \
+  TEXMFVAR="$XDG_CACHE_HOME/texlive/texmf-var" \
+  TEXMFHOME="$XDG_DATA_HOME/texmf" \
+  VIMINIT="source $XDG_CONFIG_HOME/vim/vimrc" \
+  XSERVERRC="$XDG_CONFIG_HOME/X11/xserverrc" \
+  MBSYNCRC="$XDG_CONFIG_HOME/isync/mbsyncrc" \
+  XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" \
+  XINITRC="$XDG_CONFIG_HOME/X11/xinit/xinitrc" \
+  LESSHISTFILE="$XDG_DATA_HOME/lesshst" \
+  ELECTRUMDIR="$XDG_DATA_HOME/electrum" \
+  CUDA_CACHE_PATH="$XDG_CACHE_HOME/nv" \
+  WINEPREFIX="$XDG_DATA_HOME/wine" \
+  WGETRC="$XDG_CONFIG_HOME/wget/wgetrc" \
+  GNUPGHOME="$XDG_DATA_HOME/gnupg" \
+  GOPATH="$XDG_DATA_HOME/go" \
+  SSH_CONFIG="-F ${XDG_CONFIG_HOME}/ssh/config" \
+  GIT_SSH_COMMAND="ssh -F ${XDG_CONFIG_HOME}/ssh/config" \
+  ZDOTDIR="$XDG_CONFIG_HOME/shell" \
+  NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc" \
+  IPYTHONDIR="$XDG_CONFIG_HOME/ipython" \
+  PYENV_ROOT="$XDG_DATA_HOME/pyenv" \
+  PYTHON_HISTORY="$XDG_CACHE_HOME/python_history" \
+  SQLITE_HISTORY="$XDG_CACHE_HOME/sqlite_history" \
+  PGPASSFILE="$XDG_CONFIG_HOME/pg/pgpass" \
+  UNISON="$XDG_DATA_HOME"/unison