diff --git a/zsh-linux/.config/zsh-linux/00-aliases.zsh b/zsh-linux/.config/zsh-linux/00-aliases.zsh
index 3b8e0f7..78253f7 100644
--- a/zsh-linux/.config/zsh-linux/00-aliases.zsh
+++ b/zsh-linux/.config/zsh-linux/00-aliases.zsh
@@ -25,28 +25,6 @@ alias gtv='printf "%s" "$(git describe --long | sed "s/\([^-]*-\)g/r\1/;s/-/./g"
 alias gnv='printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"'
 alias gr='git reset'
 
-# GPG
-alias gdk='gpg --delete-keys'
-alias gdsk='gpg --delete-secret-keys'
-alias gik='gpg --import '
-alias gk='gpg --list-keys'
-alias grk='gpg --receive-keys'
-alias gsk='gpg --list-secret-keys'
-
-# Neomutt
-alias neomuttconf='cd -- ${XDG_CONFIG_HOME:-${HOME}/.config}/neomutt'
-alias neomuttrc='${EDITOR} ${XDG_CONFIG_HOME:-${HOME}/.config}/neomutt/neomuttrc'
-
-# Neovim
-alias nvimcomm='${EDITOR} ${XDG_CONFIG_HOME:-${HOME}/.config}/nvim/commands'
-alias nvimconf='cd "${XDG_CONFIG_HOME:-${HOME}/.config}/nvim"'
-alias nvimft='cd "${XDG_DATA_HOME:-${HOME}/.local/share}/nvim/site/ftplugin"'
-alias nvimplug='${EDITOR} -- "${XDG_CONFIG_HOME:-${HOME}/.config}/nvim/plugins.vim"'
-alias nvimkey='${EDITOR} -- "${XDG_CONFIG_HOME:-${HOME}/.config}/nvim/keybindings.vim"'
-alias nvimrc='${EDITOR} -- "${XDG_CONFIG_HOME:-${HOME}/.config}/nvim/init.vim"'
-alias swapdir='cd -- "${XDG_DATA_HOME:-${HOME}/.local/share}/nvim/swap"'
-alias vmore='nvim -u "${XDG_CONFIG_HOME:-${HOME}/.config}/nvim/pager.vim" -'
-
 #========= Package Management =========
 # Arch Linux
 alias aurget='aur sync -d aur'
@@ -70,55 +48,17 @@ alias pa='makepkg --force --clean --cleanbuild --syncdeps --rmdeps && addpkg aur
 alias pc='makepkg --force --clean --cleanbuild --syncdeps --rmdeps && addpkg custom'
 alias pr='makepkg --force --clean --cleanbuild --syncdeps --rmdeps && addpkg rpm'
 
-# Personal
-alias :q='exit'
-alias ct='cptemplate'
-alias less='less -i --'
-alias la='ls --almost-all --color --group-directories-first --human-readable -l'
-alias ls='ls --color --group-directories-first'
-alias ll='ls --classify --color --group-directories-first --human-readable -l'
-alias python='python3'
-alias spcli='speedtest-cli --secure'
-alias sshconfig='"${EDITOR}" -- ${HOME}/.ssh/config'
-alias tmux='tmux -f "${XDG_CONFIG_HOME:-${HOME}/.config}"/tmux/tmux.conf'
-alias tmuxrc='nvim -- "${XDG_CONFIG_HOME:-${HOME}/.config}"/tmux/tmux.conf'
-alias tuir='tuir --no-flash'
-alias wget='wget --hsts-file="${XDG_DATA_HOME}/wget-hsts"'
-
-# Navigation
-alias dirconf='"${EDITOR}" -- "${XDG_CONFIG_HOME:-${HOME}/.config}/user-dirs.dirs"'
-alias dotfiles='cd "${HOME}/Dotfiles"'
-alias xch='cd -- ${XDG_CONFIG_HOME:-${HOME}/.config}'
-alias xcah='cd -- ${XDG_CACHE_HOME:-${HOME}/.cache}'
-alias xdh='cd -- ${XDG_DATA_HOME:-${HOME}/.local/share}'
-
 # Programming
 # Use python-pytest-xdist plugin
 #alias pytest='pytest --numprocesses=$(nproc)'
 alias pyarchive='git archive -o rbackup-"$(python setup.py --version)".tar.gz --prefix=rbackup-"$(python setup.py --version)"/'
 
