diff --git a/ivy.vim/syntax/ivy.vim b/ivy.vim/syntax/ivy.vim
index 032675c..5ef9330 100755
--- a/ivy.vim/syntax/ivy.vim
+++ b/ivy.vim/syntax/ivy.vim
@@ -12,8 +12,8 @@ syn match       ivyType                     /\<[A-Z]\{1,2\}\([a-z0-9]\+[A-Z]\{0,
 syn keyword	ivyStorage	class protocol
 syn keyword	ivyRepeat	for while in break continue
 syn keyword	ivyConditional	if elif else unless match
-syn match	ivySelectorLabel	/\<[a-z]\([A-Za-z0-9_]\+\)\:/
-syn match	ivySelectorLabel	/\<\([a-z]\([A-Za-z0-9_]\+\)\:\)\+/
+syn match	ivySelectorLabel	/\<[a-z]\([A-Za-z0-9_]\+\)\:\(\:\)\@!/
+syn match	ivySelectorLabel	/\<\([a-z]\([A-Za-z0-9_]\+\)\:\(\:\)\@!\)\+/
 syn match	ivyUnnamedVariable	/\<_\>/
 
 syn match	ivyAtomName	/#[a-z][a-z0-9_:/]*\>/
@@ -31,7 +31,8 @@ syn match	ivyLineContinuation	/\\\n/
 " Modifiers
 syn keyword	ivyException	try catch finally throw
 
-syn keyword	ivyBuiltinVar	self error cout cin cerr
+syn match 	ivySelfVar	/\<self\([^a-zA-Z0-9_]\)\@=/
+syn keyword	ivyBuiltinVar	error cout cin cerr
 
 syn keyword	ivyUnspecifiedStatement	end package use as then do get set
 
@@ -137,6 +138,7 @@ hi def link	ivyStorage	Keyword
 hi def link	ivyIsAs 	Keyword
 hi def link	ivyAccessor	Keyword
 hi def link	ivyBuiltinVar	@variable.builtin
+hi def link	ivySelfVar	@variable.builtin
 
 hi def link	ivyStatement	Statement
 hi def link	ivyRepeat	Repeat