diff --git a/base/favicon.ico b/base/favicon.ico
deleted file mode 100644
index b55eba2..0000000
Binary files a/base/favicon.ico and /dev/null differ
diff --git a/base/ikiwiki.mdwn b/base/ikiwiki.mdwn
deleted file mode 100644
index 4d84069..0000000
--- a/base/ikiwiki.mdwn
+++ /dev/null
@@ -1,17 +0,0 @@
-[[!meta robots="noindex, follow"]]
-This wiki is powered by [ikiwiki](http://ikiwiki.info/).
-[[!if test="enabled(version)"
-     then="(Currently running version [[!version ]].)"
-]]
-
-Some documentation on using ikiwiki:
-
-* [[ikiwiki/formatting]]
-* [[ikiwiki/wikilink]]
-* [[ikiwiki/subpage]]
-* [[ikiwiki/pagespec]]
-* [[ikiwiki/directive]]
-* [[ikiwiki/markdown]]
-* [[ikiwiki/openid]]
-* [[ikiwiki/searching]]
-* [[templates]]
diff --git a/base/ikiwiki/directive.mdwn b/base/ikiwiki/directive.mdwn
deleted file mode 100644
index 1dc1e51..0000000
--- a/base/ikiwiki/directive.mdwn
+++ /dev/null
@@ -1,56 +0,0 @@
-[[!meta robots="noindex, follow"]]
-Directives are similar to a [[ikiwiki/WikiLink]] in form, except they
-begin with `!` and may contain parameters. The general form is:
-
-	\[[!directive param="value" param="value"]]
-
-This gets expanded before the rest of the page is processed, and can be used
-to transform the page in various ways.
-
-The quotes around values can be omitted if the value is a simple word.
-Also, some directives may use parameters without values, for example:
-
-	\[[!tag foo]]
-
-A directive does not need to all be on one line, it can be
-wrapped to multiple lines if you like:
-	
-	\[[!directive foo="baldersnatch"
-	bar="supercalifragilisticexpialidocious" baz=11]]
-
-Also, multiple lines of *quoted* text can be used for a value.
-To allow quote marks inside the quoted text, delimit the block
-of text with triple-double-quotes or triple-single-quotes:
-
-	\[[!directive text="""
-	1. "foo"
-	2. "bar"
-	3. "baz"
-	""" othertext='''
-	1. 'quux'
-	2. "foo"
-	''']]
-
-If you want to put text with triple quotes into a parameter value, you can
-use perl-style here-doc syntax, even nesting it like this:
-
-	\[[!directive text=<<OUTER
-	[[!otherdirective <<INNER
-	inner text
-	INNER]]
-	outer text
-	OUTER]]
-
-ikiwiki also has an older syntax for directives, which requires a space in
-directives to distinguish them from [[wikilinks|ikiwiki/wikilink]]. This
-syntax has several disadvantages: it requires a space after directives with
-no parameters (such as `\[[pagecount ]]`), and it prohibits spaces in
-[[wikilinks|ikiwiki/wikilink]].  ikiwiki now provides the `!`-prefixed
-syntax shown above as default.  However, ikiwiki still supports wikis using
-the older syntax, if the `prefix_directives` option is disabled.
-
-[[!if test="enabled(listdirectives)" then="""
-Here is a list of currently available directives in this wiki:
-
-[[!listdirectives ]]
-"""]]
diff --git a/base/ikiwiki/formatting.mdwn b/base/ikiwiki/formatting.mdwn
deleted file mode 100644
index befbce9..0000000
--- a/base/ikiwiki/formatting.mdwn
+++ /dev/null
@@ -1,106 +0,0 @@
-[[!meta title="Formatting wiki pages"]]
-[[!meta robots="noindex, follow"]]
-
-Text on this wiki is, by default, written in a form very close to how you
-might write text for an email message. This style of text formatting is
-called [[MarkDown]], and it works like this:
-
-Leave blank lines between paragraphs.
-
-You can *\*emphasise\** or **\*\*strongly emphasise\*\*** text by placing it
-in single or double asterisks.
-
-To create a list, start each line with an asterisk:
-
-* "* this is my list"
-* "* another item"
-
-To make a numbered list, start each line with a number (any number will
-do) followed by a period:
-
-1. "1. first line"
-2. "2. second line"
-2. "2. third line"
-
-To create a header, start a line with one or more `#` characters followed
-by a space and the header text. The number of `#` characters controls the
-size of the header:
-
-# # h1
-## ## h2
-### ### h3
-#### #### h4
-##### ##### h5
-###### ###### h6
-
-To create a horizontal rule, just write three or more dashes or stars on
-their own line:
-
-----
-
-To quote someone, prefix the quote with ">":
-
-> To be or not to be,
-> that is the question.
-
-To write a code block, indent each line with a tab or 4 spaces:
-
-	10 PRINT "Hello, world!"
-	20 GOTO 10
-
-To link to an url or email address, you can just put the
-url in angle brackets: <<http://ikiwiki.info>>, or you can use the
-form \[link text\]\(url\)
-
-----
-
-In addition to basic html formatting using [[MarkDown]], this wiki lets
-you use the following additional features:
-
-* To link to another page on the wiki, place the page's name inside double
-  square brackets. So you would use `\[[WikiLink]]` to link to [[WikiLink]].
-
-[[!if test="enabled(smiley) and smileys" then="""
-* Insert [[smileys]] and some other useful symbols. :-)
-"""]]
-
-[[!if test="enabled(shortcut) and shortcuts" then="""
-* Use [[shortcuts]] to link to common resources.
-
-	\[[!wikipedia War\_of\_1812]]
-"""]]
-
-[[!if test="enabled(template) and templates" then="""
-* Create and fill out [[templates]] for repeated chunks of
-  parameterized wiki text.
-"""]]
-
-* Insert various [[directives|directive]] onto a page to perform useful
-  actions.
-[[!if test="enabled(toc) or enabled(meta) or enabled(inline)" then="""
-  For example, you can:
-"""]]
-
-[[!if test="enabled(toc)" then="""
-  * Add a table of contents to a page:
-
-	\[[!toc]]
-"""]]
-
-
-[[!if test="enabled(meta)" then="""
-  * Change the title of a page:
-
-	\[[!meta title="full page title"]]
-"""]]
-
-[[!if test="enabled(inline)" then="""
-  * Create a blog by inlining a set of pages:
-
-	\[[!inline pages="blog/*"]]
-"""]]
-
-[[!if test="enabled(listdirectives)" then="""
-  Full list of [[directives|directive]] enabled for this wiki:
-  [[!listdirectives ]]
-"""]]
diff --git a/base/ikiwiki/markdown.mdwn b/base/ikiwiki/markdown.mdwn
deleted file mode 100644
index 6841919..0000000
--- a/base/ikiwiki/markdown.mdwn
+++ /dev/null
@@ -1,11 +0,0 @@
-[[!meta robots="noindex, follow"]]
-[Markdown](http://daringfireball.net/projects/markdown/)
-is a minimal markup language that resembles plain text as used in
-email messages. It is the markup language used by this wiki by default.
-
-For documentation about the markdown syntax, see [[formatting]] and
-[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax).
-
-Note that [[WikiLinks|WikiLink]] and [[directives|directive]] are not part
-of the markdown syntax, and are the only bit of markup that this wiki
-handles internally.
diff --git a/base/ikiwiki/openid.mdwn b/base/ikiwiki/openid.mdwn
deleted file mode 100644
index 2fa972e..0000000
--- a/base/ikiwiki/openid.mdwn
+++ /dev/null
@@ -1,28 +0,0 @@
-[[!meta title="OpenID"]]
-[[!meta robots="noindex, follow"]]
-
-[[!if test="enabled(openid)"
-     then="This wiki has OpenID **enabled**."
-     else="This wiki has OpenID **disabled**."]]
-
-[OpenID](http://openid.net) is a decentralized authentication mechanism
-that allows you to have one login that you can use on a growing number of
-websites.
-
-If you have an account with some of the larger web service providers,
-you might already have an OpenID. 
-[Directory of OpenID providers](http://openiddirectory.com/openid-providers-c-1.html)
-
-[[!if test="enabled(openid)" then="""
-To sign in to this wiki using OpenID, just enter it in the OpenID field in the
-signin form. You do not need to give this wiki a password or go through any
-registration process when using OpenID.
-"""]]
-
----
-
-It's also possible to make a page in the wiki usable as an OpenID url,
-by delegating it to an openid server. Here's an example of how to do that:
-
-	\[[!meta openid="http://yourid.myopenid.com/"
-	       server="http://www.myopenid.com/server"]]
diff --git a/base/ikiwiki/pagespec.mdwn b/base/ikiwiki/pagespec.mdwn
deleted file mode 100644
index 59a0506..0000000
--- a/base/ikiwiki/pagespec.mdwn
+++ /dev/null
@@ -1,90 +0,0 @@
-[[!meta robots="noindex, follow"]]
-To select a set of pages, such as pages that are locked, pages
-whose commit emails you want subscribe to, or pages to combine into a
-blog, the wiki uses a PageSpec. This is an expression that matches
-a set of pages.
-
-The simplest PageSpec is a simple list of pages. For example, this matches
-any of the three listed pages:
-
-	foo or bar or baz
-
-More often you will want to match any pages that have a particular thing in
-their name. You can do this using a glob pattern. "`*`" stands for any part
-of a page name, and "`?`" for any single letter of a page name. So this
-matches all pages about music, and any [[SubPage]]s of the SandBox, but does
-not match the SandBox itself:
-
-	*music* or SandBox/*
-
-You can also prefix an item with "`!`" to skip pages that match it. So to
-match all pages except for Discussion pages and the SandBox:
-
-	* and !SandBox and !*/Discussion
-
-Some more elaborate limits can be added to what matches using these functions:
-
-* "`glob(someglob)`" - matches pages and other files that match the given glob.
-  Just writing the glob by itself is actually a shorthand for this function.
-* "`page(glob)`" - like `glob()`, but only matches pages, not other files
-* "`link(page)`" - matches only pages that link to a given page (or glob)
-* "`tagged(tag)`" - matches pages that are tagged or link to the given tag (or
-  tags matched by a glob)
-* "`backlink(page)`" - matches only pages that a given page links to
-* "`creation_month(month)`" - matches only files created on the given month
-  number
-* "`creation_day(mday)`" - or day of the month
-* "`creation_year(year)`" - or year
-* "`created_after(page)`" - matches only files created after the given page
-  was created
-* "`created_before(page)`" - matches only files created before the given page
-  was created
-* "`internal(glob)`" - like `glob()`, but matches even internal-use 
-  pages that globs do not usually match.
-* "`title(glob)`", "`author(glob)`", "`authorurl(glob)`",
-  "`license(glob)`", "`copyright(glob)`", "`guid(glob)`" 
-  - match pages that have the given metadata, matching the specified glob.
-* "`user(username)`" - tests whether a modification is being made by a
-  user with the specified username. If openid is enabled, an openid can also
-  be put here. Glob patterns can be used in the username. For example, 
-  to match all openid users, use `user(*://*)`
-* "`admin()`" - tests whether a modification is being made by one of the
-  wiki admins.
-* "`ip(address)`" - tests whether a modification is being made from the
-  specified IP address. Glob patterns can be used in the address. For
-  example, `ip(127.0.0.*)`
-* "`comment(glob)`" - matches comments to a page matching the glob.
-* "`comment_pending(glob)`" - matches unmoderated, pending comments.
-* "`postcomment(glob)`" - matches only when comments are being 
-  posted to a page matching the specified glob
-
-For example, to match all pages in a blog that link to the page about music
-and were written in 2005:
-
-	blog/* and link(music) and creation_year(2005)
-
-Note the use of "and" in the above example, that means that only pages that
-match each of the three expressions match the whole. Use "and" when you
-want to combine expression like that; "or" when it's enough for a page to
-match one expression. Note that it doesn't make sense to say "index and
-SandBox", since no page can match both expressions.
-
-If you want to include only one level of subpages, you can use
-
-    blog/* and !blog/*/*
-
-More complex expressions can also be created, by using parentheses for
-grouping. For example, to match pages in a blog that are tagged with either
-of two tags, use:
-
-	blog/* and (tagged(foo) or tagged(bar))
-
-Note that page names in PageSpecs are matched against the absolute
-filenames of the pages in the wiki, so a pagespec "foo" used on page
-"a/b" will not match a page named "a/foo" or "a/b/foo". To match
-relative to the directory of the page containing the pagespec, you can
-use "./". For example, "./foo" on page "a/b" matches page "a/foo".
-
-To indicate the name of the page the PageSpec is used in, you can
-use a single dot. For example, `link(.)` matches all the pages
-linking to the page containing the PageSpec.
diff --git a/base/ikiwiki/pagespec/attachment.mdwn b/base/ikiwiki/pagespec/attachment.mdwn
deleted file mode 100644
index 868fb23..0000000
--- a/base/ikiwiki/pagespec/attachment.mdwn
+++ /dev/null
@@ -1,38 +0,0 @@
-[[!meta robots="noindex, follow"]]
-[[!if test="enabled(attachment)"
-     then="This wiki has attachments **enabled**."
-     else="This wiki has attachments **disabled**."]]
-
-If attachments are enabled, the wiki admin can control what types of
-attachments will be accepted, via the `allowed_attachments`
-configuration setting.
-
-For example, to limit most users to uploading small images, and nothing else,
-while allowing larger mp3 files to be uploaded by joey into a specific
-directory, and check all attachments for viruses, something like this could be
-used:
-  
-	virusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or ((mimetype(image/jpeg) or mimetype(image/png)) and maxsize(50kb)))
-
-The regular [[ikiwiki/PageSpec]] syntax is expanded with the following
-additional tests:
-
-* "`maxsize(size)`" - tests whether the attachment is no larger than the
-  specified size. The size defaults to being in bytes, but "kb", "mb", "gb"
-  etc can be used to specify the units.
-  
-* "`minsize(size)`" - tests whether the attachment is no smaller than the
-  specified size.
-
-* "`ispage()`" - tests whether the attachment will be treated by ikiwiki as a
-  wiki page. (Ie, if it has an extension of ".mdwn", or of any other enabled
-  page format).
-
-  So, if you don't want to allow wiki pages to be uploaded as attachments,
-  use `!ispage()` ; if you only want to allow wiki pages to be uploaded
-  as attachments, use `ispage()`.
-
-* "`mimetype(foo/bar)`" - checks the MIME type of the attachment. You can
-  include a glob in the type, for example `mimetype(image/*)`.
-
-* "`virusfree()`" - checks the attachment with an antiviral program.
diff --git a/base/ikiwiki/pagespec/po.mdwn b/base/ikiwiki/pagespec/po.mdwn
deleted file mode 100644
index f995640..0000000
--- a/base/ikiwiki/pagespec/po.mdwn
+++ /dev/null
@@ -1,23 +0,0 @@
-[[!if test="enabled(po)"
-     then="This wiki has po support **enabled**."
-     else="This wiki has po support **disabled**."]]
-
-If the [[!iki plugins/po desc=po]] plugin is enabled, the regular
-[[ikiwiki/PageSpec]] syntax is expanded with the following additional
-tests that can be used to improve user navigation in a multi-lingual
-wiki:
-
-* "`lang(LL)`" - tests whether a page is written in the language
-  specified as a ISO639-1 (two-letter) language code.
-* "`currentlang()`" - tests whether a page is written in the same
-  language as the current page.
-* "`needstranslation()`" - tests whether a page needs translation
-  work. Only slave pages match this PageSpec. A minimum target
-  translation percentage can optionally be passed as an integer
-  parameter: "`needstranslation(50)`" matches only pages less than 50%
-  translated.
-
-Note that every non-po page is considered to be written in
-`po_master_language`, as specified in `ikiwiki.setup`.
-
-[[!meta robots="noindex, follow"]]
diff --git a/base/ikiwiki/pagespec/sorting.mdwn b/base/ikiwiki/pagespec/sorting.mdwn
deleted file mode 100644
index 9173ab5..0000000
--- a/base/ikiwiki/pagespec/sorting.mdwn
+++ /dev/null
@@ -1,30 +0,0 @@
-Some [[directives|ikiwiki/directive]] that use
-[[PageSpecs|ikiwiki/pagespec]] allow
-specifying the order that matching pages are shown in. The following sort
-orders can be specified using the `sort` parameter:
-
-* `age` - List pages from the most recently created to the oldest.
-
-* `mtime` - List pages with the most recently modified first.
-
-* `title` - Order by title (page name), e.g. "z/a a/b a/c"
-
-* `path` - Order by page name including parents, e.g. "a/b a/c z/a"
-[[!if test="enabled(sortnaturally)" then="""
-* `title_natural` - Orders by title, but numbers in the title are treated
-  as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
-
-* `path_natural` - Like `path`, but numbers in the title are treated as such
-"""]]
-[[!if test="enabled(meta)" then="""
-* `meta(title)` - Order according to the `\[[!meta title="foo" sortas="bar"]]`
-  or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no
-  full title was set. `meta(author)`, `meta(date)`, `meta(updated)`, etc.
-  also work.
-"""]]
-
-In addition, you can combine several sort orders and/or reverse the order of
-sorting, with a string like `age -title` (which would sort by age, then by
-title in reverse order if two pages have the same age).
-
-[[!meta robots="noindex, follow"]]
diff --git a/base/ikiwiki/searching.mdwn b/base/ikiwiki/searching.mdwn
deleted file mode 100644
index 4c12879..0000000
--- a/base/ikiwiki/searching.mdwn
+++ /dev/null
@@ -1,20 +0,0 @@
-[[!meta robots="noindex, follow"]]
-
-[[!if test="enabled(search)"
-then="This wiki has searching **enabled**."
-else="This wiki has searching **disabled**."]]
-
-If searching is enabled, you can enter search terms in the search field,
-as you'd expect. There are a few special things you can do to construct
-more powerful searches.
-
-* To match a phrase, enclose it in double quotes.
-* `AND` can be used to search for documents containing two expressions.
-* `OR` can be used to search for documents containing either one of
-  two expressions.
-* Parentheses can be used to build up complicated search expressions. For
-  example, "(foo AND bar) OR (me AND you)"
-* Prefix a search term with "-" to avoid it from appearing in the results.
-  For example, "-discussion" will omit "discussion".
-* To search for a page with a given title, use "title:foo".
-* To search for pages that contain a "bar" link, use "link:bar".
diff --git a/base/ikiwiki/subpage.mdwn b/base/ikiwiki/subpage.mdwn
deleted file mode 100644
index 862f45e..0000000
--- a/base/ikiwiki/subpage.mdwn
+++ /dev/null
@@ -1,12 +0,0 @@
-[[!meta robots="noindex, follow"]]
-ikiwiki supports placing pages in a directory hierarchy. For example,
-this page, [[SubPage]] has some related pages placed under it, like
-[[SubPage/LinkingRules]]. This is a useful way to add some order to your
-wiki rather than just having a great big directory full of pages.
-
-To add a SubPage, just make a subdirectory and put pages in it. For
-example, this page is subpage.mdwn in this wiki's source, and there is also
-a subpage subdirectory, which contains subpage/linkingrules.mdwn. Subpages
-can be nested as deeply as you'd like.
-
-Linking to and from a SubPage is explained in [[LinkingRules]].
diff --git a/base/ikiwiki/subpage/linkingrules.mdwn b/base/ikiwiki/subpage/linkingrules.mdwn
deleted file mode 100644
index e547f30..0000000
--- a/base/ikiwiki/subpage/linkingrules.mdwn
+++ /dev/null
@@ -1,33 +0,0 @@
-[[!meta robots="noindex, follow"]]
-To link to or from a [[SubPage]], you can normally use a regular
-[[WikiLink]] that does not contain the name of the parent directory of
-the [[SubPage]]. Ikiwiki descends the directory hierarchy looking for a
-page that matches your link.
-
-For example, if FooBar/SubPage links to "OtherPage", ikiwiki will first 
-prefer pointing the link to FooBar/SubPage/OtherPage if it exists, next
-to FooBar/OtherPage and finally to OtherPage in the root of the wiki.
-
-Note that this means that if a link on FooBar/SomePage to "OtherPage"
-currently links to OtherPage, in the root of the wiki, and FooBar/OtherPage
-is created, the link will _change_ to point to FooBar/OtherPage. On the
-other hand, a link from BazBar to "OtherPage" would be unchanged by this
-creation of a [[SubPage]] of FooBar.
-
-You can also specify a link that contains a directory name, like
-"FooBar/OtherPage" to more exactly specify what page to link to. This is
-the only way to link to an unrelated [[SubPage]].
-
-You can use this to, for example, to link from BazBar to "FooBar/SubPage",
-or from BazBar/SubPage to "FooBar/SubPage".
-
-You can also use "/" at the start of a link, to specify exactly which page
-to link to, when there are multiple pages with similar names and the link
-goes to the wrong page by default. For example, linking from
-"FooBar/SubPage" to  "/OtherPage" will link to the "OtherPage" in the root
-of the wiki, even if there is a "FooBar/OtherPage".
-
-Also, if the wiki is configured with a userdir, you can link to pages
-within the userdir without specifying a path to them. This is to allow for
-easy linking to a user's page in the userdir, to sign a comment. These
-links are checked for last of all.
diff --git a/base/ikiwiki/wikilink.mdwn b/base/ikiwiki/wikilink.mdwn
deleted file mode 100644
index cf3b89c..0000000
--- a/base/ikiwiki/wikilink.mdwn
+++ /dev/null
@@ -1,29 +0,0 @@
-[[!meta robots="noindex, follow"]]
-WikiLinks provide easy linking between pages of the wiki. To create a
-[[WikiLink]], just put the name of the page to link to in double brackets.
-For example `\[[WikiLink]]`.
-
-If you ever need to write something like `\[[WikiLink]]` without creating a
-wikilink, just prefix it with a `\`, like `\\[[WikiLink]]`.
-
-There are some special [[SubPage/LinkingRules]] that come into play when
-linking between [[SubPages|SubPage]].
-
-WikiLinks are matched with page names in a case-insensitive manner, so you
-don't need to worry about getting the case the same, and can capitalise
-links at the start of a sentence, and so on.
-
-It's also possible to write a WikiLink that uses something other than the page
-name as the link text. For example `\[[foo_bar|SandBox]]` links to the SandBox
-page, but the link will appear like this: [[foo_bar|SandBox]].
-
-To link to an anchor inside a page, you can use something like
-`\[[WikiLink#foo]]` .
-
-If the file linked to by a WikiLink looks like an image, it will
-be displayed inline on the page.
-
----
-
-You can also put an url in a WikiLink, to link to an external page.
-Email addresses can also be used to generate a mailto link.
diff --git a/base/index.mdwn b/base/index.mdwn
deleted file mode 100644
index 4187c11..0000000
--- a/base/index.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-Welcome to your new wiki.
-
-All wikis are supposed to have a [[SandBox]], so this one does too.
-
-----
-
-This wiki is powered by [[ikiwiki]].
diff --git a/base/recentchanges.fr.po b/base/recentchanges.fr.po
deleted file mode 100644
index 8f12155..0000000
--- a/base/recentchanges.fr.po
+++ /dev/null
@@ -1,37 +0,0 @@
-# Traduction de ikiwiki
-# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
-# This file is distributed under the same license as the PACKAGE Ikiwiki.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
-"PO-Revision-Date: 2009-08-23 09:32+0200\n"
-"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
-"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
-msgstr "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!meta title=\"RecentChanges\"]]\n"
-msgstr "[[!meta title=\"RecentChanges\"]]\n"
-
-#. type: Plain text
-msgid "Recent changes to this wiki:"
-msgstr "Dernières modifications :"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" \n"
-"template=recentchanges show=0]]\n"
-msgstr ""
-"[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" \n"
-"template=recentchanges show=0]]\n"
diff --git a/base/recentchanges.mdwn b/base/recentchanges.mdwn
deleted file mode 100644
index 3383fc7..0000000
--- a/base/recentchanges.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-[[!if test="enabled(meta)" then="""
-[[!meta title="RecentChanges"]]
-"""]]
-Recent changes to this wiki:
-
-[[!inline pages="internal(recentchanges/change_*) and !*/Discussion" 
-template=recentchanges show=0]]
diff --git a/base/sandbox.mdwn b/base/sandbox.mdwn
deleted file mode 100644
index c66534f..0000000
--- a/base/sandbox.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-This is the SandBox, a page anyone can edit to learn how to use the wiki.
-
-----
-
-Here's a paragraph.
-
-Here's another one with *emphasised* text.
-
-# Header
-
-## Subheader
-
-> This is a blockquote.
->
-> This is the first level of quoting.
->
-> > This is nested blockquote.
->
-> Back to the first level.
-
-Numbered list 
-
-1. First item.
-1. Another.
-1. And another..
-
-Bulleted list
-
-* *item*
-* item
-
-[[ikiwiki/WikiLink]]
diff --git a/base/shortcuts.fr.po b/base/shortcuts.fr.po
deleted file mode 100644
index b4755d4..0000000
--- a/base/shortcuts.fr.po
+++ /dev/null
@@ -1,266 +0,0 @@
-# Traduction de ikiwiki
-# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
-# This file is distributed under the same license as the PACKAGE Ikiwiki.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2010-03-14 22:09+0000\n"
-"PO-Revision-Date: 2010-07-16 10:39+0200\n"
-"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
-"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"[[!if test=\"enabled(shortcut)\"\n"
-"     then=\"This wiki has shortcuts **enabled**.\"\n"
-"     else=\"This wiki has shortcuts **disabled**.\"]]\n"
-msgstr ""
-"[[!if test=\"enabled(shortcut)\"\n"
-"     then=\"Les raccourcis sont **activés** dans ce wiki.\"\n"
-"     else=\"Les raccourcis sont **désactivés** dans ce wiki.\"]]\n"
-
-#. type: Plain text
-msgid "Some examples of using shortcuts include:"
-msgstr "Voici quelques exemples de raccourcis :"
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"\t\\[[!google foo]]\n"
-"\t\\[[!wikipedia War_of_1812]]\n"
-"\t\\[[!debbug 12345]]\n"
-"\tCheck the \\[[!cia ikiwiki desc=\"CIA page for %s\"]].\n"
-msgstr ""
-"\t\\[[!google foo]]\n"
-"\t\\[[!wikipedia War_of_1812]]\n"
-"\t\\[[!debbug 12345]]\n"
-"\tConsultez la \\[[!cia ikiwiki desc=\"page du projet CIA pour %s\"]].\n"
-
-#. type: Plain text
-msgid "This page controls what shortcut links the wiki supports."
-msgstr "Cette page définit les raccourcis connus par ce wiki."
-
-#. type: Bullet: '* '
-msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
-msgstr "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
-
-#. type: Bullet: '* '
-msgid "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]"
-msgstr "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]"
-
-#. type: Bullet: '* '
-msgid "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]"
-msgstr "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]"
-
-#. type: Bullet: '* '
-msgid "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
-msgstr ""
-"[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
-
-#. type: Bullet: '* '
-msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
-msgstr "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
-
-#. type: Bullet: '* '
-msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
-msgstr "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
-
-#. type: Bullet: '* '
-msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
-msgstr "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
-
-#. type: Bullet: '* '
-#| msgid ""
-#| "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s"
-#| "\"]]"
-msgid ""
-"[[!shortcut name=debbug url=\"http://bugs.debian.org/%S\" desc=\"Debian bug #"
-"%s\"]]"
-msgstr "[[!shortcut name=debbug url=\"http://bugs.debian.org/%S\" desc=\"bug #%s\"]]"
-
-#. type: Bullet: '* '
-msgid ""
-"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" desc="
-"\"debian-%s@lists.debian.org\"]]"
-msgstr ""
-"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" desc="
-"\"debian-%s@lists.debian.org\"]]"
-
-#. type: Bullet: '* '
-msgid "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]"
-msgstr "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]"
-
-#. type: Bullet: '* '
-msgid "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]"
-msgstr "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]"
-
-#. type: Bullet: '* '
-msgid "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]"
-msgstr "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]"
-
-#. type: Bullet: '* '
-msgid ""
-"[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
-msgstr ""
-"[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
-
-#. type: Bullet: '* '
-msgid ""
-"[[!shortcut name=debrt url=\"https://rt.debian.org/Ticket/Display.html?id=%s"
-"\"]]"
-msgstr ""
-"[[!shortcut name=debrt url=\"https://rt.debian.org/Ticket/Display.html?id=%s"
-"\"]]"
-
-#. type: Plain text
-#, no-wrap
-#| msgid ""
-#| "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
-#| "  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
-#| "* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
-#| "* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n"
-#| "* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n"
-#| "* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n"
-#| "* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug #%s\"]]\n"
-#| "* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n"
-#| "* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n"
-#| "* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
-#| "* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
-#| "* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n"
-#| "* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
-#| "* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
-#| "* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
-#| "* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
-#| "* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
-#| "* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
-#| "* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n"
-#| "* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
-#| "* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
-#| "* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
-#| "* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
-#| "* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
-#| "* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
-#| "* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
-#| "* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
-#| "* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
-#| "* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
-#| "* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
-#| "* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
-#| "* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
-#| "* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
-#| "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
-msgid ""
-"* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
-"  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
-"* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
-"* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n"
-"* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n"
-"* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n"
-"* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug #%s\"]]\n"
-"* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n"
-"* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n"
-"* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
-"* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
-"* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n"
-"* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
-"* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
-"* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
-"* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
-"* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
-"* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
-"* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n"
-"* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
-"* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
-"* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
-"* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
-"* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
-"* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
-"* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
-"* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
-"* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
-"* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
-"* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
-"* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
-"* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
-"* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
-"* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
-"* [[!shortcut name=cpanrt url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN RT#%s\"]]\n"
-"* [[!shortcut name=novellbug url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]\n"
-msgstr ""
-"* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
-" * Usage : `\\[[!debss package]]`, `\\[[!debss package#version]]`, ou `\\[[!debss package/version]]`. Consultez http://snapshot.debian.net pour d'autres précisions.\n"
-"* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
-"* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n"
-"* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n"
-"* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n"
-"* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\\\"Linux bug #%s\"]]\n"
-"* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n"
-"* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n"
-"* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
-"* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
-"* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n"
-"* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
-"* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
-"* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
-"* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
-"* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
-"* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
-"* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n"
-"* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
-"* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
-"* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
-"* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
-"* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
-"* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
-"* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
-"* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
-"* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
-"* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
-"* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
-"* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
-"* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
-"* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
-"* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
-"* [[!shortcut name=cpanrt url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN RT#%s\"]]\n"
-"* [[!shortcut name=novellbug url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]\n"
-
-#. type: Plain text
-msgid ""
-"To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the url, "
-"\"%s\" is replaced with the text passed to the named shortcut, after [[!"
-"wikipedia url_encoding]] it, and '%S' is replaced with the raw, non-encoded "
-"text. The optional `desc` parameter controls the description of the link."
-msgstr ""
-"Pour ajouter un raccourci, utilisez la [[ikiwiki/directive]] `shortcut`. "
-"Dans l'URL, \"%s\" est remplacé par le texte passé au raccourci, après "
-"l'avoir codé [[!\"wikipedia url_encoding]], et le \"%S\" est remplacé par le "
-"texte brut, non codé. La paramètre facultatif `desc` contrôle la description "
-"du lien."
-
-#. type: Plain text
-msgid ""
-"Remember that the `name` you give the shortcut will become a new [[ikiwiki/"
-"directive]].  Avoid using a `name` that conflicts with an existing "
-"directive.  These directives also accept a `desc` parameter that will "
-"override the one provided at definition time."
-msgstr ""
-"N'oubliez pas que le paramètre `name` donné au raccourci devient une "
-"nouvelle [[ikiwiki/directive]]. Évitez de donner un nom qui entre en conflit "
-"avec une directive existante. Ces directives acceptent aussi un paramètre "
-"`desc` qui primera celui fourni au moment de la définition du raccourci."
-
-#. type: Plain text
-msgid ""
-"If you come up with a shortcut that you think others might find useful, "
-"consider contributing it to the [shortcuts page on the ikiwiki wiki](http://"
-"ikiwiki.info/shortcuts/), so that future versions of ikiwiki will include "
-"your shortcut in the standard underlay."
-msgstr ""
-"Si vous trouvez un raccourci qui vous paraît utile, proposez-le sur la [page "
-"des raccourcis du wiki d'ikiwiki](http://ikiwiki.info/shortcuts/). Ainsi les "
-"futures versions d'ikiwiki incluront automatiquement ce raccourci."
diff --git a/base/shortcuts.mdwn b/base/shortcuts.mdwn
deleted file mode 100644
index 7d1f491..0000000
--- a/base/shortcuts.mdwn
+++ /dev/null
@@ -1,88 +0,0 @@
-[[!if test="enabled(shortcut)"
-     then="This wiki has shortcuts **enabled**."
-     else="This wiki has shortcuts **disabled**."]]
-
-Some examples of using shortcuts include:
-
-	\[[!google foo]]
-	\[[!wikipedia War_of_1812]]
-	\[[!debbug 12345]]
-	Check the \[[!google ikiwiki desc="google search for %s"]].
-
-This page controls what shortcut links the wiki supports.
-
-* [[!shortcut name=google url="https://encrypted.google.com/search?q=%s"]]
-* [[!shortcut name=archive url="http://web.archive.org/*/%S"]]
-* [[!shortcut name=gmap url="https://maps.google.com/maps?q=%s"]]
-* [[!shortcut name=gmsg url="https://groups.google.com/groups?selm=%s"]]
-* [[!shortcut name=wikipedia url="https://en.wikipedia.org/wiki/%W"]]
-* [[!shortcut name=wikitravel url="https://wikitravel.org/en/%s"]]
-* [[!shortcut name=wiktionary url="https://en.wiktionary.org/wiki/%s"]]
-* [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="Debian bug #%s"]]
-* [[!shortcut name=deblist url="https://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]]
-* [[!shortcut name=debpkg url="http://packages.debian.org/%s"]]
-* [[!shortcut name=debpkgsid url="http://packages.debian.org/sid/%s"]]
-* [[!shortcut name=debpts url="http://packages.qa.debian.org/%s"]]
-* [[!shortcut name=debmsg url="https://lists.debian.org/msgid-search/%s"]]
-* [[!shortcut name=debrt url="https://rt.debian.org/Ticket/Display.html?id=%s"]]
-* [[!shortcut name=debss url="http://snapshot.debian.org/package/%s/"]]
-  * Usage: `\[[!debss package]]` or `\[[!debss package/version]]`.  See <http://snapshot.debian.org/> for details.
-* [[!shortcut name=debwiki url="https://wiki.debian.org/%S"]]
-* [[!shortcut name=debcve url="https://security-tracker.debian.org/tracker/%S"]]
-  * also supports Debian bug numbers, packages and whatever the [security tracker](https://security-tracker.debian.org/tracker/) supports.
-* [[!shortcut name=fdobug url="https://bugs.freedesktop.org/show_bug.cgi?id=%s" desc="freedesktop.org bug #%s"]]
-* [[!shortcut name=fdolist url="http://lists.freedesktop.org/mailman/listinfo/%s" desc="%s@lists.freedesktop.org"]]
-* [[!shortcut name=gnomebug url="https://bugzilla.gnome.org/show_bug.cgi?id=%s" desc="GNOME bug #%s"]]
-* [[!shortcut name=linuxbug url="https://bugzilla.kernel.org/show_bug.cgi?id=%s" desc="Linux bug #%s"]]
-* [[!shortcut name=mozbug url="https://bugzilla.mozilla.org/show_bug.cgi?id=%s" desc="Mozilla bug #%s"]]
-* [[!shortcut name=gnulist url="https://lists.gnu.org/mailman/listinfo/%s" desc="%s@gnu.org"]]
-* [[!shortcut name=marcmsg url="http://marc.info/?i=%s"]]
-* [[!shortcut name=marclist url="http://marc.info/?l=%s"]]
-* [[!shortcut name=gmane url="http://dir.gmane.org/gmane.%s" desc="gmane.%s"]]
-* [[!shortcut name=gmanemsg url="http://mid.gmane.org/%s"]]
-* [[!shortcut name=cpan url="http://search.cpan.org/search?mode=dist&query=%s"]]
-* [[!shortcut name=ctan url="http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s"]]
-* [[!shortcut name=hoogle url="http://haskell.org/hoogle/?q=%s"]]
-* [[!shortcut name=iki url="http://ikiwiki.info/%S/"]]
-* [[!shortcut name=ljuser url="http://%s.livejournal.com/"]]
-* [[!shortcut name=rfc url="https://www.ietf.org/rfc/rfc%s.txt" desc="RFC %s"]]
-* [[!shortcut name=c2 url="http://wiki.c2.com/?%s"]]
-* [[!shortcut name=meatballwiki url="http://www.usemod.com/cgi-bin/mb.pl?%s"]]
-* [[!shortcut name=emacswiki url="http://www.emacswiki.org/cgi-bin/wiki/%s"]]
-* [[!shortcut name=haskellwiki url="http://haskell.org/haskellwiki/%s"]]
-* [[!shortcut name=dict url="http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s"]]
-* [[!shortcut name=imdb url="http://imdb.com/find?q=%s"]]
-* [[!shortcut name=gpg url="http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s"]]
-* [[!shortcut name=perldoc url="http://perldoc.perl.org/search.html?q=%s"]]
-* [[!shortcut name=whois url="http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain"]]
-* [[!shortcut name=cve url="https://cve.mitre.org/cgi-bin/cvename.cgi?name=%s"]]
-* [[!shortcut name=flickr url="https://secure.flickr.com/photos/%s"]]
-* [[!shortcut name=man url="http://manpages.debian.org/%s"]]
-* [[!shortcut name=ohloh url="https://www.ohloh.net/p/%s"]]
-* [[!shortcut name=cpanrt url="https://rt.cpan.org/Ticket/Display.html?id=%s" desc="CPAN RT#%s"]]
-* [[!shortcut name=novellbug url="https://bugzilla.novell.com/show_bug.cgi?id=%s" desc="bug %s"]]
-* [[!shortcut name=ubupkg url="http://packages.ubuntu.com/%s"]]
-* [[!shortcut name=mozillazinekb url="http://kb.mozillazine.org/%s"]]
-* [[!shortcut name=freebsdwiki url="http://wiki.freebsd.org/%s"]]
-* [[!shortcut name=hackage url="http://hackage.haskell.org/package/%s"]]
-* [[!shortcut name=pkgsrc url="http://pkgsrc.se/%S"]]
-* [[!shortcut name=doi url="http://dx.doi.org/%s" desc="doi:%s"]]
-* [[!shortcut name=arxiv url="http://arxiv.org/abs/%s" desc="arXiv:%s"]]
-
-To add a new shortcut, use the `shortcut`
-[[ikiwiki/directive]]. In the url, "%s" is replaced with the
-text passed to the named shortcut, after [[!wikipedia url_encoding]]
-it, and '%S' is replaced with the raw, non-encoded text. 
-Additionally, `%W` is replaced with the text encoded just right for
-Wikipedia. The optional `desc` parameter controls the description of
-the link.
-
-Remember that the `name` you give the shortcut will become a new
-[[ikiwiki/directive]].  Avoid using a `name` that conflicts
-with an existing directive.  These directives also accept a `desc`
-parameter that will override the one provided at definition time.
-
-If you come up with a shortcut that you think others might find useful,
-consider contributing it to the [shortcuts page on the ikiwiki
-wiki](http://ikiwiki.info/shortcuts/), so that future versions of
-ikiwiki will include your shortcut in the standard underlay.
diff --git a/base/templates.mdwn b/base/templates.mdwn
deleted file mode 100644
index 378e579..0000000
--- a/base/templates.mdwn
+++ /dev/null
@@ -1,100 +0,0 @@
-[[Ikiwiki]] uses many templates for many purposes. By editing its templates,
-you can fully customise its appearance, and avoid duplicate content.
-
-Ikiwiki uses the HTML::Template module as its template engine. This
-supports things like conditionals and loops in templates and is pretty
-easy to learn. All you really need to know to modify templates is this:
-
-* To insert the value of a template variable, use `<TMPL_VAR variable>`.
-* To make a block of text conditional on a variable being set use
-  `<TMPL_IF variable>text</TMPL_IF>`.
-* To use one block of text if a variable is set and a second if it's not,
-  use `<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`
-
-[[!if test="enabled(template) or enabled(edittemplate)" then="""
-## template pages
-
-Template pages are regular wiki pages containing a
-[[!iki ikiwiki/directive/templatebody desc="templatebody directive"]],
-used as templates for other pages. The parts of the template
-page outside the directive can be used to document it.
-"""]]
-
-[[!if test="enabled(template)" then="""
-The [[!iki ikiwiki/directive/template desc="template directive"]] allows
-template pages to be filled out and inserted into other pages in the wiki.
-"""]]
-
-[[!if test="enabled(edittemplate)" then="""
-The [[!iki ikiwiki/directive/edittemplate desc="edittemplate directive"]] can
-be used to make new pages default to containing text from a template
-page, which can be filled out as the page is edited.
-"""]]
-
-[[!if test="(enabled(template) or enabled(edittemplate))
-and enabled(inline)" then="""
-These template pages are currently available:
-
-[[!inline pages="templates/* and !*.tmpl and !templates/*/* and !*/discussion"
-feeds=no archive=yes sort=title template=titlepage
-rootpage=templates postformtext="Add a new template page named:"]]
-"""]]
-
-If the template does not contain a `templatebody` directive, the entire
-source of the page is used for the template. This is deprecated.
-
-## template files
-
-Template files are unlike template pages in that they have the extension
-`.tmpl`. Template files are used extensively by Ikiwiki to generate html.
-They can contain html that would not normally be allowed on a wiki page.
-
-Template files are located in `/usr/share/ikiwiki/templates` by default;
-the `templatedir` setting can be used to make another directory be
-searched first. Customised template files can also be placed inside the
-"templates/" directory in your wiki's source -- files placed there override
-ones in the `templatedir`.
-
-Here is a full list of the template files used:
-
-* `page.tmpl` - Used for displaying all regular wiki pages. This is the
-  key template to customise to change the look and feel of Ikiwiki.
-  [[!if test="enabled(pagetemplate)" then="""
-  (The [[!iki ikiwiki/directive/pagetemplate desc="pagetemplate directive"]]
-  can be used to make a page use a different template than `page.tmpl`.)"""]]
-* `rsspage.tmpl` - Used for generating rss feeds for blogs.
-* `rssitem.tmpl` - Used for generating individual items on rss feeds.
-* `atompage.tmpl` - Used for generating atom feeds for blogs.
-* `atomitem.tmpl` - Used for generating individual items on atom feeds.
-* `inlinepage.tmpl` - Used for displaying a post in a blog.
-* `archivepage.tmpl` - Used for listing a page in a blog archive page.
-* `titlepage.tmpl` - Used for listing a page by title in a blog archive page.
-* `microblog.tmpl` - Used for showing a microblogging post inline.
-* `blogpost.tmpl` - Used for a form to add a post to a blog (and rss/atom links)
-* `feedlink.tmpl` - Used to add rss/atom links if `blogpost.tmpl` is not used.
-* `aggregatepost.tmpl` - Used by the aggregate plugin to create
-  a page for a post.
-* `searchform.tmpl`, `googleform.tmpl` - Used by the search plugin 
-  and google plugin to add search forms to wiki pages.
-* `searchquery.tmpl` - This is a Omega template, used by the
-  search plugin.
-* `comment.tmpl` - Used by the comments plugin to display a comment.
-* `change.tmpl` - Used to create a page describing a change made to the wiki.
-* `recentchanges.tmpl` - Used for listing a change on the RecentChanges page.
-* `autoindex.tmpl` - Filled in by the autoindex plugin to make index pages.
-* `autotag.tmpl` - Filled in by the tag plugin to make tag pages.
-* `calendarmonth.tmpl`, `calendaryear.tmpl` - Used by ikiwiki-calendar to
-  make calendar archive pages.
-* `trails.tmpl` - Used by the trail plugin to generate links on each page
-  that is a member of a trail.
-* `notifyemail.tmpl` - Used by the notifymail plugin to generate mails about
-  changed pages.
-* `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,
-  `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,
-  `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,
-  `passwordmail.tmpl`, `emailauth.tmpl`, `login-selector.tmpl`, 
-  `revert.tmpl` - Parts of ikiwiki's user interface; do not normally need
-  to be customised.
-
-
-[[!meta robots="noindex, follow"]]
diff --git a/base/templates/note.mdwn b/base/templates/note.mdwn
deleted file mode 100644
index 8de7374..0000000
--- a/base/templates/note.mdwn
+++ /dev/null
@@ -1,12 +0,0 @@
-[[!templatebody <<ENDBODY
-<div class="notebox">
-<TMPL_VAR text>
-</div>
-ENDBODY]]
-
-Use this template to insert a note into a page. The note will be styled to
-float to the right of other text on the page. This template has one
-parameter:
-<ul>
-<li>`text` - the text to display in the note
-</ul>
diff --git a/base/templates/popup.mdwn b/base/templates/popup.mdwn
deleted file mode 100644
index f552bb5..0000000
--- a/base/templates/popup.mdwn
+++ /dev/null
@@ -1,17 +0,0 @@
-Use this template to create a popup window that is displayed when the mouse
-is over part of the page. This template has two parameters:
-<ul>
-<li>`mouseover` - This is the text or other content that triggers the
-popup.
-<li>`popup` - This should be the content of the popup window. It can be
-anything, even images or a whole little wiki page, but should not be too
-large for good usability.
-</ul>
-Note that browsers that do not support the CSS will display the popup
-inline in the page, inside square brackets.
-
-[[!templatebody <<ENDBODY
-<span class="popup"><TMPL_VAR mouseover>
-<span class="paren">[</span><span class="balloon"><TMPL_VAR popup></span><span class="paren">]</span>
-</span>
-ENDBODY]]
diff --git a/base/wikiicons/diff.png b/base/wikiicons/diff.png
deleted file mode 100644
index 0b98d79..0000000
Binary files a/base/wikiicons/diff.png and /dev/null differ
diff --git a/base/wikiicons/email.png b/base/wikiicons/email.png
deleted file mode 100644
index 859251f..0000000
Binary files a/base/wikiicons/email.png and /dev/null differ
diff --git a/base/wikiicons/openidlogin-bg.gif b/base/wikiicons/openidlogin-bg.gif
deleted file mode 100644
index a3bfe10..0000000
Binary files a/base/wikiicons/openidlogin-bg.gif and /dev/null differ
diff --git a/base/wikiicons/revert.png b/base/wikiicons/revert.png
deleted file mode 100644
index c39e65c..0000000
Binary files a/base/wikiicons/revert.png and /dev/null differ
diff --git a/base/wikiicons/search-bg.gif b/base/wikiicons/search-bg.gif
deleted file mode 100644
index 02f9da4..0000000
Binary files a/base/wikiicons/search-bg.gif and /dev/null differ
diff --git a/content/contact.pot b/content/contact.pot
index 1a4bbc7..63b8944 100644
--- a/content/contact.pot
+++ b/content/contact.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-09-11 14:32-0400\n"
+"POT-Creation-Date: 2024-09-17 14:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/base/css/bootstrap.local.css b/content/css/bootstrap.local.css
similarity index 100%
rename from base/css/bootstrap.local.css
rename to content/css/bootstrap.local.css
diff --git a/base/css/local.css b/content/css/local.css
similarity index 100%
rename from base/css/local.css
rename to content/css/local.css
diff --git a/base/css/style.css b/content/css/style.css
similarity index 100%
rename from base/css/style.css
rename to content/css/style.css
diff --git a/content/favicon.ico b/content/favicon.ico
index a9487fa..b55eba2 100644
Binary files a/content/favicon.ico and b/content/favicon.ico differ
diff --git a/base/fonts/glyphicons-halflings-regular.eot b/content/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from base/fonts/glyphicons-halflings-regular.eot
rename to content/fonts/glyphicons-halflings-regular.eot
diff --git a/base/fonts/glyphicons-halflings-regular.svg b/content/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from base/fonts/glyphicons-halflings-regular.svg
rename to content/fonts/glyphicons-halflings-regular.svg
diff --git a/base/fonts/glyphicons-halflings-regular.ttf b/content/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from base/fonts/glyphicons-halflings-regular.ttf
rename to content/fonts/glyphicons-halflings-regular.ttf
diff --git a/base/fonts/glyphicons-halflings-regular.woff b/content/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from base/fonts/glyphicons-halflings-regular.woff
rename to content/fonts/glyphicons-halflings-regular.woff
diff --git a/base/fonts/glyphicons-halflings-regular.woff2 b/content/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from base/fonts/glyphicons-halflings-regular.woff2
rename to content/fonts/glyphicons-halflings-regular.woff2
diff --git a/content/footer.pot b/content/footer.pot
index 4809da6..3a94975 100644
--- a/content/footer.pot
+++ b/content/footer.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-09-11 14:32-0400\n"
+"POT-Creation-Date: 2024-09-17 14:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/base/wikiicons/languages.png b/content/images/languages.png
similarity index 100%
rename from base/wikiicons/languages.png
rename to content/images/languages.png
diff --git a/content/index.fr.po b/content/index.fr.po
index 4703683..21fc3dd 100644
--- a/content/index.fr.po
+++ b/content/index.fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ayakael.net\n"
-"POT-Creation-Date: 2024-08-11 00:05-0400\n"
+"POT-Creation-Date: 2024-09-17 14:33-0400\n"
 "PO-Revision-Date: 2024-08-11 00:05-0400\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: ayakael <antoine@ayakael.net>\n"
@@ -87,6 +87,16 @@ msgstr "Mes autres espaces"
 msgid "<a rel=\"me\" href=\"https://agora.ilot.io/@ayakael\">Mastodon</a>"
 msgstr "<a rel=\"me\" href=\"https://agora.ilot.io/@ayakael\">Mastodon</a>"
 
+#, fuzzy, no-wrap
+#~| msgid "[[!meta title=\"Home\"]]\n"
+#~ msgid "[[!meta robots=\"noindex\"]]\n"
+#~ msgstr "[[!meta title=\"Accueil\"]]\n"
+
+#, fuzzy, no-wrap
+#~| msgid "[[!meta title=\"Home\"]]\n"
+#~ msgid "[[!meta script=\"home\"]]\n"
+#~ msgstr "[[!meta title=\"Accueil\"]]\n"
+
 #~ msgid "[GitLab](https://lab.ilot.io/ayakael)"
 #~ msgstr "[GitLab](https://lab.ilot.io/ayakael)"
 
diff --git a/content/index.pot b/content/index.pot
index a6be463..302c323 100644
--- a/content/index.pot
+++ b/content/index.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-09-11 14:32-0400\n"
+"POT-Creation-Date: 2024-09-17 14:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/base/js/mastodon.js b/content/js/mastodon.js
similarity index 100%
rename from base/js/mastodon.js
rename to content/js/mastodon.js
diff --git a/content/sidebar.pot b/content/sidebar.pot
index 2200388..f3ad64f 100644
--- a/content/sidebar.pot
+++ b/content/sidebar.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-09-11 14:32-0400\n"
+"POT-Creation-Date: 2024-09-17 14:37-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/ikiwiki.setup b/ikiwiki.setup
index b9b2db9..3c1e153 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -44,6 +44,7 @@ add_plugins:
 - sidebar2
 - highlight
 - typography
+- pagetemplate
 - html
 - po
 # plugins to disable
@@ -53,8 +54,8 @@ disable_plugins:
 templatedir: ./templates
 #templatedir: /usr/share/ikiwiki/templates
 # base wiki source location
-#underlaydir: /usr/share/ikiwiki/basewiki
-underlaydir: ./base
+underlaydir: /usr/share/ikiwiki/basewiki
+#underlaydir: ./base
 # display verbose messages?
 verbose: 1
 # log to syslog?
@@ -102,7 +103,7 @@ timezone: :/etc/localtime
 # regexp of normally excluded files to include
 include: ^(\.htaccess|.*/keys/.*.asc)$
 # regexp of files that should be skipped
-#exclude: ^(*\.private|Makefile)$
+exclude: ^(tools/.*|lib/.*)$
 # specifies the characters that are allowed in source filenames
 wiki_file_chars: -[:alnum:]+/.:_
 # allow symlinks in the path leading to the srcdir (potentially insecure)
diff --git a/templates/page.tmpl b/templates/page.tmpl
index f086597..c5d9cae 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -75,7 +75,7 @@
 							<div class="collapse navbar-collapse float-end ms-1" id="navbar"> 
 								<TMPL_VAR LANG_NAME>
 			 				</div>
-							<img src="<TMPL_VAR BASEURL>wikiicons/languages.png">
+							<img src="<TMPL_VAR BASEURL>images/languages.png">
 						</button>
 						<ul class="dropdown-menu dropdown-menu-end dropdown-menu-lg-start" aria-labelledby="language-menu-top">
 							<TMPL_LOOP OTHERLANGUAGES>