-# ssh
-alias scpe='scp -i "${HOME}/.ssh/empress"'
-
 # system
 alias bootloader='cd /boot/loader/entries'
-alias myip='curl ifconfig.me'
 alias restartfans='sudo systemctl restart fancontrol.service'
 
-# zsh
-alias zdotdir='cd -- ${ZDOTDIR:-${HOME}/.zsh}'
-alias zshaliases='${EDITOR} -- ${ZDOTDIR:-${HOME}/.zsh}/conf.d/00-aliases.zsh'
-alias zbindings='${EDITOR} -- ${ZDOTDIR:-${HOME}/.zsh}/conf.d/keybindings.zsh'
-alias zconf='cd -- ${ZDOTDIR:-${HOME}/.zsh}/conf.d'
-alias zhist='${EDITOR} -- ${HISTFILE}'
-alias zmod='cd -- ${ZDOTDIR:-${HOME}/.zsh}/conf.d/modules'
-alias zpath='${EDITOR} -- ${ZDOTDIR:-${HOME}/.zsh}/conf.d/path.zsh'
-alias zprompt='${EDITOR} -- ${ZDOTDIR:-${HOME}/.zsh}/conf.d/prompt.zsh'
-alias zshrc='${EDITOR} -- ${ZDOTDIR:-${HOME}/.zsh}/.zshrc'
-alias zshrefresh='source -- ${ZDOTDIR:-${HOME}/.zsh}/.zshrc'
-alias zshenv='${EDITOR} -- ${ZDOTDIR:-${HOME}/.zsh}/.zshenv'
-
 # ---------- Parameterized Aliases ----------
