diff --git a/includes/templates/Footer.mustache b/includes/templates/Footer.mustache
index 28505d1ee..ba15a17eb 100644
--- a/includes/templates/Footer.mustache
+++ b/includes/templates/Footer.mustache
@@ -1,17 +1,17 @@
 {{!
-  @typedef object footerItem
-  @prop string id of list item element
-  @prop string html of list item
-  @prop footerItem[] items
+	@typedef object footerItem
+	@prop string id of list item element
+	@prop string html of list item
+	@prop footerItem[] items
 
-  @typedef object footerRow
-  @prop string className of list element
-  @prop string id of list element
-  @prop footerItem[] array-items
+	@typedef object footerRow
+	@prop string className of list element
+	@prop string id of list element
+	@prop footerItem[] array-items
 
-  string html-hook-vector-before-footer output of VectorBeforeFooter hook
-  string|null html-userlangattributes a string of attribute HTML
-  footerRow[] array-footer-rows iterable list of footer rows
+	string html-hook-vector-before-footer output of VectorBeforeFooter hook
+	string|null html-userlangattributes a string of attribute HTML
+	footerRow[] array-footer-rows iterable list of footer rows
 }}
 {{{html-hook-vector-before-footer}}}
 <div id="footer" role="contentinfo" {{{html-userlangattributes}}}>
diff --git a/includes/templates/Sidebar.mustache b/includes/templates/Sidebar.mustache
index c4a3b69c2..badb444ee 100644
--- a/includes/templates/Sidebar.mustache
+++ b/includes/templates/Sidebar.mustache
@@ -12,15 +12,11 @@
 	<div id="p-logo" role="banner">
 		<a {{{html-logo-attributes}}}></a>
 	</div>
