diff --git a/.config/fish/variables.fish b/.config/fish/variables.fish
index ae0d85c2..c7c55b90 100644
--- a/.config/fish/variables.fish
+++ b/.config/fish/variables.fish
@@ -1,3 +1,4 @@
+# XDG Directories
 set -xg XDG_CONFIG_HOME ~/.config
 set -xg XDG_CACHE_HOME ~/.cache
 set -xg XDG_DATA_HOME ~/.local/share
@@ -6,6 +7,7 @@ set -xg XDG_BIN_HOME ~/.local/bin
 set -xg XDG_SCRIPT_HOME ~/.local/script
 set -xg XDG_SCREENSHOTS_HOME ~/Imagenes/Capturas
 
+# Language/Framework Specific Directories
 set -xg CONAN_USER_HOME $XDG_CONFIG_HOME
 set -xg GOPATH $XDG_DATA_HOME/go
 set -xg GOMODCACHE $XDG_CACHE_HOME/go/mod
@@ -15,9 +17,8 @@ set -xg LEIN_HOME $XDG_DATA_HOME/lein
 set -xg NUGET_PACKAGES $XDG_CACHE_HOME/NuGetPackages
 set -xg ANDROID_HOME $XDG_DATA_HOME/android
 set -xg BUN_INSTALL $HOME/.bun
-set -xg RIPGREP_CONFIG_PATH $HOME/.config/rg/.ripgreprc
-set -xg STARSHIP_CONFIG $HOME/.config/starship/starship.toml
 
+# Path
 set -x fish_user_paths
 fish_add_path $XDG_BIN_HOME
 fish_add_path $GOPATH/bin
@@ -34,20 +35,24 @@ fish_add_path /usr/lib/go/bin/
 fish_add_path $HOME/.dotnet/tools
 fish_add_path $BUN_INSTALL/bin
 
+# Editor
 set -xg EDITOR nvim
 set -xg VISUAL $EDITOR
 set -xg SUDO_EDITOR $EDITOR
 
+# Zellij Runner
 set -xg ZELLIJ_RUNNER_ROOT_DIR Repos
 set -xg ZELLIJ_RUNNER_IGNORE_DIRS node_modules,target
 set -xg ZELLIJ_RUNNER_MAX_DIRS_DEPTH 3
 set -xg ZELLIJ_RUNNER_LAYOUTS_DIR .config/zellij/layouts
 set -xg ZELLIJ_RUNNER_BANNERS_DIR .config/zellij/banners
 
+# GPG/LANG
 set -xg GPG_TTY (tty)
 set -xg LANG es_ES.UTF-8
 set -xg LC_ALL es_ES.UTF-8
 
+# FZF
 set -xg FZF_DEFAULT_COMMAND fd --hidden --exclude .git
 set -xg FZF_DEFAULT_OPTS "--height=90% --layout=reverse --info=inline --border --margin=1 --padding=1 \
 --color=bg+:#363a4f,bg:#24273a,spinner:#f4dbd6,hl:#ed8796 \
@@ -57,7 +62,9 @@ set -xg fzf_preview_dir_cmd eza --long --header --icons --all --color=always --g
 set -xg fzf_fd_opts --hidden --exclude=.git --color=always
 set -xg fzf_diff_highlighter delta --paging=never --width=20
 
+# Other
 set -x THEFUCK_OVERRIDDEN_ALIASES 'vi, yarn, eza, vim, neofetch, onefetch, cat, tty-clock, dua i'
-
+set -xg RIPGREP_CONFIG_PATH $HOME/.config/rg/.ripgreprc
+set -xg STARSHIP_CONFIG $HOME/.config/starship/starship.toml
 set -xg LS_COLORS (vivid generate catppuccin-macchiato)
 set -xg BAT_THEME Catppuccin-macchiato