diff --git a/src/Controller/FaqHome.php b/src/Controller/TemplateController.php
similarity index 63%
rename from src/Controller/FaqHome.php
rename to src/Controller/TemplateController.php
index f347e30dca..7b7362847a 100644
--- a/src/Controller/FaqHome.php
+++ b/src/Controller/TemplateController.php
@@ -17,25 +17,15 @@
 // along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
 // }}}
 
-/**
- * FAQ main page
- *
- * @package  GNUsocial
- * @category Controller
- *
- * @author    Eliseu Amaro <eliseu@fc.up.pt>
- * @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
- * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
- */
-
 namespace App\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use App\Core\Controller;
+use Symfony\Component\HttpFoundation\Request;
 
-class FaqHome extends AbstractController
+class TemplateController extends Controller
 {
-    public function __invoke()
+    public function handle(Request $req)
     {
-        return $this->render('faq/home.html.twig', []);
+        return ['_template' => $req->get('template')];
     }
-}
\ No newline at end of file
+}
diff --git a/src/Routes/Faq.php b/src/Routes/Faq.php
deleted file mode 100644
index 918b4875c2..0000000000
--- a/src/Routes/Faq.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-// {{{ License
-// This file is part of GNU social - https://www.gnu.org/software/social
-//
-// GNU social is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// GNU social is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
-// }}}
-
-/**
- * Define FAQ's main routes
- *
- * @package  GNUsocial
- * @category Router
- *
- * @author    Eliseu Amaro <eliseu@fc.up.pt>
- * @copyright 2020 Free Software Foundation, Inc http://www.fsf.org
- * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
- */
-
-namespace App\Routes;
-
-use App\Controller\FaqHome;
-use App\Core\Router\RouteLoader;
-
-abstract class Faq
-{
-    public static function load(RouteLoader $r): void
-    {
-        $r->connect('doc_faq', '/doc/faq', FaqHome::class);
-    }
-}
diff --git a/src/Routes/Main.php b/src/Routes/Main.php
index c29994f5bf..6d75c5c0ff 100644
--- a/src/Routes/Main.php
+++ b/src/Routes/Main.php
@@ -36,7 +36,6 @@ namespace App\Routes;
 use App\Controller as C;
 use App\Core\Router\RouteLoader;
 use Symfony\Bundle\FrameworkBundle\Controller\RedirectController;
-use Symfony\Bundle\FrameworkBundle\Controller\TemplateController;
 
 abstract class Main
 {
@@ -54,11 +53,11 @@ abstract class Main
 
         // FAQ static pages
         foreach (['faq', 'contact', 'tags', 'groups', 'openid'] as $s) {
-            $r->connect('doc_' . $s, '/doc/' . $s, TemplateController::class, ['defaults' => ['template' => 'doc/faq/' . $s . '.html.twig']]);
+            $r->connect('doc_' . $s, '/doc/' . $s, C\TemplateController::class, ['template' => 'doc/faq/' . $s . '.html.twig']);
         }
 
         foreach (['privacy', 'tos', 'version', 'source'] as $s) {
-            $r->connect('doc_' . $s, '/doc/' . $s, TemplateController::class, ['defaults' => ['template' => 'doc/' . $s . '.html.twig']]);
+            $r->connect('doc_' . $s, '/doc/' . $s, C\TemplateController::class, ['template' => 'doc/' . $s . '.html.twig']);
         }
 
         // Settings pages