diff --git a/src/Kunstmaan/DashboardBundle/Controller/DashboardController.php b/src/Kunstmaan/DashboardBundle/Controller/DashboardController.php
index e04d1670c3..e8e6f8aad6 100644
--- a/src/Kunstmaan/DashboardBundle/Controller/DashboardController.php
+++ b/src/Kunstmaan/DashboardBundle/Controller/DashboardController.php
@@ -16,7 +16,6 @@ class DashboardController extends Controller
      * The index action will render the main screen the users see when they log in in to the admin
      *
      * @Route("/", name="kunstmaan_dashboard")
-     * @Template()
      *
      * @param \Symfony\Component\HttpFoundation\Request $request
      * @return array
diff --git a/src/Kunstmaan/FormBundle/Controller/FormSubmissionsController.php b/src/Kunstmaan/FormBundle/Controller/FormSubmissionsController.php
index 6be9d74cdb..c59991e782 100644
--- a/src/Kunstmaan/FormBundle/Controller/FormSubmissionsController.php
+++ b/src/Kunstmaan/FormBundle/Controller/FormSubmissionsController.php
@@ -57,7 +57,7 @@ public function indexAction(Request $request)
      * @Route("/list/{nodeTranslationId}", requirements={"nodeTranslationId" = "\d+"},
      *                                     name="KunstmaanFormBundle_formsubmissions_list")
      * @Method({"GET", "POST"})
-     * @Template()
+     * @Template("@KunstmaanForm/FormSubmissions/list.html.twig")
      *
      * @return array
      */
@@ -85,7 +85,7 @@ public function listAction(Request $request, $nodeTranslationId)
      * @Route("/list/{nodeTranslationId}/{submissionId}", requirements={"nodeTranslationId" = "\d+", "submissionId" =
      *                                                    "\d+"}, name="KunstmaanFormBundle_formsubmissions_list_edit")
      * @Method({"GET", "POST"})
-     * @Template()
+     * @Template("@KunstmaanForm/FormSubmissions/edit.html.twig")
      *
      * @return array
      */
@@ -142,7 +142,6 @@ public function exportAction($nodeTranslationId, $_format)
      *      requirements={"id" = "\d+"},
      *      name="KunstmaanFormBundle_formsubmissions_delete"
      * )
-     * @Template()
      * @Method("POST")
      *
      * @param Request $request
diff --git a/src/Kunstmaan/MediaBundle/Controller/ChooserController.php b/src/Kunstmaan/MediaBundle/Controller/ChooserController.php
index 5f798b6ccc..ded8a9ee31 100644
--- a/src/Kunstmaan/MediaBundle/Controller/ChooserController.php
+++ b/src/Kunstmaan/MediaBundle/Controller/ChooserController.php
@@ -70,7 +70,7 @@ public function chooserIndexAction(Request $request)
      * @param int     $folderId The folder id
      *
      * @Route("/chooser/{folderId}", requirements={"folderId" = "\d+"}, name="KunstmaanMediaBundle_chooser_show_folder")
-     * @Template()
+     * @Template("@KunstmaanMedia/Chooser/chooserShowFolder.html.twig")
      *
      * @return array
      */
diff --git a/src/Kunstmaan/MediaBundle/Controller/FolderController.php b/src/Kunstmaan/MediaBundle/Controller/FolderController.php
index a35630b019..c032180bd4 100644
--- a/src/Kunstmaan/MediaBundle/Controller/FolderController.php
+++ b/src/Kunstmaan/MediaBundle/Controller/FolderController.php
@@ -155,7 +155,6 @@ public function deleteAction(Request $request, $folderId)
      *
      * @Route("/subcreate/{folderId}", requirements={"folderId" = "\d+"}, name="KunstmaanMediaBundle_folder_sub_create")
      * @Method({"GET", "POST"})
-     * @Template()
      *
      * @return Response
      */
@@ -215,7 +214,6 @@ public function subCreateAction(Request $request, $folderId)
      *
      * @Route("/empty/{folderId}", requirements={"folderId" = "\d+"}, name="KunstmaanMediaBundle_folder_empty")
      * @Method({"GET", "POST"})
-     * @Template()
      *
      * @return Response
      */
diff --git a/src/Kunstmaan/MediaBundle/Controller/IconFontController.php b/src/Kunstmaan/MediaBundle/Controller/IconFontController.php
index ff1d0e5d3c..9264b2c6d7 100644
--- a/src/Kunstmaan/MediaBundle/Controller/IconFontController.php
+++ b/src/Kunstmaan/MediaBundle/Controller/IconFontController.php
@@ -16,7 +16,7 @@ class IconFontController extends Controller
      * @param Request $request
      *
      * @Route("/chooser", name="KunstmaanMediaBundle_icon_font_chooser")
-     * @Template()
+     * @Template("@KunstmaanMedia/IconFont/iconFontChooser.html.twig")
      *
      * @return array
      */
