diff --git a/vim/after/syntax/cpp.vim b/vim/after/syntax/cpp.vim
index 79b5fb6..53fae74 100644
--- a/vim/after/syntax/cpp.vim
+++ b/vim/after/syntax/cpp.vim
@@ -9,6 +9,11 @@ endif
 syn match cxxObjects           "\<[A-Z][A-Za-z0-9_]*[a-z][A-Za-z0-9_]*\>"
 syn match cxxMetaFunction      "\<[a-z][a-z0-9]*_[a-z0-9_]*[a-z0-9]\>"
 
+syn keyword cppType noexcept decltype
+syn keyword cppStatement static_assert
+
+syn keyword cxxConstants       nullptr
+
 syn keyword cxxExceptionNames  Exception Exceptions
 syn match   cxxExceptionNames  "\<[A-Z][A-Za-z0-9_]*Exception\>"
 
@@ -39,6 +44,7 @@ if version >= 508 || !exists("did_cxx_syntax_inits")
   HiLink cxxExceptionNames Exception
   HiLink cxxErrorNames     Error
   HiLink cxxDebug          Debug
+  HiLink cxxConstants      Constant
 
   delcommand HiLink
 endif
diff --git a/vim/after/syntax/doxygen.vim b/vim/after/syntax/doxygen.vim
new file mode 100644
index 0000000..ff7c6b9
--- /dev/null
+++ b/vim/after/syntax/doxygen.vim
@@ -0,0 +1 @@
+syn keyword doxygenParam contained tparam nextgroup=doxygenParamName,doxygenParamDirection skipwhite
diff --git a/vim/vimrc.fileprefs b/vim/vimrc.fileprefs
index ee03f5d..8eea182 100644
--- a/vim/vimrc.fileprefs
+++ b/vim/vimrc.fileprefs
@@ -10,7 +10,10 @@ au BufNewFile,BufRead		*.cpp,*.hpp,*.cc,*.h		setf cpp
 " Alephaish
 au BufNewFile,BufRead		*.cpp,*.hpp,*.cc,*.h		set sw=4
 au BufNewFile,BufRead		*.cpp,*.hpp,*.cc,*.h		set ts=4
+au BufNewFile,BufRead		*.cpp,*.hpp,*.cc,*.h		set sts=4
+au BufNewFile,BufRead		*.cpp,*.hpp,*.cc,*.h		set sta
 au BufNewFile,BufRead		*.cpp,*.hpp,*.cc,*.h		set noet
+au BufNewFile,BufRead		*.cpp,*.hpp,*.cc,*.h		set tw=150
 
 au BufNewFile,BufRead		*/cshenv/tcshrc.*		setf tcsh
 
@@ -20,6 +23,14 @@ au BufNewFile,BufRead		*/cshenv/tcshrc.*		setf tcsh
 "au BufNewFile,BufRead		*.cpp,*.hpp,*.cc,*.h		set sw=3
 "au BufNewFile,BufRead		*.cpp,*.hpp,*.cc,*.h		set et
 
+" mongoish
+"au BufNewFile,BufRead		*.cpp,*.hpp,*.cc,*.h		set ts=2
+"au BufNewFile,BufRead		*.cpp,*.hpp,*.cc,*.h		set sts=2
+"au BufNewFile,BufRead		*.cpp,*.hpp,*.cc,*.h		set sw=2
+"au BufNewFile,BufRead		*.cpp,*.hpp,*.cc,*.h		set sta
+"au BufNewFile,BufRead		*.cpp,*.hpp,*.cc,*.h		set et
+"au BufNewFile,BufRead		*.cpp,*.hpp,*.cc,*.h		set tw=100
+
 au FileType * setlocal formatoptions=tcq
 
 if has("syntax")
diff --git a/vim/vimrc.globalprefs b/vim/vimrc.globalprefs
index 392ba26..79ac458 100644
--- a/vim/vimrc.globalprefs
+++ b/vim/vimrc.globalprefs
@@ -38,6 +38,8 @@ set modelines=16
 "Wildcard expansion menu from command-colon line
 set wildmenu
 
+set mps+=<:>
+
 if &term =~ "rxvt"
     set t_Co=16
 endif
diff --git a/vim/vimrc.keymaps b/vim/vimrc.keymaps
index c4af0f1..5594ad5 100644
--- a/vim/vimrc.keymaps
+++ b/vim/vimrc.keymaps
@@ -9,9 +9,8 @@ map Y y$
 
 map zz zM
 
-map _w :!/bbsrc/bin/prod/bin/aotools/bdewrap
+map [3~ :cn
 
-map _1 :.!bde_underlineheading
-map _2 :.!bde_underlineheading -l2
-map _3 :.!bde_underlineheading -l3
-map _4 :.!bde_underlineheading -l4
+"map _ :1,$!/opt/local/bin/clang-format-mp-3.9 -style=file
:1,$!/opt/local/bin/uncrustify -q -lCPP -c ~/adamformat/adam.format.cfg
+map _ :1,$!/opt/local/bin/uncrustify -q -lCPP -c ~/adamformat/adam.format.cfg
+map \ :1,$!/opt/local/bin/clang-format-mp-3.9 -style=file