diff --git a/contrib/textmate/Factor.tmbundle/Syntaxes/Factor.tmLanguage b/contrib/textmate/Factor.tmbundle/Syntaxes/Factor.tmLanguage
index 5b01909a04..9b3993046c 100644
--- a/contrib/textmate/Factor.tmbundle/Syntaxes/Factor.tmLanguage
+++ b/contrib/textmate/Factor.tmbundle/Syntaxes/Factor.tmLanguage
@@ -58,10 +58,34 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>\b(f|t)\b</string>
+			<string>(if|when|unless)\*?</string>
+			<key>name</key>
+			<string>keyword.control.flow.factor</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\s+(f|t)\s+</string>
 			<key>name</key>
 			<string>constant.language.factor</string>
 		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b(BIN:|HEX:|OCT:)?\s+-?\d+\s+</string>
+			<key>name</key>
+			<string>constant.numeric.integer.factor</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b-?+\d+\.\d+(E(\+|-)\d+)?\s+</string>
+			<key>name</key>
+			<string>constant.numeric.float.factor</string>
+		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b-?\d+/-?\d+\s+</string>
+			<key>name</key>
+			<string>constant.numeric.rational.factor</string>
+		</dict>
 		<dict>
 			<key>begin</key>
 			<string>"</string>
@@ -70,6 +94,12 @@
 			<key>name</key>
 			<string>string.quoted.double.factor</string>
 		</dict>
+		<dict>
+			<key>match</key>
+			<string>inline</string>
+			<key>name</key>
+			<string>storage.modifier.factor</string>
+		</dict>
 		<dict>
 			<key>begin</key>
 			<string>#!|!</string>