diff --git a/src/lib/Category.php b/src/lib/Category.php
index 1694006..b1da912 100644
--- a/src/lib/Category.php
+++ b/src/lib/Category.php
@@ -2,13 +2,10 @@
 
 namespace Garradin\Plugin\Materiels;
 
-use Garradin\Entity;
 use Garradin\DB;
 
-class Category extends Entity
+class Category
 {
-  const TABLE = 'plugin_materiels_category';
-
   protected $id;
 	protected $name;
 
@@ -17,8 +14,23 @@ class Category extends Entity
     'name' => 'string',
   ];
 
-  static public function listAll(): array
+  public function add($data = [])
 	{
-		return DB::getInstance()->get('SELECT id, name FROM plugin_materiels_category ORDER BY name COLLATE NOCASE;');
+		DB::getInstance()->insert('plugin_materiels_category', $data);
+	}
+
+  public function delete($id)
+	{
+		DB::getInstance()->delete('plugin_facturation_clients', 'id = ' . $id);
+	}
+
+  public function get($id)
+  {
+    return DB::getInstance()->first('SELECT * FROM plugin_materiels_category WHERE id = ?;', $id);
+  }
+
+  public function listAll()
+	{
+		return DB::getInstance()->get('SELECT id, name FROM plugin_materiels_category ORDER BY name;');
 	}
 }
diff --git a/src/templates/_nav.tpl b/src/templates/_nav.tpl
index 68a2f6b..323a59a 100644
--- a/src/templates/_nav.tpl
+++ b/src/templates/_nav.tpl
@@ -1,7 +1,7 @@
 <nav class="tabs">
 	<ul>
 		<li class="{if $current == 'index'}current{/if}"><a href="{plugin_url}">Matériels en stock</a></li>
-    <li class="{if $current == 'categories'}current{/if}"><a href="{plugin_url file="categories.php"}">Catégories</a></li>
+    <li class="{if $current == 'categories'}current{/if}"><a href="{plugin_url file="categories/index.php"}">Catégories</a></li>
 		<li class="{if $current == 'entrees_definitives'}current{/if}"><a href="{plugin_url file="entrees_definitives.php"}"><b>Entrées définitives</b></a></li>
 		<li class="{if $current == 'entrees_provisoires'}current{/if}"><a href="{plugin_url file="entrees_provisoires.php"}">Entrées provisoires</a></li>
 		<li class="{if $current == 'sorties_definitives'}current{/if}"><a href="{plugin_url file="sorties_definitives.php"}">Sorties définitives</a></li>
diff --git a/src/templates/categories.tpl b/src/templates/categories/index.tpl
similarity index 97%
rename from src/templates/categories.tpl
rename to src/templates/categories/index.tpl
index afcca8b..97c888c 100644
--- a/src/templates/categories.tpl
+++ b/src/templates/categories/index.tpl
@@ -5,6 +5,7 @@
 <form method="post" action="{$self_url}">
   <fieldset>
     <legend>Ajouter une catégorie</legend>
+    {form_errors}
     <dl>
       {input type="text" name="name" label="Nom" required=true}
     </dl>
