diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..afd112c
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,15 @@
+[submodule ".zsh/ohmyzsh"]
+	path = .zsh/ohmyzsh
+	url = git@github.com:ohmyzsh/ohmyzsh.git
+[submodule ".zsh/zsh-syntax-highlighting"]
+	path = .zsh/zsh-syntax-highlighting
+	url = git@github.com:zsh-users/zsh-syntax-highlighting.git
+[submodule ".zsh/zsh-autosuggestions"]
+	path = .zsh/zsh-autosuggestions
+	url = git@github.com:zsh-users/zsh-autosuggestions.git
+[submodule ".zsh/zsh-completions"]
+	path = .zsh/zsh-completions
+	url = git@github.com:zsh-users/zsh-completions.git
+[submodule ".zsh/zsh-history-substring-search"]
+	path = .zsh/zsh-history-substring-search
+	url = git@github.com:zsh-users/zsh-history-substring-search
diff --git a/.profile b/.profile
deleted file mode 100644
index d89ea5a..0000000
--- a/.profile
+++ /dev/null
@@ -1,27 +0,0 @@
-# ~/.profile: executed by the command interpreter for login shells.
-# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
-# exists.
-# see /usr/share/doc/bash/examples/startup-files for examples.
-# the files are located in the bash-doc package.
-
-# the default umask is set in /etc/profile; for setting the umask
-# for ssh logins, install and configure the libpam-umask package.
-#umask 022
-
-# if running bash
-if [ -n "$BASH_VERSION" ]; then
-    # include .bashrc if it exists
-    if [ -f "$HOME/.bashrc" ]; then
-	. "$HOME/.bashrc"
-    fi
-fi
-
-# set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/bin" ] ; then
-    PATH="$HOME/bin:$PATH"
-fi
-
-# set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/.local/bin" ] ; then
-    PATH="$HOME/.local/bin:$PATH"
-fi
diff --git a/.vimrc b/.vimrc
deleted file mode 100644
index ff93ccc..0000000
--- a/.vimrc
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax on
-
-filetype plugin indent on
-" show existing tab with 2 spaces width
-set tabstop=2
-" when indenting with '>', use 2 spaces width
-set shiftwidth=2
-" On pressing tab, insert 2 spaces
-set expandtab
diff --git a/.zsh/ohmyzsh b/.zsh/ohmyzsh
new file mode 160000
index 0000000..f8bf8f0
--- /dev/null
+++ b/.zsh/ohmyzsh
@@ -0,0 +1 @@
+Subproject commit f8bf8f0029a475831ebfba0799975ede20e08742
diff --git a/.zsh/zsh-autosuggestions b/.zsh/zsh-autosuggestions
new file mode 160000
index 0000000..a411ef3
--- /dev/null
+++ b/.zsh/zsh-autosuggestions
@@ -0,0 +1 @@
+Subproject commit a411ef3e0992d4839f0732ebeb9823024afaaaa8
diff --git a/.zsh/zsh-completions b/.zsh/zsh-completions
new file mode 160000
index 0000000..874bd4d
--- /dev/null
+++ b/.zsh/zsh-completions
@@ -0,0 +1 @@
+Subproject commit 874bd4d32359266d30b8ba602e7256ec72423d1a
diff --git a/.zsh/zsh-history-substring-search b/.zsh/zsh-history-substring-search
new file mode 160000
index 0000000..400e58a
--- /dev/null
+++ b/.zsh/zsh-history-substring-search
@@ -0,0 +1 @@
+Subproject commit 400e58a87f72ecec14f783fbd29bc6be4ff1641c
diff --git a/.zsh/zsh-syntax-highlighting b/.zsh/zsh-syntax-highlighting
new file mode 160000
index 0000000..75ba3d8
--- /dev/null
+++ b/.zsh/zsh-syntax-highlighting
@@ -0,0 +1 @@
+Subproject commit 75ba3d87e346de4fda7ce35c546ed8fa74d73a90
diff --git a/.zshrc b/.zshrc
index 4425d07..ae87374 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,30 +1,47 @@
-source $HOME/.antigen.zsh
 source $HOME/.aliases
 
 # Set $PATH
 export PATH=$HOME/bin:$PATH
 
-# Load the oh-my-zsh's library.
-antigen use oh-my-zsh
+# History
+export HISTFILE=$HOME/.zsh_history
+export HISTSIZE=15000 # keep 15,000 lines in memory
+export SAVEHIST=10000 # but save only 10,000 of them
+export HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE=true
 
-# Bundles from the default repo (robbyrussell's oh-my-zsh).
-antigen bundle git
-antigen bundle heroku
-antigen bundle pip
-antigen bundle lein
-antigen bundle command-not-found
+# Editor
+export EDITOR=nvim
+export GIT_EDITOR=nvim
 
-# Syntax highlighting bundle.
-antigen bundle zsh-users/zsh-syntax-highlighting
-antigen bundle zsh-users/zsh-autosuggestions
+# Compinit
+autoload -Uz compinit
+compinit
 
-# Load the theme.
-antigen theme gentoo
+# ZSH Plugins
 
-# Tell Antigen that you're done.
-antigen apply
+## Oh My Zsh
+source ~/.zsh/ohmyzsh/plugins/pip/pip.plugin.zsh
+source ~/.zsh/ohmyzsh/plugins/command-not-found/command-not-found.plugin.zsh
+source ~/.zsh/ohmyzsh/plugins/docker/_docker
+source ~/.zsh/ohmyzsh/plugins/docker-compose/docker-compose.plugin.zsh
+source ~/.zsh/ohmyzsh/plugins/git/git.plugin.zsh
+source ~/.zsh/ohmyzsh/plugins/golang/golang.plugin.zsh
+source ~/.zsh/ohmyzsh/plugins/jsontools/jsontools.plugin.zsh
+source ~/.zsh/ohmyzsh/plugins/kubectl/kubectl.plugin.zsh
+source ~/.zsh/ohmyzsh/plugins/sudo/sudo.plugin.zsh
 
-# VTE
-if [ $TILIX_ID ] || [ $VTE_VERSION ]; then
-    source /etc/profile.d/vte.sh
-fi
+### Prompt Theme
+source ~/.zsh/ohmyzsh/themes/gentoo.zsh-theme
+
+## zsh-users
+source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
+source ~/.zsh/zsh-completions/zsh-completions.plugin.zsh
+source ~/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+source ~/.zsh/zsh-history-substring-search/zsh-history-substring-search.zsh
+
+# Set Prompt
+setopt promptsubst
+
+# Bindkeys
+bindkey '^[[A' history-substring-search-up
+bindkey '^[[B' history-substring-search-down
\ No newline at end of file