diff --git a/.gitmodules b/.gitmodules
index 4f4e193..674e4c5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "dotdrop"]
 	path = dotdrop
 	url = https://github.com/deadc0de6/dotdrop.git
-[submodule "dotfiles/zsh/ohmyzsh"]
-	path = dotfiles/zsh/ohmyzsh
-	url = https://github.com/ohmyzsh/ohmyzsh
diff --git a/config.yaml b/config.yaml
index a3370db..8971fb2 100644
--- a/config.yaml
+++ b/config.yaml
@@ -15,12 +15,6 @@ dotfiles:
   f_zshrc:
     src: zsh/zshrc
     dst: ~/.zshrc
-  d_ohmyzsh:
-    src: zsh/ohmyzsh
-    dst: ~/.ohmyzsh
-  f_zsh_themes:
-    src: zsh/zsh.themes
-    dst: ~/.ohmyzsh/themes
   f_vimrc:
     src: vim/vimrc
     dst: ~/.vimrc
@@ -131,8 +125,6 @@ profiles:
   zsh:
     dotfiles:
     - f_zshrc
-    - d_ohmyzsh
-    - f_zsh_themes
   vim:
     dotfiles:
     - f_vimrc
diff --git a/dotfiles/vim/vimrc b/dotfiles/vim/vimrc
index 9f7cfea..ebb1bf1 100644
--- a/dotfiles/vim/vimrc
+++ b/dotfiles/vim/vimrc
@@ -77,7 +77,7 @@ set mouse=c
 set undolevels=1337
 set backspace=indent,eol,start
 set wildmenu " autocomplete :e
-set lazyredraw " redraw only when necessary
+"set lazyredraw " redraw only when necessary
 
 " ------------------------------------- Indents & Whitespaces ------------------
 set tabstop=4 " how many spaces are a tab when opening a file
diff --git a/dotfiles/zsh/ohmyzsh b/dotfiles/zsh/ohmyzsh
deleted file mode 160000
index bc9fe74..0000000
--- a/dotfiles/zsh/ohmyzsh
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bc9fe7423f5d8c639b208ebb9a7dbfce078bfd9b
diff --git a/dotfiles/zsh/zshrc b/dotfiles/zsh/zshrc
index 7a9cec8..e5ec8a0 100644
--- a/dotfiles/zsh/zshrc
+++ b/dotfiles/zsh/zshrc
@@ -1,7 +1,3 @@
-export ZSH="/home/$USER/.ohmyzsh"
-
-ZSH_THEME="the-one"
-
 ## Prompt
 autoload -Uz vcs_info
 autoload -U colors && colors
@@ -11,13 +7,6 @@ setopt prompt_subst
 export PROMPT="%{$fg[yellow]%}%m %{$fg_bold[green]%}➜ %{$fg_bold[blue]%}%~ %{$fg_bold[red]%}\$vcs_info_msg_0_ %{$reset_color%}"
 zstyle ':vcs_info:git:*' formats '%b'
 
-DISABLE_AUTO_UPDATE="true"
-COMPLETION_WAITING_DOTS="true"
-DISABLE_UNTRACKED_FILES_DIRTY="true"
-
-plugins=()
-#source $ZSH/oh-my-zsh.sh
-
 ## Exports
 export TERM="xterm-256color"
 export EDITOR="vim"
@@ -90,7 +79,7 @@ bindkey -v
 export FZF_DEFAULT_OPTS='--preview="head {}" --layout=reverse --bind=tab:down --bind=btab:up'
 
 ## fzf Bindings in zsh (C-r and C-t)
-if [[ -x $(which fzf) ]]
+if [[ -x $(which fzf 2> /dev/null) ]]
 then
     source ~/.vim/bundle/fzf/shell/key-bindings.zsh
 else