diff --git a/gvimrc b/gvimrc
index c1df952..064e794 100644
--- a/gvimrc
+++ b/gvimrc
@@ -4,43 +4,6 @@ set guioptions-=e
 
 set cursorline " Highlight cursor line
 
-let g:only_generic_hl=1
-
-com! Dark silent! let g:colors_name_bak = g:colors_name
-      \ | let g:ayucolor="dark"
-      \ | let g:arcadia_Daybreak=0
-      \ | let g:arcadia_Midnight=1
-      \ | let g:alduin_Shout_Become_Ethereal=1
-      \ | set bg=dark
-      \ | silent! exec "colorscheme ".g:colors_name_bak
-      \ | silent! delc PaperColor
-com! Light silent! let g:colors_name_bak = g:colors_name
-      \ | let g:ayucolor="light"
-      \ | let g:arcadia_Daybreak=1
-      \ | let g:arcadia_Midnight=0
-      \ | let g:alduin_Shout_Become_Ethereal=0
-      \ | set bg=light
-      \ | silent! exec "colorscheme ".g:colors_name_bak
-      \ | silent! delc PaperColor
-
-com! Ayu colorscheme ayu
-com! Arcadia colorscheme arcadia
-com! Alduin colorscheme alduin
-com! Moria colorscheme moria
-com! Molokai colorscheme molokai
-com! Iceberg colorscheme iceberg
-com! Papercolor colorscheme PaperColor | delc PaperColor
-com! Firewatch colorscheme two-firewatch
-
-if !exists('g:colors_name')
-  if &diff
-    Moria
-  else
-    Dark
-    Ayu
-  end
-end
-
 if has("unix")
   let g:font_temp="\\\\\\@<! \\zs\\d\\+"
 elseif has("win32")
diff --git a/vim/plugin/colors.vim b/vim/plugin/colors.vim
new file mode 100644
index 0000000..ee4667f
--- /dev/null
+++ b/vim/plugin/colors.vim
@@ -0,0 +1,29 @@
+" For my patched version of the papercolor theme
+let g:only_generic_hl=1
+
+com! Dark silent! let g:colors_name_bak = g:colors_name
+      \ | let g:ayucolor="dark"
+      \ | let g:arcadia_Daybreak=0
+      \ | let g:arcadia_Midnight=1
+      \ | let g:alduin_Shout_Become_Ethereal=1
+      \ | set bg=dark
+      \ | silent! exec "colorscheme ".g:colors_name_bak
+      \ | silent! delc PaperColor
+com! Light silent! let g:colors_name_bak = g:colors_name
+      \ | let g:ayucolor="light"
+      \ | let g:arcadia_Daybreak=1
+      \ | let g:arcadia_Midnight=0
+      \ | let g:alduin_Shout_Become_Ethereal=0
+      \ | set bg=light
+      \ | silent! exec "colorscheme ".g:colors_name_bak
+      \ | silent! delc PaperColor
+
+" Commands for some colorschemes I often use
+com! Ayu colorscheme ayu
+com! Arcadia colorscheme arcadia
+com! Alduin colorscheme alduin
+com! Moria colorscheme moria
+com! Molokai colorscheme molokai
+com! Iceberg colorscheme iceberg
+com! Papercolor colorscheme PaperColor | delc PaperColor
+com! Firewatch colorscheme two-firewatch