diff --git a/.gitmodules b/.gitmodules
index efd61a0..150274e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "vim/pack/plugins/start/syntastic"]
 	path = vim/pack/plugins/start/syntastic
 	url = https://github.com/vim-syntastic/syntastic.git
+[submodule "dircolors-solarized"]
+	path = dircolors-solarized
+	url = https://github.com/seebi/dircolors-solarized
diff --git a/Makefile b/Makefile
index 766f5de..28aa519 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,18 @@
 LN_FLAGS = -sfnv
 MKDIR_FLAGS = -pv
 
-<<<<<<< HEAD
-home_symlinks = aliases Xresources xbindkeysrc xinitrc offlineimaprc urlview msmtprc mutt zprofile zshrc vimrc vim Xmodmap
-=======
-home_symlinks = vimrc vim bash_profile
->>>>>>> be3d088b245011c8fe325ad807f90fbbcf691edb
+home_symlinks = aliases Xresources xbindkeysrc xinitrc offlineimaprc urlview msmtprc mutt zprofile zshrc vimrc vim Xmodmap bash_profile
 
 config_copy = 
 
-config_symlinks =
+config_symlinks = termite dircolors-solarized
 
-all: install
 
-<<<<<<< HEAD
-install: aliases Xresources xbindkeysrc xinitrc offlineimaprc urlview msmtprc mutt zprofile zshrc vimrc vim Xmodmap
-=======
-install: vimrc vim bash_profile
->>>>>>> be3d088b245011c8fe325ad807f90fbbcf691edb
+all: 
+
+local_install: aliases Xresources xbindkeysrc xinitrc offlineimaprc urlview msmtprc mutt zprofile zshrc vimrc vim Xmodmap termite dircolors-solarized
+
+remote_install: bash_profile vim vimrc dircolors-solarized
 
 .PHONY: $(home_symlinks)
 $(home_symlinks):
diff --git a/dircolors-solarized b/dircolors-solarized
new file mode 160000
index 0000000..2720cb1
--- /dev/null
+++ b/dircolors-solarized
@@ -0,0 +1 @@
+Subproject commit 2720cb1ff508bc358f9414f63370f0c6cd767b98
diff --git a/termite/config b/termite/config
new file mode 100644
index 0000000..0eae241
--- /dev/null
+++ b/termite/config
@@ -0,0 +1,29 @@
+# Solarized dark color scheme
+
+[colors]
+foreground = #839496
+foreground_bold = #eee8d5
+#foreground_dim = #888888
+background = #002b36
+cursor = #93a1a1
+
+# if unset, will reverse foreground and background
+#highlight = #839496
+
+# colors from color0 to color254 can be set
+color0 = #073642
+color1 = #dc322f
+color2 = #859900
+color3 = #b58900
+color4 = #268bd2
+color5 = #d33682
+color6 = #2aa198
+color7 = #eee8d5
+color8 = #002b36
+color9 = #cb4b16
+color10 = #586e75
+color11 = #657b83
+color12 = #839496
+color13 = #6c71c4
+color14 = #93a1a1
+color15 = #fdf6e3
diff --git a/termite/solarized-dark b/termite/solarized-dark
new file mode 100644
index 0000000..0eae241
--- /dev/null
+++ b/termite/solarized-dark
@@ -0,0 +1,29 @@
+# Solarized dark color scheme
+
+[colors]
+foreground = #839496
+foreground_bold = #eee8d5
+#foreground_dim = #888888
+background = #002b36
+cursor = #93a1a1
+
+# if unset, will reverse foreground and background
+#highlight = #839496
+
+# colors from color0 to color254 can be set
+color0 = #073642
+color1 = #dc322f
+color2 = #859900
+color3 = #b58900
+color4 = #268bd2
+color5 = #d33682
+color6 = #2aa198
+color7 = #eee8d5
+color8 = #002b36
+color9 = #cb4b16
+color10 = #586e75
+color11 = #657b83
+color12 = #839496
+color13 = #6c71c4
+color14 = #93a1a1
+color15 = #fdf6e3
diff --git a/termite/solarized-light b/termite/solarized-light
new file mode 100644
index 0000000..43d2c2d
--- /dev/null
+++ b/termite/solarized-light
@@ -0,0 +1,29 @@
+# Solarized light color scheme
+
+[colors]
+foreground = #657b83
+foreground_bold = #073642
+#foreground_dim = #888888
+background = #fdf6e3
+cursor = #586e75
+
+# if unset, will reverse foreground and background
+#highlight = #839496
+
+# colors from color0 to color254 can be set
+color0 = #073642
+color1 = #dc322f
+color2 = #859900
+color3 = #b58900
+color4 = #268bd2
+color5 = #d33682
+color6 = #2aa198
+color7 = #eee8d5
+color8 = #002b36
+color9 = #cb4b16
+color10 = #586e75
+color11 = #657b83
+color12 = #839496
+color13 = #6c71c4
+color14 = #93a1a1
+color15 = #fdf6e3
diff --git a/zshrc b/zshrc
index 089ae41..a74d080 100644
--- a/zshrc
+++ b/zshrc
@@ -1,92 +1,23 @@
-# If you come from bash you might have to change your $PATH.
-# export PATH=$HOME/bin:/usr/local/bin:$PATH
+### ZSH Config
 
