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 a7036871..9e96cda6 100644
--- a/Package/Sublime Text Color Scheme/Completions/Globals Keys.sublime-completions	
+++ b/Package/Sublime Text Color Scheme/Completions/Globals Keys.sublime-completions	
@@ -25,6 +25,30 @@
             "contents": "\"block_caret\": \"$1\",",
             "kind": ["keyword", "k", "globals"],
         },
+        {
+            "trigger": "block_caret_corner_style",
+            "details": "Block caret corner style",
+            "contents": "\"block_caret_corner_style\": \"$1\",",
+            "kind": ["keyword", "k", "globals"],
+        },
+        {
+            "trigger": "block_caret_border",
+            "details": "Block caret border color",
+            "contents": "\"block_caret_border\": \"$1\",",
+            "kind": ["keyword", "k", "globals"],
+        },
+        {
+            "trigger": "block_caret_underline",
+            "details": "Color of the block caret in selection",
+            "contents": "\"block_caret_underline\": \"$1\",",
+            "kind": ["keyword", "k", "globals"],
+        },
+        {
+            "trigger": "block_caret_corner_radius",
+            "details": "Block caret corner radius",
+            "contents": "\"block_caret_corner_radius\": \"$1\",",
+            "kind": ["keyword", "k", "globals"],
+        },
         {
             "trigger": "bracket_contents_foreground",
             "details": "Foreground color of highlighted brackets (inside)",
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 4bef6450..ac2f9153 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	
@@ -233,7 +233,7 @@ contexts:
           |brackets_foreground|bracket_contents_foreground|tags_foreground
           |minimap_border|gutter|gutter_foreground|rulers|fold_marker
           |line_diff_(?:modified|added|deleted) # added in 3186 & 3189
-          |block_caret # added in 3190
+          |block_caret(?:_(?:border|underline))? # block_caret added in 3190, others in 4086.
         )(")
       captures:
         1: punctuation.definition.string.begin.json
@@ -246,7 +246,7 @@ contexts:
         2: entity.name.globals.sublime-color-scheme
         3: punctuation.definition.string.end.json
       set: [expect-css-string-value, expect-colon]
-    - match: (")(shadow_width|selection_corner_radius|selection_border_width|line_diff_width)(")
+    - match: (")(shadow_width|(?:selection|block_caret)_corner_radius|selection_border_width|line_diff_width)(")
       captures:
         1: punctuation.definition.string.begin.json
         2: entity.name.globals.sublime-color-scheme
@@ -264,7 +264,7 @@ contexts:
         2: entity.name.globals.sublime-color-scheme
         3: punctuation.definition.string.end.json
       set: [expect-underlinestyle-string-value, expect-colon]
-    - match: (")(selection_corner_style)(")
+    - match: (")((?:selection|block_caret)_corner_style)(")
       captures:
         1: punctuation.definition.string.begin.json
         2: entity.name.globals.sublime-color-scheme