diff --git a/app/Models/Extension/Extensions.php b/app/Models/Extension/Extensions.php
index ad69e51e..02a4d7d4 100644
--- a/app/Models/Extension/Extensions.php
+++ b/app/Models/Extension/Extensions.php
@@ -144,9 +144,9 @@ class Extensions extends Manager
                 'authors.*.email'            => 'string',
                 'authors.*.homepage'         => 'string',
                 'authors.*.role'             => 'string',
-                'autoload.psr-4'             => 'required|array',
+                'autoload.psr-4'             => 'array',
                 'autoload.psr-4.*'           => 'required|string',
-                'require'                    => 'required|array',
+                'require'                    => 'array',
                 'extra'                      => 'required|array',
                 'extra.display-name'         => 'required|string',
                 'extra.requirements'         => 'array',
diff --git a/app/templates/_default/email.forkbb.php b/app/templates/_default/email.forkbb.php
index cbbeabdf..0eaa8ed5 100644
--- a/app/templates/_default/email.forkbb.php
+++ b/app/templates/_default/email.forkbb.php
@@ -6,11 +6,11 @@
       <h1 id="fork-h1">{!! __($p->legend) !!}</h1>
     </div>
     <!-- PRE h1After -->
-    <!-- PRE crumbsBefore -->
+    <!-- PRE linksBefore -->
     <div class="f-nav-links">
 @yield ('crumbs')
     </div>
-    <!-- PRE crumbsAfter -->
+    <!-- PRE linksAfter -->
 @if ($form = $p->form)
     <!-- PRE mainBefore -->
     <section id="fork-sendemail" class="f-post-form">
diff --git a/app/templates/_default/forum.forkbb.php b/app/templates/_default/forum.forkbb.php
index 3ddd541a..49df2c28 100644
--- a/app/templates/_default/forum.forkbb.php
+++ b/app/templates/_default/forum.forkbb.php
@@ -35,11 +35,11 @@
     </div>
     <!-- PRE h1After -->
 @if ($forums = $p->model->subforums)
-    <!-- PRE crumbsBefore -->
+    <!-- PRE linksBefore -->
     <div class="f-nav-links">
     @yield ('crumbs')
     </div>
-    <!-- PRE crumbsAfter -->
+    <!-- PRE linksAfter -->
     <!-- PRE subforumsBefore -->
     <section id="fork-subforums">
       <ol class="f-ftlist">
@@ -58,7 +58,7 @@
     </section>
     <!-- PRE subforumsAfter -->
 @endif
-    <!-- PRE linksBefore -->
+    <!-- PRE linksBBefore -->
     <div class="f-nav-links">
 @yield ('crumbs')
 @if ($p->model->canCreateTopic || $p->model->pagination)
@@ -74,7 +74,7 @@
       </div>
 @endif
     </div>
-    <!-- PRE linksAfter -->
+    <!-- PRE linksBAfter -->
 @if ($p->topics)
     <!-- PRE mainBefore -->
     <section id="fork-forum" class="f-main">
@@ -183,7 +183,7 @@
       </div>
     </section>
     <!-- PRE mainAfter -->
-    <!-- PRE linksBefore -->
+    <!-- PRE linksABefore -->
     <div class="f-nav-links">
     @if ($p->model->canCreateTopic || $p->model->pagination || $p->model->canMarkRead || $p->model->canSubscription)
       <div class="f-nlinks-a">
@@ -213,7 +213,7 @@
     @endif
     @yield ('crumbs')
     </div>
-    <!-- PRE linksAfter -->
+    <!-- PRE linksAAfter -->
 @endif
 @if ($p->enableMod && $form = $p->formMod)
     <!-- PRE modBefore -->
diff --git a/app/templates/_default/layouts/admin.forkbb.php b/app/templates/_default/layouts/admin.forkbb.php
index b4c60dcc..bc3a2a59 100644
--- a/app/templates/_default/layouts/admin.forkbb.php
+++ b/app/templates/_default/layouts/admin.forkbb.php
@@ -6,11 +6,11 @@
       <h1 id="fork-h1">{!! __($p->adminHeader) !!}</h1>
     </div>
     <!-- PRE h1After -->
-    <!-- PRE crumbsBefore -->
+    <!-- PRE linksBefore -->
     <div class="f-nav-links f-nav-admin{{ $p->mainSuffix or '' }}-links">
 @yield ('crumbs')
     </div>
-    <!-- PRE crumbsAfter -->
+    <!-- PRE linksAfter -->
     <!-- PRE mainBefore -->
     <div class="f-main f-main-admin{{ $p->mainSuffix or '' }}">
       <!-- PRE menuBefore -->
