diff --git a/site/projects/mege/test.org b/site/projects/mege/test.org
index d268219..871bfff 100644
--- a/site/projects/mege/test.org
+++ b/site/projects/mege/test.org
@@ -1,7 +1,10 @@
 #+title: Test of mege features
-#@summary
+#&summary
 Test of many features
-#@
+#&
+#+license: bysa, images
+
+
 * Test of mege features
 *mege* has many features. A bit /too/ many, perhaps.
 
@@ -34,26 +37,56 @@ Another list:
   * 3u :: o (correct behaviour)
 
 ** Images
-#@img;url=test.png,alt='This is a test picture',width=340
+#&img;url=test.png,alt='This is a test picture',width=340
 
 ** Block containers
 
 Block quote:
 
-#@block
+#&block
 Hello.
-#@
+#&
+
+*** Combination
+#÷large
+#&block
+This is a paragraph inside a blockquote inside a block container.
+\#&
+#&
+#&
 
 ** Inline container
-
 abc
-#@-strong,textsize=tiny
+#&-strong,tiny,color=red
 def
 
 (no new parapraph)
-#@
+#&
 ghi.
 
+** Inline modifiers
+
+This is a bt&acro='brutal test' of mege. More {bru te}&abbr='brutal testing'...
+
++ In a list
++ Not escaped: x&var, escaped: x\&var, not escaped in group: {x}&var, escaped
+  in group: {x}\&var. ns@metanohi.org  ua
+
+Nested groups: {{ab{ula aa}&abbr=a cd}&var&color=red cd}&acro
+
+** Inline inline formatting
+
+*mege*. /mege/ ... _mege_, {=mege mege=}&html. ~mege~! -C-f-?
+
+Fail: ~mege ~, *meg*e, solution: {{mege }&samp}, {meg&strong}e
+
+Nested fail:  */oo/ aub.
+
+{{a&strong}&emph}, {a&strong&emph}
+
+A */_woo_/*! 
+
+
 ** Tables
 *** Body only
 | Name   | Age |
@@ -63,18 +96,38 @@ ghi.
 | Name   | Age |
 |--------+-----|
 | Xryurg | 300 |
-| Bkrau  |   2 |
+| Bkrau  | *2* |
 |--------+-----|
 | Name   | Age |
 
+** Footnotes
+
+This sentence is true[fn:true]. This is /not/[fn:false].
+
+[fn:true] Master of Truthfulness, 1997
+[fn:false] Master of Truthfulness, 1999, /revised ed./, with special
+introduction by the Master of Falsefulness
+
+\[fn:false] Master of Truthfulness, 1999, revised ed.
+
+
+** Eval'd Code
+Inline code: <@eval 2 + 3@>.
+
+Block code:
+#++eval
+#+BEGIN_SRC python
+2 + 3
+#+END_SRC
+
 
 
 * Org features not supported by mege
 
 ** In lists
 #+BEGIN_SRC
-10. [@10]Starting at 10
+10. [&10]Starting at 10
 11. ABC
-40. [@40]Going to 40
+40. [&40]Going to 40
 41. 2+2=4
 #+END_SRC
diff --git a/sitespecial/listdir.org b/sitespecial/listdir.org
index 8bbb047..5247a59 100644
--- a/sitespecial/listdir.org
+++ b/sitespecial/listdir.org
@@ -1,5 +1,5 @@
 #+title: Directory listing: <@eval page.core_url@>
 
-#@deval
+#&deval
 page.dirlist
-#@
+#&
diff --git a/sitespecial/notfound.org b/sitespecial/notfound.org
index a0a629f..8d1cf66 100644
--- a/sitespecial/notfound.org
+++ b/sitespecial/notfound.org
@@ -2,6 +2,6 @@
 
 The page <@deval repr(page.core_url)@> does not exist. The error was:
 
-#@block
+#&block
 <@deval page.error@>
-#@
+#&
diff --git a/sitespecial/servererror.org b/sitespecial/servererror.org
index 318d8a5..50095f7 100644
--- a/sitespecial/servererror.org
+++ b/sitespecial/servererror.org
@@ -2,6 +2,6 @@
 
 There was an error, most likely due to sloppy programming:
 
-#@block
+#&block
 <@deval page.error@>
-#@
+#&