diff --git a/template/bricks/announcement.tpl.php b/template/bricks/announcement.tpl.php
index 4f674a06..4b5313ee 100644
--- a/template/bricks/announcement.tpl.php
+++ b/template/bricks/announcement.tpl.php
@@ -1,9 +1,13 @@
 <?php
     namespace Aowow\Template;
 
+    /** @var PageTemplate $this */
+
 foreach ($this->announcements as $a): ?>
+
             <div id="announcement-<?=$a->id;?>"></div>
             <script type="text/javascript">
                 <?=$a;?>
             </script>
+
 <?php endforeach; ?>
diff --git a/template/bricks/book.tpl.php b/template/bricks/book.tpl.php
index 2ef56dc4..e7b3922c 100644
--- a/template/bricks/book.tpl.php
+++ b/template/bricks/book.tpl.php
@@ -3,7 +3,10 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
 if ($this->book): ?>
+
                 <div class="clear"></div>
                 <h3><?=Lang::item('content'); ?></h3>
 
@@ -11,4 +14,5 @@ if ($this->book): ?>
                 <script>//<![CDATA[
                     <?=$this->book; ?>
                 //]]></script>
+
 <?php endif; ?>
diff --git a/template/bricks/contribute.tpl.php b/template/bricks/contribute.tpl.php
index 20d9834a..6f33b293 100644
--- a/template/bricks/contribute.tpl.php
+++ b/template/bricks/contribute.tpl.php
@@ -1,8 +1,15 @@
-<?php namespace Aowow; ?>
+<?php
+    namespace Aowow\Template;
+
+    use \Aowow\Lang;
+
+    /** @var \PageTemplate $this */
+?>
 
 <?php
 if ($this->contribute):
 ?>
+
 <div class="clear"></div>
 <div class="text">
 <h2><?=Lang::main('contribute'); ?></h2>
@@ -10,25 +17,30 @@ if ($this->contribute):
 <div id="tabs-contribute-generic" style="width: 50%"></div>
 <div class="text" style="margin-right: 310px">
     <div class="tabbed-contents" style="clear: none">
+
 <?php
     $this->localizedBrick('contrib', ['coError' => $this->community['coError'], 'ssError' => $this->community['ssError'], 'viError' => $this->community['viError']]);
 ?>
+
     </div>
 </div>
 <script type="text/javascript">
     var tabsContribute = new Tabs({parent: $WH.ge('tabs-contribute-generic')});
+
 <?php
     if ($this->contribute & CONTRIBUTE_CO):
-        echo "    tabsContribute.add(LANG.tab_addyourcomment, {id: 'add-your-comment'});\n";
+        echo "    tabsContribute.add(LANG.tab_addyourcomment, {id: 'add-your-comment'});".PHP_EOL;
     endif;
     if ($this->contribute & CONTRIBUTE_SS):
-        echo "    tabsContribute.add(LANG.tab_submitascreenshot, {id: 'submit-a-screenshot'});\n";
+        echo "    tabsContribute.add(LANG.tab_submitascreenshot, {id: 'submit-a-screenshot'});".PHP_EOL;
     endif;
     if ($this->contribute & CONTRIBUTE_VI):
-        echo "    if (g_user && g_user.roles & (U_GROUP_ADMIN | U_GROUP_BUREAU | U_GROUP_VIDEO))\n";
-        echo "        tabsContribute.add(LANG.tab_suggestavideo, {id: 'suggest-a-video'});\n";
+        echo "    if (g_user && g_user.roles & (U_GROUP_ADMIN | U_GROUP_BUREAU | U_GROUP_VIDEO))".PHP_EOL;
+        echo "        tabsContribute.add(LANG.tab_suggestavideo, {id: 'suggest-a-video'});".PHP_EOL;
     endif;
 ?>
+
     tabsContribute.flush();
 </script>
+
 <?php endif; ?>
diff --git a/template/bricks/footer.tpl.php b/template/bricks/footer.tpl.php
index 73eb9586..d42b2964 100644
--- a/template/bricks/footer.tpl.php
+++ b/template/bricks/footer.tpl.php
@@ -2,31 +2,35 @@
     namespace Aowow\Template;
 
     use \Aowow\Lang;
+
+    /** @var PageTemplate $this */
 ?>
 
         <div class="footer">
+
 <?php
 if ($this->pageStats):
-    echo "            <table style=\"margin:auto;\">\n";
+    echo '            <table style="margin:auto;">'.PHP_EOL;
 
     if ($x = $this->pageStats['sql']):
-        echo '                <tr><td style="text-align:left;">'.Lang::main('numSQL') .'</td><td>'.$x['count']."</td></tr>\n";
-        echo '                <tr><td style="text-align:left;">'.Lang::main('timeSQL').'</td><td>'.$x['time']."</td></tr>\n";
+        echo '                <tr><td style="text-align:left;">'.Lang::main('numSQL') .'</td><td>'.$x['count']."</td></tr>".PHP_EOL;
+        echo '                <tr><td style="text-align:left;">'.Lang::main('timeSQL').'</td><td>'.$x['time']."</td></tr>".PHP_EOL;
     endif;
 
     if ($x = $this->pageStats['time']):
-        echo '                <tr><td style="text-align:left;">Page generated in</td><td>'.$x."</td></tr>\n";
+        echo '                <tr><td style="text-align:left;">Page generated in</td><td>'.$x."</td></tr>".PHP_EOL;
     endif;
 
     if ($this->pageStats['cache'] && $this->pageStats['cache'][0] == CACHE_MODE_FILECACHE):
-        echo "                <tr><td style=\"text-align:left;\">Stored in filecache</td><td>".$this->pageStats['cache'][1]."</td></tr>\n";
+        echo '                <tr><td style="text-align:left;">Stored in filecache</td><td>'.$this->pageStats['cache'][1].'</td></tr>'.PHP_EOL;
     elseif ($this->pageStats['cache'] && $this->pageStats['cache'][0] == CACHE_MODE_MEMCACHED):
-        echo "                <tr><td style=\"text-align:left;\">Stored in Memcached</td><td>".$this->pageStats['cache'][1]."</td></tr>\n";
+        echo '                <tr><td style="text-align:left;">Stored in Memcached</td><td>'.$this->pageStats['cache'][1].'</td></tr>'.PHP_EOL;
     endif;
 
-    echo "            </table>\n";
+    echo '            </table>'.PHP_EOL;
 endif;
 ?>
+
         </div>
     </div><!-- #wrapper .nosidebar -->
     </div><!-- #layout-inner -->
@@ -44,6 +48,8 @@ endif;
 <script type="text/javascript">
     window.open("/", "SqlLog", "width=1800,height=200,top=100,left=100,status=no,location=no,toolbar=no,menubar=no")?.document?.write('<?=$this->dbProfiles;?>');
 </script>
+
 <?php endif; ?>
+
 </body>
 </html>
diff --git a/template/bricks/head.tpl.php b/template/bricks/head.tpl.php
index 2ecc6468..e279d8ff 100644
--- a/template/bricks/head.tpl.php
+++ b/template/bricks/head.tpl.php
@@ -2,6 +2,8 @@
     namespace Aowow\Template;
 
     use \Aowow\Lang;
+
+    /** @var PageTemplate $this */
 ?>
 
     <title><?=$this->concat('title', ' - '); ?></title>
@@ -14,32 +16,39 @@
         var g_serverTime = <?=$this->gServerTime; ?>;
         var g_staticUrl = "<?=$this->gStaticUrl; ?>";
         var g_host = "<?=$this->gHost; ?>";
+
 <?php
 if ($this->gDataKey):
-        echo "        var g_dataKey = '".$_SESSION['dataKey']."'\n";
+        echo "        var g_dataKey = '".$_SESSION['dataKey']."'".PHP_EOL;
 endif;
 ?>
+
     </script>
 <?=$this->renderArray('js', 4); ?>
 <script type="text/javascript">
         var g_user = <?=$this->gUser; ?>;
+
 <?php
 if ($this->gFavorites):
-    echo "        g_favorites = ".$this->gFavorites.";\n";
+    echo '        g_favorites = '.$this->gFavorites.';'.PHP_EOL;
 endif;
 ?>
+
     </script>
 
 <?php if ($this->hasAnalytics): ?>
     <script>
         $WH.Track.gaInit();
     </script>
+
 <?php
 endif;
 
 if ($this->rss):
 ?>
+
     <link rel="alternate" type="application/rss+xml" title="<?=$this->concat('title', ' - '); ?>" href="<?=$this->rss; ?>"/>
+
 <?php
 endif;
 ?>
diff --git a/template/bricks/headIcons.tpl.php b/template/bricks/headIcons.tpl.php
index d6fdb62d..5d1225c1 100644
--- a/template/bricks/headIcons.tpl.php
+++ b/template/bricks/headIcons.tpl.php
@@ -1,18 +1,24 @@
 <?php
     namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
 ?>
 
 <?php
 if ($this->headIcons):
     foreach ($this->headIcons as $k => $v):
-        echo '<div id="h1-icon-'.$k."\" class=\"h1-icon\"></div>\n";
+        echo '<div id="h1-icon-'.$k.'" class="h1-icon"></div>'.PHP_EOL;
     endforeach;
 ?>
+
 <script type="text/javascript">//<![CDATA[
+
 <?php
     foreach ($this->headIcons as $k => $v):
-        echo "\$WH.ge('h1-icon-".$k."').appendChild(Icon.create('".$this->escJS($v)."', 1));\n";
+        echo "\$WH.ge('h1-icon-".$k."').appendChild(Icon.create('".$this->escJS($v)."', 1));".PHP_EOL;
     endforeach;
 ?>
+
 //]]></script>
+
 <?php endif; ?>
diff --git a/template/bricks/header.tpl.php b/template/bricks/header.tpl.php
index ae143fab..6910b755 100644
--- a/template/bricks/header.tpl.php
+++ b/template/bricks/header.tpl.php
@@ -1,14 +1,19 @@
 <?php
     namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
 ?>
+
 <!DOCTYPE html>
 <html>
 <head>
+
 <?php $this->brick('head'); ?>
 </head>
 
 <body<?=($this->user::isPremium() ? ' class="premium-logo"' : ''); ?>>
 <div id="layers"></div>
+
 <?php if ($this->headerLogo): ?>
 <style type="text/css">
     .header-logo {
@@ -16,7 +21,9 @@
        margin-bottom: 1px !important;
     }
 </style>
+
 <?php endif; ?>
+
 <div class="layout nosidebar" id="layout">
     <div class="layout-inner" id="layout-inner">
     <div class="header" id="header">
diff --git a/template/bricks/headerMenu.tpl.php b/template/bricks/headerMenu.tpl.php
index b5165e80..4544ac7d 100644
--- a/template/bricks/headerMenu.tpl.php
+++ b/template/bricks/headerMenu.tpl.php
@@ -2,6 +2,8 @@
     namespace Aowow\Template;
 
     use \Aowow\Lang;
+
+    /** @var PageTemplate $this */
 ?>
 
 <?php
@@ -13,4 +15,5 @@ else:
     echo '<a href="?account=signin">'.Lang::main('signIn').'</a>';
 endif;
 ?>
+
 |<a href="#" id="toplinks-feedback" class="icon-email"><?=Lang::main('feedback'); ?></a>|<a href="javascript:;" id="toplinks-language"><?=Lang::main('language'); ?></a>
diff --git a/template/bricks/infobox.tpl.php b/template/bricks/infobox.tpl.php
index 60252209..89bb537c 100644
--- a/template/bricks/infobox.tpl.php
+++ b/template/bricks/infobox.tpl.php
@@ -2,14 +2,17 @@
     namespace Aowow\Template;
 
     use \Aowow\Lang;
+
+    /** @var PageTemplate $this */
 ?>
 
 <?php
 if ($this->infobox || $this->contributions || $this->series || $this->contribute & (CONTRIBUTE_SS | CONTRIBUTE_VI)):
-echo "    <table class=\"infobox\">\n";
+echo '    <table class="infobox">'.PHP_EOL;
 
     if ($this->infobox):
 ?>
+
         <tr><th id="infobox-quick-facts"><?=Lang::main('quickFacts'); ?></th></tr>
         <tr><td>
             <div class="infobox-spacer"></div>
@@ -18,11 +21,13 @@ echo "    <table class=\"infobox\">\n";
                 <?=$this->infobox; ?>
             </script>
         </td></tr>
+
 <?php
     endif;
 
     if ($this->contributions):
 ?>
+
         <tr><th id="infobox-contributions"><?=Lang::user('contributions'); ?></th></tr>
         <tr><td>
             <div class="infobox-spacer"></div>
@@ -31,6 +36,7 @@ echo "    <table class=\"infobox\">\n";
                 <?=$this->contributions; ?>
             </script>
         </td></tr>
+
 <?php
     endif;
 
@@ -42,31 +48,39 @@ echo "    <table class=\"infobox\">\n";
 
     if ($this->contribute & CONTRIBUTE_SS):
 ?>
+
         <tr><th id="infobox-screenshots"><?=Lang::main('screenshots'); ?></th></tr>
         <tr><td><div class="infobox-spacer"></div><div id="infobox-sticky-ss"></div></td></tr>
+
 <?php
     endif;
 
     if ($this->contribute & CONTRIBUTE_VI && ($this->user::isInGroup(U_GROUP_ADMIN | U_GROUP_BUREAU | U_GROUP_VIDEO) || !empty($this->community['vi']))):
 ?>
+
         <tr><th id="infobox-videos"><?=Lang::main('videos'); ?></th></tr>
         <tr><td><div class="infobox-spacer"></div><div id="infobox-sticky-vi"></div></td></tr>
     <script type="text/javascript">$WH.prepInfobox()</script>
+
 <?php
     endif;
 
     if ($this->contribute & CONTRIBUTE_SS):
 ?>
+
     <script type="text/javascript">ss_appendSticky()</script>
+
 <?php
     endif;
 
     if ($this->contribute & CONTRIBUTE_VI && ($this->user::isInGroup(U_GROUP_ADMIN | U_GROUP_BUREAU | U_GROUP_VIDEO) || !empty($this->community['vi']))):
 ?>
+
     <script type="text/javascript">vi_appendSticky()</script>
+
 <?php
     endif;
 
-    echo "    </table>\n";
+    echo '    </table>'.PHP_EOL;
 endif;
 ?>
diff --git a/template/bricks/inputbox-form-email.tpl.php b/template/bricks/inputbox-form-email.tpl.php
index dfc7be5d..c12bff9b 100644
--- a/template/bricks/inputbox-form-email.tpl.php
+++ b/template/bricks/inputbox-form-email.tpl.php
@@ -3,6 +3,7 @@
 
     use \Aowow\Lang;
 ?>
+
             <div class="pad3"></div>
 
             <script type="text/javascript">//<![CDATA[
@@ -30,10 +31,13 @@
                 <div class="inputbox">
                     <h1><?=$head ?? ''; ?></h1>
                     <div id="inputbox-error"><?=$error ?? ''; ?></div>
+
 <?php if ($message ?? ''): ?>
                     <?=$message; ?>
                     <div class="pad2"></div>
+
 <?php endif; ?>
+
                     <div style="text-align: center">
                         <?=Lang::account('email').Lang::main('colon'); ?><input type="text" name="email" value="" id="email-generic" style="width: 12em" />
                         <div class="pad2"></div>
diff --git a/template/bricks/inputbox-form-password.tpl.php b/template/bricks/inputbox-form-password.tpl.php
index 5f76c375..f7629e42 100644
--- a/template/bricks/inputbox-form-password.tpl.php
+++ b/template/bricks/inputbox-form-password.tpl.php
@@ -3,6 +3,7 @@
 
     use \Aowow\Lang;
 ?>
+
             <div class="pad3"></div>
 
             <script type="text/javascript">
diff --git a/template/bricks/inputbox-form-signin.tpl.php b/template/bricks/inputbox-form-signin.tpl.php
index 4fa30d83..06944c46 100644
--- a/template/bricks/inputbox-form-signin.tpl.php
+++ b/template/bricks/inputbox-form-signin.tpl.php
@@ -2,7 +2,10 @@
     namespace Aowow\Template;
 
     use \Aowow\Lang;
+
+    /** @var PageTemplate $this */
 ?>
+
             <div class="pad3"></div>
 
             <script type="text/javascript">
@@ -53,13 +56,17 @@
 <?php if ($hasRecovery): ?>
                     <br />
                     <div style="position: absolute; right: 5px; bottom: 5px; white-space: nowrap;"><?=Lang::account('forgot').Lang::main('colon'); ?><a href="?account=forgot-username"><?=Lang::account('forgotUser'); ?></a> | <a href="?account=forgot-password"><?=Lang::account('forgotPass'); ?></a> | <a href="?account=resend"><?=Lang::account('inputbox', 'head', 'resendMail'); ?></a></div>
+
 <?php endif; ?>
+
                 </div>
             </form>
 
             <div class="pad3"></div>
+
 <?php if ($this->cfg('ACC_ALLOW_REGISTER')): ?>
             <div style="text-align: center; line-height: 1.5em; font-size: 125%"><?=Lang::account('accCreate'); ?></div>
+
 <?php endif; ?>
 
             <script type="text/javascript">$WH.ge('username-generic').focus()</script>
diff --git a/template/bricks/inputbox-form-signup.tpl.php b/template/bricks/inputbox-form-signup.tpl.php
index 20724f66..876ff2e5 100644
--- a/template/bricks/inputbox-form-signup.tpl.php
+++ b/template/bricks/inputbox-form-signup.tpl.php
@@ -3,6 +3,7 @@
 
     use \Aowow\Lang;
 ?>
+
             <div class="pad3"></div>
 
             <script type="text/javascript">
diff --git a/template/bricks/inputbox-status.tpl.php b/template/bricks/inputbox-status.tpl.php
index 7f63d54c..dbd52050 100644
--- a/template/bricks/inputbox-status.tpl.php
+++ b/template/bricks/inputbox-status.tpl.php
@@ -1,16 +1,17 @@
 <?php
     namespace Aowow\Template;
-
-    use \Aowow\Lang;
 ?>
+
             <div class="pad3"></div>
 
             <div class="inputbox">
                 <h1><?=$head ?? ''; ?></h1>
                 <div id="inputbox-error"><?=$error ?? ''; ?></div>
+
     <?php if ($message ?? ''): ?>
                 <div style="text-align: center; font-size: 110%"><?=$message; ?></div>
     <?php else: ?>
                 <div class="clear"></div>
     <?php endif; ?>
+
             </div>
diff --git a/template/bricks/lvTabs.tpl.php b/template/bricks/lvTabs.tpl.php
index 9745b9a1..8bdb7093 100644
--- a/template/bricks/lvTabs.tpl.php
+++ b/template/bricks/lvTabs.tpl.php
@@ -1,24 +1,30 @@
 <?php
     namespace Aowow\Template;
 
-    use \Aowow\Lang;
+    /** @var PageTemplate $this */
 ?>
 
 <?php
 if (($this->lvTabs && count($this->lvTabs)) || $this->charactersLvData || $this->profilesLvData || $this->contribute):
     if ($this->lvTabs?->isTabbed()):
 ?>
+
             <div class="clear"></div>
             <div id="tabs-generic"></div>
+
 <?php endif; ?>
+
             <div id="lv-generic" class="listview">
+
 <?php
     foreach ($this->lvTabs?->getDataContainer() ?? [] as $container):
         echo '                '.$container.PHP_EOL;
     endforeach;
 ?>
+
             </div>
             <script type="text/javascript">//<![CDATA[
+
 <?php
     // seems like WH keeps their modules separated, as fi_gemScores should be with the other fi_ items but are here instead and originally the dbtype globals used by the listviews were also here)
     // May 2025: WH no longer calculates gems into item scores. Dude .. why?
