diff --git a/.editorconfig b/.editorconfig
index 87694ddab..ddde48ba4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -15,5 +15,5 @@ indent_size = 2
 [*.{diff,md}]
 trim_trailing_whitespace = false
 
-[*.php]
+[*.{php,tpl}]
 indent_size = 4
diff --git a/styles/templates/admin/admin_mass_email.tpl b/styles/templates/admin/admin_mass_email.tpl
index 03b820c01..c7ad58ee1 100644
--- a/styles/templates/admin/admin_mass_email.tpl
+++ b/styles/templates/admin/admin_mass_email.tpl
@@ -4,63 +4,62 @@
 <br/>
 
 <form method="post" action="{S_USER_ACTION}" onSubmit="return checkForm(this);">
-
-  <table class="forumline">
-    <tr>
-      <th colspan="2">{L_COMPOSE}</th>
-    </tr>
-    <tr>
-      <td class="row1" align="right"><b>{L_RECIPIENTS}</b></td>
-      <td class="row2">{S_GROUP_SELECT}</td>
-    </tr>
-    <tr>
-      <td class="row1" align="right"><b>{L_MASS_EMAIL_MESSAGE_TYPE}</b></td>
-      <td class="row2">
-        <select name="message_type">
-          <option value="text/plain" selected="selected">text/plain</option>
-          <option value="text/html">text/html</option>
-        </select>
-      </td>
-    </tr>
-    <tr>
-      <td class="row1" align="right"><b>{L_REPLY_TO}</b></td>
-      <td class="row2">
-        <input type="text" name="reply_to" size="45" maxlength="100" style="width:98%" value="{REPLY_TO}"/>
-      </td>
-    </tr>
-    <tr>
-      <td class="row1" align="right"><b>{L_SUBJECT}</b></td>
-      <td class="row2">
-        <input type="text" name="subject" size="45" maxlength="100" style="width:98%" value="{SUBJECT}"/>
-      </td>
-    </tr>
-    <tr>
-      <td class="row1" align="right" valign="top"><span class="gen"><b>{L_MESSAGE}</b></span></td>
-      <td class="row2">
-        <textarea name="message" rows="15" cols="35" wrap="virtual" style="width:98%">{MESSAGE}</textarea>
-      </td>
-    </tr>
-    <tr>
-      <td class="catBottom" colspan="2"><input type="submit" value="{L_SEND_EMAIL}" name="submit" class="mainoption"/>
-      </td>
-    </tr>
-  </table>
-
+    <table class="forumline">
+        <tr>
+            <th colspan="2">{L_COMPOSE}</th>
+        </tr>
+        <tr>
+            <td class="row1" align="right"><b>{L_RECIPIENTS}</b></td>
+            <td class="row2">{S_GROUP_SELECT}</td>
+        </tr>
+        <tr>
+            <td class="row1" align="right"><b>{L_MASS_EMAIL_MESSAGE_TYPE}</b></td>
+            <td class="row2">
+                <select name="message_type">
+                    <option value="text/plain" selected="selected">text/plain</option>
+                    <option value="text/html">text/html</option>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <td class="row1" align="right"><b>{L_REPLY_TO}</b></td>
+            <td class="row2">
+                <input type="text" name="reply_to" size="45" maxlength="100" style="width:98%" value="{REPLY_TO}"/>
+            </td>
+        </tr>
+        <tr>
+            <td class="row1" align="right"><b>{L_SUBJECT}</b></td>
+            <td class="row2">
+                <input type="text" name="subject" size="45" maxlength="100" style="width:98%" value="{SUBJECT}"/>
+            </td>
+        </tr>
+        <tr>
+            <td class="row1" align="right" valign="top"><span class="gen"><b>{L_MESSAGE}</b></span></td>
+            <td class="row2">
+                <textarea name="message" rows="15" cols="35" wrap="virtual" style="width:98%">{MESSAGE}</textarea>
+            </td>
+        </tr>
+        <tr>
+            <td class="catBottom" colspan="2"><input type="submit" value="{L_SEND_EMAIL}" name="submit"
+                                                     class="mainoption"/>
+            </td>
+        </tr>
+    </table>
 </form>
 
 <script type="text/javascript">
