diff --git a/grammars/cc65-directives.cson b/grammars/cc65-directives.cson
index 16de046..7ab35b0 100644
--- a/grammars/cc65-directives.cson
+++ b/grammars/cc65-directives.cson
@@ -103,7 +103,7 @@ repository:
       }
       # CPU constants
       {
-        match:  '\\b(CPU_6502|CPU_65SC02|CPU_65C02|CPU_65816|CPU_SWEET16|CPU_HUC6280|CPU_ISET_6502|CPU_ISET_65SC02|CPU_ISET_65C02|CPU_ISET_65816|CPU_ISET_SWEET16|CPU_ISET_HUC6280|__APPLE2__|__APPLE2ENH__|__ATARI__|__ATARIXL__|__ATMOS__|__BBC__|__C128__|__C16__|__C64__|__CBM__|__CBM510__|__CBM610__|__GEOS__|__GEOS_APPLE__|__GEOS_CBM__|__LUNIX__|__LYNX__|__NES__|__PET__|__PLUS4__|__SIM6502__|__SIM65C02__|__SUPERVISION__|__VIC20__)\\b'
+        match:  '\\b(CPU_6502|CPU_65SC02|CPU_65C02|CPU_65816|CPU_SWEET16|CPU_HUC6280|CPU_ISET_6502|CPU_ISET_65SC02|CPU_ISET_65C02|CPU_ISET_65816|CPU_ISET_SWEET16|CPU_ISET_HUC6280|__APPLE2__|__APPLE2ENH__|__ATARI__|__ATARIXL__|__ATMOS__|__BBC__|__C128__|__C16__|__C64__|__CBM__|__CBM510__|__CBM610__|__GEOS__|__GEOS_APPLE__|__GEOS_CBM__|__LUNIX__|__LYNX__|__NES__|__PET__|__PLUS4__|__SIM6502__|__SIM65C02__|__SUPERVISION__|__VIC20__|VER_MAJOR|VER_MINOR)\\b'
         name:   'constant.language.cc65-directives'
       }
       # address sizes, macpack packages
diff --git a/grammars/cc65-linker-config.cson b/grammars/cc65-linker-config.cson
index 93b50fc..115095d 100644
--- a/grammars/cc65-linker-config.cson
+++ b/grammars/cc65-linker-config.cson
@@ -43,12 +43,12 @@ repository:
       }
       # hex, prefixed with dollar sign($)
       {
-        match: '-?\\$\\b[a-fA-F0-9]+\\b'
+        match: '\\$\\b[a-fA-F0-9]+\\b'
         name: 'constant.numeric.hex.cc65-linker-config'
       }
       # hex, suffixed with h(h)
       {
-        match: '-?\\b([a-fA-F0-9]+)h\\b'
+        match: '\\b([a-fA-F0-9]+)h\\b'
         name: 'constant.numeric.hex.cc65-linker-config'
       }
       # binary
@@ -81,21 +81,21 @@ repository:
       # linker constants
       {
         match:  '\\b(__NAME_LOAD__|__NAME_RUN__|__NAME_SIZE__|__DATA_LOAD__|__DATA_RUN__|__DATA_SIZE__|__STACK_START__|__STACK_SIZE__|__STACK_LAST__|__STACK_FILEOFFS__)\\b'
-        name:   'constant.language.cc65-directives'
+        name:   'constant.language.cc65-linker-config'
       }
       # address sizes, functions
       {
-        match:  '\\b(?i:direct|zeropage|zp|absolut|abs|near|far|long|dword|atari|cbm|cpu|generic|longbranch|yes|ro|rw|bss)\\b'
-        name:   'constant.other.cc65-directives'
+        match:  '\\b(?i:direct|zeropage|zp|absolut|abs|near|far|long|dword|atari|cbm|cpu|generic|longbranch|yes|ro|rw|bss|weak)\\b'
+        name:   'constant.other.cc65-linker-config'
       }
       # case sensitive symbols
       {
-        match:  '\\b(\\%\\bO|o65)\\b'
-        name:   'constant.other.cc65-directives'
+        match:  '(%\\bO|\\bo65)\\b'
+        name:   'constant.other.cc65-linker-config'
       }
       # operators
       {
         match:  '='
-        name:   'keyword.operator.cc65-directives'
+        name:   'keyword.operator.cc65-linker-config'
       }
     ]