diff --git a/app/templates/_default/layouts/pm.forkbb.php b/app/templates/_default/layouts/pm.forkbb.php
index 9c5b45ca..d9a52838 100644
--- a/app/templates/_default/layouts/pm.forkbb.php
+++ b/app/templates/_default/layouts/pm.forkbb.php
@@ -6,11 +6,11 @@
       <h1 id="fork-h1">{!! __($p->pmHeader) !!}</h1>
     </div>
     <!-- PRE h1After -->
-    <!-- PRE crumbsBefore -->
+    <!-- PRE linksBefore -->
     <div class="f-nav-links f-nav-pm-links">
 @yield ('crumbs')
     </div>
-    <!-- PRE crumbsAfter -->
+    <!-- PRE linksAfter -->
     <!-- PRE mainBefore -->
     <div class="f-main f-main-pm">
       <!-- PRE menuBefore -->
diff --git a/app/templates/_default/moderate.forkbb.php b/app/templates/_default/moderate.forkbb.php
index 4661e883..66e3ab42 100644
--- a/app/templates/_default/moderate.forkbb.php
+++ b/app/templates/_default/moderate.forkbb.php
@@ -6,11 +6,11 @@
       <h1 id="fork-h1">{!! __($p->formTitle) !!}</h1>
     </div>
     <!-- PRE h1After -->
-    <!-- PRE crumbsBefore -->
+    <!-- PRE linksBefore -->
     <div class="f-nav-links">
 @yield ('crumbs')
     </div>
-    <!-- PRE crumbsAfter -->
+    <!-- PRE linksAfter -->
 @if ($form = $p->form)
     <!-- PRE mainBefore -->
     <div id="fork-modform" class="f-main">
diff --git a/app/templates/_default/post.forkbb.php b/app/templates/_default/post.forkbb.php
index 4682a744..9fb7aa20 100644
--- a/app/templates/_default/post.forkbb.php
+++ b/app/templates/_default/post.forkbb.php
@@ -6,11 +6,11 @@
       <h1 id="fork-h1">{!! __($p->formTitle) !!}</h1>
     </div>
     <!-- PRE h1After -->
-    <!-- PRE crumbsBefore -->
+    <!-- PRE linksBefore -->
     <div class="f-nav-links">
 @yield ('crumbs')
     </div>
-    <!-- PRE crumbsAfter -->
+    <!-- PRE linksAfter -->
 @if ($p->previewHtml)
     <!-- PRE previewBefore -->
     <section class="f-preview">
diff --git a/app/templates/_default/report.forkbb.php b/app/templates/_default/report.forkbb.php
index 35ac6da3..a22a707d 100644
--- a/app/templates/_default/report.forkbb.php
+++ b/app/templates/_default/report.forkbb.php
@@ -6,11 +6,11 @@
       <h1 id="fork-h1">{!! __('Report post') !!}</h1>
     </div>
     <!-- PRE h1After -->
-    <!-- PRE crumbsBefore -->
+    <!-- PRE linksBefore -->
     <div class="f-nav-links">
 @yield ('crumbs')
     </div>
-    <!-- PRE crumbsAfter -->
+    <!-- PRE linksAfter -->
 @if ($form = $p->form)
     <!-- PRE mainBefore -->
     <div id="fork-report" class="f-post-form">
diff --git a/app/templates/_default/rules.forkbb.php b/app/templates/_default/rules.forkbb.php
index d4373929..32b06645 100644
--- a/app/templates/_default/rules.forkbb.php
+++ b/app/templates/_default/rules.forkbb.php
@@ -6,11 +6,11 @@
       <h1 id="fork-h1">{!! __('Forum rules') !!}</h1>
     </div>
     <!-- PRE h1After -->
-    <!-- PRE crumbsBefore -->
+    <!-- PRE linksBefore -->
     <div class="f-nav-links">
 @yield ('crumbs')
     </div>
-    <!-- PRE crumbsAfter -->
+    <!-- PRE linksAfter -->
     <!-- PRE mainBefore -->
     <div id="fork-rules" class="f-main">
       <div id="id-rules">{!! $p->rules !!}</div>
diff --git a/app/templates/_default/search.forkbb.php b/app/templates/_default/search.forkbb.php
index 58f62667..f4a0fca8 100644
--- a/app/templates/_default/search.forkbb.php
+++ b/app/templates/_default/search.forkbb.php
@@ -6,11 +6,11 @@
       <h1 id="fork-h1">{!! __('Search') !!}</h1>
     </div>
     <!-- PRE h1After -->
-    <!-- PRE crumbsBefore -->
+    <!-- PRE linksBefore -->
     <div class="f-nav-links">
 @yield ('crumbs')
     </div>