-  function checkForm(formObj) {
-    var formErrors = false;
+    function checkForm(formObj) {
+        var formErrors = false;
 
-    if (formObj.message.value.length < 2) {
-      formErrors = "{L_EMPTY_MESSAGE_EMAIL}";
-    } else if (formObj.subject.value.length < 2) {
-      formErrors = "{L_EMPTY_SUBJECT_EMAIL}";
-    }
+        if (formObj.message.value.length < 2) {
+            formErrors = "{L_EMPTY_MESSAGE_EMAIL}";
+        } else if (formObj.subject.value.length < 2) {
+            formErrors = "{L_EMPTY_SUBJECT_EMAIL}";
+        }
 
-    if (formErrors) {
-      alert(formErrors);
-      return false;
+        if (formErrors) {
+            alert(formErrors);
+            return false;
+        }
     }
-  }
 </script>
diff --git a/styles/templates/admin/admin_ranks.tpl b/styles/templates/admin/admin_ranks.tpl
index 884024270..ff7139cb1 100644
--- a/styles/templates/admin/admin_ranks.tpl
+++ b/styles/templates/admin/admin_ranks.tpl
@@ -65,7 +65,7 @@
 <tr>
 	<th>{L_RANK_TITLE}</th>
 	<th>{L_RANK_IMAGE}</th>
-  <th colspan="2">{L_ACTION}</th>
+    <th colspan="2">{L_ACTION}</th>
 </tr>
 <!-- BEGIN ranks -->
 <tr class="{ranks.ROW_CLASS} tCenter">
diff --git a/styles/templates/default/group_edit.tpl b/styles/templates/default/group_edit.tpl
index 3f9a3e741..5ea1fbdf8 100644
--- a/styles/templates/default/group_edit.tpl
+++ b/styles/templates/default/group_edit.tpl
@@ -1,17 +1,17 @@
 <script type="text/javascript">
-function manage_group(mode, value) {
-	ajax.exec({
-		action   : 'manage_group',
-		mode     : mode,
-		group_id : {GROUP_ID},
-		value    : value
-	});
-	ajax.callback.manage_group = function(data) {
-    if(data.remove_avatar) {
-      $('div#avatar').html(data.remove_avatar);
+    function manage_group(mode, value) {
+        ajax.exec({
+            action: 'manage_group',
+            mode: mode,
+            group_id: {GROUP_ID},
+            value: value
+        });
+        ajax.callback.manage_group = function (data) {
+            if (data.remove_avatar) {
+                $('div#avatar').html(data.remove_avatar);
+            }
+        }
     }
-	}
-}
 </script>
 
 <h1 class="pagetitle">{PAGE_TITLE}<!-- IF GROUP_NAME --> :: {GROUP_NAME}<!-- ENDIF --></h1>
diff --git a/styles/templates/default/index.tpl b/styles/templates/default/index.tpl
index c89f603d2..daaa31d9c 100644
--- a/styles/templates/default/index.tpl
+++ b/styles/templates/default/index.tpl
@@ -14,7 +14,7 @@
 	<div class="floatL">
 		<a href="{U_SEARCH_LATEST}" class="med">{L_SEARCH_LATEST}</a> &#0183;
 		<a href="{U_SEARCH_SELF_BY_LAST}" class="med">{L_SEARCH_SELF}</a> <a href="#search-my-posts" class="menu-root menu-alt1">{OPEN_MENU_IMG_ALT}</a> &#0183;
-    <!-- IF U_ATOM_FEED --><a href="{U_ATOM_FEED}" class="med">{FEED_IMG} {L_LATEST_RELEASES}</a> &#0183;<!-- ENDIF -->
+        <!-- IF U_ATOM_FEED --><a href="{U_ATOM_FEED}" class="med">{FEED_IMG} {L_LATEST_RELEASES}</a> &#0183;<!-- ENDIF -->
 		<a href="{U_INDEX}?map=1" class="med bold">{FEED_IMG} {L_FORUM_MAP}</a>
 	</div>
 	<div class="floatR med bold">
diff --git a/styles/templates/default/info.tpl b/styles/templates/default/info.tpl
index 625770c72..662883f64 100644
--- a/styles/templates/default/info.tpl
+++ b/styles/templates/default/info.tpl
@@ -1,32 +1,32 @@
 <style type="text/css">
-  #infobox-wrap {
-    width: 760px;
-  }
+    #infobox-wrap {
+        width: 760px;
+    }
 
