From b76773533a5fa871611f230be416d97e19d698d3 Mon Sep 17 00:00:00 2001
From: deathaxe <deathaxe82@gmail.com>
Date: Sat, 21 Mar 2026 20:44:10 +0100
Subject: [PATCH 1/3] Add Sublime Text specific CSS

---
 .../Sublime CSS (for JSON).sublime-syntax     |  15 ++
 .../Sublime CSS/Sublime CSS.sublime-syntax    | 157 +++++++++++
 .../Sublime JSON/Sublime JSON.sublime-syntax  |  11 +-
 .../Sublime Text Color Scheme.sublime-syntax  | 255 ++++++------------
 .../syntax_test_colorscheme.json              | 124 +++++++--
 .../Sublime Text Theme.sublime-syntax         |  58 ++--
 .../syntax_test_newstyletheme.json            |  91 +++++--
 7 files changed, 461 insertions(+), 250 deletions(-)
 create mode 100644 Package/Sublime CSS/Sublime CSS (for JSON).sublime-syntax
 create mode 100644 Package/Sublime CSS/Sublime CSS.sublime-syntax

diff --git a/Package/Sublime CSS/Sublime CSS (for JSON).sublime-syntax b/Package/Sublime CSS/Sublime CSS (for JSON).sublime-syntax
new file mode 100644
index 00000000..7fcf7f57
--- /dev/null
+++ b/Package/Sublime CSS/Sublime CSS (for JSON).sublime-syntax	
@@ -0,0 +1,15 @@
+%YAML 1.2
+---
+# https://www.sublimetext.com/docs/syntax.html
+scope: source.css.sublime.json-string
+version: 2
+hidden: true
+
+extends: Sublime CSS.sublime-syntax
+
+contexts:
+  prototype:
+    - meta_prepend: true
+    - include: Sublime JSON.sublime-syntax#string-escape
+    - match: $|(?=")
+      pop: 1
diff --git a/Package/Sublime CSS/Sublime CSS.sublime-syntax b/Package/Sublime CSS/Sublime CSS.sublime-syntax
new file mode 100644
index 00000000..b1888b0c
--- /dev/null
+++ b/Package/Sublime CSS/Sublime CSS.sublime-syntax	
@@ -0,0 +1,157 @@
+%YAML 1.2
+---
+# https://www.sublimetext.com/docs/syntax.html
+scope: source.css.sublime
+version: 2
+hidden: true
+
+extends: Packages/CSS/CSS.sublime-syntax
+
+contexts:
+
+  stylesheet:
+    # Note: ST doesn't support at-rules
+    - include: comments
+    - include: selectors
+    - include: property-lists
+    - include: rule-terminators
+    - include: illegal-commas
+    - include: illegal-groups
+
+  at-rules: []
+  nested-at-rules: []
+
+  property-list-body:
+    # Note: ST doesn't support nested selectors
+    - meta_include_prototype: false
+    - meta_scope: meta.property-list.css meta.block.css
+    - match: '{{block_end}}'
+      scope: punctuation.section.block.end.css
+      pop: 1
+    - include: comments
+    - include: property-identifiers
+    - include: property-values
+    - include: rule-terminators
+    - include: illegal-commas
+    - include: illegal-blocks
+    - include: illegal-groups
+
+###[ BUILTIN FUNCTIONS ]#######################################################
+
+  builtin-functions:
+    # Note: ST only supports a limited subset of CSS functions
+    - include: color-adjuster-functions
+
+###[ COLOR FUNCTIONS ]#########################################################
+
+  color-functions:
+    - meta_prepend: true
+    # proprietary color function supported by Sublime Text
+    - match: \b((?i:min-contrast))(\()
+      captures:
+        1: meta.function-call.identifier.css support.function.css
+        2: meta.function-call.arguments.css meta.group.css punctuation.section.group.begin.css
+      push: color-function-argument-list-body
+
+  color-function-argument-list-body:
+    - meta_content_scope: meta.function-call.arguments.css meta.group.css
+    - match: \)
+      scope: meta.function-call.arguments.css meta.group.css punctuation.section.group.end.css
+      pop: 1
+    - include: var-functions
+    - include: color-adjuster-functions
+    - include: color-values
+    - include: none-constants
+    - include: numeric-constants
+    - include: sublime-color-variables
+    - include: other-constants
+
+  color-adjuster-functions:
+    # color adjuster functions supported by Sublime Text
+    - match: \b((?i:blenda?|alpha|saturation|lightness|[asl]))(\()
+      captures:
+        1: meta.function-call.identifier.css support.function.css
+        2: meta.function-call.arguments.css meta.group.css punctuation.section.group.begin.css
+      push: color-adjuster-function-argument-list-body
+
+  color-adjuster-function-argument-list-body:
+    - meta_content_scope: meta.function-call.arguments.css meta.group.css
+    - match: \)
+      scope: meta.function-call.arguments.css meta.group.css punctuation.section.group.end.css
+      pop: 1
+    - include: var-functions
+    - include: color-adjuster-operators
+    - include: color-values
+    - include: none-constants
+    - include: numeric-constants
+    - include: sublime-color-variables
+    - match: \b(?i:rgb|hsl|hwb){{break}}
+      scope: keyword.other.color-space.css
+    - include: other-constants
+
+  var-functions:
+    - match: \b((?i:var))(\()
+      captures:
+        1: meta.function-call.identifier.css support.function.css
+        2: meta.function-call.arguments.css meta.group.css punctuation.section.group.begin.css
+      push: var-function-argument-list-body
+
+  var-function:
+    - match: \b((?i:var))(\()
+      captures:
+        1: meta.function-call.identifier.css support.function.css
+        2: meta.function-call.arguments.css meta.group.css punctuation.section.group.begin.css
+      push: var-function-argument-list-body
+
+  var-function-argument-list-body:
+    # ST's `var()` function does not support default values (e.g. `var(name #fff)`)
+    - meta_content_scope: meta.function-call.arguments.css meta.group.css
+    - match: \)
+      scope: meta.function-call.arguments.css meta.group.css punctuation.section.group.end.css
+      pop: 1
+    - include: sublime-color-variables
+    - include: sublime-other-variables
+
+###[ IDENTIFIERS ]#############################################################
+
+  none-constants:
+    # Note: required until sublimehq/Packages/pulls/3717 (<ST4149)
+    - match: (?i:none){{break}}
+      scope: constant.language.null.css
+
+  sublime-color-variables:
+    - match: |-
+        (?x)
+        --(?:
+            background
+          | foreground
+          | accent
+          | bluish
+          | cyanish
+          | greenish
+          | orangish
+          | pinkish
+          | purplish
+          | redish
+          | yellowish
+        ){{break}}
+      scope: variable.language.sublime-color-scheme
+
+  sublime-other-variables:
+    # Supports identifiers with and without leading `--`
+    - match: '{{ident}}'
+      scope: variable.other.sublime-color-scheme
+
+###[ PUNCTUATION ]#############################################################
+
+  illegal-commas:
+    # Note: required until sublimehq/Packages/pulls/3831 (<ST4174)
+    - match: ','
+      scope: invalid.illegal.unexpected-token.css
+
+###############################################################################
+
+variables:
+  # Block punctuation
+  # Note: required until sublimehq/Packages/pulls/4055 (<ST4193)
+  block_end: \}
diff --git a/Package/Sublime JSON/Sublime JSON.sublime-syntax b/Package/Sublime JSON/Sublime JSON.sublime-syntax
index 114de729..e6fcd229 100644
--- a/Package/Sublime JSON/Sublime JSON.sublime-syntax	
+++ b/Package/Sublime JSON/Sublime JSON.sublime-syntax	
@@ -205,10 +205,19 @@ contexts:
     - match: '"'
       scope: punctuation.definition.string.end.json
       pop: true
-    - include: string-escape
     - match: $\n?
       scope: invalid.illegal.unclosed-string.json
       pop: true
+    - include: string-escape
+
+  inside-interpolated-string:
+    - match: '"'
+      scope: string.quoted.double.json punctuation.definition.string.end.json
+      pop: true
+    - match: $\n?
+      scope: string.quoted.double.json invalid.illegal.unclosed-string.json
+      pop: true
+    - include: string-escape
 
   string-escape:
     - match: |-
diff --git a/Package/Sublime Text Color Scheme/Sublime Text Color Scheme.sublime-syntax b/Package/Sublime Text Color Scheme/Sublime Text Color Scheme.sublime-syntax
index 964de7c2..376f6c49 100644
--- a/Package/Sublime Text Color Scheme/Sublime Text Color Scheme.sublime-syntax	
+++ b/Package/Sublime Text Color Scheme/Sublime Text Color Scheme.sublime-syntax	
@@ -191,15 +191,11 @@ contexts:
   variable-mapping-key-string:
     - match: '"'
       scope: punctuation.definition.string.begin.json
-      set:
-        - meta_content_scope: entity.name.variable.sublime-color-scheme
-        - match: '"'
-          scope: punctuation.definition.string.end.json
-          pop: true
-        - match: $\n?
-          scope: invalid.illegal.unclosed-string.json
-          pop: true
-        - include: string-escape
+      set: inside-variable-mapping-key-string
+
+  inside-variable-mapping-key-string:
+    - meta_content_scope: entity.name.variable.sublime-color-scheme
+    - include: Sublime JSON.sublime-syntax#inside-string
 
   expect-globals-mapping-value:
     - match: (?=\{)
@@ -352,93 +348,32 @@ contexts:
 
   color-string-pop:
     - match: \"
-      scope: punctuation.definition.string.begin.json
-      set:
-        - meta_scope: string.quoted.double.json meta.color.sublime-color-scheme
-        - match: '"'
-          scope: punctuation.definition.string.end.json
-          pop: true
-        - match: $\n?
-          scope: invalid.illegal.unclosed-string.json
-          pop: true
-        # The CSS syntax doesn't recognize bare words as variables,
-        # i.e. without the "custom property prefix" of `--`,
-        # so we push a prototype.
-        - match: ''
-          push:
-            - meta_scope: source.css-color
-            - include: CSS.sublime-syntax#color-values
-          with_prototype:
-            - match: (?=")
-              pop: true
-            - include: string-escape
-            - include: color-custom-functions
-        - include: string-escape
+      scope: string.quoted.double.json punctuation.definition.string.begin.json
+      set: inside-color-string
 
-  color-custom-functions:
-    # Collection of functions that differ in behavior from the CSS syntax
-    # due to the ST implementation being based on a draft that has since evolved.
-    # https://www.sublimetext.com/docs/minihtml.html#css:ver-dev
-    - include: color-var-function
-    - include: color-min-contrast-function
-    # Adjusters may be used directly (#327)
-    - include: CSS.sublime-syntax#color-adjuster-functions
-
-  color-min-contrast-function:
-    # Custom function of ST
-    - match: \b(?i:min-contrast)(?=\()
-      scope: support.function.min-contrast.css
-      push:
-        - meta_scope: meta.function-call.min-contrast.css
-        - match: \)
-          scope: meta.group.css punctuation.section.group.end.css
-          pop: true
-        - match: \(
-          scope: punctuation.section.group.begin.css
-          push:
-            - meta_scope: meta.group.css
-            - match: (?=\))
-              pop: true
-            - match: (?=")  # embed this here so we don't have to "with_prototype"
-              pop: true
-            - include: color-var-function
-            - include: CSS.sublime-syntax#color-values
-            - include: CSS.sublime-syntax#numeric-constants
-        - match: (?=")
-          pop: true
-
-  color-var-function:
-    # Supports identifiers without leading `--`
-    - match: \b(?i:var)(?=\()
-      scope: support.function.var.css
-      push:
-        - meta_scope: meta.function-call.var.css
-        - match: \(
-          scope: punctuation.section.group.begin.css
-          set:
-            - meta_scope: meta.function-call.var.css meta.group.css
-            - match: \)
-              scope: meta.group.css punctuation.section.group.end.css
-              pop: true
-            - match: (?:--)?[\w-]+
-              scope: variable.other.sublime-color-scheme
-            - match: (?=")  # embed this here so we don't have to "with_prototype"
-              pop: true
+  inside-color-string:
+    - meta_scope: meta.color.sublime-color-scheme meta.string.json
+    - meta_content_scope: source.css-color
+    - include: Sublime JSON.sublime-syntax#inside-interpolated-string
+    - include: Sublime CSS (for JSON).sublime-syntax#var-functions
+    - include: Sublime CSS (for JSON).sublime-syntax#color-adjuster-functions
+    - include: Sublime CSS (for JSON).sublime-syntax#color-values
 
   color-list-pop:
     - match: \[
-      scope: meta.foreground.color-list.sublime-color-scheme punctuation.section.sequence.begin.json
-      set:
-        - meta_scope: meta.sequence.json
-        - meta_content_scope: meta.foreground.color-list.sublime-color-scheme
-        - match: \]
-          scope: meta.foreground.color-list.sublime-color-scheme punctuation.section.sequence.end.json
-          pop: true
-        - match: (?=")
-          push: [in-sequence-expect-comma, color-string-pop]
-        - include: comments
-        - match: '[^\s\]\/,]+'
-          scope: invalid.illegal.color.expected-string.sublime-color-scheme
+      scope: punctuation.section.sequence.begin.json
+      set: inside-color-list
+
+  inside-color-list:
+    - meta_scope: meta.sequence.json meta.foreground.color-list.sublime-color-scheme
+    - match: \]
+      scope: punctuation.section.sequence.end.json
+      pop: true
+    - match: (?=")
+      push: [in-sequence-expect-comma, color-string-pop]
+    - include: comments
+    - match: '[^\s\]\/,]+'
+      scope: invalid.illegal.color.expected-string.sublime-color-scheme
 
   expect-color-adjuster-value:
     - match: (?=")
@@ -447,20 +382,15 @@ contexts:
 
   color-adjuster-string-pop:
     - match: \"
-      scope: punctuation.definition.string.begin.json
-      set:
-        - meta_scope: string.quoted.double.json meta.color-adjuster.sublime-color-scheme
-        # Set a fake source scope so it's recognized as "embedded code",
-        # but don't set "source.css" to avoid completions provided by shipped package.
-        - meta_content_scope: source.css-color-adjuster
-        - match: '"'
-          scope: punctuation.definition.string.end.json
-          pop: true
-        - match: $\n?
-          scope: invalid.illegal.unclosed-string.json
-          pop: true
-        - include: color-var-function
-        - include: CSS.sublime-syntax#color-adjuster-functions
+      scope: string.quoted.double.json punctuation.definition.string.begin.json
+      set: inside-color-adjuster-string
+
+  inside-color-adjuster-string:
+    - meta_scope: meta.color-adjuster.sublime-color-scheme meta.string.json
+    - meta_content_scope: source.css-color-adjuster
+    - include: Sublime JSON.sublime-syntax#inside-interpolated-string
+    - include: Sublime CSS (for JSON).sublime-syntax#var-functions
+    - include: Sublime CSS (for JSON).sublime-syntax#color-adjuster-functions
 
   expect-css-string-value:
     - match: (?=")
@@ -469,25 +399,14 @@ contexts:
 
   css-string-pop:
     - match: \"
-      scope: punctuation.definition.string.begin.json
-      set:
-        - meta_scope: string.quoted.double.json meta.css.sublime-color-scheme
-        - meta_content_scope: source.css
-        - match: '"'
-          scope: punctuation.definition.string.end.json
-          pop: true
-        - match: $\n?
-          scope: invalid.illegal.unclosed-string.json
-          pop: true
-        - match: ''
-          push:
-            - include: scope:source.css
-          with_prototype:
-            - match: (?="|$)
-              pop: true
-            - include: string-escape
-            - include: color-custom-functions
+      scope: string.quoted.double.json punctuation.definition.string.begin.json
+      set: inside-css-string
 
+  inside-css-string:
+    - meta_scope: meta.css.sublime-color-scheme meta.string.json
+    - meta_content_scope: source.css
+    - include: Sublime JSON.sublime-syntax#inside-interpolated-string
+    - include: Sublime CSS (for JSON).sublime-syntax
 
   expect-fontstyle-string-value:
     - match: (?=")
@@ -497,16 +416,12 @@ contexts:
   fontstyle-string-pop:
     - match: \"
       scope: punctuation.definition.string.begin.json
-      set:
-        - meta_scope: meta.font-style.sublime-color-scheme string.quoted.double.json
-        - match: '"'
-          scope: punctuation.definition.string.end.json
-          pop: true
-        - match: $\n?
-          scope: invalid.illegal.unclosed-string.json
-          pop: true
-        - include: font-style
-        - include: string-escape
+      set: inside-fontstyle-string
+
+  inside-fontstyle-string:
+    - meta_scope: meta.font-style.sublime-color-scheme meta.string.json string.quoted.double.json
+    - include: Sublime JSON.sublime-syntax#inside-string
+    - include: font-style
 
   font-style:
     - match: \b(bold|glow|italic|underline)\b  # glow & underline added in 4050 and 4074
@@ -520,18 +435,14 @@ contexts:
   underline-string-pop:
     - match: \"
       scope: punctuation.definition.string.begin.json
-      set:
-        - meta_scope: meta.underline-style.sublime-color-scheme string.quoted.double.json
-        - match: '"'
-          scope: punctuation.definition.string.end.json
-          pop: true
-        - match: $\n?
-          scope: invalid.illegal.unclosed-string.json
-          pop: true
-        - include: string-escape
-        - match: \b(underline|stippled_underline|squiggly_underline|foreground)\b
-          scope: support.constant.underline-style.color-scheme
-        - include: font-style
+      set: inside-underline-string
+
+  inside-underline-string:
+    - meta_scope: meta.underline-style.sublime-color-scheme meta.string.json string.quoted.double.json
+    - include: Sublime JSON.sublime-syntax#inside-string
+    - match: \b(underline|stippled_underline|squiggly_underline|foreground)\b
+      scope: support.constant.underline-style.color-scheme
+    - include: font-style
 
   expect-string-boolean-value:
     - match: (?=")
@@ -541,17 +452,13 @@ contexts:
   boolean-string-pop:
     - match: \"
       scope: punctuation.definition.string.begin.json
-      set:
-        - meta_scope: meta.boolean-string.sublime-color-scheme string.quoted.double.json
-        - match: '"'
-          scope: punctuation.definition.string.end.json
-          pop: true
-        - match: $\n?
-          scope: invalid.illegal.unclosed-string.json
-          pop: true
-        - include: string-escape
-        - match: \b(true|false)\b
-          scope: support.constant.boolean-string.color-scheme
+      set: inside-boolean-string
+
+  inside-boolean-string:
+    - meta_scope: meta.boolean-string.sublime-color-scheme meta.string.json string.quoted.double.json
+    - include: Sublime JSON.sublime-syntax#inside-string
+    - match: \b(true|false)\b
+      scope: support.constant.boolean-string.color-scheme
 
   expect-cornerstyle-string-value:
     - match: (?=")
@@ -561,17 +468,13 @@ contexts:
   cornerstyle-string-pop:
     - match: \"
       scope: punctuation.definition.string.begin.json
-      set:
-        - meta_scope: meta.corner-style.sublime-color-scheme string.quoted.double.json
-        - match: '"'
-          scope: punctuation.definition.string.end.json
-          pop: true
-        - match: $\n?
-          scope: invalid.illegal.unclosed-string.json
-          pop: true
-        - include: string-escape
-        - match: \b(square|cut|round)\b
-          scope: support.constant.corner-style.color-scheme
+      set: inside-cornerstyle-string
+
+  inside-cornerstyle-string:
+    - meta_scope: meta.corner-style.sublime-color-scheme meta.string.json string.quoted.double.json
+    - include: Sublime JSON.sublime-syntax#inside-string
+    - match: \b(square|cut|round)\b
+      scope: support.constant.corner-style.color-scheme
 
   expect-possible-number-in-string-value:
     - match: (?=")
@@ -581,13 +484,9 @@ contexts:
   possible-number-in-string-pop:
     - match: \"
       scope: punctuation.definition.string.begin.json
-      set:
-        - meta_scope: string.quoted.double.json
-        - match: '"'
-          scope: punctuation.definition.string.end.json
-          pop: true
-        - match: $\n?
-          scope: invalid.illegal.unclosed-string.json
-          pop: true
-        - include: string-escape
-        - include: Sublime JSON.sublime-syntax#number
+      set: inside-possible-number-in-string
+
+  inside-possible-number-in-string:
+    - meta_scope: meta.string.json string.quoted.double.json
+    - include: Sublime JSON.sublime-syntax#inside-string
+    - include: Sublime JSON.sublime-syntax#number
diff --git a/Package/Sublime Text Color Scheme/syntax_test_colorscheme.json b/Package/Sublime Text Color Scheme/syntax_test_colorscheme.json
index 3955a3ce..312a9722 100644
--- a/Package/Sublime Text Color Scheme/syntax_test_colorscheme.json	
+++ b/Package/Sublime Text Color Scheme/syntax_test_colorscheme.json	
@@ -25,12 +25,12 @@
 //      ^^^^^^^^^^^^^^^^^^^ meta.mapping.key.json string.quoted.double.json meta.variable-name.sublime-color-scheme
 //       ^^^^^^^^^^^^^^^^^ entity.name.variable.sublime-color-scheme
 //                         ^ punctuation.separator.mapping.key-value.json
-//                           ^^^^^^^^^ string.quoted.double.json meta.color.sublime-color-scheme
+//                           ^^^^^^^^^ meta.color.sublime-color-scheme meta.string.json
 //                           ^ punctuation.definition.string.begin.json
+//                            ^^^^^^^ constant.other.color.rgb-value.css
+//                            ^ punctuation.definition.constant.css
 //                                   ^ punctuation.definition.string.end.json
 //                                    ^ punctuation.separator.mapping.pair.json
-//                            ^ punctuation.definition.constant.css
-//                             ^^^^^^ constant.other.color.rgb-value.css
         "color_pear_green": "#A6E22E",
 
     },
@@ -48,13 +48,14 @@
 //             ^ punctuation.definition.string.end.json
 //       ^^^^^^ entity.name.globals.sublime-color-scheme
 //              ^ punctuation.separator.mapping.key-value.json
-//                ^^^^^^^^^^^^^^^^^^^^^^^ meta.mapping.value.json string.quoted.double.json meta.color.sublime-color-scheme
-//                ^ punctuation.definition.string.begin.json
-//                 ^^^ support.function.var.css
+//                ^^^^^^^^^^^^^^^^^^^^^^^ meta.mapping.value.json meta.color.sublime-color-scheme
+//                 ^^^^^^^^^^^^^^^^^^^^^ - string
+//                ^ string.quoted.double.json punctuation.definition.string.begin.json
+//                 ^^^ support.function.css
 //                    ^ punctuation.section.group.begin.css
 //                     ^^^^^^^^^^^^^^^^ variable.other.sublime-color-scheme
 //                                     ^ punctuation.section.group.end.css
-//                                      ^ punctuation.definition.string.end.json
+//                                      ^ string.quoted.double.json punctuation.definition.string.end.json
 //                                       ^ punctuation.separator.mapping.pair.json
         "stack_guide": "#9D550FB0",
         "shadow_width": "12",
@@ -107,8 +108,10 @@
 
         "sheet_css": "html { background: blue; }",
 //       ^^^^^^^^^ entity.name.globals.sublime-color-scheme
-//                   ^ string.quoted.double.json meta.css.sublime-color-scheme punctuation.definition.string.begin.json
-//                    ^^^^ source.css meta.selector.css
+//                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.mapping.value.json meta.css.sublime-color-scheme meta.string.json
+//                   ^ string.quoted.double.json punctuation.definition.string.begin.json
+//                    ^^^^^^^^^^^^^^^^^^^^^^^^^^ source.css - string
+//                                              ^ string.quoted.double.json punctuation.definition.string.end.json
     },
 //  ^ punctuation.section.mapping.end.json
 //   ^ punctuation.separator.mapping.pair.json
@@ -136,18 +139,70 @@
 //          ^ punctuation.definition.string.begin.json
 //           ^^^^^^^^^^ keyword.other.rule.sublime-color-scheme
 //                     ^ punctuation.definition.string.end.json
-//                         ^^^^^^^^^^^^^^^^^^^^^^ source.css-color meta.function-call.var.css
-//                         ^^^ support.function.var.css
+//                        ^^^^^^^^^^^^^^^^^^^^^^^^ meta.mapping.value.json meta.color.sublime-color-scheme
+//                         ^^^^^^^^^^^^^^^^^^^^^^ - string
+//                        ^ string.quoted.double.json punctuation.definition.string.begin.json
+//                         ^^^ support.function.css
+//                            ^ punctuation.section.group.begin.css
 //                             ^^^^^^^^^^^^^^^^^ variable.other.sublime-color-scheme
-//                                               ^ punctuation.definition.string.end.json
+//                                              ^ punctuation.section.group.end.css
+//                                               ^ string.quoted.double.json punctuation.definition.string.end.json
+//                                                ^ punctuation.separator.mapping.pair.json
             "foreground": "blend(hsl(219, 10%, 6%) 50%)",
-//                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.mapping.value.json string.quoted.double.json meta.color.sublime-color-scheme
-//                        ^ punctuation.definition.string.begin.json
-//                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.css-color meta.function-call
-//                               ^^^^^^^^^^^^^^^^^ meta.function-call meta.function-call
-            "foreground": "color(var(color_radical_red) tint(20%))",
+//                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.mapping.value.json meta.color.sublime-color-scheme meta.string.json
+//                        ^ string.quoted.double.json punctuation.definition.string.begin.json
+//                         ^^^^^ meta.function-call.identifier.css support.function.css
+//                              ^^^^^^^^^^^^^^^^^^^^^^^ meta.function-call.arguments.css meta.group.css
+//                              ^ punctuation.section.group.begin.css
+//                               ^^^ meta.function-call.identifier.css support.function.color.css
+//                                  ^^^^^^^^^^^^^^ meta.function-call.arguments.css meta.group.css
+//                                  ^ punctuation.section.group.begin.css
+//                                               ^ punctuation.section.group.end.css
+//                                                    ^ punctuation.section.group.end.css
+//                                                     ^ string.quoted.double.json punctuation.definition.string.end.json
+            "foreground": "color(var(color_radical_red) alpha(var(color_alpha)))",
 //                                   ^^^^^^^^^^^^^^^^^ variable.other.sublime-color-scheme
+//                                                                ^^^^^^^^^^^ variable.other.sublime-color-scheme
+
+            "foreground": "color(var(--orangish) min-contrast(var(--background) 2.5))",
+//                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.mapping.value.json meta.color.sublime-color-scheme meta.string.json
+//                        ^ string.quoted.double.json punctuation.definition.string.begin.json
+//                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.css-color - string
+//                         ^^^^^ meta.function-call.identifier.css - meta.function-call meta.function-call
+//                              ^ meta.function-call.arguments.css meta.group.css - meta.function-call meta.function-call
+//                               ^^^ meta.function-call.arguments.css meta.group.css meta.function-call.identifier.css - meta.function-call meta.function-call meta.function-call
+//                                  ^^^^^^^^^^^^ meta.function-call.arguments.css meta.group.css meta.function-call.arguments.css meta.group.css - meta.function-call meta.function-call meta.function-call
+//                                              ^ meta.function-call.arguments.css meta.group.css - meta.function-call meta.function-call
+//                                               ^^^^^^^^^^^^ meta.function-call.arguments.css meta.group.css meta.function-call.identifier.css - meta.function-call meta.function-call meta.function-call
+//                                                           ^ meta.function-call.arguments.css meta.group.css meta.function-call.arguments.css meta.group.css punctuation.section.group.begin.css - meta.function-call meta.function-call meta.function-call
+//                                                            ^^^ meta.function-call.arguments.css meta.group.css meta.function-call.arguments.css meta.group.css meta.function-call.identifier.css support.function.css
+//                                                               ^^^^^^^^^^^^^^ meta.function-call.arguments.css meta.group.css meta.function-call.arguments.css meta.group.css meta.function-call.arguments.css meta.group.css
+//                                                                             ^^^^^ meta.function-call.arguments.css meta.group.css meta.function-call.arguments.css meta.group.css - meta.function-call meta.function-call meta.function-call
+//                                                                                  ^ meta.function-call.arguments.css meta.group.css punctuation.section.group.end.css - meta.function-call meta.function-call
+//                         ^^^^^ support.function.color.css
+//                              ^ punctuation.section.group.begin.css
+//                               ^^^ meta.function-call.identifier.css support.function.css
+//                                  ^ punctuation.section.group.begin.css
+//                                   ^^^^^^^^^^ variable.language.sublime-color-scheme
+//                                             ^ punctuation.section.group.end.css
+//                                               ^^^^^^^^^^^^ support.function.css
+//                                                           ^ punctuation.section.group.begin.css
+//                                                            ^^^ support.function.css
+//                                                               ^ punctuation.section.group.begin.css
+//                                                                ^^^^^^^^^^^^ variable.language.sublime-color-scheme
+//                                                                            ^ punctuation.section.group.end.css
+//                                                                              ^^^ meta.number.float.decimal.css constant.numeric.value.css
+//                                                                                 ^^ punctuation.section.group.end.css
+//                                                                                   ^ string.quoted.double.json punctuation.definition.string.end.json
+
             "foreground": "#F8F8F0",
+//                        ^^^^^^^^^ meta.mapping.value.json meta.color.sublime-color-scheme meta.string.json
+//                        ^ string.quoted.double.json punctuation.definition.string.begin.json
+//                         ^^^^^^^ constant.other.color.rgb-value.css
+//                         ^ punctuation.definition.constant.css
+//                                ^ string.quoted.double.json punctuation.definition.string.end.json
+//                                 ^^ meta.mapping.json
+//                                 ^ meta.expect-comma.sublime punctuation.separator.mapping.pair.json
         },
         {
             "scope": "meta.structure.dictionary.key.json string.quoted.double.json",
@@ -177,14 +232,14 @@
             [
 //          ^ meta.mapping.value.json meta.sequence.json meta.foreground.color-list.sublime-color-scheme punctuation.section.sequence.begin.json
                 "hsl(100, 100%, 56%)",
-//              ^^^^^^^^^^^^^^^^^^^^^ meta.foreground.color-list.sublime-color-scheme string.quoted.double.json meta.color.sublime-color-scheme
+//              ^^^^^^^^^^^^^^^^^^^^^ meta.foreground.color-list.sublime-color-scheme meta.color.sublime-color-scheme
 //               ^^^ support.function.color.css
 //                   ^^^ constant.numeric
 //              ^ punctuation.definition.string.begin.json
 //                                  ^ punctuation.definition.string.end.json
 //                                   ^ punctuation.separator.sequence.json
                 "hsl(200, 100%, 56%)",
-//              ^^^^^^^^^^^^^^^^^^^^^ meta.foreground.color-list.sublime-color-scheme string.quoted.double.json meta.color.sublime-color-scheme
+//              ^^^^^^^^^^^^^^^^^^^^^ meta.foreground.color-list.sublime-color-scheme meta.color.sublime-color-scheme
 //               ^^^ support.function.color.css
 //                   ^^^ constant.numeric
 //              ^ punctuation.definition.string.begin.json
@@ -197,16 +252,37 @@
         {
             "scope": "variable.other.readwrite",
             "background": "color(var(color_radical_red) blend(#FFF 50% hsl))",
-//                               ^^^ support.function.var.css
-//                                                           ^^^^^^^^^^^^^^ source.css-color meta.function-call.arguments.css meta.group.css meta.function-call.arguments.css meta.group.css
+//                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.color.sublime-color-scheme meta.string.json
+//                        ^ string.quoted.double.json punctuation.definition.string.begin.json - source.css-color
+//                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.css-color - string
+//                         ^^^^^ meta.function-call.identifier.css support.function.color.css
+//                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.function-call.arguments.css meta.group.css
+//                              ^ punctuation.section.group.begin.css
+//                               ^^^ meta.function-call.identifier.css support.function.css
+//                                  ^^^^^^^^^^^^^^^^^^^ meta.function-call.arguments.css meta.group.css
+//                                  ^ punctuation.section.group.begin.css
+//                                   ^^^^^^^^^^^^^^^^^ variable.other.sublime-color-scheme
+//                                                    ^ punctuation.section.group.end.css
+//                                                      ^^^^^ meta.function-call.identifier.css support.function.css
+//                                                           ^^^^^^^^^^^^^^ meta.function-call.arguments.css meta.group.css
 //                                                           ^ punctuation.section.group.begin.css
 //                                                            ^^^^ constant.other.color.rgb-value.css
-//                                                                 ^^^ meta.number.integer.decimal.css
+//                                                            ^ punctuation.definition.constant.css
+//                                                                 ^^^ meta.number.integer.decimal.css constant.numeric
 //                                                                     ^^^ keyword.other.color-space.css
 //                                                                        ^^ punctuation.section.group.end.css
+//                                                                          ^ string.quoted.double.json punctuation.definition.string.end.json - source.css-color
             "foreground_adjust": "l(+ 50%)",
-//                               ^^^^^^^^^^ meta.color-adjuster.sublime-color-scheme
-//                                ^^^^^^^^ source.css-color-adjuster meta.function-call
+//                               ^^^^^^^^^^ meta.mapping.value.json meta.color-adjuster.sublime-color-scheme meta.string.json
+//                               ^ string.quoted.double.json punctuation.definition.string.begin.json
+//                                ^^^^^^^^ source.css-color-adjuster
+//                                ^ meta.function-call.identifier.css support.function.css
+//                                 ^^^^^^^ meta.function-call.arguments.css meta.group.css
+//                                 ^ punctuation.section.group.begin.css
+//                                  ^ keyword.operator.arithmetic.css
+//                                    ^^^ meta.number.integer.decimal.css constant.numeric
+//                                       ^ punctuation.section.group.end.css
+//                                        ^ string.quoted.double.json punctuation.definition.string.end.json
         }
     ],
 }
diff --git a/Package/Sublime Text Theme/Sublime Text Theme.sublime-syntax b/Package/Sublime Text Theme/Sublime Text Theme.sublime-syntax
index b6fc58f2..71e26240 100644
--- a/Package/Sublime Text Theme/Sublime Text Theme.sublime-syntax	
+++ b/Package/Sublime Text Theme/Sublime Text Theme.sublime-syntax	
@@ -755,20 +755,22 @@ contexts:
 
   font-size-string-value:
     - match: \"
-      scope: punctuation.definition.string.begin.json
-      set:
-        - meta_scope: string.quoted.double.json
-        - meta_content_scope: source.css-size
-        - include: Sublime JSON.sublime-syntax#inside-string
-        - match: '(?:({{css_integer}})|({{css_float}}))(r?em)?'
-          scope: constant.numeric.float.decimal.css
-          captures:
-            1: constant.numeric.integer.decimal.css
-            2: constant.numeric.float.decimal.css
-            3: punctuation.separator.decimal.css
-            4: keyword.other.unit.css
-        - match: .
-          scope: invalid.illegal.expected-font-size.sublime-theme
+      scope: string.quoted.double.json punctuation.definition.string.begin.json
+      set: inside-font-size-string
+
+  inside-font-size-string:
+    - meta_scope: meta.string.json
+    - meta_content_scope: source.css-size
+    - include: Sublime JSON.sublime-syntax#inside-interpolated-string
+    - match: '(?:({{css_integer}})|({{css_float}}))(r?em)?'
+      scope: constant.numeric.float.decimal.css
+      captures:
+        1: constant.numeric.integer.decimal.css
+        2: constant.numeric.float.decimal.css
+        3: punctuation.separator.decimal.css
+        4: keyword.other.unit.css
+    - match: .
+      scope: invalid.illegal.expected-font-size.sublime-theme
 
   var-value:
     - match: (?=\"var\(|\"(v(a(r)?)?)?(\"|$)) # improve ux while typing
@@ -776,12 +778,14 @@ contexts:
 
   var-pop:
     - match: \"
-      scope: punctuation.definition.string.begin.json
-      set:
-        - meta_scope: string.quoted.double.json
-        - meta_content_scope: source.css-color
-        - include: Sublime JSON.sublime-syntax#inside-string
-        - include: Sublime Text Color Scheme.sublime-syntax#color-var-function
+      scope: string.quoted.double.json punctuation.definition.string.begin.json
+      set: inside-var-string
+
+  inside-var-string:
+    - meta_scope: meta.string.json
+    - meta_content_scope: source.css-color
+    - include: Sublime JSON.sublime-syntax#inside-interpolated-string
+    - include: Sublime CSS (for JSON).sublime-syntax#var-functions
 
   expect-class-string-value:
     - match: (?=")
@@ -789,13 +793,15 @@ contexts:
     - include: expect-string-rest
 
   class-string-pop:
-    - match: '"'
+    - match: \"
       scope: punctuation.definition.string.begin.json
-      set:
-        # deliberately do not choose "entity.name.class"
-        - meta_scope: string.quoted.double.json meta.class-selector.sublime-theme
-        - meta_content_scope: entity.name.class-selector.sublime-theme
-        - include: Sublime JSON.sublime-syntax#inside-string
+      set: inside-class-string
+
+  inside-class-string:
+    # deliberately do not choose "entity.name.class"
+    - meta_scope: meta.class-selector.sublime-theme meta.string.json string.quoted.double.json
+    - meta_content_scope: entity.name.class-selector.sublime-theme
+    - include: Sublime JSON.sublime-syntax#inside-string
 
   #####################################
 
diff --git a/Package/Sublime Text Theme/syntax_test_newstyletheme.json b/Package/Sublime Text Theme/syntax_test_newstyletheme.json
index d773e30f..1eba85f6 100644
--- a/Package/Sublime Text Theme/syntax_test_newstyletheme.json	
+++ b/Package/Sublime Text Theme/syntax_test_newstyletheme.json	
@@ -25,12 +25,12 @@
 //      ^^^^^^^^^^^^^^^^^^^ meta.mapping.key.json string.quoted.double.json meta.variable-name.sublime-theme
 //       ^^^^^^^^^^^^^^^^^ entity.name.variable.sublime-theme
 //                         ^ punctuation.separator.mapping.key-value.json
-//                           ^^^^^^^^^ string.quoted.double.json meta.color
+//                           ^^^^^^^^^ meta.color.sublime-color-scheme meta.string.json
 //                           ^ punctuation.definition.string.begin.json
+//                            ^^^^^^^ constant.other.color.rgb-value.css
+//                            ^ punctuation.definition.constant.css
 //                                   ^ punctuation.definition.string.end.json
 //                                    ^ punctuation.separator.mapping.pair.json
-//                            ^ punctuation.definition.constant.css
-//                             ^^^^^^ constant.other.color.rgb-value.css
         "color_pear_green": "color(var(color_radical_red) alpha(0.02))",
 //                                     ^^^^^^^^^^^^^^^^^ variable.other.sublime-color-scheme
         "icon_button_opacity":
@@ -42,7 +42,7 @@
         },
 
         "text_widget_dark_modifier": "l(- 5%)", // #327
-//                                    ^ support.function.color.css
+//                                    ^ support.function
     },
 //  ^ punctuation.section.mapping.end.json
 //   ^ punctuation.separator.mapping.pair.json - meta.variables.sublime-theme
@@ -58,7 +58,10 @@
 //      ^ meta.rules.collection.sublime-theme meta.sequence.json meta.rule.sublime-theme meta.mapping.json punctuation.section.mapping.begin.json
             "class": "button_control",
 //           ^^^^^ meta.theme meta.mapping.value meta.rules.collection meta.sequence meta.rule meta.mapping.key meta.rule-key.class string.quoted.double storage.modifier.selector
-//                    ^^^^^^^^^^^^^^ string.quoted.double.json meta.class-selector.sublime-theme entity.name.class-selector.sublime-theme
+//                   ^^^^^^^^^^^^^^^^ meta.mapping.value.json meta.class-selector.sublime-theme meta.string.json string.quoted.double.json
+//                   ^ punctuation.definition.string.begin.json - entity
+//                    ^^^^^^^^^^^^^^ entity.name.class-selector.sublime-theme
+//                                  ^ punctuation.definition.string.end.json - entity
             "settings": ["test_setting", "!namespaced.setting"],
 //           ^^^^^^^^ meta.rule-key.settings.sublime-theme string.quoted.double.json storage.modifier.selector.sublime-theme
 //                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.sequence.json meta.settings-sequence.sublime-theme
@@ -112,22 +115,32 @@
 //                            ^^^^ source.css-color meta.function-call
             "layer0.tint": "var(--background)"
 //          ^^^^^^^^^^^^^ meta.mapping.key.json meta.rule-key.color.sublime-theme string.quoted.double.json
+//          ^ punctuation.definition.string.begin.json
 //           ^^^^^^^^^^^ keyword.other.rule.sublime-theme
 //           ^^^^^^ constant.other.layer.sublime-theme
 //                 ^ punctuation.accessor.dot.sublime-theme
 //                      ^ punctuation.definition.string.end.json
+//                       ^^ meta.mapping.json
 //                       ^ punctuation.separator.mapping.key-value.json
-//                         ^^^^^^^^^^^^^^^^^^^ meta.mapping.value.json string.quoted.double.json meta.color.sublime-color-scheme
-//                              ^^^^^^^^^^^^ variable.other.sublime-color-scheme
+//                         ^^^^^^^^^^^^^^^^^^^ meta.mapping.value.json meta.color.sublime-color-scheme meta.string.json
+//                         ^ string.quoted.double.json punctuation.definition.string.begin.json
+//                          ^^^^^^^^^^^^^^^^^ source.css-color
+//                          ^^^ meta.function-call.identifier.css support.function
+//                             ^^^^^^^^^^^^^^ meta.function-call.arguments.css meta.group.css
+//                             ^ punctuation.section.group.begin.css
+//                              ^^^^^^^^^^^^ variable.language.sublime-color-scheme
+//                                          ^ punctuation.section.group.end.css
+//                                           ^ string.quoted.double.json punctuation.definition.string.end.json
+//                                            ^ meta.mapping.json meta.expect-comma.sublime
             "line_selection_color": "color(var(blue) alpha(0.05))",
 // <- invalid.illegal.expected-comma.inside-mapping.json
 //          ^^^^^^^^^^^^^^^^^^^^^^ meta.rule-key.color.sublime-theme
-//                                         ^^^ support.function.var.css
+//                                         ^^^ support.function
             "layer2.tint": "color(var(--bluish) min-contrast(rgb(235, 237, 239) 2.5))",
-//                          ^^^^^ support.function.color.css
-//                                ^^^ support.function.var.css
-//                                              ^^^^^^^^^^^^ support.function.min-contrast.css
-//                                                           ^^^ support.function.color.css
+//                          ^^^^^ support.function
+//                                ^^^ support.function
+//                                              ^^^^^^^^^^^^ support.function
+//                                                           ^^^ support.function
 //                                                                              ^^^ constant.numeric
         },
         { // tints (like colors but support `null`)
@@ -138,18 +151,39 @@
         },
         { // color adjusters
             "background_modifier": "blend(white 97.5%)"
-//           ^^^^^^^^^^^^^^^^^^^ meta.rule-key.color-adjuster.sublime-theme string.quoted.double.json keyword.other.rule.sublime-theme
-//                                  ^^^^^^^^^^^^^^^^^^ meta.rule.sublime-theme meta.mapping.value.json string.quoted.double.json meta.color-adjuster.sublime-color-scheme source.css-color-adjuster
-//                                  ^^^^^ support.function.color.css
+//          ^^^^^^^^^^^^^^^^^^^^^ meta.mapping.key.json meta.rule-key.color-adjuster.sublime-theme string.quoted.double.json
+//          ^ punctuation.definition.string.begin.json
+//           ^^^^^^^^^^^^^^^^^^^ keyword.other.rule.sublime-theme
+//                              ^ punctuation.definition.string.end.json
+//                               ^^ meta.mapping.json
+//                               ^ punctuation.separator.mapping.key-value.json
+//                                 ^^^^^^^^^^^^^^^^^^^^ meta.mapping.value.json meta.color-adjuster.sublime-color-scheme meta.string.json
+//                                 ^ string.quoted.double.json punctuation.definition.string.begin.json
+//                                  ^^^^^^^^^^^^^^^^^^ source.css-color-adjuster
+//                                  ^^^^^ meta.function-call.identifier.css support.function.css
+//                                       ^^^^^^^^^^^^^ meta.function-call.arguments.css meta.group.css
 //                                       ^ punctuation.section.group.begin.css
-//                                        ^^^^^ support.constant
+//                                        ^^^^^ support.constant.color.w3c.standard.css
+//                                              ^^^^^ meta.number.float.decimal.css constant.numeric
+//                                                   ^ punctuation.section.group.end.css
+//                                                    ^ string.quoted.double.json punctuation.definition.string.end.json
+//                                                     ^ meta.mapping.json meta.expect-comma.sublime
             "background_modifier": "var(adjuster_variable)"
-//           ^^^^^^^^^^^^^^^^^^^ meta.rule-key.color-adjuster.sublime-theme string.quoted.double.json keyword.other.rule.sublime-theme
-//                                  ^^^^^^^^^^^^^^^^^^^^^^ meta.rule.sublime-theme meta.mapping.value.json string.quoted.double.json meta.color-adjuster.sublime-color-scheme source.css-color-adjuster
-//                                  ^^^ support.function.var.css
+//          ^^^^^^^^^^^^^^^^^^^^^ meta.mapping.key.json meta.rule-key.color-adjuster.sublime-theme string.quoted.double.json
+//          ^ punctuation.definition.string.begin.json
+//           ^^^^^^^^^^^^^^^^^^^ keyword.other.rule.sublime-theme
+//                              ^ punctuation.definition.string.end.json
+//                               ^^ meta.mapping.json
+//                               ^ punctuation.separator.mapping.key-value.json
+//                                 ^^^^^^^^^^^^^^^^^^^^^^^^ meta.mapping.value.json meta.color-adjuster.sublime-color-scheme meta.string.json
+//                                 ^ string.quoted.double.json punctuation.definition.string.begin.json
+//                                  ^^^^^^^^^^^^^^^^^^^^^^ source.css-color-adjuster
+//                                  ^^^ meta.function-call.identifier.css support.function.css
+//                                     ^^^^^^^^^^^^^^^^^^^ meta.function-call.arguments.css meta.group.css
 //                                     ^ punctuation.section.group.begin.css
 //                                      ^^^^^^^^^^^^^^^^^ variable.other.sublime-color-scheme
 //                                                       ^ punctuation.section.group.end.css
+//                                                        ^ string.quoted.double.json punctuation.definition.string.end.json
         },
         { // floats
             "line_selection_border_width": "abc" 2.0,
@@ -172,15 +206,30 @@
 //              ^^^^^^^^^^^^ meta.interpolation-key.sublime-theme
             },
             "opacity": "var(icon_button_opacity)",
-//                      ^^^ string.quoted.double.json source.css-color meta.function-call.var.css support.function.var.css
+//                     ^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.mapping.value.json meta.string.json
+//                     ^ string.quoted.double.json punctuation.definition.string.begin.json
+//                      ^^^^^^^^^^^^^^^^^^^^^^^^ source.css-color
+//                      ^^^ meta.function-call.identifier.css support.function.css
+//                         ^^^^^^^^^^^^^^^^^^^^^ meta.function-call.arguments.css meta.group.css
+//                         ^ punctuation.section.group.begin.css
 //                          ^^^^^^^^^^^^^^^^^^^ variable.other.sublime-color-scheme
+//                                             ^ punctuation.section.group.end.css
+//                                              ^ string.quoted.double.json punctuation.definition.string.end.json
             "font.size": "",
 //                       ^^ string.quoted.double.json
             "font.size": "0.9rem",
 //                        ^^^ source.css-size constant.numeric.float
 //                           ^^^ source.css-size keyword.other.unit.css
             "font.size": "var(default_size)"
-//                            ^^^^^^^^^^^^ source.css-color meta.function-call.var.css meta.group.css variable.other.sublime-color-scheme
+//                       ^^^^^^^^^^^^^^^^^^^ meta.mapping.value.json meta.string.json
+//                       ^ string.quoted.double.json punctuation.definition.string.begin.json
+//                        ^^^^^^^^^^^^^^^^^ source.css-color
+//                        ^^^ meta.function-call.identifier.css support.function.css
+//                           ^^^^^^^^^^^^^^ meta.function-call.arguments.css meta.group.css
+//                           ^ punctuation.section.group.begin.css
+//                            ^^^^^^^^^^^^ variable.other.sublime-color-scheme
+//                                        ^ punctuation.section.group.end.css
+//                                         ^ string.quoted.double.json punctuation.definition.string.end.json
         },
         { // integer sequences
             "min_size": 0,

From c627843d04deea02dc898a2ed5af5a63c8fce60f Mon Sep 17 00:00:00 2001
From: deathaxe <deathaxe82@gmail.com>
Date: Mon, 23 Mar 2026 18:26:07 +0100
Subject: [PATCH 2/3] Restore var() meta scope

Restore required meta scope to maintain color value completions.
---
 Package/Sublime CSS/Sublime CSS.sublime-syntax            | 1 +
 .../syntax_test_colorscheme.json                          | 8 +++++---
 Package/Sublime Text Theme/syntax_test_newstyletheme.json | 8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Package/Sublime CSS/Sublime CSS.sublime-syntax b/Package/Sublime CSS/Sublime CSS.sublime-syntax
index b1888b0c..f6c26c7e 100644
--- a/Package/Sublime CSS/Sublime CSS.sublime-syntax	
+++ b/Package/Sublime CSS/Sublime CSS.sublime-syntax	
@@ -105,6 +105,7 @@ contexts:
 
   var-function-argument-list-body:
     # ST's `var()` function does not support default values (e.g. `var(name #fff)`)
+    - meta_scope: meta.function-call.var.sublime-color-scheme
     - meta_content_scope: meta.function-call.arguments.css meta.group.css
     - match: \)
       scope: meta.function-call.arguments.css meta.group.css punctuation.section.group.end.css
diff --git a/Package/Sublime Text Color Scheme/syntax_test_colorscheme.json b/Package/Sublime Text Color Scheme/syntax_test_colorscheme.json
index 312a9722..28d4cbca 100644
--- a/Package/Sublime Text Color Scheme/syntax_test_colorscheme.json	
+++ b/Package/Sublime Text Color Scheme/syntax_test_colorscheme.json	
@@ -49,7 +49,7 @@
 //       ^^^^^^ entity.name.globals.sublime-color-scheme
 //              ^ punctuation.separator.mapping.key-value.json
 //                ^^^^^^^^^^^^^^^^^^^^^^^ meta.mapping.value.json meta.color.sublime-color-scheme
-//                 ^^^^^^^^^^^^^^^^^^^^^ - string
+//                 ^^^^^^^^^^^^^^^^^^^^^ meta.function-call.var.sublime-color-scheme - string
 //                ^ string.quoted.double.json punctuation.definition.string.begin.json
 //                 ^^^ support.function.css
 //                    ^ punctuation.section.group.begin.css
@@ -170,11 +170,13 @@
 //                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.css-color - string
 //                         ^^^^^ meta.function-call.identifier.css - meta.function-call meta.function-call
 //                              ^ meta.function-call.arguments.css meta.group.css - meta.function-call meta.function-call
-//                               ^^^ meta.function-call.arguments.css meta.group.css meta.function-call.identifier.css - meta.function-call meta.function-call meta.function-call
-//                                  ^^^^^^^^^^^^ meta.function-call.arguments.css meta.group.css meta.function-call.arguments.css meta.group.css - meta.function-call meta.function-call meta.function-call
+//                               ^^^^^^^^^^^^^^^ meta.function-call.var.sublime-color-scheme
+//                               ^^^ meta.function-call.arguments.css meta.group.css meta.function-call.identifier.css - meta.function-call meta.function-call meta.function-call meta.function-call
+//                                  ^^^^^^^^^^^^ meta.function-call.arguments.css meta.group.css meta.function-call.arguments.css meta.group.css - meta.function-call meta.function-call meta.function-call meta.function-call
 //                                              ^ meta.function-call.arguments.css meta.group.css - meta.function-call meta.function-call
 //                                               ^^^^^^^^^^^^ meta.function-call.arguments.css meta.group.css meta.function-call.identifier.css - meta.function-call meta.function-call meta.function-call
 //                                                           ^ meta.function-call.arguments.css meta.group.css meta.function-call.arguments.css meta.group.css punctuation.section.group.begin.css - meta.function-call meta.function-call meta.function-call
+//                                                            ^^^^^^^^^^^^^^^^^ meta.function-call.var.sublime-color-scheme
 //                                                            ^^^ meta.function-call.arguments.css meta.group.css meta.function-call.arguments.css meta.group.css meta.function-call.identifier.css support.function.css
 //                                                               ^^^^^^^^^^^^^^ meta.function-call.arguments.css meta.group.css meta.function-call.arguments.css meta.group.css meta.function-call.arguments.css meta.group.css
 //                                                                             ^^^^^ meta.function-call.arguments.css meta.group.css meta.function-call.arguments.css meta.group.css - meta.function-call meta.function-call meta.function-call
diff --git a/Package/Sublime Text Theme/syntax_test_newstyletheme.json b/Package/Sublime Text Theme/syntax_test_newstyletheme.json
index 1eba85f6..59f712b5 100644
--- a/Package/Sublime Text Theme/syntax_test_newstyletheme.json	
+++ b/Package/Sublime Text Theme/syntax_test_newstyletheme.json	
@@ -124,7 +124,7 @@
 //                       ^ punctuation.separator.mapping.key-value.json
 //                         ^^^^^^^^^^^^^^^^^^^ meta.mapping.value.json meta.color.sublime-color-scheme meta.string.json
 //                         ^ string.quoted.double.json punctuation.definition.string.begin.json
-//                          ^^^^^^^^^^^^^^^^^ source.css-color
+//                          ^^^^^^^^^^^^^^^^^ source.css-color meta.function-call.var.sublime-color-scheme
 //                          ^^^ meta.function-call.identifier.css support.function
 //                             ^^^^^^^^^^^^^^ meta.function-call.arguments.css meta.group.css
 //                             ^ punctuation.section.group.begin.css
@@ -177,7 +177,7 @@
 //                               ^ punctuation.separator.mapping.key-value.json
 //                                 ^^^^^^^^^^^^^^^^^^^^^^^^ meta.mapping.value.json meta.color-adjuster.sublime-color-scheme meta.string.json
 //                                 ^ string.quoted.double.json punctuation.definition.string.begin.json
-//                                  ^^^^^^^^^^^^^^^^^^^^^^ source.css-color-adjuster
+//                                  ^^^^^^^^^^^^^^^^^^^^^^ source.css-color-adjuster meta.function-call.var.sublime-color-scheme
 //                                  ^^^ meta.function-call.identifier.css support.function.css
 //                                     ^^^^^^^^^^^^^^^^^^^ meta.function-call.arguments.css meta.group.css
 //                                     ^ punctuation.section.group.begin.css
@@ -208,7 +208,7 @@
             "opacity": "var(icon_button_opacity)",
 //                     ^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.mapping.value.json meta.string.json
 //                     ^ string.quoted.double.json punctuation.definition.string.begin.json
-//                      ^^^^^^^^^^^^^^^^^^^^^^^^ source.css-color
+//                      ^^^^^^^^^^^^^^^^^^^^^^^^ source.css-color meta.function-call.var.sublime-color-scheme
 //                      ^^^ meta.function-call.identifier.css support.function.css
 //                         ^^^^^^^^^^^^^^^^^^^^^ meta.function-call.arguments.css meta.group.css
 //                         ^ punctuation.section.group.begin.css
@@ -223,7 +223,7 @@
             "font.size": "var(default_size)"
 //                       ^^^^^^^^^^^^^^^^^^^ meta.mapping.value.json meta.string.json
 //                       ^ string.quoted.double.json punctuation.definition.string.begin.json
-//                        ^^^^^^^^^^^^^^^^^ source.css-color
+//                        ^^^^^^^^^^^^^^^^^ source.css-color meta.function-call.var.sublime-color-scheme
 //                        ^^^ meta.function-call.identifier.css support.function.css
 //                           ^^^^^^^^^^^^^^ meta.function-call.arguments.css meta.group.css
 //                           ^ punctuation.section.group.begin.css

From d9b07205b2e39b8e8cc659581090465183515c3f Mon Sep 17 00:00:00 2001
From: deathaxe <deathaxe82@gmail.com>
Date: Mon, 23 Mar 2026 18:37:33 +0100
Subject: [PATCH 3/3] Adjust completion selectors

As `string` scope is removed from css values, this commit adds some adjustments.
---
 .../Completions/Globals Keys.sublime-completions                | 2 +-
 .../Completions/Main Keys.sublime-completions                   | 2 +-
 .../Completions/Rule Keys.sublime-completions                   | 2 +-
 .../Completions/Attributes.sublime-completions                  | 2 +-
 .../Completions/Interpolation Keys.sublime-completions          | 2 +-
 .../Completions/Main Keys.sublime-completions                   | 2 +-
 .../Completions/Parent Keys.sublime-completions                 | 2 +-
 .../Completions/Platform Values.sublime-completions             | 2 +-
 .../Completions/Rule Keys.sublime-completions                   | 2 +-
 .../Completions/Texture Keys.sublime-completions                | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Package/Sublime Text Color Scheme/Completions/Globals Keys.sublime-completions b/Package/Sublime Text Color Scheme/Completions/Globals Keys.sublime-completions
index 23325e73..51cce419 100644
--- a/Package/Sublime Text Color Scheme/Completions/Globals Keys.sublime-completions	
+++ b/Package/Sublime Text Color Scheme/Completions/Globals Keys.sublime-completions	
@@ -1,5 +1,5 @@
 {
-    "scope": "meta.globals.sublime-color-scheme - string - comment",
+    "scope": "meta.globals.sublime-color-scheme - meta.mapping.key - meta.string - string - comment",
     "completions": [
         {
             "trigger": "accent",
diff --git a/Package/Sublime Text Color Scheme/Completions/Main Keys.sublime-completions b/Package/Sublime Text Color Scheme/Completions/Main Keys.sublime-completions
index 27244c47..827b65ec 100644
--- a/Package/Sublime Text Color Scheme/Completions/Main Keys.sublime-completions	
+++ b/Package/Sublime Text Color Scheme/Completions/Main Keys.sublime-completions	
@@ -1,5 +1,5 @@
 {
-    "scope": "meta.color-scheme.collection.sublime-color-scheme - meta.mapping meta.mapping - meta.sequence - string - comment",
+    "scope": "meta.color-scheme.collection.sublime-color-scheme - meta.mapping meta.mapping - meta.sequence - meta.string - string - comment",
     "completions": [
         {
             "trigger": "variables",
diff --git a/Package/Sublime Text Color Scheme/Completions/Rule Keys.sublime-completions b/Package/Sublime Text Color Scheme/Completions/Rule Keys.sublime-completions
index 956f9ffb..ff26cff7 100644
--- a/Package/Sublime Text Color Scheme/Completions/Rule Keys.sublime-completions	
+++ b/Package/Sublime Text Color Scheme/Completions/Rule Keys.sublime-completions	
@@ -1,5 +1,5 @@
 {
-    "scope": "meta.rule.sublime-color-scheme - meta.sequence meta.sequence - string - comment",
+    "scope": "meta.rule.sublime-color-scheme - meta.sequence meta.sequence - meta.string - string - comment",
     "completions": [
         {
             "trigger": "scope",
diff --git a/Package/Sublime Text Theme/Completions/Attributes.sublime-completions b/Package/Sublime Text Theme/Completions/Attributes.sublime-completions
index 05c1c7d8..aec3b3b4 100644
--- a/Package/Sublime Text Theme/Completions/Attributes.sublime-completions	
+++ b/Package/Sublime Text Theme/Completions/Attributes.sublime-completions	
@@ -1,5 +1,5 @@
 {
-    "scope": "meta.attributes-sequence.sublime-theme - string - comment",
+    "scope": "meta.attributes-sequence.sublime-theme - meta.string - string - comment",
     "completions": [
         {
             "trigger": "hover",
diff --git a/Package/Sublime Text Theme/Completions/Interpolation Keys.sublime-completions b/Package/Sublime Text Theme/Completions/Interpolation Keys.sublime-completions
index 60517430..faf723af 100644
--- a/Package/Sublime Text Theme/Completions/Interpolation Keys.sublime-completions	
+++ b/Package/Sublime Text Theme/Completions/Interpolation Keys.sublime-completions	
@@ -1,5 +1,5 @@
 {
-    "scope": "meta.interpolation-mapping.sublime-theme - string - comment",
+    "scope": "meta.interpolation-mapping.sublime-theme - meta.string - string - comment",
     "completions": [
         {
             "trigger": "target",
diff --git a/Package/Sublime Text Theme/Completions/Main Keys.sublime-completions b/Package/Sublime Text Theme/Completions/Main Keys.sublime-completions
index 92c9c6c5..33eac3fd 100644
--- a/Package/Sublime Text Theme/Completions/Main Keys.sublime-completions	
+++ b/Package/Sublime Text Theme/Completions/Main Keys.sublime-completions	
@@ -1,5 +1,5 @@
 {
-    "scope": "meta.theme.sublime-theme - meta.mapping meta.mapping - meta.sequence - string - comment",
+    "scope": "meta.theme.sublime-theme - meta.mapping meta.mapping - meta.sequence - meta.string - string - comment",
     "completions": [
         {
             "trigger": "extends",
diff --git a/Package/Sublime Text Theme/Completions/Parent Keys.sublime-completions b/Package/Sublime Text Theme/Completions/Parent Keys.sublime-completions
index 86ca43e3..c6b48f3c 100644
--- a/Package/Sublime Text Theme/Completions/Parent Keys.sublime-completions	
+++ b/Package/Sublime Text Theme/Completions/Parent Keys.sublime-completions	
@@ -1,5 +1,5 @@
 {
-    "scope": "meta.parent-mapping.sublime-theme - meta.parent-mapping.sublime-theme meta meta - string - comment",
+    "scope": "meta.parent-mapping.sublime-theme - meta.parent-mapping.sublime-theme meta meta - meta.string - string - comment",
     "completions": [
         // selectors
         {
diff --git a/Package/Sublime Text Theme/Completions/Platform Values.sublime-completions b/Package/Sublime Text Theme/Completions/Platform Values.sublime-completions
index 41bcb46a..6e811dd9 100644
--- a/Package/Sublime Text Theme/Completions/Platform Values.sublime-completions	
+++ b/Package/Sublime Text Theme/Completions/Platform Values.sublime-completions	
@@ -1,5 +1,5 @@
 {
-    "scope": "meta.platforms-sequence.sublime-theme - string - comment",
+    "scope": "meta.platforms-sequence.sublime-theme - meta.string - string - comment",
     "completions": [
         {
             "trigger": "linux",
diff --git a/Package/Sublime Text Theme/Completions/Rule Keys.sublime-completions b/Package/Sublime Text Theme/Completions/Rule Keys.sublime-completions
index 86467dee..17abbc33 100644
--- a/Package/Sublime Text Theme/Completions/Rule Keys.sublime-completions	
+++ b/Package/Sublime Text Theme/Completions/Rule Keys.sublime-completions	
@@ -1,5 +1,5 @@
 {
-    "scope": "meta.rule.sublime-theme - meta.rule.sublime-theme meta meta - string - comment",
+    "scope": "meta.rule.sublime-theme - meta.rule.sublime-theme meta meta - meta.string - string - comment",
     "completions": [
         // selectors
         {
diff --git a/Package/Sublime Text Theme/Completions/Texture Keys.sublime-completions b/Package/Sublime Text Theme/Completions/Texture Keys.sublime-completions
index 4c4f4088..16954d8d 100644
--- a/Package/Sublime Text Theme/Completions/Texture Keys.sublime-completions	
+++ b/Package/Sublime Text Theme/Completions/Texture Keys.sublime-completions	
@@ -1,5 +1,5 @@
 {
-    "scope": "meta.texture-mapping.sublime-theme - meta.texture-mapping.sublime-theme meta.sequence - string - comment",
+    "scope": "meta.texture-mapping.sublime-theme - meta.texture-mapping.sublime-theme meta.sequence - meta.string - string - comment",
     "completions": [
         {
             "trigger": "keyframes",