diff --git a/.gitignore b/.gitignore
index f8eae6e..f616c94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@
 !var/SymfonyRequirements.php
 /vendor/
 /web/bundles/
+/tags
+*.swp
diff --git a/src/Mmi/Bundle/ChallengeBundle/Controller/DefaultController.php b/src/Mmi/Bundle/ChallengeBundle/Controller/DefaultController.php
index c3df287..9f3bafc 100644
--- a/src/Mmi/Bundle/ChallengeBundle/Controller/DefaultController.php
+++ b/src/Mmi/Bundle/ChallengeBundle/Controller/DefaultController.php
@@ -4,14 +4,16 @@ namespace Mmi\Bundle\ChallengeBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
 class DefaultController extends Controller
 {
     /**
      * @Route("/")
+     * @Template()
      */
     public function indexAction()
     {
-        return $this->render('MmiChallengeBundle:Default:index.html.twig');
+        return [];
     }
 }
diff --git a/src/Mmi/Bundle/ChallengeBundle/Resources/views/Default/index.html.twig b/src/Mmi/Bundle/ChallengeBundle/Resources/views/Default/index.html.twig
new file mode 100644
index 0000000..b6afcef
--- /dev/null
+++ b/src/Mmi/Bundle/ChallengeBundle/Resources/views/Default/index.html.twig
@@ -0,0 +1 @@
+{% extends "MmiChallengeBundle:Default:base.html.twig" %}
diff --git a/src/Mmi/Bundle/EnigmaBundle/Controller/DefaultController.php b/src/Mmi/Bundle/EnigmaBundle/Controller/DefaultController.php
index d3866c9..1c6f5e6 100644
--- a/src/Mmi/Bundle/EnigmaBundle/Controller/DefaultController.php
+++ b/src/Mmi/Bundle/EnigmaBundle/Controller/DefaultController.php
@@ -4,14 +4,16 @@ namespace Mmi\Bundle\EnigmaBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 
 class DefaultController extends Controller
 {
     /**
-     * @Route("/")
+     * @Route("/enigma")
+     * @Template()
      */
     public function indexAction()
     {
-        return $this->render('MmiEnigmaBundle:Default:index.html.twig');
+        return [];
     }
 }
diff --git a/src/Mmi/Bundle/EnigmaBundle/Resources/views/Default/index.html.twig b/src/Mmi/Bundle/EnigmaBundle/Resources/views/Default/index.html.twig
new file mode 100644
index 0000000..5525bfa
--- /dev/null
+++ b/src/Mmi/Bundle/EnigmaBundle/Resources/views/Default/index.html.twig
@@ -0,0 +1 @@
+{% extends "MmiEnigmaBundle:Default:base.html.twig" %}