diff --git a/roadmap.md b/roadmap.md
index b4b5b834..c7fa7418 100644
--- a/roadmap.md
+++ b/roadmap.md
@@ -3,35 +3,49 @@
 ---
 
 ## v2.4
-* User avatar *(opi)*
+Core:
+* Add tools in moulinette to manage certificates (add, remove, update) *(ljf, Moul)*
 * Run automatic tests on moulinette *(kload)*
 * Use templates to (re)generate configurations instead of packages *(beudbeud, jerome)*
 * Add proper upgrade/remove scripts and comment Debian scripts in packages *(beudbeud)*
 * Complete and improve backup & restore system *(jerome)*
-* Add tools in moulinette to manage certificates (add, remove, update) *(ljf, Moul)*
+
+Web:
+* User avatar *(opi)*
 * Plugin system for the web administration panel *(ljf)*
 
 ---
 
 ## v2.2 <small><small>12 may 2015</small></small>
-* ~~Firewall in web administration *(opi)*~~
-* ~~Install non-official apps from admin *(opi)*~~
-* ~~OpenVPN configuration page + access control *(kload)*~~
-* ~~Migrate to Baïkal and deprecate Radicale *(ju)*~~
-* ~~Add a download files button on Transmission interface *(opi)*~~
+
+Core:
+* ~~Migrate YunoHost to Debian Jessie~~
 * ~~Update Metronome to v3.6 and make a more Debian-friendly package *(jerome)*~~
-* ~~Warn users about security updates in the webadmin *(opi)*~~
 * ~~Add mail quota *(beudbeud, jerome)*~~
-* ~~Improve documentation, by making it more accessible *(Moul)*~~
-* ~~Install and switch to a new build system on a new server *(beudbeud)*~~
+* ~~Implement a simple backup & restore system *(jerome, kload)*~~
 * ~~Add logging to the moulinette for each action *(jerome)*~~
 * ~~Review the app manifest format and integrate it *(app maintainers, jerome, opi)*~~
-* ~~Implement a simple backup & restore system *(jerome, kload)*~~
-* ~~Fix WebSocket issue for Raspberry Pi *(jerome, kload)*~~
-* ~~Create YunoHost image based on Cubian for Cubieboard 2 *(Moul)*~~
-* ~~Migrate YunoHost to Debian Jessie~~
-* ~~Create a YunoHost official image for RaspberryPi~~
+
+Web admin:
+* ~~Install non-official apps from admin *(opi)*~~
+* ~~Firewall in web administration *(opi)*~~
+* ~~Warn users about security updates in the webadmin *(opi)*~~
+
+Apps:
+* ~~Migrate to Baïkal and deprecate Radicale *(ju)*~~
+* ~~Add Shell In A Box and remove GateOne from official apps *(kload)*~~
+* ~~OpenVPN configuration page + access control *(kload)*~~
+* ~~Add a download files button on Transmission interface *(opi)*~~
+
+Images:
 * ~~Create an official image for LaBriqueInternet~~
+* ~~Create YunoHost image based on Cubian for Cubieboard 2 *(Moul)*~~
+* ~~Create a YunoHost official image for RaspberryPi~~
+* ~~Fix WebSocket issue for Raspberry Pi *(jerome, kload)*~~
+
+Other:
+* ~~Install and switch to a new build system on a new server *(beudbeud)*~~
+* ~~Improve documentation, to make YunoHost more accessible *(Moul)*~~
 
 ---
 
@@ -42,12 +56,13 @@
 ---
 
 ## v2.0 RC
-* ~~Mail configuration tests *(beudbeud)*~~
+
+* ~~Mail forward configuration *(kload, beudbeud)*~~
 * ~~Make pending apps official *(Ju)*~~
 * ~~SFTP *(kload)*~~
 * ~~DNS zone fix *(kload)*~~
 * ~~SSOwat stuffs (presistent rules, public root website) *(ezpen)*~~
-* ~~Mail forward configuration *(kload, beudbeud)*~~
+* ~~Mail configuration tests *(beudbeud)*~~
 * ~~Test and upgrade official apps like Owncloud, Roundcube and Radicale *(packagers)*~~
 * ~~Upgrade function + view *(beudbeud, opi)*~~
 * ~~uPnP rework *(kload, titoko)*~~