From 07a6d838397ac9125931d266557fa854f7899f59 Mon Sep 17 00:00:00 2001
From: duckdoom4 <60387522+duckdoom4@users.noreply.github.com>
Date: Wed, 7 Aug 2024 18:43:15 +0200
Subject: [PATCH] Regenerate token patterns

---
 src/tokenizer/atl-token-patterns.g.ts    |  40 +-
 src/tokenizer/python-token-patterns.g.ts |   6 +-
 src/tokenizer/renpy-token-patterns.g.ts  | 532 ++++++++++++++++-------
 src/tokenizer/screen-token-patterns.g.ts | 128 +++---
 src/tokenizer/style-token-patterns.g.ts  |   4 +-
 src/tokenizer/token-patterns.g.ts        |  21 +-
 6 files changed, 475 insertions(+), 256 deletions(-)

diff --git a/src/tokenizer/atl-token-patterns.g.ts b/src/tokenizer/atl-token-patterns.g.ts
index c37789d..ca8524c 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: 14/07/2024 12:28:58 (UTC+0)
+// Last generated: 07/08/2024 16:42:09 (UTC+0)
 
 import { KeywordTokenType, EntityTokenType, MetaTokenType, CharacterTokenType } from "./renpy-tokens";
 import { TokenPattern } from "./token-pattern-types";
@@ -35,91 +35,91 @@ export const atlBuildInProperties: TokenPattern = {
             debugName: "atlBuildInProperties.patterns![1]",
 
             // position props (int, absolute, or a float)
-            token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.atl.renpy support.type.property-name.atl.renpy entity.name.tag.css.atl.renpy*/
             match: /\b(?<!\.)(?:xpos|ypos|xanchor|yanchor|xcenter|ycenter|radius)\b/g,
         },
         {
             debugName: "atlBuildInProperties.patterns![2]",
 
             // position pair props
-            token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.atl.renpy support.type.property-name.atl.renpy entity.name.tag.css.atl.renpy*/
             match: /\b(?<!\.)(?:pos|anchor|xycenter|around|alignaround|matrixanchor)\b/g,
         },
         {
             debugName: "atlBuildInProperties.patterns![3]",
 
             // float props
-            token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.atl.renpy support.type.property-name.atl.renpy entity.name.tag.css.atl.renpy*/
             match: /\b(?<!\.)(?:xalign|yalign|zoom|xzoom|yzoom|alpha|additive|angle|delay|events|zpos)\b/g,
         },
         {
             debugName: "atlBuildInProperties.patterns![4]",
 
             // float pair props
-            token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.atl.renpy support.type.property-name.atl.renpy entity.name.tag.css.atl.renpy*/
             match: /\b(?<!\.)(?:align|knot)\b/g,
         },
         {
             debugName: "atlBuildInProperties.patterns![5]",
 
             // int props
-            token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.atl.renpy support.type.property-name.atl.renpy entity.name.tag.css.atl.renpy*/
             match: /\b(?<!\.)(?:xoffset|yoffset|xtile|ytile)\b/g,
         },
         {
             debugName: "atlBuildInProperties.patterns![6]",
 
             // int pair props
-            token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.atl.renpy support.type.property-name.atl.renpy entity.name.tag.css.atl.renpy*/
             match: /\b(?<!\.)(?:offset)\b/g,
         },
         {
             debugName: "atlBuildInProperties.patterns![7]",
 
             // boolean props
-            token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.atl.renpy support.type.property-name.atl.renpy entity.name.tag.css.atl.renpy*/
             match: /\b(?<!\.)(?:rotate_pad|transform_anchor|nearest|crop_relative|subpixel|zzoom)\b/g,
         },
         {
             debugName: "atlBuildInProperties.patterns![8]",
 
             // ('#float' | None)
-            token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.atl.renpy support.type.property-name.atl.renpy entity.name.tag.css.atl.renpy*/
             match: /\b(?<!\.)(?:rotate|xpan|ypan|blur)\b/g,
         },
         {
             debugName: "atlBuildInProperties.patterns![9]",
 
             // ('#position' | None)
-            token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.atl.renpy support.type.property-name.atl.renpy entity.name.tag.css.atl.renpy*/
             match: /\b(?<!\.)(?:xsize|ysize)\b/g,
         },
         {
             debugName: "atlBuildInProperties.patterns![10]",
 
             // ('\(int, int, int, int\)' | '\(float, float, float, float\)' | None)
-            token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.atl.renpy support.type.property-name.atl.renpy entity.name.tag.css.atl.renpy*/
             match: /\b(?<!\.)(?:crop)\b/g,
         },
         {
             debugName: "atlBuildInProperties.patterns![11]",
 
             // ('\(int, int\)' | None)
-            token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.atl.renpy support.type.property-name.atl.renpy entity.name.tag.css.atl.renpy*/
             match: /\b(?<!\.)(?:corner1|corner2)\b/g,
         },
         {
             debugName: "atlBuildInProperties.patterns![12]",
 
             // ('\(position, position\)' | None)
-            token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.atl.renpy support.type.property-name.atl.renpy entity.name.tag.css.atl.renpy*/
             match: /\b(?<!\.)(?:xysize)\b/g,
         },
         {
             debugName: "atlBuildInProperties.patterns![13]",
 
             // ('#string' | None)
-            token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.atl.renpy support.type.property-name.atl.renpy entity.name.tag.css.atl.renpy*/
             match: /\b(?<!\.)(?:fit)\b/g,
         },
         {
@@ -133,21 +133,21 @@ export const atlBuildInProperties: TokenPattern = {
             debugName: "atlBuildInProperties.patterns![15]",
 
             // ('#Matrix' | '#MatrixColor' | None)
-            token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.atl.renpy support.type.property-name.atl.renpy entity.name.tag.css.atl.renpy*/
             match: /\b(?<!\.)(?:matrixcolor)\b/g,
         },
         {
             debugName: "atlBuildInProperties.patterns![16]",
 
             // ('#Matrix' | '#TransformMatrix' | None)
-            token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.atl.renpy support.type.property-name.atl.renpy entity.name.tag.css.atl.renpy*/
             match: /\b(?<!\.)(?:matrixtransform)\b/g,
         },
         {
             debugName: "atlBuildInProperties.patterns![17]",
 
             // ('#bool' | '#float' | '\(float, float, float\)')
-            token: EntityTokenType.TagName, /*support.type.property-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.atl.renpy support.type.property-name.atl.renpy entity.name.tag.css.atl.renpy*/
             match: /\b(?<!\.)(?:perspective)\b/g,
         },
     ]
