diff --git a/colors/paper-custom.erb b/colors/paper-custom.erb
index 7c5e3ca..80426ba 100644
--- a/colors/paper-custom.erb
+++ b/colors/paper-custom.erb
@@ -115,7 +115,6 @@
           [ "Include", "NONE", fg_weak, "NONE" ],
 
           [ "Comment", "NONE", fg_weak, "bold,italic" ],
-          [ "CommentDim", "NONE", ui_bg, "bold,italic" ],
           [ "SpecialComment", "NONE", fg_strong, "italic"],
           [ "Todo", "NONE", fg_todo, "bold,italic" ],
 
@@ -138,15 +137,15 @@
 
 
           [ "VertSplit", bg, ui_bg, "NONE" ],
-          [ "FoldColumn", bg, ui_fg_weak, "NONE" ],
+          [ "FoldColumn", bg, fg_weak, "NONE" ],
           [ "ColorColumn", bg_colorcolumn, "NONE", "NONE" ],
           [ "SignColumn", bg, ui_fg_strong, "NONE" ],
           [ "CursorLine", bg_cursorline, "NONE", "NONE" ],
 
           [ "Title", "NONE", fg_strong, "bold,italic" ],
 
-          [ "LineNr", bg, ui_fg_weak, "NONE" ],
-          [ "CursorLineNr", bg, ui_fg_weak, "bold" ],
+          [ "LineNr", bg, fg_weak, "NONE" ],
+          [ "CursorLineNr", bg, fg_weak, "bold" ],
 
           [ "Pmenu", ui_bg, ui_fg, "NONE" ],
           [ "PmenuSbar", ui_bg, ui_fg, "NONE" ],
diff --git a/colors/paper-custom.vim b/colors/paper-custom.vim
index 0df2a60..9126198 100644
--- a/colors/paper-custom.vim
+++ b/colors/paper-custom.vim
@@ -50,7 +50,6 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running")
     hi PreProc ctermbg=NONE ctermfg=238 cterm=bold guibg=NONE guifg=#9d9d9d gui=bold
     hi Include ctermbg=NONE ctermfg=238 cterm=NONE guibg=NONE guifg=#9d9d9d gui=NONE
     hi Comment ctermbg=NONE ctermfg=238 cterm=bold,italic guibg=NONE guifg=#9d9d9d gui=bold,italic
-    hi CommentDim ctermbg=NONE ctermfg=238 cterm=bold,italic guibg=NONE guifg=#efefef gui=bold,italic
     hi SpecialComment ctermbg=NONE ctermfg=232 cterm=italic guibg=NONE guifg=#777777 gui=italic
     hi Todo ctermbg=NONE ctermfg=196 cterm=bold,italic guibg=NONE guifg=#d70000 gui=bold,italic
     hi Ignore ctermbg=NONE ctermfg=234 cterm=NONE guibg=NONE guifg=#ffffff gui=NONE
@@ -66,13 +65,13 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running")
     hi TabLineItem ctermbg=238 ctermfg=243 cterm=italic guibg=#efefef guifg=#929292 gui=italic
     hi TabLineItemSel ctermbg=238 ctermfg=255 cterm=italic guibg=#efefef guifg=#555555 gui=italic
     hi VertSplit ctermbg=234 ctermfg=238 cterm=NONE guibg=#ffffff guifg=#efefef gui=NONE
-    hi FoldColumn ctermbg=234 ctermfg=240 cterm=NONE guibg=#ffffff guifg=#bbbbbb gui=NONE
+    hi FoldColumn ctermbg=234 ctermfg=238 cterm=NONE guibg=#ffffff guifg=#9d9d9d gui=NONE
     hi ColorColumn ctermbg=250 ctermfg=NONE cterm=NONE guibg=#f7f2f2 guifg=NONE gui=NONE
     hi SignColumn ctermbg=234 ctermfg=255 cterm=NONE guibg=#ffffff guifg=#555555 gui=NONE
     hi CursorLine ctermbg=250 ctermfg=NONE cterm=NONE guibg=#eeeeee guifg=NONE gui=NONE
     hi Title ctermbg=NONE ctermfg=232 cterm=bold,italic guibg=NONE guifg=#777777 gui=bold,italic
-    hi LineNr ctermbg=234 ctermfg=240 cterm=NONE guibg=#ffffff guifg=#bbbbbb gui=NONE
-    hi CursorLineNr ctermbg=234 ctermfg=240 cterm=bold guibg=#ffffff guifg=#bbbbbb gui=bold
+    hi LineNr ctermbg=234 ctermfg=238 cterm=NONE guibg=#ffffff guifg=#9d9d9d gui=NONE
+    hi CursorLineNr ctermbg=234 ctermfg=238 cterm=bold guibg=#ffffff guifg=#9d9d9d gui=bold
     hi Pmenu ctermbg=238 ctermfg=243 cterm=NONE guibg=#efefef guifg=#929292 gui=NONE
     hi PmenuSbar ctermbg=238 ctermfg=243 cterm=NONE guibg=#efefef guifg=#929292 gui=NONE
     hi PmenuSel ctermbg=238 ctermfg=255 cterm=bold guibg=#efefef guifg=#555555 gui=bold
@@ -366,7 +365,6 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16
     hi PreProc ctermbg=NONE ctermfg=gray cterm=bold
     hi Include ctermbg=NONE ctermfg=gray cterm=NONE
     hi Comment ctermbg=NONE ctermfg=gray cterm=bold,italic
-    hi CommentDim ctermbg=NONE ctermfg=gray cterm=bold,italic
     hi SpecialComment ctermbg=NONE ctermfg=gray cterm=italic
     hi Todo ctermbg=NONE ctermfg=red cterm=bold,italic
     hi Ignore ctermbg=NONE ctermfg=black cterm=NONE
diff --git a/init.vim b/init.vim
index ead0791..5e7f9dc 100644
--- a/init.vim
+++ b/init.vim
@@ -181,11 +181,11 @@ function! ToggleHighlights() abort "{{{
 		let b:toggle_highlights_state = ! b:toggle_highlights_state
 	endif
 
-	echom 'state: ' . b:toggle_highlights_state
+	" TODO account for dark/light colour schemes
 	if b:toggle_highlights_state == 1
-		hi! link Comment None
+		hi Comment guifg=#9d9d9d
 	else
-		hi! link Comment CommentDim
+		hi Comment guifg=#d6d6d6
 	endif
 endfunction
 "}}}
@@ -286,7 +286,7 @@ set wrapmargin=0
 
 setlocal cursorline
 
-set foldcolumn=0
+set foldcolumn=2
 set signcolumn=yes
 set colorcolumn=80,120
 
@@ -348,7 +348,6 @@ nnoremap <space>rr :%s/\<<Ckr>=expand('<cword>')<CR>\>//g<left><left>
 nnoremap <silent> <cr>s :syntax on<cr>
 nnoremap <silent> <cr>S :syntax off<cr>
 "   miscallaneous {{{
-nnoremap <cr>fc :set foldcolumn=
 nnoremap <cr>l :colorscheme paper-custom<cr>
 nnoremap <silent> <cr>c :call ToggleHighlights()<cr>
 nnoremap <cr>d :colorscheme monotonous-dark<cr>