diff --git a/plugged.vim b/plugged.vim
index 93547b7..d03ef05 100644
--- a/plugged.vim
+++ b/plugged.vim
@@ -24,7 +24,6 @@ Plug 'vimpostor/vim-lumen'
 " External tool integration
 Plug 'tpope/vim-bundler'      " bundler + gem-ctags
 Plug 'tpope/vim-fugitive'     " git
-Plug 'airblade/vim-gitgutter' " git gutter
 Plug 'jremmen/vim-ripgrep'    " rg is the new ag is the new ack
 
 " UI extensions
diff --git a/vimrc b/vimrc
index 5921a15..6f161ee 100644
--- a/vimrc
+++ b/vimrc
@@ -56,7 +56,14 @@ function! DetectMode()
     endif
 endfunction
 
-function! UseTermBG()
+function! ApplyMode()
+    " set theme
+    if &background ==# 'light'
+      colorscheme nofrils-light
+    else
+      colorscheme nofrils-dark
+    endif
+
     "use terminal background
     if has('nvim')
       hi Normal ctermbg=none guibg=none
@@ -71,17 +78,6 @@ function! UseTermBG()
     endif
 endfunction
 
-function! ApplyMode()
-    " set theme
-    if &background ==# 'light'
-      colorscheme habamax
-    else
-      colorscheme habamax
-    endif
-
-    call UseTermBG()
-endfunction
-
 " Terminal behavior and appearance
 if !has('gui_running')
   set showtabline=1           "automatic tab bar
@@ -91,8 +87,7 @@ if !has('gui_running')
   end
 
   if $SSH_CLIENT
-    colorscheme habamax
-    call UseTermBG()
+    colorscheme smpl
   else
     call DetectMode()
     call ApplyMode()