-RewriteRule ^([0-9]+)$ /display.php?id=$1
-RewriteRule ^([0-9]+)/delete$ /delete.php?id=$1
-RewriteRule ^([0-9]+)/delete/confirm$ /delete.php?id=$1&confirm=1
-RewriteRule ^([0-9]+)/doap$ /doap.php?id=$1
-RewriteRule ^([0-9]+)/edit$ /edit.php?id=$1
-RewriteRule ^([0-9]+)/fork$ /fork.php?id=$1
-RewriteRule ^([0-9]+)/raw/(.+)$ /raw.php?id=$1&file=$2
-RewriteRule ^([0-9]+)/rev/(.+)$ /revision.php?id=$1&rev=$2
-RewriteRule ^([0-9]+)/rev-raw/(.+)/(.+)$ /raw.php?id=$1&rev=$2&file=$3
-RewriteRule ^([0-9]+)/tool/([^/]+)/(.+)$ /tool.php?id=$1&tool=$2&file=$3
+RewriteRule ^([0-9]+)$ display.php?id=$1
+RewriteRule ^([0-9]+)/$ $1 [R]
+RewriteRule ^([0-9]+)/delete$ delete.php?id=$1
+RewriteRule ^([0-9]+)/delete/confirm$ delete.php?id=$1&confirm=1
+RewriteRule ^([0-9]+)/doap$ doap.php?id=$1
+RewriteRule ^([0-9]+)/edit$ edit.php?id=$1
+RewriteRule ^([0-9]+)/edit/(.+)$ edit.php?id=$1&file=$2
+RewriteRule ^([0-9]+)/embed$ embed.php?id=$1
+RewriteRule ^([0-9]+)/embed/(.+)$ embed-file.php?id=$1&file=$2
+RewriteRule ^([0-9]+)/fork$ fork.php?id=$1
+RewriteRule ^([0-9]+)/linkback$ linkback.php?id=$1
+RewriteRule ^([0-9]+)/raw/(.+)$ raw.php?id=$1&file=$2
+RewriteRule ^([0-9]+)/rev/(.+)$ revision.php?id=$1&rev=$2
+RewriteRule ^([0-9]+)/rev-raw/(.+)/(.+)$ raw.php?id=$1&rev=$2&file=$3
+RewriteRule ^([0-9]+)/tool/([^/]+)/(.+)$ tool.php?id=$1&tool=$2&file=$3
+
+RewriteRule ^fork-remote$ fork-remote.php
+RewriteRule ^help$ help.php
+RewriteRule ^new$ new.php