diff --git a/syntax/quox.vim b/syntax/quox.vim
index fe122d9..158d7d9 100644
--- a/syntax/quox.vim
+++ b/syntax/quox.vim
@@ -3,7 +3,9 @@ if exists('b:current_syntax')
 endif
 let b:current_syntax = 'quox'
 
-set isk+=-,#
+setlocal iskeyword+=#
+setlocal iskeyword+=-
+setlocal iskeyword+='
 
 syn match quoxDelim /[\[\](){};]/
 syn match quoxDelim /\<_\>/
@@ -35,8 +37,8 @@ hi def link quoxNat Number
 syn region quoxString start=+"+ end=+"+ skip=+\\"+ contains=quoxCharEsc
 hi def link quoxString String
 
-syn match quoxTag /'\k\+/
-syn region quoxTag start=+'"+ end=+"+ skip=+\\"+ contains=quoxCharEsc
+syn match quoxTag /\<'\k\+/
+syn region quoxTag start=+\<'"+ end=+"+ skip=+\\"+ contains=quoxCharEsc
 hi def link quoxTag Constant
 
 syn match quoxCharEsc /\\\%(\\\|"\|x\x\+;\|[nt]\)/ contained