diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add
index 214a83c..c053272 100644
--- a/vim/spell/en.utf-8.add
+++ b/vim/spell/en.utf-8.add
@@ -186,3 +186,9 @@ teleport
 Bomberman
 mana
 premultiplied
+metaprogramming
+melee
+nootropics
+teleportation
+teleportations
+codiing
diff --git a/vim/spell/en.utf-8.add.spl b/vim/spell/en.utf-8.add.spl
index 5498fc6..524e6cc 100644
Binary files a/vim/spell/en.utf-8.add.spl and b/vim/spell/en.utf-8.add.spl differ
diff --git a/vim/templates/skeleton.plan b/vim/templates/skeleton.plan
index 4fd3a0d..d478124 100644
--- a/vim/templates/skeleton.plan
+++ b/vim/templates/skeleton.plan
@@ -5,6 +5,4 @@ Michael Campagnaro's plan for <month> <day>, 2017
 DO
 +
 
-DONE
-*
-
+EXTRA
diff --git a/vimrc b/vimrc
index eee4305..155e586 100644
--- a/vimrc
+++ b/vimrc
@@ -62,7 +62,21 @@ Plug 'tpope/vim-obsession' " Continuously updated session files
 Plug 'tpope/vim-fugitive' " Git wrapper
 Plug 'tpope/vim-classpath' " TODO: still need this?
 Plug 'junegunn/goyo.vim' " Distraction-free mode with centered buffer
-Plug 'fedorenchik/VimCalc3'
+Plug 'fedorenchik/VimCalc3' " A calculator inside vim
+
+Plug 'suxpert/vimcaps' " Disable capslock (useful if the OS isn't configured to do so)
+Plug 'itchyny/vim-cursorword' " Underlines the word under the cursor
+Plug 'itchyny/thumbnail.vim' " View open buffers in a Chrome-inspired thumbnail layout
+" Google Calendar - :Calendar, :Calendar <year> <m#> <d#>, :Calendar -view=year (-split=veritcal -width=<n>)
+" :Calendar -view=day, :Calendar -first_day=monday
+Plug 'itchyny/calendar.vim'
+Plug 'itchyny/screensaver.vim' " A screensaver view - open with :ScreenSaver
+" (MAYBE) Plug 'itchyny/vim-winfix'
+
+if !IsWindows()
+  Plug 'Shougo/vimproc.vim', {'do' : 'make'}
+  Plug 'itchyny/dictionary.vim' " A way to query dictionary.com with :Dictionary
+endif
 
 " Automatically discover and 'properly' update ctags files on save
 Plug 'craigemery/vim-autotag'
@@ -286,7 +300,7 @@ augroup campoCmds
 
   " Automatically wrap at N characters
   autocmd FileType gitcommit setlocal colorcolumn=72
-  autocmd BufRead,BufNewFile *.{md,txt} execute "setlocal textwidth=" .s:max_row_length
+  autocmd BufRead,BufNewFile *.{md,txt,plan} execute "setlocal textwidth=" .s:max_row_length
 
   " Spell checking
   autocmd FileType gitcommit,markdown,text setlocal spell
@@ -502,6 +516,11 @@ let g:localvimrc_ask = 0
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 noremap <F12> :TagbarToggle<cr>
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" CALENDAR
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+let g:calendar_google_calendar = 1
+
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " SYNTASTIC
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -719,10 +738,21 @@ augroup vimrc_notices
 augroup END
 hi def link MyNotices Notices
 
+augroup vimrc_annotated_todo
+    au!
+    " This was a major pain in the ass to get working...
+    au Syntax * syn match cTodo /@\S\+/
+          \ containedin=.*Comment,vimCommentTitle
+augroup END
+
+augroup vimrc_annotated_notes
+    au!
+    au Syntax * syn match cTodo /#\+ .\+$/
+          \ containedin=.*Comment,vimCommentTitle
+augroup END
 
 "-----------------------------------------------------------------------------------------
 
-
 "################################################################
 "################################################################
 "################################################################
diff --git a/windows/readme.md b/windows/readme.md
index 605a7c1..251987e 100644
--- a/windows/readme.md
+++ b/windows/readme.md
@@ -61,4 +61,12 @@ linked source as well.
 
 * Install Lein: https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein.bat
 
+## Setup Xbox stuff
+
+* Install the xbox controller drivers
+* Turn off stats collection
+  * cmd-r, msconfig.exe, startup tab, uncheck `Microsoft Xbox 360 Accessories`.
+
+## Turn off various startup processes
+* cmd-r, msconfig.exe, startup tab