diff --git a/examples/.vscode/settings.json b/examples/.vscode/settings.json
index c897acd..c885f64 100644
--- a/examples/.vscode/settings.json
+++ b/examples/.vscode/settings.json
@@ -7,6 +7,12 @@
   },
   "editor.tokenColorCustomizations": {
     "textMateRules": [
+      {
+        "scope": "debug.invalid.illegal.unmatched.renpy",
+        "settings": {
+          "foreground": "#f00"
+        }
+      },
       {
         "scope": "renpy.meta.plain",
         "settings": {
diff --git a/package.json b/package.json
index 809890e..980fa89 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,11 @@
   "name": "languague-renpy",
   "displayName": "Ren'Py Language",
   "description": "Adds rich support for the Ren'Py programming language to Visual Studio Code.",
-  "version": "2.2.0",
+
+  "version": "2.2.1",
+
+
+
   "publisher": "LuqueDaniel",
   "license": "MIT",
   "homepage": "https://github.com/LuqueDaniel/vscode-language-renpy",
@@ -69,12 +73,16 @@
         "path": "./syntaxes/renpy.tmLanguage.json"
       },
       {
-        "scopeName": "source.renpy.python",
-        "path": "./syntaxes/renpy.python.tmLanguage.json"
+        "scopeName": "source.renpy.screen",
+        "path": "./syntaxes/renpy.screen.tmLanguage.json"
       },
       {
         "scopeName": "source.renpy.atl",
         "path": "./syntaxes/renpy.atl.tmLanguage.json"
+      },
+      {
+        "scopeName": "source.renpy.python",
+        "path": "./syntaxes/renpy.python.tmLanguage.json"
       }
     ],
     "snippets": [
diff --git a/syntaxes/renpy.atl.tmLanguage.json b/syntaxes/renpy.atl.tmLanguage.json
index c0e7ebd..b1e4029 100644
--- a/syntaxes/renpy.atl.tmLanguage.json
+++ b/syntaxes/renpy.atl.tmLanguage.json
@@ -7,7 +7,17 @@
   "repository": {
     "atl": {
       "comment": "https://www.renpy.org/doc/html/atl.html#atl-syntax-and-semantics",
-      "patterns": [{ "include": "#atl-keywords" }, { "include": "#atl-blocks" }, { "include": "#atl-simple-expression" }, { "include": "#atl-warper" }, { "include": "#atl-event" }, { "include": "#atl-on" }, { "include": "#atl-function" }]
+      "patterns": [
+        { "include": "source.renpy#conditionals" },
+        { "include": "#atl-keywords" },
+        { "include": "#atl-warper" },
+        { "include": "#atl-blocks" },
+        { "include": "#atl-simple-expression" },
+        { "include": "#atl-event" },
+        { "include": "#atl-on" },
+        { "include": "#atl-function" },
+        { "include": "#atl-fallback" }
+      ]
     },
     "atl-build-in-properties": {
       "comment": "https://www.renpy.org/doc/html/atl.html#list-of-transform-properties",
@@ -24,67 +34,67 @@
         },
         {
           "comment": "position props (int, absolute, or a float)",
-          "name": "support.type.property-name.transform.renpy",
+          "name": "support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy",
           "match": "\\b(?<!\\.)(?:xpos|ypos|xanchor|yanchor|xcenter|ycenter|radius)\\b"
         },
         {
           "comment": "position pair props",
-          "name": "support.type.property-name.transform.renpy",
+          "name": "support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy",
           "match": "\\b(?<!\\.)(?:pos|anchor|xycenter|around|alignaround|matrixanchor)\\b"
         },
         {
           "comment": "float props",
-          "name": "support.type.property-name.transform.renpy",
+          "name": "support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy",
           "match": "\\b(?<!\\.)(?:xalign|yalign|zoom|xzoom|yzoom|alpha|additive|angle|delay|events|zpos)\\b"
         },
         {
           "comment": "float pair props",
-          "name": "support.type.property-name.transform.renpy",
+          "name": "support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy",
           "match": "\\b(?<!\\.)(?:align|knot)\\b"
         },
         {
           "comment": "int props",
-          "name": "support.type.property-name.transform.renpy",
+          "name": "support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy",
           "match": "\\b(?<!\\.)(?:xoffset|yoffset|xtile|ytile)\\b"
         },
         {
           "comment": "int pair props",
-          "name": "support.type.property-name.transform.renpy",
+          "name": "support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy",
           "match": "\\b(?<!\\.)(?:offset)\\b"
         },
         {
           "comment": "boolean props",
-          "name": "support.type.property-name.transform.renpy",
+          "name": "support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy",
           "match": "\\b(?<!\\.)(?:rotate_pad|transform_anchor|nearest|crop_relative|subpixel|zzoom)\\b"
         },
         {
           "comment": "('#float' | None)",
-          "name": "support.type.property-name.transform.renpy",
+          "name": "support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy",
           "match": "\\b(?<!\\.)(?:rotate|xpan|ypan|blur)\\b"
         },
         {
           "comment": "('#position' | None)",
-          "name": "support.type.property-name.transform.renpy",
+          "name": "support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy",
           "match": "\\b(?<!\\.)(?:xsize|ysize)\\b"
         },
         {
           "comment": "('\\(int, int, int, int\\)' | '\\(float, float, float, float\\)' | None)",
-          "name": "support.type.property-name.transform.renpy",
+          "name": "support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy",
           "match": "\\b(?<!\\.)(?:crop)\\b"
         },
         {
           "comment": "('\\(int, int\\)' | None)",
-          "name": "support.type.property-name.transform.renpy",
+          "name": "support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy",
           "match": "\\b(?<!\\.)(?:corner1|corner2)\\b"
         },
         {
           "comment": "('\\(position, position\\)' | None)",
-          "name": "support.type.property-name.transform.renpy",
+          "name": "support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy",
           "match": "\\b(?<!\\.)(?:xysize)\\b"
         },
         {
           "comment": "('#string' | None)",
-          "name": "support.type.property-name.transform.renpy",
+          "name": "support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy",
           "match": "\\b(?<!\\.)(?:fit)\\b"
         },
         {
@@ -94,26 +104,25 @@
         },
         {
           "comment": "('#Matrix' | '#MatrixColor' | None)",
-          "name": "support.type.property-name.transform.renpy",
+          "name": "support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy",
           "match": "\\b(?<!\\.)(?:matrixcolor)\\b"
         },
         {
           "comment": "('#Matrix' | '#TransformMatrix' | None)",
-          "name": "support.type.property-name.transform.renpy",
+          "name": "support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy",
           "match": "\\b(?<!\\.)(?:matrixtransform)\\b"
         },
         {
           "comment": "('#bool' | '#float' | '\\(float, float, float\\)')",
-          "name": "support.type.property-name.transform.renpy",
+          "name": "support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy",
           "match": "\\b(?<!\\.)(?:perspective)\\b"
         }
       ]
     },
     "atl-simple-expression": {
       "patterns": [
-        { "include": "source.renpy#expressions" },
+        { "include": "source.renpy#renpy-only-expressions" },
         { "include": "#atl-build-in-properties" },
-        { "include": "source.renpy.python#literal" },
         { "include": "source.renpy.python#member-access" },
         { "include": "source.renpy.python#illegal-operator" },
         { "include": "source.renpy.python#operator" },
@@ -132,7 +141,13 @@
         { "include": "source.renpy.python#special-variables" },
         { "include": "source.renpy.python#ellipsis" },
         { "include": "source.renpy.python#punctuation" },
-        { "include": "source.renpy.python#line-continuation" }
+        { "include": "source.renpy.python#line-continuation" },
+        {
+          "comment": "Tokenize identifiers",
+          "name": "variable.name.python",
+          "match": "\\b([[:alpha:]_]\\w*)\\b"
+        },
+        { "include": "source.renpy#whitespace" }
       ]
     },
     "atl-expression": {
@@ -196,6 +211,10 @@
           },
           "end": "$",
           "patterns": [{ "include": "#atl-expression" }]
+        },
+        {
+          "comment": "TODO: This is a temporary include until we have proper support for all ATL keywords",
+          "include": "source.renpy#keywords"
         }
       ]
     },
