diff --git a/.aliasrc b/.aliasrc
new file mode 100644
index 0000000..1fb1c8d
--- /dev/null
+++ b/.aliasrc
@@ -0,0 +1,31 @@
+#!/bin/sh
+alias ka="killall" \
+	mpv="mpv --input-ipc-server=/tmp/mpvsoc$(date +%s)" \
+	magit="nvim -c Magit" \
+	p="sudo pacman" \
+	SS="sudo systemctl" \
+	f="vifm" \
+	g="git" \
+	trem="transmission-remote" \
+	e="$EDITOR" \
+	v="$EDITOR" \
+	x="sxiv -ft *" \
+	sdn="sudo shutdown -h now" \
+	gua="git remote | xargs -L1 git push --all" \
+	ls="ls -hN --color=auto --group-directories-first" \
+	grep="grep --color=auto" \
+	diff="diff --color=auto" \
+	ccat="highlight --out-format=ansi" \
+	yt="youtube-dl --add-metadata -i -o '%(upload_date)s-%(title)s.%(ext)s'" \
+	yta="yt -x -f bestaudio/best" \
+	YT="youtube-viewer" \
+	ref="shortcuts >/dev/null; source ~/.shortcuts" \
+	upc="sudo pacman -Syu; pkill -RTMIN+8 i3blocks" \
+	lsp="pacman -Qett --color=always | less"
+
+command -v nvim >/dev/null && alias vimdiff="nvim -d" # Use neovim for vimdiff if present.
+
+shdl() { curl -O $(curl -s http://sci-hub.tw/"$@" | grep location.href | grep -o http.*pdf) ;}
+se() { du -a ~/.scripts/* ~/.config/* | awk '{print $2}' | fzf | xargs  -r $EDITOR ;}
+sv() { vcopy "$(du -a ~/.scripts/* ~/.config/* | awk '{print $2}' | fzf)" ;}
+vf() { fzf | xargs -r -I % $EDITOR % ;}
diff --git a/.bashrc b/.bashrc
index 366bc56..8569865 100644
--- a/.bashrc
+++ b/.bashrc
@@ -5,42 +5,4 @@ HISTSIZE= HISTFILESIZE= # Infinite history.
 export PS1="\[$(tput bold)\]\[$(tput setaf 1)\][\[$(tput setaf 3)\]\u\[$(tput setaf 2)\]@\[$(tput setaf 4)\]\h \[$(tput setaf 5)\]\W\[$(tput setaf 1)\]]\[$(tput setaf 7)\]\\$ \[$(tput sgr0)\]"
 
 [ -f "$HOME/.shortcuts" ] && source "$HOME/.shortcuts" # Load shortcut aliases
-
-# System Maintainence
-alias mw="~/.config/mutt/mutt-wizard.sh"
-alias sdn="sudo shutdown now"
-alias psref="gpg-connect-agent RELOADAGENT /bye" # Refresh gpg
-alias gua="git remote | xargs -L1 git push --all"
-
-# Some aliases
-alias e="$EDITOR"
-alias p="sudo pacman"
-alias SS="sudo systemctl"
-alias v="$EDITOR"
-alias f="vifm"
-alias r="ranger"
-alias sr="sudo ranger"
-alias ka="killall"
-alias g="git"
-alias trem="transmission-remote"
-alias mkd="mkdir -pv"
-alias ref="shortcuts >/dev/null ; source ~/.bashrc" # Refresh shortcuts manually and reload bashrc
-alias mpv="mpv --input-ipc-server=/tmp/mpvsoc$(date +%s)"
-alias x="sxiv -ft *"
-alias lsp="pacman -Qett --color=always | less"
-
-# Adding color
-alias ls='ls -hN --color=auto --group-directories-first'
-alias grep="grep --color=auto"
-alias diff="diff --color=auto"
-alias ccat="highlight --out-format=ansi" # Color cat - print file with syntax highlighting.
-
-# Internet
-alias yt="youtube-dl --add-metadata -i" # Download video link
-alias yta="yt -x -f bestaudio/best" # Download only audio
-alias YT="youtube-viewer"
-
-shdl() { curl -O $(curl -s http://sci-hub.tw/"$@" | grep location.href | grep -o http.*pdf) ;}
-se() { du -a ~/.scripts/* ~/.config/* | awk '{print $2}' | fzf | xargs  -r $EDITOR ;}
-sv() { vcopy "$(du -a ~/.scripts/* ~/.config/* | awk '{print $2}' | fzf)" ;}
-vf() { fzf | xargs -r -I % $EDITOR % ;}
+[ -f "$HOME/.aliasrc" ] && source "$HOME/.aliasrc"
diff --git a/.bmfiles b/.bmfiles
index 863796e..d657c83 100644
--- a/.bmfiles
+++ b/.bmfiles
@@ -1,22 +1,17 @@
 bf	~/.bmfiles
 bd	~/.bmdirs
 cfb	~/.bashrc
+cfa	~/.aliasrc
 cfz	~/.zshrc
 cfv	~/.config/nvim/init.vim
 cfr	~/.config/ranger/rc.conf
 cfi	~/.config/i3/config
-cfq	~/.config/qutebrowser/config.py
 cfm	~/.config/mutt/muttrc
-cft	~/.config/termite/config
 eb	~/Documents/LaTeX/uni.bib
 cv	~/Documents/LaTeX/cv.tex
-cfp	~/.config/polybar/config
 cfd	~/.Xdefaults
 cfu	~/.config/newsboat/urls
 cfn	~/.config/newsboat/config
-cfA	~/.asoundrc
 cfmb	~/.config/ncmpcpp/bindings
 cfmc	~/.config/ncmpcpp/config
-cfmpd	~/.config/mpd/mpd.conf
-cfM	~/.config/mpd/mpd.conf
 er	~/.referbib