@@ -47,10 +53,12 @@ if (($this->lvTabs && count($this->lvTabs)) || $this->charactersLvData || $this-
     endif;
 
     if ($flushTabs = $this->lvTabs?->getFlush()):
-        echo "                ".$flushTabs.PHP_EOL;
+        echo '                '.$flushTabs.PHP_EOL;
     endif;
 ?>
+
             //]]></script>
+
 <?php
 endif;
 ?>
diff --git a/template/bricks/mail.tpl.php b/template/bricks/mail.tpl.php
index 27bdbe48..384955f2 100644
--- a/template/bricks/mail.tpl.php
+++ b/template/bricks/mail.tpl.php
@@ -3,36 +3,44 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
 if (['header' => $header, 'subject' => $subject, 'text' => $text, 'attachments' => $attachments] = $this->mail):
     $offset ??= 0;                                          // in case we have multiple icons on the page (prominently quest-rewards)
 
-    echo '                        <h3>'.Lang::mail('mailDelivery', $header)."</h3>\n";
+    echo '                        <h3>'.Lang::mail('mailDelivery', $header).'</h3>'.PHP_EOL;
 
     if ($subject):
-        echo '                        <div class="book"><div class="page">'.$subject."</div></div>\n";
+        echo '                        <div class="book"><div class="page">'.$subject.'</div></div>'.PHP_EOL;
     endif;
 
     if ($text):
-        echo '                        <div class="book" style="float:left; margin-bottom:26px;"><div class="page">'.$text."</div></div>\n";
+        echo '                        <div class="book" style="float:left; margin-bottom:26px;"><div class="page">'.$text.'</div></div>'.PHP_EOL;
     endif;
 
     if ($attachments):
 ?>
+
                 <table class="icontab icontab-box" style="padding-left:10px;">
+
 <?php
         foreach ($attachments as $icon):
             echo $icon->renderContainer(20, $offset, true);
         endforeach;
 ?>
+
                 </table>
 
                 <script type="text/javascript">//<![CDATA[
+
 <?php
         foreach ($attachments as $icon):
             echo $icon->renderJS(20);
         endforeach;
 ?>
+
                 //]]></script>
+
 <?php
     endif;
 endif;
diff --git a/template/bricks/mapper.tpl.php b/template/bricks/mapper.tpl.php
index 37832ad0..0bad6e70 100644
--- a/template/bricks/mapper.tpl.php
+++ b/template/bricks/mapper.tpl.php
@@ -3,63 +3,86 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
 if ([$mapper, $mapperData, $som, $foundIn] = $this->map):
     if ($foundIn):
         echo '            <div>'.$foundIn[0].' <span id="mapper-zone-generic">';
         echo Lang::concat($mapperData, true, function ($areaData, $areaId) use ($foundIn) {
             return '<a href="javascript:;" onclick="myMapper.update({zone: '.$areaId.'}); g_setSelectedLink(this, \'mapper\'); return false" onmousedown="return false">'.$foundIn[$areaId].'</a>&nbsp;('.array_sum(array_column($areaData, 'count')).')';
         });
-        echo ".</span></div>\n";
+        echo '.</span></div>'.PHP_EOL;
     else:
-        echo "            <div id=\"mapper-zone-generic\"></div>\n";
+        echo '            <div id="mapper-zone-generic"></div>'.PHP_EOL;
     endif;
 
     if (isset($mapper['zone']) && $mapper['zone'] < 0):
 ?>
+
             <div id="mapper" style="width: 778px; margin: 0 auto">
+
 <?php
         if ($som):
 ?>
+
                 <div id="som-generic"></div>
+
 <?php
         endif;
 ?>
+
                 <div id="mapper-generic"></div>
                 <div class="pad clear"></div>
             </div>
+
 <?php
     elseif ($mapper):
         if ($som):
 ?>
+
             <div class="pad"></div>
             <div id="som-generic"></div>
+
 <?php
         endif;
 ?>
+
             <div id="mapper-generic"></div>
             <div style="clear: left"></div>
+
 <?php
     else:
 ?>
+
             <?=Lang::zone('noMap');?>
             <div class="pad"></div>
+
 <?php
     endif;
 ?>
+
             <script type="text/javascript">//<![CDATA[
+
 <?php if (isset($mapper['zone']) && $this->gPageInfo): ?>
                 $.extend(g_pageInfo, {id: <?=$mapper['zone'];?>});
+
 <?php elseif (isset($mapper['zone'])): ?>
                 var g_pageInfo = {id: <?=$mapper['zone'];?>};
+
 <?php elseif ($mapperData): ?>
                 var g_mapperData = <?=$this->json($mapperData);?>;
+
 <?php endif; ?>
+
                 var myMapper = new Mapper(<?=$this->json($mapper);?>);
+
 <?php if ($som): ?>
                 new ShowOnMap(<?=$this->json($som);?>);
+
 <?php endif;
       if ($foundIn): ?>
                 $WH.gE($WH.ge('mapper-zone-generic'), 'a')[0].onclick();
+
 <?php endif;
       if ($this->user::isInGroup(U_GROUP_MODERATOR)): ?>
 
@@ -78,6 +101,9 @@ if ([$mapper, $mapperData, $som, $foundIn] = $this->map):
                         },
                     });
                 }
+
 <?php endif; ?>
+
             //]]></script>
+
 <?php endif; ?>
diff --git a/template/bricks/markup.tpl.php b/template/bricks/markup.tpl.php
index 69801b13..95d7038c 100644
--- a/template/bricks/markup.tpl.php
+++ b/template/bricks/markup.tpl.php
@@ -5,4 +5,5 @@
         <?=$markup;?>
     //]]></script>
     <div class="pad2"></div>
+
 <?php endif; ?>
diff --git a/template/bricks/pageTemplate.tpl.php b/template/bricks/pageTemplate.tpl.php
index 7934d751..17c37a7a 100644
--- a/template/bricks/pageTemplate.tpl.php
+++ b/template/bricks/pageTemplate.tpl.php
@@ -1,40 +1,44 @@
 <?php
     namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
 ?>
 
             <script type="text/javascript">//<![CDATA[
+
 <?php
 if ($this->contribute & CONTRIBUTE_CO):
-    echo "                var lv_comments = ".$this->community['co'].";\n";
+    echo '                var lv_comments = '.$this->community['co'].';'.PHP_EOL;
 endif;
 if ($this->contribute & CONTRIBUTE_SS):
-    echo "                var lv_screenshots = ".$this->community['ss'].";\n";
+    echo '                var lv_screenshots = '.$this->community['ss'].';'.PHP_EOL;
 endif;
 if ($this->contribute & CONTRIBUTE_VI):
-    echo "                var lv_videos = ".$this->community['vi'].";\n";
+    echo '                var lv_videos = '.$this->community['vi'].';'.PHP_EOL;
 endif;
 
 if ($this->gPageInfo):
-    echo "                var g_pageInfo = ".$this->json('gPageInfo', varRef: true).";\n";
+    echo '                var g_pageInfo = '.$this->json('gPageInfo', varRef: true).';'.PHP_EOL;
 
     // set by ItemBaseEndpoint
     if ($this->user::isLoggedIn() && !empty($this->redButtons[BUTTON_EQUIP])):
-        echo "                \$(document).ready(function() { pr_addEquipButton('equip-pinned-button', ".$this->typeId."); });\n";
+        echo "                \$(document).ready(function() { pr_addEquipButton('equip-pinned-button', ".$this->typeId."); });".PHP_EOL;
     endif;
 endif;
 
 if ($this->pageTemplate):
     if ($this->locale->value && $this->pageTemplate['pageName'] != 'home'):
-        echo "                Locale.set(".$this->locale->value.");\n";
+        echo '                Locale.set('.$this->locale->value.');'.PHP_EOL;
     endif;
-    echo "                PageTemplate.set(".$this->json('pageTemplate', varRef: true).");\n";
+    echo '                PageTemplate.set('.$this->json('pageTemplate', varRef: true).');'.PHP_EOL;
 endif;
-    echo "                PageTemplate.init();\n";
+    echo '                PageTemplate.init();'.PHP_EOL;
 
 if (isset($fiQuery) && count($fiMenuItem) > 1 && array_slice($fiMenuItem, 0, 2) == [1, 5]):
-    echo "                \$(document).ready(function(){ Menu.modifyUrl(Menu.findItem(mn_path, ".$this->json($fiMenuItem)."), { filter: '".$this->escJS($fiQuery)."'}, { onAppendCollision: fi_mergeFilterParams }) });\n";
+    echo "                \$(document).ready(function(){ Menu.modifyUrl(Menu.findItem(mn_path, ".$this->json($fiMenuItem)."), { filter: '".$this->escJS($fiQuery)."'}, { onAppendCollision: fi_mergeFilterParams }) });".PHP_EOL;
 elseif (isset($fiQuery)):
-    echo "                Menu.modifyUrl(Menu.findItem(mn_database, ".$this->json($fiMenuItem)."), { filter: '+=".$this->escJS($fiQuery)."' }, { onAppendCollision: fi_mergeFilterParams, onAppendEmpty: fi_setFilterParams, menuUrl: Menu.getItemUrl(Menu.findItem(mn_database, ".$this->json($fiMenuItem).")) });\n";
+    echo "                Menu.modifyUrl(Menu.findItem(mn_database, ".$this->json($fiMenuItem)."), { filter: '+=".$this->escJS($fiQuery)."' }, { onAppendCollision: fi_mergeFilterParams, onAppendEmpty: fi_setFilterParams, menuUrl: Menu.getItemUrl(Menu.findItem(mn_database, ".$this->json($fiMenuItem).")) });".PHP_EOL;
 endif;
 ?>
+
             //]]></script>
diff --git a/template/bricks/reagentList.tpl.php b/template/bricks/reagentList.tpl.php
index 0bdd4a13..273f77f0 100644
--- a/template/bricks/reagentList.tpl.php
+++ b/template/bricks/reagentList.tpl.php
@@ -9,6 +9,7 @@
 <?php
 if ($enhanced):
 ?>
+
 <style type="text/css">
     .iconlist-col              { float: left; width: 31%; margin-right: 2%; }
     .iconlist                  { border-collapse: collapse; margin-top: 4px; }
@@ -165,14 +166,17 @@ function iconlist_expandall(tableid,doexpand) {
     }
 }
 //]]></script>
+
 <?php
 endif;
 ?>
 
 <table class="iconlist" id="reagent-list-generic">
+
 <?php
 if ($enhanced):
 ?>
+
     <tr>
         <th></th>
         <th align="left">
@@ -180,6 +184,7 @@ if ($enhanced):
             <input type="button" style="font-size: 11px; margin-right: 0.5em" onclick="iconlist_expandall('reagent-list-generic', false);" value="<?=Lang::spell('_collapseAll'); ?>">
         </th>
     </tr>
+
 <?php
 endif;
 
