diff --git a/config/config/nvim/init.vim b/config/config/nvim/init.vim
index 2a9a8ea..d4e44d2 100644
--- a/config/config/nvim/init.vim
+++ b/config/config/nvim/init.vim
@@ -3,10 +3,10 @@ set showmatch
 set ignorecase
 set hlsearch
 set incsearch
-set tabstop=4
-set softtabstop=4
+set tabstop=2
+set softtabstop=2
 set expandtab
-set shiftwidth=4
+set shiftwidth=2
 set autoindent
 set number
 set wildmode=longest,list
diff --git a/config/oh-my-zsh/themes/frisky.zsh-theme b/config/oh-my-zsh/themes/frisky.zsh-theme
new file mode 100644
index 0000000..60951b4
--- /dev/null
+++ b/config/oh-my-zsh/themes/frisky.zsh-theme
@@ -0,0 +1,12 @@
+PROMPT=$'
+%{$fg[blue]%}%/%{$reset_color%} $(git_prompt_info)$(bzr_prompt_info)%{$fg[white]%}[%n@%m]%{$reset_color%} %{$fg[white]%}[%T]%{$reset_color%}
+%{$fg_bold[black]%} 𝝺%{$reset_color%} '
+
+PROMPT2="%{$fg_bold[black]%}%_𝝺 %{$reset_color%}"
+
+GIT_CB="git::"
+ZSH_THEME_SCM_PROMPT_PREFIX="%{$fg[green]%}["
+ZSH_THEME_GIT_PROMPT_PREFIX=$ZSH_THEME_SCM_PROMPT_PREFIX$GIT_CB
+ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}𝚫%{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
diff --git a/config/zshrc b/config/zshrc
index fc038cb..a3d2d46 100644
--- a/config/zshrc
+++ b/config/zshrc
@@ -8,7 +8,7 @@ export ZSH="$HOME/.oh-my-zsh"
 # load a random theme each time oh-my-zsh is loaded, in which case,
 # to know which specific one was loaded, run: echo $RANDOM_THEME
 # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
-ZSH_THEME="frisk"
+ZSH_THEME="frisky"
 
 # Set list of themes to pick from when loading at random
 # Setting this variable when ZSH_THEME=random will cause zsh to load
@@ -103,4 +103,9 @@ source $ZSH/oh-my-zsh.sh
 
 # Aliases
 alias ls="ls -F"
+alias gdiff="git diff"
+alias gdiffc="git diff --cached"
+alias gitc="git commit"
+
 export LC_CTYPE="en_US.UTF-8"
+source ~/.cargo/env
diff --git a/manifest b/manifest
index adfc4d4..b1a7c5f 100644
--- a/manifest
+++ b/manifest
@@ -4,3 +4,4 @@ config/nvim/init.vim
 config/nvim/autoload/plug.vim
 zshrc
 gitconfig
+oh-my-zsh/themes/frisky.zsh-theme