@@ -240,7 +259,7 @@
         { "include": "source.renpy.python#builtin-possible-callables" },
         { "include": "#atl-build-in-events" },
         {
-          "name": "entity.name.function.renpy meta.function-call.generic.renpy",
+          "name": "entity.name.function.event.renpy meta.function-call.generic.renpy",
           "match": "\\b([[:alpha:]_]\\w*)\\b"
         }
       ]
@@ -250,7 +269,7 @@
         { "include": "source.renpy.python#builtin-possible-callables" },
         { "include": "#atl-build-in-events" },
         {
-          "name": "entity.name.function.renpy",
+          "name": "entity.name.function.event.def.renpy",
           "match": "\\b([[:alpha:]_]\\w*)\\b"
         }
       ]
@@ -296,7 +315,7 @@
           "patterns": [
             { "include": "source.renpy.python#builtin-possible-callables" },
             {
-              "name": "entity.name.function.renpy meta.function-call.generic.renpy",
+              "name": "entity.name.function.atl-function.renpy meta.function-call.generic.renpy",
               "match": "\\b([[:alpha:]_]\\w*)\\b"
             }
           ]
@@ -314,20 +333,56 @@
         { "include": "#atl-build-in-warpers" },
         { "include": "#atl-build-in-properties" },
         {
-          "name": "entity.name.function.renpy meta.function-call.generic.renpy",
+          "name": "entity.name.function.warper.renpy meta.function-call.generic.renpy",
           "match": "\\b([[:alpha:]_]\\w*)\\b"
         }
       ]
     },
+    "atl-warper-broken": {
+      "comment": "TODO: This doesn't work right now, we can't assume all identifiers are warpers",
+      "name": "meta.atl.warper.renpy",
+      "begin": "(?<=^[ \\t]*)([[:alpha:]_]\\w*)\\b",
+      "beginCaptures": {
+        "1": { "patterns": [{ "include": "#atl-warper-name" }] }
+      },
+      "end": "(?=[ \\t]*#)|$",
+      "patterns": [{ "include": "#atl-simple-expression" }]
+    },
+
     "atl-warper": {
-      "comment": "https://www.renpy.org/doc/html/atl.html#warpers",
+      "comment": "(TODO: For now we only support build-in warper highlighting) https://www.renpy.org/doc/html/atl.html#warpers",
       "name": "meta.atl.warper.renpy",
-      "begin": "\\b(?<!\\.)([[:alpha:]_]\\w*)\\b[ \\t]*",
+      "begin": "(?<=^[ \\t]*)(linear|ease|easein|easeout|ease_back|ease_bounce|ease_circ|ease_cubic|ease_elastic|ease_expo|ease_quad|ease_quart|ease_quint|easein_back|easein_bounce|easein_circ|easein_cubic|easein_elastic|easein_expo|easein_quad|easein_quart|easein_quint|easeout_back|easeout_bounce|easeout_circ|easeout_cubic|easeout_elastic|easeout_expo|easeout_quad|easeout_quart|easeout_quint)\\b",
       "beginCaptures": {
         "1": { "patterns": [{ "include": "#atl-warper-name" }] }
       },
-      "end": "(?!\\G)",
+      "end": "(?=[ \\t]*#)|$",
       "patterns": [{ "include": "#atl-simple-expression" }]
+    },
+
+    "atl-fallback": {
+      "comment": "TODO: This is a temp fix for missing pattern references",
+      "patterns": [{ "include": "source.renpy" }]
+    },
+
+    "transform": {
+      "contentName": "meta.transform.block.renpy",
+      "begin": "^([ \\t]+)?(transform)\\b[ \\t]*(.*)?(:)",
+      "beginCaptures": {
+        "1": { "name": "punctuation.whitespace.leading.renpy" },
+        "2": { "name": "keyword.transform.renpy" },
+        "3": {
+          "patterns": [
+            {
+              "name": "variable.name.transform.renpy",
+              "match": "\\b([[:alpha:]_]\\w*)\\b"
+            }
+          ]
+        },
+        "4": { "name": "punctuation.section.atl.begin.renpy" }
+      },
+      "end": "^(?=(?!\\1)[ \\t]*[^\\s#]|\\1[^\\s#])",
+      "patterns": [{ "include": "#atl" }]
     }
   }
 }