-    <!-- PRE crumbsAfter -->
+    <!-- PRE linksAfter -->
 @if ($form = $p->form)
     <!-- PRE mainBefore -->
     <div id="fork-search" class="f-main">
diff --git a/app/templates/_default/topic.forkbb.php b/app/templates/_default/topic.forkbb.php
index 938625ec..a64a13ec 100644
--- a/app/templates/_default/topic.forkbb.php
+++ b/app/templates/_default/topic.forkbb.php
@@ -27,7 +27,7 @@
       <h1 id="fork-h1">{{ $p->model->name }}</h1>
     </div>
     <!-- PRE h1After -->
-    <!-- PRE linksBefore -->
+    <!-- PRE linksBBefore -->
     <div class="f-nav-links">
 @yield ('crumbs')
 @if ($p->model->canReply || $p->model->closed || $p->model->pagination)
@@ -49,7 +49,7 @@
       </div>
 @endif
     </div>
-    <!-- PRE linksAfter -->
+    <!-- PRE linksBAfter -->
     <!-- PRE mainBefore -->
     <section id="fork-topic" class="f-main">
       <h2>{!! __('Post list') !!}</h2>
@@ -173,7 +173,7 @@
 @endforeach
     </section>
     <!-- PRE mainAfter -->
-    <!-- PRE linksBefore -->
+    <!-- PRE linksABefore -->
     <div class="f-nav-links">
 @if ($p->model->canReply || $p->model->pagination || $p->model->canSubscription)
       <div class="f-nlinks-a">
@@ -199,7 +199,7 @@
 @endif
 @yield ('crumbs')
     </div>
-    <!-- PRE linksAfter -->
+    <!-- PRE linksAAfter -->
 @if ($p->enableMod && $form = $p->formMod)
     <!-- PRE modBefore -->
     <aside id="fork-mod" class="f-moderate">
diff --git a/app/templates/_default/topic_in_search.forkbb.php b/app/templates/_default/topic_in_search.forkbb.php
index 782991c5..64c9f34c 100644
--- a/app/templates/_default/topic_in_search.forkbb.php
+++ b/app/templates/_default/topic_in_search.forkbb.php
@@ -27,7 +27,7 @@
       <h1 id="fork-h1">{!! __($p->model->name) !!}</h1>
     </div>
     <!-- PRE h1After -->
-    <!-- PRE linksBefore -->
+    <!-- PRE linksBBefore -->
     <div class="f-nav-links">
 @yield ('crumbs')
 @if ($p->model->pagination)
@@ -36,7 +36,7 @@
       </div>
 @endif
     </div>
-    <!-- PRE linksAfter -->
+    <!-- PRE linksBAfter -->
     <!-- PRE mainBefore -->
     <section id="fork-topic-ins" class="f-main">
       <h2>{!! __('Post list') !!}</h2>
@@ -102,7 +102,7 @@
 @endforeach
     </section>
     <!-- PRE mainAfter -->
-    <!-- PRE linksBefore -->
+    <!-- PRE linksABefore -->
     <div class="f-nav-links">
 @if ($p->model->pagination)
       <div class="f-nlinks-a">
@@ -111,5 +111,5 @@
 @endif
 @yield ('crumbs')
     </div>
-    <!-- PRE linksAfter -->
+    <!-- PRE linksAAfter -->
     <!-- PRE end -->
diff --git a/app/templates/_default/userlist.forkbb.php b/app/templates/_default/userlist.forkbb.php
index 670772ad..a594699c 100644
--- a/app/templates/_default/userlist.forkbb.php
+++ b/app/templates/_default/userlist.forkbb.php
@@ -27,7 +27,7 @@
       <h1 id="fork-h1">{!! __('User list') !!}</h1>
     </div>
     <!-- PRE h1After -->
-    <!-- PRE linksBefore -->
+    <!-- PRE linksBBefore -->
     <div class="f-nav-links">
 @yield ('crumbs')
 @if ($p->pagination)
@@ -36,7 +36,7 @@
       </div>
 @endif
     </div>
-    <!-- PRE linksAfter -->
+    <!-- PRE linksBAfter -->
 @if ($form = $p->form)
     <!-- PRE searchBefore -->
     <section id="fork-usrlstform" class="f-main">
@@ -106,13 +106,13 @@
     </section>
     <!-- PRE mainAfter -->
     @if ($p->pagination)
-    <!-- PRE linksBefore -->
+    <!-- PRE linksABefore -->
     <div class="f-nav-links">
       <div class="f-nlinks">
         @yield ('pagination')
       </div>
     </div>
-    <!-- PRE linksAfter -->
+    <!-- PRE linksAAfter -->
     @endif
 @endif
     <!-- PRE end -->