@@ -198,17 +203,20 @@ foreach ($reagents as $k => ['path' => $path, 'level' => $level, 'final' => $fin
         echo '<div class="iconlist-tree disclosure-off" onclick="iconlist_showhide(this);" style="padding-left: 0; cursor: pointer; width: 15px; float: left" id="spn.reagent-list-generic.'.$path.'">&nbsp;</div>';
     endif;
 
-    echo '<span class="'.$icon->quality.'">'.($icon->href ? '<a href="?'.$typeStr.'='.$icon->typeId.'">'.$icon->text.'</a>' : $icon->text).'</span>'.($icon->num > 1 ? '&nbsp;('.$icon->num.')' : '')."</td></tr>\n";
+    echo '<span class="'.$icon->quality.'">'.($icon->href ? '<a href="?'.$typeStr.'='.$icon->typeId.'">'.$icon->text.'</a>' : $icon->text).'</span>'.($icon->num > 1 ? '&nbsp;('.$icon->num.')' : '').'</td></tr>'.PHP_EOL;
 endforeach;
 ?>
+
 </table>
 
 <script type="text/javascript">//<![CDATA[
+
 <?php
 foreach ($reagents as ['icon' => $icon]):
     echo $icon->renderJS(4);
 endforeach;
 ?>
+
 //]]></script>
 
 <div class="clear"></div>
diff --git a/template/bricks/redButtons.tpl.php b/template/bricks/redButtons.tpl.php
index f011665d..8c9c4625 100644
--- a/template/bricks/redButtons.tpl.php
+++ b/template/bricks/redButtons.tpl.php
@@ -2,6 +2,8 @@
     namespace Aowow\Template;
 
     use \Aowow\Lang;
+
+    /** @var PageTemplate $this */
 ?>
 
 <?php
diff --git a/template/bricks/rewards.tpl.php b/template/bricks/rewards.tpl.php
index 12e70c5e..c8e336b8 100644
--- a/template/bricks/rewards.tpl.php
+++ b/template/bricks/rewards.tpl.php
@@ -4,35 +4,41 @@
 $offset ??= 0;                                              // in case we have multiple icons on the page (prominently quest-rewards)
 
 if ($rewTitle):
-    echo $rewTitle.' '.($extra ?? '')."\n";
+    echo $rewTitle.' '.($extra ?? '').PHP_EOL;
 endif;
 
 if ($rewards):
 ?>
+
                 <div class="pad"></div>
                 <table class="icontab icontab-box">
                     <tr>
+
 <?php
     $last = array_key_last($rewards);
     foreach ($rewards as $k => $icon):
         echo $icon->renderContainer(24, $offset);
-        echo $k % 2 && $k != $last ? str_repeat(' ', 24) . "</tr><tr>" : '';
+        echo $k % 2 && $k != $last ? str_repeat(' ', 24) . '</tr><tr>' : '';
     endforeach;
 
     if (count($rewards) % 2):
         echo '<th style="display: none"></th><td style="display: none"></td>';
     endif;
 ?>
+
                     </tr>
                 </table>
 
                 <script type="text/javascript">//<![CDATA[
+
 <?php
     foreach ($rewards as $icon):
         echo $icon->renderJS(20);
     endforeach;
 ?>
+
                 //]]></script>
+
 <?php
 endif;
 ?>
diff --git a/template/bricks/series.tpl.php b/template/bricks/series.tpl.php
index 8a1ec0ba..a803f4da 100644
--- a/template/bricks/series.tpl.php
+++ b/template/bricks/series.tpl.php
@@ -2,16 +2,20 @@
     namespace Aowow\Template;
 
     use \Aowow\Lang;
+
+    /** @var PageTemplate $this */
 ?>
 
     <tr><th id="infobox-series"><?=$listTitle ?: Lang::achievement('series'); ?></th></tr>
     <tr><td>
         <div class="infobox-spacer"></div>
         <table class="series">
+
 <?php
 foreach ($list as $idx => $itr):
     echo $this->renderSeriesItem($idx, $itr, 12);
 endforeach;
 ?>
+
         </table>
     </td></tr>
diff --git a/template/bricks/tooltip.tpl.php b/template/bricks/tooltip.tpl.php
index 358ecfcf..e80326b9 100644
--- a/template/bricks/tooltip.tpl.php
+++ b/template/bricks/tooltip.tpl.php
@@ -3,8 +3,11 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
     [$icName, $icStack, $hasBuff] = $this->tooltip;
 ?>
+
     <div id="ic<?=$this->typeId; ?>" style="float: left"></div>
     <div id="tt<?=$this->typeId; ?>" class="wowhead-tooltip" style="float: left; padding-top: 1px"></div>
     <div style="clear: left"></div>
@@ -14,8 +17,10 @@
 <?php
 if ($hasBuff):
 ?>
+
     <h3><?=Lang::spell('_aura'); ?></h3>
     <div id="btt<?=$this->typeId; ?>" class="wowhead-tooltip"></div>
+
 <?php
 endif;
 
@@ -31,19 +36,27 @@ endif;
     $WH.ge('ic<?=$this->typeId; ?>').appendChild(Icon.create('<?=$icName; ?>', 2, null, 0, <?=$icStack; ?>));
     var
         tt  = $WH.ge('tt<?=$this->typeId; ?>'),
+
 <?php if ($hasBuff): ?>
         btt = $WH.ge('btt<?=$this->typeId; ?>'),
+
 <?php endif; ?>
+
         sl  = $WH.ge('sl<?=$this->typeId; ?>'),
         ks  = $WH.ge('ks<?=$this->typeId; ?>');
 
     tt.innerHTML = '<table><tr><td>' + ($WH.g_enhanceTooltip.bind(tt))(<?=$this->typeId; ?>, true, true, sl, null, [<?=$this->typeId; ?>], ks) + '</td><th style="background-position: top right"></th></tr><tr><th style="background-position: bottom left"></th><th style="background-position: bottom right"></th></tr></table>';
+
 <?php if ($hasBuff): ?>
     btt.innerHTML = '<table><tr><td>' + ($WH.g_enhanceTooltip.bind(btt))(<?=$this->typeId; ?>, true, true, sl, tt, [<?=$this->typeId; ?>], ks) + '</td><th style="background-position: top right"></th></tr><tr><th style="background-position: bottom left"></th><th style="background-position: bottom right"></th></tr></table>';
+
 <?php endif; ?>
 
     $WH.Tooltip.fixSafe(tt, 1, 1);
+
 <?php if ($hasBuff): ?>
     $WH.Tooltip.fixSafe(btt, 1, 1);
+
 <?php endif; ?>
+
 //]]></script>
diff --git a/template/localized/confirm-delete-account_0.tpl.php b/template/localized/confirm-delete-account_0.tpl.php
index db78173a..15a0ea92 100644
--- a/template/localized/confirm-delete-account_0.tpl.php
+++ b/template/localized/confirm-delete-account_0.tpl.php
@@ -1,3 +1,9 @@
+<?php
+    namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
+?>
+
 <div class="account-delete-box text">
     <form action="<?=$this->deleteFormTarget;?>" method="POST">
         <h1 class="heading-size-1">Please Confirm Account Deletion</h1>
diff --git a/template/localized/confirm-delete-account_2.tpl.php b/template/localized/confirm-delete-account_2.tpl.php
index 74e8b617..71227e07 100644
--- a/template/localized/confirm-delete-account_2.tpl.php
+++ b/template/localized/confirm-delete-account_2.tpl.php
@@ -1,3 +1,9 @@
+<?php
+    namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
+?>
+
 <div class="account-delete-box text">
     <form action="<?=$this->deleteFormTarget;?>" method="POST">
         <h1 class="heading-size-1">Veuillez confirmer la suppression du compte</h1>
diff --git a/template/localized/confirm-delete-account_3.tpl.php b/template/localized/confirm-delete-account_3.tpl.php
index 637f018f..651b728a 100644
--- a/template/localized/confirm-delete-account_3.tpl.php
+++ b/template/localized/confirm-delete-account_3.tpl.php
@@ -1,3 +1,9 @@
+<?php
+    namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
+?>
+
 <div class="account-delete-box text">
     <form action="<?=$this->deleteFormTarget;?>" method="POST">
         <h1 class="heading-size-1">Bitte Kontolöschung bestätigen</h1>
diff --git a/template/localized/confirm-delete-account_4.tpl.php b/template/localized/confirm-delete-account_4.tpl.php
index e4c023c3..6eae62da 100644
--- a/template/localized/confirm-delete-account_4.tpl.php
+++ b/template/localized/confirm-delete-account_4.tpl.php
@@ -1,3 +1,9 @@
+<?php
+    namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
+?>
+
 <div class="account-delete-box text">
     <form action="<?=$this->deleteFormTarget;?>" method="POST">
         <h1 class="heading-size-1">请确认删除账户</h1>
diff --git a/template/localized/confirm-delete-account_6.tpl.php b/template/localized/confirm-delete-account_6.tpl.php
index 18f58f57..0587085a 100644
--- a/template/localized/confirm-delete-account_6.tpl.php
+++ b/template/localized/confirm-delete-account_6.tpl.php
@@ -1,3 +1,9 @@
+<?php
+    namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
+?>
+
 <div class="account-delete-box text">
     <form action="<?=$this->deleteFormTarget;?>" method="POST">
         <h1 class="heading-size-1">Confirmar la eliminación de la cuenta</h1>
diff --git a/template/localized/confirm-delete-account_8.tpl.php b/template/localized/confirm-delete-account_8.tpl.php
index af869141..d9b9a0b1 100644
--- a/template/localized/confirm-delete-account_8.tpl.php
+++ b/template/localized/confirm-delete-account_8.tpl.php
@@ -1,3 +1,9 @@
+<?php
+    namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
+?>
+
 <div class="account-delete-box text">
     <form action="<?=$this->deleteFormTarget;?>" method="POST">
         <h1 class="heading-size-1">Подтвердите удаление аккаунта</h1>
diff --git a/template/localized/contrib_0.tpl.php b/template/localized/contrib_0.tpl.php
index ff602637..ede60c11 100644
--- a/template/localized/contrib_0.tpl.php
+++ b/template/localized/contrib_0.tpl.php
@@ -1,5 +1,7 @@
 <?php
     namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
 ?>
 
         <div id="tab-add-your-comment" style="display: none">
@@ -10,29 +12,40 @@
             <li><div>Please post questions on our <a href="?forums">forums</a> for quicker reply.</div></li>
             <li><div>You might want to proof-read your comments before posting them.</div></li>
             </ul>
+
 <?php
-    echo $coError ? "            <div class=\"pad\"></div>\n            <div class=\"msg-failure\">".$coError."</div>\n" : '';
+    if ($coError):
+        echo '            <div class="pad"></div>'.PHP_EOL;
+        echo '            <div class="msg-failure">'.$coError.'</div>'.PHP_EOL;
+    endif;
 
     if ($this->user::canComment()):
 ?>
+
             <form name="addcomment" action="?comment=add&amp;type=<?=$this->type.'&amp;typeid='.$this->typeId; ?>" method="post" onsubmit="return co_validateForm(this)">
                 <div id="funcbox-generic"></div>
                 <script type="text/javascript">Listview.funcBox.coEditAppend($('#funcbox-generic'), {body: ''}, 1)</script>
                 <div class="pad"></div>
                 <input type="submit" value="Submit"></input>
+
 <?php
     else:
 ?>
+
             <form action="/" method="post">
             <div class="comment-edit-body"><textarea class="comment-editbox" rows="10" cols="40" name="commentbody" disabled="disabled"></textarea></div>
+
 <?php
     endif;
     if (!$this->user::isLoggedIn()):
 ?>
+
             <small>You are not logged in. Please <a href="?account=signin">log in</a> or <a href="?account=signup">register an account</a> to add your comment.</small>
+
 <?php
     endif;
 ?>
+
             </form>
         </div>
         <div id="tab-submit-a-screenshot" style="display: none">
@@ -42,39 +55,55 @@
             <li><div>The higher the quality the better!</div></li>
             <li><div>Be sure to read the <a href="?help=screenshots-tips-tricks" target="_blank">tips &amp; tricks</a> if you haven't before.</div></li>
             </ul>
+
 <?php
-    echo $ssError ? "            <div class=\"pad\"></div>\n            <div class=\"msg-failure\">".$ssError."</div>\n" : '';
+    if ($ssError):
+        echo '            <div class="pad"></div>'.PHP_EOL;
+        echo '            <div class="msg-failure">'.$ssError.'</div>'.PHP_EOL;
+    endif;
 
     if ($this->user::canUploadScreenshot()):
 ?>
+
             <form action="?screenshot=add&<?=$this->type.'.'.$this->typeId; ?>" method="post" enctype="multipart/form-data" onsubmit="return ss_validateForm(this)">
             <input type="file" name="screenshotfile" style="width: 35%"/><br />
             <div class="pad2"></div>
             <input type="submit" value="Submit" />
             <div class="pad3"></div>
             <small class="q0">Note: Your Screenshot will need to be approved before appearing on the site.</small>
+
 <?php
     else:
 ?>
+
             <form action="/" method="post">
             <input type="file" name="screenshotfile" disabled="disabled" /><br />
+
 <?php
     endif;
     if (!$this->user::isLoggedIn()):
 ?>
+
             <small>You are not signed in. Please <a href="?account=signin">sign in</a> to submit a screenshot.</small>
+
 <?php
     endif;
 ?>
+
             </form>
         </div>
         <div id="tab-suggest-a-video" style="display: none">
             Simply type the URL of the video in the form below.
+
 <?php
-    echo $viError ? "            <div class=\"pad\"></div>\n            <div class=\"msg-failure\">".$viError."</div>\n" : '';
+    if ($viError):
+        echo '            <div class="pad"></div>'.PHP_EOL;
+        echo '            <div class="msg-failure">'.$viError.'</div>'.PHP_EOL;
+    endif;
 
     if ($this->user::canSuggestVideo()):
 ?>
+
             <div class="pad2"></div>
             <form action="?video=add&<?=$this->type.'.'.$this->typeId; ?>" method="post" enctype="multipart/form-data" onsubmit="return vi_validateForm(this)">
             <input type="text" name="videourl" style="width: 35%" /> <small>Supported: YouTube only</small>
@@ -82,18 +111,24 @@
             <input type="submit" value="Submit" />
             <div class="pad3"></div>
             <small class="q0">Note: Your video will need to be approved before appearing on the site.</small>
+
 <?php
     else:
 ?>
+
             <form action="/" method="post">
             <input type="text" name="videourl" disabled="disabled" /><br />
+
 <?php
     endif;
     if (!$this->user::isLoggedIn()):
 ?>
+
             <small>You are not signed in. Please <a href="?account=signin">sign in</a> to submit a video.</small>
+
 <?php
     endif;
 ?>
+
             </form>
         </div>
diff --git a/template/localized/contrib_2.tpl.php b/template/localized/contrib_2.tpl.php
index 49a2859e..80eebf38 100644
--- a/template/localized/contrib_2.tpl.php
+++ b/template/localized/contrib_2.tpl.php
@@ -1,5 +1,7 @@
 <?php
     namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
 ?>
 
         <div id="tab-add-your-comment" style="display: none">
@@ -10,29 +12,40 @@
             <li><div>Posez vos questions sur le <a href="?forums">forum</a> afin d'avoir une réponse plus rapide.</div></li>
             <li><div>Il serait avisé de corriger vos fautes avant de soumettre vos commentaires.</div></li>
             </ul>
+
 <?php
-    echo $coError ? "            <div class=\"pad\"></div>\n            <div class=\"msg-failure\">".$coError."</div>\n" : '';
+    if ($coError):
+        echo '            <div class="pad"></div>'.PHP_EOL;
+        echo '            <div class="msg-failure">'.$coError.'</div>'.PHP_EOL;
+    endif;
 
     if ($this->user::canComment()):
 ?>
+
             <form name="addcomment" action="?comment=add&amp;type=<?=$this->type.'&amp;typeid='.$this->typeId; ?>" method="post" onsubmit="return co_validateForm(this)">
                 <div id="funcbox-generic"></div>
                 <script type="text/javascript">Listview.funcBox.coEditAppend($('#funcbox-generic'), {body: ''}, 1)</script>
                 <div class="pad"></div>
                 <input type="submit" value="Soumettre"></input>
+
 <?php
     else:
 ?>
+
             <form action="/" method="post">
             <div class="comment-edit-body"><textarea class="comment-editbox" rows="10" cols="40" name="commentbody" disabled="disabled"></textarea></div>
+
 <?php
     endif;
     if (!$this->user::isLoggedIn()):
 ?>
+
             <small>Vous n'êtes pas connecté(e). Veuillez vous <a href="?account=signin">connecter</a> ou vous <a href="?account=signup">inscrire</a> pour ajouter votre commentaire.</small>
+
 <?php
     endif;
 ?>
+
             </form>
         </div>
         <div id="tab-submit-a-screenshot" style="display: none">
@@ -42,39 +55,55 @@
             <li><div>Plus la qualité est haute, mieux c'est !</div></li>
             <li><div>Assurez-vous de lire les <a href="?help=screenshots-tips-tricks" target="_blank">trucs et astuces</a> si ce n'est pas déjà fait.</div></li>
             </ul>
+
 <?php
-    echo $ssError ? "            <div class=\"pad\"></div>\n            <div class=\"msg-failure\">".$ssError."</div>\n" : '';
+    if ($ssError):
+        echo '            <div class="pad"></div>'.PHP_EOL;
+        echo '            <div class="msg-failure">'.$ssError.'</div>'.PHP_EOL;
+    endif;
 
     if ($this->user::canUploadScreenshot()):
 ?>
+
             <form action="?screenshot=add&<?=$this->type.'.'.$this->typeId; ?>" method="post" enctype="multipart/form-data" onsubmit="return ss_validateForm(this)">
             <input type="file" name="screenshotfile" style="width: 35%"/><br />
             <div class="pad2"></div>
             <input type="submit" value="Soumettre" />
             <div class="pad3"></div>
             <small class="q0">Note: Votre capture d'écran devra être approuvé avant d'apparaitre sur le site.</small>
+
 <?php
     else:
 ?>
+
             <form action="/" method="post">
             <input type="file" name="screenshotfile" disabled="disabled" /><br />
+
 <?php
     endif;
     if (!$this->user::isLoggedIn()):
 ?>
+
             <small>Vous n'êtes pas connecté(e). Veuillez vous <a href="?account=signin">connecter</a> pour envoyer une capture d'écran.</small>
+
 <?php
     endif;
 ?>
+
             </form>
         </div>
         <div id="tab-suggest-a-video" style="display: none">
             Entrez simplement l'URL du vidéo dans le formulaire ci-dessous.
+
 <?php
-    echo $viError ? "            <div class=\"pad\"></div>\n            <div class=\"msg-failure\">".$viError."</div>\n" : '';
+    if ($viError):
+        echo '            <div class="pad"></div>'.PHP_EOL;
+        echo '            <div class="msg-failure">'.$viError.'</div>'.PHP_EOL;
+    endif;
 
     if ($this->user::canSuggestVideo()):
 ?>
+
             <div class="pad2"></div>
             <form action="?video=add&<?=$this->type.'.'.$this->typeId; ?>" method="post" enctype="multipart/form-data" onsubmit="return vi_validateForm(this)">
             <input type="text" name="videourl" style="width: 35%" /> <small>Supporté : Youtube seulement</small>
@@ -82,18 +111,24 @@
             <input type="submit" value="Soumettre" />
             <div class="pad3"></div>
             <small class="q0">Note: Votre vidéo devra être approuvé avant d'apparaitre sur le site.</small>
+
 <?php
     else:
 ?>
+
             <form action="/" method="post">
             <input type="text" name="videourl" disabled="disabled" /><br />
+
 <?php
     endif;
     if (!$this->user::isLoggedIn()):
 ?>
+
             <small>Vous n'êtes pas connecté(e). Veuillez vous <a href="?account=signin">connecter</a> pour envoyer une vidéo.</small>
+
 <?php
     endif;
 ?>
+
             </form>
         </div>
diff --git a/template/localized/contrib_3.tpl.php b/template/localized/contrib_3.tpl.php
index d0287c8a..f9d4933a 100644
--- a/template/localized/contrib_3.tpl.php
+++ b/template/localized/contrib_3.tpl.php
@@ -1,5 +1,7 @@
 <?php
     namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
 ?>
 
         <div id="tab-add-your-comment" style="display: none">
@@ -10,29 +12,40 @@
             <li><div>Es ist ratsam, den Kommentar vor dem Einsenden noch einmal auf Richtigkeit zu überprüfen.</div></li>
             <li><div>Stellt Eure Fragen bitte in unseren <a href="?forums">Foren</a>, wenn Ihr eine schnellere Antwort wünscht.</div></li>
             </ul>
+
 <?php
-    echo $coError ? "            <div class=\"pad\"></div>\n            <div class=\"msg-failure\">".$coError."</div>\n" : '';
+    if ($coError):
+        echo '            <div class="pad"></div>'.PHP_EOL;
+        echo '            <div class="msg-failure">'.$coError.'</div>'.PHP_EOL;
+    endif;
 
     if ($this->user::canComment()):
 ?>
+
             <form name="addcomment" action="?comment=add&amp;type=<?=$this->type.'&amp;typeid='.$this->typeId; ?>" method="post" onsubmit="return co_validateForm(this)">
                 <div id="funcbox-generic"></div>
                 <script type="text/javascript">Listview.funcBox.coEditAppend($('#funcbox-generic'), {body: ''}, 1)</script>
                 <div class="pad"></div>
                 <input type="submit" value="Absenden"></input>
+
 <?php
     else:
 ?>
+
             <form action="/" method="post">
             <div class="comment-edit-body"><textarea class="comment-editbox" rows="10" cols="40" name="commentbody" disabled="disabled"></textarea></div>
+
 <?php
     endif;
     if (!$this->user::isLoggedIn()):
 ?>
+
             <small>Ihr seid nicht angemeldet. Bitte <a href="?account=signin">meldet Euch an</a>, oder <a href="?account=signup">registriert Euch</a>, um einen Kommentar einzusenden.</small>
+
 <?php
     endif;
 ?>
+
             </form>
         </div>
         <div id="tab-submit-a-screenshot" style="display: none">
@@ -42,39 +55,55 @@
             <li><div>Je höher die Qualität, desto besser!</div></li>
             <li><div>Lest Euch unbedingt die <a href="?help=screenshots-tips-tricks" target="_blank">Tipps &amp; Tricks</a> durch, wenn nicht bereits geschehen.</div></li>
             </ul>
+
 <?php
-    echo $ssError ? "            <div class=\"pad\"></div>\n            <div class=\"msg-failure\">".$ssError."</div>\n" : '';
+    if ($ssError):
+        echo '            <div class="pad"></div>'.PHP_EOL;
+        echo '            <div class="msg-failure">'.$ssError.'</div>'.PHP_EOL;
+    endif;
 
     if ($this->user::canUploadScreenshot()):
 ?>
+
             <form action="?screenshot=add&<?=$this->type.'.'.$this->typeId; ?>" method="post" enctype="multipart/form-data" onsubmit="return ss_validateForm(this)">
             <input type="file" name="screenshotfile" style="width: 35%"/><br />
             <div class="pad2"></div>
             <input type="submit" value="Senden" />
             <div class="pad3"></div>
             <small class="q0">Hinweis: Euer Screenshot muss zunächst zugelassen werden, bevor er auf der Seite erscheint.</small>
+
 <?php
     else:
 ?>
+
             <form action="/" method="post">
             <input type="file" name="screenshotfile" disabled="disabled" /><br />
+
 <?php
     endif;
     if (!$this->user::isLoggedIn()):
 ?>
+
             <small>Ihr seid nicht angemeldet. Bitte <a href="?account=signin">meldet Euch an</a>, um einen Screenshot einzusenden.</small>
+
 <?php
     endif;
 ?>
+
             </form>
         </div>
         <div id="tab-suggest-a-video" style="display: none">
             Gebt einfach die URL des Videos im folgenden Formular ein.
+
 <?php
-    echo $viError ? "            <div class=\"pad\"></div>\n            <div class=\"msg-failure\">".$viError."</div>\n" : '';
+    if ($viError):
+        echo '            <div class="pad"></div>'.PHP_EOL;
+        echo '            <div class="msg-failure">'.$viError.'</div>'.PHP_EOL;
+    endif;
 
     if ($this->user::canSuggestVideo()):
 ?>
+
             <div class="pad2"></div>
             <form action="?video=add&<?=$this->type.'.'.$this->typeId; ?>" method="post" enctype="multipart/form-data" onsubmit="return vi_validateForm(this)">
             <input type="text" name="videourl" style="width: 35%" /> <small>Unterstützt: nur YouTube</small>
@@ -82,18 +111,24 @@
             <input type="submit" value="Senden" />
             <div class="pad3"></div>
             <small class="q0">Hinweis: Euer Video muss zunächst zugelassen werden, bevor es auf der Seite erscheint.</small>
+
 <?php
     else:
 ?>
+
             <form action="/" method="post">
             <input type="text" name="videourl" disabled="disabled" /><br />
+
 <?php
     endif;
     if (!$this->user::isLoggedIn()):
 ?>
+
             <small>Ihr seid nicht angemeldet. Bitte <a href="?account=signin">meldet Euch an</a>, um ein Video vorzuschlagen.</small>
+
 <?php
     endif;
 ?>
+
             </form>
         </div>
diff --git a/template/localized/contrib_4.tpl.php b/template/localized/contrib_4.tpl.php
index 297adb95..e96ee20e 100644
--- a/template/localized/contrib_4.tpl.php
+++ b/template/localized/contrib_4.tpl.php
@@ -1,5 +1,7 @@
 <?php
     namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
 ?>
 
         <div id="tab-add-your-comment" style="display: none">
@@ -10,29 +12,40 @@
             <li><div>请发表你的疑问在我们的<a href="?forums">论坛</a> 以获得更快的答复。</div></li>
             <li><div>你在发表前最好先预览下你的评论。</div></li>
             </ul>
+
 <?php
-    echo $coError ? "            <div class=\"pad\"></div>\n            <div class=\"msg-failure\">".$coError."</div>\n" : '';
+    if ($coError):
+        echo '            <div class="pad"></div>'.PHP_EOL;
+        echo '            <div class="msg-failure">'.$coError.'</div>'.PHP_EOL;
+    endif;
 
     if ($this->user::canComment()):
 ?>
+
             <form name="addcomment" action="?comment=add&amp;type=<?=$this->type.'&amp;typeid='.$this->typeId; ?>" method="post" onsubmit="return co_validateForm(this)">
                 <div id="funcbox-generic"></div>
                 <script type="text/javascript">Listview.funcBox.coEditAppend($('#funcbox-generic'), {body: ''}, 1)</script>
                 <div class="pad"></div>
                 <input type="submit" value="提交"></input>
+
 <?php
     else:
 ?>
+
             <form action="/" method="post">
             <div class="comment-edit-body"><textarea class="comment-editbox" rows="10" cols="40" name="commentbody" disabled="disabled"></textarea></div>
+
 <?php
     endif;
     if (!$this->user::isLoggedIn()):
 ?>
+
             <small>你尚未登录，请先<a href="?account=signin">登录</a>或<a href="?account=signup">注册一个账号</a> 以发表你的评论。</small>
+
 <?php
     endif;
 ?>
+
             </form>
         </div>
         <div id="tab-submit-a-screenshot" style="display: none">
@@ -42,39 +55,54 @@
             <li><div>越高的质量越好！</div></li>
             <li><div>请阅读我们的<a href="?help=screenshots-tips-tricks" target="_blank">提示和技巧</a>假如你还没看过的话。</div></li>
             </ul>
+
 <?php
-    echo $ssError ? "            <div class=\"pad\"></div>\n            <div class=\"msg-failure\">".$ssError."</div>\n" : '';
+    if ($ssError):
+        echo '            <div class="pad"></div>'.PHP_EOL;
+        echo '            <div class="msg-failure">'.$ssError.'</div>'.PHP_EOL;
+    endif;
 
     if ($this->user::canUploadScreenshot()):
 ?>
+
             <form action="?screenshot=add&<?=$this->type.'.'.$this->typeId; ?>" method="post" enctype="multipart/form-data" onsubmit="return ss_validateForm(this)">
             <input type="file" name="screenshotfile" style="width: 35%"/><br />
             <div class="pad2"></div>
             <input type="submit" value="提交" />
             <div class="pad3"></div>
             <small class="q0">注意：你的截图将在审查后才会出现在站点上。</small>
+
 <?php
     else:
 ?>
+
             <form action="/" method="post">
             <input type="file" name="screenshotfile" disabled="disabled" /><br />
+
 <?php
     endif;
     if (!$this->user::isLoggedIn()):
 ?>
+
             <small>你尚未登录，请先<a href="?account=signin">登录</a>以提交截图。</small>
+
 <?php
     endif;
 ?>
+
             </form>
         </div>
         <div id="tab-suggest-a-video" style="display: none">
             将视频URL输入下列表格即可。
 <?php
-    echo $viError ? "            <div class=\"pad\"></div>\n            <div class=\"msg-failure\">".$viError."</div>\n" : '';
+    if ($viError):
+        echo '            <div class="pad"></div>'.PHP_EOL;
+        echo '            <div class="msg-failure">'.$viError.'</div>'.PHP_EOL;
+    endif;
 
     if ($this->user::canSuggestVideo()):
 ?>
+
             <div class="pad2"></div>
             <form action="?video=add&<?=$this->type.'.'.$this->typeId; ?>" method="post" enctype="multipart/form-data" onsubmit="return vi_validateForm(this)">
             <input type="text" name="videourl" style="width: 35%" /> <small>支持：仅限 YouTube</small>
@@ -82,18 +110,24 @@
             <input type="submit" value="提交" />
             <div class="pad3"></div>
             <small class="q0">说明：您的视频需通过审核才能在站点上显示。</small>
+
 <?php
     else:
 ?>
+
             <form action="/" method="post">
             <input type="text" name="videourl" disabled="disabled" /><br />
+
 <?php
     endif;
     if (!$this->user::isLoggedIn()):
 ?>
+
             <small>你尚未登录，请先<a href="?account=signin">登录</a>以提交视频。</small>
+
 <?php
     endif;
 ?>
+
             </form>
         </div>
diff --git a/template/localized/contrib_6.tpl.php b/template/localized/contrib_6.tpl.php
index b18a5aef..91a579f0 100644
--- a/template/localized/contrib_6.tpl.php
+++ b/template/localized/contrib_6.tpl.php
@@ -1,5 +1,7 @@
 <?php
     namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
 ?>
 
         <div id="tab-add-your-comment" style="display: none">
@@ -10,29 +12,40 @@
             <li><div>Por favor, pon tus preguntas en nuestro <a href="?forums">foro</a> para obtener una respuesta más rápida.</div></li>
             <li><div>Deberías corregir tus comentarios antes de enviarlos.</div></li>
             </ul>
+
 <?php
-    echo $coError ? "            <div class=\"pad\"></div>\n            <div class=\"msg-failure\">".$coError."</div>\n" : '';
+    if ($coError):
+        echo '            <div class="pad"></div>'.PHP_EOL;
+        echo '            <div class="msg-failure">'.$coError.'</div>'.PHP_EOL;
+    endif;
 
     if ($this->user::canComment()):
 ?>
+
             <form name="addcomment" action="?comment=add&amp;type=<?=$this->type.'&amp;typeid='.$this->typeId; ?>" method="post" onsubmit="return co_validateForm(this)">
                 <div id="funcbox-generic"></div>
                 <script type="text/javascript">Listview.funcBox.coEditAppend($('#funcbox-generic'), {body: ''}, 1)</script>
                 <div class="pad"></div>
                 <input type="submit" value="Enviar"></input>
+
 <?php
     else:
 ?>
+
             <form action="/" method="post">
             <div class="comment-edit-body"><textarea class="comment-editbox" rows="10" cols="40" name="commentbody" disabled="disabled"></textarea></div>
+
 <?php
     endif;
     if (!$this->user::isLoggedIn()):
 ?>
+
             <small>No has iniciado sesión. Por favor <a href="?account=signin">entra a tu cuenta</a> o <a href="?account=signup">registra una cuenta</a> para añadir tu comentario.</small>
+
 <?php
     endif;
 ?>
+
             </form>
         </div>
         <div id="tab-submit-a-screenshot" style="display: none">
@@ -42,39 +55,55 @@
             <li><div>¡Mientras más calidad mejor!</div></li>
             <li><div>Asegurate de leer las <a href="?help=screenshots-tips-tricks" target="_blank">sugerencias y trucos</a> si no lo has hecho antes.</div></li>
             </ul>
+
 <?php
-    echo $ssError ? "            <div class=\"pad\"></div>\n            <div class=\"msg-failure\">".$ssError."</div>\n" : '';
+    if ($ssError):
+        echo '            <div class="pad"></div>'.PHP_EOL;
+        echo '            <div class="msg-failure">'.$ssError.'</div>'.PHP_EOL;
+    endif;
 
     if ($this->user::canUploadScreenshot()):
 ?>
+
             <form action="?screenshot=add&<?=$this->type.'.'.$this->typeId; ?>" method="post" enctype="multipart/form-data" onsubmit="return ss_validateForm(this)">
             <input type="file" name="screenshotfile" style="width: 35%"/><br />
             <div class="pad2"></div>
             <input type="submit" value="Enviar" />
             <div class="pad3"></div>
             <small class="q0">Nota: Su captura de imagen deberá ser aprobado antes de aparecer en el sitio.</small>
+
 <?php
     else:
 ?>
+
             <form action="/" method="post">
             <input type="file" name="screenshotfile" disabled="disabled" /><br />
+
 <?php
     endif;
     if (!$this->user::isLoggedIn()):
 ?>
+
             <small>No has iniciado sesión. <a href="?account=signin">Inicia sesión</a> para enviar una captura de pantalla.</small>
+
 <?php
     endif;
 ?>
+
             </form>
         </div>
         <div id="tab-suggest-a-video" style="display: none">
             Símplemente, escribe la URL del vídeo en el formulario.
+
 <?php
-    echo $viError ? "            <div class=\"pad\"></div>\n            <div class=\"msg-failure\">".$viError."</div>\n" : '';
+    if ($viError):
+        echo '            <div class="pad"></div>'.PHP_EOL;
+        echo '            <div class="msg-failure">'.$viError.'</div>'.PHP_EOL;
+    endif;
 
     if ($this->user::canSuggestVideo()):
 ?>
+
             <div class="pad2"></div>
             <form action="?video=add&<?=$this->type.'.'.$this->typeId; ?>" method="post" enctype="multipart/form-data" onsubmit="return vi_validateForm(this)">
             <input type="text" name="videourl" style="width: 35%" /> <small>Soportado: Sólo YouTube</small>
@@ -82,18 +111,24 @@
             <input type="submit" value="Enviar" />
             <div class="pad3"></div>
             <small class="q0">Nota: Tu vídeo deberá ser aprobado antes de aparecer en el sitio.</small>
+
 <?php
     else:
 ?>
+
             <form action="/" method="post">
             <input type="text" name="videourl" disabled="disabled" /><br />
+
 <?php
     endif;
     if (!$this->user::isLoggedIn()):
 ?>
+
             <small>No has iniciado sesión. <a href="?account=signin">Inicia sesión</a> para enviar un video.</small>
+
 <?php
     endif;
 ?>
+
             </form>
         </div>
diff --git a/template/localized/contrib_8.tpl.php b/template/localized/contrib_8.tpl.php
index 9d78b388..6a30596c 100644
--- a/template/localized/contrib_8.tpl.php
+++ b/template/localized/contrib_8.tpl.php
@@ -1,5 +1,7 @@
 <?php
     namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
 ?>
 
         <div id="tab-add-your-comment" style="display: none">
@@ -10,29 +12,40 @@
             <li><div>Задавайте вопросы на наших <a href="?forums">форумах</a>, чтобы получить гарантированный ответ.</div></li>
             <li><div>У вас может возникнуть желание проверить написание своего комментария перед тем, как поместить его на сайт.</div></li>
             </ul>
+
 <?php
-    echo $coError ? "            <div class=\"pad\"></div>\n            <div class=\"msg-failure\">".$coError."</div>\n" : '';
+    if ($coError):
+        echo '            <div class="pad"></div>'.PHP_EOL;
+        echo '            <div class="msg-failure">'.$coError.'</div>'.PHP_EOL;
+    endif;
 
     if ($this->user::canComment()):
 ?>
+
             <form name="addcomment" action="?comment=add&amp;type=<?=$this->type.'&amp;typeid='.$this->typeId; ?>" method="post" onsubmit="return co_validateForm(this)">
                 <div id="funcbox-generic"></div>
                 <script type="text/javascript">Listview.funcBox.coEditAppend($('#funcbox-generic'), {body: ''}, 1)</script>
                 <div class="pad"></div>
                 <input type="submit" value="Отправить"></input>
+
 <?php
     else:
 ?>
+
             <form action="/" method="post">
             <div class="comment-edit-body"><textarea class="comment-editbox" rows="10" cols="40" name="commentbody" disabled="disabled"></textarea></div>
+
 <?php
     endif;
     if (!$this->user::isLoggedIn()):
 ?>
+
             <small>Вы не вошли на сайт. Пожалуйста <a href="?account=signin">войдите</a> или <a href="?account=signup">зарегистрируйтесь</a>, чтобы добавлять комментарии.</small>
+
 <?php
     endif;
 ?>
+
             </form>
         </div>
         <div id="tab-submit-a-screenshot" style="display: none">
@@ -42,39 +55,55 @@
             <li><div>Чем выше качество, тем лучше!</div></li>
             <li><div>Если вы ещё не читали, то настоятельно рекомендуем вам прочесть <a href="?help=screenshots-tips-tricks" target="_blank">советы и особенности</a> получения изображений при помощи снимков экрана.</div></li>
             </ul>
+
 <?php
-    echo $ssError ? "            <div class=\"pad\"></div>\n            <div class=\"msg-failure\">".$ssError."</div>\n" : '';
+    if ($ssError):
+        echo '            <div class="pad"></div>'.PHP_EOL;
+        echo '            <div class="msg-failure">'.$ssError.'</div>'.PHP_EOL;
+    endif;
 
     if ($this->user::canUploadScreenshot()):
 ?>
+
             <form action="?screenshot=add&<?=$this->type.'.'.$this->typeId; ?>" method="post" enctype="multipart/form-data" onsubmit="return ss_validateForm(this)">
             <input type="file" name="screenshotfile" style="width: 35%"/><br />
             <div class="pad2"></div>
             <input type="submit" value="Отправить" />
             <div class="pad3"></div>
             <small class="q0">Примечание: перед тем как появиться на сайте, ваше Скриншот должны быть утверждены.</small>
+
 <?php
     else:
 ?>
+
             <form action="/" method="post">
             <input type="file" name="screenshotfile" disabled="disabled" /><br />
+
 <?php
     endif;
     if (!$this->user::isLoggedIn()):
 ?>
+
             <small>Вы не вошли на сайт. Пожалуйста <a href="?account=signin">войдите</a>, чтобы отправить скриншот.</small>
+
 <?php
     endif;
 ?>
+
             </form>
         </div>
         <div id="tab-suggest-a-video" style="display: none">
             Введите URL видео на YouTube в форму ниже.
+
 <?php
-    echo $viError ? "            <div class=\"pad\"></div>\n            <div class=\"msg-failure\">".$viError."</div>\n" : '';
+    if ($viError):
+        echo '            <div class="pad"></div>'.PHP_EOL;
+        echo '            <div class="msg-failure">'.$viError.'</div>'.PHP_EOL;
+    endif;
 
     if ($this->user::canSuggestVideo()):
 ?>
+
             <div class="pad2"></div>
             <form action="?video=add&<?=$this->type.'.'.$this->typeId; ?>" method="post" enctype="multipart/form-data" onsubmit="return vi_validateForm(this)">
             <input type="text" name="videourl" style="width: 35%" /> <small>Поддерживается: только YouTube</small>
@@ -82,18 +111,24 @@
             <input type="submit" value="Отправить" />
             <div class="pad3"></div>
             <small class="q0">Примечание: перед тем как появиться на сайте, ваше видео должно быть одобрено.</small>
+
 <?php
     else:
 ?>
+
             <form action="/" method="post">
             <input type="text" name="videourl" disabled="disabled" /><br />
+
 <?php
     endif;
     if (!$this->user::isLoggedIn()):
 ?>
+
             <small>Вы не вошли на сайт. Пожалуйста <a href="?account=signin">войдите</a>, чтобы отправить видео.</small>
+
 <?php
     endif;
 ?>
+
             </form>
         </div>
diff --git a/template/localized/delete-account_0.tpl.php b/template/localized/delete-account_0.tpl.php
index 633484f0..bfef2a6f 100644
--- a/template/localized/delete-account_0.tpl.php
+++ b/template/localized/delete-account_0.tpl.php
@@ -1,3 +1,9 @@
+<?php
+    namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
+?>
+
 <div class="account-delete-box text">
     <form action="<?=$this->deleteFormTarget;?>" method="POST">
         <h1 class="heading-size-1">Delete Account: <?=$this->username;?></h1>
diff --git a/template/localized/delete-account_2.tpl.php b/template/localized/delete-account_2.tpl.php
index 5f34b9b5..db677dc0 100644
--- a/template/localized/delete-account_2.tpl.php
+++ b/template/localized/delete-account_2.tpl.php
@@ -1,3 +1,9 @@
+<?php
+    namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
+?>
+
 <div class="account-delete-box text">
     <form action="<?=$this->deleteFormTarget;?>" method="POST">
         <h1>Supprimer le compte : <?=$this->username;?></h1>
diff --git a/template/localized/delete-account_3.tpl.php b/template/localized/delete-account_3.tpl.php
index 15db9de0..a7585340 100644
--- a/template/localized/delete-account_3.tpl.php
+++ b/template/localized/delete-account_3.tpl.php
@@ -1,3 +1,9 @@
+<?php
+    namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
+?>
+
 <div class="account-delete-box text">
     <form action="<?=$this->deleteFormTarget;?>" method="POST">
         <h1>Konto löschen: <?=$this->username;?></h1>
diff --git a/template/localized/delete-account_4.tpl.php b/template/localized/delete-account_4.tpl.php
index 987545c9..d1c39332 100644
--- a/template/localized/delete-account_4.tpl.php
+++ b/template/localized/delete-account_4.tpl.php
@@ -1,3 +1,9 @@
+<?php
+    namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
+?>
+
 <div class="account-delete-box text">
     <form action="<?=$this->deleteFormTarget;?>" method="POST">
         <h1>删除账户：<?=$this->username;?></h1>
diff --git a/template/localized/delete-account_6.tpl.php b/template/localized/delete-account_6.tpl.php
index 12544c3f..8a1fd5c0 100644
--- a/template/localized/delete-account_6.tpl.php
+++ b/template/localized/delete-account_6.tpl.php
@@ -1,3 +1,9 @@
+<?php
+    namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
+?>
+
 <div class="account-delete-box text">
     <form action="<?=$this->deleteFormTarget;?>" method="POST">
         <h1>Eliminar Cuenta: <?=$this->username;?></h1>
diff --git a/template/localized/delete-account_8.tpl.php b/template/localized/delete-account_8.tpl.php
index b8b84244..5864fdbd 100644
--- a/template/localized/delete-account_8.tpl.php
+++ b/template/localized/delete-account_8.tpl.php
@@ -1,3 +1,9 @@
+<?php
+    namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
+?>
+
 <div class="account-delete-box text">
     <form action="<?=$this->deleteFormTarget;?>" method="POST">
         <h1>Удалить учетную запись: <?=$this->username;?></h1>
diff --git a/template/localized/ssReminder_0.tpl.php b/template/localized/ssReminder_0.tpl.php
index 021b7148..c94c311a 100644
--- a/template/localized/ssReminder_0.tpl.php
+++ b/template/localized/ssReminder_0.tpl.php
@@ -1,4 +1,8 @@
-<?php namespace Aowow\Template; ?>
+<?php
+    namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
+?>
 
                     <h2><img src="<?=$this->gStaticUrl; ?>/images/icons/bubble-big.gif" width="32" height="29" alt="" style="vertical-align:middle;margin-right:8px">Reminder</h2>
                     Your screenshot will <b class="q10">not</b> be approved if it doesn't correspond to the following guidelines.
diff --git a/template/localized/ssReminder_2.tpl.php b/template/localized/ssReminder_2.tpl.php
index 60e2755c..be667edf 100644
--- a/template/localized/ssReminder_2.tpl.php
+++ b/template/localized/ssReminder_2.tpl.php
@@ -1,4 +1,8 @@
-<?php namespace Aowow\Template; ?>
+<?php
+    namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
+?>
 
                     <h2><img src="<?=$this->gStaticUrl; ?>/images/icons/bubble-big.gif" width="32" height="29" alt="" style="vertical-align:middle;margin-right:8px">Rappel</h2>
                     Votre capture d'écran <b class="q10">ne</b> sera pas approuvée si elle ne respecte pas les directives suivantes.
diff --git a/template/localized/ssReminder_3.tpl.php b/template/localized/ssReminder_3.tpl.php
index 3737a045..953d2eea 100644
--- a/template/localized/ssReminder_3.tpl.php
+++ b/template/localized/ssReminder_3.tpl.php
@@ -1,4 +1,8 @@
-<?php namespace Aowow\Template; ?>
+<?php
+    namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
+?>
 
                     <h2><img src="<?=$this->gStaticUrl; ?>/images/icons/bubble-big.gif" width="32" height="29" alt="" style="vertical-align:middle;margin-right:8px">Hinweis</h2>
                     Euer Screenshot wird <b class="q10">nicht</b> zugelassen werden, wenn er nicht unseren Richtlinien entspricht.
diff --git a/template/localized/ssReminder_4.tpl.php b/template/localized/ssReminder_4.tpl.php
index 8ae87b64..9f7c5bd7 100644
--- a/template/localized/ssReminder_4.tpl.php
+++ b/template/localized/ssReminder_4.tpl.php
@@ -1,4 +1,8 @@
-<?php namespace Aowow\Template; ?>
+<?php
+    namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
+?>
 
                     <h2><img src="<?=$this->gStaticUrl; ?>/images/icons/bubble-big.gif" width="32" height="29" alt="" style="vertical-align:middle;margin-right:8px">提醒</h2>
                     如果您的截图不符合以下指南，将<b class="q10">不会</b>被通过审核。
diff --git a/template/localized/ssReminder_6.tpl.php b/template/localized/ssReminder_6.tpl.php
index 803078e8..e7b3b2b9 100644
--- a/template/localized/ssReminder_6.tpl.php
+++ b/template/localized/ssReminder_6.tpl.php
@@ -1,4 +1,8 @@
-<?php namespace Aowow\Template; ?>
+<?php
+    namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
+?>
 
                     <h2><img src="<?=$this->gStaticUrl; ?>/images/icons/bubble-big.gif" width="32" height="29" alt="" style="vertical-align:middle;margin-right:8px">Recordatorio</h2>
                     Su captura de pantalla <b class="q10">no</b> será aprobada si no cumple con las siguientes directrices.
diff --git a/template/localized/ssReminder_8.tpl.php b/template/localized/ssReminder_8.tpl.php
index 6e4814f0..81b43f3c 100644
--- a/template/localized/ssReminder_8.tpl.php
+++ b/template/localized/ssReminder_8.tpl.php
@@ -1,4 +1,8 @@
-<?php namespace Aowow\Template; ?>
+<?php
+    namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
+?>
 
                     <h2><img src="<?=$this->gStaticUrl; ?>/images/icons/bubble-big.gif" width="32" height="29" alt="" style="vertical-align:middle;margin-right:8px">Напоминание</h2>
                     Ваш скриншот <b class="q10">не</b> будет одобрен, если он не соответствует следующим рекомендациям.
diff --git a/template/pages/account.tpl.php b/template/pages/account.tpl.php
index 54d67966..e5565ca9 100644
--- a/template/pages/account.tpl.php
+++ b/template/pages/account.tpl.php
@@ -3,8 +3,11 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
@@ -17,12 +20,14 @@
 
             <div class="text">
                 <h1><?=Lang::account('settings');?></h1>
+
 <?php
 // Banned-Minibox
 if ($this->bans):
     foreach ($this->bans as $b):
         [$end, $reason, $name] = $b;
 ?>
+
                 <div style="max-width:300px;" class="minibox minibox-left">
                     <h1 class="q10"><?=Lang::account('accBanned'); ?></h1>
                     <ul style="text-align:left">
@@ -31,7 +36,9 @@ if ($this->bans):
                         <li><div><?='<b>'.Lang::account('reason').'</b>'.'<span class="msg-failure">'.($reason ?: Lang::account('noReason')).'</span>';?></div></li>
                     </ul>
                 </div>
+
 <?php endforeach; ?>
+
             </div>
 
 <?php else: ?>
@@ -51,6 +58,7 @@ if ($this->bans):
 
 <?php if ([$type, $msg] = $this->generalMessage): ?>
                             <div class="box"><div class="msg-<?=($type ? 'success' : 'failure');?>"><?=$msg;?></div></div>
+
 <?php endif; ?>
 
                             <div style="text-align: left">
@@ -88,11 +96,13 @@ if ($this->bans):
 <?php
     if ($this->cfg('ACC_AUTH_MODE') == AUTH_MODE_SELF):
 ?>
+
                     <div id="tab-personal" style="display: none">
                         <h2 class="first" id="change-email-address"><?=Lang::account('email');?></h2>
 
 <?php if ([$type, $msg] = $this->emailMessage): ?>
                         <div class="box"><div class="msg-<?=($type ? 'success' : 'failure');?>"><?=$msg;?></div></div>
+
 <?php endif; ?>
 
                         <form action="?account=update-email" name="ce" method="post" id="change-email">
@@ -108,12 +118,16 @@ if ($this->bans):
 
 <?php if ([$type, $msg] = $this->usernameMessage): ?>
                         <div class="box"><div class="msg-<?=($type ? 'success' : 'failure');?>"><?=$msg;?></div></div>
+
 <?php endif; ?>
 
                         <div><?=Lang::account('usernameNote', [$this->renameCD]);?></div>
+
 <?php if ($this->activeCD): ?>
                         <div class="msg-failure pad3"><br /><?=Lang::account('activeCD', [$this->activeCD]);?></div>
+
 <?php endif; ?>
+
                         <form action="?account=update-username" name="ce" method="post" id="change-username">
                             <table cellspacing="5" cellpadding="0" border="0">
                                 <tr><td nowrap="nowrap"><?=Lang::account('curName');?></td><td><input disabled="disabled" name="current-username" style="width: 15em" value="<?=$this->curName;?>" readonly="readonly" /></td></tr>
@@ -127,6 +141,7 @@ if ($this->bans):
 
 <?php if ([$type, $msg] = $this->passwordMessage): ?>
                         <div class="box"><div class="msg-<?=($type ? 'success' : 'failure');?>"><?=$msg;?></div></div>
+
 <?php endif; ?>
 
                         <form action="?account=update-password" name="cp" method="post" id="change-password">
@@ -147,6 +162,7 @@ if ($this->bans):
                     </div>
 
 <?php endif; ?>
+
                     <div id="tab-community" style="display: none">
                         <h2 class="first"><?=Lang::account('userPage');?></h2>
 
@@ -154,7 +170,9 @@ if ($this->bans):
 
 <?php if ([$type, $msg] = $this->communityMessage): ?>
                         <div class="box"><div class="msg-<?=($type ? 'success' : 'failure');?>"><?=$msg;?></div></div>
+
 <?php endif; ?>
+
                         <form action="?account=update-community-settings" name="community-settings" method="post" onsubmit="return spd(this)/*  && sfs(this) */">
                             <?=Lang::account('publicDescNote', [urlencode($this->user::$username)]);?>
 
@@ -168,6 +186,7 @@ if ($this->bans):
                                 <div class="pad"></div>
                                 <input type="submit" value="<?=Lang::main('save');?>" name="do-community-settings-update" />
                             </div>
+
 <?php
 /*      signature not used
                             <h2><?=Lang::account('forums');?></h2>
@@ -186,12 +205,14 @@ if ($this->bans):
                             </div>
 */
 ?>
+
                         </form>
 
                         <h3 id="forum-avatar"><?=Lang::account('avatar');?></h3>
 
 <?php if ([$type, $msg] = $this->avatarMessage): ?>
                         <div class="box"><div class="msg-<?=($type ? 'success' : 'failure');?>"><?=$msg;?></div></div>
+
 <?php endif; ?>
 
                         <form action="?account=forum-avatar" name="fa" method="post" enctype="multipart/form-data" onsubmit="return fa_validateForm(this)">
@@ -228,9 +249,12 @@ if ($this->bans):
                                     </div>
                                 </td></tr>
                             </table>
+
 <?php else: ?>
                             <input type="radio" name="avatar" value="2" id="avaOpt2" onclick="faChange(2)" disabled="disabled" /> <label for="avaOpt2" class="q0"><?=Lang::account('custom'); ?></label>&nbsp;&nbsp;<span class="premium-feature-icon-small"></span><table id="avaSel2" style="display:none"></table>
+
 <?php endif; ?>
+
                             <div class="clear"></div>
 
                             <script type="text/javascript">
@@ -249,8 +273,10 @@ if ($this->bans):
 
                     <div id="tab-premium" style="display: none; min-height: 70px;">
                         <h3 class="first"><?=Lang::account('premiumStatus');?></h3>
+
 <?php if (!$this->user::isPremium()): ?>
                         <ul><li><div><?=Lang::account('status').Lang::main('colon').'<b class="q10">'.Lang::account('inactive'); ?></b></div></li></ul>
+
 <?php else: ?>
                         <ul><li><div><?=Lang::account('status').Lang::main('colon').'<b class="q2">'.Lang::account('active'); ?></b></div></li></ul>
                         <h2><?=Lang::account('manageAvatars');?></h2>
@@ -263,6 +289,7 @@ if ($this->bans):
     <?php if ([$type, $msg] = $this->premiumborderMessage): ?>
                             <div class="box"><div class="msg-<?=($type ? 'success' : 'failure');?>"><?=$msg;?></div></div>
     <?php endif; ?>
+
                         <form action="?account=premium-border" method="POST">
                             <div style="width:500px; padding-left:25px;" class="pad2">
                                 <div style="display:flex; justify-content: space-between;" id="ipb-container"></div>
@@ -292,20 +319,26 @@ if ($this->bans):
                             });
                         </script>
                     </div>
