diff --git a/cobalt2.tmTheme b/cobalt2.tmTheme
index e5f8759..9a38479 100644
--- a/cobalt2.tmTheme
+++ b/cobalt2.tmTheme
@@ -926,8 +926,8 @@
Template Literals - ticks
scope
- , template.begin,
- , template.end,
+ , punctuation.definition.string.template.begin.js,
+ , punctuation.definition.string.template.end.js,
settings
@@ -940,7 +940,7 @@
name
Template Literals - words
scope
- template
+ string.template.js
settings
foreground
@@ -953,9 +953,7 @@
Template Literals - expressions
scope
- , string.template.expression.punctuation.begin,
- , string.template.expression.punctuation.end,
- , string.template.expression.brace,
+ , string.template.js punctuation,
settings
@@ -980,7 +978,7 @@
name
Template Literals - language
scope
- template.variable.language
+ string.template variable
settings
fontStyle
@@ -990,6 +988,204 @@
+
+
+ name
+ JavaScript Function
+ scope
+ storage.type.function.jsx
+ settings
+
+ foreground
+ #FFA5F3
+ background
+ #1D3C52
+
+
+
+
+ name
+ Quotes
+ scope
+
+ , punctuation.definition.string.begin.jsx,
+ , punctuation.definition.string.end.jsx,
+
+ settings
+
+ foreground
+ #2EFF00
+
+
+
+
+ name
+ Object Keys
+ scope
+
+ , string.unquoted.label.jsx,
+ , meta.object-literal.key.jsx,
+
+ settings
+
+ foreground
+ #2AFFDF
+
+
+
+
+ name
+ Object Keys - strings
+ scope
+ meta.object-literal.key.string.quoted
+ settings
+
+ foreground
+ #80FFBB
+
+
+
+
+ name
+ Object Keys - functions
+ scope
+ meta.object-literal.key.entity
+ settings
+
+ foreground
+ #FFC600
+
+
+
+
+ name
+ Template Literals - ticks
+ scope
+
+ , punctuation.definition.string.template.begin.jsx,
+ , punctuation.definition.string.template.end.jsx,
+
+ settings
+
+ foreground
+ #2EFF00
+
+
+
+
+ name
+ Template Literals - words
+ scope
+ string.template.jsx
+ settings
+
+ foreground
+ #9EFF80
+
+
+
+
+ name
+ Template Literals - expressions
+ scope
+
+ , string.template.jsx punctuation,
+
+ settings
+
+ foreground
+ #FFFFFF
+
+
+
+
+
+ name
+ TypeScript Function
+ scope
+ storage.type.function.ts
+ settings
+
+ foreground
+ #FFA5F3
+ background
+ #1D3C52
+
+
+
+
+ name
+ Quotes
+ scope
+
+ , punctuation.definition.string.begin.ts,
+ , punctuation.definition.string.end.ts,
+
+ settings
+
+ foreground
+ #2EFF00
+
+
+
+
+ name
+ Template Literals - ticks
+ scope
+
+ , punctuation.definition.string.template.begin.ts,
+ , punctuation.definition.string.template.end.ts,
+
+ settings
+
+ foreground
+ #2EFF00
+
+
+
+
+ name
+ Template Literals - words
+ scope
+ string.template.ts
+ settings
+
+ foreground
+ #9EFF80
+
+
+
+
+ name
+ Template Literals - expressions
+ scope
+
+ , string.template.ts punctuation,
+
+ settings
+
+ foreground
+ #FFFFFF
+
+
+
+
+ name
+ Object Keys
+ scope
+
+ , string.unquoted.label.ts,
+ , meta.object-literal.key.ts,
+
+ settings
+
+ foreground
+ #2AFFDF
+
+
+
+
+
@@ -1001,6 +1197,8 @@
, entity.name.class.js,
, entity.name.type.class.js,
+ , entity.name.class.jsx,
+ , entity.name.type.class.jsx,
settings
@@ -1013,7 +1211,10 @@
name
Class KeyWord
scope
- storage.type.class.js
+
+ , storage.type.class.js,
+ , storage.type.class.jsx,
+
settings
foreground
@@ -1028,6 +1229,8 @@
, storage.type.extends.js,
, storage.modifier.extends.js,
+ , storage.type.extends.jsx,
+ , storage.modifier.extends.jsx,
settings