@@ -295,7 +295,7 @@ export const atlOn: TokenPattern = {
     contentToken: MetaTokenType.ATLOnParameters, /*meta.atl.on.parameters.renpy*/
     begin: /(?<=^[ \t]*)(on)\b[ \t]*/dgm,
     beginCaptures: {
-        1: { token: KeywordTokenType.On, /*keyword.on.renpy*/ },
+        1: { token: KeywordTokenType.On, /*keyword.control.flow.on.renpy*/ },
     },
     end: /(?=#|:)|$/gm,
     patterns: [
@@ -450,7 +450,7 @@ export const transform: TokenPattern = {
 
     token: MetaTokenType.TransformStatement, /*meta.transform.statement.renpy*/
     contentToken: MetaTokenType.TransformParameters, /*meta.transform.parameters.renpy*/
-    begin: /(?<=^[ \t]*)(transform)\b[ \t]*/dgm,
+    begin: /(?<=^[ \t]*)(transform)\b/dgm,
     beginCaptures: {
         1: { token: KeywordTokenType.Transform, /*keyword.transform.renpy*/ },
     },
@@ -459,7 +459,7 @@ export const transform: TokenPattern = {
         {
             debugName: "transform.patterns![0]",
 
-            token: EntityTokenType.Identifier, /*variable.name.transform.renpy*/
+            token: EntityTokenType.TransformName, /*entity.name.type.transform.renpy*/
             match: /\b([a-zA-Z_]\w*)\b/g,
         },
     ]
diff --git a/src/tokenizer/python-token-patterns.g.ts b/src/tokenizer/python-token-patterns.g.ts
index ef5b6ce..2ece275 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: 14/07/2024 12:28:58 (UTC+0)
+// Last generated: 07/08/2024 16:42:09 (UTC+0)
 
 import { MetaTokenType, KeywordTokenType, CharacterTokenType, EntityTokenType, OperatorTokenType, LiteralTokenType } from "./renpy-tokens";
 import { TokenPattern } from "./token-pattern-types";
@@ -896,7 +896,7 @@ export const lambdaParameterWithDefault: TokenPattern = {
     begin: /\b([a-zA-Z_]\w*)\s*(=)/dg,
     beginCaptures: {
         1: { token: EntityTokenType.Identifier, /*variable.parameter.function.language.python*/ },
-        2: { token: MetaTokenType.Operator, /*keyword.operator.python*/ },
+        2: { token: OperatorTokenType.Assignment, /*keyword.operator.assignment.python*/ },
     },
     end: /(,)|(?=:|$)/dgm,
     endCaptures: {
@@ -1003,7 +1003,7 @@ export const looseDefault: TokenPattern = {
 
     begin: /(=)/dg,
     beginCaptures: {
-        1: { token: MetaTokenType.Operator, /*keyword.operator.python*/ },
+        1: { token: OperatorTokenType.Assignment, /*keyword.operator.assignment.python*/ },
     },
     end: /(,)|(?=\))/dg,
     endCaptures: {
diff --git a/src/tokenizer/renpy-token-patterns.g.ts b/src/tokenizer/renpy-token-patterns.g.ts
index b4a5ddf..3830dd6 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: 14/07/2024 15:10:14 (UTC+0)
+// Last generated: 07/08/2024 16:42:09 (UTC+0)
 
 import { MetaTokenType, CharacterTokenType, LiteralTokenType, EntityTokenType, KeywordTokenType, EscapedCharacterTokenType, OperatorTokenType } from "./renpy-tokens";
 import { TokenPattern } from "./token-pattern-types";
@@ -33,7 +33,7 @@ export const invalidToken: TokenPattern = {
     debugName: "invalidToken",
 
     token: MetaTokenType.Invalid, /*invalid.unknown.token.renpy*/
-    match: /.+/g,
+    match: /\b\w+\b|.+?/g,
 };
 
 export const newLine: TokenPattern = {
@@ -50,121 +50,127 @@ export const whitespace: TokenPattern = {
     match: /[ \t]+/g,
 };
 
-export const fallbackCharacters: TokenPattern = {
+export const singleCharacters: TokenPattern = {
     // NOTE: Having these patterns separated increases performance. Benchmark before making a change!
     patterns: [
         newLine,
         whitespace,
         {
-            debugName: "fallbackCharacters.patterns![2]",
+            debugName: "singleCharacters.patterns![2]",
 
             token: CharacterTokenType.OpenParentheses, /*punctuation.parenthesis.begin.renpy*/
             match: /\(/g,
         },
         {
-            debugName: "fallbackCharacters.patterns![3]",
+            debugName: "singleCharacters.patterns![3]",
 
             token: CharacterTokenType.CloseParentheses, /*punctuation.parenthesis.end.renpy*/
             match: /\)/g,
         },
         {
-            debugName: "fallbackCharacters.patterns![4]",
+            debugName: "singleCharacters.patterns![4]",
 
             token: CharacterTokenType.OpenBracket, /*punctuation.bracket.begin.renpy*/
             match: /{/g,
         },
         {
-            debugName: "fallbackCharacters.patterns![5]",
+            debugName: "singleCharacters.patterns![5]",
 
             token: CharacterTokenType.CloseBracket, /*punctuation.bracket.end.renpy*/
             match: /}/g,
         },
         {
-            debugName: "fallbackCharacters.patterns![6]",
+            debugName: "singleCharacters.patterns![6]",
 
             token: CharacterTokenType.OpenSquareBracket, /*punctuation.square-bracket.begin.renpy*/
             match: /\[/g,
         },
         {
-            debugName: "fallbackCharacters.patterns![7]",
+            debugName: "singleCharacters.patterns![7]",
 
             token: CharacterTokenType.CloseSquareBracket, /*punctuation.square-bracket.end.renpy*/
             match: /\]/g,
         },
         {
-            debugName: "fallbackCharacters.patterns![8]",
+            debugName: "singleCharacters.patterns![8]",
 
             token: CharacterTokenType.Dot, /*punctuation.dot.renpy*/
             match: /\./g,
         },
         {
-            debugName: "fallbackCharacters.patterns![9]",
+            debugName: "singleCharacters.patterns![9]",
 
             token: CharacterTokenType.Colon, /*punctuation.colon.renpy*/
             match: /:/g,
         },
         {
-            debugName: "fallbackCharacters.patterns![10]",
+            debugName: "singleCharacters.patterns![10]",
 
             token: CharacterTokenType.Semicolon, /*punctuation.semicolon.renpy*/
             match: /;/g,
         },
         {
-            debugName: "fallbackCharacters.patterns![11]",
+            debugName: "singleCharacters.patterns![11]",
 
             token: CharacterTokenType.Comma, /*punctuation.comma.renpy*/
             match: /,/g,
         },
         {
-            debugName: "fallbackCharacters.patterns![12]",
+            debugName: "singleCharacters.patterns![12]",
 
             token: CharacterTokenType.Hashtag, /*punctuation.hashtag.renpy*/
             match: /#/g,
         },
         {
-            debugName: "fallbackCharacters.patterns![13]",
+            debugName: "singleCharacters.patterns![13]",
 
             token: CharacterTokenType.Quote, /*punctuation.quote.renpy*/
             match: /'/g,
         },
         {
-            debugName: "fallbackCharacters.patterns![14]",
+            debugName: "singleCharacters.patterns![14]",
 
             token: CharacterTokenType.DoubleQuote, /*punctuation.double-quote.renpy*/
             match: /"/g,
         },
         {
-            debugName: "fallbackCharacters.patterns![15]",
+            debugName: "singleCharacters.patterns![15]",
 
             token: CharacterTokenType.BackQuote, /*punctuation.back-quote.renpy*/
             match: /`/g,
         },
         {
-            debugName: "fallbackCharacters.patterns![16]",
+            debugName: "singleCharacters.patterns![16]",
 
             token: CharacterTokenType.Backslash, /*punctuation.backslash.renpy*/
             match: /\\/g,
         },
         {
-            debugName: "fallbackCharacters.patterns![17]",
+            debugName: "singleCharacters.patterns![17]",
 
             token: CharacterTokenType.ForwardSlash, /*punctuation.forward-slash.renpy*/
             match: /\//g,
         },
         {
-            debugName: "fallbackCharacters.patterns![18]",
+            debugName: "singleCharacters.patterns![18]",
 
             token: CharacterTokenType.EqualsSymbol, /*punctuation.equals-symbol.renpy*/
             match: /=/g,
         },
+    ]
+};
+
+export const fallbackPatterns: TokenPattern = {
+    patterns: [
+        singleCharacters,
         {
-            debugName: "fallbackCharacters.patterns![19]",
+            debugName: "fallbackPatterns.patterns![2]",
 
             token: MetaTokenType.Invalid, /*debug.invalid.illegal.unmatched.renpy*/
             match: /\b\w+\b/g,
         },
         {
-            debugName: "fallbackCharacters.patterns![20]",
+            debugName: "fallbackPatterns.patterns![3]",
 
             token: CharacterTokenType.Unknown, /*punctuation.unknown.renpy*/
             match: /./g,
@@ -172,8 +178,11 @@ export const fallbackCharacters: TokenPattern = {
     ]
 };
 
-export const fallbackPatterns: TokenPattern = {
-    patterns: [fallbackCharacters]
+export const fallbackPatternsWithError: TokenPattern = {
+    patterns: [
+        singleCharacters,
+        invalidToken,
+    ]
 };
 
 export const literal: TokenPattern = {
@@ -316,7 +325,7 @@ export const keywords: TokenPattern = {
 
             // 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,
+            match: /\b(?<!\.)(?:camera|image|label|layeredimage|menu|nvl[ \t]+clear|play|queue|scene|screen|show|transform|translate|voice(?:[ \t]+sustain)?)\b/g,
         },
         {
             debugName: "keywords.patterns![3]",
@@ -376,7 +385,7 @@ export const comments: TokenPattern = {
 export const escapedChar: TokenPattern = {
     debugName: "escapedChar",
 
-    match: /(\\")|(\\')|(\\ )|(\\n)|(\\\\)|(\[\[)|({{)/dg,
+    match: /(\\")|(\\')|(\\ )|(\\n)|(\\\\)|(\[\[)|({{)|(%%)/dg,
     captures: {
         1: { token: EscapedCharacterTokenType.EscDoubleQuote, /*constant.character.escape.double-quote.python.renpy*/ },
         2: { token: EscapedCharacterTokenType.EscQuote, /*constant.character.escape.quote.python.renpy*/ },
@@ -385,6 +394,7 @@ export const escapedChar: TokenPattern = {
         5: { token: EscapedCharacterTokenType.EscBackslash, /*constant.character.escape.backslash.python.renpy*/ },
         6: { token: EscapedCharacterTokenType.EscOpenBracket, /*constant.character.escape.open.bracket.python.renpy*/ },
         7: { token: EscapedCharacterTokenType.EscOpenSquareBracket, /*constant.character.escape.open.square-bracket.python.renpy*/ },
+        8: { token: EscapedCharacterTokenType.EscAmpersand, /*constant.character.escape.ampersand.python.renpy*/ },
     },
 };
 
@@ -466,7 +476,7 @@ export const stringTagsBroken: TokenPattern = {
         {
             debugName: "stringTagsBroken.patterns![0]",
 
-            // Valid tags without params (close required)
+            // Valid tags without params (optional close)
             contentToken: MetaTokenType.TaggedString, /*renpy.meta.${2:/downcase} meta.tagged.string.renpy*/
             begin: /({)\s*(u|i|b|s|plain|alt|noalt|art|rb|rt)\s*(})/dg,
             beginCaptures: {
@@ -488,7 +498,7 @@ export const stringTagsBroken: TokenPattern = {
         {
             debugName: "stringTagsBroken.patterns![1]",
 
-            // Valid tags with numeric params (close required)
+            // Valid tags with numeric params (optional close)
             contentToken: MetaTokenType.TaggedString, /*renpy.meta.${2:/downcase} meta.tagged.string.renpy*/
             begin: /({)\s*(alpha|cps|k)(=)(?:(\*)|(\-)|(\+))?(\d*(?:.\d+)?)\s*(})/dg,
             beginCaptures: {
@@ -515,7 +525,7 @@ export const stringTagsBroken: TokenPattern = {
         {
             debugName: "stringTagsBroken.patterns![2]",
 
-            // Valid tags with numeric params (close required)
+            // Valid tags with numeric params (optional close)
             contentToken: MetaTokenType.TaggedString, /*renpy.meta.${2:/downcase} meta.tagged.string.renpy*/
             begin: /({)\s*(size)(=)([\-+]?)(\d+)\s*(})/dg,
             beginCaptures: {
@@ -540,7 +550,7 @@ export const stringTagsBroken: TokenPattern = {
         {
             debugName: "stringTagsBroken.patterns![3]",
 
-            // Valid tags with file param (close required)
+            // Valid tags with file param (optional close)
             token: MetaTokenType.StringTag, /*meta.string.tag.${2:/downcase}.self-closing.renpy*/
             begin: /({)\s*(font)(=)([\w.]+)\s*(})/dg,
             beginCaptures: {
@@ -625,9 +635,9 @@ export const stringTags: TokenPattern = {
             token: MetaTokenType.StringTag, /*meta.string.tag.${2:/downcase}.self-closing.renpy*/
             match: /({)\s*(nw|done|fast|p|w|clear)\s*(})/dg,
             captures: {
-                1: { token: CharacterTokenType.OpenBracket, /*punctuation.definition.tag.begin.renpy*/ },
+                1: { token: CharacterTokenType.OpenBracket, /*constant.character.format.placeholder.other.renpy punctuation.definition.tag.begin.renpy*/ },
                 2: { token: EntityTokenType.TagName, /*entity.name.tag.${2:/downcase}.renpy*/ },
-                3: { token: CharacterTokenType.CloseBracket, /*punctuation.definition.tag.end.renpy*/ },
+                3: { token: CharacterTokenType.CloseBracket, /*constant.character.format.placeholder.other.renpy punctuation.definition.tag.end.renpy*/ },
             },
         },
         {
@@ -637,12 +647,12 @@ export const stringTags: TokenPattern = {
             token: MetaTokenType.StringTag, /*meta.string.tag.${2:/downcase}.self-closing.renpy*/
             match: /({)\s*(p|w)(=)(\+?)(\d*(?:.\d+)?)\s*(})/dg,
             captures: {
-                1: { token: CharacterTokenType.OpenBracket, /*punctuation.definition.tag.begin.renpy*/ },
+                1: { token: CharacterTokenType.OpenBracket, /*constant.character.format.placeholder.other.renpy 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: OperatorTokenType.Plus, /*keyword.operator.arithmetic.plus.renpy*/ },
                 5: { token: LiteralTokenType.Float, /*support.constant.property-value.renpy constant.numeric.float.renpy*/ },
-                6: { token: CharacterTokenType.CloseBracket, /*punctuation.definition.tag.end.renpy*/ },
+                6: { token: CharacterTokenType.CloseBracket, /*constant.character.format.placeholder.other.renpy punctuation.definition.tag.end.renpy*/ },
             },
         },
         {
@@ -652,12 +662,12 @@ export const stringTags: TokenPattern = {
             token: MetaTokenType.StringTag, /*meta.string.tag.${2:/downcase}.self-closing.renpy*/
             match: /({)\s*(v?space)(=)(\+?)(\d+)\s*(})/dg,
             captures: {
-                1: { token: CharacterTokenType.OpenBracket, /*punctuation.definition.tag.begin.renpy*/ },
+                1: { token: CharacterTokenType.OpenBracket, /*constant.character.format.placeholder.other.renpy 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: OperatorTokenType.Plus, /*keyword.operator.arithmetic.plus.renpy*/ },
                 5: { token: LiteralTokenType.Integer, /*support.constant.property-value.renpy constant.numeric.integer.renpy*/ },
-                6: { token: CharacterTokenType.CloseBracket, /*punctuation.definition.tag.end.renpy*/ },
+                6: { token: CharacterTokenType.CloseBracket, /*constant.character.format.placeholder.other.renpy punctuation.definition.tag.end.renpy*/ },
             },
         },
         {
@@ -667,10 +677,10 @@ export const stringTags: TokenPattern = {
             token: MetaTokenType.StringTag, /*meta.string.tag.comment.self-closing.renpy*/
             match: /({)\s*(#)\s*(.*?)\s*(})/dg,
             captures: {
-                1: { token: CharacterTokenType.OpenBracket, /*punctuation.definition.tag.begin.renpy*/ },
+                1: { token: CharacterTokenType.OpenBracket, /*constant.character.format.placeholder.other.renpy punctuation.definition.tag.begin.renpy*/ },
                 2: { token: CharacterTokenType.Hashtag, /*comment.line.number-sign.renpy punctuation.definition.comment.renpy*/ },
                 3: { token: MetaTokenType.Comment, /*comment.line.number-sign.renpy*/ },
-                4: { token: CharacterTokenType.CloseBracket, /*punctuation.definition.tag.end.renpy*/ },
+                4: { token: CharacterTokenType.CloseBracket, /*constant.character.format.placeholder.other.renpy punctuation.definition.tag.end.renpy*/ },
             },
         },
         {
@@ -680,70 +690,70 @@ export const stringTags: TokenPattern = {
             token: MetaTokenType.StringTag, /*meta.string.tag.${2:/downcase}.self-closing.renpy*/
             match: /({)\s*(image)(=)([\w.]+)\s*(})/dg,
             captures: {
-                1: { token: CharacterTokenType.OpenBracket, /*punctuation.definition.tag.begin.renpy*/ },
+                1: { token: CharacterTokenType.OpenBracket, /*constant.character.format.placeholder.other.renpy 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*/ },
-                5: { token: CharacterTokenType.CloseBracket, /*punctuation.definition.tag.end.renpy*/ },
+                5: { token: CharacterTokenType.CloseBracket, /*constant.character.format.placeholder.other.renpy punctuation.definition.tag.end.renpy*/ },
             },
         },
         {
             debugName: "stringTags.patterns![5]",
 
-            // Valid tags without params (close required)
+            // Valid tags without params (optional close)
             match: /({)\s*(u|i|b|s|plain|alt|noalt|art|rb|rt)\s*(})/dg,
             captures: {
                 0: { token: MetaTokenType.StringTag, /*meta.string.tag.${2:/downcase}.start.renpy*/ },
-                1: { token: CharacterTokenType.OpenBracket, /*punctuation.definition.tag.begin.renpy*/ },
+                1: { token: CharacterTokenType.OpenBracket, /*constant.character.format.placeholder.other.renpy punctuation.definition.tag.begin.renpy*/ },
                 2: { token: EntityTokenType.TagName, /*entity.name.tag.${2:/downcase}.renpy*/ },
-                3: { token: CharacterTokenType.CloseBracket, /*punctuation.definition.tag.end.renpy*/ },
+                3: { token: CharacterTokenType.CloseBracket, /*constant.character.format.placeholder.other.renpy punctuation.definition.tag.end.renpy*/ },
             },
         },
         {
             debugName: "stringTags.patterns![6]",
 
-            // Valid tags with numeric params (close required)
+            // Valid tags with numeric params (optional close)
             match: /({)\s*(alpha|cps|k)(=)(?:(\*)|(\-)|(\+))?(\d*(?:.\d+)?)\s*(})/dg,
             captures: {
                 0: { token: MetaTokenType.StringTag, /*meta.string.tag.${2:/downcase}.start.renpy*/ },
-                1: { token: CharacterTokenType.OpenBracket, /*punctuation.definition.tag.begin.renpy*/ },
+                1: { token: CharacterTokenType.OpenBracket, /*constant.character.format.placeholder.other.renpy 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: OperatorTokenType.Multiply, /*keyword.operator.arithmetic.Multiply.renpy*/ },
                 5: { token: OperatorTokenType.Minus, /*keyword.operator.arithmetic.Minus.renpy*/ },
                 6: { token: OperatorTokenType.Plus, /*keyword.operator.arithmetic.Plus.renpy*/ },
                 7: { token: MetaTokenType.ConstantNumeric, /*support.constant.property-value.renpy constant.numeric.renpy*/ },
-                8: { token: CharacterTokenType.CloseBracket, /*punctuation.definition.tag.end.renpy*/ },
+                8: { token: CharacterTokenType.CloseBracket, /*constant.character.format.placeholder.other.renpy punctuation.definition.tag.end.renpy*/ },
             },
         },
         {
             debugName: "stringTags.patterns![7]",
 
-            // Valid tags with numeric params (close required)
+            // Valid tags with numeric params (optional close)
             match: /({)\s*(size)(=)([\-+]?)(\d+)\s*(})/dg,
             captures: {
                 0: { token: MetaTokenType.StringTag, /*meta.string.tag.${2:/downcase}.start.renpy*/ },
-                1: { token: CharacterTokenType.OpenBracket, /*punctuation.definition.tag.begin.renpy*/ },
+                1: { token: CharacterTokenType.OpenBracket, /*constant.character.format.placeholder.other.renpy 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.ArithmeticOperator, /*keyword.operator.arithmetic.renpy*/ },
                 5: { token: LiteralTokenType.Integer, /*support.constant.property-value.renpy constant.numeric.integer.renpy*/ },
-                6: { token: CharacterTokenType.CloseBracket, /*punctuation.definition.tag.end.renpy*/ },
+                6: { token: CharacterTokenType.CloseBracket, /*constant.character.format.placeholder.other.renpy punctuation.definition.tag.end.renpy*/ },
             },
         },
         {
             debugName: "stringTags.patterns![8]",
 
-            // Valid tags with file param (close required)
+            // Valid tags with file param (optional close)
             token: MetaTokenType.StringTag, /*meta.string.tag.${2:/downcase}.self-closing.renpy*/
             match: /({)\s*(font)(=)([\w.]+)\s*(})/dg,
             captures: {
                 0: { token: MetaTokenType.StringTag, /*meta.string.tag.${2:/downcase}.start.renpy*/ },
-                1: { token: CharacterTokenType.OpenBracket, /*punctuation.definition.tag.begin.renpy*/ },
+                1: { token: CharacterTokenType.OpenBracket, /*constant.character.format.placeholder.other.renpy 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*/ },
-                5: { token: CharacterTokenType.CloseBracket, /*punctuation.definition.tag.end.renpy*/ },
+                5: { token: CharacterTokenType.CloseBracket, /*constant.character.format.placeholder.other.renpy punctuation.definition.tag.end.renpy*/ },
             },
         },
         {
@@ -753,11 +763,11 @@ export const stringTags: TokenPattern = {
             match: /({)\s*(color|outlinecolor)(=)(#?[a-zA-Z0-9]+)\s*(})/dg,
             captures: {
                 0: { token: MetaTokenType.StringTag, /*meta.string.tag.${2:/downcase}.start.renpy*/ },
-                1: { token: CharacterTokenType.OpenBracket, /*punctuation.definition.tag.begin.renpy*/ },
+                1: { token: CharacterTokenType.OpenBracket, /*constant.character.format.placeholder.other.renpy 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: { patterns: [hexLiteral] },
-                5: { token: CharacterTokenType.CloseBracket, /*punctuation.definition.tag.end.renpy*/ },
+                5: { token: CharacterTokenType.CloseBracket, /*constant.character.format.placeholder.other.renpy punctuation.definition.tag.end.renpy*/ },
             },
         },
         {
@@ -767,56 +777,58 @@ export const stringTags: TokenPattern = {
             match: /({)\s*(a)(=)(.*?)\s*(})/dg,
             captures: {
                 0: { token: MetaTokenType.StringTag, /*meta.string.tag.${2:/downcase}.start.renpy*/ },
-                1: { token: CharacterTokenType.OpenBracket, /*punctuation.definition.tag.begin.renpy*/ },
+                1: { token: CharacterTokenType.OpenBracket, /*constant.character.format.placeholder.other.renpy 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*/ },
-                5: { token: CharacterTokenType.CloseBracket, /*punctuation.definition.tag.end.renpy*/ },
-            },
-        },
-        {
-            debugName: "stringTags.patterns![11]",
+                4: {
+                    patterns: [
+                        {
+                            debugName: "stringTags.patterns![10].captures![4].patterns![0]",
 
-            // Unknown tag (Single line support only cus \R does not work) (Since we don't know if a tag is self closing, we can't assume that an end pattern exists)
-            match: /({)[ \t]*(\w+)\b(?:(=)(.*?))?\s*(})((?:.|\R)+?)\s*({\/)\s*(\2)\s*(})/dg,
-            captures: {
-                1: { token: CharacterTokenType.OpenBracket, /*meta.string.tag.${2:/downcase}.start.renpy punctuation.definition.tag.begin.renpy*/ },
-                2: { token: EntityTokenType.TagName, /*meta.string.tag.${2:/downcase}.start.renpy renpy.meta.u entity.name.tag.${2:/downcase}.renpy*/ },
-                3: { token: OperatorTokenType.Assignment, /*meta.string.tag.${2:/downcase}.start.renpy punctuation.separator.key-value.renpy keyword.operator.assignment.renpy*/ },
-                4: { token: MetaTokenType.ConstantCaps, /*meta.string.tag.${2:/downcase}.start.renpy constant.other.placeholder.tags.renpy*/ },
-                5: { token: CharacterTokenType.CloseBracket, /*meta.string.tag.${2:/downcase}.start.renpy punctuation.definition.tag.end.renpy*/ },
-                6: { token: MetaTokenType.TaggedString, /*renpy.meta.string.tag.custom.${2:/downcase } meta.tagged.string.renpy*/
-                    patterns: [stringsInterior]
+                            match: /\b(jump)\b(:)([a-zA-Z_]\w*)/dg,
+                            captures: {
+                                1: { token: KeywordTokenType.Jump, /*keyword.control.flow.jump.renpy*/ },
+                                2: { token: OperatorTokenType.Jump, /*punctuation.definition.jump.begin.renpy keyword.operator.jump.renpy*/ },
+                                3: { patterns: [fallbackPatterns] },
+                            },
+                        },
+                        {
+                            debugName: "stringTags.patterns![10].captures![4].patterns![1]",
+
+                            token: LiteralTokenType.String, /*support.constant.property-value.renpy string.unquoted.renpy*/
+                            match: /.*/g,
+                        },
+                    ]
                 },
-                7: { token: CharacterTokenType.OpenBracket, /*meta.string.tag.${2:/downcase}.end.renpy punctuation.definition.tag.begin.renpy*/ },
-                8: { token: EntityTokenType.TagName, /*meta.string.tag.${2:/downcase}.end.renpy renpy.meta.u entity.name.tag.${2:/downcase}.renpy*/ },
-                9: { token: CharacterTokenType.CloseBracket, /*meta.string.tag.${2:/downcase}.end.renpy punctuation.definition.tag.end.renpy*/ },
+                5: { token: CharacterTokenType.CloseBracket, /*constant.character.format.placeholder.other.renpy punctuation.definition.tag.end.renpy*/ },
             },
         },
         {
-            debugName: "stringTags.patterns![12]",
+            debugName: "stringTags.patterns![11]",
 
-            // Unknown tag start
-            match: /({)\s*(\w*)(?:(=)(.*?))?\s*(})/dg,
+            // Close tags
+            match: /({\/)\s*([a-zA-Z_]?\w*)(=?)(.*?)\s*(})/dg,
             captures: {
-                0: { token: MetaTokenType.StringTag, /*meta.string.tag.${2:/downcase}.start.renpy*/ },
-                1: { token: CharacterTokenType.OpenBracket, /*punctuation.definition.tag.begin.renpy*/ },
+                0: { token: MetaTokenType.StringTag, /*meta.string.tag.${2:/downcase}.end.renpy*/ },
+                1: { token: CharacterTokenType.OpenBracket, /*constant.character.format.placeholder.other.renpy 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*/ },
-                5: { token: CharacterTokenType.CloseBracket, /*punctuation.definition.tag.end.renpy*/ },
+                4: { token: LiteralTokenType.String, /*support.constant.property-value.renpy string.unquoted.renpy*/ },
+                5: { token: CharacterTokenType.CloseBracket, /*constant.character.format.placeholder.other.renpy punctuation.definition.tag.end.renpy*/ },
             },
         },
         {
-            debugName: "stringTags.patterns![13]",
+            debugName: "stringTags.patterns![12]",
 
-            // Unknown tag end
-            match: /({\/)\s*(\w*?)\b\s*(})/dg,
+            // Custom tags (optional close)
+            match: /({)\s*([a-zA-Z_]?\w*)(=?)(.*?)\s*(})/dg,
             captures: {
-                0: { token: MetaTokenType.StringTag, /*meta.string.tag.${2:/downcase}.end.renpy*/ },
-                1: { token: CharacterTokenType.OpenBracket, /*punctuation.definition.tag.begin.renpy*/ },
+                0: { token: MetaTokenType.StringTag, /*meta.string.tag.${2:/downcase}.start.renpy*/ },
+                1: { token: CharacterTokenType.OpenBracket, /*constant.character.format.placeholder.other.renpy punctuation.definition.tag.begin.renpy*/ },
                 2: { token: EntityTokenType.TagName, /*entity.name.tag.${2:/downcase}.renpy*/ },
-                3: { token: CharacterTokenType.CloseBracket, /*punctuation.definition.tag.end.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*/ },
+                5: { token: CharacterTokenType.CloseBracket, /*constant.character.format.placeholder.other.renpy punctuation.definition.tag.end.renpy*/ },
             },
         },
     ]
@@ -970,7 +982,7 @@ export const define: TokenPattern = {
             end: /$/gm,
             patterns: [whitespace]
         },
-        fallbackCharacters,
+        fallbackPatterns,
     ]
 };
 
@@ -1061,11 +1073,12 @@ export const sayStatements: TokenPattern = {
                 4: { token: MetaTokenType.StringBegin, /*string.quoted.renpy punctuation.definition.string.begin.renpy*/ },
             },
             // @ts-ignore: Back references in end patterns are replaced by begin matches at runtime
-            end: /(?<![^\\]\\)(((?<=\4)\4)|\4)[ \t]*(\(.*?\)(?![^\(]*?\)))?/dg,
+            end: /(?<![^\\]\\)(((?<=\4)\4)|\4)([ \t]*\(.*?\)(?![^\(]*?\)))?/dg,
             endCaptures: {
                 1: { token: MetaTokenType.StringEnd, /*string.quoted.renpy punctuation.definition.string.end.renpy*/ },
                 2: { token: MetaTokenType.EmptyString, /*meta.empty-string.renpy*/ },
                 3: {
+                    token: MetaTokenType.Arguments, /*meta.say.arguments.renpy*/
                     patterns: [
                     ]
                 },
@@ -1075,23 +1088,13 @@ export const sayStatements: TokenPattern = {
         {
             debugName: "sayStatements.patterns![1]",
 
-            token: MetaTokenType.SayNarrator, /*meta.say.narrator.renpy*/
-            contentToken: LiteralTokenType.String, /*string.quoted.narrator.renpy*/
-            begin: /(?<=^[ \t]+)("""|"|'''|'|```|`)/dgm,
-            beginCaptures: {
-                1: { token: MetaTokenType.StringBegin, /*string.quoted.renpy punctuation.definition.string.begin.renpy*/ },
-            },
-            // @ts-ignore: Back references in end patterns are replaced by begin matches at runtime
-            end: /(?<![^\\]\\)(((?<=\1)\1)|\1)[ \t]*(\(.*?\)(?![^\(]*?\)))?/dg,
-            endCaptures: {
-                1: { token: MetaTokenType.StringEnd, /*string.quoted.renpy punctuation.definition.string.end.renpy*/ },
-                2: { token: MetaTokenType.EmptyString, /*meta.empty-string.renpy*/ },
-                3: {
-                    patterns: [
-                    ]
-                },
-            },
-            patterns: [stringsInterior]
+            token: MetaTokenType.SayStatement, /*meta.say.narrator.renpy meta.say.statement.renpy*/
+            begin: /(?<=(^[ \t]+))(?=r?(?:"|'|`))/gm,
+            end: /$/gm,
+            patterns: [
+                strings,
+                fallbackPatterns,
+            ]
         },
     ]
 };
@@ -1113,7 +1116,7 @@ export const renpyBlockTester: TokenPattern = {
     debugName: "renpyBlockTester",
 
     contentToken: MetaTokenType.RenpyBlock, /*meta.renpy.block.renpy*/
-    begin: /(?<=(^[ \t]*)(?:if|elif|else|for|while)\b.*?)(:)/dgm,
+    begin: /(?<=(^[ \t]*)(?:if|elif|else|for|while|label)\b.*?)(:)/dgm,
     beginCaptures: {
         2: { token: CharacterTokenType.Colon, /*punctuation.section.block.begin.renpy*/ },
     },
@@ -1130,11 +1133,8 @@ export const conditionals: TokenPattern = {
     beginCaptures: {
         1: { token: MetaTokenType.ControlFlowKeyword, /*keyword.control.flow.renpy*/ },
     },
-    end: /$|^/gm,
-    patterns: [
-        renpyBlockTester,
-        fallbackPatterns,
-    ]
+    end: /(?=#|:)|$/gm,
+    patterns: [fallbackPatterns]
 };
 
 export const atStatement: TokenPattern = {
@@ -1256,6 +1256,172 @@ export const image: TokenPattern = {
     ]
 };
 
+export const layeredimageBlockTester: TokenPattern = {
+    debugName: "layeredimageBlockTester",
+
+    contentToken: MetaTokenType.LayeredimageBlock, /*meta.layeredimage.block.renpy*/
+    begin: /(?<=(^[ \t]*)(?:layeredimage|group|always|attribute)\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: [
+        {
+            debugName: "layeredimageBlockTester.patterns![0]",
+
+            token: KeywordTokenType.Always, /*keyword.always.renpy*/
+            match: /\b(?:always)\b/g,
+        },
+        {
+            debugName: "layeredimageBlockTester.patterns![1]",
+
+            token: KeywordTokenType.Always, /*keyword.always.renpy*/
+            match: /\b(?:pos)\b/g,
+        },
+    ]
+};
+
+export const layeredimageGroup: TokenPattern = {
+    patterns: [
+        {
+            debugName: "layeredimageGroup.patterns![0]",
+
+            token: MetaTokenType.LayeredimageGroupStatement, /*meta.layeredimage.group.statement.renpy*/
+            contentToken: MetaTokenType.LayeredimageGroupParameters, /*meta.layeredimage.group.parameters.renpy*/
+            begin: /(?<=^[ \t]*)(group)\b/dgm,
+            beginCaptures: {
+                1: { token: KeywordTokenType.Group, /*keyword.group.renpy*/ },
+            },
+            end: /(?=#|:)|$/gm,
+            patterns: [
+                {
+                    debugName: "layeredimageGroup.patterns![0].patterns![0]",
+
+                    token: EntityTokenType.LayeredimageName, /*entity.name.type.layeredimage..renpy*/
+                    match: /\b([a-zA-Z_]\w*)\b/g,
+                },
+                fallbackPatterns,
+            ]
+        },
+        layeredimageBlockTester,
+    ]
+};
+
+export const layeredimageAttribute: TokenPattern = {
+    patterns: [
+        {
+            debugName: "layeredimageAttribute.patterns![0]",
+
+            token: MetaTokenType.LayeredimageAttributeStatement, /*meta.layeredimage.attribute.statement.renpy*/
+            contentToken: MetaTokenType.LayeredimageAttributeParameters, /*meta.layeredimage.attribute.parameters.renpy*/
+            begin: /(?<=^[ \t]*)(attribute)\b/dgm,
+            beginCaptures: {
+                1: { token: KeywordTokenType.Attribute, /*keyword.attribute.renpy*/ },
+            },
+            end: /(?=#|:)|$/gm,
+            patterns: [
+                {
+                    debugName: "layeredimageAttribute.patterns![0].patterns![0]",
+
+                    token: KeywordTokenType.Default, /*keyword.default.renpy*/
+                    match: /\b(default)\b/g,
+                },
+                {
+                    debugName: "layeredimageAttribute.patterns![0].patterns![1]",
+
+                    token: EntityTokenType.LayeredimageName, /*entity.name.type.layeredimage.attribute.renpy*/
+                    match: /\b([a-zA-Z_]\w*)\b/g,
+                },
+                fallbackPatterns,
+            ]
+        },
+        layeredimageBlockTester,
+    ]
+};
+
+export const layeredimage: TokenPattern = {
+    patterns: [
+        {
+            debugName: "layeredimage.patterns![0]",
+
+            token: MetaTokenType.LayeredimageStatement, /*meta.layeredimage.statement.renpy*/
+            contentToken: MetaTokenType.LayeredimageParameters, /*meta.layeredimage.parameters.renpy*/
+            begin: /(?<=^[ \t]*)(layeredimage)\b/dgm,
+            beginCaptures: {
+                1: { token: KeywordTokenType.Layeredimage, /*keyword.layeredimage.renpy*/ },
+            },
+            end: /(?=#|:)|$/gm,
+            patterns: [
+                {
+                    debugName: "layeredimage.patterns![0].patterns![0]",
+
+                    token: EntityTokenType.LayeredimageName, /*entity.name.type.layeredimage.renpy*/
+                    match: /\b([a-zA-Z_]\w*)\b/g,
+                },
+                fallbackPatterns,
+            ]
+        },
+        layeredimageBlockTester,
+    ]
+};
+
+export const translateBlockTester: TokenPattern = {
+    patterns: [
+        {
+            debugName: "translateBlockTester.patterns![0]",
+
+            contentToken: MetaTokenType.TranslateBlock, /*meta.translate.block.renpy*/
+            begin: /(?<=(^[ \t]*)(?:translate)\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 translate: TokenPattern = {
+    patterns: [
+        {
+            debugName: "translate.patterns![0]",
+
+            token: MetaTokenType.TranslateStatement, /*meta.translate.statement.renpy*/
+            contentToken: MetaTokenType.TranslateParameters, /*meta.translate.parameters.renpy*/
+            begin: /(?<=^[ \t]*)(translate)\b/dgm,
+            beginCaptures: {
+                1: { token: KeywordTokenType.Translate, /*keyword.translate.renpy*/ },
+            },
+            end: /(?=#|:)|$/gm,
+            patterns: [
+                {
+                    debugName: "translate.patterns![0].patterns![0]",
+
+                    token: MetaTokenType.ConstantLiteral, /*constant.language.renpy*/
+                    match: /\b(?<!\.)(None)\b/g,
+                },
+                {
+                    debugName: "translate.patterns![0].patterns![1]",
+
+                    token: KeywordTokenType.Other, /*keyword.other.renpy*/
+                    match: /\b(?<!\.)(strings|style|default|python)\b/g,
+                },
+                {
+                    debugName: "translate.patterns![0].patterns![2]",
+
+                    // Only the first word is the language name
+                    token: EntityTokenType.TranslateName, /*entity.name.type.translate.language.renpy*/
+                    match: /(?<=translate[ \t]+)\b([a-zA-Z_]\w*)\b/g,
+                },
+                fallbackPatterns,
+            ]
+        },
+        pythonBlockTester,
+        translateBlockTester,
+    ]
+};
+
 export const show: TokenPattern = {
     patterns: [
         {
@@ -1264,33 +1430,38 @@ export const show: TokenPattern = {
             token: MetaTokenType.ShowStatement, /*meta.show.statement.renpy*/
             begin: /(?<=^[ \t]*)(show)\b/dgm,
             beginCaptures: {
-                1: { token: KeywordTokenType.Show, /*keyword.show.renpy*/ },
+                1: { token: KeywordTokenType.Show, /*keyword.control.flow.show.renpy*/ },
             },
-            end: /(?=\b(at|as|behind|onlayer|expression|with|zorder)\b|#|:)|$/gm,
+            end: /(?=#|:)|$/gm,
             patterns: [
                 strings,
                 {
-                    debugName: "show.patterns![0].patterns![1]",
+                    debugName: "show.patterns![0].patterns![2]",
 
                     token: KeywordTokenType.Layer, /*keyword.layer.renpy*/
                     match: /\b(layer)\b/g,
                 },
                 {
-                    debugName: "show.patterns![0].patterns![2]",
+                    debugName: "show.patterns![0].patterns![3]",
+
+                    token: KeywordTokenType.Nopredict, /*keyword.nopredict.renpy*/
+                    match: /\b(nopredict)\b/g,
+                },
+                atStatement,
+                asStatement,
+                withStatement,
+                behind,
+                onlayer,
+                zorder,
+                {
+                    debugName: "show.patterns![0].patterns![10]",
 
                     token: EntityTokenType.ImageName, /*entity.name.type.image.renpy*/
                     match: /\b(?:[a-zA-Z_0-9]+)\b/g,
                 },
-                whitespace,
+                fallbackPatterns,
             ]
         },
-        atStatement,
-        asStatement,
-        withStatement,
-        behind,
-        onlayer,
-        zorder,
-        whitespace,
     ]
 };
 
@@ -1309,13 +1480,13 @@ export const window: TokenPattern = {
                 {
                     debugName: "window.patterns![0].patterns![0]",
 
-                    token: KeywordTokenType.Show, /*keyword.show.renpy*/
+                    token: KeywordTokenType.Show, /*keyword.control.flow.show.renpy*/
                     match: /\b(show)\b/g,
                 },
                 {
                     debugName: "window.patterns![0].patterns![1]",
 
-                    token: KeywordTokenType.Hide, /*keyword.hide.renpy*/
+                    token: KeywordTokenType.Hide, /*keyword.control.flow.hide.renpy*/
                     match: /\b(hide)\b/g,
                 },
                 whitespace,
@@ -1333,22 +1504,23 @@ export const hide: TokenPattern = {
             token: MetaTokenType.HideStatement, /*meta.hide.statement.renpy*/
             begin: /(?<=^[ \t]*)(hide)\b[ \t]*/dgm,
             beginCaptures: {
-                1: { token: KeywordTokenType.Hide, /*keyword.hide.renpy*/ },
+                1: { token: KeywordTokenType.Hide, /*keyword.control.flow.hide.renpy*/ },
             },
-            end: /(?=\b(behind|expression|with|zorder)\b|#)|$/gm,
+            end: /$/gm,
             patterns: [
                 strings,
+                withStatement,
+                behind,
+                zorder,
                 {
-                    debugName: "hide.patterns![0].patterns![1]",
+                    debugName: "hide.patterns![0].patterns![5]",
 
                     token: EntityTokenType.ImageName, /*entity.name.type.image.renpy*/
                     match: /\b(?:[a-zA-Z_0-9]+)\b[ \t]*/g,
                 },
+                fallbackPatterns,
             ]
         },
-        withStatement,
-        behind,
-        zorder,
     ]
 };
 
@@ -1405,6 +1577,30 @@ export const camera: TokenPattern = {
     ]
 };
 
+export const screenCall: TokenPattern = {
+    debugName: "screenCall",
+
+    token: MetaTokenType.ScreenCall, /*meta.screen.call.renpy*/
+    begin: /(?<=(?:call|show|hide)[ \t]+)(screen)\b/dg,
+    beginCaptures: {
+        1: { token: KeywordTokenType.Screen, /*keyword.screen.renpy*/ },
+    },
+    end: /(?!\G)(?<=[^ \t])/g,
+    patterns: [
+        {
+            debugName: "screenCall.patterns![0]",
+
+            // Label expression
+            begin: /(?<=screen[ \t]+)(?=[a-zA-Z_.])/g,
+            end: /(?![a-zA-Z_.])(?![ \t]*\.[ \t]*)/g,
+            patterns: [
+            ]
+        },
+        withStatement,
+        whitespace,
+    ]
+};
+
 export const builtinLabels: TokenPattern = {
     debugName: "builtinLabels",
 
@@ -1474,18 +1670,21 @@ export const label: TokenPattern = {
     debugName: "label",
 
     token: MetaTokenType.LabelStatement, /*meta.label.statement.renpy*/
-    match: /(?<=^[ \t]*)(label)\b[ \t]*(.*?)(?:[ \t]*(hide))?(:)/dgm,
-    captures: {
+    begin: /(?<=^[ \t]*)(label)\b/dgm,
+    beginCaptures: {
         1: { token: KeywordTokenType.Label, /*storage.type.function.label.renpy*/ },
-        2: {
-            patterns: [
-                labelDefName,
-                invalidToken,
-            ]
-        },
-        3: { token: KeywordTokenType.Hide, /*keyword.hide.renpy*/ },
-        4: { token: CharacterTokenType.Colon, /*punctuation.section.label.begin.renpy*/ },
     },
+    end: /(?=#|:)|$/gm,
+    patterns: [
+        {
+            debugName: "label.patterns![0]",
+
+            token: KeywordTokenType.Hide, /*keyword.control.flow.hide.renpy*/
+            match: /\b(?<!\.)(hide)\b/g,
+        },
+        labelDefName,
+        fallbackPatternsWithError,
+    ]
 };
 
 export const returnStatements: TokenPattern = {
@@ -1514,7 +1713,7 @@ export const jump: TokenPattern = {
     debugName: "jump",
 
     token: MetaTokenType.JumpStatement, /*meta.jump.statement.renpy*/
-    begin: /(?<=^[ \t]+)(jump)\b[ \t]*/dgm,
+    begin: /(?<=^[ \t]+)(jump)\b/dgm,
     beginCaptures: {
         1: { token: KeywordTokenType.Jump, /*keyword.control.flow.jump.renpy*/ },
     },
@@ -1535,6 +1734,7 @@ export const jump: TokenPattern = {
                 labelName,
             ]
         },
+        whitespace,
     ]
 };
 
@@ -1585,33 +1785,16 @@ export const call: TokenPattern = {
         callJumpExpression,
         callPass,
         callFrom,
+        screenCall,
         {
-            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: /(?!\G)(?<=[^ \t])/g,
-            patterns: [
-                {
-                    debugName: "call.patterns![3].patterns![0]",
+            debugName: "call.patterns![4]",
 
-                    // Label expression
-                    begin: /(?<=screen[ \t]+)(?=[a-zA-Z_.])/g,
-                    end: /(?![a-zA-Z_.])(?![ \t]*\.[ \t]*)/g,
-                    patterns: [
-                        labelCall,
-                        labelAccess,
-                        labelName,
-                    ]
-                },
-                whitespace,
-            ]
+            token: KeywordTokenType.Nopredict, /*keyword.nopredict.renpy*/
+            match: /\b(nopredict)\b/g,
         },
+        withStatement,
         {
-            debugName: "call.patterns![4]",
+            debugName: "call.patterns![6]",
 
             // Label expression
             begin: /(?<=call[ \t]+)(?=[a-zA-Z_.])/g,
@@ -1625,7 +1808,7 @@ export const call: TokenPattern = {
         whitespace,
         comments,
         {
-            debugName: "call.patterns![7]",
+            debugName: "call.patterns![9]",
 
             token: MetaTokenType.Invalid, /*invalid.illegal.unexpected-characters-call-arguments.renpy*/
             match: /[^ \t]+/g,
@@ -1717,7 +1900,7 @@ export const menu: TokenPattern = {
         menuOption,
         sayStatements,
         menuSet,
-        fallbackCharacters,
+        fallbackPatterns,
     ]
 };
 
@@ -1831,6 +2014,8 @@ export const renpyStatements: TokenPattern = {
         label,
         menu,
         image,
+        layeredimage,
+        translate,
         audio,
         pause,
         scene,
@@ -1854,11 +2039,20 @@ export const basePatterns: TokenPattern = {
 
 // Push pattern references that were not defined on include
 statements.patterns!.push(renpyStatements, pythonStatements, conditionals, keywords, sayStatements);
-expressions.patterns!.push(renpyPythonExpressions, fallbackCharacters);
+expressions.patterns!.push(renpyPythonExpressions, fallbackPatterns);
 renpyOnlyExpressions.patterns!.push(comments, strings, literal);
 fallbackPatterns.patterns!.splice(0, 0, comments);
+fallbackPatternsWithError.patterns!.splice(0, 0, comments);
 simpleExpression.patterns!.splice(7, 0, comments);
 stringsInterior.patterns!.splice(2, 0, stringTags);
+stringTags.patterns![10].captures![4].patterns![0].captures![3].patterns!.splice(0, 0, labelName);
 pythonStatements.patterns!.push(define, defaultStatement, oneLinePython, pythonBlockTester);
 renpyBlockTester.patterns!.push(basePatterns);
+layeredimageBlockTester.patterns!.push(layeredimageGroup, layeredimageAttribute, basePatterns);
+translateBlockTester.patterns![0].patterns!.push(basePatterns);
+translate.patterns![0].patterns!.splice(3, 0, labelAccess);
+translate.patterns![0].patterns!.splice(4, 0, labelName);
+show.patterns![0].patterns!.splice(0, 0, screenCall);
+hide.patterns![0].patterns!.splice(0, 0, screenCall);
+screenCall.patterns![0].patterns!.push(labelCall, labelAccess, labelName);
 menuOption.patterns!.push(basePatterns);
\ No newline at end of file
diff --git a/src/tokenizer/screen-token-patterns.g.ts b/src/tokenizer/screen-token-patterns.g.ts
index b370771..dd961be 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: 14/07/2024 12:28:58 (UTC+0)
+// Last generated: 07/08/2024 16:42:09 (UTC+0)
 
 import { EntityTokenType, CharacterTokenType, KeywordTokenType, MetaTokenType } from "./renpy-tokens";
 import { TokenPattern } from "./token-pattern-types";
@@ -53,135 +53,142 @@ 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,
+            token: MetaTokenType.ControlFlowKeyword, /*keyword.control.flow.renpy*/
+            match: /\b(?<!\.)(?:action|at|(?:un)?hovered|alt|value|dragged)\b/g,
+        },
+        {
+            debugName: "screenBuildInProperties.patterns![2]",
+
+            // Special manipulation keywords
+            match: /\b(?<!\.)(key|input|(?:text|image)?button|grid|auto|mousearea|side|timer|[vh]?bar|action|viewport|(?:vp)?grid|imagemap|hotspot|hotbar|transclude)\b/dg,
             captures: {
                 1: { token: KeywordTokenType.Other, /*keyword.other.renpy*/ },
             },
         },
         {
-            debugName: "screenBuildInProperties.patterns![2]",
+            debugName: "screenBuildInProperties.patterns![3]",
 
             // Random props
-            token: EntityTokenType.TagName, /*entity.name.tag.css.transform.renpy*/
-            match: /\b(?<!\.)(?:[xy]padding|area|(un)?hovered|draggable|cols|spacing|side_[xy]align)\b/g,
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            match: /\b(?<!\.)(?:(?:[xy]|top_|bottom_|left_|right_)padding|[xy]margin|background|width|height|area|draggable|droppable|drag_handle|mousewheel|scrollbars|cols|spacing|(?:text_|side_[xy])?align)\b/g,
         },
         {
-            debugName: "screenBuildInProperties.patterns![3]",
+            debugName: "screenBuildInProperties.patterns![4]",
 
             // position props (int, absolute, or a float)
-            token: EntityTokenType.TagName, /*entity.name.tag.css.transform.renpy*/
-            match: /\b(?<!\.)(?:xpos|ypos|xanchor|yanchor|xcenter|ycenter|radius)\b/g,
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            match: /\b(?<!\.)(?:[xy]?pos|[xy]?anchor|[xy]?maximum|(?:x?y?)center|radius)\b/g,
         },
         {
-            debugName: "screenBuildInProperties.patterns![4]",
+            debugName: "screenBuildInProperties.patterns![5]",
 
             // position pair props
-            token: EntityTokenType.TagName, /*entity.name.tag.css.transform.renpy*/
-            match: /\b(?<!\.)(?:pos|anchor|xycenter|around|alignaround|matrixanchor)\b/g,
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            match: /\b(?<!\.)(?:around|alignaround|matrixanchor)\b/g,
         },
         {
-            debugName: "screenBuildInProperties.patterns![5]",
+            debugName: "screenBuildInProperties.patterns![6]",
 
             // float props
-            token: EntityTokenType.TagName, /*entity.name.tag.css.transform.renpy*/
-            match: /\b(?<!\.)(?:xalign|yalign|zoom|xzoom|yzoom|alpha|additive|angle|delay|events|zpos)\b/g,
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            match: /\b(?<!\.)(?:[xy]align|[xy]?zoom|alpha|additive|angle|delay|events|zpos)\b/g,
         },
         {
-            debugName: "screenBuildInProperties.patterns![6]",
+            debugName: "screenBuildInProperties.patterns![7]",
 
             // float pair props
-            token: EntityTokenType.TagName, /*entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.transform.renpy entity.name.tag.css.transform.renpy*/
             match: /\b(?<!\.)(?:align|knot)\b/g,
         },
         {
-            debugName: "screenBuildInProperties.patterns![7]",
+            debugName: "screenBuildInProperties.patterns![8]",
 
             // int props
-            token: EntityTokenType.TagName, /*entity.name.tag.css.transform.renpy*/
-            match: /\b(?<!\.)(?:xoffset|yoffset|xtile|ytile|size)\b/g,
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            match: /\b(?<!\.)(?:[xy]offset|[xy]tile|size)\b/g,
         },
         {
-            debugName: "screenBuildInProperties.patterns![8]",
+            debugName: "screenBuildInProperties.patterns![9]",
 
             // int pair props
-            token: EntityTokenType.TagName, /*entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.transform.renpy entity.name.tag.css.transform.renpy*/
             match: /\b(?<!\.)(?:offset)\b/g,
         },
         {
-            debugName: "screenBuildInProperties.patterns![9]",
+            debugName: "screenBuildInProperties.patterns![10]",
 
             // boolean props
-            token: EntityTokenType.TagName, /*entity.name.tag.css.transform.renpy*/
-            match: /\b(?<!\.)(?:rotate_pad|transform_anchor|nearest|crop_relative|subpixel|zzoom)\b/g,
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            match: /\b(?<!\.)(?:rotate_pad|transform_anchor|nearest|crop_relative|subpixel|zzoom|transpose|[xy]fill)\b/g,
         },
         {
-            debugName: "screenBuildInProperties.patterns![10]",
+            debugName: "screenBuildInProperties.patterns![11]",
 
             // ('#float' | None)
-            token: EntityTokenType.TagName, /*entity.name.tag.css.transform.renpy*/
-            match: /\b(?<!\.)(?:rotate|xpan|ypan|blur)\b/g,
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            match: /\b(?<!\.)(?:rotate|[xy]pan|blur)\b/g,
         },
         {
-            debugName: "screenBuildInProperties.patterns![11]",
+            debugName: "screenBuildInProperties.patterns![12]",
 
             // ('#position' | None)
-            token: EntityTokenType.TagName, /*entity.name.tag.css.transform.renpy*/
-            match: /\b(?<!\.)(?:xsize|ysize)\b/g,
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            match: /\b(?<!\.)(?:[xy]size)\b/g,
         },
         {
-            debugName: "screenBuildInProperties.patterns![12]",
+            debugName: "screenBuildInProperties.patterns![13]",
 
             // ('\(int, int, int, int\)' | '\(float, float, float, float\)' | None)
-            token: EntityTokenType.TagName, /*entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.transform.renpy entity.name.tag.css.transform.renpy*/
             match: /\b(?<!\.)(?:crop)\b/g,
         },
         {
-            debugName: "screenBuildInProperties.patterns![13]",
+            debugName: "screenBuildInProperties.patterns![14]",
 
             // ('\(int, int\)' | None)
-            token: EntityTokenType.TagName, /*entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.transform.renpy entity.name.tag.css.transform.renpy*/
             match: /\b(?<!\.)(?:corner1|corner2)\b/g,
         },
         {
-            debugName: "screenBuildInProperties.patterns![14]",
+            debugName: "screenBuildInProperties.patterns![15]",
 
             // ('\(position, position\)' | None)
-            token: EntityTokenType.TagName, /*entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.transform.renpy entity.name.tag.css.transform.renpy*/
             match: /\b(?<!\.)(?:xysize)\b/g,
         },
         {
-            debugName: "screenBuildInProperties.patterns![15]",
+            debugName: "screenBuildInProperties.patterns![16]",
 
             // ('#string' | None)
-            token: EntityTokenType.TagName, /*entity.name.tag.css.transform.renpy*/
-            match: /\b(?<!\.)(?:fit)\b/g,
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            match: /\b(?<!\.)(?:fit|drag_name|child)\b/g,
         },
         {
-            debugName: "screenBuildInProperties.patterns![16]",
+            debugName: "screenBuildInProperties.patterns![17]",
 
             // ('\(int, int\)' | None)
             token: MetaTokenType.Deprecated, /*invalid.deprecated.renpy*/
             match: /\b(?<!\.)(?:size|maxsize)\b/g,
         },
         {
-            debugName: "screenBuildInProperties.patterns![17]",
+            debugName: "screenBuildInProperties.patterns![18]",
 
             // ('#Matrix' | '#MatrixColor' | None)
-            token: EntityTokenType.TagName, /*entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.transform.renpy entity.name.tag.css.transform.renpy*/
             match: /\b(?<!\.)(?:matrixcolor)\b/g,
         },
         {
-            debugName: "screenBuildInProperties.patterns![18]",
+            debugName: "screenBuildInProperties.patterns![19]",
 
             // ('#Matrix' | '#TransformMatrix' | None)
-            token: EntityTokenType.TagName, /*entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.transform.renpy entity.name.tag.css.transform.renpy*/
             match: /\b(?<!\.)(?:matrixtransform)\b/g,
         },
         {
-            debugName: "screenBuildInProperties.patterns![19]",
+            debugName: "screenBuildInProperties.patterns![20]",
 
             // ('#bool' | '#float' | '\(float, float, float\)')
-            token: EntityTokenType.TagName, /*entity.name.tag.css.transform.renpy*/
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.transform.renpy entity.name.tag.css.transform.renpy*/
             match: /\b(?<!\.)(?:perspective)\b/g,
         },
     ]
@@ -217,20 +224,26 @@ export const screenKeywords: TokenPattern = {
         {
             debugName: "screenKeywords.patterns![1]",
 
-            token: KeywordTokenType.Other, /*keyword.other.renpy*/
-            match: /\b(?<!\.)(?:modal|sensitive|tag|at|use|zorder|variant|layer|roll_forward|text)\b/g,
+            token: MetaTokenType.ControlFlowKeyword, /*keyword.control.flow.renpy*/
+            match: /\b(?<!\.)(?:showif|has|on|use)\b/g,
         },
         {
             debugName: "screenKeywords.patterns![2]",
 
             token: KeywordTokenType.Other, /*keyword.other.renpy*/
-            match: /\b(?<!\.)(?:style|style_group|style_prefix)\b/g,
+            match: /\b(?<!\.)(?:sensitive|tag|text|drag|draggroup|id|test)\b/g,
         },
         {
             debugName: "screenKeywords.patterns![3]",
 
+            token: EntityTokenType.TagName, /*entity.other.attribute-name.transform.renpy entity.name.tag.css.transform.renpy*/
+            match: /\b(?<!\.)(?:modal|style|style_group|style_prefix|zorder|tooltip|variant|layer|roll_forward)\b/g,
+        },
+        {
+            debugName: "screenKeywords.patterns![4]",
+
             token: KeywordTokenType.Other, /*keyword.other.renpy*/
-            match: /\b(?<!\.)(?:has|vbox|hbox|label|add|xfill)\b/g,
+            match: /\b(?<!\.)(?:vbox|hbox|label|add|null)\b/g,
         },
     ]
 };
@@ -240,8 +253,8 @@ export const screenBlockTester: TokenPattern = {
         {
             debugName: "screenBlockTester.patterns![0]",
 
-            contentToken: MetaTokenType.ScreenBlock, /*meta.screen-block.renpy*/
-            begin: /(?<=(^[ \t]*)(?:screen|frame|window|text|vbox|hbox)\b.*?)(:)/dgm,
+            contentToken: MetaTokenType.ScreenBlock, /*meta.screen.block.renpy*/
+            begin: /(?<=(^[ \t]*)(?:screen|frame|fixed|window|viewport|drag|draggroup|(?:vp)?grid|text|vbox|hbox|imagemap)\b.*?)(:)/dgm,
             beginCaptures: {
                 2: { token: CharacterTokenType.Colon, /*punctuation.section.screen.begin.renpy*/ },
             },
@@ -261,6 +274,16 @@ export const screenFrame: TokenPattern = {
     },
 };
 
+export const screenFixed: TokenPattern = {
+    debugName: "screenFixed",
+
+    token: MetaTokenType.ScreenFixedStatement, /*meta.screen.fixed.statement.renpy*/
+    match: /(?<=^[ \t]*)(fixed)\b/dgm,
+    captures: {
+        1: { token: KeywordTokenType.Fixed, /*keyword.fixed.renpy*/ },
+    },
+};
+
 export const screenWindow: TokenPattern = {
     debugName: "screenWindow",
 
@@ -375,6 +398,7 @@ export const screenLanguage: TokenPattern = {
     // https://www.renpy.org/doc/html/screens.html#screen-language
     patterns: [
         screenFrame,
+        screenFixed,
         screenWindow,
         screenBox,
         screenText,
diff --git a/src/tokenizer/style-token-patterns.g.ts b/src/tokenizer/style-token-patterns.g.ts
index d0bd725..e138ece 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: 14/07/2024 12:28:58 (UTC+0)
+// Last generated: 07/08/2024 16:42:09 (UTC+0)
 
 import { MetaTokenType, CharacterTokenType, EntityTokenType, KeywordTokenType } from "./renpy-tokens";
 import { TokenPattern } from "./token-pattern-types";
@@ -116,7 +116,7 @@ export const styleClause: TokenPattern = {
             beginCaptures: {
                 1: { token: EntityTokenType.TagName, /*support.constant.property-key.renpy entity.name.tag.css.style.renpy*/ },
             },
-            end: /(?!\G)/g,
+            end: /(?!\G)|$/gm,
             patterns: []
         }]
 };
diff --git a/src/tokenizer/token-patterns.g.ts b/src/tokenizer/token-patterns.g.ts
index 2246897..9262631 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: 14/07/2024 15:10:14 (UTC+0)
+// Last generated: 07/08/2024 16:42:09 (UTC+0)
 
 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";
+import * as StylePatterns from "./style-token-patterns.g";
+import * as AtlPatterns from "./atl-token-patterns.g";
 
 // Push all RenpyPatterns external includes
 RenpyPatterns.literal.patterns!.push(PythonPatterns.literal);
@@ -29,13 +29,13 @@ 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.oddFunctionCall);
-RenpyPatterns.sayStatements.patterns![1].endCaptures![3].patterns!.push(PythonPatterns.oddFunctionCall);
+RenpyPatterns.sayStatements.patterns![1].patterns!.splice(1, 0, 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);
 RenpyPatterns.labelDefName.patterns!.splice(0, 0, PythonPatterns.builtinPossibleCallables);
-RenpyPatterns.label.captures![2].patterns!.splice(1, 0, PythonPatterns.parameters);
+RenpyPatterns.label.patterns!.splice(2, 0, PythonPatterns.parameters);
 RenpyPatterns.returnStatements.patterns!.push(PythonPatterns.expression);
 RenpyPatterns.callJumpExpression.patterns!.push(PythonPatterns.expression);
 RenpyPatterns.callPass.patterns!.splice(0, 0, PythonPatterns.functionArguments);
@@ -47,10 +47,10 @@ 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);
 RenpyPatterns.stop.patterns![0].patterns!.splice(1, 0, PythonPatterns.number);
-RenpyPatterns.renpyStatements.patterns!.splice(5, 0, AtlPatterns.transform);
-RenpyPatterns.renpyStatements.patterns!.splice(6, 0, AtlPatterns.atlBlockTester);
-RenpyPatterns.renpyStatements.patterns!.splice(13, 0, ScreenPatterns.screen);
-RenpyPatterns.renpyStatements.patterns!.splice(14, 0, StylePatterns.style);
+RenpyPatterns.renpyStatements.patterns!.splice(7, 0, AtlPatterns.transform);
+RenpyPatterns.renpyStatements.patterns!.splice(8, 0, AtlPatterns.atlBlockTester);
+RenpyPatterns.renpyStatements.patterns!.splice(15, 0, ScreenPatterns.screen);
+RenpyPatterns.renpyStatements.patterns!.splice(16, 0, StylePatterns.style);
 
 // Push all AtlPatterns external includes
 AtlPatterns.atl.patterns!.splice(0, 0, RenpyPatterns.conditionals);
@@ -84,6 +84,7 @@ AtlPatterns.atlFunction.captures![2].patterns!.splice(0, 0, PythonPatterns.built
 AtlPatterns.atlWarperName.patterns!.splice(0, 0, PythonPatterns.builtinPossibleCallables);
 AtlPatterns.atlFallback.patterns!.push(RenpyPatterns.basePatterns);
 AtlPatterns.atlBlockTester.patterns!.push(AtlPatterns.atl);
+AtlPatterns.transform.patterns!.push(RenpyPatterns.whitespace);
 
 // Push all ScreenPatterns external includes
 ScreenPatterns.screenDefName.patterns!.splice(0, 0, PythonPatterns.builtinPossibleCallables);
@@ -143,4 +144,4 @@ PythonPatterns.doubleOneRegexpComments.patterns!.push(RenpyPatterns.codetags);
 PythonPatterns.doubleThreeRegexpComments.patterns!.push(RenpyPatterns.codetags);
 
 
-export { RenpyPatterns, AtlPatterns, StylePatterns, PythonPatterns, ScreenPatterns };
\ No newline at end of file
+export { RenpyPatterns, PythonPatterns, ScreenPatterns, StylePatterns, AtlPatterns };
\ No newline at end of file