-# Path to your oh-my-zsh installation.
-  export ZSH=/home/paul/.oh-my-zsh
+## Path to your oh-my-zsh installation.
+export ZSH=/home/paul/.oh-my-zsh
 
-# Set name of the theme to load. Optionally, if you set this to "random"
-# it'll load a random theme each time that oh-my-zsh is loaded.
-# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
+## See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
 ZSH_THEME="steeef"
 
-# Uncomment the following line to use case-sensitive completion.
-# CASE_SENSITIVE="true"
-
-# Uncomment the following line to use hyphen-insensitive completion. Case
-# sensitive completion must be off. _ and - will be interchangeable.
-# HYPHEN_INSENSITIVE="true"
-
-# Uncomment the following line to 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 to disable colors in ls.
-# DISABLE_LS_COLORS="true"
-
-# Uncomment the following line to disable auto-setting terminal title.
-# DISABLE_AUTO_TITLE="true"
-
-# Uncomment the following line to enable command auto-correction.
-# ENABLE_CORRECTION="true"
-
-# Uncomment the following line to display red dots whilst waiting for completion.
-# COMPLETION_WAITING_DOTS="true"
-
-# 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="mm/dd/yyyy"
-
-# Would you like to use another custom folder than $ZSH/custom?
-# ZSH_CUSTOM=/path/to/new-custom-folder
-
-# 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
 plugins=(git vi-mode history-substring-search)
 
 source $ZSH/oh-my-zsh.sh
 
-# User configuration
 
-# export MANPATH="/usr/local/man:$MANPATH"
-
-# You may need to manually set your language environment
-# export LANG=en_US.UTF-8
-
-# Preferred editor for local and remote sessions
-# if [[ -n $SSH_CONNECTION ]]; then
-#   export EDITOR='vim'
-# else
-#   export EDITOR='mvim'
-# fi
-
-# 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"
-
-export GPG_TTY=$(tty)
+### User configuration
 source ~/.aliases
 
+## GPG Auth method
+export GPG_TTY=$(tty)
+
 ##  Vim stuff
 # Reduce delay swithing between normal & insert mode
 export KEYTIMEOUT=1
@@ -97,3 +28,6 @@ bindkey '^J' history-beginning-search-forward
 
 # ctrl-w removed word backwards
 bindkey '^w' backward-kill-word
+
+## Dircolors
+eval `dircolors ~/.config/dircolors-solarized/dircolors.256dark`