diff --git a/basis/cocoa/tags.txt b/basis/cocoa/tags.txt
index 2320bdd648..86dd9eeb91 100644
--- a/basis/cocoa/tags.txt
+++ b/basis/cocoa/tags.txt
@@ -1,2 +1,3 @@
 unportable
 bindings
+ffi
diff --git a/basis/images/tags.txt b/basis/images/tags.txt
index 04b54a06f4..9347bd326b 100644
--- a/basis/images/tags.txt
+++ b/basis/images/tags.txt
@@ -1 +1 @@
-bitmap graphics
+graphics
diff --git a/basis/windows/com/tags.txt b/basis/windows/com/tags.txt
index 2320bdd648..86dd9eeb91 100755
--- a/basis/windows/com/tags.txt
+++ b/basis/windows/com/tags.txt
@@ -1,2 +1,3 @@
 unportable
 bindings
+ffi
diff --git a/core/alien/tags.txt b/core/alien/tags.txt
index 86a7c8e637..7ea420feed 100644
--- a/core/alien/tags.txt
+++ b/core/alien/tags.txt
@@ -1 +1,2 @@
 compiler
+ffi
diff --git a/extra/annotations/tags.txt b/extra/annotations/tags.txt
index 278296de5e..ef1aab0d0e 100644
--- a/extra/annotations/tags.txt
+++ b/extra/annotations/tags.txt
@@ -1,2 +1 @@
-comments
-annotation
+tools
diff --git a/extra/gpu/demos/bunny/tags.txt b/extra/gpu/demos/bunny/tags.txt
new file mode 100644
index 0000000000..cb5fc203e1
--- /dev/null
+++ b/extra/gpu/demos/bunny/tags.txt
@@ -0,0 +1 @@
+demos
diff --git a/extra/gpu/demos/raytrace/tags.txt b/extra/gpu/demos/raytrace/tags.txt
new file mode 100644
index 0000000000..cb5fc203e1
--- /dev/null
+++ b/extra/gpu/demos/raytrace/tags.txt
@@ -0,0 +1 @@
+demos
diff --git a/extra/svg/tags.txt b/extra/svg/tags.txt
index 0cf061a252..65e8f3eddb 100644
--- a/extra/svg/tags.txt
+++ b/extra/svg/tags.txt
@@ -1,3 +1,2 @@
 xml
 graphics
-svg
diff --git a/extra/terrain/tags.txt b/extra/terrain/tags.txt
new file mode 100644
index 0000000000..cb5fc203e1
--- /dev/null
+++ b/extra/terrain/tags.txt
@@ -0,0 +1 @@
+demos
diff --git a/extra/trees/splay/tags.txt b/extra/trees/splay/tags.txt
index fb6cea7147..42d711b32b 100644
--- a/extra/trees/splay/tags.txt
+++ b/extra/trees/splay/tags.txt
@@ -1,2 +1 @@
 collections
-trees
diff --git a/extra/trees/tags.txt b/extra/trees/tags.txt
index fb6cea7147..42d711b32b 100644
--- a/extra/trees/tags.txt
+++ b/extra/trees/tags.txt
@@ -1,2 +1 @@
 collections
-trees
diff --git a/extra/tty-server/tags.txt b/extra/tty-server/tags.txt
index 587fb228f3..8dfb43b578 100644
--- a/extra/tty-server/tags.txt
+++ b/extra/tty-server/tags.txt
@@ -1,4 +1,4 @@
 tools
 applications
 demos
-networking
+network
diff --git a/extra/webapps/fjsc/tags.txt b/extra/webapps/fjsc/tags.txt
index 1b93c9eb4d..14d6b62728 100644
--- a/extra/webapps/fjsc/tags.txt
+++ b/extra/webapps/fjsc/tags.txt
@@ -1 +1,2 @@
-webapp
+web
+examples