diff --git a/src/languages/flink/flink.ts b/src/languages/flink/flink.ts
index c3d0b5f2..dec89534 100644
--- a/src/languages/flink/flink.ts
+++ b/src/languages/flink/flink.ts
@@ -489,13 +489,14 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@comments' },
 			{ include: '@whitespace' },
 			{ include: '@pseudoColumns' },
+			{ include: '@customParams' },
 			{ include: '@numbers' },
 			{ include: '@strings' },
 			{ include: '@complexIdentifiers' },
 			{ include: '@scopes' },
 			{ include: '@complexDataTypes' },
 			{ include: '@complexFunctions' },
-			[/[;,.]/, TokenClassConsts.DELIMITER],
+			[/[:;,.]/, TokenClassConsts.DELIMITER],
 			[/[\(\)\[\]\{\}]/, '@brackets'],
 			[
 				/[\w@#$]+/,
@@ -535,6 +536,10 @@ export const language = <languages.IMonarchLanguage>{
 				}
 			]
 		],
+		customParams: [
+			[/\${[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE],
+			[/\@\@{[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE]
+		],
 		numbers: [
 			[/0[xX][0-9a-fA-F]*/, TokenClassConsts.NUMBER_HEX],
 			[/[$][+-]*\d*(\.\d*)?/, TokenClassConsts.NUMBER],
diff --git a/src/languages/hive/hive.ts b/src/languages/hive/hive.ts
index 9f18e6a3..151a1bfd 100644
--- a/src/languages/hive/hive.ts
+++ b/src/languages/hive/hive.ts
@@ -515,7 +515,7 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@complexIdentifiers' },
 			{ include: '@scopes' },
 			{ include: '@complexDataTypes' },
-			[/[;,.]/, TokenClassConsts.DELIMITER],
+			[/[:;,.]/, TokenClassConsts.DELIMITER],
 			[/[\(\)\[\]\{\}]/, '@brackets'],
 			[
 				/[\w@#$]+/,
diff --git a/src/languages/impala/impala.ts b/src/languages/impala/impala.ts
index 92b71bd2..0991684a 100644
--- a/src/languages/impala/impala.ts
+++ b/src/languages/impala/impala.ts
@@ -474,7 +474,7 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@scopes' },
 			{ include: '@complexDataTypes' },
 			{ include: '@complexOperators' },
-			[/[;,.]/, TokenClassConsts.DELIMITER],
+			[/[:;,.]/, TokenClassConsts.DELIMITER],
 			[/[\(\)\[\]\{\}]/, '@brackets'],
 			[
 				/[\w@#$]+/,
diff --git a/src/languages/mysql/mysql.ts b/src/languages/mysql/mysql.ts
index 4545430d..616438c9 100644
--- a/src/languages/mysql/mysql.ts
+++ b/src/languages/mysql/mysql.ts
@@ -911,7 +911,7 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@complexIdentifiers' },
 			{ include: '@scopes' },
 			{ include: '@complexOperators' },
-			[/[;,.]/, TokenClassConsts.DELIMITER],
+			[/[:;,.]/, TokenClassConsts.DELIMITER],
 			[/[\(\)\[\]\{\}]/, '@brackets'],
 			[
 				/[\w@]+/,
diff --git a/src/languages/pgsql/pgsql.ts b/src/languages/pgsql/pgsql.ts
index acfb0d69..7c49cd23 100644
--- a/src/languages/pgsql/pgsql.ts
+++ b/src/languages/pgsql/pgsql.ts
@@ -980,7 +980,7 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@complexIdentifiers' },
 			{ include: '@scopes' },
 			{ include: '@complexDataTypes' },
-			[/[;,.]/, TokenClassConsts.DELIMITER],
+			[/[:;,.]/, TokenClassConsts.DELIMITER],
 			[/[\(\)\[\]\{\}]/, '@brackets'],
 			[
 				/[\w@#$]+/,
diff --git a/src/languages/spark/spark.ts b/src/languages/spark/spark.ts
index 3d5689df..b5440e90 100644
--- a/src/languages/spark/spark.ts
+++ b/src/languages/spark/spark.ts
@@ -699,7 +699,7 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@complexIdentifiers' },
 			{ include: '@scopes' },
 			{ include: '@complexDataTypes' },
-			[/[;,.]/, TokenClassConsts.DELIMITER],
+			[/[:;,.]/, TokenClassConsts.DELIMITER],
 			[/[\(\)\[\]\{\}]/, '@brackets'],
 			[
 				/[\w@#$]+/,
diff --git a/src/languages/trino/trino.ts b/src/languages/trino/trino.ts
index 93c9b936..3d90a391 100644
--- a/src/languages/trino/trino.ts
+++ b/src/languages/trino/trino.ts
@@ -636,7 +636,7 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@complexIdentifiers' },
 			{ include: '@scopes' },
 			{ include: '@complexDataTypes' },
-			[/[;,.]/, TokenClassConsts.DELIMITER],
+			[/[:;,.]/, TokenClassConsts.DELIMITER],
 			[/[\(\)\[\]\{\}]/, '@brackets'],
 			[
 				/[\w@$-]+/, // https://trino.io/docs/current/language/reserved.html#language-identifiers
diff --git a/src/theme/vs-plus/light.ts b/src/theme/vs-plus/light.ts
index 78539917..1da1bce6 100644
--- a/src/theme/vs-plus/light.ts
+++ b/src/theme/vs-plus/light.ts
@@ -8,31 +8,31 @@ export const lightThemeData: editor.IStandaloneThemeData = {
 	base: 'vs',
 	inherit: true,
 	rules: [
-		{ token: postfixTokenClass(TokenClassConsts.BINARY), foreground: '098658' },
-		{ token: postfixTokenClass(TokenClassConsts.BINARY_ESCAPE), foreground: '098658' },
-		{ token: postfixTokenClass(TokenClassConsts.COMMENT), foreground: '008000' },
-		{ token: postfixTokenClass(TokenClassConsts.COMMENT_QUOTE), foreground: '008000' },
-		{ token: postfixTokenClass(TokenClassConsts.DELIMITER), foreground: '000000' },
-		{ token: postfixTokenClass(TokenClassConsts.DELIMITER_CURLY), foreground: '319331' },
-		{ token: postfixTokenClass(TokenClassConsts.DELIMITER_PAREN), foreground: '0431fa' },
-		{ token: postfixTokenClass(TokenClassConsts.DELIMITER_SQUARE), foreground: '0431fa' },
-		{ token: postfixTokenClass(TokenClassConsts.IDENTIFIER), foreground: '001080' },
-		{ token: postfixTokenClass(TokenClassConsts.IDENTIFIER_QUOTE), foreground: '001080' },
-		{ token: postfixTokenClass(TokenClassConsts.KEYWORD), foreground: '0000ff' },
-		{ token: postfixTokenClass(TokenClassConsts.KEYWORD_SCOPE), foreground: 'af00db' },
-		{ token: postfixTokenClass(TokenClassConsts.NUMBER), foreground: '098658' },
-		{ token: postfixTokenClass(TokenClassConsts.NUMBER_FLOAT), foreground: '098658' },
-		{ token: postfixTokenClass(TokenClassConsts.NUMBER_BINARY), foreground: '098658' },
-		{ token: postfixTokenClass(TokenClassConsts.NUMBER_OCTAL), foreground: '098658' },
-		{ token: postfixTokenClass(TokenClassConsts.NUMBER_HEX), foreground: '098658' },
-		{ token: postfixTokenClass(TokenClassConsts.OPERATOR), foreground: '000000' },
-		{ token: postfixTokenClass(TokenClassConsts.OPERATOR_KEYWORD), foreground: '0000ff' },
-		{ token: postfixTokenClass(TokenClassConsts.OPERATOR_SYMBOL), foreground: '000000' },
-		{ token: postfixTokenClass(TokenClassConsts.PREDEFINED), foreground: '795e26' },
-		{ token: postfixTokenClass(TokenClassConsts.STRING), foreground: 'a31515' },
-		{ token: postfixTokenClass(TokenClassConsts.STRING_ESCAPE), foreground: 'a31515' },
-		{ token: postfixTokenClass(TokenClassConsts.TYPE), foreground: '267f99' },
-		{ token: postfixTokenClass(TokenClassConsts.VARIABLE), foreground: '4fc1ff' }
+		{ token: postfixTokenClass(TokenClassConsts.BINARY), foreground: '45AB5A' },
+		{ token: postfixTokenClass(TokenClassConsts.BINARY_ESCAPE), foreground: '45AB5A' },
+		{ token: postfixTokenClass(TokenClassConsts.NUMBER), foreground: '45AB5A' },
+		{ token: postfixTokenClass(TokenClassConsts.NUMBER_FLOAT), foreground: '45AB5A' },
+		{ token: postfixTokenClass(TokenClassConsts.NUMBER_BINARY), foreground: '45AB5A' },
+		{ token: postfixTokenClass(TokenClassConsts.NUMBER_OCTAL), foreground: '45AB5A' },
+		{ token: postfixTokenClass(TokenClassConsts.NUMBER_HEX), foreground: '45AB5A' },
+		{ token: postfixTokenClass(TokenClassConsts.COMMENT), foreground: 'B1B4C5' },
+		{ token: postfixTokenClass(TokenClassConsts.COMMENT_QUOTE), foreground: 'B1B4C5' },
+		{ token: postfixTokenClass(TokenClassConsts.DELIMITER), foreground: '7D98B1' },
+		{ token: postfixTokenClass(TokenClassConsts.OPERATOR), foreground: '7D98B1' },
+		{ token: postfixTokenClass(TokenClassConsts.OPERATOR_SYMBOL), foreground: '7D98B1' },
+		{ token: postfixTokenClass(TokenClassConsts.DELIMITER_CURLY), foreground: 'B1BB86' },
+		{ token: postfixTokenClass(TokenClassConsts.DELIMITER_PAREN), foreground: 'B1BB86' },
+		{ token: postfixTokenClass(TokenClassConsts.DELIMITER_SQUARE), foreground: 'B1BB86' },
+		{ token: postfixTokenClass(TokenClassConsts.IDENTIFIER), foreground: '201A1A' },
+		{ token: postfixTokenClass(TokenClassConsts.IDENTIFIER_QUOTE), foreground: '201A1A' },
+		{ token: postfixTokenClass(TokenClassConsts.KEYWORD), foreground: '3300FF' },
+		{ token: postfixTokenClass(TokenClassConsts.OPERATOR_KEYWORD), foreground: '3300FF' },
+		{ token: postfixTokenClass(TokenClassConsts.KEYWORD_SCOPE), foreground: 'E221DA' },
+		{ token: postfixTokenClass(TokenClassConsts.PREDEFINED), foreground: 'C3771C' },
+		{ token: postfixTokenClass(TokenClassConsts.STRING), foreground: 'BC1313' },
+		{ token: postfixTokenClass(TokenClassConsts.STRING_ESCAPE), foreground: 'BC1313' },
+		{ token: postfixTokenClass(TokenClassConsts.TYPE), foreground: '256FC6' },
+		{ token: postfixTokenClass(TokenClassConsts.VARIABLE), foreground: '00AD84' }
 	],
 	colors: {}
 };