diff --git a/colors/gruvbox.vim b/colors/gruvbox.vim
index 5b4812ee..3bdd6c0b 100644
--- a/colors/gruvbox.vim
+++ b/colors/gruvbox.vim
@@ -45,6 +45,14 @@ if !exists('g:gruvbox_italicize_strings')
 	let g:gruvbox_italicize_strings=0
 endif
 
+if !exists('g:gruvbox_improved_strings')
+	let g:gruvbox_improved_strings=0
+endif
+
+if !exists('g:gruvbox_improved_warnings')
+	let g:gruvbox_improved_warnings=0
+endif
+
 if !exists('g:gruvbox_termcolors')
 	let g:gruvbox_termcolors=256
 endif
@@ -440,7 +448,12 @@ call s:HL('lCursor', 'none', 'none', 'inverse')
 " }}}
 " Syntax Highlighting: {{{
 
-call s:HL('Special', 'orange')
+if g:gruvbox_improved_strings == 0
+	call s:HL('Special', 'orange')
+else
+	call s:HL('Special', 'dark1', 'orange', 'italic')
+endif
+
 if g:gruvbox_italicize_comments == 0
 	call s:HL('Comment', 'medium', 'none')
 else
@@ -488,7 +501,11 @@ call s:HL('Character', 'purple')
 if g:gruvbox_italicize_strings == 0
 	call s:HL('String',  'green')
 else
-	call s:HL('String',  'green', 'none', 'italic')
+	if g:gruvbox_improved_strings == 0
+		call s:HL('String',  'green', 'none', 'italic')
+	else
+		call s:HL('String',  'dark1', 'light1', 'italic')
+	endif
 endif
 " Boolean constant: TRUE, false
 call s:HL('Boolean',   'purple')
@@ -536,8 +553,12 @@ call s:HL('DiffText',   'dark0', 'yellow')
 " Spelling: {{{
 
 if has("spell")
-	" Not capitalised word
-	call s:HL('SpellCap',   'none', 'none', 'undercurl', 'red')
+	" Not capitalised word, or compile warnings
+	if g:gruvbox_improved_warnings == 0
+		call s:HL('SpellCap',   'none', 'none', 'undercurl', 'red')
+	else
+		call s:HL('SpellCap',   'green', 'none', 'italic,bold')
+	endif
 	" Not recognized word
 	call s:HL('SpellBad',   'none', 'none', 'undercurl', 'blue')
 	" Wrong spelling for selected region