diff --git a/src/tokenizer/atl-token-patterns.g.ts b/src/tokenizer/atl-token-patterns.g.ts
index dd3703d..c37789d 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 18:50:56 (UTC+0)
+// Last generated: 14/07/2024 12:28:58 (UTC+0)
 
 import { KeywordTokenType, EntityTokenType, MetaTokenType, CharacterTokenType } from "./renpy-tokens";
 import { TokenPattern } from "./token-pattern-types";
@@ -432,19 +432,17 @@ export const atlStatements: TokenPattern = {
 };
 
 export const atlBlockTester: TokenPattern = {
-    patterns: [
-        {
-            debugName: "atlBlockTester.patterns![0]",
+    debugName: "atlBlockTester",
 
-            contentToken: MetaTokenType.ATLBlock, /*meta.atl-block.renpy*/
-            begin: /(?<=(^[ \t]*)(?:camera|image|show|scene|transform|on|block|parallel|contains|choice)\b.*?)(:)/dgm,
-            beginCaptures: {
-                2: { token: CharacterTokenType.Colon, /*punctuation.section.atl.begin.renpy*/ },
-            },
-            // @ts-ignore: Back references in end patterns are replaced by begin matches at runtime
-            end: /^(?=(?!\1)[ \t]*[^\s#]|\1[^\s#])/gm,
-            patterns: []
-        }]
+    contentToken: MetaTokenType.ATLBlock, /*meta.atl-block.renpy*/
+    begin: /(?<=(^[ \t]*)(?:camera|image|show|scene|transform|on|block|parallel|contains|choice)\b.*?)(:)/dgm,
+    beginCaptures: {
+        2: { token: CharacterTokenType.Colon, /*punctuation.section.atl.begin.renpy*/ },
+    },
+    // @ts-ignore: Back references in end patterns are replaced by begin matches at runtime
+    end: /^(?=(?!\1)[ \t]*[^\s#]|\1[^\s#])/gm,
+    patterns: [
+    ]
 };
 
 export const transform: TokenPattern = {
diff --git a/src/tokenizer/debug-decorator.ts b/src/tokenizer/debug-decorator.ts
index 9ff1409..5d6c71d 100644
--- a/src/tokenizer/debug-decorator.ts
+++ b/src/tokenizer/debug-decorator.ts
@@ -242,7 +242,7 @@ async function updateDecorations() {
             range: range,
             hoverMessage: {
                 language: "text",
-                value: `Token: ${tokenTypeToStringMap[token.type]}(id: ${token.type})
+                value: `${token.isMetaToken() ? "MetaToken" : "Token"}: ${tokenTypeToStringMap[token.type]}(id: ${token.type})
 Start: {Line: ${range.start.line + 1}, Char: ${range.start.character + 1}}
 End: {Line: ${range.end.line + 1}, Char: ${range.end.character + 1}}
 Content: {${content?.replaceAll("\n", "\\n")}}`,
@@ -327,6 +327,7 @@ ${(decoration.hoverMessage as MarkdownString).value}`,
             case KeywordTokenType.Other:
             case KeywordTokenType.OtherPython:
             case KeywordTokenType.OtherAudio:
+            case KeywordTokenType.Layer:
             case KeywordTokenType.Take: // Renpy style sub-expression keywords
             case KeywordTokenType.Del:
             case KeywordTokenType.Clear:
diff --git a/src/tokenizer/python-token-patterns.g.ts b/src/tokenizer/python-token-patterns.g.ts
index 4819511..ef5b6ce 100644
--- a/src/tokenizer/python-token-patterns.g.ts
+++ b/src/tokenizer/python-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 18:44:34 (UTC+0)
+// Last generated: 14/07/2024 12:28:58 (UTC+0)
 
 import { MetaTokenType, KeywordTokenType, CharacterTokenType, EntityTokenType, OperatorTokenType, LiteralTokenType } from "./renpy-tokens";
 import { TokenPattern } from "./token-pattern-types";
@@ -85,7 +85,7 @@ export const docstringStatement: TokenPattern = {
     debugName: "docstringStatement",
 
     // the string either terminates correctly or by the beginning of a new line (this is for single line docstrings that aren't terminated) AND it's not followed by another docstring
-    begin: /^(?=\s*[rR]?(\'\'\'|\"\"\"|\'|\"))/gm,
+    begin: /(?<=^[ \t]*)(?=[rR]?(\'\'\'|\"\"\"|\'|\"))/gm,
     // @ts-ignore: Back references in end patterns are replaced by begin matches at runtime
     end: /((?<=\1)|^)(?!\s*[rR]?(\'\'\'|\"\"\"|\'|\"))/gm,
     patterns: [
@@ -351,7 +351,7 @@ export const oddFunctionCall: TokenPattern = {
 
     // 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)"
     token: MetaTokenType.FunctionCall, /*meta.function-call.python*/
-    begin: /(?<=\]|\))\s*(?=\()/g,
+    begin: /(?<=\]|\)|")\s*(?=\()/g,
     end: /(\))/dg,
     endCaptures: {
         1: { token: CharacterTokenType.CloseParentheses, /*punctuation.definition.arguments.end.python*/ },
@@ -482,7 +482,7 @@ export const numberHex: TokenPattern = {
     debugName: "numberHex",
 
     token: MetaTokenType.ConstantNumeric, /*constant.numeric.hex.python*/
-    match: /(?<![\w.])(0[xX])(_?[0-9a-fA-F])+\b/dg,
+    match: /(?<![\w.])(0[xX])(?:_?[0-9a-fA-F])+\b/dg,
     captures: {
         1: { token: MetaTokenType.NumberStorageType, /*storage.type.number.python*/ },
     },
@@ -492,7 +492,7 @@ export const numberOct: TokenPattern = {
     debugName: "numberOct",
 
     token: MetaTokenType.ConstantNumeric, /*constant.numeric.oct.python*/
-    match: /(?<![\w.])(0[oO])(_?[0-7])+\b/dg,
+    match: /(?<![\w.])(0[oO])(?:_?[0-7])+\b/dg,
     captures: {
         1: { token: MetaTokenType.NumberStorageType, /*storage.type.number.python*/ },
     },
@@ -502,7 +502,7 @@ export const numberBin: TokenPattern = {
     debugName: "numberBin",
 
     token: MetaTokenType.ConstantNumeric, /*constant.numeric.bin.python*/
-    match: /(?<![\w.])(0[bB])(_?[01])+\b/dg,
+    match: /(?<![\w.])(0[bB])(?:_?[01])+\b/dg,
     captures: {
         1: { token: MetaTokenType.NumberStorageType, /*storage.type.number.python*/ },
     },
@@ -513,9 +513,9 @@ export const numberLong: TokenPattern = {
 
     // this is to support python2 syntax for long ints
     token: MetaTokenType.ConstantNumeric, /*constant.numeric.bin.python*/
-    match: /(?<![\w.])([1-9][0-9]*|0)([lL])\b/dg,
+    match: /(?<![\w.])(?:[1-9][0-9]*|0)([lL])\b/dg,
     captures: {
-        2: { token: MetaTokenType.NumberStorageType, /*storage.type.number.python*/ },
+        1: { token: MetaTokenType.NumberStorageType, /*storage.type.number.python*/ },
     },
 };
 
@@ -625,7 +625,7 @@ export const stringFormatting: TokenPattern = {
     debugName: "stringFormatting",
 
     token: MetaTokenType.FormatPercent, /*meta.format.percent.python*/
-    match: /(%(\([\w\s]*\))?[-+#0 ]*(\d+|\*)?(\.(\d+|\*))?([hlL])?[diouxXeEfFgGcrsab%])/dg,
+    match: /(%(?:\([\w\s]*\))?[-+#0 ]*(?:\d+|\*)?(?:\.(?:\d+|\*))?(?:[hlL])?[diouxXeEfFgGcrsab%])/dg,
     captures: {
         1: { token: MetaTokenType.Placeholder, /*constant.character.format.placeholder.other.python*/ },
     },
@@ -1211,10 +1211,11 @@ export const functionArguments: TokenPattern = {
         {
             debugName: "functionArguments.patterns![4]",
 
-            match: /\b([a-zA-Z_]\w*)\s*(=)(?!=)/dg,
+            match: /\b([a-zA-Z_]\w*)(\s+)?(=)(?!=)/dg,
             captures: {
                 1: { token: EntityTokenType.Identifier, /*variable.parameter.function-call.python*/ },
-                2: { token: OperatorTokenType.Assignment, /*keyword.operator.assignment.python*/ },
+                2: { token: CharacterTokenType.Whitespace, /*punctuation.whitespace.python*/ },
+                3: { token: OperatorTokenType.Assignment, /*keyword.operator.assignment.python*/ },
             },
         },
         {
@@ -2510,7 +2511,7 @@ export const stringRawBinQuotedSingleLine: TokenPattern = {
 export const stringQuotedSingleLine: TokenPattern = {
     debugName: "stringQuotedSingleLine",
 
-    token: LiteralTokenType.String, /*string.quoted.single.test.python*/
+    token: LiteralTokenType.String, /*string.quoted.single.python*/
     begin: /(?:\b([rR])(?=[uU]))?([uU])?(['"])/dg,
     beginCaptures: {
         1: { token: MetaTokenType.Invalid, /*invalid.illegal.prefix.python*/ },
diff --git a/src/tokenizer/renpy-token-patterns.g.ts b/src/tokenizer/renpy-token-patterns.g.ts
index 07054b7..b4a5ddf 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 18:46:24 (UTC+0)
+// Last generated: 14/07/2024 15:10:14 (UTC+0)
 
 import { MetaTokenType, CharacterTokenType, LiteralTokenType, EntityTokenType, KeywordTokenType, EscapedCharacterTokenType, OperatorTokenType } from "./renpy-tokens";
 import { TokenPattern } from "./token-pattern-types";
@@ -302,47 +302,31 @@ export const keywords: TokenPattern = {
 
             // Control flow keywords
             token: MetaTokenType.ControlFlowKeyword, /*keyword.control.flow.renpy*/
-            match: /\b(?<!\.)(?:pass|return|pause)\b/g,
+            match: /\b(?<!\.)(?:pass|return|pause|if|elif|else|while|for)\b/g,
         },
         {
             debugName: "keywords.patterns![1]",
 
-            // Control flow keywords with block
-            contentToken: MetaTokenType.PythonLine, /*meta.embedded.line.python*/
-            begin: /\b(?<!\.)(?:(if|elif|else)|(for|while))\b/dg,
-            beginCaptures: {
-                1: { token: KeywordTokenType.If, /*keyword.control.conditional.renpy*/ },
-                2: { token: MetaTokenType.ControlFlowKeyword, /*keyword.control.flow.renpy*/ },
-            },
-            end: /:|$/dgm,
-            endCaptures: {
-                0: { token: CharacterTokenType.Colon, /*punctuation.section.block.begin.renpy*/ },
-            },
-            patterns: [expressions]
-        },
-        {
-            debugName: "keywords.patterns![2]",
-
             // Python statement keywords
             token: KeywordTokenType.OtherPython, /*keyword.other.python.renpy*/
             match: /\b(?<!\.)(define|default|early|hide|in|init|python)\b/g,
         },
         {
-            debugName: "keywords.patterns![3]",
+            debugName: "keywords.patterns![2]",
 
             // Renpy keywords
             token: KeywordTokenType.Other, /*keyword.other.renpy*/
             match: /\b(?<!\.)(?:camera|image|label|layeredimage|menu|nvl[ \t]+clear|play|queue|scene|screen|show|transform|translate|voice(?:[ \t]+sustain)?|window|frame)\b/g,
         },
         {
-            debugName: "keywords.patterns![4]",
+            debugName: "keywords.patterns![3]",
 
             // [TODO: Should probably only be a keyword in the expression] Renpy sub expression keywords
             token: KeywordTokenType.Other, /*keyword.other.renpy*/
             match: /\b(?<!\.)(?:set|expression|at|with|from|style_prefix|spacing|textbutton)\b/g,
         },
         {
-            debugName: "keywords.patterns![5]",
+            debugName: "keywords.patterns![4]",
 
             // [TODO: Should probably only be a keyword in the expression] Renpy sub expression keywords
             token: KeywordTokenType.Other, /*keyword.control.flow.other.renpy*/
@@ -900,7 +884,7 @@ export const pythonStatements: TokenPattern = {
                             beginCaptures: {
                                 1: { token: KeywordTokenType.In, /*keyword.control.flow.in.renpy*/ },
                             },
-                            end: /(?<=[^ \t])(?!\G)|$/gm,
+                            end: /(?!\G)(?<=[^ \t])|$/gm,
                             patterns: [
                                 {
                                     debugName: "pythonStatements.patterns![1].beginCaptures![8].patterns![0].patterns![0]",
@@ -933,18 +917,33 @@ export const pythonStatements: TokenPattern = {
 };
 
 export const pythonBlockTester: TokenPattern = {
-    debugName: "pythonBlockTester",
-
-    // Check for assignments that support python expressions
-    contentToken: MetaTokenType.PythonExpression, /*meta.python.expression.renpy*/
-    begin: /(?<=(^[ \t]*)(?:image)\b.*?)(=)/dgm,
-    beginCaptures: {
-        2: { token: OperatorTokenType.Assignment, /*keyword.operator.assignment.renpy*/ },
-    },
-    // @ts-ignore: Back references in end patterns are replaced by begin matches at runtime
-    end: /^(?=(?!\1)[ \t]*[^\s#]|\1[^\s#])/gm,
     patterns: [
-    ]
+        {
+            debugName: "pythonBlockTester.patterns![0]",
+
+            // Check for assignments that support python expressions
+            contentToken: MetaTokenType.PythonExpression, /*meta.python.expression.renpy*/
+            begin: /(?<=(^[ \t]*)(?:image)\b.*?)(=)/dgm,
+            beginCaptures: {
+                2: { token: OperatorTokenType.Assignment, /*keyword.operator.assignment.renpy*/ },
+            },
+            // @ts-ignore: Back references in end patterns are replaced by begin matches at runtime
+            end: /^(?=(?!\1)[ \t]*[^\s#]|\1[^\s#])/gm,
+            patterns: [
+            ]
+        },
+        {
+            debugName: "pythonBlockTester.patterns![1]",
+
+            contentToken: MetaTokenType.PythonBlock, /*meta.embedded.block.python*/
+            begin: /(?<=(^[ \t]*).*?python\b\s*)(:)/dgm,
+            beginCaptures: {
+                2: { 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,
+            patterns: []
+        }]
 };
 
 export const define: TokenPattern = {
@@ -1110,15 +1109,32 @@ export const pause: TokenPattern = {
     patterns: [simpleExpression]
 };
 
+export const renpyBlockTester: TokenPattern = {
+    debugName: "renpyBlockTester",
+
+    contentToken: MetaTokenType.RenpyBlock, /*meta.renpy.block.renpy*/
+    begin: /(?<=(^[ \t]*)(?:if|elif|else|for|while)\b.*?)(:)/dgm,
+    beginCaptures: {
+        2: { token: CharacterTokenType.Colon, /*punctuation.section.block.begin.renpy*/ },
+    },
+    // @ts-ignore: Back references in end patterns are replaced by begin matches at runtime
+    end: /^(?=(?!\1)[ \t]*[^\s#]|\1[^\s#])/gm,
+    patterns: [
+    ]
+};
+
 export const conditionals: TokenPattern = {
     debugName: "conditionals",
 
-    match: /(?<=^[ \t]+)(if|elif|else)\b(.*?)(:)/dgm,
-    captures: {
-        1: { token: KeywordTokenType.If, /*keyword.control.conditional.renpy*/ },
-        2: { patterns: [fallbackPatterns] },
-        3: { token: CharacterTokenType.Colon, /*punctuation.section.condition.begin.renpy*/ },
+    begin: /(?<=^[ \t]+)(if|elif|else|while|for)\b/dgm,
+    beginCaptures: {
+        1: { token: MetaTokenType.ControlFlowKeyword, /*keyword.control.flow.renpy*/ },
     },
+    end: /$|^/gm,
+    patterns: [
+        renpyBlockTester,
+        fallbackPatterns,
+    ]
 };
 
 export const atStatement: TokenPattern = {
@@ -1246,7 +1262,7 @@ export const show: TokenPattern = {
             debugName: "show.patterns![0]",
 
             token: MetaTokenType.ShowStatement, /*meta.show.statement.renpy*/
-            begin: /(?<=^[ \t]*)(show)\b[ \t]*/dgm,
+            begin: /(?<=^[ \t]*)(show)\b/dgm,
             beginCaptures: {
                 1: { token: KeywordTokenType.Show, /*keyword.show.renpy*/ },
             },
@@ -1256,9 +1272,16 @@ export const show: TokenPattern = {
                 {
                     debugName: "show.patterns![0].patterns![1]",
 
+                    token: KeywordTokenType.Layer, /*keyword.layer.renpy*/
+                    match: /\b(layer)\b/g,
+                },
+                {
+                    debugName: "show.patterns![0].patterns![2]",
+
                     token: EntityTokenType.ImageName, /*entity.name.type.image.renpy*/
-                    match: /\b(?:[a-zA-Z_0-9]+)\b[ \t]*/g,
+                    match: /\b(?:[a-zA-Z_0-9]+)\b/g,
                 },
+                whitespace,
             ]
         },
         atStatement,
@@ -1267,6 +1290,7 @@ export const show: TokenPattern = {
         behind,
         onlayer,
         zorder,
+        whitespace,
     ]
 };
 
@@ -1280,19 +1304,19 @@ export const window: TokenPattern = {
             beginCaptures: {
                 1: { token: KeywordTokenType.Window, /*keyword.window.renpy*/ },
             },
-            end: /#|$/gm,
+            end: /$/gm,
             patterns: [
                 {
                     debugName: "window.patterns![0].patterns![0]",
 
                     token: KeywordTokenType.Show, /*keyword.show.renpy*/
-                    match: /(show)/g,
+                    match: /\b(show)\b/g,
                 },
                 {
                     debugName: "window.patterns![0].patterns![1]",
 
                     token: KeywordTokenType.Hide, /*keyword.hide.renpy*/
-                    match: /(hide)/g,
+                    match: /\b(hide)\b/g,
                 },
                 whitespace,
                 simpleExpression,
@@ -1537,7 +1561,7 @@ export const callFrom: TokenPattern = {
     beginCaptures: {
         1: { token: KeywordTokenType.From, /*keyword.control.flow.from.renpy*/ },
     },
-    end: /(?<=[^ \t])(?!\G)|$/gm,
+    end: /(?!\G)(?<=[^ \t])|$/gm,
     patterns: [
         labelName,
         fallbackPatterns,
@@ -1569,7 +1593,7 @@ export const call: TokenPattern = {
             beginCaptures: {
                 1: { token: KeywordTokenType.Screen, /*keyword.screen.renpy*/ },
             },
-            end: /(?<=[^ \t])(?!\G)/g,
+            end: /(?!\G)(?<=[^ \t])/g,
             patterns: [
                 {
                     debugName: "call.patterns![3].patterns![0]",
@@ -1631,16 +1655,8 @@ export const menuOption: TokenPattern = {
                         1: { token: KeywordTokenType.If, /*keyword.control.conditional.renpy*/ },
                     },
                     end: /(?=#|:)|$/gm,
-                    patterns: [
-                    ]
-                },
-                {
-                    debugName: "menuOption.beginCaptures![3].patterns![2]",
-
-                    token: MetaTokenType.Invalid, /*invalid.illegal.unexpected-characters-in-menu-arguments.renpy*/
-                    match: /[^ \t]+/g,
-                },
-            ]
+                    patterns: []
+                }]
         },
         4: { token: CharacterTokenType.Colon, /*punctuation.section.menu-option.begin.renpy*/ },
     },
@@ -1668,9 +1684,8 @@ export const menu: TokenPattern = {
 
     token: MetaTokenType.MenuStatement, /*meta.menu.statement.renpy*/
     contentToken: MetaTokenType.MenuBlock, /*meta.menu.block.renpy*/
-    begin: /^([ \t]+)?(menu)[ \t]*(.+)?(:)/dgm,
+    begin: /(?<=(^[ \t]*))(menu)[ \t]*(.+)?(:)/dgm,
     beginCaptures: {
-        1: { token: CharacterTokenType.Whitespace, /*punctuation.whitespace.menu.leading.renpy*/ },
         2: { token: KeywordTokenType.Def, /*storage.type.function.renpy*/ },
         3: {
             patterns: [
@@ -1681,7 +1696,17 @@ export const menu: TokenPattern = {
                     token: EntityTokenType.FunctionName, /*entity.name.function.menu.renpy*/
                     match: /[a-zA-Z_.]\w*/g,
                 },
-            ]
+                {
+                    debugName: "menu.beginCaptures![3].patterns![1]",
+
+                    token: MetaTokenType.FunctionCall, /*meta.function-call.python*/
+                    begin: /(?<=\bmenu\s*)(?=\()/g,
+                    end: /(\))/dg,
+                    endCaptures: {
+                        1: { token: CharacterTokenType.CloseParentheses, /*punctuation.definition.arguments.end.python*/ },
+                    },
+                    patterns: []
+                }]
         },
         4: { token: CharacterTokenType.Colon, /*punctuation.section.menu.begin.renpy*/ },
     },
@@ -1832,6 +1857,8 @@ statements.patterns!.push(renpyStatements, pythonStatements, conditionals, keywo
 expressions.patterns!.push(renpyPythonExpressions, fallbackCharacters);
 renpyOnlyExpressions.patterns!.push(comments, strings, literal);
 fallbackPatterns.patterns!.splice(0, 0, comments);
+simpleExpression.patterns!.splice(7, 0, comments);
 stringsInterior.patterns!.splice(2, 0, stringTags);
 pythonStatements.patterns!.push(define, defaultStatement, oneLinePython, pythonBlockTester);
+renpyBlockTester.patterns!.push(basePatterns);
 menuOption.patterns!.push(basePatterns);
\ No newline at end of file
diff --git a/src/tokenizer/renpy-tokens.ts b/src/tokenizer/renpy-tokens.ts
index 6f536e2..b6fbd9a 100644
--- a/src/tokenizer/renpy-tokens.ts
+++ b/src/tokenizer/renpy-tokens.ts
@@ -64,6 +64,7 @@ export const enum KeywordTokenType {
     Other,
     OtherPython,
     OtherAudio,
+    Layer,
 
     // Renpy style sub-expression keywords
     Take,
@@ -286,6 +287,7 @@ export const enum MetaTokenType {
 
     SimpleExpression,
 
+    RenpyBlock,
     CodeBlock,
     PythonLine,
     PythonBlock,
diff --git a/src/tokenizer/screen-token-patterns.g.ts b/src/tokenizer/screen-token-patterns.g.ts
index 35fb18b..b370771 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 18:50:56 (UTC+0)
+// Last generated: 14/07/2024 12:28:58 (UTC+0)
 
 import { EntityTokenType, CharacterTokenType, KeywordTokenType, MetaTokenType } from "./renpy-tokens";
 import { TokenPattern } from "./token-pattern-types";
diff --git a/src/tokenizer/style-token-patterns.g.ts b/src/tokenizer/style-token-patterns.g.ts
index c4dc072..d0bd725 100644
--- a/src/tokenizer/style-token-patterns.g.ts
+++ b/src/tokenizer/style-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 18:50:56 (UTC+0)
+// Last generated: 14/07/2024 12:28:58 (UTC+0)
 
 import { MetaTokenType, CharacterTokenType, EntityTokenType, KeywordTokenType } from "./renpy-tokens";
 import { TokenPattern } from "./token-pattern-types";
@@ -61,7 +61,7 @@ export const styleClause: TokenPattern = {
             beginCaptures: {
                 1: { token: MetaTokenType.LogicalOperatorKeyword, /*keyword.operator.logical.python*/ },
             },
-            end: /(?<=[^ \t])(?!\G)|$/gm,
+            end: /(?!\G)(?<=[^ \t])|$/gm,
             patterns: [
                 {
                     debugName: "styleClause.patterns![0].patterns![0]",
@@ -84,7 +84,7 @@ export const styleClause: TokenPattern = {
             beginCaptures: {
                 1: { token: KeywordTokenType.Take, /*keyword.take.renpy*/ },
             },
-            end: /(?<=[^ \t])(?!\G)|$/gm,
+            end: /(?!\G)(?<=[^ \t])|$/gm,
             patterns: [
             ]
         },
diff --git a/src/tokenizer/token-definitions.ts b/src/tokenizer/token-definitions.ts
index 1133287..c879479 100644
--- a/src/tokenizer/token-definitions.ts
+++ b/src/tokenizer/token-definitions.ts
@@ -448,6 +448,7 @@ const tokenTypeDefinitions: EnumToString<TypeOfTokenType> = {
     Other: { name: "Other", value: KeywordTokenType.Other },
     OtherPython: { name: "OtherPython", value: KeywordTokenType.OtherPython },
     OtherAudio: { name: "OtherAudio", value: KeywordTokenType.OtherAudio },
+    Layer: { name: "Layer", value: KeywordTokenType.Layer },
 
     Take: { name: "Take", value: KeywordTokenType.Take },
     Del: { name: "Del", value: KeywordTokenType.Del },
@@ -635,6 +636,7 @@ const tokenTypeDefinitions: EnumToString<TypeOfTokenType> = {
 
     SimpleExpression: { name: "SimpleExpression", value: MetaTokenType.SimpleExpression },
 
+    RenpyBlock: { name: "RenpyBlock", value: MetaTokenType.RenpyBlock },
     CodeBlock: { name: "CodeBlock", value: MetaTokenType.CodeBlock },
     PythonLine: { name: "PythonLine", value: MetaTokenType.PythonLine },
     PythonBlock: { name: "PythonBlock", value: MetaTokenType.PythonBlock },
diff --git a/src/tokenizer/token-patterns.g.ts b/src/tokenizer/token-patterns.g.ts
index c40b98b..2246897 100644
--- a/src/tokenizer/token-patterns.g.ts
+++ b/src/tokenizer/token-patterns.g.ts
@@ -3,10 +3,10 @@
 // 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 18:44:34 (UTC+0)
+// Last generated: 14/07/2024 15:10:14 (UTC+0)
 
-import * as AtlPatterns from "./atl-token-patterns.g";
 import * as RenpyPatterns from "./renpy-token-patterns.g";
+import * as AtlPatterns from "./atl-token-patterns.g";
 import * as StylePatterns from "./style-token-patterns.g";
 import * as PythonPatterns from "./python-token-patterns.g";
 import * as ScreenPatterns from "./screen-token-patterns.g";
@@ -19,18 +19,18 @@ RenpyPatterns.parenthesizedPython.patterns![2].patterns!.push(PythonPatterns.exp
 RenpyPatterns.simpleExpression.patterns!.splice(0, 0, PythonPatterns.string);
 RenpyPatterns.simpleExpression.patterns!.splice(3, 0, PythonPatterns.memberAccess);
 RenpyPatterns.simpleExpression.patterns!.splice(4, 0, PythonPatterns.functionCall);
-RenpyPatterns.keywords.patterns![1].patterns!.push(PythonPatterns.expression);
 RenpyPatterns.constantPlaceholder.captures![2].patterns!.push(PythonPatterns.expression);
 RenpyPatterns.pythonStatements.patterns![1].patterns!.push(PythonPatterns.python);
-RenpyPatterns.pythonBlockTester.patterns!.push(PythonPatterns.python);
+RenpyPatterns.pythonBlockTester.patterns![0].patterns!.push(PythonPatterns.python);
+RenpyPatterns.pythonBlockTester.patterns![1].patterns!.push(PythonPatterns.python);
 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(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!.splice(0, 0, PythonPatterns.expression);
+RenpyPatterns.sayStatements.patterns![0].endCaptures![3].patterns!.push(PythonPatterns.oddFunctionCall);
+RenpyPatterns.sayStatements.patterns![1].endCaptures![3].patterns!.push(PythonPatterns.oddFunctionCall);
+RenpyPatterns.conditionals.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);
@@ -39,10 +39,10 @@ RenpyPatterns.label.captures![2].patterns!.splice(1, 0, PythonPatterns.parameter
 RenpyPatterns.returnStatements.patterns!.push(PythonPatterns.expression);
 RenpyPatterns.callJumpExpression.patterns!.push(PythonPatterns.expression);
 RenpyPatterns.callPass.patterns!.splice(0, 0, PythonPatterns.functionArguments);
-RenpyPatterns.menuOption.beginCaptures![3].patterns!.splice(0, 0, PythonPatterns.functionArguments);
+RenpyPatterns.menuOption.beginCaptures![3].patterns!.splice(0, 0, PythonPatterns.oddFunctionCall);
 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.menu.beginCaptures![3].patterns![1].patterns!.push(PythonPatterns.functionArguments);
 RenpyPatterns.audioParams.patterns!.push(PythonPatterns.number);
 RenpyPatterns.play.patterns![0].patterns!.splice(2, 0, PythonPatterns.expression);
 RenpyPatterns.queue.patterns![0].patterns!.splice(2, 0, PythonPatterns.expression);
@@ -83,7 +83,7 @@ AtlPatterns.atlOn.patterns!.push(RenpyPatterns.comments);
 AtlPatterns.atlFunction.captures![2].patterns!.splice(0, 0, PythonPatterns.builtinPossibleCallables);
 AtlPatterns.atlWarperName.patterns!.splice(0, 0, PythonPatterns.builtinPossibleCallables);
 AtlPatterns.atlFallback.patterns!.push(RenpyPatterns.basePatterns);
-AtlPatterns.atlBlockTester.patterns![0].patterns!.push(AtlPatterns.atl);
+AtlPatterns.atlBlockTester.patterns!.push(AtlPatterns.atl);
 
 // Push all ScreenPatterns external includes
 ScreenPatterns.screenDefName.patterns!.splice(0, 0, PythonPatterns.builtinPossibleCallables);
@@ -114,7 +114,10 @@ ScreenPatterns.screenText.patterns![1].patterns!.splice(0, 0, RenpyPatterns.stri
 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);
+ScreenPatterns.screenLanguage.patterns!.splice(0, 0, RenpyPatterns.define);
+ScreenPatterns.screenLanguage.patterns!.splice(1, 0, RenpyPatterns.defaultStatement);
+ScreenPatterns.screenLanguage.patterns!.splice(2, 0, RenpyPatterns.conditionals);
+ScreenPatterns.screenLanguage.patterns!.splice(3, 0, RenpyPatterns.pythonStatements);
 
 // Push all StylePatterns external includes
 StylePatterns.styleBlockTester.patterns![0].patterns!.push(RenpyPatterns.fallbackPatterns);
@@ -140,4 +143,4 @@ PythonPatterns.doubleOneRegexpComments.patterns!.push(RenpyPatterns.codetags);
 PythonPatterns.doubleThreeRegexpComments.patterns!.push(RenpyPatterns.codetags);
 
 
-export { AtlPatterns, RenpyPatterns, StylePatterns, PythonPatterns, ScreenPatterns };
\ No newline at end of file
+export { RenpyPatterns, AtlPatterns, StylePatterns, PythonPatterns, ScreenPatterns };
\ No newline at end of file
diff --git a/src/tokenizer/tokenizer.ts b/src/tokenizer/tokenizer.ts
index c9dfea1..5b79b13 100644
--- a/src/tokenizer/tokenizer.ts
+++ b/src/tokenizer/tokenizer.ts
@@ -434,6 +434,7 @@ class DocumentTokenizer {
                 if (backref !== undefined) {
                     return escapeRegExpCharacters(backref);
                 }
+                logCatMessage(LogLevel.Warning, LogCategory.Tokenizer, `Could not find content to replace backreference ${g1}!`);
                 return "";
             });
 
@@ -448,6 +449,13 @@ class DocumentTokenizer {
         let matchEnd = reEnd.exec(result.source);
         const contentMatches = new Stack<ScanResult>();
 
+        if (!matchEnd) {
+            // If no end match could be found, we'll need to expand the range to the end of the source
+            const reLastChar = /$(?!\r\n|\r|\n)/dg;
+            reLastChar.lastIndex = Math.max(0, result.source.length - 1);
+            matchEnd = reLastChar.exec(result.source);
+        }
+
         if (matchEnd) {
             // Check if any child pattern has content that would extend the currently determined end match
             if (p._patternsRepo) {
@@ -639,7 +647,7 @@ class DocumentTokenizer {
         const contentNode = new TreeNode();
 
         // p.contentToken matches the range 'between'; after the end of beginMatch and before the start of endMatch
-        if (p.contentToken) {
+        if (p.contentToken && contentStart !== contentEnd) {
             contentNode.token = new Token(p.contentToken, this.positionAt(contentStart), this.positionAt(contentEnd));
         }
 
@@ -742,10 +750,16 @@ class DocumentTokenizer {
         while (lastMatchIndex < lastCharIndex) {
             const bestMatch = this.scanPattern(pattern, source, lastMatchIndex, cache);
 
-            if (!bestMatch || bestMatch.matchBegin.index >= lastCharIndex) {
+            if (!bestMatch) {
                 break; // No valid match was found in the remaining text. Break the loop
             }
 
+            const matchBegin = bestMatch.matchBegin;
+            const beginMatchEnd = matchBegin.index + matchBegin[0].length;
+            if (matchBegin.index >= lastCharIndex || beginMatchEnd > lastCharIndex) {
+                break;
+            }
+
             const failSafeIndex = lastMatchIndex; // Debug index to break in case of an infinite loop
 
             if (bestMatch.pattern._patternType === TokenPatternType.RangePattern) {
@@ -756,8 +770,7 @@ class DocumentTokenizer {
                 const matchEnd = bestMatch.matchEnd!;
                 lastMatchIndex = matchEnd.index + matchEnd[0].length;
             } else {
-                const matchBegin = bestMatch.matchBegin;
-                lastMatchIndex = matchBegin.index + matchBegin[0].length;
+                lastMatchIndex = beginMatchEnd;
             }
 
             if (failSafeIndex === lastMatchIndex) {
diff --git a/syntaxes/renpy.atl.tmLanguage.json b/syntaxes/renpy.atl.tmLanguage.json
index 7e3bbb4..727ef75 100644
--- a/syntaxes/renpy.atl.tmLanguage.json
+++ b/syntaxes/renpy.atl.tmLanguage.json
@@ -378,17 +378,13 @@
     },
 
     "atl-block-tester": {
-      "patterns": [
-        {
-          "contentName": "meta.atl-block.renpy",
-          "begin": "(?<=(^[ \\t]*)(?:camera|image|show|scene|transform|on|block|parallel|contains|choice)\\b.*?)(:)",
-          "beginCaptures": {
-            "2": { "name": "punctuation.section.atl.begin.renpy" }
-          },
-          "end": "^(?=(?!\\1)[ \\t]*[^\\s#]|\\1[^\\s#])",
-          "patterns": [ { "include": "source.renpy.atl" } ]
-        }
-      ]
+      "contentName": "meta.atl-block.renpy",
+      "begin": "(?<=(^[ \\t]*)(?:camera|image|show|scene|transform|on|block|parallel|contains|choice)\\b.*?)(:)",
+      "beginCaptures": {
+        "2": { "name": "punctuation.section.atl.begin.renpy" }
+      },
+      "end": "^(?=(?!\\1)[ \\t]*[^\\s#]|\\1[^\\s#])",
+      "patterns": [ { "include": "source.renpy.atl" } ]
     },
 
     "transform": {
diff --git a/syntaxes/renpy.python.tmLanguage.json b/syntaxes/renpy.python.tmLanguage.json
index 03b450d..1b424d1 100644
--- a/syntaxes/renpy.python.tmLanguage.json
+++ b/syntaxes/renpy.python.tmLanguage.json
@@ -97,7 +97,7 @@
       ]
     },
     "docstring-statement": {
-      "begin": "^(?=\\s*[rR]?(\\'\\'\\'|\\\"\\\"\\\"|\\'|\\\"))",
+      "begin": "(?<=^[ \\t]*)(?=[rR]?(\\'\\'\\'|\\\"\\\"\\\"|\\'|\\\"))",
       "comment": "the string either terminates correctly or by the beginning of a new line (this is for single line docstrings that aren't terminated) AND it's not followed by another docstring",
       "end": "((?<=\\1)|^)(?!\\s*[rR]?(\\'\\'\\'|\\\"\\\"\\\"|\\'|\\\"))",
       "patterns": [ { "include": "#docstring" } ]
@@ -315,7 +315,7 @@
     "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)\"",
       "name": "meta.function-call.python",
-      "begin": "(?<=\\]|\\))\\s*(?=\\()",
+      "begin": "(?<=\\]|\\)|\")\\s*(?=\\()",
       "end": "(\\))",
       "endCaptures": {
         "1": { "name": "punctuation.definition.arguments.end.python" }
@@ -419,21 +419,21 @@
     },
     "number-hex": {
       "name": "constant.numeric.hex.python",
-      "match": "(?<![\\w.])(0[xX])(_?[0-9a-fA-F])+\\b",
+      "match": "(?<![\\w.])(0[xX])(?:_?[0-9a-fA-F])+\\b",
       "captures": {
         "1": { "name": "storage.type.number.python" }
       }
     },
     "number-oct": {
       "name": "constant.numeric.oct.python",
-      "match": "(?<![\\w.])(0[oO])(_?[0-7])+\\b",
+      "match": "(?<![\\w.])(0[oO])(?:_?[0-7])+\\b",
       "captures": {
         "1": { "name": "storage.type.number.python" }
       }
     },
     "number-bin": {
       "name": "constant.numeric.bin.python",
-      "match": "(?<![\\w.])(0[bB])(_?[01])+\\b",
+      "match": "(?<![\\w.])(0[bB])(?:_?[01])+\\b",
       "captures": {
         "1": { "name": "storage.type.number.python" }
       }
@@ -441,9 +441,9 @@
     "number-long": {
       "name": "constant.numeric.bin.python",
       "comment": "this is to support python2 syntax for long ints",
-      "match": "(?<![\\w.])([1-9][0-9]*|0)([lL])\\b",
+      "match": "(?<![\\w.])(?:[1-9][0-9]*|0)([lL])\\b",
       "captures": {
-        "2": { "name": "storage.type.number.python" }
+        "1": { "name": "storage.type.number.python" }
       }
     },
     "regexp": {
@@ -530,7 +530,7 @@
     },
     "string-formatting": {
       "name": "meta.format.percent.python",
-      "match": "(%(\\([\\w\\s]*\\))?[-+#0 ]*(\\d+|\\*)?(\\.(\\d+|\\*))?([hlL])?[diouxXeEfFgGcrsab%])",
+      "match": "(%(?:\\([\\w\\s]*\\))?[-+#0 ]*(?:\\d+|\\*)?(?:\\.(?:\\d+|\\*))?(?:[hlL])?[diouxXeEfFgGcrsab%])",
       "captures": {
         "1": { "name": "constant.character.format.placeholder.other.python" }
       }
@@ -997,10 +997,11 @@
         { "include": "#lambda-incomplete" },
         { "include": "#illegal-names" },
         {
-          "match": "\\b([[:alpha:]_]\\w*)\\s*(=)(?!=)",
+          "match": "\\b([[:alpha:]_]\\w*)(\\s+)?(=)(?!=)",
           "captures": {
             "1": { "name": "variable.parameter.function-call.python" },
-            "2": { "name": "keyword.operator.assignment.python" }
+            "2": { "name": "punctuation.whitespace.python" },
+            "3": { "name": "keyword.operator.assignment.python" }
           }
         },
         {
@@ -2000,7 +2001,7 @@
       "patterns": [ { "include": "#string-raw-bin-guts" } ]
     },
     "string-quoted-single-line": {
-      "name": "string.quoted.single.test.python",
+      "name": "string.quoted.single.python",
       "begin": "(?:\\b([rR])(?=[uU]))?([uU])?(['\"])",
       "end": "(\\3)|((?<!\\\\)\\n)",
       "beginCaptures": {
diff --git a/syntaxes/renpy.screen.tmLanguage.json b/syntaxes/renpy.screen.tmLanguage.json
index d401260..4b34e05 100644
--- a/syntaxes/renpy.screen.tmLanguage.json
+++ b/syntaxes/renpy.screen.tmLanguage.json
@@ -312,7 +312,10 @@
     "screen-language": {
       "comment": "https://www.renpy.org/doc/html/screens.html#screen-language",
       "patterns": [
+        { "include": "source.renpy#define" },
+        { "include": "source.renpy#default-statement" },
         { "include": "source.renpy#conditionals" },
+        { "include": "source.renpy#python-statements" },
         { "include": "#screen-frame" },
         { "include": "#screen-window" },
         { "include": "#screen-box" },
diff --git a/syntaxes/renpy.style.tmLanguage.json b/syntaxes/renpy.style.tmLanguage.json
index 4ba421a..d2d9ee0 100644
--- a/syntaxes/renpy.style.tmLanguage.json
+++ b/syntaxes/renpy.style.tmLanguage.json
@@ -49,7 +49,7 @@
           "beginCaptures": {
             "1": { "name": "keyword.operator.logical.python" }
           },
-          "end": "(?<=[^ \\t])(?!\\G)|$",
+          "end": "(?!\\G)(?<=[^ \\t])|$",
           "patterns": [
             {
               "name": "entity.name.type.style.base.renpy",
@@ -67,7 +67,7 @@
           "beginCaptures": {
             "1": { "name": "keyword.take.renpy" }
           },
-          "end": "(?<=[^ \\t])(?!\\G)|$",
+          "end": "(?!\\G)(?<=[^ \\t])|$",
           "patterns": [
             { "include": "source.renpy#name" },
             { "include": "source.renpy#fallback-patterns" }
diff --git a/syntaxes/renpy.tmLanguage.json b/syntaxes/renpy.tmLanguage.json
index 350ec99..d4d2dae 100644
--- a/syntaxes/renpy.tmLanguage.json
+++ b/syntaxes/renpy.tmLanguage.json
@@ -218,6 +218,7 @@
         { "include": "source.renpy.python#function-call" },
         { "include": "#identifier" },
         { "include": "#parenthesized-python" },
+        { "include": "#comments" },
         { "include": "#whitespace" }
       ]
     },
@@ -228,21 +229,7 @@
         {
           "comment": "Control flow keywords",
           "name": "keyword.control.flow.renpy",
-          "match": "\\b(?<!\\.)(?:pass|return|pause)\\b"
-        },
-        {
-          "comment": "Control flow keywords with block",
-          "begin": "\\b(?<!\\.)(?:(if|elif|else)|(for|while))\\b",
-          "contentName": "meta.embedded.line.python",
-          "beginCaptures": {
-            "1": { "name": "keyword.control.conditional.renpy" },
-            "2": { "name": "keyword.control.flow.renpy" }
-          },
-          "end": ":|$",
-          "endCaptures": {
-            "0": { "name": "punctuation.section.block.begin.renpy" }
-          },
-          "patterns": [ { "include": "#expressions" }, { "include": "source.renpy.python#expression" } ]
+          "match": "\\b(?<!\\.)(?:pass|return|pause|if|elif|else|while|for)\\b"
         },
         {
           "comment": "Python statement keywords",
@@ -730,7 +717,7 @@
                   "beginCaptures": {
                     "1": { "name": "keyword.control.flow.in.renpy" }
                   },
-                  "end": "(?<=[^ \\t])(?!\\G)|$",
+                  "end": "(?!\\G)(?<=[^ \\t])|$",
                   "patterns": [
                     {
                       "name": "entity.name.namespace",
@@ -762,14 +749,27 @@
       ]
     },
     "python-block-tester": {
-      "comment": "Check for assignments that support python expressions",
-      "contentName": "meta.python.expression.renpy",
-      "begin": "(?<=(^[ \\t]*)(?:image)\\b.*?)(=)",
-      "beginCaptures": {
-        "2": { "name": "keyword.operator.assignment.renpy" }
-      },
-      "end": "^(?=(?!\\1)[ \\t]*[^\\s#]|\\1[^\\s#])",
-      "patterns": [ { "include": "source.renpy.python" } ]
+      "patterns": [
+        {
+          "comment": "Check for assignments that support python expressions",
+          "contentName": "meta.python.expression.renpy",
+          "begin": "(?<=(^[ \\t]*)(?:image)\\b.*?)(=)",
+          "beginCaptures": {
+            "2": { "name": "keyword.operator.assignment.renpy" }
+          },
+          "end": "^(?=(?!\\1)[ \\t]*[^\\s#]|\\1[^\\s#])",
+          "patterns": [ { "include": "source.renpy.python" } ]
+        },
+        {
+          "contentName": "meta.embedded.block.python",
+          "begin": "(?<=(^[ \\t]*).*?python\\b\\s*)(:)",
+          "beginCaptures": {
+            "2": { "name": "punctuation.section.python.begin.renpy" }
+          },
+          "end": "^(?=(?!\\1)[ \\t]*[^\\s#]|\\1[^\\s#])",
+          "patterns": [ { "include": "source.renpy.python" } ]
+        }
+      ]
     },
 
     "define": {
@@ -875,7 +875,7 @@
             "1": { "name": "string.quoted.renpy punctuation.definition.string.end.renpy" },
             "2": { "name": "meta.empty-string.renpy" },
             "3": {
-              "patterns": [ { "include": "source.renpy.python#function-arguments" } ]
+              "patterns": [ { "include": "source.renpy.python#odd-function-call" } ]
             }
           },
           "patterns": [ { "include": "#strings-interior" } ]
@@ -892,7 +892,7 @@
             "1": { "name": "string.quoted.renpy punctuation.definition.string.end.renpy" },
             "2": { "name": "meta.empty-string.renpy" },
             "3": {
-              "patterns": [ { "include": "source.renpy.python#function-arguments" } ]
+              "patterns": [ { "include": "source.renpy.python#odd-function-call" } ]
             }
           },
           "patterns": [ { "include": "#strings-interior" } ]
@@ -912,18 +912,27 @@
       "patterns": [ { "include": "#simple-expression" } ]
     },
 
+    "renpy-block-tester": {
+      "contentName": "meta.renpy.block.renpy",
+      "begin": "(?<=(^[ \\t]*)(?:if|elif|else|for|while)\\b.*?)(:)",
+      "beginCaptures": {
+        "2": { "name": "punctuation.section.block.begin.renpy" }
+      },
+      "end": "^(?=(?!\\1)[ \\t]*[^\\s#]|\\1[^\\s#])",
+      "patterns": [ { "include": "#base-patterns" } ]
+    },
+
     "conditionals": {
-      "match": "(?<=^[ \\t]+)(if|elif|else)\\b(.*?)(:)",
-      "captures": {
-        "1": { "name": "keyword.control.conditional.renpy" },
-        "2": {
-          "patterns": [
-            { "include": "source.renpy.python#expression" },
-            { "include": "#fallback-patterns" }
-          ]
-        },
-        "3": { "name": "punctuation.section.condition.begin.renpy" }
-      }
+      "begin": "(?<=^[ \\t]+)(if|elif|else|while|for)\\b",
+      "beginCaptures": {
+        "1": { "name": "keyword.control.flow.renpy" }
+      },
+      "end": "$|^",
+      "patterns": [
+        { "include": "source.renpy.python#expression" },
+        { "include": "#renpy-block-tester" },
+        { "include": "#fallback-patterns" }
+      ]
     },
 
     "at-statement": {
@@ -1017,7 +1026,7 @@
       "patterns": [
         {
           "name": "meta.show.statement.renpy",
-          "begin": "(?<=^[ \\t]*)(show)\\b[ \\t]*",
+          "begin": "(?<=^[ \\t]*)(show)\\b",
           "beginCaptures": {
             "1": { "name": "keyword.show.renpy" }
           },
@@ -1025,9 +1034,14 @@
           "patterns": [
             { "include": "#strings" },
             {
-              "match": "\\b(?:[a-zA-Z_0-9]+)\\b[ \\t]*",
+              "name": "keyword.layer.renpy",
+              "match": "\\b(layer)\\b"
+            },
+            {
+              "match": "\\b(?:[a-zA-Z_0-9]+)\\b",
               "name": "entity.name.type.image.renpy"
-            }
+            },
+            { "include": "#whitespace" }
           ]
         },
         { "include": "#at-statement" },
@@ -1035,7 +1049,8 @@
         { "include": "#with-statement" },
         { "include": "#behind" },
         { "include": "#onlayer" },
-        { "include": "#zorder" }
+        { "include": "#zorder" },
+        { "include": "#whitespace" }
       ]
     },
     "window": {
@@ -1046,15 +1061,15 @@
           "beginCaptures": {
             "1": { "name": "keyword.window.renpy" }
           },
-          "end": "#|$",
+          "end": "$",
           "patterns": [
             {
               "name": "keyword.show.renpy",
-              "match": "(show)"
+              "match": "\\b(show)\\b"
             },
             {
               "name": "keyword.hide.renpy",
-              "match": "(hide)"
+              "match": "\\b(hide)\\b"
             },
             { "include": "#whitespace" },
             { "include": "#simple-expression" }
@@ -1246,7 +1261,7 @@
       "beginCaptures": {
         "1": { "name": "keyword.control.flow.from.renpy" }
       },
-      "end": "(?<=[^ \\t])(?!\\G)|$",
+      "end": "(?!\\G)(?<=[^ \\t])|$",
       "patterns": [
         { "include": "#label-name" },
         { "include": "#fallback-patterns" }
@@ -1273,7 +1288,7 @@
           "beginCaptures": {
             "1": { "name": "keyword.screen.renpy" }
           },
-          "end": "(?<=[^ \\t])(?!\\G)",
+          "end": "(?!\\G)(?<=[^ \\t])",
           "patterns": [
             {
               "comment": "Label expression",
@@ -1309,7 +1324,7 @@
         "3": {
           "name": "meta.embedded.line.python",
           "patterns": [
-            { "include": "source.renpy.python#function-arguments" },
+            { "include": "source.renpy.python#odd-function-call" },
             {
               "comment": "if condition",
               "begin": "\\b(if)\\b",
@@ -1318,10 +1333,6 @@
               },
               "end": "(?=#|:)|$",
               "patterns": [ { "include": "source.renpy.python#expression" } ]
-            },
-            {
-              "match": "[^ \\t]+",
-              "name": "invalid.illegal.unexpected-characters-in-menu-arguments.renpy"
             }
           ]
         },
@@ -1342,9 +1353,8 @@
     "menu": {
       "name": "meta.menu.statement.renpy",
       "contentName": "meta.menu.block.renpy",
-      "begin": "^([ \\t]+)?(menu)[ \\t]*(.+)?(:)",
+      "begin": "(?<=(^[ \\t]*))(menu)[ \\t]*(.+)?(:)",
       "beginCaptures": {
-        "1": { "name": "punctuation.whitespace.menu.leading.renpy" },
         "2": { "name": "storage.type.function.renpy" },
         "3": {
           "patterns": [
@@ -1353,7 +1363,15 @@
               "match": "[a-zA-Z_.]\\w*",
               "name": "entity.name.function.menu.renpy"
             },
-            { "include": "source.renpy.python#function-arguments" }
+            {
+              "name": "meta.function-call.python",
+              "begin": "(?<=\\bmenu\\s*)(?=\\()",
+              "end": "(\\))",
+              "endCaptures": {
+                "1": { "name": "punctuation.definition.arguments.end.python" }
+              },
+              "patterns": [ { "include": "source.renpy.python#function-arguments" } ]
+            }
           ]
         },
         "4": { "name": "punctuation.section.menu.begin.renpy" }