diff --git a/README.markdown b/README.markdown
index 1b92d67..b7c3560 100644
--- a/README.markdown
+++ b/README.markdown
@@ -12,8 +12,8 @@
 ## Why thematic?
 
 You may be among the many Vim users who keep things simple by sticking
-with a single theme that suits their needs, configuring it in their `.vimrc`
-by setting the color scheme, font and status line.
+with a single theme that suits their needs, configuring it in their
+`.vimrc` by setting the color scheme, font and status line.
 
 Or you might instead be among the users who instead configure the visual
 details of Vim to match the lighting conditions or task at hand, or even
@@ -130,8 +130,9 @@ For console or GUI Vim:
 * `fold-column-color-mute` - temporarily modifies colorscheme to hide
   indicators in foldcolumn
 
-For GUI-based options, see the `vim-thematic-gui` plugin. Here’s
-a summary:
+For GUI-based options, see the
+[vim-thematic-gui](https://github.com/reedes/vim-thematic-gui) plugin.
+Here’s a summary:
 
 * `typeface`, `font-size`, and `linespace` - be specific about typography
 * `fullscreen` and `fullscreen-background-color-fix` - force a switch to
@@ -141,7 +142,7 @@ a summary:
 
 ## FAQ
 
-### Q: I want to set `cursorline`, `wrap`, `textwidth`, etc. in my themes.
+### Q: I want to set `cursorline`, `wrap`, `textwidth`, `foldcolumn`, etc. in my themes.
 
 thematic focuses exclusively on global settings. The settings above are
 not globally-scoped but are instead scoped to individual buffers and
@@ -219,7 +220,7 @@ If you like this plugin, you might like these others from the same author:
 
 ## Future development
 
-If you have any ideas on improving this plugin, please post them to the github
-project issue page.
+If you have any ideas on improving this plugin, please post them to the
+github project issue page.
 
 <!-- vim: set tw=74 :-->
diff --git a/autoload/thematic.vim b/autoload/thematic.vim
index cba2d97..055d83a 100644
--- a/autoload/thematic.vim
+++ b/autoload/thematic.vim
@@ -141,22 +141,20 @@ function! thematic#init(mode)
 
   if thematic#getThemeValue(l:th, 'sign-column-color-fix', 0)
     " Ensure the gutter matches the text background
-    " TODO how about match the number background?
-    hi! SignColumn guifg=fg guibg=bg
+    hi! SignColumn guifg=fg guibg=bg ctermfg=fg ctermbg=bg
   endif
 
   if thematic#getThemeValue(l:th, 'diff-color-fix', 0)
     " Override diff colors
-    " TODO figure out what to do for cterm
-    hi! DiffAdd    guifg=darkgreen  guibg=bg "cterm=bold ctermbg=237 ctermfg=119
-    hi! DiffDelete guifg=darkorange guibg=bg "cterm=bold ctermbg=237 ctermfg=167
-    hi! DiffChange guifg=darkyellow guibg=bg "cterm=bold ctermbg=237 ctermfg=227
-    hi! DiffText   guifg=fg         guibg=bg
+    hi! DiffAdd    guifg=darkgreen  guibg=bg cterm=bold ctermbg=bg ctermfg=119
+    hi! DiffDelete guifg=darkorange guibg=bg cterm=bold ctermbg=bg ctermfg=167
+    hi! DiffChange guifg=darkyellow guibg=bg cterm=bold ctermbg=bg ctermfg=227
+    hi! DiffText   guifg=fg         guibg=bg cterm=none ctermbg=fg ctermfg=fg
   endif
 
   if thematic#getThemeValue(l:th, 'fold-column-color-mute', 0)
     " Ensure the fold column is blank, for non-distracted editing
-    hi! FoldColumn guifg=bg guibg=bg cterm=none ctermbg=none ctermfg=none
+    hi! FoldColumn guifg=bg guibg=bg cterm=bold ctermbg=bg ctermfg=bg
   endif
 
   " ------ Set sign column for all buffers ------