diff --git a/onyx/include/admin/exercice.php b/onyx/include/admin/exercice.php
index 3a925efb..fa6858cd 100644
--- a/onyx/include/admin/exercice.php
+++ b/onyx/include/admin/exercice.php
@@ -5,9 +5,16 @@ if(!defined('ONYX')) exit;
 $p = $out[0];
 
 if (isset($p[2]))
-    $template->assign("theme", $p[2]);
+{
+    $tmp = explode("-", $p[2]);
+    $id = intval($tmp[0]);
+    if ($id == 0)
+      return "404";
+    $theme = new Theme($id);
+    $template->assign("theme", $theme);
+}
 
 if (isset($p[3]))
-    $template->assign("ex", $p[3]);
+  $template->assign("ex", new Exercice($p[3], $theme));
 
-return "admin/exercice";
+return SALT_ADMIN."/exercice";
diff --git a/onyx/tpl/bootstrap/admin/exercice.tpl b/onyx/tpl/bootstrap/admin/exercice.tpl
index 1537536f..605034b2 100644
--- a/onyx/tpl/bootstrap/admin/exercice.tpl
+++ b/onyx/tpl/bootstrap/admin/exercice.tpl
@@ -1,7 +1,15 @@
 {extends file="admin/layout.tpl"}
 {block name=content}
 <p>
-    Theme: {$theme} </br>
-    Exercice: {$ex}
+    Theme: {$theme->name} </br>
+    {if isset($ex)}
+      Exercice: {$ex->id}
+    {else}
+      <ul>
+      {foreach $theme->get_exercices_ordered() as $ex}
+        <li><a href="/{$SALT_ADMIN}/ex/{$theme->id}-{$theme->name}/{$ex->id}">{$ex->get_name()}</a></li>
+      {/foreach}
+      </ul>
+    {/if}
 </p>
 {/block}
diff --git a/onyx/tpl/bootstrap/admin/themes.tpl b/onyx/tpl/bootstrap/admin/themes.tpl
index 150ded87..86c9bf2b 100644
--- a/onyx/tpl/bootstrap/admin/themes.tpl
+++ b/onyx/tpl/bootstrap/admin/themes.tpl
@@ -19,10 +19,10 @@
 	<a href="?delete={$t->id}"><span class="glyphicon glyphicon-trash"></span></a>
         <a href="/{$SALT_ADMIN}/themes/export?id={$t->id}" role="button"><span class="glyphicon glyphicon-floppy-save"></span> Exporter</a>
       </td>
-      <td><a href="/{$SALT_ADMIN}/{$t->id}-{$t->name}">{$t->name}</a></td>
+      <td><a href="/{$SALT_ADMIN}/ex/{$t->id}-{$t->name}">{$t->name}</a></td>
       <td><ul>
       {foreach from=$t->get_exercices_ordered() item=e}
-        <li><a href="/{$SALT_ADMIN}/{$t->id}-{$t->name}/{$e->id}">{$e->get_name()}</a></li>
+        <li><a href="/{$SALT_ADMIN}/ex/{$t->id}-{$t->name}/{$e->id}">{$e->get_name()}</a></li>
       {/foreach}
       </ul></td>
       <td>FIXME</td>