diff --git a/src/templates/categories/supprimer_categorie.tpl b/src/templates/categories/supprimer_categorie.tpl
new file mode 100644
index 0000000..dbed701
--- /dev/null
+++ b/src/templates/categories/supprimer_categorie.tpl
@@ -0,0 +1,11 @@
+{include file="admin/_head.tpl" title="%s"|args:$plugin.nom current="plugin_%s"|args:$plugin.id}
+
+{include file="%s_nav.tpl"|args:$plugin_tpl current="categories"}
+
+{include file="%scommon/delete_form.tpl"|args:$plugin_tpl
+	legend="Supprimer cette catégorie de matériels ?"
+	warning="Êtes-vous sûr de vouloir supprimer la catégorie « %s » ?"|args:$cat.name
+	alert="Attention, la catégorie ne doit plus contenir de matériels pour pouvoir être supprimée."
+}
+
+{include file="admin/_foot.tpl"}
diff --git a/src/templates/common/delete_form.tpl b/src/templates/common/delete_form.tpl
new file mode 100644
index 0000000..5fa144f
--- /dev/null
+++ b/src/templates/common/delete_form.tpl
@@ -0,0 +1,13 @@
+{form_errors}
+
+<form method="post" action="{$self_url}" data-focus="1">
+  <fieldset>
+	   <legend>{$legend}</legend>
+	    <h3 class="warning">{$warning}</h3>
+		  <p class="block alert">{$alert}</p>
+	</fieldset>
+	<p class="submit">
+		{csrf_field key=$csrf_key}
+		{button type="submit" name="delete" label="Supprimer" shape="delete" class="main"}
+	</p>
+</form>
diff --git a/src/www/admin/categories.php b/src/www/admin/categories.php
deleted file mode 100644
index e51add8..0000000
--- a/src/www/admin/categories.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace Garradin;
-
-use Garradin\Plugin\Materiels\Category;
-use Garradin\Membres\Session;
-
-require_once __DIR__ . '/_inc.php';
-
-$csrf_key = 'cat_create';
-
-$form->runIf('save', function() {
-	$cat = new Category;
-	$cat->importForm([
-	   'name' => ucfirst(f('name')),
-	]);
-  try {
-    $cat->save();
-  } catch (\RuntimeException $e) {
-    throw new UserException('Cette catégorie existe déjà.');
-  }
-}, $csrf_key, Utils::getSelfURI());
-
-$list = Category::listAll();
-
-$tpl->assign(compact('csrf_key', 'list'));
-
-$tpl->display(PLUGIN_ROOT . '/templates/categories.tpl');
diff --git a/src/www/admin/categories/index.php b/src/www/admin/categories/index.php
new file mode 100644
index 0000000..ac5e2fa
--- /dev/null
+++ b/src/www/admin/categories/index.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Garradin;
+
+use Garradin\Plugin\Materiels\Category;
+use Garradin\Utils;
+
+require_once __DIR__ . '/../_inc.php';
+
+$cat = new Category;
+
+$csrf_key = 'cat_create';
+
+if (f('save') && $form->check($csrf_key))
+{
+	if (!$form->hasErrors())
+	{
+		try
+		{
+			$cat->add([
+				'name' => ucfirst(f('name'))
+			]);
+			Utils::redirect(PLUGIN_URL . 'categories/index.php');
+		}
+		catch (\RuntimeException $e)
+		{
+			if (strstr($e->getMessage(), 'UNIQUE constraint failed'))
+			{
+				$form->addError('Cette catégorie existe déjà.');
+			} else
+			{
+				$form->addError($e->getMessage());
+			}
+		}
+	}
+}
+
+$list = $cat->listAll();
+
+$tpl->assign(compact('csrf_key', 'list'));
+
+$tpl->display(PLUGIN_ROOT . '/templates/categories/index.tpl');
diff --git a/src/www/admin/categories/supprimer_categorie.php b/src/www/admin/categories/supprimer_categorie.php
new file mode 100644
index 0000000..3aa93f0
--- /dev/null
+++ b/src/www/admin/categories/supprimer_categorie.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Garradin;
+use Garradin\Plugin\Materiels\Category;
+use Garradin\Utils;
+
+require_once __DIR__ . '/../_inc.php';
+
+$cat = new Category;
+$cat = $cat->get((int) qg('id'));
+
+if (!$cat) {
+	throw new UserException("Cette catégorie n'existe pas.");
+}
+
+$csrf_key = 'cat_delete_' . qg('id');
+
+$form->runIf('delete', function () use($cat) {
+	$cat->delete((int) qg('id'));
+}, $csrf_key, Utils::redirect(PLUGIN_URL . 'categories/index.php'));
+
+$tpl->assign(compact('cat', 'csrf_key'));
+
+$tpl->display(PLUGIN_ROOT . '/templates/categories/supprimer_categorie.tpl');
diff --git a/src/www/admin/supprimer_categorie.php b/src/www/admin/supprimer_categorie.php
deleted file mode 100644
index 0960979..0000000
--- a/src/www/admin/supprimer_categorie.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace Garradin;
-
-require_once __DIR__ . '/_inc.php';
-
-$tpl->display(PLUGIN_ROOT . '/templates/index.tpl');