diff --git a/htop/.config/htop/htoprc b/htop/.config/htop/htoprc
new file mode 100644
index 0000000..6a3a268
--- /dev/null
+++ b/htop/.config/htop/htoprc
@@ -0,0 +1,26 @@
+# Beware! This file is rewritten by htop when settings are changed in the interface.
+# The parser is also very primitive, and not human-friendly.
+fields=0 46 47 1 
+sort_key=46
+sort_direction=1
+hide_threads=0
+hide_kernel_threads=1
+hide_userland_threads=1
+shadow_other_users=0
+show_thread_names=0
+show_program_path=0
+highlight_base_name=0
+highlight_megabytes=1
+highlight_threads=1
+tree_view=1
+header_margin=0
+detailed_cpu_time=0
+cpu_count_from_zero=0
+update_process_names=0
+account_guest_in_cpu_meter=1
+color_scheme=6
+delay=15
+left_meters=LeftCPUs Memory Swap 
+left_meter_modes=1 1 1 
+right_meters=RightCPUs Tasks LoadAverage Uptime 
+right_meter_modes=1 2 2 2 
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
new file mode 100644
index 0000000..809992f
--- /dev/null
+++ b/tmux/.tmux.conf
@@ -0,0 +1,7 @@
+set -g default-terminal "screen-256color"
+
+run-shell "powerline-daemon -q"
+
+source "/usr/share/powerline/bindings/tmux/powerline.conf"
+
+# vim: ft=tmux
diff --git a/zsh/.zlogout b/zsh/.zlogout
new file mode 100644
index 0000000..bd439e0
--- /dev/null
+++ b/zsh/.zlogout
@@ -0,0 +1,5 @@
+# If connected remote
+if [ ! -z "$SSH_TTY" ]; then
+    # cleanup remote gpg agent socket
+    [ -e ~/.gnupg/S.gpg-agent ] && rm ~/.gnupg/S.gpg-agent
+fi
diff --git a/zsh/.zshenv b/zsh/.zshenv
new file mode 100644
index 0000000..de8d423
--- /dev/null
+++ b/zsh/.zshenv
@@ -0,0 +1,35 @@
+export BROWSER="firefox"
+export EDITOR="nvim"
+export TZ="America/Los_Angeles"
+export GTK_THEME="Adwaita:dark"
+export GOPATH=~/.local/lib/go/
+
+# Apply QubesOS specific configuration
+if command -v qubesdb-read &> /dev/null; then
+	export QUBES_GPG_DOMAIN="vault";
+	export SSH_AUTH_SOCK="/home/${USER}/.SSH_AGENT_${QUBES_GPG_DOMAIN}";
+	git config --global gpg.program qubes-gpg-client-wrapper;
+else
+	# Always use gpg2
+	[[ -f /usr/bin/gpg2 ]] && alias gpg="/usr/bin/gpg2"
+fi
+
+alias vi="nvim"
+alias vim="nvim"
+
+path=("$PYENV_ROOT/bin" $path)
+path=("$HOME/.local/bin" $path)
+path=($^path(N)) # remove paths that don't exist
+
+#man theme
+man() {
+    env \
+        LESS_TERMCAP_mb=$(printf "\e[1;31m") \
+        LESS_TERMCAP_md=$(printf "\e[1;31m") \
+        LESS_TERMCAP_me=$(printf "\e[0m") \
+        LESS_TERMCAP_se=$(printf "\e[0m") \
+        LESS_TERMCAP_so=$(printf "\e[1;44;33m") \
+        LESS_TERMCAP_ue=$(printf "\e[0m") \
+        LESS_TERMCAP_us=$(printf "\e[1;32m") \
+        man "$@"
+}
diff --git a/zsh/.zshrc b/zsh/.zshrc
new file mode 100644
index 0000000..71e60d3
--- /dev/null
+++ b/zsh/.zshrc
@@ -0,0 +1,14 @@
+#oh-my-zsh
+ZSH=$HOME/.oh-my-zsh
+DEFAULT_USER="lrvick"
+DISABLE_AUTO_UPDATE="true"
+COMPLETION_WAITING_DOTS="true"
+plugins=(git git-extras mosh vi-mode docker pass systemd z taskwarrior docker docker-compose)
+source $ZSH/oh-my-zsh.sh
+
+#powerline
+pl_zsh_module=/usr/share/powerline/bindings/zsh/powerline.zsh
+[ -f "$pl_zsh_module" ] && source "$pl_zsh_module"
+
+# OPAM configuration
+. /home/lrvick/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true