diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1377554
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.swp
diff --git a/cfg/vimrc b/cfg/vimrc
new file mode 100644
index 0000000..2146232
--- /dev/null
+++ b/cfg/vimrc
@@ -0,0 +1,14 @@
+call plug#begin('~/.vim/plugged')
+Plug 'vim-airline/vim-airline'
+call plug#end()
+
+" general config
+set number
+
+" Allow saving files as root when vim was launched as user
+cmap w!! w !sudo tee > /dev/null %
+
+" vim-airline configuration
+set laststatus=2
+let g:airline_powerline_fonts = 1
+let g:airline#extensions#tabline#enabled = 1
diff --git a/cfg/zshrc b/cfg/zshrc
new file mode 100644
index 0000000..8101eca
--- /dev/null
+++ b/cfg/zshrc
@@ -0,0 +1,68 @@
+# Path to your oh-my-zsh installation.
+ZSH=/usr/share/oh-my-zsh/
+
+# Autojump
+source /usr/share/autojump/autojump.zsh
+
+# ZSH Theme
+ZSH_THEME="agnoster"
+
+# Use case-sensitive completion.
+CASE_SENSITIVE="true"
+
+# Use hyphen-insensitive completion. Case-sensitive completion must be off.
+# HYPHEN_INSENSITIVE="true"
+
+# Disable bi-weekly auto-update checks.
+DISABLE_AUTO_UPDATE="true"
+
+# Uncomment the following line to change how often to auto-update (in days).
+# export UPDATE_ZSH_DAYS=13
+
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
+# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+HIST_STAMPS="yyyy-mm-dd"
+
+# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
+# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
+plugins=(git)
+
+
+### User configuration
+
+export MANPATH="/usr/local/man:$MANPATH"
+
+export LANG=en_US.UTF-8
+
+# Preferred editor for local and remote sessions
+export EDITOR='vim'
+
+# Compilation flags
+export ARCHFLAGS="-arch x86_64"
+
+# ssh
+export SSH_KEY_PATH="~/.ssh/rsa_id"
+
+# Set personal aliases, overriding those provided by oh-my-zsh libs,
+# plugins, and themes. Aliases can be placed here, though oh-my-zsh
+# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# For a full list of active aliases, run `alias`.
+#
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+
+ZSH_CACHE_DIR=$HOME/.cache/oh-my-zsh
+if [[ ! -d $ZSH_CACHE_DIR ]]; then
+  mkdir $ZSH_CACHE_DIR
+fi
+
+source $ZSH/oh-my-zsh.sh
diff --git a/configure.sh b/configure.sh
index bb7773c..69fd9eb 100755
--- a/configure.sh
+++ b/configure.sh
@@ -25,6 +25,7 @@ ln() {
 }
 
 install_i3() {
+	# Install Packages
 	if ! (pacman -Q i3-gaps >/dev/null 2>&1);
 	then
 		lnh "Installing i3-gaps from AUR..."
@@ -56,12 +57,28 @@ install_i3() {
 		pacman -S compton --noconfirm
 	fi;
 
-	### Configuration Files
+	### Install Service Files
+	lnh "Installing Services"
+	# Suspend locker
+	lnf
+	sudo cp -v cfg/systemd/system/suspend@.service /etc/systemd/system/
+	# Auto locker
+	lnf
+	sudo cp -v cfg/systemd/user/locker.service /etc/systemd/user
+	sudo systemctl daemon-reload
+	lnh "Enabling Services"
+	lnf
+	sudo systemctl enable suspend@$USER.service
+	lnf
+	systemctl --user enable locker.service
+
+
+	### Install Configuration Files
 	lnh  "Installing General Configuration Files"
 	# Compton
 	lnf
 	cp -v cfg/compton/config ~/.config/compton/config
-	# NCMPCPP config
+	# NCMPCPP ws10 config
 	lnf
 	cp -v cfg/termite/ncmpcpp_config ~/.config/termite/ncmpcpp_config
 
@@ -75,21 +92,6 @@ install_i3() {
 	cp -v cfg/wallpapers/wallpaper* ~/Pictures/
 	lnfbe
 
-	### Install Service Files
-	lnh "Installing Services"
-	# Suspend locker
-	lnf
-	sudo cp -v cfg/systemd/system/suspend@.service /etc/systemd/system/
-	# Auto locker
-	lnf
-	sudo cp -v cfg/systemd/user/locker.service /etc/systemd/user
-	sudo systemctl daemon-reload
-	lnh "Enabling Services"
-	lnf
-	sudo systemctl enable suspend@$USER.service	
-	lnf
-	systemctl --user enable locker.service
-
 	lnh "Select a Platform"
 	platform_opt=("Desktop" "Laptop")
 	select opt in "${platform_opt[@]}"
@@ -118,7 +120,21 @@ install_i3_laptop() {
 	lnfb
 	cp -v cfg/i3blocks/laptop/blocks/* ~/.config/i3blocks/blocks/
 	lnfbe
-	
+}
+
+configure_common() {
+	lnh "Installing Common Configuration Files"
+	# ZSH
+	lnf
+	cp -v cfg/zshrc ~/.zshrc
+
+	# VIM
+	lnf
+	cp -v cfg/vimrc ~/.vimrc
+	# Install Vim Plugins
+	vim +PlugInstall +qall
+
+	# MPD + NCMPCPP
 }
 
 echo "Select a Window Manager"
@@ -134,6 +150,6 @@ do
 			install_i3
 			break
 			;;
-		*) echo "Invalid Option";; 
+		*) echo "Invalid Option";;
 	esac
 done
diff --git a/packages.txt b/packages.txt
new file mode 100644
index 0000000..d89dd67
--- /dev/null
+++ b/packages.txt
@@ -0,0 +1,14 @@
+termite
+
+vim
+vim-plug
+
+mpd
+ncmpcpp
+
+zsh
+oh-my-zsh
+
+networkmanager
+
+