+
 <?php endif; ?>
+
                 </div>
             </div>
 
             <script type="text/javascript">
                 var _ = new Tabs({parent: $WH.ge('tabs-generic')});
                 _.add('<?=Lang::account('tabGeneral');?>', {id: 'general'});
+
 <?php if ($this->cfg('ACC_AUTH_MODE') == AUTH_MODE_SELF): ?>
                 _.add('<?=Lang::account('tabPersonal');?>', {id: 'personal'});
+
 <?php endif; ?>
+
                 _.add('<?=Lang::account('tabCommunity');?>', {id: 'community'});
                 _.add('<?=Lang::account('tabPremium');?>', {id: 'premium'});
                 _.flush();
             </script>
+
 <?php endif; ?>
 
             <div class="clear"></div>
diff --git a/template/pages/achievement.tpl.php b/template/pages/achievement.tpl.php
index 0d1f4df8..86a31978 100644
--- a/template/pages/achievement.tpl.php
+++ b/template/pages/achievement.tpl.php
@@ -3,8 +3,11 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
@@ -18,15 +21,17 @@
 ?>
 
             <div class="text">
-<?php
-$this->brick('headIcons');
 
-$this->brick('redButtons');
+<?php
+    $this->brick('headIcons');
+
+    $this->brick('redButtons');
 ?>
 
                 <h1><?=$this->h1; ?></h1>
                 <?=$this->description.PHP_EOL; ?>
                 <h3><?=Lang::achievement('criteria').($this->reqCrtQty ? ' &ndash; <small><b>'.Lang::achievement('reqNumCrt', [$this->reqCrtQty, count($this->criteria)]).'</b></small>' : ''); ?></h3>