-	{{#array-portals-first}}
-	{{>Portal}}
-	{{/array-portals-first}}
+	{{#array-portals-first}}{{>Portal}}{{/array-portals-first}}
 	{{#data-emphasized-sidebar-action}}
 	<div class="vector-emphasized-sidebar-action">
 		<a class="vector-emphasized-sidebar-action-link" href="{{href}}">{{text}}</a>
 	</div>
 	{{/data-emphasized-sidebar-action}}
-	{{#array-portals-rest}}
-	{{>Portal}}
-	{{/array-portals-rest}}
+	{{#array-portals-rest}}{{>Portal}}{{/array-portals-rest}}
 </div>
diff --git a/includes/templates/index.mustache b/includes/templates/index.mustache
index ac3d2188e..a03381a8a 100644
--- a/includes/templates/index.mustache
+++ b/includes/templates/index.mustache
@@ -1,37 +1,37 @@
 {{!
-  string html-headelement a string of attribute HTML that begins with `<html> and ends with '</head>'
-    and contains `meta` tags and ResourceLoader internals.
-  string|null html-sitenotice the contents of a banner defined in MediaWiki:Sitenotice.
-    Also used by CentralNotice to inject banners into Vector.
-  string html-indicators raw HTML containing wiki-defined badges such as "good article", "featured article".
-    An empty string if none are defined.
-  string page-langcode the content language of the article. Assumed to be escaped HTML./
-  string html-title
-  string html-prebodyhtml
-  bool page-isarticle
-  string msg-tagline
-  string html-subtitle
-  string html-undelete
-  string html-newtalk
-  string msg-jumptonavigation
-  string msg-jumptosearch
-  string html-bodycontent
-  string html-printfooter
-  string html-catlinks
-  string html-debuglog
-  string html-dataAfterContent
-  string html-navigation-heading heading for entire navigation that is
-    usually hidden to screen readers
-  object data-personal-menu See PersonalMenu.mustache for documentation.
-  object data-namespace-tabs. See VectorTabs.mustache for documentation.
-  object data-variants. See VectorMenu.mustache for documentation.
-  object data-page-actions. See VectorTabs.mustache for documentation.
-  object data-page-actions-more. See VectorMenu.mustache for documentation.
-  object data-search-box. See SearchBox.mustache for documentation.
-  object data-sidebar. See Sidebar.mustache for documentation.
-  object data-footer for footer template partial. see Footer.mustache for documentation.
-  string html-printtail HTML to render at the end of the page contained necessary script tags for ResourceLoader
-    terminated with `</body></html>`.
+	string html-headelement a string of attribute HTML that begins with `<html>` and ends with
+		`</head>` and contains `meta` tags and ResourceLoader internals.
+	string|null html-sitenotice the contents of a banner defined in MediaWiki:Sitenotice.
+		Also used by CentralNotice to inject banners into Vector.
+	string html-indicators raw HTML containing wiki-defined badges such as "good article",
+		"featured article". An empty string if none are defined.
+	string page-langcode the content language of the article. Assumed to be escaped HTML.
+	string html-title
+	string html-prebodyhtml
+	bool page-isarticle
+	string msg-tagline
+	string html-subtitle
+	string html-undelete
+	string html-newtalk
+	string msg-jumptonavigation
+	string msg-jumptosearch
+	string html-bodycontent
+	string html-printfooter
+	string html-catlinks
+	string html-debuglog
+	string html-dataAfterContent
+	string html-navigation-heading heading for entire navigation that is usually hidden to screen
+		readers
+	object data-personal-menu See PersonalMenu.mustache for documentation.
+	object data-namespace-tabs. See VectorTabs.mustache for documentation.
+	object data-variants. See VectorMenu.mustache for documentation.
+	object data-page-actions. See VectorTabs.mustache for documentation.
+	object data-page-actions-more. See VectorMenu.mustache for documentation.
+	object data-search-box. See SearchBox.mustache for documentation.
+	object data-sidebar. See Sidebar.mustache for documentation.
+	object data-footer for footer template partial. see Footer.mustache for documentation.
+	string html-printtail HTML to render at the end of the page contained necessary script tags for
+		ResourceLoader terminated with `</body></html>`.
 }}
 
 {{{html-headelement}}}
@@ -39,7 +39,9 @@
 <div id="mw-head-base" class="noprint"></div>
 <div id="content" class="mw-body" role="main">
 	<a id="top"></a>
-	{{#html-sitenotice}}<div id="siteNotice" class="mw-body-content">{{{html-sitenotice}}}</div>{{/html-sitenotice}}
+	{{#html-sitenotice}}
+		<div id="siteNotice" class="mw-body-content">{{{html-sitenotice}}}</div>
+	{{/html-sitenotice}}
 	{{{html-indicators}}}
 	<h1 id="firstHeading" class="firstHeading" lang="{{page-langcode}}">{{{html-title}}}</h1>
 	{{{html-prebodyhtml}}}
@@ -49,15 +51,15 @@
 		{{#html-undelete}}<div id="contentSub2">{{{html-undelete}}}</div>{{/html-undelete}}
 		{{#html-newtalk}}<div class="usermessage">{{{html-newtalk}}}</div>{{/html-newtalk}}
 		{{!
-		Keep this empty `div` for compatibility with gadgets and user scripts
-		using this place to insert extra elements before.
+			Keep this empty `div` for compatibility with gadgets and user scripts
+			using this place to insert extra elements before.
 		}}
 		<div id="jump-to-nav"></div>
 		<a class="mw-jump-link" href="#mw-head">{{msg-jumptonavigation}}</a>
 		<a class="mw-jump-link" href="#p-search">{{msg-jumptosearch}}</a>
 		{{{html-bodycontent}}}
 		{{#html-printfooter}}
-		<div class="printfooter">{{{html-printfooter}}}</div>
+			<div class="printfooter">{{{html-printfooter}}}</div>
 		{{/html-printfooter}}
 		{{{html-catlinks}}}
 		<div class="visualClear"></div>
@@ -66,36 +68,20 @@
 </div>
 {{{html-dataAfterContent}}}
 <div id="mw-navigation">
-    <h2>{{{html-navigation-heading}}}</h2>
-    <div id="mw-head">
-        {{#data-personal-menu}}
-        {{>PersonalMenu}}
-        {{/data-personal-menu}}
-        <div id="left-navigation">
-            {{#data-namespace-tabs}}
-            {{>VectorTabs}}
-            {{/data-namespace-tabs}}
-            {{#data-variants}}
-            {{>VectorMenu}}
-            {{/data-variants}}
-        </div>
-        <div id="right-navigation">
-            {{#data-page-actions}}
-            {{>VectorTabs}}
-            {{/data-page-actions}}
-            {{#data-page-actions-more}}
-            {{>VectorMenu}}
-            {{/data-page-actions-more}}
-            {{#data-search-box}}
-            {{>SearchBox}}
-            {{/data-search-box}}
-        </div>
-    </div>
-    {{#data-sidebar}}
-    {{>Sidebar}}
-    {{/data-sidebar}}
+	<h2>{{{html-navigation-heading}}}</h2>
+	<div id="mw-head">
+		{{#data-personal-menu}}{{>PersonalMenu}}{{/data-personal-menu}}
+		<div id="left-navigation">
+			{{#data-namespace-tabs}}{{>VectorTabs}}{{/data-namespace-tabs}}
+			{{#data-variants}}{{>VectorMenu}}{{/data-variants}}
+		</div>
+		<div id="right-navigation">
+			{{#data-page-actions}}{{>VectorTabs}}{{/data-page-actions}}
+			{{#data-page-actions-more}}{{>VectorMenu}}{{/data-page-actions-more}}
+			{{#data-search-box}}{{>SearchBox}}{{/data-search-box}}
+		</div>
+	</div>
+	{{#data-sidebar}}{{>Sidebar}}{{/data-sidebar}}
 </div>
-{{#data-footer}}
-{{>Footer}}
-{{/data-footer}}
+{{#data-footer}}{{>Footer}}{{/data-footer}}
 {{{html-printtail}}}
diff --git a/includes/templates/legacy.mustache b/includes/templates/legacy.mustache
index ac3d2188e..7a392c5e3 100644
--- a/includes/templates/legacy.mustache
+++ b/includes/templates/legacy.mustache
@@ -1,37 +1,37 @@
 {{!
-  string html-headelement a string of attribute HTML that begins with `<html> and ends with '</head>'
-    and contains `meta` tags and ResourceLoader internals.
-  string|null html-sitenotice the contents of a banner defined in MediaWiki:Sitenotice.
-    Also used by CentralNotice to inject banners into Vector.
-  string html-indicators raw HTML containing wiki-defined badges such as "good article", "featured article".
-    An empty string if none are defined.
-  string page-langcode the content language of the article. Assumed to be escaped HTML./
-  string html-title
-  string html-prebodyhtml
-  bool page-isarticle
-  string msg-tagline
-  string html-subtitle
-  string html-undelete
-  string html-newtalk
-  string msg-jumptonavigation
-  string msg-jumptosearch
-  string html-bodycontent
-  string html-printfooter
-  string html-catlinks
-  string html-debuglog
-  string html-dataAfterContent
-  string html-navigation-heading heading for entire navigation that is
-    usually hidden to screen readers
-  object data-personal-menu See PersonalMenu.mustache for documentation.
-  object data-namespace-tabs. See VectorTabs.mustache for documentation.
-  object data-variants. See VectorMenu.mustache for documentation.
-  object data-page-actions. See VectorTabs.mustache for documentation.
-  object data-page-actions-more. See VectorMenu.mustache for documentation.
-  object data-search-box. See SearchBox.mustache for documentation.
-  object data-sidebar. See Sidebar.mustache for documentation.
-  object data-footer for footer template partial. see Footer.mustache for documentation.
-  string html-printtail HTML to render at the end of the page contained necessary script tags for ResourceLoader
-    terminated with `</body></html>`.
+	string html-headelement a string of attribute HTML that begins with `<html>` and ends with
+		`</head>` and contains `meta` tags and ResourceLoader internals.
+	string|null html-sitenotice the contents of a banner defined in MediaWiki:Sitenotice.
+		Also used by CentralNotice to inject banners into Vector.
+	string html-indicators raw HTML containing wiki-defined badges such as "good article",
+		"featured article". An empty string if none are defined.
+	string page-langcode the content language of the article. Assumed to be escaped HTML.
+	string html-title
+	string html-prebodyhtml
+	bool page-isarticle
+	string msg-tagline
+	string html-subtitle
+	string html-undelete
+	string html-newtalk
+	string msg-jumptonavigation
+	string msg-jumptosearch
+	string html-bodycontent
+	string html-printfooter
+	string html-catlinks
+	string html-debuglog
+	string html-dataAfterContent
+	string html-navigation-heading heading for entire navigation that is
+		usually hidden to screen readers
+	object data-personal-menu See PersonalMenu.mustache for documentation.
+	object data-namespace-tabs. See VectorTabs.mustache for documentation.
+	object data-variants. See VectorMenu.mustache for documentation.
+	object data-page-actions. See VectorTabs.mustache for documentation.
+	object data-page-actions-more. See VectorMenu.mustache for documentation.
+	object data-search-box. See SearchBox.mustache for documentation.
+	object data-sidebar. See Sidebar.mustache for documentation.
+	object data-footer for footer template partial. see Footer.mustache for documentation.
+	string html-printtail HTML to render at the end of the page contained necessary script tags for
+		ResourceLoader terminated with `</body></html>`.
 }}
 
 {{{html-headelement}}}
@@ -39,7 +39,9 @@
 <div id="mw-head-base" class="noprint"></div>
 <div id="content" class="mw-body" role="main">
 	<a id="top"></a>
-	{{#html-sitenotice}}<div id="siteNotice" class="mw-body-content">{{{html-sitenotice}}}</div>{{/html-sitenotice}}
+	{{#html-sitenotice}}
+		<div id="siteNotice" class="mw-body-content">{{{html-sitenotice}}}</div>
+	{{/html-sitenotice}}
 	{{{html-indicators}}}
 	<h1 id="firstHeading" class="firstHeading" lang="{{page-langcode}}">{{{html-title}}}</h1>
 	{{{html-prebodyhtml}}}
@@ -49,8 +51,8 @@
 		{{#html-undelete}}<div id="contentSub2">{{{html-undelete}}}</div>{{/html-undelete}}
 		{{#html-newtalk}}<div class="usermessage">{{{html-newtalk}}}</div>{{/html-newtalk}}
 		{{!
-		Keep this empty `div` for compatibility with gadgets and user scripts
-		using this place to insert extra elements before.
+			Keep this empty `div` for compatibility with gadgets and user scripts
+			using this place to insert extra elements before.
 		}}
 		<div id="jump-to-nav"></div>
 		<a class="mw-jump-link" href="#mw-head">{{msg-jumptonavigation}}</a>
@@ -66,36 +68,20 @@
 </div>
 {{{html-dataAfterContent}}}
 <div id="mw-navigation">
-    <h2>{{{html-navigation-heading}}}</h2>
-    <div id="mw-head">
-        {{#data-personal-menu}}
-        {{>PersonalMenu}}
-        {{/data-personal-menu}}
-        <div id="left-navigation">
-            {{#data-namespace-tabs}}
-            {{>VectorTabs}}
-            {{/data-namespace-tabs}}
-            {{#data-variants}}
-            {{>VectorMenu}}
-            {{/data-variants}}
-        </div>
-        <div id="right-navigation">
-            {{#data-page-actions}}
-            {{>VectorTabs}}
-            {{/data-page-actions}}
-            {{#data-page-actions-more}}
-            {{>VectorMenu}}
-            {{/data-page-actions-more}}
-            {{#data-search-box}}
-            {{>SearchBox}}
-            {{/data-search-box}}
-        </div>
-    </div>
-    {{#data-sidebar}}
-    {{>Sidebar}}
-    {{/data-sidebar}}
+	<h2>{{{html-navigation-heading}}}</h2>
+	<div id="mw-head">
+		{{#data-personal-menu}}{{>PersonalMenu}}{{/data-personal-menu}}
+		<div id="left-navigation">
+			{{#data-namespace-tabs}}{{>VectorTabs}}{{/data-namespace-tabs}}
+			{{#data-variants}}{{>VectorMenu}}{{/data-variants}}
+		</div>
+		<div id="right-navigation">
+			{{#data-page-actions}}{{>VectorTabs}}{{/data-page-actions}}
+			{{#data-page-actions-more}}{{>VectorMenu}}{{/data-page-actions-more}}
+			{{#data-search-box}}{{>SearchBox}}{{/data-search-box}}
+		</div>
+	</div>
+	{{#data-sidebar}}{{>Sidebar}}{{/data-sidebar}}
 </div>
-{{#data-footer}}
-{{>Footer}}
-{{/data-footer}}
+{{#data-footer}}{{>Footer}}{{/data-footer}}
 {{{html-printtail}}}