diff --git a/syntaxes/renpy.python.tmLanguage.json b/syntaxes/renpy.python.tmLanguage.json
index 091b55c..6821c4f 100644
--- a/syntaxes/renpy.python.tmLanguage.json
+++ b/syntaxes/renpy.python.tmLanguage.json
@@ -260,6 +260,7 @@
     },
     "member-access": {
       "name": "meta.member.access.python",
+      "contentName": "variable.name.python",
       "begin": "(\\.)\\s*(?!\\.)",
       "end": "(?<=\\S)(?=\\W)|(^|(?<=\\s))(?=[^\\\\\\w\\s])|$",
       "beginCaptures": {
@@ -309,6 +310,7 @@
     },
     "odd-function-call": {
       "comment": "A bit obscured function call where there may have been anarbitrary number of other operations to get the function.E.g. \"arr[idx](args)\"",
+      "name": "meta.odd-function-call.python",
       "begin": "(?<=\\]|\\))\\s*(?=\\()",
       "end": "(\\))",
       "endCaptures": {
diff --git a/syntaxes/renpy.screen.tmLanguage.json b/syntaxes/renpy.screen.tmLanguage.json
new file mode 100644
index 0000000..3cf9925
--- /dev/null
+++ b/syntaxes/renpy.screen.tmLanguage.json
@@ -0,0 +1,291 @@
+{
+  "information_for_contributors": ["Please remeber to regenerate the ts token patterns using the 'syntax-to-token-pattern.py' python script"],
+  "$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
+  "name": "Ren'Py Screen",
+  "scopeName": "source.renpy.screen",
+  "patterns": [{ "include": "#screen-language" }],
+  "repository": {
+    "builtin-screens": {
+      "name": "support.function.builtin.screen.renpy",
+      "match": "(?<!\\.)\\b(?:start|quit|after_load|splashscreen|before_main_menu|main_menu|after_warp|hide_windows)\\b"
+    },
+    "screen-def-name": {
+      "comment": "TODO: Should combine this with label-def-name",
+      "patterns": [
+        { "include": "source.renpy.python#builtin-possible-callables" },
+        { "include": "#builtin-screens" },
+        {
+          "match": "(?<=^|[ \\t])(\\b(?:[a-zA-Z_]\\w*)\\b)?(\\.)?(\\b(?:[a-zA-Z_]\\w*)\\b)",
+          "captures": {
+            "1": { "name": "entity.name.function.renpy" },
+            "2": { "name": "punctuation.separator.period.renpy" },
+            "3": { "name": "entity.name.function.renpy" }
+          }
+        }
+      ]
+    },
+    "screen-build-in-properties": {
+      "comment": "https://www.renpy.org/doc/html/atl.html#list-of-transform-properties",
+      "patterns": [
+        {
+          "comment": "Special manipulation keywords",
+          "match": "\\b(?<!\\.)(?:(warp)|(circles)|(clockwise)|(counterclockwise))\\b",
+          "captures": {
+            "1": { "name": "keyword.warp.renpy" },
+            "2": { "name": "keyword.circles.renpy" },
+            "3": { "name": "keyword.clockwise.renpy" },
+            "4": { "name": "keyword.counterclockwise.renpy" }
+          }
+        },
+        {
+          "comment": "position props (int, absolute, or a float)",
+          "name": "entity.name.tag.css.transform.renpy",
+          "match": "\\b(?<!\\.)(?:xpos|ypos|xanchor|yanchor|xcenter|ycenter|radius)\\b"
+        },
+        {
+          "comment": "position pair props",
+          "name": "entity.name.tag.css.transform.renpy",
+          "match": "\\b(?<!\\.)(?:pos|anchor|xycenter|around|alignaround|matrixanchor)\\b"
+        },
+        {
+          "comment": "float props",
+          "name": "entity.name.tag.css.transform.renpy",
+          "match": "\\b(?<!\\.)(?:xalign|yalign|zoom|xzoom|yzoom|alpha|additive|angle|delay|events|zpos)\\b"
+        },
+        {
+          "comment": "float pair props",
+          "name": "entity.name.tag.css.transform.renpy",
+          "match": "\\b(?<!\\.)(?:align|knot)\\b"
+        },
+        {
+          "comment": "int props",
+          "name": "entity.name.tag.css.transform.renpy",
+          "match": "\\b(?<!\\.)(?:xoffset|yoffset|xtile|ytile|size)\\b"
+        },
+        {
+          "comment": "int pair props",
+          "name": "entity.name.tag.css.transform.renpy",
+          "match": "\\b(?<!\\.)(?:offset)\\b"
+        },
+        {
+          "comment": "boolean props",
+          "name": "entity.name.tag.css.transform.renpy",
+          "match": "\\b(?<!\\.)(?:rotate_pad|transform_anchor|nearest|crop_relative|subpixel|zzoom)\\b"
+        },
+        {
+          "comment": "('#float' | None)",
+          "name": "entity.name.tag.css.transform.renpy",
+          "match": "\\b(?<!\\.)(?:rotate|xpan|ypan|blur)\\b"
+        },
+        {
+          "comment": "('#position' | None)",
+          "name": "entity.name.tag.css.transform.renpy",
+          "match": "\\b(?<!\\.)(?:xsize|ysize)\\b"
+        },
+        {
+          "comment": "('\\(int, int, int, int\\)' | '\\(float, float, float, float\\)' | None)",
+          "name": "entity.name.tag.css.transform.renpy",
+          "match": "\\b(?<!\\.)(?:crop)\\b"
+        },
+        {
+          "comment": "('\\(int, int\\)' | None)",
+          "name": "entity.name.tag.css.transform.renpy",
+          "match": "\\b(?<!\\.)(?:corner1|corner2)\\b"
+        },
+        {
+          "comment": "('\\(position, position\\)' | None)",
+          "name": "entity.name.tag.css.transform.renpy",
+          "match": "\\b(?<!\\.)(?:xysize)\\b"
+        },
+        {
+          "comment": "('#string' | None)",
+          "name": "entity.name.tag.css.transform.renpy",
+          "match": "\\b(?<!\\.)(?:fit)\\b"
+        },
+        {
+          "comment": "('\\(int, int\\)' | None)",
+          "name": "invalid.deprecated.renpy",
+          "match": "\\b(?<!\\.)(?:size|maxsize)\\b"
+        },
+        {
+          "comment": "('#Matrix' | '#MatrixColor' | None)",
+          "name": "entity.name.tag.css.transform.renpy",
+          "match": "\\b(?<!\\.)(?:matrixcolor)\\b"
+        },
+        {
+          "comment": "('#Matrix' | '#TransformMatrix' | None)",
+          "name": "entity.name.tag.css.transform.renpy",
+          "match": "\\b(?<!\\.)(?:matrixtransform)\\b"
+        },
+        {
+          "comment": "('#bool' | '#float' | '\\(float, float, float\\)')",
+          "name": "entity.name.tag.css.transform.renpy",
+          "match": "\\b(?<!\\.)(?:perspective)\\b"
+        }
+      ]
+    },
+    "screen-simple-expression": {
+      "patterns": [
+        { "include": "source.renpy#renpy-only-expressions" },
+        { "include": "#screen-build-in-properties" },
+        { "include": "source.renpy.python#member-access" },
+        { "include": "source.renpy.python#illegal-operator" },
+        { "include": "source.renpy.python#operator" },
+        { "include": "source.renpy.python#curly-braces" },
+        { "include": "source.renpy.python#item-access" },
+        { "include": "source.renpy.python#list" },
+        { "include": "source.renpy.python#odd-function-call" },
+        { "include": "source.renpy.python#round-braces" },
+        { "include": "source.renpy.python#function-call" },
+        { "include": "source.renpy.python#builtin-functions" },
+        { "include": "source.renpy.python#builtin-types" },
+        { "include": "source.renpy.python#builtin-exceptions" },
+        { "include": "source.renpy.python#magic-names" },
+        { "include": "source.renpy.python#special-names" },
+        { "include": "source.renpy.python#illegal-names" },
+        { "include": "source.renpy.python#special-variables" },
+        { "include": "source.renpy.python#ellipsis" },
+        { "include": "source.renpy.python#punctuation" },
+        { "include": "source.renpy.python#line-continuation" }
+      ]
+    },
+    "screen-keywords": {
+      "comment": "https://www.renpy.org/doc/html/screens.html#screen-statement",
+      "patterns": [
+        {
+          "contentName": "meta.screen.sensitive.renpy",
+          "begin": "(?<=^[ \\t]*)(sensitive)\\b[ \\t]*",
+          "beginCaptures": {
+            "1": { "name": "keyword.sensitive.renpy" }
+          },
+          "end": "$",
+          "patterns": [{ "include": "#screen-simple-expression" }]
+        },
+        {
+          "name": "keyword.other.renpy",
+          "match": "\\b(?<!\\.)(?:modal|sensitive|tag|zorder|variant|layer|roll_forward|text)\\b"
+        },
+        {
+          "name": "keyword.other.renpy",
+          "match": "\\b(?<!\\.)(?:style|style_group|style_prefix)\\b"
+        },
+        {
+          "name": "keyword.other.renpy",
+          "match": "\\b(?<!\\.)(?:has|vbox|hbox|label|add|xfill)\\b"
+        }
+      ]
+    },
+    "screen-frame": {
+      "contentName": "meta.screen.frame.renpy",
+      "begin": "^([ \\t]+)?(frame)\\b[ \\t]*(:)",
+      "beginCaptures": {
+        "1": { "name": "punctuation.whitespace.leading.block.renpy" },
+        "2": { "name": "keyword.frame.renpy" },
+        "3": { "name": "punctuation.section.block.begin.renpy" }
+      },
+      "end": "^(?=(?!\\1)[ \\t]*[^\\s#]|\\1[^\\s#])",
+      "patterns": [{ "include": "#screen-language" }]
+    },
+    "screen-window": {
+      "contentName": "meta.screen.window.renpy",
+      "begin": "^([ \\t]+)?(window)\\b[ \\t]*(:)",
+      "beginCaptures": {
+        "1": { "name": "punctuation.whitespace.leading.block.renpy" },
+        "2": { "name": "keyword.window.renpy" },
+        "3": { "name": "punctuation.section.block.begin.renpy" }
+      },
+      "end": "^(?=(?!\\1)[ \\t]*[^\\s#]|\\1[^\\s#])",
+      "patterns": [{ "include": "#screen-language" }]
+    },
+    "screen-text": {
+      "contentName": "meta.screen.text.renpy",
+      "begin": "^([ \\t]+)?(text)\\b[ \\t]*(:)",
+      "beginCaptures": {
+        "1": { "name": "punctuation.whitespace.leading.block.renpy" },
+        "2": { "name": "keyword.text.renpy" },
+        "3": { "name": "punctuation.section.block.begin.renpy" }
+      },
+      "end": "^(?=(?!\\1)[ \\t]*[^\\s#]|\\1[^\\s#])",
+
+      "patterns": [
+        {
+          "name": "meta.screen.text.renpy",
+          "contentName": "meta.atl-block.renpy",
+          "begin": "^([ \\t]+)?(text)\\b[ \\t]*([a-zA-Z_0-9 ]*)(:)",
+          "beginCaptures": {
+            "1": { "name": "punctuation.whitespace.leading.renpy" },
+            "2": { "name": "keyword.text.renpy" },
+            "3": { "name": "entity.name.type.text.renpy" },
+            "4": { "name": "punctuation.section.atl.begin.renpy" }
+          },
+          "end": "^(?=(?!\\1)[ \\t]*[^\\s#]|\\1[^\\s#])",
+          "patterns": [{ "include": "source.renpy.atl" }]
+        },
+        {
+          "name": "meta.screen.text.renpy",
+          "begin": "(?<=^[ \\t]*)(text)\\b[ \\t]*",
+          "beginCaptures": {
+            "1": { "name": "keyword.text.renpy" }
+          },
+          "end": "(?=\\b(at)\\b|#|=)|$",
+          "patterns": [
+            { "include": "source.renpy#strings" },
+            {
+              "match": "\\b(?:[a-zA-Z_0-9]+)\\b[ \\t]*",
+              "name": "entity.name.type.text.renpy"
+            }
+          ]
+        },
+        { "include": "source.renpy#at-statement" }
+      ]
+    },
+    "screen-box": {
+      "contentName": "meta.box.block.renpy",
+      "begin": "^([ \\t]+)?([vh]box)\\b[ \\t]*(?:.*?)(:)",
+      "beginCaptures": {
+        "1": { "name": "punctuation.whitespace.leading.block.renpy" },
+        "2": { "name": "keyword.box.renpy" },
+        "3": { "name": "punctuation.section.block.begin.renpy" }
+      },
+      "end": "^(?=(?!\\1)[ \\t]*[^\\s#]|\\1[^\\s#])",
+      "patterns": [{ "include": "source.renpy.atl#atl" }]
+    },
+    "screen": {
+      "patterns": [
+        {
+          "comment": "See https://www.renpy.org/doc/html/screens.html",
+          "contentName": "meta.screen.block.renpy",
+          "begin": "^([ \\t]+)?(screen)\\b[ \\t]*(.*?)(:)",
+          "beginCaptures": {
+            "1": { "name": "punctuation.whitespace.leading.block.renpy" },
+            "2": { "name": "storage.type.function.renpy" },
+            "3": {
+              "patterns": [{ "include": "#screen-def-name" }, { "include": "source.renpy.python#parameters" }, { "include": "source.renpy#invalid-token" }]
+            },
+            "4": { "name": "punctuation.section.block.begin.renpy" }
+          },
+          "end": "^(?=(?!\\1)[ \\t]*[^\\s#]|\\1[^\\s#])",
+          "patterns": [{ "include": "#screen-language" }]
+        }
+      ]
+    },
+
+    "screen-fallback": {
+      "comment": "TODO: This is a temp fix for missing pattern references",
+      "patterns": [{ "include": "source.renpy" }]
+    },
+
+    "screen-language": {
+      "comment": "https://www.renpy.org/doc/html/screens.html#screen-language",
+      "patterns": [
+        { "include": "#screen-frame" },
+        { "include": "#screen-window" },
+        { "include": "#screen-box" },
+        { "include": "#screen-text" },
+        { "include": "#screen-keywords" },
+        { "include": "#screen-simple-expression" },
+        { "include": "#screen-fallback" }
+      ]
+    }
+  }
+}
diff --git a/syntaxes/renpy.tmLanguage.json b/syntaxes/renpy.tmLanguage.json
index 9c24c3b..e124e5c 100644
--- a/syntaxes/renpy.tmLanguage.json
+++ b/syntaxes/renpy.tmLanguage.json
@@ -6,10 +6,16 @@
   "patterns": [{ "include": "#base-patterns" }],
   "repository": {
     "statements": {
-      "patterns": [{ "include": "#renpy-statements" }, { "include": "#python-statements" }, { "include": "#keywords" }, { "include": "#say-statements" }]
+      "patterns": [{ "include": "#renpy-statements" }, { "include": "#python-statements" }, { "include": "#conditionals" }, { "include": "#keywords" }, { "include": "#say-statements" }]
     },
     "expressions": {
-      "patterns": [{ "include": "#comments" }, { "include": "#strings" }, { "include": "#literal" }, { "include": "#fallback-characters" }]
+      "patterns": [{ "include": "#renpy-python-expressions" }, { "include": "#fallback-characters" }]
+    },
+    "renpy-only-expressions": {
+      "patterns": [{ "include": "#comments" }, { "include": "#strings" }, { "include": "#literal" }]
+    },
+    "renpy-python-expressions": {
+      "patterns": [{ "include": "#renpy-only-expressions" }]
     },
     "invalid-token": {
       "match": ".+",
@@ -120,7 +126,8 @@
           "comment": "Python literals",
           "name": "constant.language.renpy",
           "match": "\\b(?<!\\.)(True|False|None)\\b"
-        }
+        },
+        { "include": "source.renpy.python#literal" }
       ]
     },
     "num-float": {
@@ -170,7 +177,12 @@
         {
           "comment": "[TODO: Should probably only be a keyword in the expression] Renpy sub expression keywords",
           "name": "keyword.other.renpy",
-          "match": "\\b(?<!\\.)(?:set|expression|at|with|from)\\b"
+          "match": "\\b(?<!\\.)(?:set|expression|at|with|from|style|style_prefix|spacing|textbutton)\\b"
+        },
+        {
+          "comment": "[TODO: Should probably only be a keyword in the expression] Renpy sub expression keywords",
+          "name": "keyword.control.flow.other.renpy",
+          "match": "\\b(?<!\\.)(?:action)\\b"
         }
       ]
     },
