Improve highlighting for PHP and JS

data/filetypes.xml

@@ -39,13 +39,13 @@ php_default=default
 php_simplestring=string_1
 php_hstring=string_1
 php_number=number_1
-php_word=number_2
-php_variable=identifier_4
+php_word=keyword_1
+php_variable=preprocessor
 php_comment=comment
 php_commentline=comment
 php_operator=operator
 php_hstring_variable=string_2
-php_complex_variable=identifier_2
+php_complex_variable=preprocessor
 
 jscript_start=tag
 jscript_default=default
@@ -53,8 +53,8 @@ jscript_comment=comment
 jscript_commentline=comment
 jscript_commentdoc=comment_doc
 jscript_number=number_1
-jscript_word=number_2
-jscript_keyword=keyword_1
+jscript_word=keyword_1
+jscript_keyword=keyword_2
 jscript_doublestring=string_1
 jscript_singlestring=string_1