--- a/.gvimrc	Tue Mar 26 13:05:36 2024 -0400
+++ b/.gvimrc	Tue Mar 26 16:58:39 2024 -0400
@@ -1,6 +1,3 @@
 set lines=55
 set columns=200
 set guifont=Monaco:h18
-colors default
-set background=dark
-hi Normal guibg=black guifg=white

--- a/.vimrc	Tue Mar 26 13:05:36 2024 -0400
+++ b/.vimrc	Tue Mar 26 16:58:39 2024 -0400
@@ -6,7 +6,15 @@
 set showmatch
 set hls
 hi Normal guibg=black guifg=white
+
+" These were updated in a recent version.. I prefer the old coloring so
+" setting it by default here.
+hi def link diffRemoved WarningMsg
+hi def link diffChanged PreProc
+hi def link diffAdded Identifier
+
 autocmd FileType make setlocal noet | setlocal ts=8 | setlocal sw=8
+let macvim_skip_colorscheme=1
 
 " These might not be needed with the inclusion of vim-sleuth now...
 set autoindent
@@ -23,6 +31,7 @@
 "filetype plugin indent on
 
 call plug#begin()
+" https://github.com/junegunn/vim-plug
 " The default plugin directory will be as follows:
 "   - Vim (Linux/macOS): '~/.vim/plugged'
 "   - Vim (Windows): '~/vimfiles/plugged'
@@ -34,33 +43,54 @@
 " Make sure you use single quotes
 
 " ========== My plugins here ==========
+" https://github.com/vim-airline/vim-airline
+" Status bar.  I like status bars.
+Plug 'vim-airline/vim-airline'
+
+" https://github.com/tpope/vim-sleuth
 " automatically adjusts 'shiftwidth' and 'expandtab' heuristically
 Plug 'tpope/vim-sleuth'
 
+" https://github.com/preservim/vim-indent-guides
 " visually displays indent levels
 Plug 'preservim/vim-indent-guides'
 
+" https://github.com/tpope/vim-endwise
 " wisely 'ends' structures (think do/done in bash, if/fi, etc)
 Plug 'tpope/vim-endwise'
 
+" https://github.com/rstacruz/vim-closer
 " closes brackets
-Plug 'rstacruz/vim-closer'
+""Plug 'rstacruz/vim-closer'
 
+" https://github.com/jiangmiao/auto-pairs
+" Less conservative version of vim-closer, see if it works better
+Plug 'jiangmiao/auto-pairs'
+
+" https://github.com/tpope/vim-surround
 " provides mappings to easily delete, change and add surroundings (quotes, HTML tags, etc) in pairs
 Plug 'tpope/vim-surround'
 
+" https://github.com/ntpeters/vim-better-whitespace
 " highlights whitespace at the end of lines
 Plug 'ntpeters/vim-better-whitespace'
 
+" https://github.com/gabrielelana/vim-markdown
 " markdown syntax highlighting and whatnot (better than the built-in which is similar to tpope from what I can tell)
 Plug 'gabrielelana/vim-markdown'
 
+" https://github.com/jamessan/vim-gnupg
 " gnupg integration (replaces the one I had before)
 Plug 'jamessan/vim-gnupg'
 
+" https://github.com/rodjek/vim-puppet
 " puppet syntax, indenting, etc - recommended by maintainers of the one I had before
 Plug 'rodjek/vim-puppet'
 
+" https://github.com/tpope/vim-fugitive
+" Lots of git integrations
+Plug 'tpope/vim-fugitive'
+
 " ========== My plugins end ==========
 " Below are the examples (commented out) that came with plug