+
 <?php
 $rows0 = $rows1 = '';
 foreach ($this->criteria as $i => $icon):
@@ -35,19 +40,25 @@ foreach ($this->criteria as $i => $icon):
 endforeach;
 
 if ($rows0):
-    echo "                <div style=\"float: left; margin-right: 25px\"><table class=\"iconlist\">\n".$rows0."                </table></div>\n";
+    echo '                <div style="float: left; margin-right: 25px"><table class="iconlist">'.PHP_EOL;
+    echo $rows0;
+    echo '                </table></div>'.PHP_EOL;
 endif;
 if ($rows1):
-    echo "                <div style=\"float: left;\"><table class=\"iconlist\">\n".$rows1."                </table></div>\n";
+    echo '                <div style="float: left;"><table class="iconlist">'.PHP_EOL;
+    echo $rows1;
+    echo '                </table></div>'.PHP_EOL;
 endif;
 ?>
 
                 <script type="text/javascript">//<![CDATA[
+
 <?php
 foreach ($this->criteria as $crt):
     echo $crt->renderJS(24);
 endforeach;
 ?>
+
                 //]]></script>
 
                 <div style="clear: left"></div>
@@ -55,28 +66,30 @@ endforeach;
 <?php
 if ([$rewItems, $rewTitle, $rewText] = $this->rewards):
     if ($rewItems):
-        echo '<h3>'.Lang::main('rewards')."</h3>\n";
+        echo '<h3>'.Lang::main('rewards').'</h3>'.PHP_EOL;
         $this->brick('rewards', ['rewards' => $rewItems, 'rewTitle' => null]);
     endif;
 
     if ($rewTitle):
         echo '<h3>'.Lang::main('gains')."</h3>\n<ul>";
         foreach ($rewTitle as $i):
-            echo '    <li><div>'.$i."</div></li>\n";
+            echo '    <li><div>'.$i.'</div></li>'.PHP_EOL;
         endforeach;
-        echo "</ul>\n";
+        echo '</ul>'.PHP_EOL;
     endif;
 
     if (!$rewTitle && !$rewItems && $rewText):
-        echo '<h3>'.Lang::main('rewards')."</h3>\n<ul><li><div>".$rewText."</div></li></ul>\n";
+        echo '<h3>'.Lang::main('rewards').'</h3>'.PHP_EOL;
+        echo '<ul><li><div>'.$rewText.'</div></li></ul>'.PHP_EOL;
     endif;
 endif;
 
 $this->brickIf($this->mail, 'mail');
 
 if ($this->transfer):
-    echo "    <div style=\"clear: left\"></div>";
-    echo "    <div class=\"pad\"></div>\n    ".$this->transfer."\n";
+    echo '    <div style="clear: left"></div>'.PHP_EOL;
+    echo '    <div class="pad"></div>'.PHP_EOL;
+    echo '    '.$this->transfer.PHP_EOL;
 endif;
 
 ?>
diff --git a/template/pages/achievements.tpl.php b/template/pages/achievements.tpl.php
index 8688d9d3..05bd6e51 100644
--- a/template/pages/achievements.tpl.php
+++ b/template/pages/achievements.tpl.php
@@ -3,26 +3,32 @@
 
     use \Aowow\Lang;
 
-$this->brick('header');
-$f = $this->filter->values;                                 // shorthand
+    /** @var PageTemplate $this */
+
+    $this->brick('header');
+    $f = $this->filter->values;                             // shorthand
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
 
 <?php
-$this->brick('announcement');
+    $this->brick('announcement');
 
-$this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => [9]]);
+    $this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => [9]]);
 ?>
+
             <div id="fi" style="display: <?=$this->filter->query ? 'block' : 'none'; ?>;">
                 <form action="?filter=achievements<?=$this->subCat; ?>" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">
                     <div class="text">
-<?php
-$this->brick('headIcons');
 
-$this->brick('redButtons');
+<?php
+    $this->brick('headIcons');
+
+    $this->brick('redButtons');
 ?>
+
                         <h1><?=$this->h1; ?></h1>
                     </div>
                     <table>
diff --git a/template/pages/admin/reports.tpl.php b/template/pages/admin/reports.tpl.php
index d35577e2..ac203920 100644
--- a/template/pages/admin/reports.tpl.php
+++ b/template/pages/admin/reports.tpl.php
@@ -1,6 +1,8 @@
 <?php
     namespace Aowow\Template;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
 
@@ -12,10 +14,11 @@
         <div class="main-contents" id="main-contents">
 
 <?php
-$this->brick('announcement');
+    $this->brick('announcement');
 
-$this->brick('pageTemplate');
+    $this->brick('pageTemplate');
 ?>
+
             <div class="text">
                 <h1><?=$this->h1;?></h1>
 
@@ -26,6 +29,7 @@ $this->brick('pageTemplate');
 
     echo $this->extraHTML ?? '';
 ?>
+
             </div>
         </div><!-- main-contents -->
     </div><!-- main -->
diff --git a/template/pages/admin/screenshots.tpl.php b/template/pages/admin/screenshots.tpl.php
index f2034ba8..e0276d9f 100644
--- a/template/pages/admin/screenshots.tpl.php
+++ b/template/pages/admin/screenshots.tpl.php
@@ -1,17 +1,21 @@
 <?php
     namespace Aowow\Template;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
 
 <?php
-$this->brick('announcement');
+    $this->brick('announcement');
 
-$this->brick('pageTemplate');
+    $this->brick('pageTemplate');
 ?>
+
             <div class="text">
                 <h1><?=$this->h1; ?></h1>
 
@@ -114,18 +118,20 @@ $this->brick('pageTemplate');
 
                         return true;
                     }
+
 <?php
 if ($this->getAll):
-    echo "                    var ss_getAll = true;\n";
+    echo '                    var ss_getAll = true;'.PHP_EOL;
 endif;
 if ($this->ssPages):
-    echo "                    var ssm_screenshotPages = ".$this->json($this->ssPages).";\n";
-    echo "                    ssm_UpdatePages();\n";
+    echo '                    var ssm_screenshotPages = ".$this->json($this->ssPages).";'.PHP_EOL;
+    echo '                    ssm_UpdatePages();'.PHP_EOL;
 elseif ($this->ssData):
-    echo "                    var ssm_screenshotData = ".$this->json($this->ssData).";\n";
-    echo "                    ssm_UpdateList();\n";
+    echo '                    var ssm_screenshotData = ".$this->json($this->ssData).";'.PHP_EOL;
+    echo '                    ssm_UpdateList();'.PHP_EOL;
 endif;
 ?>
+
                     ss_OnResize();
                 </script>
             </div>
diff --git a/template/pages/admin/siteconfig.tpl.php b/template/pages/admin/siteconfig.tpl.php
index 5437a838..6c604cc4 100644
--- a/template/pages/admin/siteconfig.tpl.php
+++ b/template/pages/admin/siteconfig.tpl.php
@@ -1,6 +1,8 @@
 <?php
     namespace Aowow\Template;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
 
@@ -281,6 +283,7 @@
 
     $this->brick('lvTabs');
 ?>
+
             <div class="clear"></div>
         </div><!-- main-contents -->
     </div><!-- main -->
diff --git a/template/pages/admin/videos.tpl.php b/template/pages/admin/videos.tpl.php
index da89e0a6..5cc7b135 100644
--- a/template/pages/admin/videos.tpl.php
+++ b/template/pages/admin/videos.tpl.php
@@ -1,17 +1,21 @@
 <?php
     namespace Aowow\Template;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
 
 <?php
-$this->brick('announcement');
+    $this->brick('announcement');
 
-$this->brick('pageTemplate');
+    $this->brick('pageTemplate');
 ?>
+
             <div class="text">
                 <h1><?=$this->h1; ?></h1>
 
@@ -114,18 +118,20 @@ $this->brick('pageTemplate');
 
                         return true;
                     }
+
 <?php
 if ($this->getAll):
-    echo "                    var vi_getAll = true;\n";
+    echo '                    var vi_getAll = true;'.PHP_EOL;
 endif;
 if ($this->viPages):
-    echo "                    var vim_videoPages = ".$this->json($this->viPages).";\n";
-    echo "                    vim_UpdatePages();\n";
+    echo '                    var vim_videoPages = ".$this->json($this->viPages).";'.PHP_EOL;
+    echo '                    vim_UpdatePages();'.PHP_EOL;
 elseif ($this->viData):
-    echo "                    var vim_videoData = ".$this->json($this->viData).";\n";
-    echo "                    vim_UpdateList();\n";
+    echo '                    var vim_videoData = ".$this->json($this->viData).";'.PHP_EOL;
+    echo '                    vim_UpdateList();'.PHP_EOL;
 endif;
 ?>
+
                     vi_OnResize();
                 </script>
             </div>
diff --git a/template/pages/admin/weight-presets.tpl.php b/template/pages/admin/weight-presets.tpl.php
index 68a25ea1..c21baf6a 100644
--- a/template/pages/admin/weight-presets.tpl.php
+++ b/template/pages/admin/weight-presets.tpl.php
@@ -1,6 +1,8 @@
 <?php
     namespace Aowow\Template;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
 
@@ -554,6 +556,7 @@ $this->brick('announcement');
 
 $this->brick('pageTemplate');
 ?>
+
             <div class="text">
                 <h1><?=$this->h1;?></h1>
 
@@ -564,6 +567,7 @@ $this->brick('pageTemplate');
 
     echo $this->extraHTML ?? '';
 ?>
+
                 <h2>Edit<span id="wt-name"></span><span id="status-ic" style="float:right;"></span></h2>
                 <div class="wt-edit">
                     <div style="display:inline-block; vertical-align:top;"><div class="pad2" style="color: white; font-size: 15px; font-weight: bold;">Icon</div><input type="text" id="wt-icon" size="30" /></div>
diff --git a/template/pages/areatriggers.tpl.php b/template/pages/areatriggers.tpl.php
index e9d574a3..a663845e 100644
--- a/template/pages/areatriggers.tpl.php
+++ b/template/pages/areatriggers.tpl.php
@@ -3,26 +3,32 @@
 
     use \Aowow\Lang;
 
-$this->brick('header');
-$f = $this->filter->values;                                 // shorthand
+    /** @var PageTemplate $this */
+
+    $this->brick('header');
+    $f = $this->filter->values;                             // shorthand
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
 
 <?php
-$this->brick('announcement');
+    $this->brick('announcement');
 
-$this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => [102]]);
+    $this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => [102]]);
 ?>
+
             <div id="fi" style="display: <?=($this->filter->query ? 'block' : 'none'); ?>;">
                 <form action="?filter=areatriggers" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">
                     <div class="text">
-<?php
-$this->brick('headIcons');
 
-$this->brick('redButtons');
+<?php
+    $this->brick('headIcons');
+
+    $this->brick('redButtons');
 ?>
+
                         <h1><?=$this->h1; ?></h1>
                     </div>
                     <div class="rightpanel">
diff --git a/template/pages/arena-teams.tpl.php b/template/pages/arena-teams.tpl.php
index 4798f617..c7636499 100644
--- a/template/pages/arena-teams.tpl.php
+++ b/template/pages/arena-teams.tpl.php
@@ -3,28 +3,34 @@
 
     use \Aowow\Lang;
 
-$this->brick('header');
-$f = $this->filter->values;                                 // shorthand
+    /** @var PageTemplate $this */
+
+    $this->brick('header');
+    $f = $this->filter->values;                             // shorthand
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
 
 <?php
-$this->brick('announcement');
+    $this->brick('announcement');
 
-$this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => array_slice($this->pageTemplate['breadcrumb'], 0, 3)]);
+    $this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => array_slice($this->pageTemplate['breadcrumb'], 0, 3)]);
 
 # pr_setRegionRealm($WH.ge('fi').firstChild, realm, region) - never have \n\s before <form>, it will become firstChild (a text node)
 ?>
+
             <div id="fi" style="display: <?=($this->filter->query ? 'block' : 'none'); ?>;"><form
                 action="?filter=arena-teams&<?=$this->subCat; ?>" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">
                     <div class="text">
-<?php
-$this->brick('headIcons');
 
-$this->brick('redButtons');
+<?php
+    $this->brick('headIcons');
+
+    $this->brick('redButtons');
 ?>
+
                         <h1><?=$this->h1; ?></h1>
                     </div>
                     <table>
diff --git a/template/pages/compare.tpl.php b/template/pages/compare.tpl.php
index 6f98f7fb..5f06d246 100644
--- a/template/pages/compare.tpl.php
+++ b/template/pages/compare.tpl.php
@@ -1,8 +1,11 @@
 <?php
     namespace Aowow\Template;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
@@ -16,11 +19,13 @@
             <div class="text">
                 <div id="compare-generic"></div>
                 <script type="text/javascript">//<![CDATA[
+
 <?php
 foreach ($this->cmpItems as $iId => $iData):
-    echo '                        g_items.add('.$iId.', '.$this->json($iData).");\n";
+    echo '                        g_items.add('.$iId.', '.$this->json($iData).');'.PHP_EOL;
 endforeach;
 ?>
+
                     <?=$this->summary; ?>
                 //]]></script>
             </div>
diff --git a/template/pages/delete.tpl.php b/template/pages/delete.tpl.php
index 77753488..ddcc3c18 100644
--- a/template/pages/delete.tpl.php
+++ b/template/pages/delete.tpl.php
@@ -1,11 +1,15 @@
 <?php
     namespace Aowow\Template;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
+
 <?php
     $this->brick('announcement');
 
@@ -19,6 +23,7 @@ else:
     $this->localizedBrick('delete-account');
 endif;
 ?>
+
             </div>
         </div><!-- main-contents -->
     </div><!-- main -->
diff --git a/template/pages/detail-page-generic.tpl.php b/template/pages/detail-page-generic.tpl.php
index e24ed529..7757c8ff 100644
--- a/template/pages/detail-page-generic.tpl.php
+++ b/template/pages/detail-page-generic.tpl.php
@@ -3,8 +3,11 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
@@ -18,15 +21,16 @@
 ?>
 
             <div class="text">
+
 <?php
     $this->brick('headIcons');
 
     $this->brick('redButtons');
 
     if ($this->expansion && $this->h1):
-        echo '                <h1 class="h1-icon"><span class="icon-'.$this->expansion.'-right">'.$this->h1."</span></h1>\n";
+        echo '                <h1 class="h1-icon"><span class="icon-'.$this->expansion.'-right">'.$this->h1.'</span></h1>'.PHP_EOL;
     elseif ($this->h1):
-        echo '                <h1>'.$this->h1."</h1>\n";
+        echo '                <h1>'.$this->h1.'</h1>'.PHP_EOL;
     endif;
 
     $this->brick('markup', ['markup' => $this->article]);
@@ -36,32 +40,41 @@
     $this->brick('mapper');
 
     if ($this->transfer):
-        echo "    <div class=\"pad\"></div>\n    ".$this->transfer."\n";
+        echo '    <div class="pad"></div>'.PHP_EOL;
+        echo '    '.$this->transfer.PHP_EOL;
     endif;
 
     $this->brick('markup', ['markup' => $this->smartAI]);
 
 if ($this->zoneMusic):
 ?>
+
                 <div class="clear">
+
 <?php
     foreach ($this->zoneMusic as [$h3, $data, $divId, $opts]):
 ?>
+
                 <div id="zonemusicdiv-<?=$divId; ?>" style="float: left">
                     <h3><?=$h3; ?></h3>
                 </div>
                 <script type="text/javascript">//<![CDATA[
                     (new AudioControls()).init(<?=$this->json($data); ?>, $WH.ge('zonemusicdiv-<?=$divId; ?>'), <?=$this->json($opts); ?>);
                 //]]></script>
+
 <?php
     endforeach;
 ?>
+
                 <br clear="all"/></div>
+
 <?php
 endif;
 ?>
+
                 <h2 class="clear"><?=Lang::main('related'); ?></h2>
             </div>
+
 <?php
     $this->brick('lvTabs');
 
diff --git a/template/pages/enchantment.tpl.php b/template/pages/enchantment.tpl.php
index e759cff4..f737f555 100644
--- a/template/pages/enchantment.tpl.php
+++ b/template/pages/enchantment.tpl.php
@@ -3,8 +3,11 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
@@ -36,21 +39,26 @@
                         <col width="42%" />
                         <col width="50%" />
                     </colgroup>
+
 <?php
 if ($this->activation):
 ?>
+
                     <tr>
                         <th><?=Lang::enchantment('activation'); ?></th>
                         <td colspan="2"><?=$this->activation; ?></td>
                     </tr>
+
 <?php
 endif;
 
 foreach ($this->effects as $i => $e):
 ?>
+
                     <tr>
                         <th><?=Lang::spell('_effect').' #'.$i; ?></th>
                         <td colspan="3" style="line-height: 17px">
+
 <?php
     echo '                            '.$e['name'].($e['tip'] ? Lang::main('colon').'(<span '.($e['tip'][0] ? 'class="tip" ' : '').'id="efftip-'.$i.'"></span>)' : '').'<small>';
 
@@ -68,24 +76,29 @@ foreach ($this->effects as $i => $e):
         endif;
     endif;
 
-    echo "</small>\n";
+    echo '</small>'.PHP_EOL;
 
     if ($e['tip']):
 ?>
+
                             <script type="text/javascript">
+
 <?php
-        echo "                                \$WH.ae(\$WH.ge('efftip-".$i."'), \$WH.ct(LANG.traits['".$e['tip'][1]."'][0]));\n";
+        echo "                                \$WH.ae(\$WH.ge('efftip-".$i."'), \$WH.ct(LANG.traits['".$e['tip'][1]."'][0]));".PHP_EOL;
         if ($e['tip'][0]):
-            echo "                                g_addTooltip(\$WH.ge('efftip-".$i."'), 'Object: ".$e['tip'][0]."', 'q');\n";
+            echo "                                g_addTooltip(\$WH.ge('efftip-".$i."'), 'Object: ".$e['tip'][0]."', 'q');".PHP_EOL;
         endif;
 ?>
+
                             </script>
+
 <?php
     endif;
 
 
     if ($e['icon']):
 ?>
+
                             <table class="icontab">
                                 <tr>
                                     <?=$e['icon']->renderContainer(0, $i); ?>
@@ -95,14 +108,18 @@ foreach ($this->effects as $i => $e):
                             <script type="text/javascript">
                                 <?=$e['icon']->renderJS(); ?>
                             </script>
+
 <?php
     endif;
 ?>
+
                         </td>
                     </tr>
+
 <?php
 endforeach;
 ?>
+
                 </table>
 
                 <h2 class="clear"><?=Lang::main('related'); ?></h2>
@@ -113,6 +130,7 @@ $this->brick('lvTabs');
 
 $this->brick('contribute');
 ?>
+
             <div class="clear"></div>
         </div><!-- main-contents -->
     </div><!-- main -->
diff --git a/template/pages/enchantments.tpl.php b/template/pages/enchantments.tpl.php
index 3fbb0ad6..b818df45 100644
--- a/template/pages/enchantments.tpl.php
+++ b/template/pages/enchantments.tpl.php
@@ -3,26 +3,32 @@
 
     use \Aowow\Lang;
 
-$this->brick('header');
-$f = $this->filter->values;                                 // shorthand
+    /** @var PageTemplate $this */
+
+    $this->brick('header');
+    $f = $this->filter->values;                             // shorthand
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
 
 <?php
-$this->brick('announcement');
+    $this->brick('announcement');
 
-$this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => [101]]);
+    $this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => [101]]);
 ?>
+
             <div id="fi" style="display: <?=($this->filter->query ? 'block' : 'none'); ?>;">
                 <form action="?filter=enchantments" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">
                     <div class="text">
-<?php
-$this->brick('headIcons');
 
-$this->brick('redButtons');
+<?php
+    $this->brick('headIcons');
+
+    $this->brick('redButtons');
 ?>
+
                         <h1><?=$this->h1; ?></h1>
                     </div>
                     <div class="rightpanel">
diff --git a/template/pages/guide-edit.tpl.php b/template/pages/guide-edit.tpl.php
index b497929c..3d83fb77 100644
--- a/template/pages/guide-edit.tpl.php
+++ b/template/pages/guide-edit.tpl.php
@@ -3,22 +3,28 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
 
 <?php
