diff --git a/syntax/nomsu.vim b/syntax/nomsu.vim
index b8effee..2b24899 100644
--- a/syntax/nomsu.vim
+++ b/syntax/nomsu.vim
@@ -19,13 +19,13 @@ syn region nomsuComment start=/\(^\z(\s*\)\)\@<=#/ skip=/\n\s*$/ end=/\n\(\z1\s\
 hi nomsuComment ctermfg=DarkBlue
 hi def link nomsuComment Comment
 
-syn region nomsuList start=/\[/ end=/\]/ contains=@nomsuAll,nomsuComma nextgroup=nomsuIndex
+syn region nomsuList start=/\[/ end=/\]\|$/ contains=@nomsuAll,nomsuComma nextgroup=nomsuIndex
 hi nomsuList ctermfg=Blue
 
-syn region nomsuDict start=/{/ end=/}/ contains=nomsuDictWordKey,nomsuComma,@nomsuAll nextgroup=nomsuIndex
+syn region nomsuDict start=/{/ end=/}\|$/ contains=nomsuDictWordKey,nomsuComma,@nomsuAll nextgroup=nomsuIndex
 hi nomsuDict ctermfg=Green
 
-syn region nomsuParenGroup start=/(/ end=/)/ contains=@nomsuAll nextgroup=nomsuIndex
+syn region nomsuParenGroup start=/(/ end=/)\|$/ contains=@nomsuAll nextgroup=nomsuIndex
 hi nomsuParenGroup ctermfg=Yellow
 
 syn match nomsuLongTextStart /"\\$/ contained
@@ -34,9 +34,9 @@ hi def link nomsuLongTextStart String
 syn match nomsuTextBackslash /\\\(\\\)\@=/ nextgroup=nomsuTextEscapedBackslash contained
 hi nomsuTextBackslash ctermfg=Gray
 syn match nomsuTextEscapedChar /\(\x\{1,3}\|x\x\{1,2}\|.\)/ contained
-hi nomsuTextEscapedChar ctermfg=Magenta cterm=reverse
+hi nomsuTextEscapedChar cterm=bold ctermfg=Blue
 syn match nomsuTextEscapedBackslash /./ contained
-hi nomsuTextEscapedBackslash ctermfg=Magenta cterm=reverse
+hi nomsuTextEscapedBackslash cterm=bold ctermfg=Blue
 syn match nomsuTextEscape /\\/ nextgroup=nomsuTextEscapedChar contained
 hi nomsuTextEscape ctermfg=Gray
 syn match nomsuInterp /\\\([%[{(]\)\@=/ nextgroup=nomsuVar,nomsuList,nomsuDict,nomsuParenGroup contained
@@ -59,21 +59,27 @@ syn match nomsuTextWord /\([a-zA-Z_]\|[^\x00-\xff]\)\([a-zA-Z0-9_]\|[^\x00-\xff]
 hi def link nomsuTextWord String
 
 syn match nomsuVar /%\(\([a-zA-Z0-9_-]\|[^\x00-\xff]\)\+\([a-zA-Z0-9_-]\|[^\x00-\xff]\)*\)\?/ nextgroup=nomsuIndex
+"syn match nomsuVar /([ ]*\([a-zA-Z_]\|[^\x00-\xff]\)\([a-zA-Z0-9_ ]\|[^\x00-\xff]\)*)/ contains=nomsuVarParens nextgroup=nomsuIndex
+"syn match nomsuVar /\$\(\([a-zA-Z0-9_-]\|[^\x00-\xff]\)\+\([a-zA-Z0-9_-]\|[^\x00-\xff]\)*\)\?/ nextgroup=nomsuIndex
 hi nomsuVar ctermfg=Cyan
 hi def link nomsuVar Identifier
 
+syn match nomsuVarParens /[()]/ contained
+hi nomsuVarParens ctermfg=DarkGray
+
 syn match nomsuIndex /\./ nextgroup=nomsuVar,nomsuNumber,nomsuParenGroup,nomsuText,nomsuList,nomsuDict,nomsuTextWord
 hi nomsuIndex ctermfg=Yellow
 
 syn match nomsuWord /\([a-zA-Z_]\|[^\x00-\xff]\)\([a-zA-Z0-9_]\|[^\x00-\xff]\)*/
 hi def link nomsuWord Function
 hi nomsuWord ctermfg=White
-syn match nomsuOpWord ;\v[`$~!@^&*_+=|<>?'/-]+;
+syn match nomsuOpWord ;\v[`~!@^&*_+=|<>?'/-]+;
 hi def link nomsuOpWord Function
 hi nomsuOpWord ctermfg=LightYellow
 
 syn match nomsuNumber /-\?\(0x\x\+\|\d\+\(\.\(\d\+\)\?\)\?\|\.\d\+\)/ nextgroup=nomsuIndex
 hi def link nomsuNumber Number
+hi nomsuNumber ctermfg=Red
 
 syn match nomsuDotDot /\.\./
 hi def link nomsuDotDot Special
@@ -87,9 +93,6 @@ syn match nomsuColon /:/
 hi nomsuColon ctermfg=Yellow
 hi def link nomsuColon Delimiter
 
-syn region nomsuDictWordKey start=/\(\([a-zA-Z_]\|[^\x00-\xff]\)\([a-zA-Z0-9_]\|[^\x00-\xff]\)*:\)\@=/ end=/:/
-\                     contains=nomsuColon,nomsuTextWord
-
 syn match nomsuSemicolon /;/
 hi nomsuSemicolon ctermfg=Blue
 hi def link nomsuSemicolon Delimiter
@@ -98,6 +101,9 @@ syn cluster nomsuAll contains=nomsuParenGroup,nomsuText,nomsuLongText,nomsuComme
 \                             nomsuVar,nomsuNumber,nomsuDict,nomsuList,nomsuColon,nomsuSemicolon,
 \                             nomsuDotDot,nomsuWord,nomsuOpWord
 
+syn match nomsuDictWordKey /\([a-zA-Z_]\|[^\x00-\xff]\)\([a-zA-Z0-9_]\|[^\x00-\xff]\)*\(:\)\@=/ contained
+hi def link nomsuDictWordKey String
+
 if !exists('b:current_syntax')
   let b:current_syntax = 'nomsu'
 endif