-  #infobox-body {
-    background: #FFFFFF;
-    color: #000000;
-    padding: 1em;
-    height: 400px;
-    overflow: auto;
-    border: 1px inset #000000;
-  }
+    #infobox-body {
+        background: #FFFFFF;
+        color: #000000;
+        padding: 1em;
+        height: 400px;
+        overflow: auto;
+        border: 1px inset #000000;
+    }
 
-  #infobox-body p {
-    margin-top: 1em;
-    margin-bottom: 1em;
-  }
+    #infobox-body p {
+        margin-top: 1em;
+        margin-bottom: 1em;
+    }
 </style>
 
 <br/>
 <div id="infobox-wrap" class="bCenter row1">
-  <fieldset class="pad_6">
-    <legend class="med bold mrg_2 warnColor1"><!-- IF PAGE_TITLE -->{PAGE_TITLE}<!-- ENDIF --></legend>
-    <!-- IF REQUIRE -->
-    <div class="bCenter">{REQUIRE}</div>
-    <!-- ENDIF -->
-  </fieldset>
-  <p class="gen tRight pad_6"><a href="javascript:window.close();" class="gen">[ {L_LOCK} ]</a>
-  </p>
+    <fieldset class="pad_6">
+        <legend class="med bold mrg_2 warnColor1"><!-- IF PAGE_TITLE -->{PAGE_TITLE}<!-- ENDIF --></legend>
+        <!-- IF REQUIRE -->
+        <div class="bCenter">{REQUIRE}</div>
+        <!-- ENDIF -->
+    </fieldset>
+    <p class="gen tRight pad_6"><a href="javascript:window.close();" class="gen">[ {L_LOCK} ]</a>
+    </p>
 </div><!--/infobox-wrap-->
 <br/>
diff --git a/styles/templates/default/memberlist.tpl b/styles/templates/default/memberlist.tpl
index eddaaa62f..4e77baa2e 100644
--- a/styles/templates/default/memberlist.tpl
+++ b/styles/templates/default/memberlist.tpl
@@ -39,7 +39,7 @@
 <!-- BEGIN memberrow -->
 <tr class="{memberrow.ROW_CLASS} tCenter">
 	<td>{memberrow.ROW_NUMBER}</td>
-  <td><div>{memberrow.AVATAR}</div><b>{memberrow.USER}</b></td>
+    <td><div>{memberrow.AVATAR}</div><b>{memberrow.USER}</b></td>
 	<td>{memberrow.PM}</td>
 	<!-- IF IS_ADMIN --><td>{memberrow.EMAIL}</td><!-- ENDIF -->
 	<td>{memberrow.FROM}</td>
