diff --git a/schemes/GitHub Dark Legacy.sublime-color-scheme b/schemes/GitHub Dark Legacy.sublime-color-scheme
index 082cbb2..7b33053 100644
--- a/schemes/GitHub Dark Legacy.sublime-color-scheme	
+++ b/schemes/GitHub Dark Legacy.sublime-color-scheme	
@@ -98,7 +98,7 @@
             "foreground": "var(blue)"
         },
         {
-            "scope": "support",
+            "scope": "support, support.class.component",
             "foreground": "var(blue)"
         },
         {
diff --git a/schemes/GitHub Dark.sublime-color-scheme b/schemes/GitHub Dark.sublime-color-scheme
index 0d99f85..865fa8c 100644
--- a/schemes/GitHub Dark.sublime-color-scheme	
+++ b/schemes/GitHub Dark.sublime-color-scheme	
@@ -50,7 +50,7 @@
         "tags_foreground": "var(cyan)",
         "tags_options": "underline",
         "gutter": "var(background)",
-        "gutter_foreground": "#8b949e",
+        "gutter_foreground": "color(#8b949e alpha(0.3))",
         "gutter_foreground_highlight": "#c9d1d9",
         "find_highlight": "#ffd33d22",
         "find_highlight_foreground": "#c9d1d9",
@@ -73,19 +73,23 @@
             "foreground": "#79c0ff"
         },
         {
-            "scope": "entity.name,variable.parameter.function,entity.name.function variable.other.readwrite,meta.export.default,meta.definition.variable",
+            "scope": "variable.other.readwrite,variable.parameter.function,meta.export.default,meta.definition.variable,entity.name.type,entity.name.type.module",
             "foreground": "#ffa657"
         },
         {
-            "scope": "meta.jsx.children,meta.block,meta.tag.attributes,meta.object.member,meta.embedded.expression",
-            "foreground": "#c9d1d9"
+            "scope": "entity.name.type.class",
+            "foreground": "#79c0ff"
         },
         {
-            "scope": "entity.name.function,meta.function-call support.function",
+            "scope": "variable.function,entity.name.function,meta.export.default variable.other.readwrite,meta.tag.attributes variable.other.readwrite,entity.name",
             "foreground": "#d2a8ff"
         },
         {
-            "scope": "entity.name.tag,support.class.component",
+            "scope": "meta.jsx.children,meta.block,meta.object.member,meta.embedded.expression",
+            "foreground": "#c9d1d9"
+        },
+        {
+            "scope": "entity.name.tag",
             "foreground": "#7ee787"
         },
         {
@@ -117,7 +121,7 @@
             "foreground": "#ffa657"
         },
         {
-            "scope": "variable.other",
+            "scope": "variable.other,meta.import variable.other.readwrite.alias,meta.import variable.other.readwrite",
             "foreground": "#c9d1d9"
         },
         {
@@ -143,6 +147,7 @@
         {
             "scope": "carriage-return",
             "font_style": "italic underline",
+            "background": "#ff7b72",
             "foreground": "#0d1117"
         },
         {
@@ -162,14 +167,9 @@
             "foreground": "#a5d6ff"
         },
         {
-            "scope": "string.regexp.character-class,string.regexp source.ruby.embedded,string.regexp string.regexp.arbitrary-repitition",
+            "scope": "string.regexp.character-class,string.regexp constant.character.escape,string.regexp source.ruby.embedded,string.regexp string.regexp.arbitrary-repitition",
             "foreground": "#a5d6ff"
         },
-        {
-            "scope": "string.regexp constant.character.escape",
-            "font_style": "bold",
-            "foreground": "#7ee787"
-        },
         {
             "scope": "support.constant",
             "foreground": "#79c0ff"
diff --git a/schemes/GitHub Dimmed.sublime-color-scheme b/schemes/GitHub Dimmed.sublime-color-scheme
index db5cd1c..6e22fd0 100644
--- a/schemes/GitHub Dimmed.sublime-color-scheme	
+++ b/schemes/GitHub Dimmed.sublime-color-scheme	
@@ -50,7 +50,7 @@
         "tags_foreground": "var(cyan)",
         "tags_options": "underline",
         "gutter": "var(background)",
-        "gutter_foreground": "#768390",
+        "gutter_foreground": "color(#768390 alpha(0.3))",
         "gutter_foreground_highlight": "#adbac7",
         "find_highlight": "#ffd33d22",
         "find_highlight_foreground": "#adbac7",
@@ -73,19 +73,23 @@
             "foreground": "#6cb6ff"
         },
         {
-            "scope": "entity.name,variable.parameter.function,entity.name.function variable.other.readwrite,meta.export.default,meta.definition.variable",
+            "scope": "variable.other.readwrite,variable.parameter.function,meta.export.default,meta.definition.variable,entity.name.type,entity.name.type.module",
             "foreground": "#f69d50"
         },
         {
-            "scope": "meta.jsx.children,meta.block,meta.tag.attributes,meta.object.member,meta.embedded.expression",
-            "foreground": "#adbac7"
+            "scope": "entity.name.type.class",
+            "foreground": "#6cb6ff"
         },
         {
-            "scope": "entity.name.function,meta.function-call support.function",
+            "scope": "variable.function,entity.name.function,meta.export.default variable.other.readwrite,meta.tag.attributes variable.other.readwrite,entity.name",
             "foreground": "#dcbdfb"
         },
         {
-            "scope": "entity.name.tag,support.class.component",
+            "scope": "meta.jsx.children,meta.block,meta.object.member,meta.embedded.expression",
+            "foreground": "#adbac7"
+        },
+        {
+            "scope": "entity.name.tag",
             "foreground": "#8ddb8c"
         },
         {
@@ -117,7 +121,7 @@
             "foreground": "#f69d50"
         },
         {
-            "scope": "variable.other",
+            "scope": "variable.other,meta.import variable.other.readwrite.alias,meta.import variable.other.readwrite",
             "foreground": "#adbac7"
         },
         {
@@ -143,6 +147,7 @@
         {
             "scope": "carriage-return",
             "font_style": "italic underline",
+            "background": "#f47067",
             "foreground": "#22272e"
         },
         {
@@ -162,14 +167,9 @@
             "foreground": "#96d0ff"
         },
         {
-            "scope": "string.regexp.character-class,string.regexp source.ruby.embedded,string.regexp string.regexp.arbitrary-repitition",
+            "scope": "string.regexp.character-class,string.regexp constant.character.escape,string.regexp source.ruby.embedded,string.regexp string.regexp.arbitrary-repitition",
             "foreground": "#96d0ff"
         },
-        {
-            "scope": "string.regexp constant.character.escape",
-            "font_style": "bold",
-            "foreground": "#8ddb8c"
-        },
         {
             "scope": "support.constant",
             "foreground": "#6cb6ff"
diff --git a/schemes/GitHub Light Legacy.sublime-color-scheme b/schemes/GitHub Light Legacy.sublime-color-scheme
index b3812ea..6f18131 100644
--- a/schemes/GitHub Light Legacy.sublime-color-scheme	
+++ b/schemes/GitHub Light Legacy.sublime-color-scheme	
@@ -98,7 +98,7 @@
             "foreground": "var(blue)"
         },
         {
-            "scope": "support",
+            "scope": "support, support.class.component",
             "foreground": "var(blue)"
         },
         {
diff --git a/schemes/GitHub Light.sublime-color-scheme b/schemes/GitHub Light.sublime-color-scheme
index e70aec2..784bf48 100644
--- a/schemes/GitHub Light.sublime-color-scheme	
+++ b/schemes/GitHub Light.sublime-color-scheme	
@@ -50,7 +50,7 @@
         "tags_foreground": "var(cyan)",
         "tags_options": "underline",
         "gutter": "var(background)",
-        "gutter_foreground": "#57606a",
+        "gutter_foreground": "color(#57606a alpha(0.3))",
         "gutter_foreground_highlight": "#24292f",
         "find_highlight": "#ffdf5d66",
         "find_highlight_foreground": "#24292f",
@@ -73,19 +73,23 @@
             "foreground": "#0550ae"
         },
         {
-            "scope": "entity.name,variable.parameter.function,entity.name.function variable.other.readwrite,meta.export.default,meta.definition.variable",
+            "scope": "variable.other.readwrite,variable.parameter.function,meta.export.default,meta.definition.variable,entity.name.type,entity.name.type.module",
             "foreground": "#953800"
         },
         {
-            "scope": "meta.jsx.children,meta.block,meta.tag.attributes,meta.object.member,meta.embedded.expression",
-            "foreground": "#24292f"
+            "scope": "entity.name.type.class",
+            "foreground": "#0550ae"
         },
         {
-            "scope": "entity.name.function,meta.function-call support.function",
+            "scope": "variable.function,entity.name.function,meta.export.default variable.other.readwrite,meta.tag.attributes variable.other.readwrite,entity.name",
             "foreground": "#8250df"
         },
         {
-            "scope": "entity.name.tag,support.class.component",
+            "scope": "meta.jsx.children,meta.block,meta.object.member,meta.embedded.expression",
+            "foreground": "#24292f"
+        },
+        {
+            "scope": "entity.name.tag",
             "foreground": "#116329"
         },
         {
@@ -117,7 +121,7 @@
             "foreground": "#953800"
         },
         {
-            "scope": "variable.other",
+            "scope": "variable.other,meta.import variable.other.readwrite.alias,meta.import variable.other.readwrite",
             "foreground": "#24292f"
         },
         {
@@ -143,6 +147,7 @@
         {
             "scope": "carriage-return",
             "font_style": "italic underline",
+            "background": "#cf222e",
             "foreground": "#f6f8fa"
         },
         {
@@ -162,14 +167,9 @@
             "foreground": "#0a3069"
         },
         {
-            "scope": "string.regexp.character-class,string.regexp source.ruby.embedded,string.regexp string.regexp.arbitrary-repitition",
+            "scope": "string.regexp.character-class,string.regexp constant.character.escape,string.regexp source.ruby.embedded,string.regexp string.regexp.arbitrary-repitition",
             "foreground": "#0a3069"
         },
-        {
-            "scope": "string.regexp constant.character.escape",
-            "font_style": "bold",
-            "foreground": "#116329"
-        },
         {
             "scope": "support.constant",
             "foreground": "#0550ae"
diff --git a/src/scheme.ts b/src/scheme.ts
index 8a27a42..e760e95 100644
--- a/src/scheme.ts
+++ b/src/scheme.ts
@@ -86,7 +86,7 @@ export function ui(theme: Primer): UI {
         tags_foreground: 'var(cyan)',
         tags_options: 'underline',
         gutter: 'var(background)',
-        gutter_foreground: color.codemirror.linenumberText,
+        gutter_foreground: `color(${color.codemirror.linenumberText} alpha(0.3))`,
         gutter_foreground_highlight: color.fg.default,
         find_highlight: themes({
             light: '#ffdf5d66',
@@ -143,7 +143,7 @@ export function rules(theme: Primer): Rules[] {
                 'variable.other.constant',
                 'variable.other.object',
                 'variable.language',
-                'entity',
+                'entity'
             ],
             settings: {
                 foreground: themes({
@@ -155,11 +155,12 @@ export function rules(theme: Primer): Rules[] {
         },
         {
             scope: [
-                'entity.name',
+                'variable.other.readwrite',
                 'variable.parameter.function',
-                'entity.name.function variable.other.readwrite',
                 'meta.export.default',
                 'meta.definition.variable',
+                'entity.name.type',
+                'entity.name.type.module',
             ],
             settings: {
                 foreground: themes({
@@ -170,21 +171,22 @@ export function rules(theme: Primer): Rules[] {
             },
         },
         {
-            scope: [
-                'meta.jsx.children',
-                'meta.block',
-                'meta.tag.attributes',
-                'meta.object.member',
-                'meta.embedded.expression',
-            ],
+            scope: ['entity.name.type.class'],
             settings: {
-                foreground: color.fg.default,
+                foreground: themes({
+                    light: scale.blue[6],
+                    dark: scale.blue[2],
+                    dimmed: scale.blue[2],
+                }),
             },
         },
         {
             scope: [
+                'variable.function',
                 'entity.name.function',
-                'meta.function-call support.function',
+                'meta.export.default variable.other.readwrite',
+                'meta.tag.attributes variable.other.readwrite',
+                'entity.name',
             ],
             settings: {
                 foreground: themes({
@@ -195,7 +197,18 @@ export function rules(theme: Primer): Rules[] {
             },
         },
         {
-            scope: ['entity.name.tag', 'support.class.component'],
+            scope: [
+                'meta.jsx.children',
+                'meta.block',
+                'meta.object.member',
+                'meta.embedded.expression',
+            ],
+            settings: {
+                foreground: color.fg.default,
+            },
+        },
+        {
+            scope: ['entity.name.tag'],
             settings: {
                 foreground: themes({
                     light: scale.green[6],
@@ -282,7 +295,11 @@ export function rules(theme: Primer): Rules[] {
             },
         },
         {
-            scope: ['variable.other'],
+            scope: [
+                'variable.other',
+                'meta.import variable.other.readwrite.alias',
+                'meta.import variable.other.readwrite',
+            ],
             settings: {
                 foreground: color.fg.default,
             },
@@ -335,6 +352,11 @@ export function rules(theme: Primer): Rules[] {
             scope: ['carriage-return'],
             settings: {
                 font_style: 'italic underline',
+                background: themes({
+                    light: scale.red[5],
+                    dark: scale.red[3],
+                    dimmed: scale.red[3],
+                }),
                 foreground: themes({
                     light: scale.gray[0],
                     dark: scale.gray[9],
@@ -381,6 +403,7 @@ export function rules(theme: Primer): Rules[] {
         {
             scope: [
                 'string.regexp.character-class',
+                'string.regexp constant.character.escape',
                 'string.regexp source.ruby.embedded',
                 'string.regexp string.regexp.arbitrary-repitition',
             ],
@@ -392,17 +415,6 @@ export function rules(theme: Primer): Rules[] {
                 }),
             },
         },
-        {
-            scope: ['string.regexp constant.character.escape'],
-            settings: {
-                font_style: 'bold',
-                foreground: themes({
-                    light: scale.green[6],
-                    dark: scale.green[1],
-                    dimmed: scale.green[1],
-                }),
-            },
-        },
         {
             scope: ['support.constant'],
             settings: {