-$this->brick('announcement');
+    $this->brick('announcement');
 
-$this->brick('pageTemplate');
+    $this->brick('pageTemplate');
 ?>
+
             <div class="text">
                 <h1><?=$this->h1; ?></h1>
+
 <?php
     $this->brick('markup', ['markup' => $this->article]);
 ?>
+
             </div>
             <div class="pad"></div>
 <!-- start insert -->
@@ -204,6 +210,7 @@ $this->brick('pageTemplate');
                     <td></td>
                     <td colspan="3"><span id="desc-info"></span></td>
                 </tr>
+
 <?php
 /*
                 <tr>
@@ -217,14 +224,17 @@ $this->brick('pageTemplate');
                 </tr>
 */
 ?>
+
                 <tr>
                     <th><?=Lang::main('status');?></th>
                     <td colspan="3"><dfn title="<?=Lang::guide('editor', 'statusTip', $this->editStatus);?>" style="color:<?=$this->editStatusColor;?>"><?=Lang::guide('status', $this->editStatus);?></dfn>
+
 <?php
 if ($this->isDraft && $this->typeId):
-    echo '                        <small>(<a href="?guide='.$this->typeId.'&rev='.$this->editRev.'" target="_blank" class="q1">'.Lang::guide('editor', 'testGuide')."</a>)</small>\n";
+    echo '                        <small>(<a href="?guide='.$this->typeId.'&rev='.$this->editRev.'" target="_blank" class="q1">'.Lang::guide('editor', 'testGuide').'</a>)</small>'.PHP_EOL;
 endif;
 ?>
+
                     </td>
                 </tr>
 
@@ -269,6 +279,7 @@ endif;
             </div>
 
 <?php endif; ?>
+
             <div class="guide-submission">
                 <div class="guide-submission-options">
                     <button type="button" class="btn btn-site" data-type="save" onclick="$('.guide-submission').attr('data-type', 'save'); $('#changelog').focus();"><?=Lang::guide('editor', 'save');?></button>
diff --git a/template/pages/guilds.tpl.php b/template/pages/guilds.tpl.php
index fd59e793..312606cf 100644
--- a/template/pages/guilds.tpl.php
+++ b/template/pages/guilds.tpl.php
@@ -3,28 +3,34 @@
 
     use \Aowow\Lang;
 
-$this->brick('header');
-$f = $this->filter->values;                                 // shorthand
+    /** @var PageTemplate $this */
+
+    $this->brick('header');
+    $f = $this->filter->values;                             // shorthand
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
 
 <?php
-$this->brick('announcement');
+    $this->brick('announcement');
 
-$this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => array_slice($this->pageTemplate['breadcrumb'], 0, 3)]);
+    $this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => array_slice($this->pageTemplate['breadcrumb'], 0, 3)]);
 
-# pr_setRegionRealm($WH.ge('fi').firstChild, realm, region) - never have \n\s before <form>, it will become firstChild (a text node)
+    # pr_setRegionRealm($WH.ge('fi').firstChild, realm, region) - never have \n\s before <form>, it will become firstChild (a text node)
 ?>
+
             <div id="fi" style="display: <?=($this->filter->query ? 'block' : 'none'); ?>;"><form
                 action="?filter=guilds&<?=$this->subCat; ?>" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">
                     <div class="text">
-<?php
-$this->brick('headIcons');
 
-$this->brick('redButtons');
+<?php
+    $this->brick('headIcons');
+
+    $this->brick('redButtons');
 ?>
+
                         <h1><?=$this->h1; ?></h1>
                     </div>
                     <table>
diff --git a/template/pages/home.tpl.php b/template/pages/home.tpl.php
index 45881f18..3334e0b2 100644
--- a/template/pages/home.tpl.php
+++ b/template/pages/home.tpl.php
@@ -2,29 +2,37 @@
     namespace Aowow\Template;
 
     use \Aowow\Lang;
+
+    /** @var PageTemplate $this */
 ?>
+
 <!DOCTYPE html>
 <html>
 <head>
+
 <?php $this->brick('head'); ?>
 
 </head>
 <body class="home<?=($this->user::isPremium() ? ' premium-logo' : ''); ?>">
     <div id="layers"></div>
+
 <?php
 if ($this->homeTitle):
-    echo "    <script>document.title = '".$this->homeTitle."';</script>\n";
+    echo "    <script>document.title = '".$this->homeTitle."';</script>".PHP_EOL;
 endif;
 
 if ($this->altHomeLogo):
 ?>
+
     <style type="text/css">
     .home-logo {
         background: url(<?=$this->altHomeLogo; ?>) no-repeat center 0 !important;
         margin-bottom: 1px !important;
     }
     </style>
+
 <?php endif; ?>
+
     <div class="home-wrapper">
         <h1><?=$this->concat('title'); ?></h1>
         <div class="home-logo" id="home-logo"></div>
@@ -47,39 +55,49 @@ if ($this->altHomeLogo):
 
 <?php elseif ($this->featuredBox): ?>
        <div class="pad"></div>
+
 <?php
 endif;
 
 if ($this->featuredBox):
 ?>
+
         <div class="home-featuredbox<?=$this->featuredBox['extended'] ? ' home-featuredbox-extended' : ''; ?>" style="background-image: url(<?=$this->featuredBox['boxBG']; ?>);" id="home-featuredbox">
+
 <?php if ($this->featuredBox['overlays']): ?>
             <div class="home-featuredbox-links">
+
 <?php
         foreach ($this->featuredBox['overlays'] as ['url' => $u, 'title' => $t, 'left' => $l, 'width' => $w]):
-                echo '                <a href="'.$u.'" title="'.$t.'" style="left: '.$l.'px; top: 18px; width:'.$w.'px; height: 160px"></a>'."\n";
-                echo '                <var style="left: '.$l.'px; top: 18px; width:'.$w.'px; height: 160px"></var>'."\n";
+                echo '                <a href="'.$u.'" title="'.$t.'" style="left: '.$l.'px; top: 18px; width:'.$w.'px; height: 160px"></a>'.PHP_EOL;
+                echo '                <var style="left: '.$l.'px; top: 18px; width:'.$w.'px; height: 160px"></var>'.PHP_EOL;
         endforeach;
 ?>
+
             </div>
+
 <?php endif; ?>
+
             <div class="home-featuredbox-inner text" id="news-generic"></div>
         </div>
 
 <?php
 endif;
 ?>
+
         <script type="text/javascript">//<![CDATA[
+
 <?php
 if ($this->locale->value):
-    echo "            Locale.set(".$this->locale->value.");\n";
+    echo '            Locale.set('.$this->locale->value.');'.PHP_EOL;
 endif;
 echo $this->renderGlobalVars(12);
 
 if ($this->featuredBox):
-    echo "            ".$this->featuredBox['markup'];
+    echo '            '.$this->featuredBox['markup'];
 endif;
 ?>
+
         //]]></script>
     </div>
 
diff --git a/template/pages/icon.tpl.php b/template/pages/icon.tpl.php
index 5ec5f25a..59a3a906 100644
--- a/template/pages/icon.tpl.php
+++ b/template/pages/icon.tpl.php
@@ -3,8 +3,11 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
@@ -18,6 +21,7 @@
 ?>
 
             <div class="text">
+
 <?php
     $this->brick('redButtons');
 ?>
@@ -27,9 +31,11 @@
                 <script type="text/javascript">//<![CDATA[
                     $WH.ge('h1-icon-0').appendChild(Icon.create("<?=$this->icon;?>", 2));
                 //]]></script>
+
 <?php
     $this->brick('markup', ['markup' => $this->article]);
 ?>
+
                 <div class="clear"></div>
                 <h2 class="clear"><?=Lang::main('related'); ?></h2>
             </div>
diff --git a/template/pages/icons.tpl.php b/template/pages/icons.tpl.php
index 2ab62c48..35f59368 100644
--- a/template/pages/icons.tpl.php
+++ b/template/pages/icons.tpl.php
@@ -3,26 +3,32 @@
 
     use \Aowow\Lang;
 
-$this->brick('header');
-$f = $this->filter->values;                                 // shorthand
+    /** @var PageTemplate $this */
+
+    $this->brick('header');
+    $f = $this->filter->values;                             // shorthand
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
 
 <?php
-$this->brick('announcement');
+    $this->brick('announcement');
 
-$this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => [31]]);
+    $this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => [31]]);
 ?>
+
             <div id="fi" style="display: <?=($this->filter->query ? 'block' : 'none'); ?>;">
                 <form action="?filter=icons" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">
                     <div class="text">
-<?php
-$this->brick('headIcons');
 
-$this->brick('redButtons');
+<?php
+    $this->brick('headIcons');
+
+    $this->brick('redButtons');
 ?>
+
                         <h1><?=$this->h1; ?></h1>
                     </div>
                     <table>
diff --git a/template/pages/image-crop.tpl.php b/template/pages/image-crop.tpl.php
index 59d130f7..6084bf49 100644
--- a/template/pages/image-crop.tpl.php
+++ b/template/pages/image-crop.tpl.php
@@ -3,17 +3,21 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
 
 <?php
-$this->brick('announcement');
+    $this->brick('announcement');
 
-$this->brick('pageTemplate');
+    $this->brick('pageTemplate');
 ?>
+
             <div class="text">
                 <h1><?=$this->h1; ?></h1>
 
diff --git a/template/pages/item.tpl.php b/template/pages/item.tpl.php
index 23b1c768..070fb0b1 100644
--- a/template/pages/item.tpl.php
+++ b/template/pages/item.tpl.php
@@ -3,8 +3,11 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
@@ -18,15 +21,19 @@
 ?>
 
             <div class="text">
+
 <?php $this->brick('redButtons'); ?>
 
                 <h1><?=$this->h1; ?></h1>
+
 <?php
 if ($this->unavailable):
 ?>
+
 	<div class="pad"></div>
     <b style="color: red"><?=Lang::item('_unavailable'); ?></b>
 	<div class="pad"></div>
+
 <?php
 endif;
 
@@ -35,31 +42,38 @@ endif;
     $this->brick('markup', ['markup' => $this->article]);
 
 if ($this->map):
-    echo "            <h3>".$this->map[4]."</h3>\n";
+    echo '            <h3>'.$this->map[4].'</h3>'.PHP_EOL;
     $this->brick('mapper');
 endif;
 
 if ($this->transfer):
-    echo "    <div class=\"pad\"></div>\n    ".$this->transfer."\n";
+    echo '    <div class="pad"></div>'.PHP_EOL;
+    echo '    '.$this->transfer.PHP_EOL;
 endif;
 
 if ($this->subItems):
 ?>
+
                 <div class="clear"></div>
                 <h3><?=Lang::item('_rndEnchants'); ?></h3>
+
 <?php
     foreach (array_chunk($this->subItems['data'], ceil(count($this->subItems['data']) / 2)) as $columns):
 ?>
+
                 <div class="random-enchantments" style="margin-right: 25px">
                     <ul>
+
 <?php
         foreach ($columns as $k => ['name' => $name, 'enchantment' => $enchantment, 'chance' => $chance]):
             echo '                        <li><div><span title="ID'.Lang::main('colon').$this->subItems['randIds'][$k].'" class="tip q'.$this->subItems['quality'].'">...'.$name.'</span> <small class="q0">'.Lang::item('_chance', [$chance]).'</small><br />';
-            echo Lang::concat($enchantment, Lang::CONCAT_NONE, fn($txt, $eId) => '<a style="text-decoration:none; color:#CCCCCC;" href="?enchantment='.$eId.'">'.$txt.'</a>')."</div></li>\n";
+            echo Lang::concat($enchantment, Lang::CONCAT_NONE, fn($txt, $eId) => '<a style="text-decoration:none; color:#CCCCCC;" href="?enchantment='.$eId.'">'.$txt.'</a>').'</div></li>'.PHP_EOL;
         endforeach;
 ?>
+
                     </ul>
                 </div>
+
 <?php
     endforeach;
 endif;
diff --git a/template/pages/items.tpl.php b/template/pages/items.tpl.php
index e69d69a8..b722653a 100644
--- a/template/pages/items.tpl.php
+++ b/template/pages/items.tpl.php
@@ -1,28 +1,34 @@
 <?php
     namespace Aowow\Template;
 
-    use Aowow\Lang;
+    use \Aowow\Lang;
 
-$this->brick('header');
-$f = $this->filter->values;                                 // shorthand
+    /** @var PageTemplate $this */
+
+    $this->brick('header');
+    $f = $this->filter->values;                             // shorthand
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
 
 <?php
-$this->brick('announcement');
+    $this->brick('announcement');
 
-$this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => [0]]);
+    $this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => [0]]);
 ?>
+
             <div id="fi" style="display: <?=($this->filter->query ? 'block' : 'none'); ?>;">
                 <form action="?filter=items<?=$this->subCat; ?>" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">
                     <div class="text">
-<?php
-$this->brick('headIcons');
 
-$this->brick('redButtons');
+<?php
+    $this->brick('headIcons');
+
+    $this->brick('redButtons');
 ?>
+
                         <h1><?=$this->h1; ?></h1>
                     </div>
                     <div class="rightpanel">
@@ -37,6 +43,7 @@ $this->brick('redButtons');
 <?php
 if ($this->slotList):
 ?>
+
                     <div class="rightpanel2">
                         <div style="float: left"><?=Lang::item('slot'); ?></div>
                         <small><a href="javascript:;" onclick="document.forms['fi'].elements['sl[]'].selectedIndex = -1; return false" onmousedown="return false"><?=Lang::main('clear'); ?></a></small>
@@ -45,11 +52,13 @@ if ($this->slotList):
 <?=$this->makeOptionsList($this->slotList, $f['sl'], 28); ?>
                         </select>
                     </div>
+
 <?php
 endif;
 
 if ($this->typeList):
 ?>
+
                     <div class="rightpanel2">
                         <div style="float: left"><?=Lang::game('type'); ?></div>
                         <small><a href="javascript:;" onclick="document.forms['fi'].elements['ty[]'].selectedIndex = -1; return false" onmousedown="return false"><?=Lang::main('clear'); ?></a></small>
@@ -62,6 +71,7 @@ if ($this->typeList):
 }); ?>
                         </select>
                     </div>
+
 <?php endif; ?>
 
                     <table>
@@ -141,7 +151,7 @@ if ($this->typeList):
 
                     <div class="clear"></div>
                     <div class="padded">
-                        <?=Lang::main('groupBy')."\n"; ?>
+                        <?=Lang::main('groupBy').PHP_EOL; ?>
 <?=$this->makeRadiosList('gb', Lang::main('gb'), $f['gb'] ?? '', 24, fn($v, &$k) => ($k = $k ?: '') || 1); ?>
                     </div>
 
diff --git a/template/pages/itemset.tpl.php b/template/pages/itemset.tpl.php
index 5bc4b51c..42a3b36f 100644
--- a/template/pages/itemset.tpl.php
+++ b/template/pages/itemset.tpl.php
@@ -3,8 +3,11 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
@@ -18,60 +21,73 @@
 ?>
 
             <div class="text">
+
 <?php
-$this->brick('redButtons');
+    $this->brick('redButtons');
 
 if ($this->expansion):
-    echo '                <h1 class="h1-icon"><span class="icon-'.$this->expansion.'-right">'.$this->h1."</span></h1>\n";
+    echo '                <h1 class="h1-icon"><span class="icon-'.$this->expansion.'-right">'.$this->h1.'</span></h1>'.PHP_EOL;
 else:
-    echo '                <h1>'.$this->h1."</h1>\n";
+    echo '                <h1>'.$this->h1.'</h1>'.PHP_EOL;
 endif;
 if ($this->unavailable):
 ?>
+
                 <div class="pad"></div>
                 <b style="color: red"><?=Lang::itemset('_unavailable'); ?></b>
                 <div class="pad"></div>
+
 <?php
 endif;
 $this->brick('markup', ['markup' => $this->article]);
 
 echo $this->description;
 ?>
+
                 <script type="text/javascript">//<![CDATA[
+
 <?php
 foreach ($this->pieces as $iId => [$piece, ]):
-    echo "                    g_items.add(".$iId.", ".$this->json($piece).");\n";
+    echo '                    g_items.add('.$iId.', '.$this->json($piece).');'.PHP_EOL;
 endforeach;
 ?>
+
                 //]]></script>
 
                 <table class="iconlist">
+
 <?php
 $iconIdx = 0;
 foreach ($this->pieces as [, $icon]):
     echo $icon->renderContainer(20, $iconIdx, true);
 endforeach;
 ?>
+
                 </table>
 
                 <script type="text/javascript">//<![CDATA[
+
 <?php
 foreach ($this->pieces as [, $icon]):
     echo $icon->renderJS(20);
 endforeach;
 ?>
+
                 //]]></script>
 
                 <h3><?=Lang::itemset('_setBonuses').$this->bonusExt; ?></h3>
 
-<?="                ".Lang::itemset('_conveyBonus')."\n"; ?>
+<?='                '.Lang::itemset('_conveyBonus').PHP_EOL; ?>
                 <ul>
+
 <?php
 foreach ($this->spells as [$nItems, $spellId, $text]):
-    echo '                    <li><div>'.Lang::itemset('_pieces', [$nItems]).'<a href="?spell='.$spellId.'">'.$text."</a></div></li>\n";
+    echo '                    <li><div>'.Lang::itemset('_pieces', [$nItems]).'<a href="?spell='.$spellId.'">'.$text.'</a></div></li>'.PHP_EOL;
 endforeach;
 ?>
+
                 </ul>
+
 <?php
 if ($this->summary):
 ?>
@@ -82,6 +98,7 @@ if ($this->summary):
                 <script type="text/javascript">//<![CDATA[
                     <?=$this->summary; ?>
                 //]]></script>
+
 <?php
 endif;
 ?>
diff --git a/template/pages/itemsets.tpl.php b/template/pages/itemsets.tpl.php
index 23297b55..3f2d09c9 100644
--- a/template/pages/itemsets.tpl.php
+++ b/template/pages/itemsets.tpl.php
@@ -3,26 +3,32 @@
 
     use \Aowow\Lang;
 
-$this->brick('header');
-$f = $this->filter->values;                                 // shorthand
+    /** @var PageTemplate $this */
+
+    $this->brick('header');
+    $f = $this->filter->values;                             // shorthand
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
 
 <?php
-$this->brick('announcement');
+    $this->brick('announcement');
 
-$this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => [2]]);
+    $this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => [2]]);
 ?>
+
             <div id="fi" style="display: <?=($this->filter->query ? 'block' : 'none'); ?>;">
                 <form action="?filter=itemsets<?=$this->subCat; ?>" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">
                     <div class="text">
-<?php
-$this->brick('headIcons');
 
-$this->brick('redButtons');
+<?php
+    $this->brick('headIcons');
+
+    $this->brick('redButtons');
 ?>
+
                         <h1><?=$this->h1; ?></h1>
                     </div>
                     <div class="rightpanel">
diff --git a/template/pages/list-page-generic.tpl.php b/template/pages/list-page-generic.tpl.php
index 72ca1ac3..c4e1d1cb 100644
--- a/template/pages/list-page-generic.tpl.php
+++ b/template/pages/list-page-generic.tpl.php
@@ -3,8 +3,11 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
@@ -14,7 +17,9 @@
 
     $this->brick('pageTemplate');
 ?>
+
             <div class="text">
+
 <?php
     $this->brick('redButtons');
 
@@ -38,15 +43,20 @@
         echo '                <h2 class="clear">'.$this->tabsTitle.'</h2>';
     endif;
 ?>
+
             </div>
+
 <?php
     if ($this->lvTabs):
         $this->brick('lvTabs');
 ?>
+
         <div class="clear"></div>
+
 <?php
     endif;
 ?>
+
         </div><!-- main-contents -->
     </div><!-- main -->
 
diff --git a/template/pages/maintenance.tpl.php b/template/pages/maintenance.tpl.php
index b3f9ecfa..b65cbd3d 100644
--- a/template/pages/maintenance.tpl.php
+++ b/template/pages/maintenance.tpl.php
@@ -1,4 +1,9 @@
-<?php namespace Aowow\Template; ?>
+<?php
+    namespace Aowow\Template;
+
+    /** @var PageTemplate $this */
+?>
+
 <!DOCTYPE html>
 <html>
 <head>
diff --git a/template/pages/maps.tpl.php b/template/pages/maps.tpl.php
index 8e54af9d..daf37bbe 100644
--- a/template/pages/maps.tpl.php
+++ b/template/pages/maps.tpl.php
@@ -3,8 +3,11 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
diff --git a/template/pages/npc.tpl.php b/template/pages/npc.tpl.php
index ba68c727..6f2de964 100644
--- a/template/pages/npc.tpl.php
+++ b/template/pages/npc.tpl.php
@@ -3,8 +3,11 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
@@ -18,6 +21,7 @@
 ?>
 
             <div class="text">
+
 <?php $this->brick('redButtons'); ?>
 
                 <h1><?=$this->h1.($this->subname ? ' &lt;'.$this->subname.'&gt;' : ''); ?></h1>
@@ -28,47 +32,55 @@
 if ($this->accessory):
     echo '                <div>'.Lang::npc('accessoryFor').' ';
     echo Lang::concat($this->accessory, true, fn ($v) => '<a href="?npc='.$v[0].'">'.$v[1].'</a>');
-    echo ".</div>\n";
+    echo '.</div>'.PHP_EOL;
 endif;
 
 if ($this->placeholder):
 ?>
