diff --git a/ivy.vim/syntax/ivy-asm.vim b/ivy.vim/syntax/ivy-asm.vim
index d36403b..2b92782 100755
--- a/ivy.vim/syntax/ivy-asm.vim
+++ b/ivy.vim/syntax/ivy-asm.vim
@@ -7,7 +7,9 @@ set cpoptions&vim
 
 setlocal iskeyword+=@-@
 setlocal iskeyword+=.
-syn keyword	ivyasmUnspecifiedStatement	@end @class @block @import @constpool @selector @ident @atom @package @property @var @msgh @lambda
+syn keyword	ivyasmUnspecifiedStatement
+			\ @end @class @block @import @constpool @selector
+			\ @ident @atom @package @property @var @msgh @lambda
 syn keyword	ivyasmInstruction
 			\ ldr str ret ret.n
 			\ c.z c.nz c.eq c.ne c.lt c.le c.gt c.ge
@@ -16,6 +18,7 @@ syn keyword	ivyasmInstruction
 syn match	ivyasmRegister			"x[0-9]"
 syn match	ivyasmRegister			"x[1-9][0-9]"
 syn keyword	ivyasmIndexBase			self bp sp pool
+syn match	ivyasmLabelRef			"\$[a-zA-Z_][a-zA-Z0-9._]*"
 
 syn match	ivyasmFieldIndex		/#[0-9]\+:\>/
 syn match	ivyasmFieldIndex		/#-[0-9]\+:\>/
@@ -34,7 +37,7 @@ syn region	ivyasmBlockComment		start="/\*"  end="\*/" contains=ivyasmTodo,ivyasm
 syn match	ivyasmLineComment		";.*$" contains=ivyasmTodo,ivyasmBlockComment
 syn cluster	ivyasmComment			contains=ivyasmLineComment,ivyasmBlockComment
 
-syn match	ivyasmPropertyName		/\($\s*\)\@<=[a-zA-Z_][A-Za-z0-9_]*/
+" syn match	ivyasmPropertyName		/\($\s*\)\@<=[a-zA-Z_][A-Za-z0-9_]*/
 syn match	ivyasmFieldName			/\(#[0-9]\+:\s\)\@<=[a-zA-Z_][A-Za-z0-9_]*\>/
 
 syn match	ivyasmClassName			/\(@msgh (\)\@<=\([A-Za-z_][A-Za-z0-9_]*\)\(.\([A-Za-z_][A-Za-z0-9_]*\)\)*\()\)\@=\>/
@@ -52,11 +55,9 @@ syn match	ivyasmSelectorLabel		/\<[A-Za-z_]\([A-Za-z0-9_]*\)\:/
 
 syn match	ivyasmBrackets			"[[\]]" display
 syn match	ivyasmParens			"[()]" display
-syn match	ivyPropertySymbol		"\$" display
 
 " The default highlighting.
 hi def link	ivyasmUnspecifiedStatement	Statement
-hi def link	ivyPropertySymbol		Statement
 
 hi def link	ivyasmInteger			Number
 hi def link	ivyasmFieldIndex		Tag
@@ -64,7 +65,7 @@ hi def link	ivyasmFieldIndex		Tag
 hi def link	ivyasmParens			Delimiter
 hi def link	ivyasmBraces			Structure
 
-hi def link 	ivyasmPropertyName		@property
+" hi def link 	ivyasmPropertyName		@property
 hi def link 	ivyasmFieldName			@variable.parameter
 hi def link 	ivyasmClassName			Type
 hi def link 	ivyasmLambdaName		@variable.parameter
@@ -74,6 +75,7 @@ hi def link 	ivyasmIndexBase			@variable.builtin
 hi def link 	ivyasmRegister			Constant
 
 hi def link 	ivyasmSelectorLabel		Label
+hi def link 	ivyasmLabelRef			Label
 
 hi def link 	ivyasmString			String