diff --git a/src/Kunstmaan/MediaBundle/Controller/MediaController.php b/src/Kunstmaan/MediaBundle/Controller/MediaController.php
index 964eb6e93b..612a202e74 100644
--- a/src/Kunstmaan/MediaBundle/Controller/MediaController.php
+++ b/src/Kunstmaan/MediaBundle/Controller/MediaController.php
@@ -122,7 +122,7 @@ public function deleteAction(Request $request, $mediaId)
      * @param int $folderId
      *
      * @Route("bulkupload/{folderId}", requirements={"folderId" = "\d+"}, name="KunstmaanMediaBundle_media_bulk_upload")
-     * @Template()
+     * @Template("@KunstmaanMedia/Media/bulkUpload.html.twig")
      *
      * @return array|RedirectResponse
      */
@@ -141,7 +141,6 @@ public function bulkUploadAction($folderId)
      * @param int     $folderId
      *
      * @Route("bulkuploadsubmit/{folderId}", requirements={"folderId" = "\d+"}, name="KunstmaanMediaBundle_media_bulk_upload_submit")
-     * @Template()
      *
      * @return JsonResponse
      */
@@ -352,7 +351,7 @@ public function dropAction(Request $request, $folderId)
      *
      * @Route("create/{folderId}/{type}", requirements={"folderId" = "\d+", "type" = ".+"}, name="KunstmaanMediaBundle_media_create")
      * @Method({"GET", "POST"})
-     * @Template()
+     * @Template("@KunstmaanMedia/Media/create.html.twig")
      *
      * @return array|RedirectResponse
      */
@@ -437,8 +436,7 @@ private function createAndRedirect(Request $request, $folderId, $type, $redirect
      * @param string  $type     The type
      *
      * @Route("create/modal/{folderId}/{type}", requirements={"folderId" = "\d+", "type" = ".+"}, name="KunstmaanMediaBundle_media_modal_create")
-     * @Method({"GET", "POST"})
-     * @Template()
+     * @Method({"POST"})
      *
      * @return array|RedirectResponse
      */
diff --git a/src/Kunstmaan/NodeBundle/Controller/NodeAdminController.php b/src/Kunstmaan/NodeBundle/Controller/NodeAdminController.php
index 2b4168a71a..47a3a35a9d 100644
--- a/src/Kunstmaan/NodeBundle/Controller/NodeAdminController.php
+++ b/src/Kunstmaan/NodeBundle/Controller/NodeAdminController.php
@@ -160,7 +160,6 @@ public function indexAction(Request $request)
      *      name="KunstmaanNodeBundle_nodes_copyfromotherlanguage"
      * )
      * @Method("GET")
-     * @Template()
      *
      * @param Request $request
      * @param int $id The node id
@@ -212,7 +211,6 @@ public function copyFromOtherLanguageAction(Request $request, $id)
      *      name="KunstmaanNodeBundle_nodes_recopyfromotherlanguage"
      * )
      * @Method("POST")
-     * @Template()
      *
      * @param Request $request
      * @param int $id The node id
@@ -263,7 +261,6 @@ public function recopyFromOtherLanguageAction(Request $request, $id)
      *      name="KunstmaanNodeBundle_nodes_createemptypage"
      * )
      * @Method("GET")
-     * @Template()
      *
      * @param Request $request
      * @param int $id
@@ -389,7 +386,6 @@ public function unSchedulePublishAction(Request $request, $id)
      *      requirements={"id" = "\d+"},
      *      name="KunstmaanNodeBundle_nodes_delete"
      * )
-     * @Template()
      * @Method("POST")
      *
      * @param Request $request
@@ -454,7 +450,6 @@ public function deleteAction(Request $request, $id)
      *      requirements={"id" = "\d+"},
      *      name="KunstmaanNodeBundle_nodes_duplicate"
      * )
-     * @Template()
      * @Method("POST")
      *
      * @param Request $request
@@ -528,7 +523,6 @@ public function duplicateAction(Request $request, $id)
      *      defaults={"subaction" = "public"},
      *      name="KunstmaanNodeBundle_nodes_revert"
      * )
-     * @Template()
      * @Method("GET")
      *
      * @param Request $request
@@ -613,7 +607,6 @@ public function revertAction(Request $request, $id)
      *      requirements={"id" = "\d+"},
      *      name="KunstmaanNodeBundle_nodes_add"
      * )
-     * @Template()
      * @Method("POST")
      *
      * @param Request $request
@@ -679,7 +672,6 @@ public function addAction(Request $request, $id)
 
     /**
      * @Route("/add-homepage", name="KunstmaanNodeBundle_nodes_add_homepage")
-     * @Template()
      * @Method("POST")
      *
      * @return RedirectResponse
@@ -802,7 +794,7 @@ public function reorderAction(Request $request)
      *      defaults={"subaction" = "public"},
      *      name="KunstmaanNodeBundle_nodes_edit"
      * )
-     * @Template()
+     * @Template("@KunstmaanNode/NodeAdmin/edit.html.twig")
      * @Method({"GET", "POST"})
      *
      * @param Request $request