+
                 <div><?=Lang::npc('difficultyPH', $this->placeholder);?></div>
                 <div class="pad"></div>
+
 <?php
 elseif ($this->map):
     $this->brick('mapper');
 else:
-    echo '                '.Lang::npc('unkPosition')."\n";
+    echo '                '.Lang::npc('unkPosition').''.PHP_EOL;
 endif;
 
 if ([$quoteGroups, $count] = $this->quotes):
 ?>
+
                 <h3><a class="disclosure-off" onclick="return g_disclose($WH.ge('quotes-generic'), this)"><?=Lang::npc('quotes', [$count]); ?></a></h3>
                 <div id="quotes-generic" style="display: none"><ul>
+
 <?php
     foreach ($quoteGroups as $group):
         if (count($group) > 1 && count($quoteGroups) > 1):
-            echo "<ul>\n";
+            echo '<ul>'.PHP_EOL;
         endif;
 
         foreach ($group as $itr):
-            echo '<li>'.sprintf($itr['text'], $this->h1)."</li>\n";
+            echo '<li>'.sprintf($itr['text'], $this->h1).'</li>'.PHP_EOL;
         endforeach;
 
         if (count($group) > 1 && count($quoteGroups) > 1):
-            echo "</ul>\n";
+            echo '</ul>'.PHP_EOL;
         endif;
 
     endforeach;
 ?>
+
                 </ul></div>
+
 <?php
 endif;
 
 if ($this->reputation):
 ?>
+
                 <h3><?=Lang::main('gains'); ?></h3>
+
 <?php
     echo Lang::npc('gainsDesc');
 
@@ -95,6 +107,7 @@ endif;
 $this->brick('markup', ['markup' => $this->smartAI]);
 
 ?>
+
                 <h2 class="clear"><?=Lang::main('related'); ?></h2>
             </div>
 
diff --git a/template/pages/npcs.tpl.php b/template/pages/npcs.tpl.php
index 90100955..46a6189a 100644
--- a/template/pages/npcs.tpl.php
+++ b/template/pages/npcs.tpl.php
@@ -3,26 +3,32 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
 $this->brick('header');
 $f = $this->filter->values;                                 // shorthand
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
 
 <?php
-$this->brick('announcement');
+    $this->brick('announcement');
 
-$this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => [4]]);
+    $this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => [4]]);
 ?>
+
             <div id="fi" style="display: <?=($this->filter->query ? 'block' : 'none'); ?>;">
                 <form action="?filter=npcs<?=$this->subCat; ?>" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">
                     <div class="text">
-<?php
-$this->brick('headIcons');
 
-$this->brick('redButtons');
+<?php
+    $this->brick('headIcons');
+
+    $this->brick('redButtons');
 ?>
+
                         <h1><?=$this->h1; ?></h1>
                     </div>
                     <div class="rightpanel">
@@ -33,6 +39,7 @@ $this->brick('redButtons');
 <?=$this->makeOptionsList(Lang::npc('rank'), $f['cl'], 28); ?>
                         </select>
                     </div>
+
 <?php if ($this->petFamPanel): ?>
                     <div class="rightpanel2">
                         <div style="float: left"><?=Lang::npc('petFamily'); ?></div><small><a href="javascript:;" onclick="document.forms['fi'].elements['fa[]'].selectedIndex = -1; return false" onmousedown="return false"><?=Lang::main('clear'); ?></a></small>
@@ -41,7 +48,9 @@ $this->brick('redButtons');
 <?=$this->makeOptionsList(Lang::game('fa'), $f['fa'], 28); ?>
                         </select>
                     </div>
+
 <?php endif; ?>
+
                     <table>
                         <tr>
                             <td><?=$this->ucFirst(Lang::main('name')).Lang::main('colon'); ?></td>
diff --git a/template/pages/object.tpl.php b/template/pages/object.tpl.php
index b3e076e5..ad44552b 100644
--- a/template/pages/object.tpl.php
+++ b/template/pages/object.tpl.php
@@ -3,8 +3,11 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
@@ -18,6 +21,7 @@
 ?>
 
             <div class="text">
+
 <?php $this->brick('redButtons'); ?>
 
                 <h1><?=$this->h1; ?></h1>
@@ -26,7 +30,7 @@
     $this->brick('markup', ['markup' => $this->article]);
 
 if ($this->relBoss):
-    echo "                <div>".sprintf(Lang::gameObject('npcLootPH'), $this->h1, $this->relBoss[0], $this->relBoss[1])."</div>\n";
+    echo '                <div>'.sprintf(Lang::gameObject('npcLootPH'), $this->h1, $this->relBoss[0], $this->relBoss[1]).'</div>'.PHP_EOL;
     echo '                <div class="pad"></div>';
 endif;
 
diff --git a/template/pages/objects.tpl.php b/template/pages/objects.tpl.php
index d5055534..aeacf714 100644
--- a/template/pages/objects.tpl.php
+++ b/template/pages/objects.tpl.php
@@ -3,26 +3,32 @@
 
     use \Aowow\Lang;
 
-$this->brick('header');
-$f = $this->filter->values;                                 // shorthand
+    /** @var PageTemplate $this */
+
+    $this->brick('header');
+    $f = $this->filter->values;                             // shorthand
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
 
 <?php
-$this->brick('announcement');
+    $this->brick('announcement');
 
-$this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => [5]]);
+    $this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => [5]]);
 ?>
+
             <div id="fi" style="display: <?=($this->filter->query ? 'block' : 'none'); ?>;">
                 <form action="?filter=objects<?=$this->subCat; ?>" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">
                     <div class="text">
-<?php
-$this->brick('headIcons');
 
-$this->brick('redButtons');
+<?php
+    $this->brick('headIcons');
+
+    $this->brick('redButtons');
 ?>
+
                         <h1><?=$this->h1; ?></h1>
                     </div>
                     <table>
diff --git a/template/pages/privilege.tpl.php b/template/pages/privilege.tpl.php
index 7aafd824..f86c7cdb 100644
--- a/template/pages/privilege.tpl.php
+++ b/template/pages/privilege.tpl.php
@@ -1,8 +1,11 @@
 <?php
     namespace Aowow\Template;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
@@ -16,9 +19,11 @@
             <div class="text">
                 <h1><?=$this->h1;?></h1>
                 <p><?=$this->privReqPoints;?></p><br />
+
 <?php
     $this->brick('markup', ['markup' => $this->article]);
 ?>
+
             </div>
             <div class="clear"></div>
         </div><!-- main-contents -->
diff --git a/template/pages/privileges.tpl.php b/template/pages/privileges.tpl.php
index 6e86449b..5f4005eb 100644
--- a/template/pages/privileges.tpl.php
+++ b/template/pages/privileges.tpl.php
@@ -3,8 +3,11 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
@@ -23,11 +26,13 @@
                 <table class="wsa-list wsa-tbl">
                     <thead><th><?=Lang::privileges('privilege');?></th><th><?=Lang::privileges('requiredRep');?></th></thead>
                     <tbody>
+
 <?php
     foreach ($this->privileges as $id => [$earned, $name, $value]):
-        echo '                        <tr'.($earned ? ' class="wsa-earned"' : '').'><td><div class="wsa-check" style="float:left;margin:0 3px 0 0">&nbsp;</div><a href="?privilege='.$id.'">'.$name.'</a></td><td class="number-right"><span>'.Lang::nf($value)."</span></td></tr>\n";
+        echo '                        <tr'.($earned ? ' class="wsa-earned"' : '').'><td><div class="wsa-check" style="float:left;margin:0 3px 0 0">&nbsp;</div><a href="?privilege='.$id.'">'.$name.'</a></td><td class="number-right"><span>'.Lang::nf($value).'</span></td></tr>'.PHP_EOL;
     endforeach;
 ?>
+
                     </tbody>
                 </table>
             </div>
diff --git a/template/pages/profile.tpl.php b/template/pages/profile.tpl.php
index 2edd318d..fed434d7 100644
--- a/template/pages/profile.tpl.php
+++ b/template/pages/profile.tpl.php
@@ -1,8 +1,11 @@
 <?php
     namespace Aowow\Template;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
diff --git a/template/pages/profiler.tpl.php b/template/pages/profiler.tpl.php
index f036e1f0..8880f490 100644
--- a/template/pages/profiler.tpl.php
+++ b/template/pages/profiler.tpl.php
@@ -3,8 +3,11 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
diff --git a/template/pages/profiles.tpl.php b/template/pages/profiles.tpl.php
index db39deb1..7879c37c 100644
--- a/template/pages/profiles.tpl.php
+++ b/template/pages/profiles.tpl.php
@@ -3,28 +3,34 @@
 
     use \Aowow\Lang;
 
-$this->brick('header');
-$f = $this->filter->values;                                 // shorthand
+    /** @var PageTemplate $this */
+
+    $this->brick('header');
+    $f = $this->filter->values;                             // shorthand
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
 
 <?php
-$this->brick('announcement');
+    $this->brick('announcement');
 
-$this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => array_slice($this->pageTemplate['breadcrumb'], 0, 3)]);
+    $this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => array_slice($this->pageTemplate['breadcrumb'], 0, 3)]);
 
-# pr_setRegionRealm($WH.ge('fi').firstChild, realm, region) - never have \n\s before <form>, it will become firstChild (a text node)
+    # pr_setRegionRealm($WH.ge('fi').firstChild, realm, region) - never have \n\s before <form>, it will become firstChild (a text node)
 ?>
+
             <div id="fi" style="display: <?=($this->filter->query ? 'block' : 'none'); ?>;"><form
                 action="?filter=profiles<?=$this->subCat; ?>" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">
                     <div class="text">
-<?php
-$this->brick('headIcons');
 
-$this->brick('redButtons');
+<?php
+    $this->brick('headIcons');
+
+    $this->brick('redButtons');
 ?>
+
                         <h1><?=$this->h1; ?></h1>
                     </div>
                     <div class="rightpanel">
@@ -93,14 +99,19 @@ $this->brick('redButtons');
 <?php
     if ($this->roster):
 ?>
+
                 <div class="text"><h2 style="padding-top: 0;"><?=$this->roster;?></h2></div>
+
 <?php
     else:
 ?>
+
                 <div class="pad"></div>
+
 <?php
     endif;
 ?>
+
             </div>
 
 <?=$this->renderFilter(12); ?>
diff --git a/template/pages/quest.tpl.php b/template/pages/quest.tpl.php
index b59bb47a..104827e9 100644
--- a/template/pages/quest.tpl.php
+++ b/template/pages/quest.tpl.php
@@ -3,8 +3,11 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
@@ -18,70 +21,80 @@
 ?>
 
             <div class="text">
+
 <?php $this->brick('redButtons'); ?>
 
                 <h1><?=$this->h1; ?></h1>
+
 <?php if ($this->unavailable): ?>
                 <div class="pad"></div>
                 <b style="color: red"><?=Lang::quest('unavailable'); ?></b>
                 <div class="pad"></div>
+
 <?php
 endif;
 
 if ($this->objectives):
-    echo $this->objectives."\n";
+    echo $this->objectives.PHP_EOL;
 elseif ($this->requestItems):
-    echo '                <h3>'.Lang::quest('progress')."</h3>\n";
-    echo $this->requestItems."\n";
+    echo '                <h3>'.Lang::quest('progress').'</h3>'.PHP_EOL;
+    echo $this->requestItems.PHP_EOL;
 elseif ($this->offerReward):
-    echo '                <h3>'.Lang::quest('completion')."</h3>\n";
-    echo $this->offerReward."\n";
+    echo '                <h3>'.Lang::quest('completion').'</h3>'.PHP_EOL;
+    echo $this->offerReward.PHP_EOL;
 endif;
 
 $iconOffset = 0;
 if ($this->end || $this->objectiveList):
 ?>
+
                 <table class="iconlist">
+
 <?php
     foreach ($this->objectiveList as $objective):
         if (is_string($objective)):                         // just text line
-            echo '                    <tr><th><p style="height: 26px; width: 30px;">&nbsp;</p></th><td>'.$objective."</td></tr>\n";
+            echo '                    <tr><th><p style="height: 26px; width: 30px;">&nbsp;</p></th><td>'.$objective.'</td></tr>'.PHP_EOL;
         elseif (is_array($objective)):                      // proxy npc data
             ['id' => $id, 'text' => $text, 'qty' => $qty, 'proxy' => $proxies] = $objective;
-            echo '                    <tr><th><p style="height: 26px">&nbsp;</p></th><td><a href="javascript:;" onclick="g_disclose($WH.ge(\'npcgroup-'.$id.'\'), this)" class="disclosure-off">'.$text.'</a>'.($qty ? '&nbsp;('.$qty.')' : '').'<div id="npcgroup-'.$id."\" style=\"display: none\">\n";
+            echo '                    <tr><th><p style="height: 26px">&nbsp;</p></th><td><a href="javascript:;" onclick="g_disclose($WH.ge(\'npcgroup-'.$id.'\'), this)" class="disclosure-off">'.$text.'</a>'.($qty ? '&nbsp;('.$qty.')' : '').'<div id="npcgroup-'.$id.'" style="display: none">'.PHP_EOL;
             foreach ($proxies as $block):
-                echo "                        <div style=\"float: left\"><table class=\"iconlist\">\n";
+                echo '                        <div style="float: left"><table class="iconlist">'.PHP_EOL;
                 foreach ($block as $pId => $pName):
-                    echo '                            <tr><th><ul><li><var>&nbsp;</var></li></ul></th><td><a href="?npc='.$pId.'">'.$pName."</a></td></tr>\n";
+                    echo '                            <tr><th><ul><li><var>&nbsp;</var></li></ul></th><td><a href="?npc='.$pId.'">'.$pName.'</a></td></tr>'.PHP_EOL;
                 endforeach;
-                echo "                        </table></div>\n";
+                echo '                        </table></div>'.PHP_EOL;
             endforeach;
-            echo "                    </div></td></tr>\n";
+            echo '                    </div></td></tr>'.PHP_EOL;
         elseif (is_object($objective)):                     // has icon set (spell / item / ...) or unordered linked list
             echo $objective?->renderContainer(20, $iconOffset, true);
         endif;
     endforeach;
 
     if ($this->end):
-        echo "                    <tr><th><p style=\"height: 26px; width: 30px;\">&nbsp;</p></th><td>".$this->end."</td></tr>\n";
+        echo '                    <tr><th><p style="height: 26px; width: 30px;">&nbsp;</p></th><td>'.$this->end.'</td></tr>'.PHP_EOL;
     endif;
 
     if ($this->suggestedPl):
-        echo '                    <tr><th><p style="height: 26px; width: 30px;">&nbsp;</p></th><td>'.Lang::quest('suggestedPl', [$this->suggestedPl])."</td></tr>\n";
+        echo '                    <tr><th><p style="height: 26px; width: 30px;">&nbsp;</p></th><td>'.Lang::quest('suggestedPl', [$this->suggestedPl]).'</td></tr>'.PHP_EOL;
     endif;
 ?>
+
                 </table>
 
                 <script type="text/javascript">//<![CDATA[
+
 <?php
     foreach (array_filter($this->objectiveList, fn($x) => is_object($x)) as $k => $objective):
         echo $objective?->renderJS();
     endforeach;
 ?>
+
                 //]]></script>
+
 <?php
     if ($this->providedItem):
 ?>
+
                 <div class="pad"></div>
                 <?=Lang::quest('providedItem').Lang::main('colon'); ?>
                 <table class="iconlist">
@@ -91,6 +104,7 @@ if ($this->end || $this->objectiveList):
                 <script type="text/javascript">//<![CDATA[
                     <?=$this->providedItem->renderJS(); ?>
                 //]]></script>
+
 <?php
     endif;
 endif;
@@ -98,25 +112,30 @@ endif;
 $this->brick('mapper');
 
 if ($this->details):
-    echo '                <h3>'.Lang::quest('description')."</h3>\n" . $this->details."\n";
+    echo '                <h3>'.Lang::quest('description').'</h3>'.PHP_EOL;
+    echo '                '.$this->details.PHP_EOL;
 endif;
 
 if ($this->requestItems && $this->objectives):
 ?>
+
                 <h3><a href="javascript:;" class="disclosure-off" onclick="return g_disclose($WH.ge('disclosure-progress'), this)"><?=Lang::quest('progress'); ?></a></h3>
                 <div id="disclosure-progress" style="display: none"><?=$this->requestItems; ?></div>
+
 <?php
 endif;
 
 if ($this->offerReward && ($this->requestItems || $this->objectives)):
 ?>
+
                 <h3><a href="javascript:;" class="disclosure-off" onclick="return g_disclose($WH.ge('disclosure-completion'), this)"><?=Lang::quest('completion'); ?></a></h3>
                 <div id="disclosure-completion" style="display: none"><?=$this->offerReward; ?></div>
+
 <?php
 endif;
 
 if ([$spells, $items, $choice, $money] = $this->rewards):
-    echo '                <h3>'.Lang::main('rewards')."</h3>\n";
+    echo '                <h3>'.Lang::main('rewards').'</h3>'.PHP_EOL;
 
     if ($choice):
         $this->brick('rewards', ['rewTitle' => Lang::quest('rewardChoices'), 'rewards' => $choice, 'offset' => $iconOffset]);
@@ -125,7 +144,7 @@ if ([$spells, $items, $choice, $money] = $this->rewards):
 
     if ($spells):
         if ($choice):
-            echo "                        <div class=\"pad\"></div>\n";
+            echo '                        <div class="pad"></div>'.PHP_EOL;
         endif;
 
         $this->brick('rewards', ['rewTitle' => $spells['title'], 'rewards' => $spells['cast'], 'offset' => $iconOffset, 'extra' => $spells['extra']]);
@@ -134,7 +153,7 @@ if ([$spells, $items, $choice, $money] = $this->rewards):
 
     if ($items || $money):
         if ($choice || $spells):
-            echo "                        <div class=\"pad\"></div>\n";
+            echo '                        <div class="pad"></div>'.PHP_EOL;
         endif;
 
         $this->brick('rewards', array(
@@ -149,26 +168,28 @@ endif;
 
 if ([$xp, $rep, $title, $tp, $honor, $arena] = $this->gains):
 ?>
+
                     <h3><?=Lang::main('gains'); ?></h3>
                     <?=Lang::quest('gainsDesc').Lang::main('colon'); ?>
                     <ul>
+
 <?php
     if ($xp):
-        echo '                        <li><div>'.Lang::nf($xp).' '.Lang::quest('experience')."</div></li>\n";
+        echo '                        <li><div>'.Lang::nf($xp).' '.Lang::quest('experience').'</div></li>'.PHP_EOL;
     endif;
 
     if ($rep):
         foreach ($rep as $r):
-            echo '                        <li><div>'.sprintf($r['qty'][0] < 0 ? '<b class="q10">%s</b>' : '%s', $r['qty'][1]).' '.Lang::npc('repWith').' <a href="?faction='.$r['id'].'">'.$r['name']."</a></div></li>\n";
+            echo '                        <li><div>'.sprintf($r['qty'][0] < 0 ? '<b class="q10">%s</b>' : '%s', $r['qty'][1]).' '.Lang::npc('repWith').' <a href="?faction='.$r['id'].'">'.$r['name'].'</a></div></li>'.PHP_EOL;
         endforeach;
     endif;
 
     if ($title):
-        echo '                        <li><div>'.Lang::quest('rewardTitle', $title)."</div></li>\n";
+        echo '                        <li><div>'.Lang::quest('rewardTitle', $title).'</div></li>'.PHP_EOL;
     endif;
 
     if ($tp):
-        echo '                        <li><div>'.Lang::quest('bonusTalents', [$tp])."</div></li>\n";
+        echo '                        <li><div>'.Lang::quest('bonusTalents', [$tp]).'</div></li>'.PHP_EOL;
     endif;
 
     if ($arena || $honor):
@@ -181,20 +202,21 @@ if ([$xp, $rep, $title, $tp, $honor, $arena] = $this->gains):
         if ($arena):
             echo ' <span class="moneyarena tip q1" onmouseover="Listview.funcBox.moneyArenaOver(event)" onmousemove="$WH.Tooltip.cursorUpdate(event)" onmouseout="$WH.Tooltip.hide()"><a href="?currency=103">'.$arena.'</a></span>';
         endif;
-        echo                         "</div></li>\n";
+        echo                         '</div></li>'.PHP_EOL;
     endif;
 
-    echo "                    </ul>\n";
+    echo '                    </ul>'.PHP_EOL;
 endif;
 
 $this->brickIf($this->mail, 'mail', ['offset' => ++$iconOffset]);
 
 if ($this->transfer):
-    echo "    <div style=\"clear: left\"></div>";
-    echo "    <div class=\"pad\"></div>\n    ".$this->transfer."\n";
+    echo '    <div style="clear: left"></div>'.PHP_EOL;
+    echo '    <div class="pad"></div>'.PHP_EOL;
+    echo '    '.$this->transfer.PHP_EOL;
 endif;
-
 ?>
+
                 <h2 class="clear"><?=Lang::main('related'); ?></h2>
             </div>
 
diff --git a/template/pages/quests.tpl.php b/template/pages/quests.tpl.php
index 427e5aaa..1dbeb100 100644
--- a/template/pages/quests.tpl.php
+++ b/template/pages/quests.tpl.php
@@ -1,28 +1,34 @@
 <?php
     namespace Aowow\Template;
 
-    use Aowow\Lang;
+    use \Aowow\Lang;
 
-$this->brick('header');
-$f = $this->filter->values;                                 // shorthand
+    /** @var PageTemplate $this */
+
+    $this->brick('header');
+    $f = $this->filter->values;                             // shorthand
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
 
 <?php
-$this->brick('announcement');
+    $this->brick('announcement');
 
-$this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => [3]]);
+    $this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => [3]]);
 ?>
