diff --git a/plugin/00-dustin.vim b/plugin/00-dustin.vim
index 2126688..2067e70 100644
--- a/plugin/00-dustin.vim
+++ b/plugin/00-dustin.vim
@@ -12,15 +12,18 @@ set splitright
 " Use a dark theme for console editing
 colorscheme torte
 
-" The ESC key is way out of the way. Use jj to switch to normal mode
-inoremap jj <esc><right>
-" Shift+Tab to un-indent
-inoremap <S-TAB> <C-D>
-
+" For the GUI, use a lower contrast theme from
+" http://dengmao.wordpress.com/2007/01/22/vim-color-scheme-wombat/
 if has('gui_running')
   colorscheme wombat
 endif
 
+" Nice font and size (escape spaces) (GUI only)
+set guifont=Luxi\ Mono\ 10
+" Set GUI size for side-by-side editing
 autocmd GUIEnter * set lines=60 columns=169
 
-set guifont=Luxi\ Mono\ 10
+" The ESC key is way out of the way. Use jj to switch to normal mode
+inoremap jj <esc><right>
+" Shift+Tab to un-indent
+inoremap <S-TAB> <C-D>