+# List all binaries of a given package
 lsbin() {
     if [[ -n $1 ]]; then
         pacman -Qql $1 | rg bin
@@ -127,6 +67,7 @@ lsbin() {
     fi
 }
 
+# Use GNU long flags
 stow-config () {
     local dotfile_dir="${HOME}/Dotfiles"
 
diff --git a/zsh-macos/.config/zsh-macos/00-aliases.zsh b/zsh-macos/.config/zsh-macos/00-aliases.zsh
index bfbe24b..2453735 100644
--- a/zsh-macos/.config/zsh-macos/00-aliases.zsh
+++ b/zsh-macos/.config/zsh-macos/00-aliases.zsh
@@ -7,9 +7,6 @@ alias mv='gmv -iv'
 alias rm='safe-rm -iv'
 alias rmdir='grmdir -v'
 
-# Games
-alias add-modrinth='ferium add-modrinth'
-
 # Git
 alias gar='git archive'
 alias gb='git branch'
@@ -26,66 +23,7 @@ alias gtv='printf "%s" "$(git describe --long | sed "s/\([^-]*-\)g/r\1/;s/-/./g"
 alias gnv='printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"'
 alias gr='git reset'
 
-# GPG
-alias gdk='gpg --delete-keys'
-alias gdsk='gpg --delete-secret-keys'
-alias gik='gpg --import '
-alias gk='gpg --list-keys'
-alias grk='gpg --receive-keys'
-alias gsk='gpg --list-secret-keys'
-
-# Neomutt
-alias neomuttconf='cd -- ${XDG_CONFIG_HOME:-${HOME}/.config}/neomutt'
-alias neomuttrc='${EDITOR} ${XDG_CONFIG_HOME:-${HOME}/.config}/neomutt/neomuttrc'
-
-# Neovim
-alias nvimcomm='${EDITOR} ${XDG_CONFIG_HOME:-${HOME}/.config}/nvim/commands'
-alias nvimconf='cd "${XDG_CONFIG_HOME:-${HOME}/.config}/nvim"'
-alias nvimft='cd "${XDG_DATA_HOME:-${HOME}/.local/share}/nvim/site/ftplugin"'
-alias nvimplug='${EDITOR} -- "${XDG_CONFIG_HOME:-${HOME}/.config}/nvim/plugins.vim"'
-alias nvimkey='${EDITOR} -- "${XDG_CONFIG_HOME:-${HOME}/.config}/nvim/keybindings.vim"'
-alias nvimrc='${EDITOR} -- "${XDG_CONFIG_HOME:-${HOME}/.config}/nvim/init.vim"'
-alias swapdir='cd -- "${XDG_DATA_HOME:-${HOME}/.local/share}/nvim/swap"'
-alias vmore='nvim -u "${XDG_CONFIG_HOME:-${HOME}/.config}/nvim/pager.vim" -'
-
 #========= Package Management =========
-# Arch Linux
-alias aurget='aur sync -d aur'
-alias -g autoremove='pacman -Rns $(pacman -Qtdq)'
-alias checkaurupdates='aur sync -d aur --upgrades'
-# alias does not work correctly for some reason
-alias lspkg="pacman -Qi | awk '/^Name/{name=$3} /^Installed Size/{print $4$5, name}' | sort -h"
-alias ql='pacman -Qql'
-alias pacsearch='pacman -Ss'
-alias rpmget='aur sync -d rpm'
-alias -g updatemirrors="reflector --verbose --country 'United States' --latest 20 --age 24 --sort rate --save /etc/pacman.d/mirrorlist"
-
-# ========== Packaging ==========
-# Arch Linux
-alias aurcache='cd ${XDG_CACHE_HOME}/aurutils/sync'
-alias aurdir='cd /var/cache/pacman/aur'
-alias customdir='cd /var/cache/pacman/custom'
-alias gpkginit='cp /usr/share/pacman/PKGBUILD-vcs.proto ./PKGBUILD'
-alias pkginit='cp /usr/share/pacman/PKGBUILD.proto ./PKGBUILD'
-alias pa='makepkg --force --clean --cleanbuild --syncdeps --rmdeps && addpkg aur'
-alias pc='makepkg --force --clean --cleanbuild --syncdeps --rmdeps && addpkg custom'
-alias pr='makepkg --force --clean --cleanbuild --syncdeps --rmdeps && addpkg rpm'
-
-# Personal
-alias :q='exit'
-alias ct='cptemplate'
-#alias less='less -i --'
-alias la='gls --almost-all --color --group-directories-first --human-readable -l'
-alias ls='gls --color --group-directories-first'
-alias ll='gls --classify --color --group-directories-first --human-readable -l'
-alias python='python3'
-alias spcli='speedtest-cli --secure'
-alias sshconfig='"${EDITOR}" -- ${HOME}/.ssh/config'
-alias tmux='tmux -f "${XDG_CONFIG_HOME:-${HOME}/.config}"/tmux/tmux.conf'
-alias tmuxrc='nvim -- "${XDG_CONFIG_HOME:-${HOME}/.config}"/tmux/tmux.conf'
-alias tuir='tuir --no-flash'
-alias wget='wget --hsts-file="${XDG_DATA_HOME}/wget-hsts"'
-
 # Navigation
 alias dirconf='"${EDITOR}" -- "${XDG_CONFIG_HOME:-${HOME}/.config}/user-dirs.dirs"'
 alias dotfiles='cd "${HOME}/Dotfiles"'
@@ -98,13 +36,8 @@ alias xdh='cd -- ${XDG_DATA_HOME:-${HOME}/.local/share}'
 #alias pytest='pytest --numprocesses=$(nproc)'
 alias pyarchive='git archive -o rbackup-"$(python setup.py --version)".tar.gz --prefix=rbackup-"$(python setup.py --version)"/'
 
-# ssh
-alias scpe='scp -i "${HOME}/.ssh/empress"'
-
 # system
-alias bootloader='cd /boot/loader/entries'
 alias myip='curl ifconfig.me'
-alias restartfans='sudo systemctl restart fancontrol.service'
 
 # zsh
 alias zdotdir='cd -- "$ZDOTDIR"'
@@ -118,6 +51,7 @@ alias zshrc='${EDITOR} -- "$ZDOTDIR"/.zshrc'
 alias zshenv='${EDITOR} -- "$ZDOTDIR"/.zshenv'
 
 # ---------- Parameterized Aliases ----------
+# Use macOS-specific flags
 stow-config () {
     local dotfile_dir="${HOME}/Dotfiles"
 
diff --git a/zsh/.config/zsh/00-common-aliases.zsh b/zsh/.config/zsh/00-common-aliases.zsh
new file mode 100644
index 0000000..4e511b8
--- /dev/null
+++ b/zsh/.config/zsh/00-common-aliases.zsh
@@ -0,0 +1,67 @@
+# ---------- Normal Aliases ----------
+# GPG
+alias gdk='gpg --delete-keys'
+alias gdsk='gpg --delete-secret-keys'
+alias gik='gpg --import '
+alias gk='gpg --list-keys'
+alias grk='gpg --receive-keys'
+alias gsk='gpg --list-secret-keys'
+
+# Neomutt
+alias neomuttconf='cd -- ${XDG_CONFIG_HOME:-${HOME}/.config}/neomutt'
+alias neomuttrc='${EDITOR} ${XDG_CONFIG_HOME:-${HOME}/.config}/neomutt/neomuttrc'
+
+# Neovim
+alias nvimcomm='${EDITOR} ${XDG_CONFIG_HOME:-${HOME}/.config}/nvim/commands'
+alias nvimconf='cd "${XDG_CONFIG_HOME:-${HOME}/.config}/nvim"'
+alias nvimft='cd "${XDG_DATA_HOME:-${HOME}/.local/share}/nvim/site/ftplugin"'
+alias nvimplug='${EDITOR} -- "${XDG_CONFIG_HOME:-${HOME}/.config}/nvim/plugins.vim"'
+alias nvimkey='${EDITOR} -- "${XDG_CONFIG_HOME:-${HOME}/.config}/nvim/keybindings.vim"'
+alias nvimrc='${EDITOR} -- "${XDG_CONFIG_HOME:-${HOME}/.config}/nvim/init.vim"'
+alias swapdir='cd -- "${XDG_DATA_HOME:-${HOME}/.local/share}/nvim/swap"'
+alias vmore='nvim -u "${XDG_CONFIG_HOME:-${HOME}/.config}/nvim/pager.vim" -'
+
+# Personal
+alias :q='exit'
+alias ct='cptemplate'
+alias less='less -i --'
+alias la='ls --almost-all --color --group-directories-first --human-readable -l'
+alias ls='ls --color --group-directories-first'
+alias ll='ls --classify --color --group-directories-first --human-readable -l'
+alias python='python3'
+alias spcli='speedtest-cli --secure'
+alias tmux='tmux -f "${XDG_CONFIG_HOME:-${HOME}/.config}"/tmux/tmux.conf'
+alias tmuxrc='nvim -- "${XDG_CONFIG_HOME:-${HOME}/.config}"/tmux/tmux.conf'
+alias tuir='tuir --no-flash'
+alias wget='wget --hsts-file="${XDG_DATA_HOME}/wget-hsts"'
+
+# Navigation
+alias dirconf='"${EDITOR}" -- "${XDG_CONFIG_HOME:-${HOME}/.config}/user-dirs.dirs"'
+alias dotfiles='cd "${HOME}/Dotfiles"'
+alias xch='cd -- ${XDG_CONFIG_HOME:-${HOME}/.config}'
+alias xcah='cd -- ${XDG_CACHE_HOME:-${HOME}/.cache}'
+alias xdh='cd -- ${XDG_DATA_HOME:-${HOME}/.local/share}'
+
+# Programming
+# Use python-pytest-xdist plugin
+#alias pytest='pytest --numprocesses=$(nproc)'
+alias pyarchive='git archive -o rbackup-"$(python setup.py --version)".tar.gz --prefix=rbackup-"$(python setup.py --version)"/'
+
+# ssh
+alias scpe='scp -i "${HOME}/.ssh/empress"'
+alias sshconfig='"${EDITOR}" -- ${HOME}/.ssh/config'
+
+# system
+alias myip='curl ifconfig.me'
+
+# zsh
+alias zdotdir='cd -- ${ZDOTDIR:-${HOME}/.zsh}'
+alias zshaliases='${EDITOR} -- ${ZDOTDIR:-${HOME}/.zsh}/conf.d/00-aliases.zsh'
+alias zbindings='${EDITOR} -- ${ZDOTDIR:-${HOME}/.zsh}/conf.d/keybindings.zsh'
+alias zhist='${EDITOR} -- ${HISTFILE}'
+alias zmod='cd -- ${ZDOTDIR:-${HOME}/.zsh}/conf.d/modules'
+alias zpath='${EDITOR} -- ${ZDOTDIR:-${HOME}/.zsh}/conf.d/path.zsh'
+alias zprompt='${EDITOR} -- ${ZDOTDIR:-${HOME}/.zsh}/conf.d/prompt.zsh'
+alias zshrc='${EDITOR} -- ${ZDOTDIR:-${HOME}/.zsh}/.zshrc'
+alias zshrefresh='source -- ${ZDOTDIR:-${HOME}/.zsh}/.zshrc'
+alias zshenv='${EDITOR} -- ${ZDOTDIR:-${HOME}/.zsh}/.zshenv'