+
             <div id="fi" style="display: <?=($this->filter->query ? 'block' : 'none'); ?>;">
                 <form action="?filter=quests<?=$this->subCat; ?>" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">
                     <div class="text">
-<?php
-$this->brick('headIcons');
 
-$this->brick('redButtons');
+<?php
+    $this->brick('headIcons');
+
+    $this->brick('redButtons');
 ?>
+
                         <h1><?=$this->h1; ?></h1>
                     </div>
                     <div class="rightpanel">
diff --git a/template/pages/roster.tpl.php b/template/pages/roster.tpl.php
index 88ed8975..7159bf1b 100644
--- a/template/pages/roster.tpl.php
+++ b/template/pages/roster.tpl.php
@@ -1,21 +1,25 @@
 <?php
     namespace Aowow\Template;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
 
 <?php
-$this->brick('announcement');
-
-$this->brick('pageTemplate');
+    $this->brick('announcement');
 
+    $this->brick('pageTemplate');
 ?>
+
 <div id="roster-status" class="profiler-message" style="display: none"></div>
 
             <div class="text">
+
 <?php $this->brick('redButtons'); ?>
                 <h1 class="first"><?=$this->h1; ?></h1>
 
@@ -25,9 +29,11 @@ $this->brick('pageTemplate');
 ?>
 
             </div>
+
 <?php
     $this->brick('lvTabs');
 ?>
+
             <div class="clear"></div>
         </div><!-- main-contents -->
     </div><!-- main -->
diff --git a/template/pages/screenshot.tpl.php b/template/pages/screenshot.tpl.php
index 819607b7..60559162 100644
--- a/template/pages/screenshot.tpl.php
+++ b/template/pages/screenshot.tpl.php
@@ -3,20 +3,23 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
 
 <?php
-$this->brick('announcement');
+    $this->brick('announcement');
 
-$this->brick('pageTemplate');
-
-$this->brick('infobox');
+    $this->brick('pageTemplate');
 
+    $this->brick('infobox');
 ?>
+
             <div class="text">
                 <h1><?=$this->h1; ?></h1>
 
diff --git a/template/pages/search.tpl.php b/template/pages/search.tpl.php
index a0845be4..a66adbed 100644
--- a/template/pages/search.tpl.php
+++ b/template/pages/search.tpl.php
@@ -3,29 +3,35 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
 
 <?php
-$this->brick('announcement');
+    $this->brick('announcement');
 
-$this->brick('pageTemplate');
+    $this->brick('pageTemplate');
 ?>
 
             <div class="text">
+
 <?php
-$this->brick('redButtons');
+    $this->brick('redButtons');
 if (count($this->lvTabs)):
     echo '                <h1>'.Lang::main('foundResult').' <i>'.$this->search.'</i>';
     if ($this->invalidTerms):
         echo '<span class="sub">'.Lang::main('ignoredTerms', [$this->invalidTerms]).'</span>';
     endif;
-    echo "</h1>\n";
+    echo '</h1>'.PHP_EOL;
 ?>
+
             </div>
+
 <?php
 $this->brick('lvTabs');
 
@@ -34,14 +40,16 @@ else:
     if ($this->invalidTerms):
         echo '<span class="sub">'.Lang::main('ignoredTerms', [$this->invalidTerms]).'</span>';
     endif;
-    echo "</h1>\n";
+    echo '</h1>'.PHP_EOL;
 ?>
+
             <div class="search-noresults"></div>
 
 <?php
-    echo '            '.Lang::main('tryAgain')."\n";
+    echo '            '.Lang::main('tryAgain').PHP_EOL;
 endif;
 ?>
+
             <div class="clear"></div>
         </div><!-- main-contents -->
     </div><!-- main -->
diff --git a/template/pages/sound-playlist.tpl.php b/template/pages/sound-playlist.tpl.php
index 1d561627..59ea456a 100644
--- a/template/pages/sound-playlist.tpl.php
+++ b/template/pages/sound-playlist.tpl.php
@@ -1,10 +1,11 @@
 <?php
     namespace Aowow\Template;
 
-    use \Aowow\Lang;
+    /** @var PageTemplate $this */
 
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
diff --git a/template/pages/sound.tpl.php b/template/pages/sound.tpl.php
index 6dbb1a32..619a7f28 100644
--- a/template/pages/sound.tpl.php
+++ b/template/pages/sound.tpl.php
@@ -3,8 +3,11 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
@@ -16,6 +19,7 @@
 ?>
 
             <div class="text">
+
 <?php
     $this->brick('redButtons');
 ?>
@@ -27,6 +31,7 @@
 
     $this->brickIf($this->map, 'mapper');
 ?>
+
                 <ol id="soundfilelist"></ol>
                 <div id="mainsound"></div>
                 <script type="text/javascript">//<![CDATA[
diff --git a/template/pages/sounds.tpl.php b/template/pages/sounds.tpl.php
index 283ded3f..1d9729a2 100644
--- a/template/pages/sounds.tpl.php
+++ b/template/pages/sounds.tpl.php
@@ -3,26 +3,32 @@
 
     use \Aowow\Lang;
 
-$this->brick('header');
-$f = $this->filter->values;                                 // shorthand
+    /** @var PageTemplate $this */
+
+    $this->brick('header');
+    $f = $this->filter->values;                             // shorthand
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
 
 <?php
-$this->brick('announcement');
+    $this->brick('announcement');
 
-$this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => [19]]);
+    $this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => [19]]);
 ?>
+
             <div id="fi" style="display: <?=($this->filter->query ? 'block' : 'none'); ?>;">
                 <form action="?filter=sounds" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">
                     <div class="text">
-<?php
-$this->brick('headIcons');
 
-$this->brick('redButtons');
+<?php
+    $this->brick('headIcons');
+
+    $this->brick('redButtons');
 ?>
+
                         <h1><?=$this->h1; ?></h1>
                     </div>
                     <div class="rightpanel">
diff --git a/template/pages/spell.tpl.php b/template/pages/spell.tpl.php
index a2f8adcd..1487db0d 100644
--- a/template/pages/spell.tpl.php
+++ b/template/pages/spell.tpl.php
@@ -3,10 +3,13 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 
     $iconOffset = 0;
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
@@ -26,10 +29,10 @@
                 <h1 class="h1-icon"><?=$this->h1; ?></h1>
 
 <?php
-$this->brick('tooltip');
+    $this->brick('tooltip');
 
 if ($this->tools):
-    echo "                <div style=\"float: left; margin-right: 75px\">\n";
+    echo '                <div style="float: left; margin-right: 75px">'.PHP_EOL;
 endif;
 
 if ($this->reagents[1]):
@@ -38,40 +41,48 @@ if ($this->reagents[1]):
 endif;
 
 if ($this->tools):
-    echo "                </div>\n";
+    echo '                </div>'.PHP_EOL;
 
     if ($this->reagents[0]):
-        echo "                <div style=\"float: left\">\n";
+        echo '                <div style="float: left">'.PHP_EOL;
     endif;
 ?>
+
                 <h3><?=Lang::spell('tools'); ?></h3>
                 <table class="iconlist">
+
 <?php
     foreach ($this->tools as $icon):
         echo $icon->renderContainer(20, $iconOffset, true);
     endforeach;
 ?>
+
                 </table>
                 <script type="text/javascript">
+
 <?php
     foreach ($this->tools as $icon):
         echo $icon->renderJS(20);
     endforeach;
 ?>
+
                 </script>
+
 <?php
     if ($this->reagents[0]):
-        echo "                </div>\n";
+        echo '                </div>'.PHP_EOL;
     endif;
 endif;
 ?>
+
                 <div class="clear"></div>
 
 <?php
-$this->brick('markup', ['markup' => $this->article]);
+    $this->brick('markup', ['markup' => $this->article]);
 
 if ($this->transfer):
-    echo "    <div class=\"pad\"></div>\n    ".$this->transfer."\n";
+    echo '    <div class="pad"></div>'.PHP_EOL;
+    echo '    '.$this->transfer.PHP_EOL;
 endif;
 ?>
 
@@ -133,36 +144,43 @@ endif;
                         <th><dfn title="<?=Lang::spell('_globCD').'">'.Lang::spell('_gcd');?></dfn></th>
                         <td><?=$this->gcd;?></td>
                     </tr>
+
 <?php
 if ($this->stances):
 ?>
+
                     <tr>
                         <th><?=Lang::spell('_forms');?></th>
                         <td colspan="3"><?=$this->stances;?></td>
                     </tr>
+
 <?php
 endif;
 
 if ($this->items):
 ?>
+
                     <tr>
                         <th><?=Lang::game('requires2');?></th>
                         <td colspan="3"><?=$this->items;?></td>
                     </tr>
+
 <?php
 endif;
 
 $iconTabIdx = 0;
 foreach ($this->effects as $i => $e):
 ?>
+
                     <tr>
                         <th><?=Lang::spell('_effect').' #'.$i;?></th>
                         <td colspan="3" style="line-height: 17px">
+
 <?php
     echo '                            '.$e['name'];
 
     if ($e['footer']):
-        echo "<small><br />".implode("<br />", $e['footer'])."</small>\n";
+        echo '<small><br />'.implode('<br />', $e['footer']).'</small>'.PHP_EOL;
     endif;
 
     if ($e['markup']):
@@ -173,6 +191,7 @@ $WH.aE(window,\'load\',function(){$WH.ge(\'spelleffectmarkup-'.$i.'\').innerHTML
 
     if ($e['icon']):
 ?>
+
                             <table class="icontab">
                                 <tr>
                                     <?=$e['icon']->renderContainer(iconIdxOffset: $iconTabIdx); ?>
@@ -182,12 +201,14 @@ $WH.aE(window,\'load\',function(){$WH.ge(\'spelleffectmarkup-'.$i.'\').innerHTML
                             <script type="text/javascript">
                                 <?=$e['icon']->renderJS(); ?>
                             </script>
+
 <?php
     endif;
 
     if ($e['perfectItem']):
         ['spellId' => $si, 'spellName' => $sn, 'item' => $it, 'icon' => $ic, 'chance' => $ch] = $e['perfectItem'];
 ?>
+
                             <small><a href="?spell=<?=$si;?>" class="icontiny"><img src="<?=$this->gStaticUrl;?>/images/wow/icons/tiny/<?=$ic;?>.gif" align="absmiddle">
                                 <span class="tinyicontxt"><?=$sn;?></span></a><?=Lang::main('colon').' '.$ch.'%';?></small><table class="icontab">
                             <?=$it->renderContainer(0, $iconTabIdx, true); ?></table>
@@ -201,7 +222,9 @@ $WH.aE(window,\'load\',function(){$WH.ge(\'spelleffectmarkup-'.$i.'\').innerHTML
 
     if ($e['modifies']):
 ?>
+
                             <br /><small><?=Lang::spell('_affected');?></small>
+
 <?php
         for ($type = 0; $type < 2; $type++):                // [classSpells, miscSpells]
             if (!$e['modifies'][$type])
@@ -216,17 +239,18 @@ $WH.aE(window,\'load\',function(){$WH.ge(\'spelleffectmarkup-'.$i.'\').innerHTML
 
             foreach ($e['modifies'][$type] as $idx => [$icon, $ranks]):
                 if (!$idx || !($idx % 3))
-                    echo "<tr".($folded ? ' style="display:none;"' : '').">";
+                    echo '<tr'.($folded ? ' style="display:none;"' : '').'>';
 
                 $icon->renderContainer(iconIdxOffset: $iconTabIdx); // just to assign iconOffset
-                echo "<th id=\"icontab-icon".$iconTabIdx."\"></th><td><a href=\"?spell=".$icon->typeId."\">".($type ? $icon->text : "<b>".$icon->text."</b>")."</a>".($ranks ? "<br /><small>(".Lang::spell('_rankRange', $ranks).")</small>" : '')."</td>\n";
+                echo '<th id="icontab-icon'.$iconTabIdx.'"></th><td><a href="?spell='.$icon->typeId.'">'.($type ? $icon->text : '<b>'.$icon->text.'</b>').'</a>'.($ranks ? '<br /><small>('.Lang::spell('_rankRange', $ranks).')</small>' : '').'</td>'.PHP_EOL;
 
                 if ($idx == count($e['modifies'][$type]) - 1 || !(($idx + 1) % 3))
-                    echo "</tr>";
+                    echo '</tr>';
 
                 if ($idx == 17 && count($e['modifies'][$type]) > 21):
                     $folded = true;
 ?>
+
                 <tr class="icontab-revealer">
                     <td colspan="6">
                         <a onclick="$(this).closest('table').addClass('show-all')">
@@ -234,18 +258,22 @@ $WH.aE(window,\'load\',function(){$WH.ge(\'spelleffectmarkup-'.$i.'\').innerHTML
                         </a>
                     </td>
                 </tr>
+
 <?php
                 endif;
 
             endforeach;
 ?>
+
                             </table>
 
                             <script type="text/javascript">//<![CDATA[
+
 <?php
             foreach ($e['modifies'][$type] as [$icon, ])
                 echo $icon->renderJS(32);
 ?>
+
                             //]]></script>
 
 <?php
@@ -255,13 +283,16 @@ $WH.aE(window,\'load\',function(){$WH.ge(\'spelleffectmarkup-'.$i.'\').innerHTML
         endfor;
     endif;
 ?>
+
                         </td>
                     </tr>
+
 <?php
 endforeach;
 
 if ($this->attributes):
 ?>
+
                     <tr>
                         <th><?=Lang::game('flags');?></th>
                             <td colspan="3" style="line-height:17px">
@@ -272,7 +303,9 @@ if ($this->attributes):
 ?></ul>
                         </td>
                     </tr>
+
 <?php endif; ?>
+
                 </table>
 
                 <h2 class="clear"><?=Lang::main('related');?></h2>
@@ -283,6 +316,7 @@ $this->brick('lvTabs');
 
 $this->brick('contribute');
 ?>
+
             <div class="clear"></div>
         </div><!-- main-contents -->
     </div><!-- main -->
diff --git a/template/pages/spells.tpl.php b/template/pages/spells.tpl.php
index 0579cdad..e3452808 100644
--- a/template/pages/spells.tpl.php
+++ b/template/pages/spells.tpl.php
@@ -1,28 +1,34 @@
 <?php
     namespace Aowow\Template;
 
-    use Aowow\Lang;
+    use \Aowow\Lang;
 
-$this->brick('header');
-$f = $this->filter->values;                                 // shorthand
+    /** @var PageTemplate $this */
+
+    $this->brick('header');
+    $f = $this->filter->values;                             // shorthand
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
 
 <?php
-$this->brick('announcement');
+    $this->brick('announcement');
 
-$this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => [1]]);
+    $this->brick('pageTemplate', ['fiQuery' => $this->filter->query, 'fiMenuItem' => [1]]);
 ?>
+
             <div id="fi" style="display: <?=($this->filter->query ? 'block' : 'none'); ?>;">
                 <form action="?filter=spells<?=$this->subCat; ?>" method="post" name="fi" onsubmit="return fi_submit(this)" onreset="return fi_reset(this)">
                     <div class="text">
-<?php
-$this->brick('headIcons');
 
-$this->brick('redButtons');
+<?php
+    $this->brick('headIcons');
+
+    $this->brick('redButtons');
 ?>
+
                         <h1><?=$this->h1; ?></h1>
                     </div>
                     <div class="rightpanel">
@@ -33,6 +39,7 @@ $this->brick('redButtons');
 <?=$this->makeOptionsList(Lang::game('sc') , $f['sc'], 28,); ?>
                         </select>
                     </div>
+
 <?php if ($this->classPanel): ?>
                     <div class="rightpanel2">
                         <div style="float: left"><?=$this->ucFirst(Lang::game('class')).Lang::main('colon'); ?></div>
@@ -42,11 +49,13 @@ $this->brick('redButtons');
 <?=$this->makeOptionsList(Lang::game('cl') , $f['cl'], 28, fn($v, $k, &$e) => $v && ($e = ['class' => 'c'.$k])); ?>
                         </select>
                     </div>
+
 <?php
 endif;
 
 if ($this->glyphPanel):
 ?>
+
                     <div class="rightpanel2">
                         <div style="float: left"><?=Lang::game('glyphType'); ?></div>
                         <small><a href="javascript:;" onclick="document.forms['fi'].elements['gl[]'].selectedIndex = -1; return false" onmousedown="return false"><?=Lang::main('clear'); ?></a></small>
@@ -55,7 +64,9 @@ if ($this->glyphPanel):
 <?=$this->makeOptionsList(Lang::game('gl') , $f['gl'], 28); ?>
                         </select>
                     </div>
+
 <?php endif; ?>
+
                     <table>
                         <tr>
                             <td><?=$this->ucFirst(Lang::main('name')).Lang::main('colon'); ?></td>
diff --git a/template/pages/talent.tpl.php b/template/pages/talent.tpl.php
index dbc85fe8..2bb03f46 100644
--- a/template/pages/talent.tpl.php
+++ b/template/pages/talent.tpl.php
@@ -1,10 +1,11 @@
 <?php
     namespace Aowow\Template;
 
-    use \Aowow\Lang;
+    /** @var PageTemplate $this */
 
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
diff --git a/template/pages/text-page-generic.tpl.php b/template/pages/text-page-generic.tpl.php
index cda04390..4c05960c 100644
--- a/template/pages/text-page-generic.tpl.php
+++ b/template/pages/text-page-generic.tpl.php
@@ -1,11 +1,15 @@
 <?php
     namespace Aowow\Template;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
+
 <?php
     $this->brick('announcement');
 
@@ -13,11 +17,13 @@
 
 if ([$typeStr, $id] = $this->doResync):
 ?>
+
             <div id="roster-status" class="profiler-message clear"></div>
             <script type="text/javascript">//<![CDATA[
                 pr_updateStatus('<?=$typeStr; ?>', $WH.ge('roster-status'), <?=$id; ?>, 1);
                 pr_setRegionRealm($WH.gE($WH.ge('topbar'), 'form')[0], '<?=$this->region; ?>', '<?=$this->realm; ?>');
             //]]></script>
+
 <?php
 endif;
 
@@ -25,6 +31,7 @@ if ($this->inputbox):
     $this->brick(...$this->inputbox);                       // $templateName, [$templateVars]
 else:
 ?>
+
             <div class="text">
 <?=($this->h1 ? '                <h1>'.$this->h1.'</h1>' : '');?>
 
@@ -35,10 +42,13 @@ else:
 
     echo $this->extraHTML ?? '';
 ?>
+
             </div>
+
 <?php
 endif;
 ?>
+
         </div><!-- main-contents -->
     </div><!-- main -->
 
diff --git a/template/pages/user.tpl.php b/template/pages/user.tpl.php
index 3e4190da..81bf0372 100644
--- a/template/pages/user.tpl.php
+++ b/template/pages/user.tpl.php
@@ -3,8 +3,11 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
@@ -14,37 +17,50 @@
 
     $this->brick('pageTemplate');
 ?>
+
             <script type="text/javascript">var g_pageInfo = { username: '<?=$this->escJS($this->username); ?>' }</script>
+
 <?php
     $this->brick('infobox');
 ?>
+
             <div class="text">
+
 <?php
     if ($this->userIcon):
 ?>
+
                 <div id="h1-icon-generic" class="h1-icon"></div>
                 <script type="text/javascript">
                     $WH.ge('h1-icon-generic').appendChild(Icon.createUser(<?=substr($this->json('userIcon', varRef: true), 1, -1); ?>));
                 </script>
                 <h1 class="h1-icon"><?=$this->h1; ?></h1>
+
 <?php else: ?>
                 <h1><?=$this->h1; ?></h1>
+
 <?php endif; ?>
+
                 <h3 class="first"><?=Lang::user('publicDesc'); ?></h3>
                 <div id="description" class="left"><?php #  must follow directly, no whitespaces allowed
 if ($this->description):
 ?>
+
                     <div id="description-generic"></div>
                     <script type="text/javascript">//<![CDATA[
                         <?=$this->description; ?>
                     //]]></script>
+
 <?php
 endif;
               ?></div>
                 <script type="text/javascript">us_addDescription()</script>
+
 <?php if (count($this->lvTabs)): ?>
                 <h2 id="related" class="clear"><?=Lang::main('related'); ?></h2>
+
 <?php endif; ?>
+
             </div>
 
             <div id="roster-status" class="profiler-message clear" style="display: none"></div>
diff --git a/template/pages/video.tpl.php b/template/pages/video.tpl.php
index f3cded7d..a069c3ab 100644
--- a/template/pages/video.tpl.php
+++ b/template/pages/video.tpl.php
@@ -3,20 +3,23 @@
 
     use \Aowow\Lang;
 
+    /** @var PageTemplate $this */
+
     $this->brick('header');
 ?>
+
     <div class="main" id="main">
         <div class="main-precontents" id="main-precontents"></div>
         <div class="main-contents" id="main-contents">
 
 <?php
-$this->brick('announcement');
+    $this->brick('announcement');
 
-$this->brick('pageTemplate');
-
-$this->brick('infobox');
+    $this->brick('pageTemplate');
 
+    $this->brick('infobox');
 ?>
+
             <div class="text">
                 <h1><?=$this->h1; ?></h1>