From 43008f6c2040057949e5759f2c6c49af3bc86aeb Mon Sep 17 00:00:00 2001
From: duckdoom4 <60387522+duckdoom4@users.noreply.github.com>
Date: Fri, 12 Jul 2024 20:59:29 +0200
Subject: [PATCH] Update patterns to fix some warnings in the tokenizer

---
 src/tokenizer/atl-token-patterns.g.ts    |  14 +-
 src/tokenizer/debug-decorator.ts         |   5 +
 src/tokenizer/python-token-patterns.g.ts | 138 +++++++------
 src/tokenizer/renpy-token-patterns.g.ts  | 252 +++++++++++++----------
 src/tokenizer/renpy-tokens.ts            |   4 +
 src/tokenizer/screen-token-patterns.g.ts |  28 ++-
 src/tokenizer/style-token-patterns.g.ts  |  32 +--
 src/tokenizer/token-definitions.ts       |   6 +-
 src/tokenizer/token-patterns.g.ts        |  36 +++-
 syntax-to-token-pattern.py               |   2 +
 syntaxes/renpy.atl.tmLanguage.json       |  12 +-
 syntaxes/renpy.python.tmLanguage.json    | 110 ++++------
 syntaxes/renpy.screen.tmLanguage.json    |  28 +--
 syntaxes/renpy.style.tmLanguage.json     |  32 ++-
 syntaxes/renpy.tmLanguage.json           | 207 +++++++++++--------
 15 files changed, 500 insertions(+), 406 deletions(-)

diff --git a/src/tokenizer/atl-token-patterns.g.ts b/src/tokenizer/atl-token-patterns.g.ts
index 949c479..dd3703d 100644
--- a/src/tokenizer/atl-token-patterns.g.ts
+++ b/src/tokenizer/atl-token-patterns.g.ts
@@ -5,7 +5,7 @@
 // THIS FILE HAS BEEN GENERATED BY THE `syntax-to-token-pattern.py` GENERATOR
 // DO NOT EDIT THIS FILE DIRECTLY! INSTEAD RUN THE PYTHON SCRIPT.
 // ANY MANUAL EDITS MADE TO THIS FILE WILL BE OVERWRITTEN. YOU HAVE BEEN WARNED.
-// Last generated: 12/07/2024 09:35:29 (UTC+0)
+// Last generated: 12/07/2024 18:50:56 (UTC+0)
 
 import { KeywordTokenType, EntityTokenType, MetaTokenType, CharacterTokenType } from "./renpy-tokens";
 import { TokenPattern } from "./token-pattern-types";
