diff --git a/.shared_exports b/.shared_exports
deleted file mode 100644
index 45acb349..00000000
--- a/.shared_exports
+++ /dev/null
@@ -1,2 +0,0 @@
-export VISUAL=emacs
-export EDITOR=emacs
\ No newline at end of file
diff --git a/.zshrc b/.zshrc
deleted file mode 100644
index adaac904..00000000
--- a/.zshrc
+++ /dev/null
@@ -1,32 +0,0 @@
-# Path to your oh-my-zsh configuration.
-ZSH=$HOME/.oh-my-zsh
-
-# Customize to your needs...
-for file in ~/.{path,bash_prompt,exports,shared_exports,aliases,functions,extra}; do
-	[ -r "$file" ] && source "$file"
-done
-
-# Set name of the theme to load.
-# Look in ~/.oh-my-zsh/themes/
-# Optionally, if you set this to "random", it'll load a random theme each
-# time that oh-my-zsh is loaded.
-ZSH_THEME="fino"
-
-# Example aliases
-# alias zshconfig="mate ~/.zshrc"
-# alias ohmyzsh="mate ~/.oh-my-zsh"
-
-# Set to this to use case-sensitive completion
-# CASE_SENSITIVE="true"
-
-# Comment this out to disable bi-weekly auto-update checks
-# DISABLE_AUTO_UPDATE="true"
-
-# Uncomment to change how many often would you like to wait before auto-updates occur? (in days)
-# export UPDATE_ZSH_DAYS=13
-
-plugins=(git github heroku)
-
-source $ZSH/oh-my-zsh.sh
-
-unset file
\ No newline at end of file
diff --git a/oh-my-zsh b/oh-my-zsh
index 99f632ec..9845316d 160000
--- a/oh-my-zsh
+++ b/oh-my-zsh
@@ -1 +1 @@
-Subproject commit 99f632ec0d0f7c78a1d0c99359f71c461cdd8222
+Subproject commit 9845316df9bcab666b68ddb4bb615c138bc4ff93
diff --git a/tmux-powerline b/tmux-powerline
index a3acc1e2..e881fe0b 160000
--- a/tmux-powerline
+++ b/tmux-powerline
@@ -1 +1 @@
-Subproject commit a3acc1e209edc6853e99b0d64999d11e40912beb
+Subproject commit e881fe0b4017d775abc25962b65522b97fe518ee