diff --git a/styles/templates/default/posting_editor.tpl b/styles/templates/default/posting_editor.tpl
index f433d61f1..f81b154c4 100644
--- a/styles/templates/default/posting_editor.tpl
+++ b/styles/templates/default/posting_editor.tpl
@@ -17,13 +17,13 @@ ajax.callback.posts = function(data) {
 	<option style="font-family: sans-serif" value="sans-serif">&nbsp;Sans Serif</option>
 	<option style="font-family: cursive" value="cursive">&nbsp;Cursive</option>
 	<option style="font-family: Arial" value="Arial">&nbsp;Arial</option>
-  <option style="font-family: Arial Black" value="Arial Black">&nbsp;Arial Black</option>
-  <option style="font-family: Times New Roman" value="Times New Roman">&nbsp;Times New Roman</option>
+    <option style="font-family: Arial Black" value="Arial Black">&nbsp;Arial Black</option>
+    <option style="font-family: Times New Roman" value="Times New Roman">&nbsp;Times New Roman</option>
 	<option style="font-family: Tahoma" value="Tahoma">&nbsp;Tahoma</option>
-  <option style="font-family: Courier" value="Courier">&nbsp;Courier</option>
-  <option style="font-family: Bookman Old Style" value="Bookman Old Style">&nbsp;Bookman</option>
-  <option style="font-family: Trebuchet MS" value="Trebuchet MS">&nbsp;Trebuchet</option>
-  <option style="font-family: Garamond" value="Garamond">&nbsp;Garamond</option>
+    <option style="font-family: Courier" value="Courier">&nbsp;Courier</option>
+    <option style="font-family: Bookman Old Style" value="Bookman Old Style">&nbsp;Bookman</option>
+    <option style="font-family: Trebuchet MS" value="Trebuchet MS">&nbsp;Trebuchet</option>
+    <option style="font-family: Garamond" value="Garamond">&nbsp;Garamond</option>
 	<option style="font-family: Georgia" value="Georgia">&nbsp;Georgia</option>
 	<option style="font-family: Fixedsys" value="Fixedsys">&nbsp;Fixedsys</option>
 </select>
@@ -57,8 +57,8 @@ ajax.callback.posts = function(data) {
 	<option value="20">&nbsp;size=20</option>
 	<option value="22">&nbsp;size=22</option>
 	<option value="24" class="em">{L_FONT_HUGE}</option>
-  <option value="26">&nbsp;size=26</option>
-  <option value="28">&nbsp;size=28</option>
+    <option value="26">&nbsp;size=26</option>
+    <option value="28">&nbsp;size=28</option>
 </select>
 &nbsp;
 <select name="codeAlign" class="text_size">
diff --git a/styles/templates/default/usercp_viewprofile.tpl b/styles/templates/default/usercp_viewprofile.tpl
index b07e48c75..49fa9e84c 100644
--- a/styles/templates/default/usercp_viewprofile.tpl
+++ b/styles/templates/default/usercp_viewprofile.tpl
@@ -221,8 +221,8 @@ ajax.callback.gen_passkey = function(data){
 			{RANK_IMAGE}
 		<!-- ENDIF -->
 		</p>
-    <!-- IF BIRTHDAY_ICON --><div class="mrg_8">{BIRTHDAY_ICON}</div><!-- ENDIF -->
-		<h4 class="cat border bw_TB" id="username">{L_CONTACT} <span class="editable bold">{USERNAME}</span></h4>
+        <!-- IF BIRTHDAY_ICON --><div class="mrg_8">{BIRTHDAY_ICON}</div><!-- ENDIF -->
+		<h4 class="cat border bw_TB">{L_CONTACT}&nbsp;{USERNAME}</span></h4>
 
 		<div class="spacer_4"></div>
 
@@ -293,6 +293,12 @@ ajax.callback.gen_passkey = function(data){
 		<!-- ENDIF -->
 
 		<table class="user_details borderless w100">
+            <tr>
+                <th>{L_USERNAME}:</th>
+                <td id="username">
+                    <span class="editable bold">{USERNAME}</span>
+                </td>
+            </tr>
 			<!-- IF SHOW_ROLE -->
 			<tr>
 				<th>{L_ROLE}</th>
diff --git a/styles/templates/default/viewtopic.tpl b/styles/templates/default/viewtopic.tpl
index 9383f834f..828b88b23 100644
--- a/styles/templates/default/viewtopic.tpl
+++ b/styles/templates/default/viewtopic.tpl
@@ -240,8 +240,8 @@ function build_poll_add_form (src_el)
 			<!-- IF IN_MODERATION -->{L_MODERATE_TOPIC}<!-- ELSE --><a href="{PAGE_URL}&amp;mod=1&amp;start={PAGE_START}" class="small bold">{L_MODERATE_TOPIC}</a><!-- ENDIF -->
 			&nbsp;<span style="color:#CDCDCD;">|</span>&nbsp;
 			<a class="small bold" href="{PIN_HREF}">{PIN_TITLE}</a>
-      &nbsp;<span style="color:#CDCDCD;">|</span>&nbsp;
-      <a class="small bold" href="#" onclick="$('#main_content').printThis(); return false;">{L_PRINT_PAGE}</a>
+            &nbsp;<span style="color:#CDCDCD;">|</span>&nbsp;
+            <a class="small bold" href="#" onclick="$('#main_content').printThis(); return false;">{L_PRINT_PAGE}</a>
 		</td>
 		<!-- IF SELECT_PPP -->
 		<td class="med" style="padding: 0 4px 2px 4px;">|</td>