--- wikisrc/projects/all.mdwn	2011/11/06 01:59:12	1.2
+++ wikisrc/projects/all.mdwn	2011/11/06 21:08:23	1.4
@@ -1,49 +1,65 @@
 [[!meta title="All projects"]]
 
 This page contains the list of all available projects, broken by topic
-and difficulty.
+and difficulty.  The topics are as follows:
 
-# Kernel-level projects
+[[!toc levels=1]]
 
+# File system projects
 ## Easy
-
-[[!map show="title" pages="projects/project/* and tagged(kernel) and tagged(easy)"]]
-
+[[!map show="title" pages="projects/project/* and tagged(category:filesystems) and tagged(difficulty:easy)"]]
 ## Medium
-
-[[!map show="title" pages="projects/project/* and tagged(kernel) and tagged(medium)"]]
-
+[[!map show="title" pages="projects/project/* and tagged(category:filesystems) and tagged(difficulty:medium)"]]
 ## Hard
+[[!map show="title" pages="projects/project/* and tagged(category:filesystems) and tagged(difficulty:hard)"]]
 
-[[!map show="title" pages="projects/project/* and tagged(kernel) and tagged(hard)"]]
-
-# Userland projects
-
+# Kernel-level projects
 ## Easy
-
-[[!map show="title" pages="projects/project/* and tagged(userland) and tagged(easy)"]]
-
+[[!map show="title" pages="projects/project/* and tagged(category:kernel) and tagged(difficulty:easy)"]]
 ## Medium
+[[!map show="title" pages="projects/project/* and tagged(category:kernel) and tagged(difficulty:medium)"]]
+## Hard
+[[!map show="title" pages="projects/project/* and tagged(category:kernel) and tagged(difficulty:hard)"]]
 
-[[!map show="title" pages="projects/project/* and tagged(userland) and tagged(medium)"]]
-
+# Miscellaneous projects
+## Easy
+[[!map show="title" pages="projects/project/* and tagged(category:misc) and tagged(difficulty:easy)"]]
+## Medium
+[[!map show="title" pages="projects/project/* and tagged(category:misc) and tagged(difficulty:medium)"]]
 ## Hard
+[[!map show="title" pages="projects/project/* and tagged(category:misc) and tagged(difficulty:hard)"]]
 
-[[!map show="title" pages="projects/project/* and tagged(userland) and tagged(hard)"]]
+# Networking projects
+## Easy
+[[!map show="title" pages="projects/project/* and tagged(category:networking) and tagged(difficulty:easy)"]]
+## Medium
+[[!map show="title" pages="projects/project/* and tagged(category:networking) and tagged(difficulty:medium)"]]
+## Hard
+[[!map show="title" pages="projects/project/* and tagged(category:networking) and tagged(difficulty:hard)"]]
 
 # pkgsrc projects
-
 ## Easy
-
-[[!map show="title" pages="projects/project/* and tagged(pkgsrc) and tagged(easy)"]]
-
+[[!map show="title" pages="projects/project/* and tagged(category:pkgsrc) and tagged(difficulty:easy)"]]
 ## Medium
+[[!map show="title" pages="projects/project/* and tagged(category:pkgsrc) and tagged(difficulty:medium)"]]
+## Hard
+[[!map show="title" pages="projects/project/* and tagged(category:pkgsrc) and tagged(difficulty:hard)"]]
 
-[[!map show="title" pages="projects/project/* and tagged(pkgsrc) and tagged(medium)"]]
-
+# Port-related projects
+## Easy
+[[!map show="title" pages="projects/project/* and tagged(category:ports) and tagged(difficulty:easy)"]]
+## Medium
+[[!map show="title" pages="projects/project/* and tagged(category:ports) and tagged(difficulty:medium)"]]
 ## Hard
+[[!map show="title" pages="projects/project/* and tagged(category:ports) and tagged(difficulty:hard)"]]
 
-[[!map show="title" pages="projects/project/* and tagged(pkgsrc) and tagged(hard)"]]
+# Userland projects
+## Easy
+[[!map show="title" pages="projects/project/* and tagged(category:userland) and tagged(difficulty:easy)"]]
+## Medium
+[[!map show="title" pages="projects/project/* and tagged(category:userland) and tagged(difficulty:medium)"]]
+## Hard
+[[!map show="title" pages="projects/project/* and tagged(category:userland) and tagged(difficulty:hard)"]]
 
 # Unclassified projects
 
@@ -58,8 +74,8 @@ important to spot them!
 
 ## Projects without a category definition
 
-[[!map show="title" pages="projects/project/* and !tagged(kernel) and !tagged(pkgsrc) and !tagged(userland)"]]
+[[!map show="title" pages="projects/project/* and !tagged(category:filesystems) and !tagged(category:kernel) and !tagged(category:misc) and !tagged(category:networking) and !tagged(category:pkgsrc) and !tagged(category:ports) and !tagged(category:userland)"]]
 
 ## Projects without a difficulty definition
 
-[[!map show="title" pages="projects/project/* and !tagged(easy) and !tagged(medium) and !tagged(hard)"]]
+[[!map show="title" pages="projects/project/* and !tagged(difficulty:easy) and !tagged(difficulty:medium) and !tagged(difficulty:hard)"]]