diff --git a/lib/ace/mode/php_highlight_rules.js b/lib/ace/mode/php_highlight_rules.js
index 69a5181f..17d403a1 100644
--- a/lib/ace/mode/php_highlight_rules.js
+++ b/lib/ace/mode/php_highlight_rules.js
@@ -44,7 +44,7 @@ var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocComme
 var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
 
 var PhpHighlightRules = function() {
-	var docComment = new DocCommentHighlightRules();
+    var docComment = new DocCommentHighlightRules();
     // http://php.net/quickref.php
     var builtinFunctions = lang.arrayToMap(
         ('abs|acos|acosh|addcslashes|addslashes|aggregate|aggregate_info|aggregate_methods|aggregate_methods_by_list|aggregate_methods_by_regexp|' +
@@ -912,23 +912,23 @@ var PhpHighlightRules = function() {
                 regex : "\\?>"
             },
             {
-            	token : "comment",
-        		regex : "<\\!--",
-        		next : "htmlcomment"
+                token : "comment",
+                regex : "<\\!--",
+                next : "htmlcomment"
             }, 
-		    {
-		        token : "meta.tag",
-		        regex : "<style",
-		        next : "css"
-		    },
-		    {
-		        token : "meta.tag", // opening tag
-		        regex : "<\\/?[-_a-zA-Z0-9:]+",
-		        next : "htmltag"
-		    },
             {
-            	token : 'meta.tag',
-            	regex : '<\!DOCTYPE.*?>'
+                token : "meta.tag",
+                regex : "<style",
+                next : "css"
+            },
+            {
+                token : "meta.tag", // opening tag
+                regex : "<\\/?[-_a-zA-Z0-9:]+",
+                next : "htmltag"
+            },
+            {
+                token : 'meta.tag',
+                regex : '<\!DOCTYPE.*?>'
             },
             {
                 token : "comment",
@@ -1059,93 +1059,93 @@ var PhpHighlightRules = function() {
         ],
         "htmlcomment" : [
              {
-             	token : "comment",
-             	regex : ".*?-->",
-             	next : "start"
-         	}, {
-         		token : "comment",
-         		regex : ".+"
-         	} 
+                 token : "comment",
+                 regex : ".*?-->",
+                 next : "start"
+             }, {
+                 token : "comment",
+                 regex : ".+"
+             } 
          ],
          "htmltag" : [ 
              {
- 	            token : "meta.tag",
- 	            regex : ">",
- 	            next : "start"
- 	        }, {
- 	            token : "text",
- 	            regex : "[-_a-zA-Z0-9:]+"
- 	        }, {
- 	            token : "text",
- 	            regex : "\\s+"
- 	        }, {
- 	            token : "string",
- 	            regex : '".*?"'
- 	        }, {
- 	            token : "string",
- 	            regex : "'.*?'"
- 	        } 
- 	    ],
+                 token : "meta.tag",
+                 regex : ">",
+                 next : "start"
+             }, {
+                 token : "text",
+                 regex : "[-_a-zA-Z0-9:]+"
+             }, {
+                 token : "text",
+                 regex : "\\s+"
+             }, {
+                 token : "string",
+                 regex : '".*?"'
+             }, {
+                 token : "string",
+                 regex : "'.*?'"
+             } 
+         ],
         "css" : [ 
              {
- 	            token : "meta.tag",
- 	            regex : "<\/style>",
- 	            next : "htmltag"
- 	        }, {
- 	            token : "meta.tag",
- 	            regex : ">",
- 		    }, {
- 	        	token : 'text',
- 	        	regex : "(?:media|type|href)"
- 	        }, {
- 	        	token : 'string',
- 	        	regex : '=".*?"'
- 	        }, {
- 	            token : "paren.lparen",
- 	            regex : "\{",
- 	            next : "cssdeclaration",
- 	        }, {
- 	        	token : "keyword",
- 	        	regex : "#[A-Za-z0-9\-\_\.]+"
- 	        }, {
- 	        	token : "variable",
- 	        	regex : "\\.[A-Za-z0-9\-\_\.]+"
- 	        }, {
- 	        	token : "constant",
- 	        	regex : "[A-Za-z0-9]+"
- 	        }
- 	    ],
- 	    "cssdeclaration" : [
- 	        {
- 	        	token : "support.type",
- 	        	regex : "[\-a-zA-Z]+",
- 	        	next  : "cssvalue"
- 	        }, 
- 	        {
- 	        	token : "paren.rparen",
- 	        	regex : '\}',
- 	        	next : "css"
- 	        }
- 	    ],
- 	    "cssvalue" : [
-   	        {
-   	        	token : "text",
-   	        	regex : "\:"
-   	        }, 
-   	        {
-   	        	token : "constant",
-   	        	regex : "#[0-9a-zA-Z]+"
-   	        },
-   	        {
-   	        	token : "text",
-   	        	regex : "[\-\_0-9a-zA-Z\"' ,%]+"
-   	        },
-   	        {
-   	        	token : "text",
-   	        	regex : ";",
-   	        	next : "cssdeclaration"
-   	        }
- 	    ],
+                 token : "meta.tag",
+                 regex : "<\/style>",
+                 next : "htmltag"
+             }, {
+                 token : "meta.tag",
+                 regex : ">",
+             }, {
+                 token : 'text',
+                 regex : "(?:media|type|href)"
+             }, {
+                 token : 'string',
+                 regex : '=".*?"'
+             }, {
+                 token : "paren.lparen",
+                 regex : "\{",
+                 next : "cssdeclaration",
+             }, {
+                 token : "keyword",
+                 regex : "#[A-Za-z0-9\-\_\.]+"
+             }, {
+                 token : "variable",
+                 regex : "\\.[A-Za-z0-9\-\_\.]+"
+             }, {
+                 token : "constant",
+                 regex : "[A-Za-z0-9]+"
+             }
+         ],
+         "cssdeclaration" : [
+             {
+                 token : "support.type",
+                 regex : "[\-a-zA-Z]+",
+                 next  : "cssvalue"
+             }, 
+             {
+                 token : "paren.rparen",
+                 regex : '\}',
+                 next : "css"
+             }
+         ],
+         "cssvalue" : [
+               {
+                   token : "text",
+                   regex : "\:"
+               }, 
+               {
+                   token : "constant",
+                   regex : "#[0-9a-zA-Z]+"
+               },
+               {
+                   token : "text",
+                   regex : "[\-\_0-9a-zA-Z\"' ,%]+"
+               },
+               {
+                   token : "text",
+                   regex : ";",
+                   next : "cssdeclaration"
+               }
+         ],
     };
 
     this.embedRules(DocCommentHighlightRules, "doc-",
diff --git a/lib/ace/mode/xml_util.js b/lib/ace/mode/xml_util.js
index 9632fddf..02f4d69e 100644
--- a/lib/ace/mode/xml_util.js
+++ b/lib/ace/mode/xml_util.js
@@ -36,12 +36,12 @@
  * ***** END LICENSE BLOCK ***** */
 
 define(function(require, exports, module) {
-	var lang = require("../lib/lang");
-	
+    var lang = require("../lib/lang");
+    
     var formTags = lang.arrayToMap(
         ("button|form|input|label|select|textarea").split("|")
     );
-	
+    
     var tableTags = lang.arrayToMap(
         ("table|tbody|td|tfoot|th|tr").split("|")
     );
@@ -85,30 +85,30 @@ exports.tag = function(states, name, nextState) {
         regex : "\\s+"
     }, {
         //token : "meta.tag",
-		
-	token : function(value) {
-			if ( value==='a' ) {
-				return "meta.tag.anchor";
-			}
-			else if ( value==='img' ) {
-				return "meta.tag.image";
-			}
-			else if ( value==='script' ) {
-				return "meta.tag.script";
-			}
-			else if ( value==='style' ) {
-				return "meta.tag.style";
-			}
-			else if (formTags.hasOwnProperty(value.toLowerCase())) {
-				return "meta.tag.form";
-			}
-			else if (tableTags.hasOwnProperty(value.toLowerCase())) {
-				return "meta.tag.table";
-			}
-			else {
-				return "meta.tag";
-			}
-		},		
+        
+    token : function(value) {
+            if ( value==='a' ) {
+                return "meta.tag.anchor";
+            }
+            else if ( value==='img' ) {
+                return "meta.tag.image";
+            }
+            else if ( value==='script' ) {
+                return "meta.tag.script";
+            }
+            else if ( value==='style' ) {
+                return "meta.tag.style";
+            }
+            else if (formTags.hasOwnProperty(value.toLowerCase())) {
+                return "meta.tag.form";
+            }
+            else if (tableTags.hasOwnProperty(value.toLowerCase())) {
+                return "meta.tag.table";
+            }
+            else {
+                return "meta.tag";
+            }
+        },        
         merge : true,
         regex : "[-_a-zA-Z0-9:!]+",
         next : name + "embed-attribute-list"