diff --git a/vim/plugin/settings/powerline.vim b/vim/colors-settings/solarized-powerline.vim
similarity index 100%
rename from vim/plugin/settings/powerline.vim
rename to vim/colors-settings/solarized-powerline.vim
diff --git a/vim/plugin/settings/solarized.vim b/vim/colors-settings/solarized.vim
similarity index 95%
rename from vim/plugin/settings/solarized.vim
rename to vim/colors-settings/solarized.vim
index 44098b9..f88e60c 100644
--- a/vim/plugin/settings/solarized.vim
+++ b/vim/colors-settings/solarized.vim
@@ -62,7 +62,3 @@ hi! link htmlLink Include
 hi! CursorLine cterm=NONE gui=NONE
 hi! Visual ctermbg=233
 hi! Type gui=bold
-
-
-" Enforce the colors set here
-au VimEnter * so ~/.vim/plugin/settings/solarized.vim
diff --git a/vim/plugin/settings/yadr-appearance.vim b/vim/plugin/settings/yadr-appearance.vim
index 15a00c8..94ac9b2 100644
--- a/vim/plugin/settings/yadr-appearance.vim
+++ b/vim/plugin/settings/yadr-appearance.vim
@@ -1,7 +1,24 @@
 " Make it beautiful - colors and fonts
 
 " http://ethanschoonover.com/solarized/vim-colors-solarized
-colorscheme solarized
+let s:myTheme='solarized'
+exec 'colorscheme ' . s:myTheme
+
+" If there's a custom powerline theme too, load it. Otherwise load the
+" solarized one just so it won't look very bad.
+let s:powerlineCustom="~/.vim/colors-settings/" . s:myTheme . "-powerline.vim"
+if filereadable(expand(s:powerlineCustom))
+  exec "au VimEnter * so " . s:powerlineCustom
+else
+  exec "au VimEnter * so ~/.vim/colors-settings/solarized-powerline.vim"
+endif
+
+let s:colorSchemeCustom="~/.vim/colors-settings/" . s:myTheme . ".vim"
+if filereadable(expand(s:colorSchemeCustom))
+  exec "au VimEnter * so " . s:colorSchemeCustom
+endif
+
+
 set background=dark
 
 if has("gui_running")