diff --git a/.vim/colors/baraknew.vim b/.vim/colors/baraknew.vim
index 508f553..803aebe 100644
--- a/.vim/colors/baraknew.vim
+++ b/.vim/colors/baraknew.vim
@@ -144,6 +144,12 @@ hi Structure        ctermfg=116                                     cterm=none
 " typedef
 hi Typedef          guifg=#73e1e6                                   gui=none
 hi Typedef          ctermfg=116                                     cterm=none
+" classes? b2ad50/143
+hi Class          guifg=#00afff                                   gui=none
+hi Class          ctermfg=39                                     cterm=none
+
+hi link cCustomClass Class
+hi link javaCustomClass Class
 
 
 " Special Group
@@ -375,3 +381,36 @@ hi makoDelim          guifg=#e9dfaf                                   gui=none g
 hi makoDelim          ctermfg=223                                     cterm=none ctermbg=234
 hi makoEscape term=underline guibg=gray25 ctermbg=234
 
+
+" Specials for org-mode
+" ---------------------
+
+
+" define foreground colors for ****UNfolded**** outline heading levels
+hi OL1 guifg=#7744ff ctermfg=blue
+hi OL2 guifg=#aaaa22 ctermfg=brown
+hi OL3 guifg=#00ccff ctermfg=cyan
+hi OL4 guifg=#999999 gui=italic  	ctermfg=gray
+hi OL5 guifg=#eeaaee ctermfg=lightgray
+hi OL6 guifg=#9966ff 	ctermfg=yellow
+hi OL7 guifg=#dd99dd  	ctermfg=red
+hi OL8 guifg=cyan	ctermfg=grey
+hi OL9 guifg=magenta	ctermfg=blue
+
+" various text item highlightings are below
+hi Properties guifg=pink ctermfg=lightred
+hi Tags guifg=pink ctermfg=lightred
+hi Dates guifg=magenta ctermfg=magenta
+hi stars guifg=#444444 ctermfg=darkgray
+hi Props guifg=#ffa0a0 ctermfg=lightred
+hi code guifg=orange gui=bold ctermfg=14
+hi itals gui=italic guifg=#aaaaaa ctermfg=lightgray
+hi boldtext gui=bold guifg=#aaaaaa ctermfg=lightgray
+hi undertext gui=underline guifg=#aaaaaa ctermfg=lightgray
+hi lnumber guifg=#999999 ctermfg=gray
+
+hi TODO guifg=orange guibg=NONE ctermfg=14 ctermbg=NONE
+hi CANCELED guifg=red guibg=NONE ctermfg=red ctermbg=NONE
+hi STARTED guifg=yellow guibg=NONE ctermfg=yellow ctermbg=NONE
+hi NEXT guifg=cyan guibg=NONE ctermfg=cyan ctermbg=NONE
+hi DONE guifg=green guibg=NONE ctermfg=green ctermbg=NONE
diff --git a/.vim/filetype.vim b/.vim/filetype.vim
index 73269a7..ffac8f0 100644
--- a/.vim/filetype.vim
+++ b/.vim/filetype.vim
@@ -25,6 +25,15 @@ augroup less
   autocmd BufNewFile,BufRead *.less set filetype=less
 augroup END
 
+augroup org
+  " leave these as is:
+  au! BufRead,BufWrite,BufWritePost,BufNewFile *.org 
+  au BufRead,BufNewFile *.org            call org#SetOrgFileType()
+  au BufRead *.org :PreLoadTags
+  au BufWrite *.org :PreWriteTags
+  au BufWritePost *.org :PostWriteTags
+augroup END
+
 au BufNewFile,BufRead motd.public,/tmp/motd.public.r.* setf motd
 
 au Filetype html,xml,xsl source ~/.vim/closetag.vim
@@ -65,3 +74,4 @@ autocmd FileType go let b:auto_trim_whitespace=1
 autocmd FileType cpp let b:auto_trim_whitespace=1
 autocmd FileType perl let b:auto_trim_whitespace=1
 autocmd FileType borg let b:auto_trim_whitespace=1
+
diff --git a/.vim/syntax/javascript.vim b/.vim/syntax/javascript.vim
index 3ba7fca..53b684e 100644
--- a/.vim/syntax/javascript.vim
+++ b/.vim/syntax/javascript.vim
@@ -200,7 +200,8 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink javaScriptBranch               Conditional
   HiLink javaScriptRepeat               Repeat
   HiLink javaScriptStatement            Statement
-  HiLink javaScriptFunction             Function
+"  HiLink javaScriptFunction             Function
+  HiLink javaScriptFunction             Keyword
   HiLink javaScriptError                Error
   HiLink javaScriptParensError          Error
   HiLink javaScriptParensErrA           Error