diff --git a/Assembly x86 AT&T.JSON-tmLanguage b/Assembly x86 AT&T.JSON-tmLanguage
index e126f26..9c656b1 100644
--- a/Assembly x86 AT&T.JSON-tmLanguage	
+++ b/Assembly x86 AT&T.JSON-tmLanguage	
@@ -104,7 +104,10 @@
            "comment":"cpuid | grep -i 'xsaveopt'"
         },
         {  "name": "support.constant.preprocessor",
-           "match": "(?<!\\w)(#\\s*(#|include|define|undef|if|ifn?def|else|elsif|endif|pragma|warning))|__(FILE|LINE|DATE|TIME(STAMP)?|STDC_(VERSION|HOSTED)?|GNUC|GNUC_MINOR|GNUC_PATCHLEVEL|VERSION|STRICT_ANSI|BASE_FILE|INCLUDE_LEVEL|OPTIMIZE|OPTIMIZE_SIZE|NO_INLINE|CHAR_UNSIGNED|CHAR_BIT|INT_SHORT|SCHAR_MAX|SHRT_MAX|INT_MAX|LONG_MAX|LONG_LONG_MAX|REGISTER_PREFIX|USER_LABEL_PREFIX)__\\b"
+           "match": "(?<!\\w)(#(#|include|define|undef|if|ifn?def|else|elsif|endif|pragma|warning))|__(FILE|LINE|DATE|TIME(STAMP)?|STDC_(VERSION|HOSTED)?|GNUC|GNUC_MINOR|GNUC_PATCHLEVEL|VERSION|STRICT_ANSI|BASE_FILE|INCLUDE_LEVEL|OPTIMIZE|OPTIMIZE_SIZE|NO_INLINE|CHAR_UNSIGNED|CHAR_BIT|INT_SHORT|SCHAR_MAX|SHRT_MAX|INT_MAX|LONG_MAX|LONG_LONG_MAX|REGISTER_PREFIX|USER_LABEL_PREFIX)__\\b"
+        },
+        {  "name": "invalid.warnings",
+           "match": "(?<!\\w)(#\\s+(#|include|define|undef|if|ifn?def|else|elsif|endif|pragma|warning))\\b"
         },
         {
             "name": "comment.assembly", 
diff --git a/Assembly x86 AT&T.tmLanguage b/Assembly x86 AT&T.tmLanguage
index c833ea4..487712e 100644
--- a/Assembly x86 AT&T.tmLanguage	
+++ b/Assembly x86 AT&T.tmLanguage	
@@ -214,10 +214,16 @@
 		</dict>
 		<dict>
 			<key>match</key>
-			<string>(?&lt;!\w)(#\s*(#|include|define|undef|if|ifn?def|else|elsif|endif|pragma|warning))|__(FILE|LINE|DATE|TIME(STAMP)?|STDC_(VERSION|HOSTED)?|GNUC|GNUC_MINOR|GNUC_PATCHLEVEL|VERSION|STRICT_ANSI|BASE_FILE|INCLUDE_LEVEL|OPTIMIZE|OPTIMIZE_SIZE|NO_INLINE|CHAR_UNSIGNED|CHAR_BIT|INT_SHORT|SCHAR_MAX|SHRT_MAX|INT_MAX|LONG_MAX|LONG_LONG_MAX|REGISTER_PREFIX|USER_LABEL_PREFIX)__\b</string>
+			<string>(?&lt;!\w)(#(#|include|define|undef|if|ifn?def|else|elsif|endif|pragma|warning))|__(FILE|LINE|DATE|TIME(STAMP)?|STDC_(VERSION|HOSTED)?|GNUC|GNUC_MINOR|GNUC_PATCHLEVEL|VERSION|STRICT_ANSI|BASE_FILE|INCLUDE_LEVEL|OPTIMIZE|OPTIMIZE_SIZE|NO_INLINE|CHAR_UNSIGNED|CHAR_BIT|INT_SHORT|SCHAR_MAX|SHRT_MAX|INT_MAX|LONG_MAX|LONG_LONG_MAX|REGISTER_PREFIX|USER_LABEL_PREFIX)__\b</string>
 			<key>name</key>
 			<string>support.constant.preprocessor</string>
 		</dict>
+		<dict>
+			<key>match</key>
+			<string>(?&lt;!\w)(#\s+(#|include|define|undef|if|ifn?def|else|elsif|endif|pragma|warning))\b</string>
+			<key>name</key>
+			<string>invalid.warnings</string>
+		</dict>
 		<dict>
 			<key>match</key>
 			<string>#.*$</string>
diff --git a/messages/1.1.2.txt b/messages/1.1.2.txt
index ad15884..3c648cd 100644
--- a/messages/1.1.2.txt
+++ b/messages/1.1.2.txt
@@ -1,3 +1,5 @@
 v1.1.2 !!ACHTUNG!!
     
     The commenting shortcut will now insert `#:' instead of `# '. This was done to help prevent people accidentally putting directives in their comments.
+    
+    I will also highlight valid directives if there is some number of spaces between it and the # that precedes it.