diff --git a/doc/vim/enhancements.md b/doc/vim/enhancements.md
index 078b0597..7f36bd52 100644
--- a/doc/vim/enhancements.md
+++ b/doc/vim/enhancements.md
@@ -9,3 +9,7 @@
 * AnsiEsc - inteprets ansi color codes inside log files. great for looking at Rails logs
 * solarized - a color scheme scientifically calibrated for awesomeness (including skwp mods for ShowMarks)
 * Airline - Improved status bar. Requires patched fonts (installed from fonts/ directory)
+
+YADR provides solarized enhancements that make it even better. If you're using another theme, you can disable them with this line in `~/.vimrc.before`:
+
+    let g:yadr_disable_solarized_enhancements=1
diff --git a/vim/settings/solarized.vim b/vim/settings/solarized.vim
index f334422b..5fd1742c 100644
--- a/vim/settings/solarized.vim
+++ b/vim/settings/solarized.vim
@@ -2,67 +2,69 @@ if !has("gui_macvim")
   set t_Co=256
 endif
 
-hi! link txtBold Identifier
-hi! link zshVariableDef Identifier
-hi! link zshFunction Function
-hi! link rubyControl Statement
-hi! link rspecGroupMethods rubyControl
-hi! link rspecMocks Identifier
-hi! link rspecKeywords Identifier
-hi! link rubyLocalVariableOrMethod Normal
-hi! link rubyStringDelimiter Constant
-hi! link rubyString Constant
-hi! link rubyAccess Todo
-hi! link rubySymbol Identifier
-hi! link rubyPseudoVariable Type
-hi! link rubyRailsARAssociationMethod Title
-hi! link rubyRailsARValidationMethod Title
-hi! link rubyRailsMethod Title
-hi! link rubyDoBlock Normal
-hi! link MatchParen DiffText
+if !exists("g:yadr_disable_solarized_enhancements")
+  hi! link txtBold Identifier
+  hi! link zshVariableDef Identifier
+  hi! link zshFunction Function
+  hi! link rubyControl Statement
+  hi! link rspecGroupMethods rubyControl
+  hi! link rspecMocks Identifier
+  hi! link rspecKeywords Identifier
+  hi! link rubyLocalVariableOrMethod Normal
+  hi! link rubyStringDelimiter Constant
+  hi! link rubyString Constant
+  hi! link rubyAccess Todo
+  hi! link rubySymbol Identifier
+  hi! link rubyPseudoVariable Type
+  hi! link rubyRailsARAssociationMethod Title
+  hi! link rubyRailsARValidationMethod Title
+  hi! link rubyRailsMethod Title
+  hi! link rubyDoBlock Normal
+  hi! link MatchParen DiffText
 
-hi! link CTagsModule Type
-hi! link CTagsClass Type
-hi! link CTagsMethod Identifier
-hi! link CTagsSingleton Identifier
+  hi! link CTagsModule Type
+  hi! link CTagsClass Type
+  hi! link CTagsMethod Identifier
+  hi! link CTagsSingleton Identifier
 
-hi! link javascriptFuncName Type
-hi! link jsFuncCall jsFuncName
-hi! link javascriptFunction Statement
-hi! link javascriptThis Statement
-hi! link javascriptParens Normal
-hi! link jOperators javascriptStringD
-hi! link jId Title
-hi! link jClass Title
+  hi! link javascriptFuncName Type
+  hi! link jsFuncCall jsFuncName
+  hi! link javascriptFunction Statement
+  hi! link javascriptThis Statement
+  hi! link javascriptParens Normal
+  hi! link jOperators javascriptStringD
+  hi! link jId Title
+  hi! link jClass Title
 
-hi! link NERDTreeFile Constant
-hi! link NERDTreeDir Identifier
+  hi! link NERDTreeFile Constant
+  hi! link NERDTreeDir Identifier
 
-hi! link sassMixinName Function
-hi! link sassDefinition Function
-hi! link sassProperty Type
-hi! link htmlTagName Type
+  hi! link sassMixinName Function
+  hi! link sassDefinition Function
+  hi! link sassProperty Type
+  hi! link htmlTagName Type
 
-hi! PreProc gui=bold
+  hi! PreProc gui=bold
 
-" Solarized separators are a little garish.
-" This moves separators, comments, and normal
-" text into the same color family as the background.
-" Using the http://drpeterjones.com/colorcalc/,
-" they are now just differently saturated and
-" valued riffs on the background color, making
-" everything play together just a little more nicely.
-hi! VertSplit guifg=#003745 cterm=NONE term=NONE ctermfg=NONE ctermbg=NONE
-hi! LineNR guifg=#004C60 gui=bold guibg=#002B36 ctermfg=146
-hi! link NonText VertSplit
-hi! Normal guifg=#77A5B1
-hi! Constant guifg=#00BCE0
-hi! Comment guifg=#52737B
-hi! link htmlLink Include
-hi! CursorLine cterm=NONE gui=NONE
-hi! Visual ctermbg=233
-hi! Type gui=bold
-hi! EasyMotionTarget guifg=#4CE660 gui=bold
+  " Solarized separators are a little garish.
+  " This moves separators, comments, and normal
+  " text into the same color family as the background.
+  " Using the http://drpeterjones.com/colorcalc/,
+  " they are now just differently saturated and
+  " valued riffs on the background color, making
+  " everything play together just a little more nicely.
+  hi! VertSplit guifg=#003745 cterm=NONE term=NONE ctermfg=NONE ctermbg=NONE
+  hi! LineNR guifg=#004C60 gui=bold guibg=#002B36 ctermfg=146
+  hi! link NonText VertSplit
+  hi! Normal guifg=#77A5B1
+  hi! Constant guifg=#00BCE0
+  hi! Comment guifg=#52737B
+  hi! link htmlLink Include
+  hi! CursorLine cterm=NONE gui=NONE
+  hi! Visual ctermbg=233
+  hi! Type gui=bold
+  hi! EasyMotionTarget guifg=#4CE660 gui=bold
 
-" Make sure this file loads itself on top of any other color settings
-au VimEnter * so ~/.vim/settings/solarized.vim
+  " Make sure this file loads itself on top of any other color settings
+  au VimEnter * so ~/.vim/settings/solarized.vim
+endif