@@ -173,7 +173,7 @@ export const atlExpression: TokenPattern = {
         {
             debugName: "atlExpression.patterns![1]",
 
-            begin: /\b(with)\b[ \t]*/dg,
+            begin: /\b(with)\b/dg,
             beginCaptures: {
                 1: { token: KeywordTokenType.With, /*keyword.with.renpy*/ },
             },
@@ -189,7 +189,7 @@ export const atlKeywords: TokenPattern = {
             debugName: "atlKeywords.patterns![0]",
 
             // https://www.renpy.org/doc/html/atl.html#animation-statement
-            match: /^[ \t]*(animation)\b/dgm,
+            match: /(?<=^[ \t]*)(animation)\b/dgm,
             captures: {
                 1: { token: KeywordTokenType.Animation, /*keyword.animation.renpy*/ },
             },
@@ -198,7 +198,7 @@ export const atlKeywords: TokenPattern = {
             debugName: "atlKeywords.patterns![1]",
 
             // https://www.renpy.org/doc/html/atl.html#pass-statement
-            match: /^[ \t]*(pass)\b/dgm,
+            match: /(?<=^[ \t]*)(pass)\b/dgm,
             captures: {
                 1: { token: KeywordTokenType.Pass, /*keyword.control.flow.pass.renpy*/ },
             },
@@ -207,7 +207,7 @@ export const atlKeywords: TokenPattern = {
             debugName: "atlKeywords.patterns![2]",
 
             // https://www.renpy.org/doc/html/atl.html#repeat-statement and https://www.renpy.org/doc/html/atl.html#time-statement
-            begin: /^[ \t]*(?:(repeat)|(time)|(pause))\b[ \t]*/dgm,
+            begin: /(?<=^[ \t]*)(?:(repeat)|(time)|(pause))\b/dgm,
             beginCaptures: {
                 1: { token: KeywordTokenType.Repeat, /*keyword.control.flow.repeat.renpy*/ },
                 2: { token: KeywordTokenType.Time, /*keyword.control.flow.time.renpy*/ },
@@ -221,7 +221,7 @@ export const atlKeywords: TokenPattern = {
 
             // https://www.renpy.org/doc/html/atl.html#expression-statement
             contentToken: MetaTokenType.ATLWith, /*meta.atl.with.renpy*/
-            begin: /^[ \t]*(with)\b[ \t]*/dgm,
+            begin: /(?<=^[ \t]*)(with)\b/dgm,
             beginCaptures: {
                 1: { token: KeywordTokenType.With, /*keyword.with.renpy*/ },
             },
@@ -233,7 +233,7 @@ export const atlKeywords: TokenPattern = {
 
             // https://www.renpy.org/doc/html/atl.html#contains-statement
             contentToken: MetaTokenType.ATLContains, /*meta.atl.contains.renpy*/
-            begin: /^[ \t]*(contains)\b[ \t]*/dgm,
+            begin: /(?<=^[ \t]*)(contains)\b/dgm,
             beginCaptures: {
                 1: { token: KeywordTokenType.Contains, /*keyword.control.flow.contains.renpy*/ },
             },
diff --git a/src/tokenizer/debug-decorator.ts b/src/tokenizer/debug-decorator.ts
index 317d147..9ff1409 100644
--- a/src/tokenizer/debug-decorator.ts
+++ b/src/tokenizer/debug-decorator.ts
@@ -446,8 +446,12 @@ ${(decoration.hoverMessage as MarkdownString).value}`,
             case MetaTokenType.CameraStatement:
             case MetaTokenType.SceneStatement:
             case MetaTokenType.ShowStatement:
+            case MetaTokenType.HideStatement:
             case MetaTokenType.ImageStatement:
             case MetaTokenType.CallStatement:
+            case MetaTokenType.CallArguments:
+            case MetaTokenType.FromClause:
+            case MetaTokenType.FromArguments:
             case MetaTokenType.JumpStatement:
             case MetaTokenType.PlayAudioStatement:
             case MetaTokenType.QueueAudioStatement:
@@ -482,6 +486,7 @@ ${(decoration.hoverMessage as MarkdownString).value}`,
             case MetaTokenType.OnlayerParameters:
             case MetaTokenType.WithParameters:
             case MetaTokenType.ZorderParameters:
+            case MetaTokenType.PauseStatement:
             case MetaTokenType.PauseParameters:
             case MetaTokenType.ATLBlock:
             case MetaTokenType.ATLChoiceBlock:
diff --git a/src/tokenizer/python-token-patterns.g.ts b/src/tokenizer/python-token-patterns.g.ts
index a586e8e..4819511 100644
--- a/src/tokenizer/python-token-patterns.g.ts
+++ b/src/tokenizer/python-token-patterns.g.ts
@@ -5,9 +5,9 @@
 // THIS FILE HAS BEEN GENERATED BY THE `syntax-to-token-pattern.py` GENERATOR
 // DO NOT EDIT THIS FILE DIRECTLY! INSTEAD RUN THE PYTHON SCRIPT.
 // ANY MANUAL EDITS MADE TO THIS FILE WILL BE OVERWRITTEN. YOU HAVE BEEN WARNED.
-// Last generated: 12/07/2024 09:35:29 (UTC+0)
+// Last generated: 12/07/2024 18:44:34 (UTC+0)
 
-import { MetaTokenType, KeywordTokenType, EntityTokenType, CharacterTokenType, OperatorTokenType, LiteralTokenType } from "./renpy-tokens";
+import { MetaTokenType, KeywordTokenType, CharacterTokenType, EntityTokenType, OperatorTokenType, LiteralTokenType } from "./renpy-tokens";
 import { TokenPattern } from "./token-pattern-types";
 
 export const python: TokenPattern = {
@@ -40,15 +40,6 @@ export const semicolon: TokenPattern = {
 
 export const comments: TokenPattern = {
     patterns: [
-        {
-            debugName: "comments.patterns![0]",
-
-            token: MetaTokenType.Comment, /*comment.line.number-sign.renpy*/
-            match: /^[ \t]*(#[ \t]*(?:end)?region)\b.*$/dgm,
-            captures: {
-                1: { token: MetaTokenType.CommentRegionTag, /*punctuation.definition.tag.region*/ },
-            },
-        },
         {
             debugName: "comments.patterns![1]",
 
@@ -241,9 +232,25 @@ export const statementKeyword: TokenPattern = {
     ]
 };
 
+export const newLine: TokenPattern = {
+    debugName: "newLine",
+
+    token: CharacterTokenType.NewLine, /*punctuation.new-line.renpy*/
+    match: /\r\n|\r|\n/g,
+};
+
+export const whitespace: TokenPattern = {
+    debugName: "whitespace",
+
+    token: CharacterTokenType.Whitespace, /*punctuation.whitespace.python*/
+    match: /[ \t]+/g,
+};
+
 export const expressionBare: TokenPattern = {
     // valid Python expressions w/o comments and line continuation
     patterns: [
+        whitespace,
+        newLine,
     ]
 };
 
@@ -711,7 +718,7 @@ export const classDeclaration: TokenPattern = {
             debugName: "classDeclaration.patterns![0]",
 
             token: MetaTokenType.ClassDefinition, /*meta.class.python*/
-            begin: /\s*(class)\s+(?=[a-zA-Z_]\w*\s*(:|\())/dg,
+            begin: /\s*(class)\s+(?=[a-zA-Z_]\w*\s*(?::|\())/dg,
             beginCaptures: {
                 1: { token: KeywordTokenType.Class, /*storage.type.class.python*/ },
             },
@@ -1091,7 +1098,7 @@ export const decorator: TokenPattern = {
     debugName: "decorator",
 
     token: MetaTokenType.FunctionDefinition, /*meta.function.decorator.python*/
-    begin: /^\s*((@))\s*(?=[a-zA-Z_]\w*)/dgm,
+    begin: /(?<=^[ \t]*)(@)\s*(?=[a-zA-Z_]\w*)/dgm,
     beginCaptures: {
         1: { token: EntityTokenType.FunctionName, /*entity.name.function.decorator.python*/ },
         2: { token: CharacterTokenType.AtSymbol, /*punctuation.definition.decorator.python*/ },
@@ -1111,9 +1118,9 @@ export const decoratorName: TokenPattern = {
             debugName: "decoratorName.patterns![2]",
 
             token: EntityTokenType.FunctionName, /*entity.name.function.decorator.python*/
-            match: /([a-zA-Z_]\w*)|(\.)/dg,
+            match: /(?:[a-zA-Z_]\w*)|(\.)/dg,
             captures: {
-                2: { token: CharacterTokenType.Dot, /*punctuation.separator.dot.python*/ },
+                1: { token: CharacterTokenType.Dot, /*punctuation.separator.dot.python*/ },
             },
         },
         lineContinuation,
@@ -1545,27 +1552,6 @@ export const regexpCharecterSetEscapes: TokenPattern = {
     ]
 };
 
-export const codetags: TokenPattern = {
-    debugName: "codetags",
-
-    match: /(?:\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\b)/dg,
-    captures: {
-        1: { token: MetaTokenType.CommentCodeTag, /*keyword.codetag.notation.python*/ },
-    },
-};
-
-export const commentsBase: TokenPattern = {
-    debugName: "commentsBase",
-
-    token: MetaTokenType.Comment, /*comment.line.number-sign.python*/
-    begin: /(\#)/dg,
-    beginCaptures: {
-        1: { token: CharacterTokenType.Hashtag, /*punctuation.definition.comment.python*/ },
-    },
-    end: /($)/gm,
-    patterns: [codetags]
-};
-
 export const commentsStringSingleThree: TokenPattern = {
     debugName: "commentsStringSingleThree",
 
@@ -1575,7 +1561,8 @@ export const commentsStringSingleThree: TokenPattern = {
         1: { token: CharacterTokenType.Hashtag, /*punctuation.definition.comment.python*/ },
     },
     end: /($|(?='''))/gm,
-    patterns: [codetags]
+    patterns: [
+    ]
 };
 
 export const commentsStringDoubleThree: TokenPattern = {
@@ -1587,7 +1574,8 @@ export const commentsStringDoubleThree: TokenPattern = {
         1: { token: CharacterTokenType.Hashtag, /*punctuation.definition.comment.python*/ },
     },
     end: /($|(?="""))/gm,
-    patterns: [codetags]
+    patterns: [
+    ]
 };
 
 export const singleOneRegexpExpression: TokenPattern = {
@@ -1663,7 +1651,8 @@ export const singleOneRegexpComments: TokenPattern = {
         1: { token: MetaTokenType.CommentEnd, /*punctuation.comment.end.regexp*/ },
         2: { token: MetaTokenType.Invalid, /*invalid.illegal.newline.python*/ },
     },
-    patterns: [codetags]
+    patterns: [
+    ]
 };
 
 export const singleOneRegexpLookahead: TokenPattern = {
@@ -1853,7 +1842,8 @@ export const singleThreeRegexpComments: TokenPattern = {
         1: { token: MetaTokenType.CommentEnd, /*punctuation.comment.end.regexp*/ },
         2: { token: MetaTokenType.Invalid, /*invalid.illegal.newline.python*/ },
     },
-    patterns: [codetags]
+    patterns: [
+    ]
 };
 
 export const singleThreeRegexpLookahead: TokenPattern = {
@@ -2060,7 +2050,8 @@ export const doubleOneRegexpComments: TokenPattern = {
         1: { token: MetaTokenType.CommentEnd, /*punctuation.comment.end.regexp*/ },
         2: { token: MetaTokenType.Invalid, /*invalid.illegal.newline.python*/ },
     },
-    patterns: [codetags]
+    patterns: [
+    ]
 };
 
 export const doubleOneRegexpLookahead: TokenPattern = {
@@ -2250,7 +2241,8 @@ export const doubleThreeRegexpComments: TokenPattern = {
         1: { token: MetaTokenType.CommentEnd, /*punctuation.comment.end.regexp*/ },
         2: { token: MetaTokenType.Invalid, /*invalid.illegal.newline.python*/ },
     },
-    patterns: [codetags]
+    patterns: [
+    ]
 };
 
 export const doubleThreeRegexpLookahead: TokenPattern = {
@@ -2518,7 +2510,7 @@ export const stringRawBinQuotedSingleLine: TokenPattern = {
 export const stringQuotedSingleLine: TokenPattern = {
     debugName: "stringQuotedSingleLine",
 
-    token: LiteralTokenType.String, /*string.quoted.single.python*/
+    token: LiteralTokenType.String, /*string.quoted.single.test.python*/
     begin: /(?:\b([rR])(?=[uU]))?([uU])?(['"])/dg,
     beginCaptures: {
         1: { token: MetaTokenType.Invalid, /*invalid.illegal.prefix.python*/ },
@@ -2538,8 +2530,8 @@ export const stringSingleBadBrace1FormattingUnicode: TokenPattern = {
     debugName: "stringSingleBadBrace1FormattingUnicode",
 
     // template using {% ... %}
-    begin: /(?=\{%(.*?(?!(['"])|((?<!\\)\n)))%\})/g,
-    end: /(?=(['"])|((?<!\\)\n))/g,
+    begin: /(?=\{%(?:.*?(?!['"]|(?:(?<!\\)\n)))%\})/g,
+    end: /(?=['"]|(?:(?<!\\)\n))/g,
     patterns: [
         escapeSequenceUnicode,
         escapeSequence,
@@ -2551,29 +2543,17 @@ export const stringSingleBadBrace1FormattingRaw: TokenPattern = {
     debugName: "stringSingleBadBrace1FormattingRaw",
 
     // template using {% ... %}
-    begin: /(?=\{%(.*?(?!(['"])|((?<!\\)\n)))%\})/g,
-    end: /(?=(['"])|((?<!\\)\n))/g,
+    begin: /(?=\{%(?:.*?(?!['"]|(?:(?<!\\)\n)))%\})/g,
+    end: /(?=['"]|(?:(?<!\\)\n))/g,
     patterns: [stringConsumeEscape]
 };
 
-export const stringSingleBadBrace2FormattingUnicode: TokenPattern = {
-    debugName: "stringSingleBadBrace2FormattingUnicode",
-
-    // odd format or format-like syntax
-    begin: /(?!\{\{)(?=\{(\w*?(?!(['"])|((?<!\\)\n))[^!:\.\[}\w]).*?(?!(['"])|((?<!\\)\n))\})/g,
-    end: /(?=(['"])|((?<!\\)\n))/g,
-    patterns: [
-        escapeSequenceUnicode,
-        stringEntity,
-    ]
-};
-
 export const stringSingleBadBrace2FormattingRaw: TokenPattern = {
     debugName: "stringSingleBadBrace2FormattingRaw",
 
     // odd format or format-like syntax
-    begin: /(?!\{\{)(?=\{(\w*?(?!(['"])|((?<!\\)\n))[^!:\.\[}\w]).*?(?!(['"])|((?<!\\)\n))\})/g,
-    end: /(?=(['"])|((?<!\\)\n))/g,
+    begin: /(?!\{\{)(?=\{(?:\w*?(?!['"]|(?:(?<!\\)\n))[^!:\.\[}\w]).*?(?!['"]|(?:(?<!\\)\n))\})/g,
+    end: /(?=['"]|(?:(?<!\\)\n))/g,
     patterns: [
         stringConsumeEscape,
         stringFormatting,
@@ -3069,14 +3049,37 @@ export const fstringTerminatorMultiTail: TokenPattern = {
 // Push pattern references that were not defined on include
 python.patterns!.push(statement, expression);
 statement.patterns!.push(importStatement, classDeclaration, functionDeclaration, generator, statementKeyword, assignmentOperator, decorator, docstringStatement, semicolon);
-comments.patterns!.push(commentsBase);
 docstringStatement.patterns!.push(docstring);
-docstring.patterns![0].patterns!.push(docstringPrompt, codetags, docstringGutsUnicode);
-docstring.patterns![1].patterns!.push(stringConsumeEscape, docstringPrompt, codetags);
-docstring.patterns![2].patterns!.push(codetags, docstringGutsUnicode);
-docstring.patterns![3].patterns!.push(stringConsumeEscape, codetags);
+docstring.patterns![0].patterns!.push(docstringPrompt, docstringGutsUnicode);
+docstring.patterns![1].patterns!.push(stringConsumeEscape, docstringPrompt);
+docstring.patterns![2].patterns!.push(docstringGutsUnicode);
+docstring.patterns![3].patterns!.push(stringConsumeEscape);
 docstringGutsUnicode.patterns!.push(escapeSequenceUnicode, escapeSequence, stringLineContinuation);
-expressionBare.patterns!.push(backticks, illegalAnno, literal, regexp, string, lambda, generator, illegalOperator, operator, curlyBraces, itemAccess, list, oddFunctionCall, roundBraces, functionCall, builtinFunctions, builtinTypes, builtinExceptions, magicNames, specialNames, illegalNames, specialVariables, ellipsis, punctuation, lineContinuation);
+expressionBare.patterns!.splice(0, 0, backticks);
+expressionBare.patterns!.splice(1, 0, illegalAnno);
+expressionBare.patterns!.splice(2, 0, literal);
+expressionBare.patterns!.splice(3, 0, regexp);
+expressionBare.patterns!.splice(4, 0, string);
+expressionBare.patterns!.splice(5, 0, lambda);
+expressionBare.patterns!.splice(6, 0, generator);
+expressionBare.patterns!.splice(7, 0, illegalOperator);
+expressionBare.patterns!.splice(8, 0, operator);
+expressionBare.patterns!.splice(9, 0, curlyBraces);
+expressionBare.patterns!.splice(10, 0, itemAccess);
+expressionBare.patterns!.splice(11, 0, list);
+expressionBare.patterns!.splice(12, 0, oddFunctionCall);
+expressionBare.patterns!.splice(13, 0, roundBraces);
+expressionBare.patterns!.splice(14, 0, functionCall);
+expressionBare.patterns!.splice(15, 0, builtinFunctions);
+expressionBare.patterns!.splice(16, 0, builtinTypes);
+expressionBare.patterns!.splice(17, 0, builtinExceptions);
+expressionBare.patterns!.splice(18, 0, magicNames);
+expressionBare.patterns!.splice(19, 0, specialNames);
+expressionBare.patterns!.splice(20, 0, illegalNames);
+expressionBare.patterns!.splice(21, 0, specialVariables);
+expressionBare.patterns!.splice(22, 0, ellipsis);
+expressionBare.patterns!.splice(23, 0, punctuation);
+expressionBare.patterns!.splice(24, 0, lineContinuation);
 expressionBase.patterns!.push(lineContinuation);
 expression.patterns!.splice(1, 0, memberAccess);
 memberAccess.patterns!.push(functionCall, memberAccessBase, memberAccessAttribute);
@@ -3173,7 +3176,6 @@ doubleThreeRegexpExpression.patterns!.splice(12, 0, doubleThreeRegexpParentheses
 stringRawQuotedSingleLine.patterns!.splice(0, 0, stringSingleBadBrace1FormattingRaw);
 stringRawQuotedSingleLine.patterns!.splice(1, 0, stringSingleBadBrace2FormattingRaw);
 stringQuotedSingleLine.patterns!.splice(0, 0, stringSingleBadBrace1FormattingUnicode);
-stringQuotedSingleLine.patterns!.splice(1, 0, stringSingleBadBrace2FormattingUnicode);
 stringRawQuotedMultiLine.patterns!.splice(0, 0, stringMultiBadBrace1FormattingRaw);
 stringRawQuotedMultiLine.patterns!.splice(1, 0, stringMultiBadBrace2FormattingRaw);
 stringQuotedMultiLine.patterns!.splice(0, 0, stringMultiBadBrace1FormattingUnicode);
diff --git a/src/tokenizer/renpy-token-patterns.g.ts b/src/tokenizer/renpy-token-patterns.g.ts
index ebc24a8..07054b7 100644
--- a/src/tokenizer/renpy-token-patterns.g.ts
+++ b/src/tokenizer/renpy-token-patterns.g.ts
@@ -5,7 +5,7 @@
 // THIS FILE HAS BEEN GENERATED BY THE `syntax-to-token-pattern.py` GENERATOR
 // DO NOT EDIT THIS FILE DIRECTLY! INSTEAD RUN THE PYTHON SCRIPT.
 // ANY MANUAL EDITS MADE TO THIS FILE WILL BE OVERWRITTEN. YOU HAVE BEEN WARNED.
-// Last generated: 12/07/2024 09:35:29 (UTC+0)
+// Last generated: 12/07/2024 18:46:24 (UTC+0)
 
 import { MetaTokenType, CharacterTokenType, LiteralTokenType, EntityTokenType, KeywordTokenType, EscapedCharacterTokenType, OperatorTokenType } from "./renpy-tokens";
 import { TokenPattern } from "./token-pattern-types";
@@ -230,11 +230,11 @@ export const parenthesizedPython: TokenPattern = {
 
             begin: /\[/dg,
             beginCaptures: {
-                1: { token: CharacterTokenType.OpenSquareBracket, /*punctuation.square-bracket.begin.python.renpy*/ },
+                0: { token: CharacterTokenType.OpenSquareBracket, /*punctuation.square-bracket.begin.python.renpy*/ },
             },
             end: /\]/dg,
             endCaptures: {
-                1: { token: CharacterTokenType.CloseSquareBracket, /*punctuation.square-bracket.end.python.renpy*/ },
+                0: { token: CharacterTokenType.CloseSquareBracket, /*punctuation.square-bracket.end.python.renpy*/ },
             },
             patterns: [
             ]
@@ -244,11 +244,11 @@ export const parenthesizedPython: TokenPattern = {
 
             begin: /\{/dg,
             beginCaptures: {
-                1: { token: CharacterTokenType.OpenBracket, /*punctuation.bracket.begin.python.renpy*/ },
+                0: { token: CharacterTokenType.OpenBracket, /*punctuation.bracket.begin.python.renpy*/ },
             },
             end: /\}/dg,
             endCaptures: {
-                1: { token: CharacterTokenType.CloseBracket, /*punctuation.bracket.end.python.renpy*/ },
+                0: { token: CharacterTokenType.CloseBracket, /*punctuation.bracket.end.python.renpy*/ },
             },
             patterns: []
         }]
@@ -351,39 +351,41 @@ export const keywords: TokenPattern = {
     ]
 };
 
-export const comments: TokenPattern = {
-    patterns: [
-        {
-            debugName: "comments.patterns![0]",
+export const regionComment: TokenPattern = {
+    debugName: "regionComment",
 
-            token: MetaTokenType.Comment, /*comment.line.number-sign.renpy*/
-            match: /(?<=^[ \t]*)(#[ \t]*(?:end)?region)\b.*$/dgm,
-            captures: {
-                1: { token: MetaTokenType.CommentRegionTag, /*punctuation.definition.tag.region*/ },
-            },
-        },
-        {
-            debugName: "comments.patterns![1]",
+    token: MetaTokenType.Comment, /*comment.line.number-sign.renpy*/
+    match: /(?<=^[ \t]*)(#[ \t]*(?:end)?region)\b.*$/dgm,
+    captures: {
+        1: { token: MetaTokenType.CommentRegionTag, /*punctuation.definition.tag.region.renpy*/ },
+    },
+};
 
-            token: MetaTokenType.Comment, /*comment.line.number-sign.renpy*/
-            match: /(#)(.*)$/dgm,
-            captures: {
-                1: { token: CharacterTokenType.Hashtag, /*punctuation.definition.comment.renpy*/ },
-                2: {
-                    patterns: [
-                        {
-                            debugName: "comments.patterns![1].captures![2].patterns![0]",
+export const codetags: TokenPattern = {
+    debugName: "codetags",
 
-                            // Code Tags
-                            match: /(?:\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\b)/dg,
-                            captures: {
-                                1: { token: MetaTokenType.CommentCodeTag, /*keyword.codetag.notation.renpy*/ },
-                            },
-                        },
-                    ]
-                },
-            },
-        },
+    match: /(?:\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\b)/dg,
+    captures: {
+        1: { token: MetaTokenType.CommentCodeTag, /*keyword.codetag.notation.renpy*/ },
+    },
+};
+
+export const commentsBase: TokenPattern = {
+    debugName: "commentsBase",
+
+    token: MetaTokenType.Comment, /*comment.line.number-sign.renpy*/
+    begin: /#/dg,
+    beginCaptures: {
+        0: { token: CharacterTokenType.Hashtag, /*punctuation.definition.comment.renpy*/ },
+    },
+    end: /$/gm,
+    patterns: [codetags]
+};
+
+export const comments: TokenPattern = {
+    patterns: [
+        regionComment,
+        commentsBase,
     ]
 };
 
@@ -784,11 +786,7 @@ export const stringTags: TokenPattern = {
                 1: { token: CharacterTokenType.OpenBracket, /*punctuation.definition.tag.begin.renpy*/ },
                 2: { token: EntityTokenType.TagName, /*entity.name.tag.${2:/downcase}.renpy*/ },
                 3: { token: OperatorTokenType.Assignment, /*punctuation.separator.key-value.renpy keyword.operator.assignment.renpy*/ },
-                4: {
-                    token: LiteralTokenType.String, /*support.constant.property-value.renpy string.unquoted.renpy*/
-                    patterns: [
-                    ]
-                },
+                4: { token: LiteralTokenType.String, /*support.constant.property-value.renpy string.unquoted.renpy*/ },
                 5: { token: CharacterTokenType.CloseBracket, /*punctuation.definition.tag.end.renpy*/ },
             },
         },
@@ -821,11 +819,7 @@ export const stringTags: TokenPattern = {
                 1: { token: CharacterTokenType.OpenBracket, /*punctuation.definition.tag.begin.renpy*/ },
                 2: { token: EntityTokenType.TagName, /*entity.name.tag.${2:/downcase}.renpy*/ },
                 3: { token: OperatorTokenType.Assignment, /*punctuation.separator.key-value.renpy keyword.operator.assignment.renpy*/ },
-                4: {
-                    token: MetaTokenType.ConstantCaps, /*support.constant.property-value.renpy constant.other.placeholder.tags.renpy*/
-                    patterns: [
-                    ]
-                },
+                4: { token: MetaTokenType.ConstantCaps, /*support.constant.property-value.renpy constant.other.placeholder.tags.renpy*/ },
                 5: { token: CharacterTokenType.CloseBracket, /*punctuation.definition.tag.end.renpy*/ },
             },
         },
@@ -865,14 +859,16 @@ export const pythonStatements: TokenPattern = {
         {
             debugName: "pythonStatements.patterns![0]",
 
-            match: /^([ \t]*)(init)[ \t]+(offset)[ \t]*(=)[ \t]*(-)?([^#]*?)$/dgm,
+            match: /(?<=^[ \t]*)(init)([ \t]+)(offset)([ \t]*)(=)([ \t]*)(-)?([^#]*?)$/dgm,
             captures: {
-                1: { token: CharacterTokenType.Whitespace, /*punctuation.whitespace.leading.renpy*/ },
-                2: { token: KeywordTokenType.Init, /*keyword.init.renpy*/ },
+                1: { token: KeywordTokenType.Init, /*keyword.init.renpy*/ },
+                2: { token: CharacterTokenType.Whitespace, /*punctuation.whitespace.renpy*/ },
                 3: { token: KeywordTokenType.Offset, /*keyword.offset.renpy*/ },
-                4: { token: OperatorTokenType.Assignment, /*keyword.operator.assignment.renpy*/ },
-                5: { token: OperatorTokenType.Minus, /*keyword.operator.arithmetic.minus.renpy*/ },
-                6: {
+                4: { token: CharacterTokenType.Whitespace, /*punctuation.whitespace.renpy*/ },
+                5: { token: OperatorTokenType.Assignment, /*keyword.operator.assignment.renpy*/ },
+                6: { token: CharacterTokenType.Whitespace, /*punctuation.whitespace.renpy*/ },
+                7: { token: OperatorTokenType.Minus, /*keyword.operator.arithmetic.minus.renpy*/ },
+                8: {
                     patterns: [
                         numInt,
                         invalidToken,
@@ -885,27 +881,38 @@ export const pythonStatements: TokenPattern = {
 
             // Renpy python block
             contentToken: MetaTokenType.PythonBlock, /*meta.embedded.block.python*/
-            begin: /(?<=(^[ \t]*))(?:(init)(?:[ \t]+(-)?(\d+))?[ \t]+)?(python)[ \t]*(.*)?(:)/dgm,
+            begin: /(?<=(^[ \t]*))(?:(init)(?:([ \t]+)(-)?(\d+))?([ \t]+))?(python)(.*)?(:)/dgm,
             beginCaptures: {
                 2: { token: KeywordTokenType.Init, /*keyword.init.renpy*/ },
-                3: { token: OperatorTokenType.Minus, /*keyword.operator.arithmetic.minus.renpy*/ },
-                4: { token: LiteralTokenType.Integer, /*constant.numeric.integer.renpy*/ },
-                5: { token: KeywordTokenType.Python, /*keyword.python.renpy*/ },
-                6: {
+                3: { token: CharacterTokenType.Whitespace, /*punctuation.whitespace.renpy*/ },
+                4: { token: OperatorTokenType.Minus, /*keyword.operator.arithmetic.minus.renpy*/ },
+                5: { token: LiteralTokenType.Integer, /*constant.numeric.integer.renpy*/ },
+                6: { token: CharacterTokenType.Whitespace, /*punctuation.whitespace.renpy*/ },
+                7: { token: KeywordTokenType.Python, /*keyword.python.renpy*/ },
+                8: {
                     token: MetaTokenType.Arguments, /*meta.python.block.arguments.renpy*/
                     patterns: [
                         {
-                            debugName: "pythonStatements.patterns![1].beginCaptures![6].patterns![0]",
+                            debugName: "pythonStatements.patterns![1].beginCaptures![8].patterns![0]",
 
                             // in statement
-                            match: /(?:\s*(in)\s*([a-zA-Z_]\w*)\b)/dg,
-                            captures: {
+                            begin: /\b(in)\b/dg,
+                            beginCaptures: {
                                 1: { token: KeywordTokenType.In, /*keyword.control.flow.in.renpy*/ },
-                                2: { token: EntityTokenType.NamespaceName, /*entity.name.namespace*/ },
                             },
+                            end: /(?<=[^ \t])(?!\G)|$/gm,
+                            patterns: [
+                                {
+                                    debugName: "pythonStatements.patterns![1].beginCaptures![8].patterns![0].patterns![0]",
+
+                                    token: EntityTokenType.NamespaceName, /*entity.name.namespace*/
+                                    match: /\b[\p{XID_Start}_]\p{XID_Continue}*\b/gu,
+                                },
+                                fallbackPatterns,
+                            ]
                         },
                         {
-                            debugName: "pythonStatements.patterns![1].beginCaptures![6].patterns![1]",
+                            debugName: "pythonStatements.patterns![1].beginCaptures![8].patterns![1]",
 
                             // keywords
                             match: /\b(hide)|(early)|(in)\b/dg,
@@ -917,7 +924,7 @@ export const pythonStatements: TokenPattern = {
                         },
                     ]
                 },
-                7: { token: CharacterTokenType.Colon, /*punctuation.section.python.begin.renpy*/ },
+                9: { token: CharacterTokenType.Colon, /*punctuation.section.python.begin.renpy*/ },
             },
             // @ts-ignore: Back references in end patterns are replaced by begin matches at runtime
             end: /^(?=(?!\1)[ \t]*[^\s#]|\1[^\s#])/gm,
@@ -1002,15 +1009,8 @@ export const oneLinePython: TokenPattern = {
     },
     end: /$/gm,
     patterns: [
-        {
-            debugName: "oneLinePython.patterns![0]",
-
-            // Type the first name as a variable (Probably not needed, but python doesn't seem to catch it)
-            token: EntityTokenType.Identifier, /*variable.other.renpy*/
-            match: /(?<!\.)\b([a-zA-Z_]\w*)(?=\s=\s)/g,
-        },
         strings,
-        whitespace,
+        fallbackPatterns,
     ]
 };
 
@@ -1100,14 +1100,14 @@ export const sayStatements: TokenPattern = {
 export const pause: TokenPattern = {
     debugName: "pause",
 
-    match: /(?<=^[ \t]+)(pause)\b(.+)?/dgm,
-    captures: {
+    token: MetaTokenType.PauseStatement, /*meta.pause.statement.renpy*/
+    contentToken: MetaTokenType.PauseParameters, /*meta.pause.parameters.renpy*/
+    begin: /(?<=^[ \t]+)(pause)\b/dgm,
+    beginCaptures: {
         1: { token: KeywordTokenType.Pause, /*keyword.control.flow.pause.renpy*/ },
-        2: {
-            token: MetaTokenType.PauseParameters, /*meta.pause.parameters.renpy*/
-            patterns: [simpleExpression]
-        },
     },
+    end: /(?=#)|$/gm,
+    patterns: [simpleExpression]
 };
 
 export const conditionals: TokenPattern = {
@@ -1116,10 +1116,7 @@ export const conditionals: TokenPattern = {
     match: /(?<=^[ \t]+)(if|elif|else)\b(.*?)(:)/dgm,
     captures: {
         1: { token: KeywordTokenType.If, /*keyword.control.conditional.renpy*/ },
-        2: {
-            patterns: [
-            ]
-        },
+        2: { patterns: [fallbackPatterns] },
         3: { token: CharacterTokenType.Colon, /*punctuation.section.condition.begin.renpy*/ },
     },
 };
@@ -1134,10 +1131,7 @@ export const atStatement: TokenPattern = {
         1: { token: KeywordTokenType.At, /*keyword.control.flow.at.renpy*/ },
     },
     end: /(?=\b(at|as|behind|onlayer|expression|with|zorder)\b|#|=|:)|$/gm,
-    patterns: [
-        whitespace,
-        simpleExpression,
-    ]
+    patterns: [simpleExpression]
 };
 
 export const asStatement: TokenPattern = {
@@ -1473,7 +1467,7 @@ export const label: TokenPattern = {
 export const returnStatements: TokenPattern = {
     debugName: "returnStatements",
 
-    begin: /(?<=^[ \t]+)(return)\b[ \t]*/dgm,
+    begin: /(?<=^[ \t]+)(return)\b/dgm,
     beginCaptures: {
         1: { token: KeywordTokenType.Return, /*keyword.control.flow.return.renpy*/ },
     },
@@ -1523,7 +1517,7 @@ export const jump: TokenPattern = {
 export const callPass: TokenPattern = {
     debugName: "callPass",
 
-    begin: /\b(?<!\.)(pass)\b[ \t]*(?=\()/dg,
+    begin: /\b(?<!\.)(pass)\b(?=[ \t]*\()/dg,
     beginCaptures: {
         1: { token: KeywordTokenType.Pass, /*keyword.control.flow.pass.renpy*/ },
     },
@@ -1531,42 +1525,72 @@ export const callPass: TokenPattern = {
     endCaptures: {
         1: { token: CharacterTokenType.CloseParentheses, /*punctuation.definition.arguments.end.renpy*/ },
     },
-    patterns: [
-    ]
+    patterns: [whitespace]
 };
 
 export const callFrom: TokenPattern = {
     debugName: "callFrom",
 
-    begin: /\b(?<!\.)(from)\b[ \t]*/dg,
+    token: MetaTokenType.FromClause, /*meta.from.clause.renpy*/
+    contentToken: MetaTokenType.Arguments, /*meta.from.arguments.renpy*/
+    begin: /\b(?<!\.)(from)\b/dg,
     beginCaptures: {
         1: { token: KeywordTokenType.From, /*keyword.control.flow.from.renpy*/ },
     },
-    end: /(?=\W|$)/gm,
-    patterns: [labelName]
+    end: /(?<=[^ \t])(?!\G)|$/gm,
+    patterns: [
+        labelName,
+        fallbackPatterns,
+    ]
 };
 
 export const call: TokenPattern = {
     debugName: "call",
 
     token: MetaTokenType.CallStatement, /*meta.call.statement.renpy*/
-    begin: /(?<=^[ \t]+)(call)\b(?:[ \t]+(screen))?/dgm,
+    contentToken: MetaTokenType.Arguments, /*meta.call.arguments.renpy*/
+    begin: /(?<=^[ \t]+)(call)\b/dgm,
     beginCaptures: {
         1: { token: KeywordTokenType.Call, /*keyword.control.flow.call.renpy*/ },
-        2: { token: KeywordTokenType.Screen, /*keyword.screen.renpy*/ },
     },
-    end: /(?=#)|$/dgm,
+    end: /$/dgm,
     endCaptures: {
         1: { token: MetaTokenType.Invalid, /*invalid.illegal.renpy*/ },
     },
     patterns: [
         callJumpExpression,
         callPass,
+        callFrom,
         {
-            debugName: "call.patterns![2]",
+            debugName: "call.patterns![3]",
+
+            token: MetaTokenType.FromClause, /*meta.from.clause.renpy*/
+            begin: /(?<=call[ \t]+)(screen)\b/dg,
+            beginCaptures: {
+                1: { token: KeywordTokenType.Screen, /*keyword.screen.renpy*/ },
+            },
+            end: /(?<=[^ \t])(?!\G)/g,
+            patterns: [
+                {
+                    debugName: "call.patterns![3].patterns![0]",
+
+                    // Label expression
+                    begin: /(?<=screen[ \t]+)(?=[a-zA-Z_.])/g,
+                    end: /(?![a-zA-Z_.])(?![ \t]*\.[ \t]*)/g,
+                    patterns: [
+                        labelCall,
+                        labelAccess,
+                        labelName,
+                    ]
+                },
+                whitespace,
+            ]
+        },
+        {
+            debugName: "call.patterns![4]",
 
             // Label expression
-            begin: /(?=[a-zA-Z_.])/g,
+            begin: /(?<=call[ \t]+)(?=[a-zA-Z_.])/g,
             end: /(?![a-zA-Z_.])(?![ \t]*\.[ \t]*)/g,
             patterns: [
                 labelCall,
@@ -1574,7 +1598,14 @@ export const call: TokenPattern = {
                 labelName,
             ]
         },
-        callFrom,
+        whitespace,
+        comments,
+        {
+            debugName: "call.patterns![7]",
+
+            token: MetaTokenType.Invalid, /*invalid.illegal.unexpected-characters-call-arguments.renpy*/
+            match: /[^ \t]+/g,
+        },
     ]
 };
 
@@ -1582,9 +1613,8 @@ export const menuOption: TokenPattern = {
     debugName: "menuOption",
 
     contentToken: MetaTokenType.MenuOptionBlock, /*meta.menu-option.block.renpy*/
-    begin: /^([ \t]+)?((?:".*")|(?:'.*')|(?:""".*"""))[ \t]*(.+)?(:)/dgm,
+    begin: /(?<=(^[ \t]+))((?:".*")|(?:'.*')|(?:""".*"""))(.+)?(:)/dgm,
     beginCaptures: {
-        1: { token: CharacterTokenType.Whitespace, /*punctuation.whitespace.menu-option.leading.renpy*/ },
         2: {
             token: MetaTokenType.MenuOption, /*meta.menu-option.renpy*/
             patterns: [strings]
@@ -1596,14 +1626,13 @@ export const menuOption: TokenPattern = {
                     debugName: "menuOption.beginCaptures![3].patterns![1]",
 
                     // if condition
-                    match: /\b(if)[ \t]+(.+)?/dg,
-                    captures: {
+                    begin: /\b(if)\b/dg,
+                    beginCaptures: {
                         1: { token: KeywordTokenType.If, /*keyword.control.conditional.renpy*/ },
-                        2: {
-                            patterns: [
-                            ]
-                        },
                     },
+                    end: /(?=#|:)|$/gm,
+                    patterns: [
+                    ]
                 },
                 {
                     debugName: "menuOption.beginCaptures![3].patterns![2]",
@@ -1624,15 +1653,14 @@ export const menuOption: TokenPattern = {
 export const menuSet: TokenPattern = {
     debugName: "menuSet",
 
-    match: /(?<=^[ \t]+)(set)[ \t]+(.+)?/dgm,
-    captures: {
+    contentToken: MetaTokenType.PythonLine, /*meta.embedded.line.python*/
+    begin: /(?<=^[ \t]+)(set)\b/dgm,
+    beginCaptures: {
         1: { token: KeywordTokenType.Set, /*keyword.set.renpy*/ },
-        2: {
-            token: MetaTokenType.PythonLine, /*meta.embedded.line.python*/
-            patterns: [
-            ]
-        },
     },
+    end: /$/gm,
+    patterns: [
+    ]
 };
 
 export const menu: TokenPattern = {
diff --git a/src/tokenizer/renpy-tokens.ts b/src/tokenizer/renpy-tokens.ts
index 281296e..6f536e2 100644
--- a/src/tokenizer/renpy-tokens.ts
+++ b/src/tokenizer/renpy-tokens.ts
@@ -321,6 +321,9 @@ export const enum MetaTokenType {
     HideStatement,
 
     CallStatement,
+    CallArguments,
+    FromClause,
+    FromArguments,
     JumpStatement,
 
     PlayAudioStatement,
@@ -354,6 +357,7 @@ export const enum MetaTokenType {
     OnlayerParameters,
     WithParameters,
     ZorderParameters,
+    PauseStatement,
     PauseParameters,
 
     ATLBlock,
diff --git a/src/tokenizer/screen-token-patterns.g.ts b/src/tokenizer/screen-token-patterns.g.ts
index 3bb7d71..35fb18b 100644
--- a/src/tokenizer/screen-token-patterns.g.ts
+++ b/src/tokenizer/screen-token-patterns.g.ts
@@ -5,7 +5,7 @@
 // THIS FILE HAS BEEN GENERATED BY THE `syntax-to-token-pattern.py` GENERATOR
 // DO NOT EDIT THIS FILE DIRECTLY! INSTEAD RUN THE PYTHON SCRIPT.
 // ANY MANUAL EDITS MADE TO THIS FILE WILL BE OVERWRITTEN. YOU HAVE BEEN WARNED.
-// Last generated: 12/07/2024 09:35:29 (UTC+0)
+// Last generated: 12/07/2024 18:50:56 (UTC+0)
 
 import { EntityTokenType, CharacterTokenType, KeywordTokenType, MetaTokenType } from "./renpy-tokens";
 import { TokenPattern } from "./token-pattern-types";
@@ -53,7 +53,7 @@ export const screenBuildInProperties: TokenPattern = {
             debugName: "screenBuildInProperties.patterns![1]",
 
             // Special manipulation keywords
-            match: /\b(?<!\.)(key|input|(text|image)?button|grid|auto|mousearea|side|timer|[vh]?bar|action|viewport|scrollbars|mousewheel|vpgrid|imagemap)\b/dg,
+            match: /\b(?<!\.)(key|input|(?:text|image)?button|grid|auto|mousearea|side|timer|[vh]?bar|action|viewport|scrollbars|mousewheel|vpgrid|imagemap)\b/dg,
             captures: {
                 1: { token: KeywordTokenType.Other, /*keyword.other.renpy*/ },
             },
@@ -241,7 +241,7 @@ export const screenBlockTester: TokenPattern = {
             debugName: "screenBlockTester.patterns![0]",
 
             contentToken: MetaTokenType.ScreenBlock, /*meta.screen-block.renpy*/
-            begin: /(?<=(^[ \t]*)(?:frame|window|text|vbox|hbox)\b.*?)(:)/dgm,
+            begin: /(?<=(^[ \t]*)(?:screen|frame|window|text|vbox|hbox)\b.*?)(:)/dgm,
             beginCaptures: {
                 2: { token: CharacterTokenType.Colon, /*punctuation.section.screen.begin.renpy*/ },
             },
@@ -352,17 +352,17 @@ export const screen: TokenPattern = {
 
             // See https://www.renpy.org/doc/html/screens.html
             contentToken: MetaTokenType.ScreenBlock, /*meta.screen.block.renpy*/
-            begin: /^([ \t]+)?(screen)\b[ \t]*(.*?)(:)/dgm,
+            begin: /(?<=^[ \t]*)(screen)\b/dgm,
             beginCaptures: {
-                1: { token: CharacterTokenType.Whitespace, /*punctuation.whitespace.leading.block.renpy*/ },
-                2: { token: KeywordTokenType.Def, /*storage.type.function.renpy*/ },
-                3: { patterns: [screenDefName] },
-                4: { token: CharacterTokenType.Colon, /*punctuation.section.block.begin.renpy*/ },
+                1: { token: KeywordTokenType.Screen, /*storage.type.screen.renpy*/ },
             },
-            // @ts-ignore: Back references in end patterns are replaced by begin matches at runtime
-            end: /^(?=(?!\1)[ \t]*[^\s#]|\1[^\s#])/gm,
-            patterns: []
-        }]
+            end: /$|^/gm,
+            patterns: [
+                screenDefName,
+                screenBlockTester,
+            ]
+        },
+    ]
 };
 
 export const screenFallback: TokenPattern = {
@@ -374,7 +374,6 @@ export const screenFallback: TokenPattern = {
 export const screenLanguage: TokenPattern = {
     // https://www.renpy.org/doc/html/screens.html#screen-language
     patterns: [
-        screenBlockTester,
         screenFrame,
         screenWindow,
         screenBox,
@@ -386,5 +385,4 @@ export const screenLanguage: TokenPattern = {
 };
 
 // Push pattern references that were not defined on include
-screenBlockTester.patterns![0].patterns!.push(screenLanguage);
-screen.patterns![0].patterns!.push(screenLanguage);
\ No newline at end of file
+screenBlockTester.patterns![0].patterns!.push(screenLanguage);
\ No newline at end of file
diff --git a/src/tokenizer/style-token-patterns.g.ts b/src/tokenizer/style-token-patterns.g.ts
index 4c64455..c4dc072 100644
--- a/src/tokenizer/style-token-patterns.g.ts
+++ b/src/tokenizer/style-token-patterns.g.ts
@@ -5,9 +5,9 @@
 // THIS FILE HAS BEEN GENERATED BY THE `syntax-to-token-pattern.py` GENERATOR
 // DO NOT EDIT THIS FILE DIRECTLY! INSTEAD RUN THE PYTHON SCRIPT.
 // ANY MANUAL EDITS MADE TO THIS FILE WILL BE OVERWRITTEN. YOU HAVE BEEN WARNED.
-// Last generated: 12/07/2024 09:35:29 (UTC+0)
+// Last generated: 12/07/2024 18:50:56 (UTC+0)
 
-import { MetaTokenType, CharacterTokenType, EntityTokenType, OperatorTokenType, KeywordTokenType } from "./renpy-tokens";
+import { MetaTokenType, CharacterTokenType, EntityTokenType, KeywordTokenType } from "./renpy-tokens";
 import { TokenPattern } from "./token-pattern-types";
 
 export const styleBlockTester: TokenPattern = {
@@ -56,11 +56,20 @@ export const styleClause: TokenPattern = {
         {
             debugName: "styleClause.patterns![0]",
 
-            match: /\b(?<!\.)(is)\b[ \t]*(\w*)/dg,
-            captures: {
-                1: { token: OperatorTokenType.Is, /*keyword.is.renpy keyword.operator.logical.is.renpy*/ },
-                2: { token: EntityTokenType.StyleName, /*entity.name.type.style.parent.renpy*/ },
+            // is statement
+            begin: /\b(?<!\.)(is)\b/dg,
+            beginCaptures: {
+                1: { token: MetaTokenType.LogicalOperatorKeyword, /*keyword.operator.logical.python*/ },
             },
+            end: /(?<=[^ \t])(?!\G)|$/gm,
+            patterns: [
+                {
+                    debugName: "styleClause.patterns![0].patterns![0]",
+
+                    token: EntityTokenType.StyleName, /*entity.name.type.style.base.renpy*/
+                    match: /\b[\p{XID_Start}_]\p{XID_Continue}*\b/gu,
+                },
+            ]
         },
         {
             debugName: "styleClause.patterns![1]",
@@ -71,14 +80,13 @@ export const styleClause: TokenPattern = {
         {
             debugName: "styleClause.patterns![2]",
 
-            match: /\b(?<!\.)(take)\b[ \t]*(\w*)/dg,
-            captures: {
+            begin: /\b(?<!\.)(take)\b/dg,
+            beginCaptures: {
                 1: { token: KeywordTokenType.Take, /*keyword.take.renpy*/ },
-                2: {
-                    patterns: [
-                    ]
-                },
             },
+            end: /(?<=[^ \t])(?!\G)|$/gm,
+            patterns: [
+            ]
         },
         {
             debugName: "styleClause.patterns![3]",
diff --git a/src/tokenizer/token-definitions.ts b/src/tokenizer/token-definitions.ts
index cec664a..1133287 100644
--- a/src/tokenizer/token-definitions.ts
+++ b/src/tokenizer/token-definitions.ts
@@ -669,8 +669,11 @@ const tokenTypeDefinitions: EnumToString<TypeOfTokenType> = {
     ShowStatement: { name: "ShowStatement", value: MetaTokenType.ShowStatement },
     HideStatement: { name: "HideStatement", value: MetaTokenType.HideStatement },
 
-    JumpStatement: { name: "JumpStatement", value: MetaTokenType.JumpStatement },
     CallStatement: { name: "CallStatement", value: MetaTokenType.CallStatement },
+    CallArguments: { name: "CallArguments", value: MetaTokenType.CallArguments },
+    FromClause: { name: "FromClause", value: MetaTokenType.FromClause },
+    FromArguments: { name: "FromArguments", value: MetaTokenType.FromArguments },
+    JumpStatement: { name: "JumpStatement", value: MetaTokenType.JumpStatement },
 
     PlayAudioStatement: { name: "PlayAudioStatement", value: MetaTokenType.PlayAudioStatement },
     QueueAudioStatement: { name: "QueueAudioStatement", value: MetaTokenType.QueueAudioStatement },
@@ -703,6 +706,7 @@ const tokenTypeDefinitions: EnumToString<TypeOfTokenType> = {
     OnlayerParameters: { name: "OnlayerParameters", value: MetaTokenType.OnlayerParameters },
     WithParameters: { name: "WithParameters", value: MetaTokenType.WithParameters },
     ZorderParameters: { name: "ZorderParameters", value: MetaTokenType.ZorderParameters },
+    PauseStatement: { name: "PauseStatement", value: MetaTokenType.PauseStatement },
     PauseParameters: { name: "PauseParameters", value: MetaTokenType.PauseParameters },
 
     ATLBlock: { name: "ATLBlock", value: MetaTokenType.ATLBlock },
diff --git a/src/tokenizer/token-patterns.g.ts b/src/tokenizer/token-patterns.g.ts
index 4d57214..c40b98b 100644
--- a/src/tokenizer/token-patterns.g.ts
+++ b/src/tokenizer/token-patterns.g.ts
@@ -3,13 +3,13 @@
 // THIS FILE HAS BEEN GENERATED BY THE `syntax-to-token-pattern.py` GENERATOR
 // DO NOT EDIT THIS FILE DIRECTLY! INSTEAD RUN THE PYTHON SCRIPT.
 // ANY MANUAL EDITS MADE TO THIS FILE WILL BE OVERWRITTEN. YOU HAVE BEEN WARNED.
-// Last generated: 12/07/2024 09:35:29 (UTC+0)
+// Last generated: 12/07/2024 18:44:34 (UTC+0)
 
+import * as AtlPatterns from "./atl-token-patterns.g";
 import * as RenpyPatterns from "./renpy-token-patterns.g";
-import * as ScreenPatterns from "./screen-token-patterns.g";
 import * as StylePatterns from "./style-token-patterns.g";
-import * as AtlPatterns from "./atl-token-patterns.g";
 import * as PythonPatterns from "./python-token-patterns.g";
+import * as ScreenPatterns from "./screen-token-patterns.g";
 
 // Push all RenpyPatterns external includes
 RenpyPatterns.literal.patterns!.push(PythonPatterns.literal);
@@ -27,10 +27,10 @@ RenpyPatterns.define.patterns!.splice(2, 0, PythonPatterns.expression);
 RenpyPatterns.define.patterns![3].patterns!.splice(0, 0, PythonPatterns.expression);
 RenpyPatterns.defaultStatement.patterns!.splice(1, 0, PythonPatterns.expression);
 RenpyPatterns.defaultStatement.patterns![2].patterns!.splice(0, 0, PythonPatterns.expression);
-RenpyPatterns.oneLinePython.patterns!.splice(2, 0, PythonPatterns.expression);
+RenpyPatterns.oneLinePython.patterns!.splice(1, 0, PythonPatterns.expression);
 RenpyPatterns.sayStatements.patterns![0].endCaptures![3].patterns!.push(PythonPatterns.functionArguments);
 RenpyPatterns.sayStatements.patterns![1].endCaptures![3].patterns!.push(PythonPatterns.functionArguments);
-RenpyPatterns.conditionals.captures![2].patterns!.push(PythonPatterns.expression);
+RenpyPatterns.conditionals.captures![2].patterns!.splice(0, 0, PythonPatterns.expression);
 RenpyPatterns.labelName.patterns!.splice(0, 0, PythonPatterns.builtinPossibleCallables);
 RenpyPatterns.labelCall.patterns!.splice(0, 0, PythonPatterns.specialVariables);
 RenpyPatterns.labelCall.patterns!.push(PythonPatterns.functionArguments);
@@ -38,10 +38,10 @@ RenpyPatterns.labelDefName.patterns!.splice(0, 0, PythonPatterns.builtinPossible
 RenpyPatterns.label.captures![2].patterns!.splice(1, 0, PythonPatterns.parameters);
 RenpyPatterns.returnStatements.patterns!.push(PythonPatterns.expression);
 RenpyPatterns.callJumpExpression.patterns!.push(PythonPatterns.expression);
-RenpyPatterns.callPass.patterns!.push(PythonPatterns.functionArguments);
+RenpyPatterns.callPass.patterns!.splice(0, 0, PythonPatterns.functionArguments);
 RenpyPatterns.menuOption.beginCaptures![3].patterns!.splice(0, 0, PythonPatterns.functionArguments);
-RenpyPatterns.menuOption.beginCaptures![3].patterns![1].captures![2].patterns!.push(PythonPatterns.expressionBare);
-RenpyPatterns.menuSet.captures![2].patterns!.push(PythonPatterns.expressionBare);
+RenpyPatterns.menuOption.beginCaptures![3].patterns![1].patterns!.push(PythonPatterns.expression);
+RenpyPatterns.menuSet.patterns!.push(PythonPatterns.expression);
 RenpyPatterns.menu.beginCaptures![3].patterns!.push(PythonPatterns.functionArguments);
 RenpyPatterns.audioParams.patterns!.push(PythonPatterns.number);
 RenpyPatterns.play.patterns![0].patterns!.splice(2, 0, PythonPatterns.expression);
@@ -111,19 +111,33 @@ ScreenPatterns.screenSimpleExpression.patterns!.push(RenpyPatterns.whitespace);
 ScreenPatterns.screenText.patterns!.push(RenpyPatterns.atStatement);
 ScreenPatterns.screenText.patterns![0].patterns!.push(AtlPatterns.atl);
 ScreenPatterns.screenText.patterns![1].patterns!.splice(0, 0, RenpyPatterns.strings);
-ScreenPatterns.screen.patterns![0].beginCaptures![3].patterns!.push(PythonPatterns.parameters, RenpyPatterns.invalidToken);
+ScreenPatterns.screen.patterns![0].patterns!.splice(1, 0, PythonPatterns.parameters);
+ScreenPatterns.screen.patterns![0].patterns!.push(RenpyPatterns.fallbackPatterns);
 ScreenPatterns.screenFallback.patterns!.push(RenpyPatterns.basePatterns);
 ScreenPatterns.screenLanguage.patterns!.splice(0, 0, RenpyPatterns.conditionals);
 
 // Push all StylePatterns external includes
 StylePatterns.styleBlockTester.patterns![0].patterns!.push(RenpyPatterns.fallbackPatterns);
-StylePatterns.styleClause.patterns![2].captures![2].patterns!.push(RenpyPatterns.name);
+StylePatterns.styleClause.patterns![0].patterns!.push(RenpyPatterns.fallbackPatterns);
+StylePatterns.styleClause.patterns![2].patterns!.push(RenpyPatterns.name, RenpyPatterns.fallbackPatterns);
 StylePatterns.styleClause.patterns![4].patterns!.push(RenpyPatterns.simpleExpression);
 StylePatterns.styleClause.patterns![5].patterns!.push(RenpyPatterns.simpleExpression);
 StylePatterns.style.patterns!.push(RenpyPatterns.fallbackPatterns);
 
 // Push all PythonPatterns external includes
+PythonPatterns.comments.patterns!.splice(0, 0, RenpyPatterns.regionComment);
+PythonPatterns.comments.patterns!.push(RenpyPatterns.commentsBase);
+PythonPatterns.docstring.patterns![0].patterns!.splice(1, 0, RenpyPatterns.codetags);
+PythonPatterns.docstring.patterns![1].patterns!.push(RenpyPatterns.codetags);
+PythonPatterns.docstring.patterns![2].patterns!.splice(0, 0, RenpyPatterns.codetags);
+PythonPatterns.docstring.patterns![3].patterns!.push(RenpyPatterns.codetags);
 PythonPatterns.stringUnicodeGuts.patterns!.splice(0, 0, RenpyPatterns.stringsInterior);
+PythonPatterns.commentsStringSingleThree.patterns!.push(RenpyPatterns.codetags);
+PythonPatterns.commentsStringDoubleThree.patterns!.push(RenpyPatterns.codetags);
+PythonPatterns.singleOneRegexpComments.patterns!.push(RenpyPatterns.codetags);
+PythonPatterns.singleThreeRegexpComments.patterns!.push(RenpyPatterns.codetags);
+PythonPatterns.doubleOneRegexpComments.patterns!.push(RenpyPatterns.codetags);
+PythonPatterns.doubleThreeRegexpComments.patterns!.push(RenpyPatterns.codetags);
 
 
-export { RenpyPatterns, ScreenPatterns, StylePatterns, AtlPatterns, PythonPatterns };
\ No newline at end of file
+export { AtlPatterns, RenpyPatterns, StylePatterns, PythonPatterns, ScreenPatterns };
\ No newline at end of file
diff --git a/syntax-to-token-pattern.py b/syntax-to-token-pattern.py
index fd3fea5..a00425c 100644
--- a/syntax-to-token-pattern.py
+++ b/syntax-to-token-pattern.py
@@ -57,6 +57,8 @@ def get_parts(range: slice) -> str:
                 return "KeywordTokenType.Class"
             elif get_part(2) == "style":
                 return "KeywordTokenType.Style"
+            elif get_part(2) == "screen":
+                return "KeywordTokenType.Screen"
             elif get_part(2) == "imaginary":
                 return "MetaTokenType.ImaginaryNumberStorageType"
             elif get_part(2) == "number":
diff --git a/syntaxes/renpy.atl.tmLanguage.json b/syntaxes/renpy.atl.tmLanguage.json
index 29f6d1a..7e3bbb4 100644
--- a/syntaxes/renpy.atl.tmLanguage.json
+++ b/syntaxes/renpy.atl.tmLanguage.json
@@ -154,7 +154,7 @@
       "patterns": [
         { "include": "#atl-simple-expression" },
         {
-          "begin": "\\b(with)\\b[ \\t]*",
+          "begin": "\\b(with)\\b",
           "beginCaptures": {
             "1": { "name": "keyword.with.renpy" }
           },
@@ -168,21 +168,21 @@
       "patterns": [
         {
           "comment": "https://www.renpy.org/doc/html/atl.html#animation-statement",
-          "match": "^[ \\t]*(animation)\\b",
+          "match": "(?<=^[ \\t]*)(animation)\\b",
           "captures": {
             "1": { "name": "keyword.animation.renpy" }
           }
         },
         {
           "comment": "https://www.renpy.org/doc/html/atl.html#pass-statement",
-          "match": "^[ \\t]*(pass)\\b",
+          "match": "(?<=^[ \\t]*)(pass)\\b",
           "captures": {
             "1": { "name": "keyword.control.flow.pass.renpy" }
           }
         },
         {
           "comment": "https://www.renpy.org/doc/html/atl.html#repeat-statement and https://www.renpy.org/doc/html/atl.html#time-statement",
-          "begin": "^[ \\t]*(?:(repeat)|(time)|(pause))\\b[ \\t]*",
+          "begin": "(?<=^[ \\t]*)(?:(repeat)|(time)|(pause))\\b",
           "beginCaptures": {
             "1": { "name": "keyword.control.flow.repeat.renpy" },
             "2": { "name": "keyword.control.flow.time.renpy" },
@@ -194,7 +194,7 @@
         {
           "comment": "https://www.renpy.org/doc/html/atl.html#expression-statement",
           "contentName": "meta.atl.with.renpy",
-          "begin": "^[ \\t]*(with)\\b[ \\t]*",
+          "begin": "(?<=^[ \\t]*)(with)\\b",
           "beginCaptures": {
             "1": { "name": "keyword.with.renpy" }
           },
@@ -204,7 +204,7 @@
         {
           "comment": "https://www.renpy.org/doc/html/atl.html#contains-statement",
           "contentName": "meta.atl.contains.renpy",
-          "begin": "^[ \\t]*(contains)\\b[ \\t]*",
+          "begin": "(?<=^[ \\t]*)(contains)\\b",
           "beginCaptures": {
             "1": { "name": "keyword.control.flow.contains.renpy" }
           },
diff --git a/syntaxes/renpy.python.tmLanguage.json b/syntaxes/renpy.python.tmLanguage.json
index 892e5ea..03b450d 100644
--- a/syntaxes/renpy.python.tmLanguage.json
+++ b/syntaxes/renpy.python.tmLanguage.json
@@ -64,13 +64,7 @@
     },
     "comments": {
       "patterns": [
-        {
-          "name": "comment.line.number-sign.renpy",
-          "match": "^[ \\t]*(#[ \\t]*(?:end)?region)\\b.*$",
-          "captures": {
-            "1": { "name": "punctuation.definition.tag.region" }
-          }
-        },
+        { "include": "source.renpy#region-comment" },
         {
           "name": "comment.line.number-sign.python",
           "contentName": "meta.typehint.comment.python",
@@ -99,7 +93,7 @@
             }
           ]
         },
-        { "include": "#comments-base" }
+        { "include": "source.renpy#comments-base" }
       ]
     },
     "docstring-statement": {
@@ -120,7 +114,7 @@
           "endCaptures": {
             "1": { "name": "punctuation.definition.string.end.python" }
           },
-          "patterns": [ { "include": "#docstring-prompt" }, { "include": "#codetags" }, { "include": "#docstring-guts-unicode" } ]
+          "patterns": [ { "include": "#docstring-prompt" }, { "include": "source.renpy#codetags" }, { "include": "#docstring-guts-unicode" } ]
         },
         {
           "name": "string.quoted.docstring.raw.multi.python",
@@ -133,7 +127,7 @@
           "endCaptures": {
             "1": { "name": "punctuation.definition.string.end.python" }
           },
-          "patterns": [ { "include": "#string-consume-escape" }, { "include": "#docstring-prompt" }, { "include": "#codetags" } ]
+          "patterns": [ { "include": "#string-consume-escape" }, { "include": "#docstring-prompt" }, { "include": "source.renpy#codetags" } ]
         },
         {
           "name": "string.quoted.docstring.single.python",
@@ -146,7 +140,7 @@
             "1": { "name": "punctuation.definition.string.end.python" },
             "2": { "name": "invalid.illegal.newline.python" }
           },
-          "patterns": [ { "include": "#codetags" }, { "include": "#docstring-guts-unicode" } ]
+          "patterns": [ { "include": "source.renpy#codetags" }, { "include": "#docstring-guts-unicode" } ]
         },
         {
           "name": "string.quoted.docstring.raw.single.python",
@@ -160,7 +154,7 @@
             "1": { "name": "punctuation.definition.string.end.python" },
             "2": { "name": "invalid.illegal.newline.python" }
           },
-          "patterns": [ { "include": "#string-consume-escape" }, { "include": "#codetags" } ]
+          "patterns": [ { "include": "#string-consume-escape" }, { "include": "source.renpy#codetags" } ]
         }
       ]
     },
@@ -212,6 +206,14 @@
         }
       ]
     },
+    "new-line": {
+      "match": "\\r\\n|\\r|\\n",
+      "name": "punctuation.new-line.renpy"
+    },
+    "whitespace": {
+      "match": "[ \\t]+",
+      "name": "punctuation.whitespace.python"
+    },
     "expression-bare": {
       "comment": "valid Python expressions w/o comments and line continuation",
       "patterns": [
@@ -239,7 +241,9 @@
         { "include": "#special-variables" },
         { "include": "#ellipsis" },
         { "include": "#punctuation" },
-        { "include": "#line-continuation" }
+        { "include": "#line-continuation" },
+        { "include": "#whitespace" },
+        { "include": "#new-line" }
       ]
     },
     "expression-base": {
@@ -306,10 +310,7 @@
       "endCaptures": {
         "0": { "name": "punctuation.definition.list.end.python" }
       },
-      "patterns": [
-        { "include": "#expression" },
-        { "include": "#whitespace" }
-      ]
+      "patterns": [ { "include": "#expression" } ]
     },
     "odd-function-call": {
       "comment": "A bit obscured function call where there may have been an arbitrary number of other operations to get the function.E.g. \"arr[idx](args)\"",
@@ -330,10 +331,7 @@
       "endCaptures": {
         "0": { "name": "punctuation.parenthesis.end.python" }
       },
-      "patterns": [
-        { "include": "#expression" },
-        { "include": "#whitespace" }
-      ]
+      "patterns": [ { "include": "#expression" } ]
     },
     "line-continuation": {
       "patterns": [
@@ -381,10 +379,6 @@
         }
       ]
     },
-    "whitespace": {
-      "match": "[ \\t]+",
-      "name": "punctuation.whitespace.python"
-    },
     "literal": {
       "patterns": [
         {
@@ -607,7 +601,7 @@
       "patterns": [
         {
           "name": "meta.class.python",
-          "begin": "\\s*(class)\\s+(?=[[:alpha:]_]\\w*\\s*(:|\\())",
+          "begin": "\\s*(class)\\s+(?=[[:alpha:]_]\\w*\\s*(?::|\\())",
           "end": "(:)",
           "beginCaptures": {
             "1": { "name": "storage.type.class.python" }
@@ -916,7 +910,7 @@
     },
     "decorator": {
       "name": "meta.function.decorator.python",
-      "begin": "^\\s*((@))\\s*(?=[[:alpha:]_]\\w*)",
+      "begin": "(?<=^[ \\t]*)(@)\\s*(?=[[:alpha:]_]\\w*)",
       "end": "(\\))(?:(.*?)(?=\\s*(?:\\#|$)))|(?=\\n|\\#)",
       "beginCaptures": {
         "1": { "name": "entity.name.function.decorator.python" },
@@ -934,9 +928,9 @@
         { "include": "#illegal-object-name" },
         {
           "name": "entity.name.function.decorator.python",
-          "match": "([[:alpha:]_]\\w*)|(\\.)",
+          "match": "(?:[[:alpha:]_]\\w*)|(\\.)",
           "captures": {
-            "2": { "name": "punctuation.separator.dot.python" }
+            "1": { "name": "punctuation.separator.dot.python" }
           }
         },
         { "include": "#line-continuation" },
@@ -1234,21 +1228,6 @@
         { "include": "#regexp-escape-catchall" }
       ]
     },
-    "codetags": {
-      "match": "(?:\\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\\b)",
-      "captures": {
-        "1": { "name": "keyword.codetag.notation.python" }
-      }
-    },
-    "comments-base": {
-      "name": "comment.line.number-sign.python",
-      "begin": "(\\#)",
-      "beginCaptures": {
-        "1": { "name": "punctuation.definition.comment.python" }
-      },
-      "end": "($)",
-      "patterns": [ { "include": "#codetags" } ]
-    },
     "comments-string-single-three": {
       "name": "comment.line.number-sign.python",
       "begin": "(\\#)",
@@ -1256,7 +1235,7 @@
         "1": { "name": "punctuation.definition.comment.python" }
       },
       "end": "($|(?='''))",
-      "patterns": [ { "include": "#codetags" } ]
+      "patterns": [ { "include": "source.renpy#codetags" } ]
     },
     "comments-string-double-three": {
       "name": "comment.line.number-sign.python",
@@ -1265,7 +1244,7 @@
         "1": { "name": "punctuation.definition.comment.python" }
       },
       "end": "($|(?=\"\"\"))",
-      "patterns": [ { "include": "#codetags" } ]
+      "patterns": [ { "include": "source.renpy#codetags" } ]
     },
     "single-one-regexp-expression": {
       "patterns": [
@@ -1337,7 +1316,7 @@
         "1": { "name": "punctuation.comment.end.regexp" },
         "2": { "name": "invalid.illegal.newline.python" }
       },
-      "patterns": [ { "include": "#codetags" } ]
+      "patterns": [ { "include": "source.renpy#codetags" } ]
     },
     "single-one-regexp-lookahead": {
       "begin": "(\\()\\?=",
@@ -1499,7 +1478,7 @@
         "1": { "name": "punctuation.comment.end.regexp" },
         "2": { "name": "invalid.illegal.newline.python" }
       },
-      "patterns": [ { "include": "#codetags" } ]
+      "patterns": [ { "include": "source.renpy#codetags" } ]
     },
     "single-three-regexp-lookahead": {
       "begin": "(\\()\\?=",
@@ -1660,7 +1639,7 @@
         "1": { "name": "punctuation.comment.end.regexp" },
         "2": { "name": "invalid.illegal.newline.python" }
       },
-      "patterns": [ { "include": "#codetags" } ]
+      "patterns": [ { "include": "source.renpy#codetags" } ]
     },
     "double-one-regexp-lookahead": {
       "begin": "(\\()\\?=",
@@ -1822,7 +1801,7 @@
         "1": { "name": "punctuation.comment.end.regexp" },
         "2": { "name": "invalid.illegal.newline.python" }
       },
-      "patterns": [ { "include": "#codetags" } ]
+      "patterns": [ { "include": "source.renpy#codetags" } ]
     },
     "double-three-regexp-lookahead": {
       "begin": "(\\()\\?=",
@@ -2021,7 +2000,7 @@
       "patterns": [ { "include": "#string-raw-bin-guts" } ]
     },
     "string-quoted-single-line": {
-      "name": "string.quoted.single.python",
+      "name": "string.quoted.single.test.python",
       "begin": "(?:\\b([rR])(?=[uU]))?([uU])?(['\"])",
       "end": "(\\3)|((?<!\\\\)\\n)",
       "beginCaptures": {
@@ -2033,30 +2012,31 @@
         "1": { "name": "punctuation.definition.string.end.python" },
         "2": { "name": "invalid.illegal.newline.python" }
       },
-      "patterns": [ { "include": "#string-single-bad-brace1-formatting-unicode" }, { "include": "#string-single-bad-brace2-formatting-unicode" }, { "include": "#string-unicode-guts" } ]
+      "patterns": [
+        { "include": "#string-single-bad-brace1-formatting-unicode" },
+        { "include": "#string-unicode-guts" }
+      ]
     },
     "string-single-bad-brace1-formatting-unicode": {
       "comment": "template using {% ... %}",
-      "begin": "(?=\\{%(.*?(?!(['\"])|((?<!\\\\)\\n)))%\\})",
-      "end": "(?=(['\"])|((?<!\\\\)\\n))",
-      "patterns": [ { "include": "#escape-sequence-unicode" }, { "include": "#escape-sequence" }, { "include": "#string-line-continuation" } ]
+      "begin": "(?=\\{%(?:.*?(?!['\"]|(?:(?<!\\\\)\\n)))%\\})",
+      "end": "(?=['\"]|(?:(?<!\\\\)\\n))",
+      "patterns": [
+        { "include": "#escape-sequence-unicode" },
+        { "include": "#escape-sequence" },
+        { "include": "#string-line-continuation" }
+      ]
     },
     "string-single-bad-brace1-formatting-raw": {
       "comment": "template using {% ... %}",
-      "begin": "(?=\\{%(.*?(?!(['\"])|((?<!\\\\)\\n)))%\\})",
-      "end": "(?=(['\"])|((?<!\\\\)\\n))",
+      "begin": "(?=\\{%(?:.*?(?!['\"]|(?:(?<!\\\\)\\n)))%\\})",
+      "end": "(?=['\"]|(?:(?<!\\\\)\\n))",
       "patterns": [ { "include": "#string-consume-escape" } ]
     },
-    "string-single-bad-brace2-formatting-unicode": {
-      "comment": "odd format or format-like syntax",
-      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!(['\"])|((?<!\\\\)\\n))[^!:\\.\\[}\\w]).*?(?!(['\"])|((?<!\\\\)\\n))\\})",
-      "end": "(?=(['\"])|((?<!\\\\)\\n))",
-      "patterns": [ { "include": "#escape-sequence-unicode" }, { "include": "#string-entity" } ]
-    },
     "string-single-bad-brace2-formatting-raw": {
       "comment": "odd format or format-like syntax",
-      "begin": "(?!\\{\\{)(?=\\{(\\w*?(?!(['\"])|((?<!\\\\)\\n))[^!:\\.\\[}\\w]).*?(?!(['\"])|((?<!\\\\)\\n))\\})",
-      "end": "(?=(['\"])|((?<!\\\\)\\n))",
+      "begin": "(?!\\{\\{)(?=\\{(?:\\w*?(?!['\"]|(?:(?<!\\\\)\\n))[^!:\\.\\[}\\w]).*?(?!['\"]|(?:(?<!\\\\)\\n))\\})",
+      "end": "(?=['\"]|(?:(?<!\\\\)\\n))",
       "patterns": [ { "include": "#string-consume-escape" }, { "include": "#string-formatting" } ]
     },
     "string-raw-quoted-multi-line": {
diff --git a/syntaxes/renpy.screen.tmLanguage.json b/syntaxes/renpy.screen.tmLanguage.json
index 0ee18a1..d401260 100644
--- a/syntaxes/renpy.screen.tmLanguage.json
+++ b/syntaxes/renpy.screen.tmLanguage.json
@@ -39,7 +39,7 @@
         },
         {
           "comment": "Special manipulation keywords",
-          "match": "\\b(?<!\\.)(key|input|(text|image)?button|grid|auto|mousearea|side|timer|[vh]?bar|action|viewport|scrollbars|mousewheel|vpgrid|imagemap)\\b",
+          "match": "\\b(?<!\\.)(key|input|(?:text|image)?button|grid|auto|mousearea|side|timer|[vh]?bar|action|viewport|scrollbars|mousewheel|vpgrid|imagemap)\\b",
           "captures": {
             "1": { "name": "keyword.other.renpy" }
           }
@@ -197,12 +197,14 @@
       "patterns": [
         {
           "contentName": "meta.screen-block.renpy",
-          "begin": "(?<=(^[ \\t]*)(?:frame|window|text|vbox|hbox)\\b.*?)(:)",
+          "begin": "(?<=(^[ \\t]*)(?:screen|frame|window|text|vbox|hbox)\\b.*?)(:)",
           "beginCaptures": {
             "2": { "name": "punctuation.section.screen.begin.renpy" }
           },
           "end": "^(?=(?!\\1)[ \\t]*[^\\s#]|\\1[^\\s#])",
-          "patterns": [ { "include": "#screen-language" } ]
+          "patterns": [
+            { "include": "#screen-language" }
+          ]
         }
       ]
     },
@@ -281,22 +283,23 @@
         }
       ]
     },
+
     "screen": {
       "patterns": [
         {
           "comment": "See https://www.renpy.org/doc/html/screens.html",
           "contentName": "meta.screen.block.renpy",
-          "begin": "^([ \\t]+)?(screen)\\b[ \\t]*(.*?)(:)",
+          "begin": "(?<=^[ \\t]*)(screen)\\b",
           "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" }
+            "1": { "name": "storage.type.screen.renpy" }
           },
-          "end": "^(?=(?!\\1)[ \\t]*[^\\s#]|\\1[^\\s#])",
-          "patterns": [ { "include": "#screen-language" } ]
+          "end": "$|^",
+          "patterns": [
+            { "include": "#screen-def-name" },
+            { "include": "source.renpy.python#parameters" },
+            { "include": "#screen-block-tester" },
+            { "include": "source.renpy#fallback-patterns" }
+          ]
         }
       ]
     },
@@ -310,7 +313,6 @@
       "comment": "https://www.renpy.org/doc/html/screens.html#screen-language",
       "patterns": [
         { "include": "source.renpy#conditionals" },
-        { "include": "#screen-block-tester" },
         { "include": "#screen-frame" },
         { "include": "#screen-window" },
         { "include": "#screen-box" },
diff --git a/syntaxes/renpy.style.tmLanguage.json b/syntaxes/renpy.style.tmLanguage.json
index 071b92e..4ba421a 100644
--- a/syntaxes/renpy.style.tmLanguage.json
+++ b/syntaxes/renpy.style.tmLanguage.json
@@ -44,22 +44,34 @@
     "style-clause": {
       "patterns": [
         {
-          "match": "\\b(?<!\\.)(is)\\b[ \\t]*(\\w*)",
-          "captures": {
-            "1": { "name": "keyword.operator.logical.python" },
-            "2": { "name": "entity.name.type.style.parent.renpy" }
-          }
+          "comment": "is statement",
+          "begin": "\\b(?<!\\.)(is)\\b",
+          "beginCaptures": {
+            "1": { "name": "keyword.operator.logical.python" }
+          },
+          "end": "(?<=[^ \\t])(?!\\G)|$",
+          "patterns": [
+            {
+              "name": "entity.name.type.style.base.renpy",
+              "match": "\\b[\\p{XID_Start}_]\\p{XID_Continue}*\\b"
+            },
+            { "include": "source.renpy#fallback-patterns" }
+          ]
         },
         {
           "match": "\\b(?<!\\.)clear\\b",
           "name": "keyword.clear.renpy"
         },
         {
-          "match": "\\b(?<!\\.)(take)\\b[ \\t]*(\\w*)",
-          "captures": {
-            "1": { "name": "keyword.take.renpy" },
-            "2": { "patterns": [ { "include": "source.renpy#name" } ] }
-          }
+          "begin": "\\b(?<!\\.)(take)\\b",
+          "beginCaptures": {
+            "1": { "name": "keyword.take.renpy" }
+          },
+          "end": "(?<=[^ \\t])(?!\\G)|$",
+          "patterns": [
+            { "include": "source.renpy#name" },
+            { "include": "source.renpy#fallback-patterns" }
+          ]
         },
         {
           "match": "\\b(?<!\\.)(del)\\b[ \\t]*(\\w*)",
diff --git a/syntaxes/renpy.tmLanguage.json b/syntaxes/renpy.tmLanguage.json
index ac50dea..350ec99 100644
--- a/syntaxes/renpy.tmLanguage.json
+++ b/syntaxes/renpy.tmLanguage.json
@@ -266,33 +266,32 @@
         }
       ]
     },
+    "region-comment": {
+      "name": "comment.line.number-sign.renpy",
+      "match": "(?<=^[ \\t]*)(#[ \\t]*(?:end)?region)\\b.*$",
+      "captures": {
+        "1": { "name": "punctuation.definition.tag.region.renpy" }
+      }
+    },
+    "codetags": {
+      "match": "(?:\\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\\b)",
+      "captures": {
+        "1": { "name": "keyword.codetag.notation.renpy" }
+      }
+    },
+    "comments-base": {
+      "name": "comment.line.number-sign.renpy",
+      "begin": "#",
+      "beginCaptures": {
+        "0": { "name": "punctuation.definition.comment.renpy" }
+      },
+      "end": "$",
+      "patterns": [ { "include": "#codetags" } ]
+    },
     "comments": {
       "patterns": [
-        {
-          "name": "comment.line.number-sign.renpy",
-          "match": "(?<=^[ \\t]*)(#[ \\t]*(?:end)?region)\\b.*$",
-          "captures": {
-            "1": { "name": "punctuation.definition.tag.region" }
-          }
-        },
-        {
-          "name": "comment.line.number-sign.renpy",
-          "match": "(#)(.*)$",
-          "captures": {
-            "1": { "name": "punctuation.definition.comment.renpy" },
-            "2": {
-              "patterns": [
-                {
-                  "comment": "Code Tags",
-                  "match": "(?:\\b(NOTE|XXX|HACK|FIXME|BUG|TODO)\\b)",
-                  "captures": {
-                    "1": { "name": "keyword.codetag.notation.renpy" }
-                  }
-                }
-              ]
-            }
-          }
-        }
+        { "include": "#region-comment" },
+        { "include": "#comments-base" }
       ]
     },
     "escaped_char": {
@@ -632,10 +631,7 @@
             "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": [ ]
-            },
+            "4": { "name": "support.constant.property-value.renpy string.unquoted.renpy" },
             "5": { "name": "punctuation.definition.tag.end.renpy" }
           }
         },
@@ -666,8 +662,7 @@
             "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",
-              "patterns": [ ]
+              "name": "support.constant.property-value.renpy constant.other.placeholder.tags.renpy"
             },
             "5": { "name": "punctuation.definition.tag.end.renpy" }
           }
@@ -701,14 +696,16 @@
     "python-statements": {
       "patterns": [
         {
-          "match": "^([ \\t]*)(init)[ \\t]+(offset)[ \\t]*(=)[ \\t]*(-)?([^#]*?)$",
+          "match": "(?<=^[ \\t]*)(init)([ \\t]+)(offset)([ \\t]*)(=)([ \\t]*)(-)?([^#]*?)$",
           "captures": {
-            "1": { "name": "punctuation.whitespace.leading.renpy" },
-            "2": { "name": "keyword.init.renpy" },
+            "1": { "name": "keyword.init.renpy" },
+            "2": { "name": "punctuation.whitespace.renpy" },
             "3": { "name": "keyword.offset.renpy" },
-            "4": { "name": "keyword.operator.assignment.renpy" },
-            "5": { "name": "keyword.operator.arithmetic.minus.renpy" },
-            "6": {
+            "4": { "name": "punctuation.whitespace.renpy" },
+            "5": { "name": "keyword.operator.assignment.renpy" },
+            "6": { "name": "punctuation.whitespace.renpy" },
+            "7": { "name": "keyword.operator.arithmetic.minus.renpy" },
+            "8": {
               "patterns": [ { "include": "#num-int" }, { "include": "#invalid-token" } ]
             }
           }
@@ -716,22 +713,31 @@
         {
           "comment": "Renpy python block",
           "contentName": "meta.embedded.block.python",
-          "begin": "(?<=(^[ \\t]*))(?:(init)(?:[ \\t]+(-)?(\\d+))?[ \\t]+)?(python)[ \\t]*(.*)?(:)",
+          "begin": "(?<=(^[ \\t]*))(?:(init)(?:([ \\t]+)(-)?(\\d+))?([ \\t]+))?(python)(.*)?(:)",
           "beginCaptures": {
             "2": { "name": "keyword.init.renpy" },
-            "3": { "name": "keyword.operator.arithmetic.minus.renpy" },
-            "4": { "name": "constant.numeric.integer.renpy" },
-            "5": { "name": "keyword.python.renpy" },
-            "6": {
+            "3": { "name": "punctuation.whitespace.renpy" },
+            "4": { "name": "keyword.operator.arithmetic.minus.renpy" },
+            "5": { "name": "constant.numeric.integer.renpy" },
+            "6": { "name": "punctuation.whitespace.renpy" },
+            "7": { "name": "keyword.python.renpy" },
+            "8": {
               "name": "meta.python.block.arguments.renpy",
               "patterns": [
                 {
                   "comment": "in statement",
-                  "match": "(?:\\s*(in)\\s*([a-zA-Z_]\\w*)\\b)",
-                  "captures": {
-                    "1": { "name": "keyword.control.flow.in.renpy" },
-                    "2": { "name": "entity.name.namespace" }
-                  }
+                  "begin": "\\b(in)\\b",
+                  "beginCaptures": {
+                    "1": { "name": "keyword.control.flow.in.renpy" }
+                  },
+                  "end": "(?<=[^ \\t])(?!\\G)|$",
+                  "patterns": [
+                    {
+                      "name": "entity.name.namespace",
+                      "match": "\\b[\\p{XID_Start}_]\\p{XID_Continue}*\\b"
+                    },
+                    { "include": "#fallback-patterns" }
+                  ]
                 },
                 {
                   "comment": "keywords",
@@ -744,7 +750,7 @@
                 }
               ]
             },
-            "7": { "name": "punctuation.section.python.begin.renpy" }
+            "9": { "name": "punctuation.section.python.begin.renpy" }
           },
           "end": "^(?=(?!\\1)[ \\t]*[^\\s#]|\\1[^\\s#])",
           "patterns": [ { "include": "source.renpy.python" } ]
@@ -895,14 +901,15 @@
     },
 
     "pause": {
-      "match": "(?<=^[ \\t]+)(pause)\\b(.+)?",
-      "captures": {
-        "1": { "name": "keyword.control.flow.pause.renpy" },
-        "2": {
-          "name": "meta.pause.parameters.renpy",
-          "patterns": [ { "include": "#simple-expression" } ]
-        }
-      }
+      "name": "meta.pause.statement.renpy",
+      "contentName": "meta.pause.parameters.renpy",
+      "begin": "(?<=^[ \\t]+)(pause)\\b",
+      "beginCaptures": {
+        "1": { "name": "keyword.control.flow.pause.renpy" }
+      },
+      "end": "(?=#)|$",
+
+      "patterns": [ { "include": "#simple-expression" } ]
     },
 
     "conditionals": {
@@ -928,7 +935,7 @@
       },
       "end": "(?=\\b(at|as|behind|onlayer|expression|with|zorder)\\b|#|=|:)|$",
 
-      "patterns": [ { "include": "#whitespace" }, { "include": "#simple-expression" } ]
+      "patterns": [ { "include": "#simple-expression" } ]
     },
     "as-statement": {
       "name": "meta.as.statement.renpy",
@@ -1183,7 +1190,7 @@
       }
     },
     "return-statements": {
-      "begin": "(?<=^[ \\t]+)(return)\\b[ \\t]*",
+      "begin": "(?<=^[ \\t]+)(return)\\b",
       "beginCaptures": {
         "1": { "name": "keyword.control.flow.return.renpy" }
       },
@@ -1219,7 +1226,7 @@
       ]
     },
     "call-pass": {
-      "begin": "\\b(?<!\\.)(pass)\\b[ \\t]*(?=\\()",
+      "begin": "\\b(?<!\\.)(pass)\\b(?=[ \\t]*\\()",
       "beginCaptures": {
         "1": { "name": "keyword.control.flow.pass.renpy" }
       },
@@ -1227,44 +1234,74 @@
       "endCaptures": {
         "1": { "name": "punctuation.definition.arguments.end.renpy" }
       },
-      "patterns": [ { "include": "source.renpy.python#function-arguments" } ]
+      "patterns": [
+        { "include": "source.renpy.python#function-arguments" },
+        { "include": "#whitespace" }
+      ]
     },
     "call-from": {
-      "begin": "\\b(?<!\\.)(from)\\b[ \\t]*",
+      "name": "meta.from.clause.renpy",
+      "contentName": "meta.from.arguments.renpy",
+      "begin": "\\b(?<!\\.)(from)\\b",
       "beginCaptures": {
         "1": { "name": "keyword.control.flow.from.renpy" }
       },
-      "end": "(?=\\W|$)",
-      "patterns": [ { "include": "#label-name" } ]
+      "end": "(?<=[^ \\t])(?!\\G)|$",
+      "patterns": [
+        { "include": "#label-name" },
+        { "include": "#fallback-patterns" }
+      ]
     },
     "call": {
       "name": "meta.call.statement.renpy",
-      "begin": "(?<=^[ \\t]+)(call)\\b(?:[ \\t]+(screen))?",
+      "contentName": "meta.call.arguments.renpy",
+      "begin": "(?<=^[ \\t]+)(call)\\b",
       "beginCaptures": {
-        "1": { "name": "keyword.control.flow.call.renpy" },
-        "2": { "name": "keyword.screen.renpy" }
+        "1": { "name": "keyword.control.flow.call.renpy" }
       },
-      "end": "(?=#)|$",
+      "end": "$",
       "endCaptures": {
         "1": { "name": "invalid.illegal.renpy" }
       },
       "patterns": [
         { "include": "#call-jump-expression" },
         { "include": "#call-pass" },
+        { "include": "#call-from" },
+        {
+          "name": "meta.from.clause.renpy",
+          "begin": "(?<=call[ \\t]+)(screen)\\b",
+          "beginCaptures": {
+            "1": { "name": "keyword.screen.renpy" }
+          },
+          "end": "(?<=[^ \\t])(?!\\G)",
+          "patterns": [
+            {
+              "comment": "Label expression",
+              "begin": "(?<=screen[ \\t]+)(?=[a-zA-Z_.])",
+              "end": "(?![a-zA-Z_.])(?![ \\t]*\\.[ \\t]*)",
+              "patterns": [ { "include": "#label-call" }, { "include": "#label-access" }, { "include": "#label-name" } ]
+            },
+            { "include": "#whitespace" }
+          ]
+        },
         {
           "comment": "Label expression",
-          "begin": "(?=[a-zA-Z_.])",
+          "begin": "(?<=call[ \\t]+)(?=[a-zA-Z_.])",
           "end": "(?![a-zA-Z_.])(?![ \\t]*\\.[ \\t]*)",
           "patterns": [ { "include": "#label-call" }, { "include": "#label-access" }, { "include": "#label-name" } ]
         },
-        { "include": "#call-from" }
+        { "include": "#whitespace" },
+        { "include": "#comments" },
+        {
+          "match": "[^ \\t]+",
+          "name": "invalid.illegal.unexpected-characters-call-arguments.renpy"
+        }
       ]
     },
     "menu-option": {
       "contentName": "meta.menu-option.block.renpy",
-      "begin": "^([ \\t]+)?((?:\".*\")|(?:'.*')|(?:\"\"\".*\"\"\"))[ \\t]*(.+)?(:)",
+      "begin": "(?<=(^[ \\t]+))((?:\".*\")|(?:'.*')|(?:\"\"\".*\"\"\"))(.+)?(:)",
       "beginCaptures": {
-        "1": { "name": "punctuation.whitespace.menu-option.leading.renpy" },
         "2": {
           "name": "meta.menu-option.renpy",
           "patterns": [ { "include": "#strings" } ]
@@ -1275,13 +1312,12 @@
             { "include": "source.renpy.python#function-arguments" },
             {
               "comment": "if condition",
-              "match": "\\b(if)[ \\t]+(.+)?",
-              "captures": {
-                "1": { "name": "keyword.control.conditional.renpy" },
-                "2": {
-                  "patterns": [ { "include": "source.renpy.python#expression-bare" } ]
-                }
-              }
+              "begin": "\\b(if)\\b",
+              "beginCaptures": {
+                "1": { "name": "keyword.control.conditional.renpy" }
+              },
+              "end": "(?=#|:)|$",
+              "patterns": [ { "include": "source.renpy.python#expression" } ]
             },
             {
               "match": "[^ \\t]+",
@@ -1295,14 +1331,13 @@
       "patterns": [ { "include": "#base-patterns" } ]
     },
     "menu-set": {
-      "match": "(?<=^[ \\t]+)(set)[ \\t]+(.+)?",
-      "captures": {
-        "1": { "name": "keyword.set.renpy" },
-        "2": {
-          "name": "meta.embedded.line.python",
-          "patterns": [ { "include": "source.renpy.python#expression-bare" } ]
-        }
-      }
+      "contentName": "meta.embedded.line.python",
+      "begin": "(?<=^[ \\t]+)(set)\\b",
+      "beginCaptures": {
+        "1": { "name": "keyword.set.renpy" }
+      },
+      "end": "$",
+      "patterns": [ { "include": "source.renpy.python#expression" } ]
     },
     "menu": {
       "name": "meta.menu.statement.renpy",