@@ -260,67 +272,8 @@
     "strings-interior": {
       "patterns": [{ "include": "#new-line" }, { "include": "#escaped_char" }, { "include": "#string-tags" }, { "include": "#constant_placeholder" }]
     },
-    "string-tags": {
+    "string-tags-broken": {
       "patterns": [
-        {
-          "comment": "Valid tags without params (self-closing)",
-          "name": "meta.string.tag.${2:/downcase}.self-closing.renpy",
-          "match": "({)\\s*(nw|done|fast|p|w|clear)\\s*(})",
-          "captures": {
-            "1": { "name": "punctuation.definition.tag.begin.renpy" },
-            "2": { "name": "entity.name.tag.${2:/downcase}.renpy" },
-            "3": { "name": "punctuation.definition.tag.end.renpy" }
-          }
-        },
-        {
-          "comment": "Valid tags with numeric params (self-closing)",
-          "name": "meta.string.tag.${2:/downcase}.self-closing.renpy",
-          "match": "({)\\s*(p|w)(=)(\\+?)(\\d*(?:.\\d+)?)\\s*(})",
-          "captures": {
-            "1": { "name": "punctuation.definition.tag.begin.renpy" },
-            "2": { "name": "entity.name.tag.${2:/downcase}.renpy" },
-            "3": { "name": "punctuation.separator.key-value.renpy keyword.operator.assignment.renpy" },
-            "4": { "name": "keyword.operator.arithmetic.plus.renpy" },
-            "5": { "name": "support.constant.property-value.renpy constant.numeric.float.renpy" },
-            "6": { "name": "punctuation.definition.tag.end.renpy" }
-          }
-        },
-        {
-          "comment": "Valid tags with numeric params (self-closing)",
-          "name": "meta.string.tag.${2:/downcase}.self-closing.renpy",
-          "match": "({)\\s*(v?space)(=)(\\+?)(\\d+)\\s*(})",
-          "captures": {
-            "1": { "name": "punctuation.definition.tag.begin.renpy" },
-            "2": { "name": "entity.name.tag.${2:/downcase}.renpy" },
-            "3": { "name": "punctuation.separator.key-value.renpy keyword.operator.assignment.renpy" },
-            "4": { "name": "keyword.operator.arithmetic.plus.renpy" },
-            "5": { "name": "support.constant.property-value.renpy constant.numeric.integer.renpy" },
-            "6": { "name": "punctuation.definition.tag.end.renpy" }
-          }
-        },
-        {
-          "comment": "Comment tag (self-closing)",
-          "name": "meta.string.tag.comment.self-closing.renpy",
-          "match": "({)\\s*(#)\\s*(.*?)\\s*(})",
-          "captures": {
-            "1": { "name": "punctuation.definition.tag.begin.renpy" },
-            "2": { "name": "comment.line.number-sign.renpy punctuation.definition.comment.renpy" },
-            "3": { "name": "comment.line.number-sign.renpy" },
-            "4": { "name": "punctuation.definition.tag.end.renpy" }
-          }
-        },
-        {
-          "comment": "Valid tags with file param",
-          "name": "meta.string.tag.${2:/downcase}.self-closing.renpy",
-          "match": "({)\\s*(image)(=)([\\w.]+)\\s*(})",
-          "captures": {
-            "1": { "name": "punctuation.definition.tag.begin.renpy" },
-            "2": { "name": "entity.name.tag.${2:/downcase}.renpy" },
-            "3": { "name": "punctuation.separator.key-value.renpy keyword.operator.assignment.renpy" },
-            "4": { "name": "support.constant.property-value.renpy string.unquoted.renpy" },
-            "5": { "name": "punctuation.definition.tag.end.renpy" }
-          }
-        },
         {
           "comment": "Valid tags without params (close required)",
           "contentName": "renpy.meta.${2:/downcase} meta.tagged.string.renpy",
@@ -454,6 +407,154 @@
             "3": { "name": "punctuation.definition.tag.end.renpy" }
           },
           "patterns": [{ "include": "#strings-interior" }]
+        }
+      ]
+    },
+    "string-tags": {
+      "patterns": [
+        {
+          "comment": "Valid tags without params (self-closing)",
+          "name": "meta.string.tag.${2:/downcase}.self-closing.renpy",
+          "match": "({)\\s*(nw|done|fast|p|w|clear)\\s*(})",
+          "captures": {
+            "1": { "name": "punctuation.definition.tag.begin.renpy" },
+            "2": { "name": "entity.name.tag.${2:/downcase}.renpy" },
+            "3": { "name": "punctuation.definition.tag.end.renpy" }
+          }
+        },
+        {
+          "comment": "Valid tags with numeric params (self-closing)",
+          "name": "meta.string.tag.${2:/downcase}.self-closing.renpy",
+          "match": "({)\\s*(p|w)(=)(\\+?)(\\d*(?:.\\d+)?)\\s*(})",
+          "captures": {
+            "1": { "name": "punctuation.definition.tag.begin.renpy" },
+            "2": { "name": "entity.name.tag.${2:/downcase}.renpy" },
+            "3": { "name": "punctuation.separator.key-value.renpy keyword.operator.assignment.renpy" },
+            "4": { "name": "keyword.operator.arithmetic.plus.renpy" },
+            "5": { "name": "support.constant.property-value.renpy constant.numeric.float.renpy" },
+            "6": { "name": "punctuation.definition.tag.end.renpy" }
+          }
+        },
+        {
+          "comment": "Valid tags with numeric params (self-closing)",
+          "name": "meta.string.tag.${2:/downcase}.self-closing.renpy",
+          "match": "({)\\s*(v?space)(=)(\\+?)(\\d+)\\s*(})",
+          "captures": {
+            "1": { "name": "punctuation.definition.tag.begin.renpy" },
+            "2": { "name": "entity.name.tag.${2:/downcase}.renpy" },
+            "3": { "name": "punctuation.separator.key-value.renpy keyword.operator.assignment.renpy" },
+            "4": { "name": "keyword.operator.arithmetic.plus.renpy" },
+            "5": { "name": "support.constant.property-value.renpy constant.numeric.integer.renpy" },
+            "6": { "name": "punctuation.definition.tag.end.renpy" }
+          }
+        },
+        {
+          "comment": "Comment tag (self-closing)",
+          "name": "meta.string.tag.comment.self-closing.renpy",
+          "match": "({)\\s*(#)\\s*(.*?)\\s*(})",
+          "captures": {
+            "1": { "name": "punctuation.definition.tag.begin.renpy" },
+            "2": { "name": "comment.line.number-sign.renpy punctuation.definition.comment.renpy" },
+            "3": { "name": "comment.line.number-sign.renpy" },
+            "4": { "name": "punctuation.definition.tag.end.renpy" }
+          }
+        },
+        {
+          "comment": "Valid tags with file param",
+          "name": "meta.string.tag.${2:/downcase}.self-closing.renpy",
+          "match": "({)\\s*(image)(=)([\\w.]+)\\s*(})",
+          "captures": {
+            "1": { "name": "punctuation.definition.tag.begin.renpy" },
+            "2": { "name": "entity.name.tag.${2:/downcase}.renpy" },
+            "3": { "name": "punctuation.separator.key-value.renpy keyword.operator.assignment.renpy" },
+            "4": { "name": "support.constant.property-value.renpy string.unquoted.renpy" },
+            "5": { "name": "punctuation.definition.tag.end.renpy" }
+          }
+        },
+        {
+          "comment": "Valid tags without params (close required)",
+          "match": "({)\\s*(u|i|b|s|plain|alt|noalt|art|rb|rt)\\s*(})",
+          "captures": {
+            "0": { "name": "meta.string.tag.${2:/downcase}.start.renpy" },
+            "1": { "name": "punctuation.definition.tag.begin.renpy" },
+            "2": { "name": "entity.name.tag.${2:/downcase}.renpy" },
+            "3": { "name": "punctuation.definition.tag.end.renpy" }
+          }
+        },
+        {
+          "comment": "Valid tags with numeric params (close required)",
+          "contentName": "renpy.meta.${2:/downcase} meta.tagged.string.renpy",
+          "match": "({)\\s*(alpha|cps|k)(=)(?:(\\*)|(\\-)|(\\+))?(\\d*(?:.\\d+)?)\\s*(})",
+          "captures": {
+            "0": { "name": "meta.string.tag.${2:/downcase}.start.renpy" },
+            "1": { "name": "punctuation.definition.tag.begin.renpy" },
+            "2": { "name": "entity.name.tag.${2:/downcase}.renpy" },
+            "3": { "name": "punctuation.separator.key-value.renpy keyword.operator.assignment.renpy" },
+            "4": { "name": "keyword.operator.arithmetic.Multiply.renpy" },
+            "5": { "name": "keyword.operator.arithmetic.Minus.renpy" },
+            "6": { "name": "keyword.operator.arithmetic.Plus.renpy" },
+            "7": { "name": "support.constant.property-value.renpy constant.numeric.renpy" },
+            "8": { "name": "punctuation.definition.tag.end.renpy" }
+          }
+        },
+        {
+          "comment": "Valid tags with numeric params (close required)",
+          "contentName": "renpy.meta.${2:/downcase} meta.tagged.string.renpy",
+          "match": "({)\\s*(size)(=)([\\-+]?)(\\d+)\\s*(})",
+          "captures": {
+            "0": { "name": "meta.string.tag.${2:/downcase}.start.renpy" },
+            "1": { "name": "punctuation.definition.tag.begin.renpy" },
+            "2": { "name": "entity.name.tag.${2:/downcase}.renpy" },
+            "3": { "name": "punctuation.separator.key-value.renpy keyword.operator.assignment.renpy" },
+            "4": { "name": "keyword.operator.arithmetic.renpy" },
+            "5": { "name": "support.constant.property-value.renpy constant.numeric.integer.renpy" },
+            "6": { "name": "punctuation.definition.tag.end.renpy" }
+          }
+        },
+        {
+          "comment": "Valid tags with file param (close required)",
+          "name": "meta.string.tag.${2:/downcase}.self-closing.renpy",
+          "match": "({)\\s*(font)(=)([\\w.]+)\\s*(})",
+          "captures": {
+            "0": { "name": "meta.string.tag.${2:/downcase}.start.renpy" },
+            "1": { "name": "punctuation.definition.tag.begin.renpy" },
+            "2": { "name": "entity.name.tag.${2:/downcase}.renpy" },
+            "3": { "name": "punctuation.separator.key-value.renpy keyword.operator.assignment.renpy" },
+            "4": { "name": "support.constant.property-value.renpy string.unquoted.renpy" },
+            "5": { "name": "punctuation.definition.tag.end.renpy" }
+          }
+        },
+        {
+          "comment": "Color tag",
+          "contentName": "renpy.meta.${2:/downcase}.${4:/downcase} meta.tagged.string.renpy",
+          "match": "({)\\s*(color|outlinecolor)(=)(#?[a-zA-Z0-9]+)\\s*(})",
+          "captures": {
+            "0": { "name": "meta.string.tag.${2:/downcase}.start.renpy" },
+            "1": { "name": "punctuation.definition.tag.begin.renpy" },
+            "2": { "name": "entity.name.tag.${2:/downcase}.renpy" },
+            "3": { "name": "punctuation.separator.key-value.renpy keyword.operator.assignment.renpy" },
+            "4": {
+              "name": "constant.color.renpy",
+              "patterns": [{ "include": "#hex_literal" }]
+            },
+            "5": { "name": "punctuation.definition.tag.end.renpy" }
+          }
+        },
+        {
+          "comment": "a tag",
+          "contentName": "renpy.meta.${2:/downcase} meta.tagged.string.renpy",
+          "match": "({)\\s*(a)(=)(.*?)\\s*(})",
+          "captures": {
+            "0": { "name": "meta.string.tag.${2:/downcase}.start.renpy" },
+            "1": { "name": "punctuation.definition.tag.begin.renpy" },
+            "2": { "name": "entity.name.tag.${2:/downcase}.renpy" },
+            "3": { "name": "punctuation.separator.key-value.renpy keyword.operator.assignment.renpy" },
+            "4": {
+              "name": "support.constant.property-value.renpy string.unquoted.renpy",
+              "patterns": []
+            },
+            "5": { "name": "punctuation.definition.tag.end.renpy" }
+          }
         },
         {
           "comment": "Unknown tag (Single line support only cus \\R does not work) (Since we don't know if a tag is self closing, we can't assume that an end pattern exists)",
@@ -479,7 +580,7 @@
           "captures": {
             "0": { "name": "meta.string.tag.${2:/downcase}.start.renpy" },
             "1": { "name": "punctuation.definition.tag.begin.renpy" },
-            "2": { "name": "renpy.meta.u entity.name.tag.${2:/downcase}.renpy" },
+            "2": { "name": "entity.name.tag.${2:/downcase}.renpy" },
             "3": { "name": "punctuation.separator.key-value.renpy keyword.operator.assignment.renpy" },
             "4": {
               "name": "support.constant.property-value.renpy constant.other.placeholder.tags.renpy",
@@ -494,7 +595,7 @@
           "captures": {
             "0": { "name": "meta.string.tag.${2:/downcase}.end.renpy" },
             "1": { "name": "punctuation.definition.tag.begin.renpy" },
-            "2": { "name": "renpy.meta.u entity.name.tag.${2:/downcase}.renpy" },
+            "2": { "name": "entity.name.tag.${2:/downcase}.renpy" },
             "3": { "name": "punctuation.definition.tag.end.renpy" }
           }
         }
@@ -658,7 +759,7 @@
     },
 
     "pause": {
-      "match": "^([ \\t]+)(pause)\\b([ \\t]+[^#\\n]*)?$",
+      "match": "(?<=^[ \\t]+)(pause)\\b([ \\t]+[^#\\n]*)?$",
       "captures": {
         "1": { "name": "punctuation.whitespace.leading.renpy" },
         "2": { "name": "keyword.control.flow.pause.renpy" },
@@ -670,24 +771,18 @@
       }
     },
 
-    "transform": {
-      "begin": "^([ \\t]+)?(transform)\\b[ \\t]*(.*)?(:)",
-      "beginCaptures": {
-        "1": { "name": "punctuation.whitespace.leading.renpy" },
-        "2": { "name": "keyword.transform.renpy" },
-        "3": {
-          "patterns": [
-            {
-              "name": "variable.name.transform.renpy",
-              "match": "\\b([[:alpha:]_]\\w*)\\b"
-            }
-          ]
+    "conditionals": {
+      "match": "(?<=^[ \\t]+)(if|elif|else)\\b([^#\\n:]+)?(:)",
+      "captures": {
+        "1": { "name": "keyword.control.conditional.renpy" },
+        "2": {
+          "name": "meta.condition.renpy",
+          "patterns": [{ "include": "source.renpy.python#expression" }]
         },
-        "4": { "name": "punctuation.section.atl.begin.renpy" }
-      },
-      "end": "^(?=(?!\\1)[ \\t]*[^\\s#]|\\1[^\\s#])",
-      "patterns": [{ "include": "source.renpy.atl" }]
+        "3": { "name": "punctuation.section.condition.begin.renpy" }
+      }
     },
+
     "at-statement": {
       "name": "meta.at.statement.renpy",
       "match": "\\b(at)\\b[ \\t]*(.+)?",
@@ -911,164 +1006,6 @@
         "2": { "name": "entity.name.class.python.renpy.screen.renpy" }
       }
     },
-    "builtin-screens": {
-      "comment": "TODO: Should combine this with builtin-labels",
-      "name": "support.function.builtin.renpy",
-      "match": "(?<!\\.)\\b(?:start|quit|after_load|splashscreen|before_main_menu|main_menu|after_warp|hide_windows)\\b"
-    },
-    "screen-language": {
-      "comment": "https://www.renpy.org/doc/html/screens.html#screen-language",
-      "patterns": [{ "include": "#screen-frame" }, { "include": "#screen-window" }, { "include": "#screen-text" }, { "include": "#screen-keywords" }, { "include": "#screen-simple-expression" }]
-    },
-    "screen-def-name": {
-      "comment": "TODO: Should combine this with label-def-name",
-      "patterns": [
-        { "include": "source.renpy.python#builtin-possible-callables" },
-        { "include": "#builtin-screens" },
-        {
-          "match": "(?<=^|[ \\t])(\\b(?:[a-zA-Z_]\\w*)\\b)?(\\.)?(\\b(?:[a-zA-Z_]\\w*)\\b)",
-          "captures": {
-            "1": { "name": "entity.name.function.renpy" },
-            "2": { "name": "punctuation.separator.period.renpy" },
-            "3": { "name": "entity.name.function.renpy" }
-          }
-        }
-      ]
-    },
-    "screen-simple-expression": {
-      "patterns": [
-        { "include": "#expressions" },
-        { "include": "source.renpy.python#literal" },
-        { "include": "source.renpy.python#member-access" },
-        { "include": "source.renpy.python#illegal-operator" },
-        { "include": "source.renpy.python#operator" },
-        { "include": "source.renpy.python#curly-braces" },
-        { "include": "source.renpy.python#item-access" },
-        { "include": "source.renpy.python#list" },
-        { "include": "source.renpy.python#odd-function-call" },
-        { "include": "source.renpy.python#round-braces" },
-        { "include": "source.renpy.python#function-call" },
-        { "include": "source.renpy.python#builtin-functions" },
-        { "include": "source.renpy.python#builtin-types" },
-        { "include": "source.renpy.python#builtin-exceptions" },
-        { "include": "source.renpy.python#magic-names" },
-        { "include": "source.renpy.python#special-names" },
-        { "include": "source.renpy.python#illegal-names" },
-        { "include": "source.renpy.python#special-variables" },
-        { "include": "source.renpy.python#ellipsis" },
-        { "include": "source.renpy.python#punctuation" },
-        { "include": "source.renpy.python#line-continuation" }
-      ]
-    },
-    "screen-keywords": {
-      "comment": "https://www.renpy.org/doc/html/screens.html#screen-statement",
-      "patterns": [
-        {
-          "contentName": "meta.screen.sensitive.renpy",
-          "begin": "(?<=^[ \\t]*)(sensitive)\\b[ \\t]*",
-          "beginCaptures": {
-            "1": { "name": "keyword.sensitive.renpy" }
-          },
-          "end": "$",
-          "patterns": [{ "include": "#screen-simple-expression" }]
-        },
-        {
-          "name": "keyword.other.renpy",
-          "match": "\\b(?<!\\.)(?:modal|sensitive|tag|zorder|variant|layer|roll_forward|text)\\b"
-        },
-        {
-          "name": "keyword.other.renpy",
-          "match": "\\b(?<!\\.)(?:style|style_group|style_prefix)\\b"
-        },
-        {
-          "name": "keyword.other.renpy",
-          "match": "\\b(?<!\\.)(?:has|vbox|label|add|xfill)\\b"
-        }
-      ]
-    },
-    "screen-frame": {
-      "contentName": "meta.screen.frame.renpy",
-      "begin": "^([ \\t]+)?(frame)\\b[ \\t]*(:)",
-      "beginCaptures": {
-        "1": { "name": "punctuation.whitespace.leading.block.renpy" },
-        "2": { "name": "keyword.frame.renpy" },
-        "3": { "name": "punctuation.section.block.begin.renpy" }
-      },
-      "end": "^(?=(?!\\1)[ \\t]*[^\\s#]|\\1[^\\s#])",
-      "patterns": [{ "include": "#screen-language" }]
-    },
-    "screen-window": {
-      "contentName": "meta.screen.window.renpy",
-      "begin": "^([ \\t]+)?(window)\\b[ \\t]*(:)",
-      "beginCaptures": {
-        "1": { "name": "punctuation.whitespace.leading.block.renpy" },
-        "2": { "name": "keyword.window.renpy" },
-        "3": { "name": "punctuation.section.block.begin.renpy" }
-      },
-      "end": "^(?=(?!\\1)[ \\t]*[^\\s#]|\\1[^\\s#])",
-      "patterns": [{ "include": "#screen-language" }]
-    },
-    "screen-text": {
-      "contentName": "meta.screen.text.renpy",
-      "begin": "^([ \\t]+)?(text)\\b[ \\t]*(:)",
-      "beginCaptures": {
-        "1": { "name": "punctuation.whitespace.leading.block.renpy" },
-        "2": { "name": "keyword.text.renpy" },
-        "3": { "name": "punctuation.section.block.begin.renpy" }
-      },
-      "end": "^(?=(?!\\1)[ \\t]*[^\\s#]|\\1[^\\s#])",
-
-      "patterns": [
-        {
-          "name": "meta.screen.text.renpy",
-          "contentName": "meta.atl-block.renpy",
-          "begin": "^([ \\t]+)?(text)\\b[ \\t]*([a-zA-Z_0-9 ]*)(:)",
-          "beginCaptures": {
-            "1": { "name": "punctuation.whitespace.leading.renpy" },
-            "2": { "name": "keyword.text.renpy" },
-            "3": { "name": "entity.name.type.text.renpy" },
-            "4": { "name": "punctuation.section.atl.begin.renpy" }
-          },
-          "end": "^(?=(?!\\1)[ \\t]*[^\\s#]|\\1[^\\s#])",
-          "patterns": [{ "include": "source.renpy.atl" }]
-        },
-        {
-          "name": "meta.screen.text.renpy",
-          "begin": "(?<=^[ \\t]*)(text)\\b[ \\t]*",
-          "beginCaptures": {
-            "1": { "name": "keyword.text.renpy" }
-          },
-          "end": "(?=\\b(at)\\b|#|=)|$",
-          "patterns": [
-            { "include": "#strings" },
-            {
-              "match": "\\b(?:[a-zA-Z_0-9]+)\\b[ \\t]*",
-              "name": "entity.name.type.text.renpy"
-            }
-          ]
-        },
-        { "include": "#at-statement" }
-      ]
-    },
-    "screen": {
-      "patterns": [
-        {
-          "comment": "See https://www.renpy.org/doc/html/screens.html",
-          "contentName": "meta.screen.block.renpy",
-          "begin": "^([ \\t]+)?(screen)\\b[ \\t]*(.*?)(:)",
-          "beginCaptures": {
-            "1": { "name": "punctuation.whitespace.leading.block.renpy" },
-            "2": { "name": "storage.type.function.renpy" },
-            "3": {
-              "patterns": [{ "include": "#screen-def-name" }, { "include": "source.renpy.python#parameters" }, { "include": "#invalid-token" }]
-            },
-            "4": { "name": "punctuation.section.block.begin.renpy" }
-          },
-          "end": "^(?=(?!\\1)[ \\t]*[^\\s#]|\\1[^\\s#])",
-          "patterns": [{ "include": "#screen-language" }]
-        }
-      ]
-    },
     "builtin-labels": {
       "name": "support.function.builtin.renpy",
       "match": "(?<!\\.)\\b(?:start|quit|after_load|splashscreen|before_main_menu|main_menu|after_warp|hide_windows)\\b"
@@ -1078,7 +1015,7 @@
         { "include": "source.renpy.python#builtin-possible-callables" },
         { "include": "#builtin-labels" },
         {
-          "name": "entity.name.function.renpy",
+          "name": "entity.name.function.label.renpy",
           "match": "\\b(?:[a-zA-Z_]\\w*)\\b"
         }
       ]
@@ -1111,9 +1048,9 @@
         {
           "match": "(?<=^|[ \\t])(\\b(?:[a-zA-Z_]\\w*)\\b)?(\\.)?(\\b(?:[a-zA-Z_]\\w*)\\b)",
           "captures": {
-            "1": { "name": "entity.name.function.renpy" },
+            "1": { "name": "entity.name.function.label.renpy" },
             "2": { "name": "punctuation.separator.period.renpy" },
-            "3": { "name": "entity.name.function.renpy" }
+            "3": { "name": "entity.name.function.label.renpy" }
           }
         }
       ]
@@ -1136,7 +1073,7 @@
         "1": { "name": "keyword.control.flow.return.renpy" }
       },
       "end": "$",
-      "patterns": [{ "include": "#expressions" }, { "include": "source.renpy.python#expression" }]
+      "patterns": [{ "include": "#expressions-renpy-only" }, { "include": "source.renpy.python#expression" }]
     },
     "call-jump-expression": {
       "begin": "\\b(?<!\\.)(expression)\\b",
@@ -1144,7 +1081,7 @@
         "1": { "name": "keyword.expression.renpy" }
       },
       "end": "(?=\\b(?<!\\.)(?:pass|from)\\b)|$",
-      "patterns": [{ "include": "#expressions" }, { "include": "source.renpy.python#expression" }]
+      "patterns": [{ "include": "#expressions-renpy-only" }, { "include": "source.renpy.python#expression" }]
     },
     "jump": {
       "name": "meta.jump.statement.renpy",
@@ -1169,7 +1106,7 @@
     "call-pass": {
       "begin": "\\b(?<!\\.)(pass)\\b[ \\t]*(?=\\()",
       "beginCaptures": {
-        "1": { "name": "keyword.pass.renpy" }
+        "1": { "name": "keyword.control.flow.pass.renpy" }
       },
       "end": "(\\))",
       "endCaptures": {
@@ -1187,9 +1124,10 @@
     },
     "call": {
       "name": "meta.call.statement.renpy",
-      "begin": "(?<=^[ \\t]+)(call)\\b[ \\t]*",
+      "begin": "(?<=^[ \\t]+)(call)\\b(?:[ \\t]+(screen))?",
       "beginCaptures": {
-        "1": { "name": "keyword.control.flow.call.renpy" }
+        "1": { "name": "keyword.control.flow.call.renpy" },
+        "2": { "name": "keyword.screen.renpy" }
       },
       "end": "(?=#)|$",
       "endCaptures": {
@@ -1263,7 +1201,7 @@
             {
               "comment": "Menu name",
               "match": "[a-zA-Z_.]\\w*",
-              "name": "entity.name.function.renpy"
+              "name": "entity.name.function.menu.renpy"
             },
             { "include": "source.renpy.python#function-arguments" }
           ]
@@ -1360,14 +1298,14 @@
         { "include": "#image" },
         { "include": "#audio" },
         { "include": "#pause" },
-        { "include": "#transform" },
+        { "include": "source.renpy.atl#transform" },
         { "include": "#scene" },
         { "include": "#camera" },
         { "include": "#show" },
         { "include": "#with-statement" },
         { "include": "#style-old" },
         { "include": "#use-old" },
-        { "include": "#screen" },
+        { "include": "source.renpy.screen#screen" },
         { "include": "#return-statements" },
         { "include": "#jump" },
         { "include": "#call" }