diff --git a/extra/feedicon.png b/extra/feedicon.png
new file mode 100644
index 0000000..f02d414
Binary files /dev/null and b/extra/feedicon.png differ
diff --git a/extra/feedicon.svg b/extra/feedicon.svg
new file mode 100644
index 0000000..243cb03
--- /dev/null
+++ b/extra/feedicon.svg
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   id="svg3942"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="feedicon.svg"
+   inkscape:export-filename="/home/niels/www/nohi/extra/feedicon.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs3944">
+    <linearGradient
+       id="linearGradient3824">
+      <stop
+         id="stop3826"
+         offset="0"
+         style="stop-color:#ff0000;stop-opacity:0.39215687;" />
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0.5"
+         id="stop3840" />
+      <stop
+         id="stop3828"
+         offset="1"
+         style="stop-color:#ff0000;stop-opacity:0.39215687;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4.5409514"
+     inkscape:cx="17.70445"
+     inkscape:cy="52.904492"
+     inkscape:document-units="px"
+     inkscape:current-layer="g4023"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="1024"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3947">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g4023"
+       transform="matrix(0,2.191671,-2.191671,0,121.62963,27.03079)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3758"
+         style="fill:#008000;fill-opacity:1;-inkscape-font-specification:Inconsolata Bold"
+         d="m 6.1947105,53.437709 0,-2.307832 -10.6299891,0 c -0.7692828,0 -1.4686264,-0.06983 -2.3078324,-0.5245 -1.0490234,-0.559477 -1.4686224,-1.258813 -1.4686224,-1.923183 0,-0.55948 0.3497114,-1.18889 1.2238533,-1.468627 0.6643642,-0.209797 1.4336568,-0.174828 2.0980289,-0.174828 l 11.0845617,0 0,-2.34279 -10.5600658,0 c -0.8392061,0 -1.5035762,-0.06987 -2.51763,-0.664374 -0.4196465,-0.279738 -1.4336489,-0.874177 -1.4336489,-1.853258 0,-0.524498 0.3147438,-1.014048 0.9091491,-1.258815 0.6643642,-0.314706 1.5735232,-0.244771 2.3078186,-0.244771 l 11.3293486,0 0,-2.377761 -11.3643043,0 c -1.3287502,0 -2.6575122,-0.03503 -3.7414833,0.664388 -0.9091353,0.594431 -1.2588115,1.608476 -1.2588115,2.48266 0,1.53855 0.9091456,2.972201 2.3078348,3.601603 -1.3287659,0.244773 -2.3078348,1.363728 -2.3078348,2.797382 0,1.328739 0.8392025,2.552596 1.9581512,3.286891 l -1.5735193,-0.03503 0,2.342788 15.9449956,0" />
+      <path
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3772"
+         style="fill:#008000;fill-opacity:1;-inkscape-font-specification:Inconsolata Bold"
+         d="m 39.323287,44.969414 0,1.093947 2.039577,0 0,6.322675 -51.1123338,0 -3.905e-4,1.056875 54.4502603,0 0,-1.056875 -1.983936,0 0,-7.416622 -3.393122,0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3762"
+         style="fill:#008000;fill-opacity:1;-inkscape-font-specification:Inconsolata Bold"
+         d="m -9.7809324,20.206357 3.3491529,0.245058 0,2.967949 1.6065027,0.02716 0,-2.913505 c 2.1238595,0.163315 4.24772882,0.245058 6.3443434,0.245058 1.1163908,0 2.3689272,0 3.4036249,-0.73518 0.8168728,-0.599024 1.3069906,-1.552048 1.3069906,-2.83181 0,-1.470359 -0.6262652,-2.913489 -1.3886799,-3.975422 l -1.5520386,0.599056 c 0.789626,1.061915 1.1436101,2.042169 1.1436101,2.804581 0,0.92578 -0.5173468,1.878788 -2.014945,2.096617 -0.1090153,0 -0.5718051,0.08166 -2.39615045,0.08166 -1.60649675,0 -3.24024635,-0.08166 -4.84675505,-0.245058 l 0,-4.084346 -1.6337318,0 0,4.057115 c 0,0 -2.2327818,-0.190613 -2.9407343,-0.326757 -0.2723048,-0.02716 -0.4356714,-0.245058 -0.7351861,-0.136155 l 0.3540045,2.123865" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3766"
+         style="fill:#008000;fill-opacity:1;-inkscape-font-specification:Inconsolata Bold"
+         d="m 8.304349,53.423246 1.898426,0 0,-6.83953 c 0,-0.780181 0.104086,-1.37832 0.598126,-2.028468 0.442098,-0.598127 1.586356,-1.664374 2.834645,-1.664374 0.598134,0 1.196264,0.26009 1.612356,0.754182 0.650154,0.780176 0.650154,1.794391 0.650154,2.626583 l 0,7.151607 1.846414,0 0,-7.20362 0,0 c 0,-0.910196 0,-1.898427 -0.416092,-2.860643 -0.598139,-1.326289 -1.820404,-2.080461 -3.172713,-2.080461 -1.612369,0 -3.068692,1.040225 -3.95289,2.366534 l 0,-2.080469 -1.898426,0 0,11.858659" />
+      <path
+         d="m 29.531651,47.363565 c 0,-4.005988 -2.535444,-6.085043 -5.172298,-6.085043 -2.941096,0 -5.476531,2.535425 -5.476531,6.135742 0,3.524243 2.510085,6.008982 5.425829,6.008982 2.73827,0 5.223,-2.205833 5.223,-6.059681 m -5.299065,-4.53843 c 1.673389,0 3.448194,1.445201 3.448194,4.614488 0,2.915747 -1.673385,4.386299 -3.346775,4.386299 -1.850862,0 -3.524249,-1.724087 -3.524249,-4.58914 0,-2.839684 1.648027,-4.411647 3.42283,-4.411647"
+         style="fill:#008000;fill-opacity:1;-inkscape-font-specification:Inconsolata Bold"
+         id="path3903"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(1.7002621,0,0,1.7002621,-318.56518,-273.8438)"
+         d="m 212.79518,186.10309 a 0.84869117,0.84869117 0 1 1 -1.69738,0 0.84869117,0.84869117 0 1 1 1.69738,0 z"
+         sodipodi:ry="0.84869117"
+         sodipodi:rx="0.84869117"
+         sodipodi:cy="186.10309"
+         sodipodi:cx="211.94649"
+         id="path3818"
+         style="fill:#008000;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3770"
+         style="fill:#008000;fill-opacity:1;-inkscape-font-specification:Inconsolata Bold"
+         d="m 31.177039,53.386815 1.353484,0 0,-4.810332 c 0,-0.548712 0.05487,-0.969395 0.402399,-1.426644 0.329217,-0.420697 1.134005,-1.170579 2.011936,-1.170579 0.420697,0 0.841345,0.182926 1.133989,0.530414 0.457288,0.548714 0.457288,1.26203 0.457288,1.847307 l 0,5.029828 1.298612,0 0,-5.066407 0,0 c 0,-0.640158 -0.01832,-1.335178 -0.310911,-2.011923 -0.420639,-0.93281 -1.262013,-1.463217 -2.213116,-1.463217 -1.133989,0 -2.176532,0.731609 -2.780113,1.664412 l 0,-4.846917 c 0,-0.05487 0,-0.109785 0.05488,-0.16461 0.05487,-0.05487 0.127999,-0.109784 0.127999,-0.201183 0,-0.01832 0,-0.03653 -0.01832,-0.05487 l -1.518094,0 0,12.144724" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3764"
+         style="fill:#008000;fill-opacity:1;-inkscape-font-specification:Inconsolata Bold"
+         d="m -7.9780835,11.044575 1.5748327,-1.1982484 c -1.3351751,-1.3009513 -1.746007,-3.0469544 -1.746007,-4.5190821 0,-1.8487239 0.7874143,-2.7730968 1.5063653,-3.2181525 0.8558837,-0.513533 1.8829517,-0.4793152 2.7046037,-0.4793152 l 0.5477509,0 0,0.4793152 c 0,2.3280173 0,4.7929793 0.7189727,6.7786459 0.8901213,2.4649561 2.73884134,3.5604951 4.4506187,3.5604951 2.2937935,0 4.4506286,-1.985658 4.4506286,-5.2380427 0,-1.9171854 -0.7189767,-3.9028441 -2.1226054,-5.6146313 l 1.7117714,0 0,-2.32801935 -9.6886675,0 c -1.2667118,0 -2.4649442,0.0343801 -3.6974282,0.75318464 -1.6775535,1.02705811 -2.5676694,3.01272471 -2.5676694,5.44345691 0,2.0883657 0.6504662,4.108272 2.1568335,5.5803938 m 6.4705368,-9.5174854 1.06128786,0 c 0.78741833,0 1.81449424,0 2.94427114,1.0613116 0.5819589,0.5819628 1.8487042,2.054128 1.8487042,4.108264 0,2.0883677 -1.3351791,3.2865982 -2.7046017,3.2865982 -1.16400474,0 -2.43071645,-0.7874124 -2.9100237,-2.7388414 C -1.6102893,5.80653 -1.5075368,3.7181643 -1.5075368,2.0748603 l 0,-0.547747" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3760"
+         style="fill:#008000;fill-opacity:1;-inkscape-font-specification:Inconsolata Bold"
+         d="m -10.134917,30.444184 c 0,3.731685 2.6703725,7.18948 8.3534731,7.18948 5.2380272,0 8.011126,-3.252384 8.011126,-7.497595 0,-2.25954 -0.821652,-4.279442 -2.4307303,-5.614629 l -1.335185,1.369422 c 1.1640106,0.992825 1.7802546,2.499188 1.7802546,4.039801 0,2.088366 -1.1640186,5.135326 -5.8542751,5.3065 l 0,-11.092322 c -1.0613115,-0.102744 -2.0883934,-0.06842 -2.9785088,0.102745 -4.210973,0.718955 -5.5461545,3.628986 -5.5461545,6.196641 m 6.6416998,4.724512 c -3.6974499,-0.513525 -4.7587476,-2.875782 -4.7587476,-4.553317 0,-2.533438 2.2253083,-4.34793 4.7587476,-4.039797 l 0,8.593114" />
+      <rect
+         style="fill:#008000;fill-opacity:1;stroke:none"
+         id="rect4053"
+         width="1.589739"
+         height="9.4677792"
+         x="-52.725357"
+         y="0.15318967"
+         transform="matrix(0,-1,1,0,0,0)" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#008000;fill-opacity:1;stroke:none"
+         id="path4055"
+         sodipodi:cx="211.94649"
+         sodipodi:cy="186.10309"
+         sodipodi:rx="0.84869117"
+         sodipodi:ry="0.84869117"
+         d="m 212.79518,186.10309 a 0.84869117,0.84869117 0 1 1 -1.69738,0 0.84869117,0.84869117 0 1 1 1.69738,0 z"
+         transform="matrix(2.5290171,0,0,2.5290171,-495.62359,-430.69013)" />
+      <path
+         transform="matrix(3.653756,0,0,3.653756,-736.57027,-643.39005)"
+         d="m 212.79518,186.10309 a 0.84869117,0.84869117 0 1 1 -1.69738,0 0.84869117,0.84869117 0 1 1 1.69738,0 z"
+         sodipodi:ry="0.84869117"
+         sodipodi:rx="0.84869117"
+         sodipodi:cy="186.10309"
+         sodipodi:cx="211.94649"
+         id="path4057"
+         style="fill:#008000;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#008000;fill-opacity:1;stroke:none"
+         id="path4059"
+         sodipodi:cx="211.94649"
+         sodipodi:cy="186.10309"
+         sodipodi:rx="0.84869117"
+         sodipodi:ry="0.84869117"
+         d="m 212.79518,186.10309 a 0.84869117,0.84869117 0 1 1 -1.69738,0 0.84869117,0.84869117 0 1 1 1.69738,0 z"
+         transform="matrix(5.5480531,0,0,5.5480531,-1139.6676,-1001.2072)" />
+      <path
+         transform="matrix(7.6199405,0,0,7.6199405,-1582.6654,-1392.9713)"
+         d="m 212.79518,186.10309 a 0.84869117,0.84869117 0 1 1 -1.69738,0 0.84869117,0.84869117 0 1 1 1.69738,0 z"
+         sodipodi:ry="0.84869117"
+         sodipodi:rx="0.84869117"
+         sodipodi:cy="186.10309"
+         sodipodi:cx="211.94649"
+         id="path4061"
+         style="fill:#008000;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#008000;fill-opacity:1;stroke:none"
+         id="path4063"
+         sodipodi:cx="211.94649"
+         sodipodi:cy="186.10309"
+         sodipodi:rx="0.84869117"
+         sodipodi:ry="0.84869117"
+         d="m 212.79518,186.10309 a 0.84869117,0.84869117 0 1 1 -1.69738,0 0.84869117,0.84869117 0 1 1 1.69738,0 z"
+         transform="matrix(8.9814665,0,0,8.9814665,-1877.5161,-1650.7263)" />
+      <path
+         transform="matrix(10.816567,0,0,11.763715,-2273.4425,-2169.265)"
+         d="m 212.79518,186.10309 a 0.84869117,0.84869117 0 1 1 -1.69738,0 0.84869117,0.84869117 0 1 1 1.69738,0 z"
+         sodipodi:ry="0.84869117"
+         sodipodi:rx="0.84869117"
+         sodipodi:cy="186.10309"
+         sodipodi:cx="211.94649"
+         id="path4065"
+         style="fill:#008000;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <image
+         y="12.175755"
+         x="-29.196436"
+         id="image4126"
+         xlink:href="file:///home/niels/www/nohi/static/snails.png"
+         height="16.182295"
+         width="16.605799"
+         transform="matrix(0,-1,1,0,0,0)" />
+    </g>
+  </g>
+</svg>
diff --git a/extra/feedlogo.png b/extra/feedlogo.png
new file mode 100644
index 0000000..922b1c8
Binary files /dev/null and b/extra/feedlogo.png differ
diff --git a/extra/feedlogo.svg b/extra/feedlogo.svg
new file mode 100644
index 0000000..e372e3e
--- /dev/null
+++ b/extra/feedlogo.svg
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="512"
+   height="256"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="feedlogo.svg"
+   inkscape:export-filename="/home/niels/www/nohi/extra/feedlogo.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3824">
+      <stop
+         id="stop3826"
+         offset="0"
+         style="stop-color:#ff0000;stop-opacity:0.39215687;" />
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0.5"
+         id="stop3840" />
+      <stop
+         id="stop3828"
+         offset="1"
+         style="stop-color:#ff0000;stop-opacity:0.39215687;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.2792969"
+     inkscape:cx="256"
+     inkscape:cy="128"
+     inkscape:document-units="px"
+     inkscape:current-layer="g3058"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="1024"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3058"
+       transform="matrix(0,9.0395728,-9.0395728,0,489.88186,164.83878)">
+      <image
+         y="-14.935645"
+         x="-23.382669"
+         id="image3171"
+         xlink:href="file:///home/niels/www/nohi/static/snails.png"
+         height="19.649628"
+         width="20.163876"
+         transform="matrix(0,-1,1,0,0,0)" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3758"
+         style="fill:#008000;fill-opacity:1;-inkscape-font-specification:Inconsolata Bold"
+         d="m 8.3161804,52.656161 0,-1.166668 -16.0453572,0 c -1.1611881,0 -2.2168071,-0.0353 -3.4835402,-0.265148 -1.583441,-0.28283 -2.216801,-0.636362 -2.216801,-0.972218 0,-0.282831 0.527869,-0.601014 1.847336,-0.742428 1.00282,-0.106058 2.1640226,-0.08838 3.166854,-0.08838 l 16.7315084,0 0,-1.18434 -15.9398121,0 c -1.2667332,0 -2.2695617,-0.03532 -3.8002173,-0.335858 -0.633433,-0.141415 -2.164011,-0.441919 -2.164011,-0.936869 0,-0.265147 0.475088,-0.512627 1.372308,-0.636363 1.00282,-0.159092 2.3751432,-0.123738 3.4835198,-0.123738 l 17.1010001,0 0,-1.202019 -17.1537637,0 c -2.0056722,0 -4.0113622,-0.01771 -5.6475542,0.335865 -1.372287,0.3005 -1.900103,0.813126 -1.900103,1.255048 0,0.777776 1.372303,1.502523 3.483544,1.820702 -2.005696,0.123739 -3.483544,0.689399 -3.483544,1.414148 0,0.671711 1.266728,1.290402 2.955716,1.661607 l -2.375136,-0.01771 0,1.184339 24.0680534,0" />
+      <path
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3772"
+         style="fill:#008000;fill-opacity:1;-inkscape-font-specification:Inconsolata Bold"
+         d="m 2.6104019,3.662785 0.745172,0 0,-1.389316 4.306869,0 0,50.381955 0.71992,0.0053 0,-52.660724 -0.71992,0 0,1.351414 -5.052041,0 0,2.31132" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3762"
+         style="fill:#008000;fill-opacity:1;-inkscape-font-specification:Inconsolata Bold"
+         d="m -15.798134,35.856867 5.055354,0.123883 0,1.500374 2.4249234,0.01373 0,-1.472851 c 3.2058437,0.08256 6.4117023,0.123883 9.5764213,0.123883 1.6851279,0 3.5757595,0 5.1375761,-0.371652 1.2330225,-0.302822 1.9728271,-0.7846 1.9728271,-1.431552 0,-0.743304 -0.9453113,-1.472843 -2.0961324,-2.009677 l -2.3427129,0.302838 c 1.1918949,0.536825 1.7262136,1.032368 1.7262136,1.417787 0,0.468005 -0.7809053,0.949775 -3.0414437,1.059893 -0.1645523,0 -0.8631068,0.04128 -3.6168512,0.04128 -2.4249145,0 -4.8909655,-0.04128 -7.3158979,-0.123883 l 0,-2.064741 -2.4660244,0 0,2.050975 c 0,0 -3.370256,-0.09636 -4.438869,-0.165184 -0.411029,-0.01373 -0.657621,-0.123883 -1.10972,-0.06883 l 0.534348,1.073668" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3766"
+         style="fill:#008000;fill-opacity:1;-inkscape-font-specification:Inconsolata Bold;stroke:none;stroke-opacity:1;stroke-width:0.22124938999999999;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 8.3689679,24.792207 0,-1.293165 -4.658939,0 c -0.531442,0 -0.938882,-0.0709 -1.381747,-0.407431 -0.407432,-0.301147 -1.133736,-1.080591 -1.133736,-1.930898 0,-0.407436 0.177168,-0.814869 0.513732,-1.098302 0.531439,-0.442871 1.2223,-0.442871 1.789171,-0.442871 l 4.871519,0 0,-1.257737 -4.906949,0 0,0 c -0.620005,0 -1.293167,0 -1.948608,0.283433 -0.90343802,0.40744 -1.41716402,1.24002 -1.41716402,2.161183 0,1.098311 0.708579,2.090326 1.61203102,2.692623 l -1.41717002,0 0,1.293165 8.07786002,0" />
+      <path
+         d="m 4.2412449,10.332633 c -2.728791,0 -4.14499802,1.727089 -4.14499802,3.523256 0,2.003411 1.72707602,3.730494 4.17953302,3.730494 2.400638,0 4.093188,-1.709815 4.093188,-3.695957 0,-1.865249 -1.502566,-3.557793 -4.127723,-3.557793 m -3.091479,3.609608 c 0,-1.139877 0.98444,-2.348834 3.143288,-2.348834 1.986143,0 2.987852,1.139872 2.987852,2.279749 0,1.260767 -1.17441,2.400642 -3.126022,2.400642 -1.934331,0 -3.005118,-1.1226 -3.005118,-2.331557"
+         style="fill:#008000;fill-opacity:1;-inkscape-font-specification:Inconsolata Bold;stroke:none;stroke-opacity:1;stroke-width:0.22124938999999999;stroke-miterlimit:4;stroke-dasharray:none"
+         id="path3903"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(0,-1.1581814,1.1581814,0,-214.5582,247.4486)"
+         d="m 212.79518,186.10309 c 0,0.46872 -0.37997,0.84869 -0.84869,0.84869 -0.46872,0 -0.84869,-0.37997 -0.84869,-0.84869 0,-0.46872 0.37997,-0.84869 0.84869,-0.84869 0.46872,0 0.84869,0.37997 0.84869,0.84869 z"
+         sodipodi:ry="0.84869117"
+         sodipodi:rx="0.84869117"
+         sodipodi:cy="186.10309"
+         sodipodi:cx="211.94649"
+         id="path3818"
+         style="fill:#008000;fill-opacity:1;stroke:none;stroke-opacity:1;stroke-width:0.19103173000000001;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3770"
+         style="fill:#008000;fill-opacity:1;-inkscape-font-specification:Inconsolata Bold;stroke:none;stroke-opacity:1;stroke-width:0.22124938999999999;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 8.3441519,9.211831 0,-0.921964 -3.276694,0 c -0.37377,0 -0.66033,-0.03738 -0.971798,-0.274105 -0.286569,-0.224255 -0.797373,-0.772459 -0.797373,-1.370487 0,-0.286569 0.124606,-0.573106 0.361307,-0.772448 0.373772,-0.311494 0.859667,-0.311494 1.258345,-0.311494 l 3.426209,0 0,-0.884587 -3.451126,0 0,0 c -0.436062,0 -0.909494,0.01247 -1.370478,0.211785 -0.635409,0.286531 -0.996712,0.859657 -0.996712,1.507527 0,0.772449 0.498356,1.482606 1.133762,1.893753 l -3.30161502,0 c -0.03737,0 -0.07478,0 -0.112128,-0.03738 -0.03738,-0.03738 -0.07478,-0.08719 -0.137042,-0.08719 -0.01247,0 -0.02489,0 -0.03738,0.01247 l 0,1.034092 8.27272102,0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3764"
+         style="fill:#008000;fill-opacity:1;-inkscape-font-specification:Inconsolata Bold"
+         d="m -13.076837,31.225353 2.377119,-0.605745 c -2.01537,-0.657664 -2.635497,-1.540313 -2.635497,-2.284511 0,-0.934577 1.188557,-1.401871 2.273772,-1.626858 1.2919072,-0.259604 2.8422073,-0.242306 4.0824437,-0.242306 l 0.8267984,0 0,0.242306 c 0,1.176872 0,2.422973 1.085248,3.426778 1.343587,1.246098 4.1341235,1.799921 6.7179529,1.799921 3.4623494,0 6.7179679,-1.003801 6.7179679,-2.647964 0,-0.969186 -1.0852539,-1.972987 -3.2039506,-2.838339 l 2.5838204,0 0,-1.176873 -14.6244864,0 c -1.9120285,0 -3.7206913,0.01738 -5.5810553,0.380754 -2.53217,0.519204 -3.875749,1.523009 -3.875749,2.751806 0,1.055722 0.981841,2.076836 3.255616,2.821031 m 9.7669032,-4.811331 1.6019529,0 c 1.18856266,0 2.7388746,0 4.444208,0.53652 0.8784334,0.294197 2.7905126,1.038414 2.7905126,2.076832 0,1.055723 -2.015376,1.661459 -4.0824408,1.661459 -1.75699813,0 -3.6690266,-0.398057 -4.3925133,-1.384554 -0.5168035,-0.726891 -0.3617045,-1.782613 -0.3617045,-2.613345 l 0,-0.2769" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3760"
+         style="fill:#008000;fill-opacity:1;-inkscape-font-specification:Inconsolata Bold"
+         d="m -16.332453,41.032349 c 0,1.886462 4.030774,3.634465 12.6090871,3.634465 7.9065007,0 12.0923338,-1.644163 12.0923338,-3.790225 0,-1.142255 -1.2402365,-2.163367 -3.6690475,-2.838338 l -2.015385,0.692278 c 1.7570071,0.501898 2.6871919,1.263403 2.6871919,2.042222 0,1.055722 -1.757019,2.596038 -8.8366914,2.682571 l 0,-5.607451 c -1.6019888,-0.05194 -3.1523098,-0.03459 -4.4958878,0.05194 -6.3562211,0.36345 -8.3716011,1.834545 -8.3716011,3.13256 m 10.0252636,2.388361 c -5.5810876,-0.2596 -7.1830556,-1.453781 -7.1830556,-2.301818 0,-1.280717 3.358975,-2.197989 7.1830556,-2.04222 l 0,4.344038" />
+    </g>
+  </g>
+</svg>
diff --git a/prestatic/screen.css b/prestatic/screen.css
index 8ac7378..feb1022 100644
--- a/prestatic/screen.css
+++ b/prestatic/screen.css
@@ -84,6 +84,11 @@ body {
     color: #fff;
 }
 
