diff --git a/syntaxes/tony.tmLanguage.json b/syntaxes/tony.tmLanguage.json
index 5f9c5ab..a6363ed 100644
--- a/syntaxes/tony.tmLanguage.json
+++ b/syntaxes/tony.tmLanguage.json
@@ -9,10 +9,10 @@
 			"include": "#punctuation"
 		},
 		{
-			"include": "#operators"
+			"include": "#identifiers"
 		},
 		{
-			"include": "#identifiers"
+			"include": "#operators"
 		},
 		{
 			"include": "#booleans"
@@ -29,10 +29,16 @@
 	],
 	"repository": {
 		"keywords": {
-			"patterns": [{
-				"name": "keyword",
-				"match": "\\b(import|from|export|return|if|then|else|case|when|module|in)\\b"
-			}]
+			"patterns": [
+				{
+					"name": "keyword",
+					"match": "\\b(import|from|export|return|if|then|else|case|when|in)\\b"
+				},
+				{
+					"name": "storage.type",
+					"match": "\\b(module)\\b"
+				}
+			]
 		},
 		"punctuation": {
 			"name": "comment",
@@ -43,12 +49,6 @@
 				}
 			]
 		},
-		"operators": {
-			"patterns": [{
-				"name": "keyword.operator",
-				"match": "\\-\\>|\\:\\=|\\=\\>|\\?|\\="
-			}]
-		},
 		"identifiers": {
 			"patterns": [
 				{
@@ -65,7 +65,7 @@
 				"identifier_operators": {
 					"patterns": [{
 						"name": "support.variable",
-						"match": "(==|[!@$%^&*|<>~*\\\\\\-+\\/.]+)=*>?"
+						"match": "[!@$%^&*|<>~*\\\\\\-+.=]+"
 					}]
 				},
 				"infix_operators": {
@@ -81,6 +81,12 @@
 				}
 			}
 		},
+		"operators": {
+			"patterns": [{
+				"name": "keyword.operator",
+				"match": "\\-\\>|\\:\\=|\\=\\>|\\?|\\="
+			}]
+		},
 		"booleans": {
 			"patterns": [{
 				"name": "constant.language",