diff --git a/app/Controller/Base.php b/app/Controller/Base.php
index 9f799a8fc..5027cf312 100644
--- a/app/Controller/Base.php
+++ b/app/Controller/Base.php
@@ -282,7 +282,7 @@ abstract class Base
         $params['title'] = $params['task']['project_name'].' > '.$params['task']['title'];
         $params['board_selector'] = $this->projectPermission->getAllowedProjects($this->acl->getUserId());
 
-        return $this->template->layout('task_layout', $params);
+        return $this->template->layout('task/layout', $params);
     }
 
     /**
diff --git a/app/Controller/Task.php b/app/Controller/Task.php
index 481d0ccd6..8d38317c3 100644
--- a/app/Controller/Task.php
+++ b/app/Controller/Task.php
@@ -32,7 +32,7 @@ class Task extends Base
             $this->notfound(true);
         }
 
-        $this->response->html($this->template->layout('task_public', array(
+        $this->response->html($this->template->layout('task/public', array(
             'project' => $project,
             'comments' => $this->comment->getAll($task['id']),
             'subtasks' => $this->subTask->getAll($task['id']),
@@ -65,7 +65,7 @@ class Task extends Base
 
         $this->dateParser->format($values, array('date_started'));
 
-        $this->response->html($this->taskLayout('task_show', array(
+        $this->response->html($this->taskLayout('task/show', array(
             'project' => $this->project->getById($task['project_id']),
             'files' => $this->file->getAll($task['id']),
             'comments' => $this->comment->getAll($task['id']),
@@ -101,7 +101,7 @@ class Task extends Base
             );
         }
 
-        $this->response->html($this->template->$method('task_new', array(
+        $this->response->html($this->template->$method('task/new', array(
             'ajax' => $this->request->isAjax(),
             'errors' => $errors,
             'values' => $values + array('project_id' => $project['id']),
@@ -178,10 +178,10 @@ class Task extends Base
         );
 
         if ($ajax) {
-            $this->response->html($this->template->load('task_edit', $params));
+            $this->response->html($this->template->load('task/edit', $params));
         }
         else {
-            $this->response->html($this->taskLayout('task_edit', $params));
+            $this->response->html($this->taskLayout('task/edit', $params));
         }
     }
 
@@ -214,7 +214,7 @@ class Task extends Base
             }
         }
 
-        $this->response->html($this->taskLayout('task_edit', array(
+        $this->response->html($this->taskLayout('task/edit', array(
             'values' => $values,
             'errors' => $errors,
             'task' => $task,
@@ -272,7 +272,7 @@ class Task extends Base
             $this->response->redirect('?controller=task&action=show&task_id='.$task['id']);
         }
 
-        $this->response->html($this->taskLayout('task_close', array(
+        $this->response->html($this->taskLayout('task/close', array(
             'task' => $task,
         )));
     }
@@ -299,7 +299,7 @@ class Task extends Base
             $this->response->redirect('?controller=task&action=show&task_id='.$task['id']);
         }
 
-        $this->response->html($this->taskLayout('task_open', array(
+        $this->response->html($this->taskLayout('task/open', array(
             'task' => $task,
         )));
     }
@@ -330,7 +330,7 @@ class Task extends Base
             $this->response->redirect('?controller=board&action=show&project_id='.$task['project_id']);
         }
 
-        $this->response->html($this->taskLayout('task_remove', array(
+        $this->response->html($this->taskLayout('task/remove', array(
             'task' => $task,
         )));
     }
@@ -358,7 +358,7 @@ class Task extends Base
             }
         }
 
-        $this->response->html($this->taskLayout('task_duplicate', array(
+        $this->response->html($this->taskLayout('task/duplicate', array(
             'task' => $task,
         )));
     }
@@ -409,10 +409,10 @@ class Task extends Base
         );
 
         if ($ajax) {
-            $this->response->html($this->template->load('task_edit_description', $params));
+            $this->response->html($this->template->load('task/edit_description', $params));
         }
         else {
-            $this->response->html($this->taskLayout('task_edit_description', $params));
+            $this->response->html($this->taskLayout('task/edit_description', $params));
         }
     }
 
@@ -447,7 +447,7 @@ class Task extends Base
             }
         }
 
-        $this->response->html($this->taskLayout('task_move_project', array(
+        $this->response->html($this->taskLayout('task/move_project', array(
             'values' => $values,
             'errors' => $errors,
             'task' => $task,
@@ -486,7 +486,7 @@ class Task extends Base
             }
         }
 
-        $this->response->html($this->taskLayout('task_duplicate_project', array(
+        $this->response->html($this->taskLayout('task/duplicate_project', array(
             'values' => $values,
             'errors' => $errors,
             'task' => $task,
diff --git a/app/Template/project/search.php b/app/Template/project/search.php
index 11e207d2a..3bad43e3c 100644
--- a/app/Template/project/search.php
+++ b/app/Template/project/search.php
@@ -18,7 +18,7 @@
     <?php if (empty($tasks) && ! empty($values['search'])): ?>
         <p class="alert"><?= t('Nothing found.') ?></p>
     <?php elseif (! empty($tasks)): ?>
-        <?= Helper\template('task_table', array(
+        <?= Helper\template('task/table', array(
             'tasks' => $tasks,
             'categories' => $categories,
             'columns' => $columns,
diff --git a/app/Template/project/tasks.php b/app/Template/project/tasks.php
index 638e4c31e..6fe20c381 100644
--- a/app/Template/project/tasks.php
+++ b/app/Template/project/tasks.php
@@ -10,7 +10,7 @@
     <?php if (empty($tasks)): ?>
         <p class="alert"><?= t('No task') ?></p>
     <?php else: ?>
-        <?= Helper\template('task_table', array(
+        <?= Helper\template('task/table', array(
             'tasks' => $tasks,
             'categories' => $categories,
             'columns' => $columns,
diff --git a/app/Template/task/close.php b/app/Template/task/close.php
new file mode 100644
index 000000000..062d0a883
--- /dev/null
+++ b/app/Template/task/close.php
@@ -0,0 +1,15 @@
+<div class="page-header">
+    <h2><?= t('Close a task') ?></h2>
+</div>
+
+<div class="confirm">
+    <p class="alert alert-info">
+        <?= t('Do you really want to close this task: "%s"?', Helper\escape($task['title'])) ?>
+    </p>
+
+    <div class="form-actions">
+        <?= Helper\a(t('Yes'), 'task', 'close', array('task_id' => $task['id'], 'confirmation' => 'yes'), true, 'btn btn-red') ?>
+        <?= t('or') ?>
+        <?= Helper\a(t('cancel'), 'task', 'show', array('task_id' => $task['id'])) ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Template/task_comments.php b/app/Template/task/comments.php
similarity index 100%
rename from app/Template/task_comments.php
rename to app/Template/task/comments.php
diff --git a/app/Template/task_details.php b/app/Template/task/details.php
similarity index 94%
rename from app/Template/task_details.php
rename to app/Template/task/details.php
index bbd2d648f..b5111f782 100644
--- a/app/Template/task_details.php
+++ b/app/Template/task/details.php
@@ -76,7 +76,7 @@
         </li>
         <?php if ($project['is_public']): ?>
         <li>
-            <a href="?controller=task&amp;action=readonly&amp;task_id=<?= $task['id'] ?>&amp;token=<?= $project['token'] ?>" target="_blank"><?= t('Public link') ?></a>
+            <?= Helper\a(t('Public link'), 'task', 'readonly', array('task_id' => $task['id'], 'token' => $project['token']), false, '', '', true) ?>
         </li>
         <?php endif ?>
     </ul>
diff --git a/app/Template/task/duplicate.php b/app/Template/task/duplicate.php
new file mode 100644
index 000000000..3d1829ed2
--- /dev/null
+++ b/app/Template/task/duplicate.php
@@ -0,0 +1,15 @@
+<div class="page-header">
+    <h2><?= t('Duplicate a task') ?></h2>
+</div>
+
+<div class="confirm">
+    <p class="alert alert-info">
+        <?= t('Do you really want to duplicate this task?') ?>
+    </p>
+
+    <div class="form-actions">
+        <?= Helper\a(t('Yes'), 'task', 'duplicate', array('task_id' => $task['id'], 'confirmation' => 'yes'), true, 'btn btn-red') ?>
+        <?= t('or') ?>
+        <?= Helper\a(t('cancel'), 'task', 'show', array('task_id' => $task['id'])) ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Template/task_duplicate_project.php b/app/Template/task/duplicate_project.php
similarity index 68%
rename from app/Template/task_duplicate_project.php
rename to app/Template/task/duplicate_project.php
index 86d2114aa..45081842f 100644
--- a/app/Template/task_duplicate_project.php
+++ b/app/Template/task/duplicate_project.php
@@ -6,7 +6,7 @@
     <p class="alert"><?= t('No project') ?></p>
 <?php else: ?>
 
-    <form method="post" action="?controller=task&amp;action=copy&amp;task_id=<?= $task['id'] ?>&amp;project_id=<?= $task['project_id'] ?>" autocomplete="off">
+    <form method="post" action="<?= Helper\u('task', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
 
         <?= Helper\form_csrf() ?>
 
@@ -17,7 +17,7 @@
         <div class="form-actions">
             <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
             <?= t('or') ?>
-            <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
+            <?= Helper\a(t('cancel'), 'task', 'show', array('task_id' => $task['id'])) ?>
         </div>
     </form>
 
diff --git a/app/Template/task_edit.php b/app/Template/task/edit.php
similarity index 87%
rename from app/Template/task_edit.php
rename to app/Template/task/edit.php
index 701bd08e2..6f136cb92 100644
--- a/app/Template/task_edit.php
+++ b/app/Template/task/edit.php
@@ -2,7 +2,7 @@
     <h2><?= t('Edit a task') ?></h2>
 </div>
 <section id="task-section">
-<form method="post" action="?controller=task&amp;action=update&amp;task_id=<?= $task['id'] ?>&amp;ajax=<?= $ajax ?>" autocomplete="off">
+<form method="post" action="<?= Helper\u('task', 'update', array('task_id' => $task['id'], 'ajax' => $ajax)) ?>" autocomplete="off">
 
     <?= Helper\form_csrf() ?>
 
@@ -59,9 +59,9 @@
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
         <?= t('or') ?>
         <?php if ($ajax): ?>
-            <a href="?controller=board&amp;action=show&amp;project_id=<?= $task['project_id'] ?>"><?= t('cancel') ?></a>
+            <?= Helper\a(t('cancel'), 'board', 'show', array('project_id' => $task['project_id'])) ?>
         <?php else: ?>
-            <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
+            <?= Helper\a(t('cancel'), 'task', 'show', array('task_id' => $task['id'])) ?>
         <?php endif ?>
     </div>
 </form>
diff --git a/app/Template/task_edit_description.php b/app/Template/task/edit_description.php
similarity index 77%
rename from app/Template/task_edit_description.php
rename to app/Template/task/edit_description.php
index f805c034c..9ec94d698 100644
--- a/app/Template/task_edit_description.php
+++ b/app/Template/task/edit_description.php
@@ -2,7 +2,7 @@
     <h2><?= t('Edit the description') ?></h2>
 </div>
 
-<form method="post" action="?controller=task&amp;action=description&amp;task_id=<?= $task['id'] ?>&amp;ajax=<?= $ajax ?>" autocomplete="off">
+<form method="post" action="<?= Helper\u('task', 'description', array('task_id' => $task['id'], 'ajax' => $ajax)) ?>" autocomplete="off">
 
     <?= Helper\form_csrf() ?>
     <?= Helper\form_hidden('id', $values) ?>
@@ -30,9 +30,9 @@
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
         <?= t('or') ?>
         <?php if ($ajax): ?>
-                <a href="?controller=board&amp;action=show&amp;project_id=<?= $task['project_id'] ?>"><?= t('cancel') ?></a>
+            <?= Helper\a(t('cancel'), 'board', 'show', array('project_id' => $task['project_id'])) ?>
         <?php else: ?>
-                <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
+            <?= Helper\a(t('cancel'), 'task', 'show', array('task_id' => $task['id'])) ?>
         <?php endif ?>
     </div>
 </form>
diff --git a/app/Template/task_layout.php b/app/Template/task/layout.php
similarity index 86%
rename from app/Template/task_layout.php
rename to app/Template/task/layout.php
index 0f8a6f2b1..a73ce28fc 100644
--- a/app/Template/task_layout.php
+++ b/app/Template/task/layout.php
@@ -6,7 +6,7 @@
     </div>
     <section class="sidebar-container" id="task-section">
 
-        <?= Helper\template('task_sidebar', array('task' => $task, 'hide_remove_menu' => isset($hide_remove_menu))) ?>
+        <?= Helper\template('task/sidebar', array('task' => $task, 'hide_remove_menu' => isset($hide_remove_menu))) ?>
 
         <div class="sidebar-content">
             <?= $task_content_for_layout ?>
diff --git a/app/Template/task_move_project.php b/app/Template/task/move_project.php
similarity index 67%
rename from app/Template/task_move_project.php
rename to app/Template/task/move_project.php
index 3bc3bcb84..1a355b025 100644
--- a/app/Template/task_move_project.php
+++ b/app/Template/task/move_project.php
@@ -6,7 +6,7 @@
     <p class="alert"><?= t('No project') ?></p>
 <?php else: ?>
 
-    <form method="post" action="?controller=task&amp;action=move&amp;task_id=<?= $task['id'] ?>&amp;project_id=<?= $task['project_id'] ?>" autocomplete="off">
+    <form method="post" action="<?= Helper\u('task', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
 
         <?= Helper\form_csrf() ?>
 
@@ -17,7 +17,7 @@
         <div class="form-actions">
             <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
             <?= t('or') ?>
-            <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
+            <?= Helper\a(t('cancel'), 'task', 'show', array('task_id' => $task['id'])) ?>
         </div>
     </form>
 
diff --git a/app/Template/task_new.php b/app/Template/task/new.php
similarity index 100%
rename from app/Template/task_new.php
rename to app/Template/task/new.php
diff --git a/app/Template/task/open.php b/app/Template/task/open.php
new file mode 100644
index 000000000..5dec3b0e7
--- /dev/null
+++ b/app/Template/task/open.php
@@ -0,0 +1,15 @@
+<div class="page-header">
+    <h2><?= t('Open a task') ?></h2>
+</div>
+
+<div class="confirm">
+    <p class="alert alert-info">
+        <?= t('Do you really want to open this task: "%s"?', Helper\escape($task['title'])) ?>
+    </p>
+
+    <div class="form-actions">
+        <?= Helper\a(t('Yes'), 'task', 'open', array('task_id' => $task['id'], 'confirmation' => 'yes'), true, 'btn btn-red') ?>
+        <?= t('or') ?>
+        <?= Helper\a(t('cancel'), 'task', 'show', array('task_id' => $task['id'])) ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Template/task_public.php b/app/Template/task/public.php
similarity index 85%
rename from app/Template/task_public.php
rename to app/Template/task/public.php
index 370204cea..db8d26b0d 100644
--- a/app/Template/task_public.php
+++ b/app/Template/task/public.php
@@ -4,7 +4,7 @@
 
     <p class="pull-right"><?= Helper\a(t('Back to the board'), 'board', 'readonly', array('token' => $project['token'])) ?></p>
 
-    <?= Helper\template('task_show_description', array(
+    <?= Helper\template('task/show_description', array(
         'task' => $task,
         'project' => $project,
         'is_public' => true
@@ -16,7 +16,7 @@
         'not_editable' => true
     )) ?>
 
-    <?= Helper\template('task_comments', array(
+    <?= Helper\template('task/comments', array(
         'task' => $task,
         'comments' => $comments,
         'project' => $project,
diff --git a/app/Template/task/remove.php b/app/Template/task/remove.php
new file mode 100644
index 000000000..5d6095bc4
--- /dev/null
+++ b/app/Template/task/remove.php
@@ -0,0 +1,15 @@
+<div class="page-header">
+    <h2><?= t('Remove a task') ?></h2>
+</div>
+
+<div class="confirm">
+    <p class="alert alert-info">
+        <?= t('Do you really want to remove this task: "%s"?', Helper\escape($task['title'])) ?>
+    </p>
+
+    <div class="form-actions">
+        <?= Helper\a(t('Yes'), 'task', 'remove', array('task_id' => $task['id'], 'confirmation' => 'yes'), true, 'btn btn-red') ?>
+        <?= t('or') ?>
+        <?= Helper\a(t('cancel'), 'task', 'show', array('task_id' => $task['id'])) ?>
+    </div>
+</div>
\ No newline at end of file
diff --git a/app/Template/task/show.php b/app/Template/task/show.php
new file mode 100644
index 000000000..2652291aa
--- /dev/null
+++ b/app/Template/task/show.php
@@ -0,0 +1,7 @@
+<?= Helper\template('task/details', array('task' => $task, 'project' => $project)) ?>
+<?= Helper\template('task/time', array('values' => $values, 'date_format' => $date_format, 'date_formats' => $date_formats)) ?>
+<?= Helper\template('task/show_description', array('task' => $task)) ?>
+<?= Helper\template('subtask/show', array('task' => $task, 'subtasks' => $subtasks)) ?>
+<?= Helper\template('task/timesheet', array('timesheet' => $timesheet)) ?>
+<?= Helper\template('file/show', array('task' => $task, 'files' => $files)) ?>
+<?= Helper\template('task/comments', array('task' => $task, 'comments' => $comments, 'project' => $project)) ?>
\ No newline at end of file
diff --git a/app/Template/task_show_description.php b/app/Template/task/show_description.php
similarity index 100%
rename from app/Template/task_show_description.php
rename to app/Template/task/show_description.php
diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php
new file mode 100644
index 000000000..25bddeab6
--- /dev/null
+++ b/app/Template/task/sidebar.php
@@ -0,0 +1,44 @@
+<div class="sidebar">
+    <h2><?= t('Actions') ?></h2>
+    <ul>
+        <li>
+            <?= Helper\a(t('Summary'), 'task', 'show', array('task_id' => $task['id'])) ?>
+        </li>
+        <li>
+            <?= Helper\a(t('Edit the task'), 'task', 'edit', array('task_id' => $task['id'])) ?>
+        </li>
+        <li>
+            <?= Helper\a(t('Edit the description'), 'task', 'description', array('task_id' => $task['id'])) ?>
+        </li>
+        <li>
+            <?= Helper\a(t('Add a sub-task'), 'subtask', 'create', array('task_id' => $task['id'])) ?>
+        </li>
+        <li>
+            <?= Helper\a(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'])) ?>
+        </li>
+        <li>
+            <?= Helper\a(t('Attach a document'), 'file', 'create', array('task_id' => $task['id'])) ?>
+        </li>
+        <li>
+            <?= Helper\a(t('Duplicate'), 'task', 'duplicate', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+        </li>
+        <li>
+            <?= Helper\a(t('Duplicate to another project'), 'task', 'copy', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+        </li>
+        <li>
+            <?= Helper\a(t('Move to another project'), 'task', 'move', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+        </li>
+        <li>
+            <?php if ($task['is_active'] == 1): ?>
+                <?= Helper\a(t('Close this task'), 'task', 'close', array('task_id' => $task['id'])) ?>
+            <?php else: ?>
+                <?= Helper\a(t('Open this task'), 'task', 'open', array('task_id' => $task['id'])) ?>
+            <?php endif ?>
+        </li>
+        <?php if (! $hide_remove_menu): ?>
+        <li>
+            <?= Helper\a(t('Remove'), 'task', 'remove', array('task_id' => $task['id'])) ?>
+        </li>
+        <?php endif ?>
+    </ul>
+</div>
\ No newline at end of file
diff --git a/app/Template/task_table.php b/app/Template/task/table.php
similarity index 87%
rename from app/Template/task_table.php
rename to app/Template/task/table.php
index 2f856661a..9f11ea850 100644
--- a/app/Template/task_table.php
+++ b/app/Template/task/table.php
@@ -13,7 +13,7 @@
     <?php foreach ($tasks as $task): ?>
     <tr>
         <td class="task-table task-<?= $task['color_id'] ?>">
-            <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>" title="<?= t('View this task') ?>">#<?= Helper\escape($task['id']) ?></a>
+            <?= Helper\a('#'.Helper\escape($task['id']), 'task', 'show', array('task_id' => $task['id']), false, '', t('View this task')) ?>
         </td>
         <td>
             <?= Helper\in_list($task['column_id'], $columns) ?>
@@ -22,7 +22,7 @@
             <?= Helper\in_list($task['category_id'], $categories, '') ?>
         </td>
         <td>
-            <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>" title="<?= t('View this task') ?>"><?= Helper\escape($task['title']) ?></a>
+            <?= Helper\a(Helper\escape($task['title']), 'task', 'show', array('task_id' => $task['id']), false, '', t('View this task')) ?>
         </td>
         <td>
             <?php if ($task['assignee_username']): ?>
diff --git a/app/Template/task_time.php b/app/Template/task/time.php
similarity index 100%
rename from app/Template/task_time.php
rename to app/Template/task/time.php
diff --git a/app/Template/task_timesheet.php b/app/Template/task/timesheet.php
similarity index 100%
rename from app/Template/task_timesheet.php
rename to app/Template/task/timesheet.php
diff --git a/app/Template/task_close.php b/app/Template/task_close.php
deleted file mode 100644
index 2abfd032d..000000000
--- a/app/Template/task_close.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Close a task') ?></h2>
-</div>
-
-<div class="confirm">
-    <p class="alert alert-info">
-        <?= t('Do you really want to close this task: "%s"?', Helper\escape($task['title'])) ?>
-    </p>
-
-    <div class="form-actions">
-        <a href="?controller=task&amp;action=close&amp;confirmation=yes&amp;task_id=<?= $task['id'].Helper\param_csrf() ?>" class="btn btn-red"><?= t('Yes') ?></a>
-        <?= t('or') ?> <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
-    </div>
-</div>
\ No newline at end of file
diff --git a/app/Template/task_duplicate.php b/app/Template/task_duplicate.php
deleted file mode 100644
index ef903f1d2..000000000
--- a/app/Template/task_duplicate.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Duplicate a task') ?></h2>
-</div>
-
-<div class="confirm">
-    <p class="alert alert-info">
-        <?= t('Do you really want to duplicate this task?') ?>
-    </p>
-
-    <div class="form-actions">
-        <a href="?controller=task&amp;action=duplicate&amp;confirmation=yes&amp;task_id=<?= $task['id'].Helper\param_csrf() ?>" class="btn btn-red"><?= t('Yes') ?></a>
-        <?= t('or') ?> <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
-    </div>
-</div>
\ No newline at end of file
diff --git a/app/Template/task_open.php b/app/Template/task_open.php
deleted file mode 100644
index d28970e3a..000000000
--- a/app/Template/task_open.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Open a task') ?></h2>
-</div>
-
-<div class="confirm">
-    <p class="alert alert-info">
-        <?= t('Do you really want to open this task: "%s"?', Helper\escape($task['title'])) ?>
-    </p>
-
-    <div class="form-actions">
-        <a href="?controller=task&amp;action=open&amp;confirmation=yes&amp;task_id=<?= $task['id'].Helper\param_csrf() ?>" class="btn btn-red"><?= t('Yes') ?></a>
-        <?= t('or') ?> <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
-    </div>
-</div>
\ No newline at end of file
diff --git a/app/Template/task_remove.php b/app/Template/task_remove.php
deleted file mode 100644
index 496ac2d83..000000000
--- a/app/Template/task_remove.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Remove a task') ?></h2>
-</div>
-
-<div class="confirm">
-    <p class="alert alert-info">
-        <?= t('Do you really want to remove this task: "%s"?', Helper\escape($task['title'])) ?>
-    </p>
-
-    <div class="form-actions">
-        <a href="?controller=task&amp;action=remove&amp;confirmation=yes&amp;task_id=<?= $task['id'].Helper\param_csrf() ?>" class="btn btn-red"><?= t('Yes') ?></a>
-        <?= t('or') ?> <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
-    </div>
-</div>
\ No newline at end of file
diff --git a/app/Template/task_show.php b/app/Template/task_show.php
deleted file mode 100644
index d1264d2e7..000000000
--- a/app/Template/task_show.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?= Helper\template('task_details', array('task' => $task, 'project' => $project)) ?>
-<?= Helper\template('task_time', array('values' => $values, 'date_format' => $date_format, 'date_formats' => $date_formats)) ?>
-<?= Helper\template('task_show_description', array('task' => $task)) ?>
-<?= Helper\template('subtask/show', array('task' => $task, 'subtasks' => $subtasks)) ?>
-<?= Helper\template('task_timesheet', array('timesheet' => $timesheet)) ?>
-<?= Helper\template('file/show', array('task' => $task, 'files' => $files)) ?>
-<?= Helper\template('task_comments', array('task' => $task, 'comments' => $comments, 'project' => $project)) ?>
\ No newline at end of file
diff --git a/app/Template/task_sidebar.php b/app/Template/task_sidebar.php
deleted file mode 100644
index ff47e988e..000000000
--- a/app/Template/task_sidebar.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="sidebar">
-    <h2><?= t('Actions') ?></h2>
-    <ul>
-        <li><a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('Summary') ?></a></li>
-        <li><a href="?controller=task&amp;action=edit&amp;task_id=<?= $task['id'] ?>"><?= t('Edit the task') ?></a></li>
-        <li><a href="?controller=task&amp;action=description&amp;task_id=<?= $task['id'] ?>"><?= t('Edit the description') ?></a></li>
-        <li><a href="?controller=subtask&amp;action=create&amp;task_id=<?= $task['id'] ?>"><?= t('Add a sub-task') ?></a></li>
-        <li><a href="?controller=comment&amp;action=create&amp;task_id=<?= $task['id'] ?>"><?= t('Add a comment') ?></a></li>
-        <li><a href="?controller=file&amp;action=create&amp;task_id=<?= $task['id'] ?>"><?= t('Attach a document') ?></a></li>
-        <li><a href="?controller=task&amp;action=duplicate&amp;project_id=<?= $task['project_id'] ?>&amp;task_id=<?= $task['id'] ?>"><?= t('Duplicate') ?></a></li>
-        <li><a href="?controller=task&amp;action=copy&amp;project_id=<?= $task['project_id'] ?>&amp;task_id=<?= $task['id'] ?>"><?= t('Duplicate to another project') ?></a></li>
-        <li><a href="?controller=task&amp;action=move&amp;project_id=<?= $task['project_id'] ?>&amp;task_id=<?= $task['id'] ?>"><?= t('Move to another project') ?></a></li>
-        <li>
-            <?php if ($task['is_active'] == 1): ?>
-                <a href="?controller=task&amp;action=close&amp;task_id=<?= $task['id'] ?>"><?= t('Close this task') ?></a>
-            <?php else: ?>
-                <a href="?controller=task&amp;action=open&amp;task_id=<?= $task['id'] ?>"><?= t('Open this task') ?></a>
-            <?php endif ?>
-        </li>
-        <?php if (! $hide_remove_menu): ?>
-            <li><a href="?controller=task&amp;action=remove&amp;task_id=<?= $task['id'] ?>"><?= t('Remove') ?></a></li>
-        <?php endif ?>
-    </ul>
-</div>
\ No newline at end of file