   'core_types': {
     'comment': 'Built-in/core type'
     'name': 'storage.type.core.reason'
-    'match': '\\b(bool|option|string|char|usize|isize|u8|u16|u32|u64|i8|i16|i32|i64|f32|f64|str|self)\\b'
-  }
-  'core_vars': {
-    'comment': 'Core type variant'
-    'name': 'support.constant.core.reason'
-    'match': '\\b(Some|None|Ok|Err)\\b'
+    'match': '\\b(bool|option|string|float|int|list|array|char|usize|isize|u8|u16|u32|u64|i8|i16|i32|i64|f32|f64|str|self)\\b'
   }
   'core_marker': {
     'comment': 'Core trait (marker)'

      { 'include': '#block_comment' }
      { 'include': '#line_comment' }
      { 'include': '#sigils' }
      { 'include': '#mut' }
      { 'include': '#ref_lifetime' }
      { 'include': '#core_types' }
      { 'include': '#core_marker' }

    'name': 'keyword.operator.sigil.reason'
    'match': '[&*](?=[a-zA-Z0-9_\\(\\[\\|\\"]+)'
  }
  'variant': {
    'comment': 'variant value/type or module'
    'name': 'variable.language.reason'
    'match': '\\b[A-Z][a-zA-Z0-9\'_]*\\b'
  }
  'mutable': {
    'comment': 'Mutable storage modifier'
    'name': 'storage.modifier.mut.reason'
    'match': '\\bmutable\\b'
  }
  'box': {
    'comment': 'Box storage modifier'
