diff --git a/frontends/cgi/live-build-cgi.default b/frontends/cgi/live-build-cgi.default
index 73daa586c..50ff303ab 100644
--- a/frontends/cgi/live-build-cgi.default
+++ b/frontends/cgi/live-build-cgi.default
@@ -2,7 +2,7 @@
 
 _WEBBUILD="disabled"
 
-_MODE="debian-official"
+_MODE="debian"
 
 _DEBUG="disabled"
 
diff --git a/templates/cgi/debian-unofficial/build.html b/templates/cgi/debian-unofficial/build.html
deleted file mode 100644
index 64f06cb17..000000000
--- a/templates/cgi/debian-unofficial/build.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<br />
-
-<h3>Your build 'BUILD' was recorded and will be processed soon. Depending on the options you have selected, a build attempt generally takes between 5 and 20 minutes to complete. Currently there are 'QUEUENUM' pending build(s) to be processed ahead of your request. You will be notified by email when the attempt has completed.</h3>
-
-<h3>Your build will be available at: <a href="SERVER/BUILD/">SERVER/BUILD/</a>.</h3>
-
-<fieldset>
-
-<legend><b>Options</b></legend>
-
-<b>Standard options</b>
-
-<table>
-	<tr><td>Email: </td><td>EMAIL</td></tr>
-	<tr><td>--binary-image: </td><td>LB_BINARY_IMAGES</td></tr>
-	<tr><td>--distribution: </td><td>LB_DISTRIBUTION</td></tr>
-	<tr><td>--package-lists: </td><td>LB_PACKAGE_LISTS</td></tr>
-	<tr><td>--tasks: </td><td>LB_TASKS</td><tr>
-	<tr><td>cgipackages.list.chroot: </td><td>_LB_CGIPACKAGES</td><tr>
-</table>
-
-<b>Advanced bootstrap options</b>
-
-<table>
-	<tr><td>--architectures: </td><td>LB_ARCHITECTURES</td></tr>
-	<tr><td>--bootstrap-flavour: </td><td>LB_BOOTSTRAP_FLAVOUR</td></tr>
-	<tr><td>--archive-areas: </td><td>LB_ARCHIVE_AREAS</td></tr>
-</table>
-
-<b>Advanced chroot options</b>
-
-<table>
-	<tr><td>--chroot-fileystem: </td><td>LB_CHROOT_FILESYSTEM</td></tr>
-	<tr><td>--linux-flavours: </td><td>LB_LINUX_FLAVOURS</td></tr>
-	<tr><td>--security: </td><td>LB_SECURITY</td></tr>
-</table>
-
-<b>Advanced binary options</b>
-
-<table>
-	<tr><td>--apt-indices: </td><td>LB_BINARY_INDICES</td></tr>
-	<tr><td>--bootappend-live: </td><td>LB_BOOTAPPEND_LIVE</td></tr>
-	<tr><td>--bootloader: </td><td>LB_BOOTLOADER</td></tr>
-	<tr><td>--debian-installer: </td><td>LB_DEBIAN_INSTALLER</td></tr>
-	<tr><td>--bootappend-install: </td><td>LB_BOOTAPPEND_INSTALL</td></tr>
-	<tr><td>--iso-application: </td><td>LB_ISO_APPLICATION</td></tr>
-	<tr><td>--iso-preparer: </td><td>LB_ISO_PREPARER</td></tr>
-	<tr><td>--iso-publisher: </td><td>LB_ISO_PUBLISHER</td></tr>
-	<tr><td>--iso-volume: </td><td>LB_ISO_VOLUME</td></tr>
-	<tr><td>--memtest: </td><td>LB_MEMTEST</td></tr>
-	<tr><td>--net-path: </td><td>LB_NET_ROOT_PATH</td></tr>
-	<tr><td>--net-server: </td><td>LB_NET_ROOT_SERVER</td></tr>
-</table>
-
-<b>Advanced source options</b>
-
-<table>
-	<tr><td>--source: </td><td>LB_SOURCE</td></tr>
-	<tr><td>--source-images: </td><td>LB_SOURCE_IMAGES</td></tr>
-</table>
-
-<b>Unofficial options</b>
-
-<table>
-	<tr><td>custom.bootstrap: </td><td>CUSTOM_BOOTSTRAP</td></tr>
-	<tr><td>custom.binary: </td><td>CUSTOM_BINARY</td></tr>
-</table>
-
-</fieldset>
-
-<br />
-
-<h2>Thank you for your submission.</h2>
diff --git a/templates/cgi/debian-unofficial/footer.html b/templates/cgi/debian-unofficial/footer.html
deleted file mode 100644
index 6c2ce27cb..000000000
--- a/templates/cgi/debian-unofficial/footer.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="footer">
-	<br />
-	<h2 id="subtitle">Debian Live Project <a href="mailto:debian-live@lists.debian.org">&lt;debian-live@lists.debian.org&gt;</a> &mdash; <a href="http://live.debian.net/devel/live-build">live-build</a>, version VERSION &mdash; <a href="http://live.debian.net/legal.html">Legal information</a></h2>
-	<br />
-</div>
-
-</body>
-</html>
diff --git a/templates/cgi/debian-unofficial/form.html b/templates/cgi/debian-unofficial/form.html
deleted file mode 100644
index 3483c6593..000000000
--- a/templates/cgi/debian-unofficial/form.html
+++ /dev/null
@@ -1,316 +0,0 @@
-<h3>Submit your parameters (<b>working</b> email address is required) to generate your very own Debian Live system.</h3>
-
-<form action="live-build" method="get">
-
-<fieldset>
-
-<legend><b>Options</b></legend>
-
-<table>
-	<tr>
-		<td><label for="Email">Email Address:</label> </td>
-		<td><input id="Email" name="email" maxlength="50" size="50" type="text" /></td>
-	</tr>
-</table>
-
-<span id="click_1" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(1,"<b>Standard options</b>")'>
-	<b>Standard options</b><small>&nbsp;(click to collapse)</small>
-	<br />
-</span>
-
-<div id="text_1" style='margin-left:0;display:block'>
-	<table>
-		<tr>
-			<td><label for="Binary_Images">--binary-images:</label> </td>
-			<td>
-				<select id="Binary_Images" name="binary_images" size="1">
-					<option value="iso">iso</option>
-					<option selected value="iso-hybrid">iso-hybrid</option>
-					<option value="net">net</option>
-					<option value="tar">tar</option>
-					<option value="hdd">hdd</option>
-					<option value="virtual-hdd">virtual-hdd</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="Distribution">--distribution:</label> </td>
-			<td>
-				<select id="Distribution" name="distribution" size="1">
-					<option selected value="squeeze">squeeze</option>
-					<option value="wheezy">wheezy</option>
-					<option value="sid">sid</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="Package_Lists">--package-lists:</label> </td>
-			<td>
-				<select id="Package_Lists" name="package_lists" size="1" >
-					<option value="debian-forensics">debian-forensics</option>
-					<option value="debian-junior">debian-junior</option>
-					<option value="debian-live-devel">debian-live-devel</option>
-					<option value="debian-live-pxe-server">debian-live-pxe-server</option>
-					<option value="debian-science">debian-science</option>
-					<option value="gnome">gnome</option>
-					<option value="gnome-core">gnome-core</option>
-					<option value="gnome-full">gnome-full</option>
-					<option value="gnome-junior">gnome-junior</option>
-					<option value="gnustep">gnustep</option>
-					<option value="kde">kde</option>
-					<option value="kde-core">kde-core</option>
-					<option value="kde-extra">kde-extra</option>
-					<option value="kde-full">kde-full</option>
-					<option value="kde-junior">kde-junior</option>
-					<option value="lxde">lxde</option>
-					<option value="minimal">minimal</option>
-					<option value="rescue">rescue</option>
-					<option selected value="standard">standard</option>
-					<option value="standard-x11">standard-x11</option>
-					<option value="ubuntu-cloud">ubuntu-cloud</option>
-					<option value="ubuntu-cloud-desktop">ubuntu-cloud-desktop</option>
-					<option value="xfce">xfce</option>
-					<option value="xfce-junior">xfce-junior</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="Tasks">--tasks:</label> </td>
-			<td><input id="Tasks" name="tasks" maxlength="256" size="50" type="text" /></td>
-		</tr>
-		<tr>
-			<td><label for="Packages">cgipackages.list.chroot:</label> </td>
-			<td><input id="Packages" name="cgipackages" maxlength="256" size="50" type="text" /></td>
-		</tr>
-	</table>
-</div>
-
-<span id="click_2" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(2,"<b>Advanced bootstrap options</b>")'>
-	<b>Advanced bootstrap options</b><small>&nbsp;(click to expand)</small>
-	<br />
-</span>
-
-<div id="text_2" style='margin-left:0;display:none'>
-	<table>
-		<tr>
-			<td><label for="Architectures">--architectures:</label> </td>
-			<td>
-				<select id="Architectures" name="architectures" size="1">
-					<option value="amd64">amd64</option>
-					<option selected value="i386">i386</option>
-				</select>
-			</td>
-		</tr>
-		<!-- LIVE_DISTRIBUTION -->
-		<!-- LIVE_DISTRIBUTION_CONFIG -->
-		<tr>
-			<td><label for="Bootstrap_Flavour">--bootstrap-flavour:</label> </td>
-			<td>
-				<select id="Bootstrap_Flavour" name="bootstrap_flavour" size="1">
-					<option value="minimal">minimal</option>
-					<option selected value="standard">standard</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="Archive_Areas">--archive-areas:</label> </td>
-			<td><input id="Archive_Areas" name="archive_areas" maxlength="128" size="50" type="text" value="main" readonly /></td>
-		</tr>
-	</table>
-</div>
-
-<span id="click_3" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(3,"<b>Advanced chroot options</b>")'>
-	<b>Advanced chroot options</b><small>&nbsp;(click to expand)</small>
-	<br />
-</span>
-
-<div id="text_3" style='margin-left:0;display:none'>
-	<table>
-		<tr>
-			<td><label for="Chroot_Filesystem">--chroot-filesystem:</label> </td>
-			<td>
-				<select id="Chroot_Filesystem" name="chroot_filesystem" size="1">
-					<option value="ext2">ext2</option>
-					<option value="plain">plain</option>
-					<option selected value="squashfs">squashfs</option>
-				</select>
-			</td>
-		</tr>
-		<!-- LIVE_HOOKS -->
-		<!-- LIVE_INTERACTIVE -->
-		<!-- LIVE_KEYRING_PACKAGES -->
-		<!-- LIVE_LANGUAGE -->
-		<tr>
-			<td><label for="Linux_Flavours">--linux-flavours:</label> </td>
-			<td>
-				<select id="Linux_Flavours" name="linux_flavours" size="1">
-					<option selected value="486">486</option>
-					<option value="686">686</option>
-					<option value="686-pae">686-pae</option>
-					<option value="amd64">amd64</option>
-					<option value="k7">k7</option>
-					<option value="vserver-686">vserver-686</option>
-					<option value="vserver-k7">vserver-k7</option>
-					<option value="xen-686">xen-686</option>
-				</select>
-			</td>
-		</tr>
-		<!-- LIVE_LINUX_PACKAGES -->
-		<!-- LIVE_PACKAGES -->
-		<!-- LIVE_PACKAGE_LISTS -->
-		<!-- LIVE_TASKS -->
-		<tr>
-			<td><label for="Security">--security:</label> </td>
-			<td>
-				<select id="Security" name="security" size="1">
-					<option selected value="true">true</option>
-					<option value="false">false</option>
-				</select>
-			</td>
-		</tr>
-	</table>
-</div>
-
-<span id="click_4" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(4,"<b>Advanced binary options</b>")'>
-	<b>Advanced binary options</b><small>&nbsp;(click to expand)</small>
-	<br />
-</span>
-
-<div id="text_4" style='margin-left:0;display:none'>
-	<table>
-		<!-- LIVE_BINARY_IMAGES -->
-		<tr>
-			<td><label for="Apt_Indices">--apt-indices:</label> </td>
-			<td>
-				<select id="Apt_Indices" name="binary_indices" size="1">
-					<option selected value="true">true</option>
-					<option value="false">false</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="Bootappend_Live">--bootappend-live:</label> </td>
-			<td><input id="Bootappend_Live" name="bootappend_live" maxlength="256" size="50" type="text" value="" /></td>
-		</tr>
-		<tr>
-			<td><label for="Bootloader">--bootloader:</label> </td>
-			<td>
-				<select id="Bootloader" name="bootloader" size="1">
-					<option value="grub">grub</option>
-					<option selected value="syslinux">syslinux</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="Debian_Installer">--debian-installer:</label> </td>
-			<td>
-				<select id="Debian_Installer" name="debian_installer" size="1">
-					<option value="true">true</option>
-					<option selected value="false">false</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="Bootappend_Install">--bootappend-install:</label> </td>
-			<td><input id="Bootappend_Install" name="bootappend_install" maxlength="256" size="50" type="text" value="" /></td>
-		</tr>
-		<!-- LIVE_GRUB_SPLASH -->
-		<tr>
-			<td><label for="Iso_Application">--iso-application:</label> </td>
-			<td><input id="Iso_Application" name="iso_application" maxlength="128" size="50" type="text" value="Debian Live" /></td>
-		</tr>
-		<tr>
-			<td><label for="Iso_Preparer">--iso-preparer:</label> </td>
-			<td><input id="Iso_Preparer" name="iso_preparer" maxlength="128" size="50" type="text" value="live-build; http://packages.qa.debian.org/live-build" /></td>
-		</tr>
-		<tr>
-			<td><label for="Iso_Publisher">--iso-publisher:</label> </td>
-			<td><input id="Iso_Publisher" name="iso_publisher" maxlength="128" size="50" type="text" value="Debian Live project; http://live.debian.net/; debian-live@lists.debian.org" /></td>
-		</tr>
-		<tr>
-			<td><label for="Iso_Volume">--iso-volume:</label> </td>
-			<td><input id="Iso_Volume" name="iso_volume" maxlength="128" size="50" type="text" value="Debian Live DATE" /></td>
-		</tr>
-		<tr>
-			<td><label for="Memtest">--memtest:</label> </td>
-			<td>
-				<select id="Memtest" name="memtest" size="1">
-					<option value="memtest86">memtest86</option>
-					<option selected value="memtest86+">memtest86+</option>
-					<option value="none">none</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="Net_Path">--net-path:</label> </td>
-			<td><input id="Net_Path" name="net_path" maxlength="256" size="50" type="text" value="/srv/debian-live" /></td>
-		</tr>
-		<tr>
-			<td><label for="Net_Server">--net-server:</label> </td>
-			<td><input id="Net_Server" name="net_server" maxlength="15" size="50" type="text" value="192.168.1.1" /></td>
-		</tr>
-		<!-- LIVE_SYSLINUX_SPLASH -->
-	</table>
-</div>
-
-<span id="click_5" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(5,"<b>Advanced source options</b>")'>
-	<b>Advanced source options</b><small>&nbsp;(click to expand)</small>
-	<br />
-</span>
-
-<div id="text_5" style='margin-left:0;display:none'>
-	<table>
-		<tr>
-			<td><label for="Source">--source:</label> </td>
-			<td>
-				<select id="Source" name="source" size="1">
-					<option value="true">true</option>
-					<option selected value="false">false</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td><label for="Source_Images">--source-images:</label> </td>
-			<td>
-				<select id="Source_Images" name="source_images" size="1">
-					<option value="iso">iso</option>
-					<option value="net">net</option>
-					<option selected value="tar">tar</option>
-					<option value="hdd">hdd</option>
-				</select>
-			</td>
-		</tr>
-	</table>
-</div>
-
-<span id="click_6" onmouseover='javascript:objectOver(this)' onmouseout='javascript:objectOut(this)' onclick='javascript:collapse(6,"<b>Unofficial options</b>")'>
-	<b>Unofficial options</b><small>&nbsp;(click to expand)</small>
-	<br />
-</span>
-
-<div id="text_6" style='margin-left:0;display:none'>
-	<li> With custom.bootstrap the repository will be available at build time, so you just have to list the packages you want in packages. See "Standard options" above.</li>
-	<li> With custom.binary the repository will be added to your live-system's /etc/apt/sources.list .</li>
-	<li> Example custom.{bootstrap,binary}: deb http://live.debian.net/debian/ etch main</li>
-	<table>
-		<tr>
-			<td><label for="Custom_Bootstrap">custom.bootstrap:</label> </td>
-			<td><input id="Custom_Bootstrap" name="custom_bootstrap" maxlength="128" size="50" type="text" /></td>
-		</tr>
-		<tr>
-			<td><label for="Custom_Binary">custom.binary:</label> </td>
-			<td><input id="Custom_Binary" name="custom_binary" maxlength="128" size="50" type="text" /></td>
-		</tr>
-	</table>
-</div>
-
-</fieldset>
-
-<br />
-
-<input type="reset" value="Reset" />
-&nbsp;
-<input type="submit" value="Submit" />
-&nbsp;
-
-</form>
diff --git a/templates/cgi/debian-unofficial/header.html b/templates/cgi/debian-unofficial/header.html
deleted file mode 100644
index 096303e25..000000000
--- a/templates/cgi/debian-unofficial/header.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-	<head>
-		<title>Debian Live Build</title>
-		<link rel="icon" href="http://live.debian.net/favicon.ico" type="image/ico">
-		<link rel="stylesheet" type="text/css" href="http://live.debian.net/stylesheet.css" />
-		<meta http-equiv="content-type" content="text/html; charset=iso-8859-15">
-		<meta name="keywords" content="Debian, Live, Project">
-		<meta name="description" content="The Debian Live Project">
-
-		<style type="text/css">
-			label { cursor:pointer; }
-		</style>
-
-		<script type="text/javascript" language="JavaScript">
-			function collapse(x, txt)
-			{
-				var oTemp=document.getElementById("text_"+x);
-				var oClick=document.getElementById("click_"+x);
-				if (oTemp.style.display=="block")
-				{
-					oTemp.style.display="none";
-					oClick.innerHTML=txt+"&nbsp<small>(click to expand)<\/small><br \/>";
-				}
-				else
-				{
-					oTemp.style.display="block";
-					oClick.innerHTML=txt+"&nbsp<small>(click to collapse)<\/small><br \/>";
-				}
-			}
-		</script>
-	</head>
-<body>
-
-<div id="maincontent" style="margin: 0 0 0 0;">
-	<h1 id="title">live-build web-frontend of the <a href="http://live.debian.net/">Debian Live Project</a></h1>
-	<h2 id="subtitle"><a href="http://live.debian.net/">Live Debian systems!</a></h2>
-</div>
diff --git a/templates/cgi/debian-unofficial/mail.txt b/templates/cgi/debian-unofficial/mail.txt
deleted file mode 100644
index 1b52405c6..000000000
--- a/templates/cgi/debian-unofficial/mail.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Subject: Debian Live, live-build web-frontend - Build BUILD
-From: Debian Live live-build web-frontend <debian-live@lists.debian.org>
-To: EMAIL
-
-Hi,
-
-This is live-build web-frontend <http://live-build.debian.net/> of the Debian Live project <http://live.debian.net/>.
-
-Your build BUILD was started DATE_START and ended DATE_END with status 'STATUS'.
-
-You can see the log file and download the image from <SERVER/BUILD/>.
-
-Note that builds are removed after 24 hours.
-
-Feedback about all Debian Live matters can be sent to our mailinglist at debian-live@lists.debian.org (no subscription required).
-
-Have fun,
-The Debian Live Team
diff --git a/templates/cgi/debian-official/build.html b/templates/cgi/debian/build.html
similarity index 100%
rename from templates/cgi/debian-official/build.html
rename to templates/cgi/debian/build.html
diff --git a/templates/cgi/debian-official/footer.html b/templates/cgi/debian/footer.html
similarity index 100%
rename from templates/cgi/debian-official/footer.html
rename to templates/cgi/debian/footer.html
diff --git a/templates/cgi/debian-official/form.html b/templates/cgi/debian/form.html
similarity index 100%
rename from templates/cgi/debian-official/form.html
rename to templates/cgi/debian/form.html
diff --git a/templates/cgi/debian-official/header.html b/templates/cgi/debian/header.html
similarity index 100%
rename from templates/cgi/debian-official/header.html
rename to templates/cgi/debian/header.html
diff --git a/templates/cgi/debian-official/mail.txt b/templates/cgi/debian/mail.txt
similarity index 100%
rename from templates/cgi/debian-official/mail.txt
rename to templates/cgi/debian/mail.txt