+#metadata li {
+    display: inline;
+    list-style: none;
+}
+
 #logo {
     margin-top: 10px;
     background: #111111;
diff --git a/prestatic/template.html b/prestatic/template.html
index 891d352..9880ddd 100644
--- a/prestatic/template.html
+++ b/prestatic/template.html
@@ -62,10 +62,11 @@ for x in('projects', 'writings', 'films', 'about'):
     print(' ' * 14 + "<li><a href='/{x}/'>{x}</a></li>".format(x=x))@-->
       </ul>
     </div>
-    <div id='body'<!--@exec if page.fullpage: print(" class='full'", end='')@-->>
+    <div id='body'<!--@exec if page.is_fullpage: print(" class='full'", end='')@-->>
+<!--@eval page.toc_html if page.has_toc else ''@-->
 <!--@eval run_macros(page.body)@-->
       <div id='metadata'>
-<!--@eval page.metadata_info@-->
+<!--@eval page.metadata_html@-->
       </div>
       </div>
       <div id='logo'>
diff --git a/site/projects/mege/test.org b/site/projects/mege/test.org
index 552ca45..239af3b 100644
--- a/site/projects/mege/test.org
+++ b/site/projects/mege/test.org
@@ -4,10 +4,10 @@
 *mege* has many features. A bit /too/ many, perhaps.
 
 ** Lists
-10. [@10]Starting at 10
-11. ABC
-40. [@40]Going to 40
-41. 2+2=4
+
++ A
++ B
++ C
 
 Another list:
 
@@ -19,5 +19,17 @@ Another list:
      1) and so on
      2) etc...
 
+** Definition lists
++ Lizard :: an animal
++ Ape :: also an animal
++ Book :: not an animal
 
+* Org features not supported by mege
 
+** In lists
+#+BEGIN_SRC
+10. [@10]Starting at 10
+11. ABC
+40. [@40]Going to 40
+41. 2+2=4
+#+END_SRC