diff --git a/gvimrc b/gvimrc
deleted file mode 100644
index c572937..0000000
--- a/gvimrc
+++ /dev/null
@@ -1,7 +0,0 @@
-" Nice window size for side-by-side editors
-set lines=60 columns=169
-" Cool, dark theme from
-" http://dengmao.wordpress.com/2007/01/22/vim-color-scheme-wombat/
-colorscheme wombat
-" Nice font and size (escape spaces)
-set guifont=Luxi\ Mono\ 10
diff --git a/vimrc b/plugin/00-dustin.vim
similarity index 80%
rename from vimrc
rename to plugin/00-dustin.vim
index cca23e0..2126688 100644
--- a/vimrc
+++ b/plugin/00-dustin.vim
@@ -16,3 +16,11 @@ colorscheme torte
 inoremap jj <esc><right>
 " Shift+Tab to un-indent
 inoremap <S-TAB> <C-D>
+
+if has('gui_running')
+  colorscheme wombat
+endif
+
+autocmd GUIEnter * set lines=60 columns=169
+
+set guifont=Luxi\ Mono\ 10