diff --git a/CHANGELOG b/CHANGELOG
index 2082b36..5947e3e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+eeleater, 22.02.2017, Cleaned up a bit
+
 eeleater, 06.10.2015, Stuff (look at commits)
 
 eeleater, 22.09.2015, removed Ansible Completion (again...)
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
deleted file mode 100644
index 9bcc131..0000000
--- a/zsh/aliases.zsh
+++ /dev/null
@@ -1,26 +0,0 @@
-# Listing
-source ${HOME}/dotfiles/zsh/aliases.d/list.zsh
-
-# Grep
-source ${HOME}/dotfiles/zsh/aliases.d/grep.zsh
-
-# Tail
-source ${HOME}/dotfiles/zsh/aliases.d/tail.zsh
-
-# CD
-source ${HOME}/dotfiles/zsh/aliases.d/cd.zsh
-
-# Du/Find
-source ${HOME}/dotfiles/zsh/aliases.d/find.zsh
-
-# Stuff
-source ${HOME}/dotfiles/zsh/aliases.d/stuff.zsh
-
-# Interactive
-source ${HOME}/dotfiles/zsh/aliases.d/interactive.zsh
-
-# Own
-source ${HOME}/dotfiles/zsh/aliases.d/own.zsh
-
-# Transfer
-source ${HOME}/dotfiles/zsh/aliases.d/transfer.zsh
diff --git a/zsh/zshrc b/zsh/zshrc
index 91a6247..e82c418 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -1,61 +1,49 @@
-# Oh My ZSH Path
+# Exports - mostly self-explaining
 export ZSH=${HOME}/dotfiles/lib/ohmyzsh
-
-# Oh My ZSH Theme
 ZSH_THEME="mortalscumbag"
-
-# Disable Auto Update of Oh My ZSH
 DISABLE_AUTO_UPDATE="true"
-
-# Go Path
 export GOPATH=${HOME}/go
-
-# Path
-export PATH="${GOPATH}/bin:${HOME}/.gem/ruby/2.2.0/bin:${HOME}/dotfiles/lib/util:${HOME}/dotfiles/lib/dasht/bin:${PATH}"
-
-# Dasht
+export PATH="${GOPATH}/bin:${HOME}/.gem/ruby/2.3.0/bin:${HOME}/dotfiles/lib/util:${HOME}/dotfiles/lib/dasht/bin:${PATH}"
 export DASHT_DOCSETS_DIR=$HOME/.local/share/Zeal/Zeal/docsets
+export EDITOR='nano'
 
 # Plugins
 plugins=(gem bundler composer git vagrant docker python)
 plugins+=(npm systemd systemadmin gitignore tmux extract)
 plugins+=(command-not-found colored-man-pages fabric ansible)
+case $(uname -n) in
+"megumi|sayaka")
+   plugins+=(archlinux)
+  ;;
+"test|git")
+   plugins+=(debian)
+  ;;
+esac
 
-if [ $(uname -n) = "megumi" -o $(uname -n) = "kimari" -o $(uname -n) = "sayaka" ]; then
-    plugins+=(archlinux)
-fi
-if [ $(uname -n) = "test" -o $(uname -n) = "git" ]; then
-    plugins+=(debian)
-fi
-
-# Preferred editor for local and remote sessions
-export EDITOR='nano'
-
-# Load Oh My ZSH
+# Load Parts of Scripts
 source ${ZSH}/oh-my-zsh.sh
 
-# Fix home/end key at work
-bindkey "^[[1~" beginning-of-line
-bindkey "^[[4~" end-of-line
-
-# Source k.sh
-source ${HOME}/dotfiles/lib/k/k.sh
-
-# Shell Syntax Highlighter
+# Syntax Highlighting
 source ${HOME}/dotfiles/lib/highlighting/zsh-syntax-highlighting.zsh
 ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
 
+# Aliases
+for file in ${HOME}/dotfiles/zsh/aliases.d/*.zsh; do
+  source $file
+done
+
+# FZF
+[ -f ${HOME}/.fzf.zsh ] && source ${HOME}/.fzf.zsh
+
+# Local ZSHRC
+[ -f ${HOME}/local.zshrc ] && source ${HOME}/local.zshrc
+
 # Dircolors
 eval `dircolors ${HOME}/dotfiles/zsh/dircolors`
 
-# Source Aliases
-source ${HOME}/dotfiles/zsh/aliases.zsh
-
-# Source FZF
-[ -f ${HOME}/.fzf.zsh ] && source ${HOME}/.fzf.zsh
-
 # Completions Path
 fpath=(${HOME}/dotfiles/lib/completions/src $fpath)
 
-# Source local zshrc
-[ -f ${HOME}/local.zshrc ] && source ${HOME}/local.zshrc
+# Fix home/end key at work -- still needed?
+bindkey "^[[1~" beginning-of-line
+bindkey "^[[4~" end-of-line