diff --git a/vimrc b/vimrc
index 40ae225..ae97431 100644
--- a/vimrc
+++ b/vimrc
@@ -12,12 +12,12 @@ call plug#begin('~/.vim/plugged')
     Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
     Plug 'junegunn/fzf.vim',
     Plug 'pbogut/fzf-mru.vim',
-    " Plug 'tpope/vim-fugitive'
     Plug 'junegunn/gv.vim'
     Plug 'jreybert/vimagit'
 
     Plug 'vim-airline/vim-airline'
     Plug 'vim-airline/vim-airline-themes'
+    Plug 'dracula/vim', { 'as': 'dracula' }
 
     Plug 'scrooloose/nerdtree'
     Plug 'wesQ3/vim-windowswap'
@@ -96,7 +96,8 @@ set complete=.,b,u,]
 
 set wildignore+=deps/*,node_modules/*,*.sw?
 
-color desert
+" color desert
+colorscheme dracula
 if has("AirlineTheme")
   if has("gui_running")
     let g:airline_theme="papercolor"
@@ -142,10 +143,6 @@ map ,t3   :echo TabSize(3)<CR>
 map ,t4   :echo TabSize(4)<CR>
 map ,t8   :echo TabSize(8)<CR>
 
-augroup filetype_python
-  call TabSize(2)
-augroup END
-
 " treat C preprocessed assembler files as C
 augroup filetype
   au!
@@ -167,16 +164,15 @@ augroup cppprog
 augroup END
 
 augroup cprog
-  au!
-  au BufRead,BufNewFile *.[ch]     set cindent
-  call TabSize(4)
+    au!
+    au BufRead,BufNewFile *.[ch]     set cindent
+    call TabSize(4)
 augroup END
 
 " Apply the muttrc colouring to mutt setup files:
 au BufNewFile,BufRead .mutt.*                   set ft=muttrc
 
 " Automatic typo fixing
-iab KREN_EMERG KERN_EMERG
 iab compomemt component
 
 " Disable the command 'K' (keyword lookup) 
@@ -226,8 +222,6 @@ nnoremap <leader>qw   /\s<CR>i"<ESC>?\s<CR>i"<ESC>
 " map <C-Up> :wincmd k<CR>
 " map <C-Down> :wincmd j<CR>
 
-" Start recording keystrokes (q to finish)
-map <C-M> qa
 " Replay keystrokes
 map <C-CR> @a
 
@@ -270,8 +264,10 @@ nn  ,s :mks! Session.vim<CR>
 
 " For some reason, the control-up/down doesn't work through putty, so create
 " alternates as well.
-nn  ,p :wincmd k<CR>
+nn  ,k :wincmd h<CR>
 nn  ,l :wincmd j<CR>
+nn  ,p :wincmd k<CR>
+nn  ,; :wincmd l<CR>
 
 " ===================================================================
 
@@ -312,7 +308,7 @@ set autoindent
 set ruler
 
 " Don't highlight search targets (irritating)
-set nohlsearch
+" set nohlsearch
 
 " Return makes a new line at the cursor without entering insert mode
 map <CR> i<CR><ESC>
@@ -348,13 +344,8 @@ nnoremap <leader>n :NERDTreeToggle<cr>
 map       <F6>      :b #<CR>
 nnoremap  <leader>b :b #<CR>
 
-map <F8>   :split<CR>
-map <F9>   :only<CR>
-
 map //        gc$
 
-" map <F11>  :cal SetSyn("c")<CR>
-" map <F11>  :syntax sync fromstart<CR>
 nnoremap <leader>ss :syntax sync fromstart<CR>
 
 nnoremap <leader>t  :TagbarToggle<CR>
@@ -375,7 +366,7 @@ map ` bi"<ESC>wwhi"<ESC>
 " use GNU make (gnu_make is a script to perform builds with GNU make
 " and filter results into GNU format error report)
 " :set mp=gnu_make
-:set mp=make
+" :set mp=make
 
 " xterm title magic
 if "$TERM" != "dumb"