Merge branch 'redesign'

Conflicts:
	templates/public/download.html

87 files changed, 4848 insertions, 1498 deletions

diff --git a/main/admin.py b/main/admin.py
index 0585e5c3..ec10d9cd 100644
--- a/main/admin.py
+++ b/main/admin.py
@@ -55,7 +55,6 @@ class MirrorAdmin(admin.ModelAdmin):
     form = MirrorAdminForm
     list_display = ('name', 'tier', 'country', 'active', 'public', 'isos', 'admin_email', 'supported_protocols')
     list_filter = ('tier', 'country', 'active', 'public')
-    ordering = ['country', 'name']
     search_fields = ('name',)
     inlines = [
             MirrorUrlInlineAdmin,
diff --git a/main/models.py b/main/models.py
index 52e68958..6facc8ba 100644
--- a/main/models.py
+++ b/main/models.py
@@ -72,6 +72,10 @@ class Mirror(models.Model):
     rsync_user = models.CharField(max_length=50, blank=True, default='')
     rsync_password = models.CharField(max_length=50, blank=True, default='')
     notes = models.TextField(blank=True)
+
+    class Meta:
+        ordering = ('country', 'name')
+
     def __unicode__(self):
         return self.name
 
@@ -106,10 +110,13 @@ class MirrorRsync(models.Model):
 class Donor(models.Model):
     id = models.AutoField(primary_key=True)
     name = models.CharField(max_length=255, unique=True)
+
     def __unicode__(self):
         return self.name
+
     class Meta:
         db_table = 'donors'
+        ordering = ['name']
 
 class News(models.Model):
     id = models.AutoField(primary_key=True)
diff --git a/media/arch.css b/media/arch.css
deleted file mode 100644
index 358d5a57..00000000
--- a/media/arch.css
+++ /dev/null
@@ -1,335 +0,0 @@
-* { margin: 0; padding: 0; }
-* ul { padding: 10px 20px; }
-body {
-  min-width: 600px;
-	background: url("/media/titlebar.png") repeat-x top left #fff;
-	padding: 0 30px;
-	color: #46494d;
-  font-size: 14px;
-	font-family: "DejaVu Sans", "Bitstream Vera Sans", "Lucida Grande", Arial, sans-serif;
-}
-/*
- * Divs
- */
-#head_container {
-	height: 220px;
-}
-#main_nav {
-  position: absolute;
-  top: 123px;
-  right: 30px;
-  background: #333;
-}
-#dev_nav {
-  position: absolute;
-  top: 149px;
-  right: 30px;
-  background: #1793d1;
-}
-#main_nav ul, #dev_nav ul {
-	list-style: none; 
-	margin: 0;
-  padding: 0;
-}
-#main_nav ul li, #dev_nav ul li {
-	display: block;
-	float: left;
-  margin: 0 3px;
-  padding: 0;
-	text-align: center;
-	font-size: 13px;
-  line-height: 26px;
-}
-#main_nav ul li.selected {
-	background: #1793d1;
-}
-#dev_nav ul li.selected {
-	background: #333;
-}
-#main_nav ul li a, #dev_nav ul li a {
-  display: block;
-  padding: 0 8px;
-  color: #fff;
-  font-weight: bold;
-	text-decoration: none;
-}
-#main_nav ul li a:hover {
-	background: #1793d1;
-}
-#updates {
-	font-size: small;
-	/*position: relative;*/
-	top: 0px;
-	background: #f6efe0;
-	border: 1px solid #eee4cb;
-	padding: 10px;
-}
-#updates .testing, #updates .community-testing {
-    font-style: italic;
-}
-#about {
-	position: relative;
-	top: -9px;
-}
-#logo {
-  z-index: 1;
-	position: absolute;
-  top: 10px;
-  left: 25px;
-	width: 350px;
-}
-#logo h1#archtitle {
-  text-indent: -9999px;
-  margin: 0;
-  padding: 0;
-}
-#logo h1#archtitle a {
-  display: block;
-  background: transparent url("/media/titlelogo.png") top left no-repeat;
-  width: 350px;
-  height: 103px;
-}
-#devlist {
-	width: 80%;
-	padding: 10px;
-	margin-left: auto;
-	margin-right: auto;
-	border-top: 1px dashed black;
-	border-bottom: 1px dashed black;
-	text-align: center;
-}
-.clear {
-	clear: both;
-	margin: 0;
-	padding: 0;
-}
-.right {
-	float: right;
-	width: 320px;
-	padding: 0 10px 10px 0;
-}
-.left {
-	padding: 10px;
-	margin: 0 360px 0 0;
-}
-.left p {
-	padding-bottom: 10px;
-}
-.box {
-	padding: 10px;
-	background: #f0f0f0;
-	border: 1px solid #d9d9d9;
-}
-.greybox {
-	padding: 10px;
-	background: #f6efe0;
-	border: 1px solid #eee4cb;
-}
-div.listing {
-	padding-right: 10px;
-}
-.error, .errorlist {
-	color: #dd0000;
-	font-size: small;
-}
-.foot {
-	clear: both;
-  padding: 2em 0;
-	text-align: center;
-	font-size: 0.75em;
-  line-height: 1.5em;
-}
-#search {
-	float: right;
-	position: relative;
-	top: -2em;
-	font-size: 0.8em;
-}
-#search input {
-	background: #f6efe0;
-	border: 1px solid #eee4cb;
-}
-#adoptbox {
-    text-align:center;
-}
-.smalltext {
-	text-align: right;
-	font-size: x-small;
-}
-/*
- * Headers
- */
-h2 {
-	margin: 20px 0 10px 0;
-}
-h2.title {
-	border-bottom: 1px solid #46494d;
-}
-h3 {
-	margin-bottom: 10px;
-}
-h3.title {
-	text-align: right;
-	border-bottom: 1px solid #46494d;
-}
-h4.title {
-	text-align: left;
-	border-bottom: 1px solid #46494d;
-}
-h4.news {
-	border-bottom: 1px dotted #0771a6;
-  margin-bottom: .25em;
-  padding-bottom: .2em;
-}
-div.listing h4 {
-  color: #fff;
-	background: #0771a6;
-	padding: 3px;
-}
-/*
- * Paragraphs, Anchors, Images
- */
-p {
-	padding-bottom: 20px;
-}
-p.news {
-	font-size: small;
-}
-a {
-	color: #0771a6;
-	text-decoration: none;
-}
-a:hover {
-  color: #333;
-  text-decoration: underline;
-}
-ol {
-	padding-left: 45px;
-}
-ul.small {
-	list-style: none;
-	font-size: x-small;
-}
-ul.links {
-	list-style: none;
-	font-size: small;
-	padding: 0px 0px 20px 20px;
-}
-img {
-	border: none;
-}
-hr {
-	border: none;
-	border-top: 1px solid #46494d;
-}
-.greybox input, .greybox button, .greybox textarea, .greybox select {
-	background: #e1e3e6;
-	border: 1px solid #8faecd;
-}
-.box input, .box button {
-	padding: 2px;
-	background: #c1c3f6;
-	font-size: x-small;
-	border: 1px solid #8faecd;
-}
-/*
- * Table stuff
- */
-table.center {
-	margin-left: auto;
-	margin-right: auto;
-}
-table#feedlist {
-	text-align: center;
-	border-collapse: collapse;
-	border: 1px solid #46494d;
-}
-table#feedlist th, table#feedlist td {
-	padding: 5px;
-	border: 1px dotted #0771a6;
-}
-.devpic {
-	vertical-align: top;
-	padding-right: 15px;
-    padding-top: 10px;
-}
-table.deventry {
-	padding-bottom: 25px;
-}
-.deventry th {
-	text-align: left;
-	vertical-align: top;
-	white-space: nowrap;
-}
-.deventry td {
-	width: 100%;
-}
-table.results {
-	padding: 0px;
-	border-collapse: collapse;
-}
-.results th {
-	background: #e1e3e6;
-	border-bottom: 1px solid #46494d;
-	border-top: 1px solid #46494d;
-	text-align: left;
-	padding-top: 0px;
-	padding-bottom: 0px;
-	padding-right: 5px;
-}
-.results th>a {
-	text-decoration: none;
-	color: #46494d;
-}
-.results td {
-	padding-right: 5px;
-	vertical-align: top;
-	font-size: 0.8em;
-}
-.listing th {
-	font-size: small;
-	vertical-align: top;
-	text-align: left;
-	padding: 2px;
-}
-.listing td {
-	font-size: small;
-	padding: 2px;
-}
-
-td.signoff_yes {
-    font-size: large;
-    color: green;
-    font-weight: bold;
-}
-td.signoff_no {
-    font-size: large;
-    color: red;
-}
-
-.pkgr2 {
-	background-color: #eee4cb;
-}
-
-form#newsform table {
-	width: 100%;
-	max-width: 1024px;
-}
-form#newsform input[type=text] {
-	width: 100%;
-}
-form#newsform textarea {
-	width: 100%;
-}
-
-/* donate page styles */
-ul#donorlist {
-	width: 100%;
-}
-ul#donorlist li {
-	float: left;
-	/* max 4 columns, but possibly fewer if screen size doesn't allow for more */
-	width: 25%;
-	min-width: 20em;
-}
-
diff --git a/media/archnavbar/archlogo.gif b/media/archnavbar/archlogo.gif
new file mode 100644
index 00000000..e1852a06
--- /dev/null
+++ b/media/archnavbar/archlogo.gif
diff --git a/media/archnavbar/archlogo.png b/media/archnavbar/archlogo.png
new file mode 100644
index 00000000..e873e94b
--- /dev/null
+++ b/media/archnavbar/archlogo.png
diff --git a/media/archnavbar/archnavbar.css b/media/archnavbar/archnavbar.css
new file mode 100644
index 00000000..0a729ef4
--- /dev/null
+++ b/media/archnavbar/archnavbar.css
@@ -0,0 +1,33 @@
+/*
+ * ARCH GLOBAL NAVBAR
+ *
+ * We're forcing all generic selectors with !important
+ * to help prevent other stylesheets from interfering.
+ *
+ */
+
+/* container for the entire bar */
+#archnavbar { height: 40px !important; padding: 10px 15px !important; background: #333 !important; border-bottom: 5px #08c solid !important; }
+
+/* logo trickery -- GIF for IE6 and PNG for the rest */
+#archnavbarlogo { float: left !important; margin: 0 !important; padding: 0 !important; height: 40px !important; width: 190px !important; }
+/* IE6 doesn't support alpha PNGs so we serve it a GIF */
+#archnavbarlogo { background: url('archlogo.gif') no-repeat !important; }
+/* and use a proper PNG for all other modern browsers */
+html > body #archnavbarlogo { background: url('archlogo.png') no-repeat !important; }
+
+/* move the heading/paragraph text offscreen */
+#archnavbarlogo p { margin: 0 !important; padding: 0 !important; text-indent: -9999px !important; }
+#archnavbarlogo h1 { margin: 0 !important; padding: 0 !important; text-indent: -9999px !important; }
+
+/* make the link the same size as the logo */
+#archnavbarlogo a { display: block !important; height: 40px !important; width: 190px !important; }
+
+/* display the list inline, float it to the right and style it */
+#archnavbar ul { display: inline !important; float: right !important; list-style: none !important; margin: 0 !important; padding: 0 !important; }
+#archnavbar ul li { float: left !important; font-size: 14px !important; font-family: sans-serif !important; line-height: 45px !important; padding-right: 15px !important; padding-left: 15px !important; }
+
+/* style the links */
+#archnavbar ul#archnavbarlist li a { color: #999; font-weight: normal !important; text-decoration: none !important; }
+#archnavbar ul li a:hover { color: white !important; text-decoration: underline !important; }
+
diff --git a/media/archweb-print.css b/media/archweb-print.css
new file mode 100644
index 00000000..2946de54
--- /dev/null
+++ b/media/archweb-print.css
@@ -0,0 +1,11 @@
+/*
+ *  ARCH LINUX DJANGO (MAIN SITE)
+ *
+ *  Stylesheet for printing
+ */
+
+/* general styling */
+body { font: normal 100% sans-serif; }
+#content { font-size: 0.812em; }
+#archnavbarmenu, #archdev-navbar, .admin-actions { display: none; }
+
diff --git a/media/archweb.css b/media/archweb.css
new file mode 100644
index 00000000..2e317369
--- /dev/null
+++ b/media/archweb.css
@@ -0,0 +1,247 @@
+/*
+ * ARCH LINUX DJANGO (MAIN SITE)
+ *
+ * Font sizing based on 16px browser defaults (use em):
+ *   14px = 0.875em
+ *   13px = 0.812em
+ *   12px = 0.75em
+ *   11px = 0.6875em
+ *
+ */
+
+/* import the global navbar stylesheet */
+@import url('archnavbar/archnavbar.css');
+
+/* simple reset */
+* { margin: 0; padding: 0; line-height: 1.4; }
+
+/* general styling */
+body { min-width: 650px; background: #eef; color: #444; font: normal 100% sans-serif; text-align: center; }
+p { margin: .33em 0 1em; }
+ol, ul { margin-bottom: 1em; padding-left: 2em; }
+ul { list-style: square; }
+code { font: 1.2em monospace; background: #ffa; padding: 0.15em 0.25em; }
+pre { font: 1.2em monospace; border: 1px solid #bdb; background: #dfd; padding: 0.5em; margin: 0.25em 2em; }
+blockquote { margin: 1.5em 2em; }
+input { vertical-align: middle; }
+.clear { clear: both; }
+hr { border: none; border-top: 1px solid #888; }
+img { border: 0; }
+
+/* scale fonts down to a sane default (16 * .812 = 13px) */
+#content { font-size: 0.812em; }
+
+/* link style */
+a { text-decoration: none; }
+a:link, th a:visited { color: #07b; }
+a:visited { color: #549; }
+a:hover { text-decoration: underline; }
+a:active { color: #e90; }
+
+/* headings */
+h2 { font-size: 1.5em; margin-bottom: 0.5em; border-bottom: 1px solid #888; }
+h3 { font-size: 1.25em; margin-top: 1em; }
+h4 { font-size: 1.15em; margin-top: 1em; }
+h5 { font-size: 1em; margin-top: 1em; }
+
+/* general layout */
+div#content { width: 95%; margin: 0 auto; text-align: left; } 
+div#content-left-wrapper { float: left; width: 100%; } /* req to keep content above sidebar in source code */ 
+div#content-left { margin: 0 340px 0 0; }
+div#content-right { float: left; width: 300px; margin-left: -300px; }
+div.box { margin-bottom: 1.5em; padding: 0.65em; background: #fff; border: 1px solid #bcd; }
+div#footer { clear: both; margin: 2em 0 1em; }
+div#footer p { margin: 0; text-align: center; font-size: 0.85em; }
+
+/* alignment */
+div.center, table.center, img.center { width: auto; margin-left: auto; margin-right: auto; }
+p.center, td.center, th.center { text-align: center; }
+
+/* table generics */
+table { width: 100%; border-collapse: collapse; }
+table .wrap { white-space: normal; }
+th, td { white-space: nowrap; text-align: left; }
+th { vertical-align: middle; font-weight: bold; }
+td { vertical-align: top; }
+
+/* table pretty styles */
+table.pretty1 { width: auto; margin-top: 0.25em; margin-bottom: 0.5em; border-collapse: collapse; border: 1px solid #bcd; }
+table.pretty1 th { padding: 0.35em; background: #eef; border: 1px solid #bcd; }
+table.pretty1 td { padding: 0.35em; border: 1px dotted #bcd; }
+table.pretty2 { width: auto; margin-top: 0.25em; margin-bottom: 0.5em; border-collapse: collapse; border: 1px solid #bbb; }
+table.pretty2 th { padding: 0.35em; background: #eee; border: 1px solid #bbb; }
+table.pretty2 td { padding: 0.35em; border: 1px dotted #bbb; }
+
+/* forms and input styling */
+form p { margin: 0.5em 0; }
+fieldset { border: 0; }
+label { width: 12em; vertical-align: top; display: inline-block; font-weight: bold; }
+input[type=text], input[type=password], textarea { padding: 0.10em; }
+form.general-form label, form.general-form .form-help { width: 10em; vertical-align: top; display: inline-block; }
+form.general-form input[type=text], form.general-form textarea { width: 45%; }
+
+/* archdev navbar */
+div#archdev-navbar { margin: 1.5em 0; }
+div#archdev-navbar ul { list-style: none; margin: -0.5em 0; padding: 0; }
+div#archdev-navbar li { display: inline; margin: 0; padding: 0; font-size: 0.9em; }
+div#archdev-navbar li a { padding: 0 0.5em; color: #07b; }
+
+/* error/info messages (x pkg is already flagged out-of-date, etc) */
+#sys-message { width: 35em; text-align: center; margin: 1em auto; padding: 0.5em; background: #fff; border: 1px solid #f00; }
+#sys-message p { margin: 0; }
+
+/*
+ *  PAGE SPECIFIC STYLES
+ */
+
+/* home: introduction */
+#intro p.readmore { margin: -0.5em 0 0 0; font-size: .9em; text-align: right; }
+
+/* home: news */
+#news { margin-top: 1.5em; }
+#news p { margin-bottom: 1.5em; }
+#news h3 { border-bottom: 1px solid #888; }
+#news .more { font-weight: normal; }
+#news .rss-icon { float: right; margin: -1.6em 0.4em 0 0; }
+#news h4 { font-size: 1em; margin-top: 1.5em; border-bottom: 1px dotted #bbb; }
+#news .timestamp { float: right; font-size: 0.85em; margin: -1.8em 0.5em 0 0; }
+
+/* home: pkgsearch box */
+#pkgsearch { padding: 1em 0.75em; background: #3ad; color: #fff; border: 1px solid #08b; } 
+#pkgsearch p { margin: 0; padding: 0; font-weight: bold; text-align: right; }
+#pkgsearch input { vertical-align: bottom; width: 12em; padding: 0.15em; font-size: 1em; background: #fff; border: 1px solid #09c; }
+
+/* home: recent pkg updates */
+#pkg-updates h3 { margin: 0 0 0.3em; }
+#pkg-updates .more { font-weight: normal; }
+#pkg-updates .rss-icon { float: right; margin: -2em 0 0 0; }
+#pkg-updates table { margin: 0; }
+#pkg-updates td.pkg-name { white-space: normal; }
+#pkg-updates td.pkg-arch { text-align: right; }
+#pkg-updates a.testing, #pkg-updates a.community-testing { font-style: italic; }
+
+/* home: sidebar navigation */
+div#nav-sidebar ul { list-style: none; margin: 0.5em 0 0.5em 1em; padding: 0; }
+
+/* home: sponsor banners */
+div#sponsors img { padding: 0.3em 0; }
+
+/* home: sidebar components (navlist, sponsors, pkgsearch, etc) */
+div.widget { margin-bottom: 1.5em; }
+
+/* feeds page */
+#rss-feeds .rss { padding-right: 20px; background: url(rss.png) top right no-repeat; }
+
+/* artwork: logo images */
+#artwork img.inverted { background: #333; padding: 0; }
+#artwork div.imagelist img { display: inline; margin: 0.75em; }
+
+/* news: article pages */
+div#news-article .article-info { margin: 0; color: #999; }
+
+/* news: add/edit article */
+form#newsform { width: 60em; }
+form#newsform input[type=text], form#newsform textarea  { width: 75%; }
+
+/* donate: donor list */
+div#donor-list ul { width: 100%; }
+/* max 4 columns, but possibly fewer if screen size doesn't allow for more */
+div#donor-list li { float: left; width: 25%; min-width: 20em; }
+
+/* download page */
+#arch-downloads h3 { border-bottom: 1px dotted #aaa; }
+table#download-torrents .cpu-arch { text-align: center; }
+table#download-mirrors { width: auto; margin-bottom: 1em; }
+table#download-mirrors td.mirror-country { padding-top: 1em; }
+table#download-mirrors td.mirror-server { padding-right: 1em; }
+table#download-mirrors a { display: block; float: right; width: 4em; }
+
+/* pkglists/devlists */
+table.results { font-size: 0.846em; }
+table.results th { padding: 0.5em 1em 0.25em 0.25em; border-bottom: 1px solid #999; white-space: nowrap; }
+table.results td { padding: .3em 1em .3em 3px; }
+table.results tr.even { background: #e7ecff; }
+
+/* pkglist: layout */
+div#pkglist-search { margin-bottom: 1.5em; }
+div#pkglist-about { margin-top: 1.5em; }
+
+/* pkglist: results */
+#pkglist-results .flagged { color: red; }
+
+/* pkglist: results navigation */
+#pkglist-stats-top { font-size: 0.85em; border-bottom: 1px dotted #999; }
+#pkglist-stats-bottom { font-size: 0.85em; border-top: 1px dotted #999; }
+#pkglist-results .pkglist-nav { float: right; margin-top: -2.2em; }
+.pkglist-nav .prev { margin-right: 1em; }
+.pkglist-nav .next { margin-right: 1em; }
+
+/* pkglist: search fields */
+#pkglist-search h3 { font-size: 1em; margin-top:0; }
+#pkglist-search div { float: left; margin-right: 1.65em; font-size: 0.85em; }
+#pkglist-search legend { display: none; }
+#pkglist-search label { width: auto; display: block; font-weight: normal; }
+
+/* pkgdetails: action list (svn entries, flag out-of-date) */
+#pkgdetails #actionlist { float: right; }
+#pkgdetails #actionlist ul { list-style: none; padding: 0; font-size: 0.846em }
+#pkgdetails #actionlist .flagged { color: red; font-size: 0.9em; font-style: italic; }
+
+/* pkgdetails: pkg info */
+#pkgdetails #pkginfo { width: auto; }
+#pkgdetails #pkginfo td { padding: 0.25em 0 0.25em 1.5em; }
+
+/* pkgdetails: flag package */
+form#flag-pkg-form label { width: 10em; }
+form#flag-pkg-form textarea, form#flag-pkg-form input[type=text] { width: 45%; } 
+
+/* pkgdetails: deps, required by and file lists */
+#pkgdetails #metadata h3 { background: #555; color: #fff; font-size: 1em; margin-bottom: 0.5em; padding: 0.2em 0.35em; }
+#pkgdetails #metadata ul { list-style: none; margin: 0; padding: 0; }
+#pkgdetails #metadata li { padding-left: 0.5em; }
+#pkgdetails #metadata br { clear: both; }
+#pkgdetails #pkgdeps { float: left; width: 48%; margin-right: 2%; }
+#pkgdetails #pkgreqs { float: left; width: 50%; }
+#pkgdetails #pkgfiles { clear: left; padding-top: 1em; }
+
+/* dev/TU biographies */
+div#arch-bio-toc { width: 75%; margin: 0 auto; text-align: center; }
+table.arch-bio-entry td.pic { vertical-align: top; padding-right: 15px; padding-top: 10px; }
+table.arch-bio-entry td.pic img { padding: 4px; border: 1px solid #ccc; }
+table.arch-bio-entry table.bio { margin-bottom: 2em; }
+table.arch-bio-entry table.bio th { text-align: left; padding-right: 0.5em; vertical-align: top; white-space: nowrap; }
+table.arch-bio-entry table.bio td { width: 100%; padding-bottom: 0.25em; }
+
+/* dev: login/out */
+p.login-error {}
+table#dev-login { width: auto; } 
+
+/* dev dashboard: flagged packages */
+form#dash-pkg-notify { text-align: right; padding: 1em 0 0; margin-top: 1em; font-size: 0.85em; border-top: 1px dotted #aaa; }
+form#dash-pkg-notify label { width: auto; font-weight: normal; }
+form#dash-pkg-notify input { vertical-align: middle; margin: 0 0.25em; }
+form#dash-pkg-notify input[type=submit] { margin-top: -0.25em; }
+form#dash-pkg-notify p { margin: 0; }
+
+/* dev dashboard: collapse stat tables by default */
+table#stats-by-maintainer, table#stats-by-repo, table#stats-by-arch { display: none; }
+table.dash-stats .key { width: 50%; } 
+span.dash-click { font-weight: normal; font-size: 0.8em; color: #888; }
+div.dash-stats h3 { color: #07b; border-bottom: 1px dotted #aaa; }
+
+/* dev dashboard: admin actions (add news items, todo list, etc) */
+ul.admin-actions { float: right; list-style: none; margin-top: -2.5em; }
+ul.admin-actions li { display: inline; padding-left: 1.5em; }
+
+/* dev: todo list */
+#dev-todo .complete, #dev-todo-details .complete { color: green; }
+#dev-todo .incomplete, #dev-todo-details .incomplete { color: red; }
+
+/* dev: signoff page */
+#dev-signoffs ul { list-style: none; margin: 0; padding: 0; }
+#dev-signoffs .signoff-yes { color: green; font-weight: bold; }
+#dev-signoffs .signoff-no { color: red; }
+#dev-signoffs .signed-username { color: #888; margin-left: 0.5em; }
+
+/* highlight current website in the navbar */
+#archnavbar ul li.selected a { color: white !important; }
diff --git a/media/logo.png b/media/logo.png
deleted file mode 100644
index d8f871c9..00000000
--- a/media/logo.png
+++ /dev/null
diff --git a/media/logos/archlinux-logo-black-1200dpi.png b/media/logos/archlinux-logo-black-1200dpi.png
new file mode 100644
index 00000000..a3082c39
--- /dev/null
+++ b/media/logos/archlinux-logo-black-1200dpi.png
diff --git a/media/logos/archlinux-logo-black-90dpi.png b/media/logos/archlinux-logo-black-90dpi.png
new file mode 100644
index 00000000..6948b795
--- /dev/null
+++ b/media/logos/archlinux-logo-black-90dpi.png
diff --git a/media/logos/archlinux-logo-black-scalable.svg b/media/logos/archlinux-logo-black-scalable.svg
new file mode 100644
index 00000000..10d6c4af
--- /dev/null
+++ b/media/logos/archlinux-logo-black-scalable.svg
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.0"
+   width="600"
+   height="199.41692"
+   id="svg2424">
+  <defs
+     id="defs2426">
+    <linearGradient
+       x1="112.49854"
+       y1="6.1372099"
+       x2="112.49853"
+       y2="129.3468"
+       id="path1082_2_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(287,-83)">
+      <stop
+         id="stop193"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop195"
+         style="stop-color:#ffffff;stop-opacity:0.27450982"
+         offset="1" />
+      <midPointStop
+         offset="0"
+         style="stop-color:#FFFFFF"
+         id="midPointStop197" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#FFFFFF"
+         id="midPointStop199" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#000000"
+         id="midPointStop201" />
+    </linearGradient>
+    <linearGradient
+       x1="541.33502"
+       y1="104.50665"
+       x2="606.91248"
+       y2="303.14029"
+       id="linearGradient2544"
+       xlink:href="#path1082_2_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.3937741,0,0,0.393752,357.51969,122.00151)" />
+    <linearGradient
+       id="linearGradient3388">
+      <stop
+         id="stop3390"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop3392"
+         style="stop-color:#000000;stop-opacity:0.37113401"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="490.72305"
+       y1="237.72447"
+       x2="490.72305"
+       y2="183.9644"
+       id="linearGradient4416"
+       xlink:href="#linearGradient3388"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.749107,0,0,0.749107,-35.459862,91.44108)" />
+  </defs>
+  <g
+     transform="translate(-34.777313,-129.80241)"
+     id="layer1">
+    <g
+       transform="matrix(0.8746356,0,0,0.8746356,14.730518,23.408954)"
+       id="g2424"
+       style="fill:#000000">
+      <g
+         transform="matrix(0.6378586,0,0,0.6378586,36.486487,2.17139)"
+         id="g2809"
+         style="fill:#000000;fill-opacity:1">
+        <path
+           d="m 339.96875,309.09375 c -14.47141,-0.0239 -26.4812,2.94367 -31.125,4.5625 l -4.78125,25.8125 c -0.0116,0.0951 23.79543,-6.34855 34.28125,-5.96875 17.36158,0.62381 18.95948,6.63541 18.65625,14.75 0.29595,0.47462 -4.47933,-7.33192 -19.5,-7.59375 -18.94961,-0.32687 -45.69284,6.70947 -45.65625,35.3125 -0.51086,32.17412 24.03361,41.63882 40.75,41.8125 15.02821,-0.27364 22.0777,-5.69136 25.9375,-8.59375 5.07124,-5.30236 10.87308,-10.63447 16.40625,-17.03125 -5.23567,9.51278 -9.77472,16.0898 -14.5,21.125 l 0,4.25 22.84375,-3.84375 0.15625,-62.09375 c -0.23141,-8.78839 5.04123,-42.41827 -43.46875,-42.5 z m -3.28125,54.0625 c 9.46889,0.12995 20.32788,4.79708 20.34375,16.03125 0.049,10.21821 -12.80005,15.71183 -21.15625,15.625 -8.35976,-0.0868 -19.45093,-6.56982 -19.5,-16.53125 0.16016,-8.90444 10.45953,-15.35418 20.3125,-15.125 z"
+           id="path2284"
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 398.50106,314.83145 -0.15505,102.82693 26.61213,-5.12724 0.0449,-58.30157 c 0.006,-8.68089 12.40554,-18.82451 27.9627,-18.66287 3.30202,-5.97408 9.5087,-21.24219 11.02088,-24.71514 -34.75649,-0.0833 -35.19897,9.98993 -41.24398,14.94517 -0.0631,-9.45285 -0.0213,-15.12741 -0.0213,-15.12741 l -24.2202,4.16213 z"
+           id="path2286"
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 548.2688,328.33058 c -0.25696,-0.12068 -13.87938,-15.93419 -41.26638,-16.0589 -25.65249,-0.42638 -54.42578,9.51895 -54.88631,52.5328 0.22457,37.81852 27.6402,52.59809 55.0314,52.88627 29.31292,0.30451 40.97654,-18.32947 41.67615,-18.79124 -3.49762,-3.0321 -16.59792,-16.0131 -16.59792,-16.0131 0,0 -8.18236,11.65102 -24.05802,11.79913 -15.87942,0.1512 -29.68245,-12.27325 -29.87805,-29.60905 -0.20349,-17.33595 12.68881,-26.72821 29.99725,-27.48687 14.98466,-0.003 23.6297,9.67334 23.6297,9.67334 l 16.35218,-18.93238 z"
+           id="path2288"
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 581.8125,278.84375 -25.125,5.90625 0.1875,133.9375 24.75,-4.46875 0.28125,-63.03125 c 0.0529,-6.60927 9.56127,-16.75916 25.4375,-16.4375 15.17973,0.15775 18.57236,10.11767 18.53125,11.375 l 0.4375,72.96875 24.40625,-4.3125 0.0937,-77.375 c 0.1607,-7.44539 -16.30833,-23.16954 -42.78125,-23.28125 -12.58087,0.0202 -19.54815,2.86825 -23.09375,4.96875 -6.06656,4.68565 -12.9998,9.17543 -19.8125,14.90625 6.29809,-8.09099 11.58551,-13.68516 16.75,-17.84375 l -0.0625,-37.3125 z"
+           id="path2290"
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      </g>
+      <g
+         transform="matrix(0.9443373,0,0.01336345,0.9443373,78.345657,-412.48879)"
+         id="g5326"
+         style="fill:#000000;fill-opacity:1;stroke:none">
+        <path
+           d="m 400.67581,629.79609 7.68167,-1.91575 -0.92851,91.20792 -7.79574,1.32426 1.04258,-90.61643 z"
+           id="path2292"
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 421.10266,657.01757 6.75064,-2.9867 -0.86808,65.39931 -6.49779,1.33915 0.61523,-63.75176 z m -1.26059,-23.58316 5.47167,-4.41533 4.42261,4.99952 -5.47558,4.53221 -4.4187,-5.1164 z"
+           id="path2294"
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 440.44273,655.82614 7.67755,-1.56201 -0.1573,13.6722 c -0.007,0.58717 4.4194,-15.27364 24.68502,-14.92094 19.67986,0.10952 22.68401,15.34634 22.5291,18.76237 l -0.43759,48.0783 -6.73044,1.45631 0.63316,-47.489 c 0.0974,-1.38684 -2.88144,-13.11441 -16.78906,-13.15754 -13.90509,-0.0404 -23.68364,10.10048 -23.75821,16.57937 l -0.48127,41.83477 -7.80388,2.0313 0.63292,-65.28513 z"
+           id="path2296"
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 561.53301,720.20203 -7.6776,1.56186 0.15737,-13.67198 c 0.007,-0.58742 -4.42201,15.27361 -24.68504,14.92086 -19.67983,-0.10944 -22.68399,-15.34626 -22.52908,-18.76229 l 0.43757,-48.07861 8.15674,-1.64226 -0.54644,47.48988 c -0.0149,1.29682 1.36845,13.29979 15.27604,13.3426 13.90511,0.0405 23.76622,-8.37359 24.01453,-21.04416 l 0.43105,-37.46902 7.5978,-1.93195 -0.63294,65.28507 z"
+           id="path2298"
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 577.45461,655.28678 -5.42715,4.20017 20.19894,26.93328 -22.39092,31.11622 5.63499,4.226 21.04365,-28.8967 20.8779,29.58159 5.32727,-4.20103 -22.37578,-31.62866 18.56963,-25.5775 -5.53193,-4.73429 -16.92109,23.66778 -19.00551,-24.68686 z"
+           id="path2300"
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      </g>
+      <path
+         d="m 105.8125,16.625 c -7.39687,18.135158 -11.858304,29.997682 -20.09375,47.59375 5.04936,5.35232 11.247211,11.585364 21.3125,18.625 C 96.210077,78.390904 88.828713,73.920352 83.3125,69.28125 72.7727,91.274163 56.259864,122.60209 22.75,182.8125 49.087628,167.60733 69.504089,158.23318 88.53125,154.65625 87.714216,151.1422 87.2497,147.34107 87.28125,143.375 l 0.03125,-0.84375 c 0.417917,-16.87382 9.195665,-29.84979 19.59375,-28.96875 10.39809,0.88104 18.48041,15.28242 18.0625,32.15625 -0.0786,3.17512 -0.43674,6.22955 -1.0625,9.0625 18.82058,3.68164 39.01873,13.03179 65,28.03125 -5.123,-9.4318 -9.69572,-17.93388 -14.0625,-26.03125 -6.87839,-5.33121 -14.05289,-12.2698 -28.6875,-19.78125 10.05899,2.61375 17.2611,5.62932 22.875,9 C 124.63297,63.338161 121.03766,52.354109 105.8125,16.625 z"
+         transform="matrix(1.1433333,0,0,1.1433333,22.920168,121.64318)"
+         id="path2518"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      <g
+         id="text2634"
+         style="font-size:8.44138241px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans Mono">
+        <path
+           d="m 685.46692,263.83624 0,-5.32944 -1.99082,0 0,-0.71307 4.7895,0 0,0.71307 -1.99906,0 0,5.32944 -0.79962,0"
+           id="path4714" />
+        <path
+           d="m 689.0982,263.83624 0,-6.04251 1.20355,0 1.43026,4.2784 c 0.13189,0.39843 0.22806,0.69658 0.28852,0.89442 0.0687,-0.21983 0.17586,-0.5427 0.3215,-0.96862 l 1.44674,-4.2042 1.07578,0 0,6.04251 -0.77077,0 0,-5.05741 -1.75587,5.05741 -0.72131,0 -1.74763,-5.14396 0,5.14396 -0.77077,0"
+           id="path4716" />
+      </g>
+      <g
+         id="text2638"
+         style="font-size:8.25130367px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans Mono">
+        <path
+           d="m 239.84053,313.69965 0,-5.20945 -1.94598,0 0,-0.697 4.68164,0 0,0.697 -1.95404,0 0,5.20945 -0.78162,0"
+           id="path4719" />
+        <path
+           d="m 243.39004,313.69965 0,-5.90645 1.17646,0 1.39805,4.18205 c 0.12892,0.38947 0.22293,0.6809 0.28202,0.87429 0.0671,-0.21488 0.1719,-0.53048 0.31426,-0.94681 l 1.41417,-4.10953 1.05155,0 0,5.90645 -0.75341,0 0,-4.94353 -1.71634,4.94353 -0.70506,0 -1.70828,-5.02814 0,5.02814 -0.75342,0"
+           id="path4721" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/media/logos/archlinux-logo-dark-1200dpi.png b/media/logos/archlinux-logo-dark-1200dpi.png
new file mode 100644
index 00000000..24a5cefa
--- /dev/null
+++ b/media/logos/archlinux-logo-dark-1200dpi.png
diff --git a/media/logos/archlinux-logo-dark-90dpi.png b/media/logos/archlinux-logo-dark-90dpi.png
new file mode 100644
index 00000000..f3757c61
--- /dev/null
+++ b/media/logos/archlinux-logo-dark-90dpi.png
diff --git a/media/logos/archlinux-logo-dark-scalable.svg b/media/logos/archlinux-logo-dark-scalable.svg
new file mode 100644
index 00000000..5a80cc4d
--- /dev/null
+++ b/media/logos/archlinux-logo-dark-scalable.svg
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.0"
+   width="600"
+   height="199.41692"
+   id="svg2424">
+  <defs
+     id="defs2426">
+    <linearGradient
+       x1="112.49854"
+       y1="6.1372099"
+       x2="112.49853"
+       y2="129.3468"
+       id="path1082_2_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(287,-83)">
+      <stop
+         id="stop193"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop195"
+         style="stop-color:#ffffff;stop-opacity:0.27450982"
+         offset="1" />
+      <midPointStop
+         offset="0"
+         style="stop-color:#FFFFFF"
+         id="midPointStop197" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#FFFFFF"
+         id="midPointStop199" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#000000"
+         id="midPointStop201" />
+    </linearGradient>
+    <linearGradient
+       x1="541.33502"
+       y1="104.50665"
+       x2="606.91248"
+       y2="303.14029"
+       id="linearGradient2544"
+       xlink:href="#path1082_2_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.3937741,0,0,0.393752,357.51969,122.00151)" />
+    <linearGradient
+       id="linearGradient3388">
+      <stop
+         id="stop3390"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop3392"
+         style="stop-color:#000000;stop-opacity:0.37113401"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="490.72305"
+       y1="237.72447"
+       x2="490.72305"
+       y2="183.9644"
+       id="linearGradient4416"
+       xlink:href="#linearGradient3388"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.749107,0,0,0.749107,-35.459862,91.44108)" />
+  </defs>
+  <g
+     transform="translate(-34.777313,-129.80241)"
+     id="layer1">
+    <g
+       transform="matrix(0.8746356,0,0,0.8746356,14.730518,23.408954)"
+       id="g2424">
+      <g
+         transform="matrix(0.6378586,0,0,0.6378586,36.486487,2.17139)"
+         id="g2809"
+         style="fill:#4d4d4d;fill-opacity:1">
+        <path
+           d="m 339.96875,309.09375 c -14.47141,-0.0239 -26.4812,2.94367 -31.125,4.5625 l -4.78125,25.8125 c -0.0116,0.0951 23.79543,-6.34855 34.28125,-5.96875 17.36158,0.62381 18.95948,6.63541 18.65625,14.75 0.29595,0.47462 -4.47933,-7.33192 -19.5,-7.59375 -18.94961,-0.32687 -45.69284,6.70947 -45.65625,35.3125 -0.51086,32.17412 24.03361,41.63882 40.75,41.8125 15.02821,-0.27364 22.0777,-5.69136 25.9375,-8.59375 5.07124,-5.30236 10.87308,-10.63447 16.40625,-17.03125 -5.23567,9.51278 -9.77472,16.0898 -14.5,21.125 l 0,4.25 22.84375,-3.84375 0.15625,-62.09375 c -0.23141,-8.78839 5.04123,-42.41827 -43.46875,-42.5 z m -3.28125,54.0625 c 9.46889,0.12995 20.32788,4.79708 20.34375,16.03125 0.049,10.21821 -12.80005,15.71183 -21.15625,15.625 -8.35976,-0.0868 -19.45093,-6.56982 -19.5,-16.53125 0.16016,-8.90444 10.45953,-15.35418 20.3125,-15.125 z"
+           id="path2284"
+           style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 398.50106,314.83145 -0.15505,102.82693 26.61213,-5.12724 0.0449,-58.30157 c 0.006,-8.68089 12.40554,-18.82451 27.9627,-18.66287 3.30202,-5.97408 9.5087,-21.24219 11.02088,-24.71514 -34.75649,-0.0833 -35.19897,9.98993 -41.24398,14.94517 -0.0631,-9.45285 -0.0213,-15.12741 -0.0213,-15.12741 l -24.2202,4.16213 z"
+           id="path2286"
+           style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 548.2688,328.33058 c -0.25696,-0.12068 -13.87938,-15.93419 -41.26638,-16.0589 -25.65249,-0.42638 -54.42578,9.51895 -54.88631,52.5328 0.22457,37.81852 27.6402,52.59809 55.0314,52.88627 29.31292,0.30451 40.97654,-18.32947 41.67615,-18.79124 -3.49762,-3.0321 -16.59792,-16.0131 -16.59792,-16.0131 0,0 -8.18236,11.65102 -24.05802,11.79913 -15.87942,0.1512 -29.68245,-12.27325 -29.87805,-29.60905 -0.20349,-17.33595 12.68881,-26.72821 29.99725,-27.48687 14.98466,-0.003 23.6297,9.67334 23.6297,9.67334 l 16.35218,-18.93238 z"
+           id="path2288"
+           style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 581.8125,278.84375 -25.125,5.90625 0.1875,133.9375 24.75,-4.46875 0.28125,-63.03125 c 0.0529,-6.60927 9.56127,-16.75916 25.4375,-16.4375 15.17973,0.15775 18.57236,10.11767 18.53125,11.375 l 0.4375,72.96875 24.40625,-4.3125 0.0937,-77.375 c 0.1607,-7.44539 -16.30833,-23.16954 -42.78125,-23.28125 -12.58087,0.0202 -19.54815,2.86825 -23.09375,4.96875 -6.06656,4.68565 -12.9998,9.17543 -19.8125,14.90625 6.29809,-8.09099 11.58551,-13.68516 16.75,-17.84375 l -0.0625,-37.3125 z"
+           id="path2290"
+           style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      </g>
+      <g
+         transform="matrix(0.9443373,0,0.01336345,0.9443373,78.345657,-412.48879)"
+         id="g5326"
+         style="fill:#1793d1;fill-opacity:1;stroke:none">
+        <path
+           d="m 400.67581,629.79609 7.68167,-1.91575 -0.92851,91.20792 -7.79574,1.32426 1.04258,-90.61643 z"
+           id="path2292"
+           style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 421.10266,657.01757 6.75064,-2.9867 -0.86808,65.39931 -6.49779,1.33915 0.61523,-63.75176 z m -1.26059,-23.58316 5.47167,-4.41533 4.42261,4.99952 -5.47558,4.53221 -4.4187,-5.1164 z"
+           id="path2294"
+           style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 440.44273,655.82614 7.67755,-1.56201 -0.1573,13.6722 c -0.007,0.58717 4.4194,-15.27364 24.68502,-14.92094 19.67986,0.10952 22.68401,15.34634 22.5291,18.76237 l -0.43759,48.0783 -6.73044,1.45631 0.63316,-47.489 c 0.0974,-1.38684 -2.88144,-13.11441 -16.78906,-13.15754 -13.90509,-0.0404 -23.68364,10.10048 -23.75821,16.57937 l -0.48127,41.83477 -7.80388,2.0313 0.63292,-65.28513 z"
+           id="path2296"
+           style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 561.53301,720.20203 -7.6776,1.56186 0.15737,-13.67198 c 0.007,-0.58742 -4.42201,15.27361 -24.68504,14.92086 -19.67983,-0.10944 -22.68399,-15.34626 -22.52908,-18.76229 l 0.43757,-48.07861 8.15674,-1.64226 -0.54644,47.48988 c -0.0149,1.29682 1.36845,13.29979 15.27604,13.3426 13.90511,0.0405 23.76622,-8.37359 24.01453,-21.04416 l 0.43105,-37.46902 7.5978,-1.93195 -0.63294,65.28507 z"
+           id="path2298"
+           style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 577.45461,655.28678 -5.42715,4.20017 20.19894,26.93328 -22.39092,31.11622 5.63499,4.226 21.04365,-28.8967 20.8779,29.58159 5.32727,-4.20103 -22.37578,-31.62866 18.56963,-25.5775 -5.53193,-4.73429 -16.92109,23.66778 -19.00551,-24.68686 z"
+           id="path2300"
+           style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      </g>
+      <path
+         d="m 105.8125,16.625 c -7.39687,18.135158 -11.858304,29.997682 -20.09375,47.59375 5.04936,5.35232 11.247211,11.585364 21.3125,18.625 C 96.210077,78.390904 88.828713,73.920352 83.3125,69.28125 72.7727,91.274163 56.259864,122.60209 22.75,182.8125 49.087628,167.60733 69.504089,158.23318 88.53125,154.65625 87.714216,151.1422 87.2497,147.34107 87.28125,143.375 l 0.03125,-0.84375 c 0.417917,-16.87382 9.195665,-29.84979 19.59375,-28.96875 10.39809,0.88104 18.48041,15.28242 18.0625,32.15625 -0.0786,3.17512 -0.43674,6.22955 -1.0625,9.0625 18.82058,3.68164 39.01873,13.03179 65,28.03125 -5.123,-9.4318 -9.69572,-17.93388 -14.0625,-26.03125 -6.87839,-5.33121 -14.05289,-12.2698 -28.6875,-19.78125 10.05899,2.61375 17.2611,5.62932 22.875,9 C 124.63297,63.338161 121.03766,52.354109 105.8125,16.625 z"
+         transform="matrix(1.1433333,0,0,1.1433333,22.920168,121.64318)"
+         id="path2518"
+         style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      <g
+         id="text2634"
+         style="font-size:8.44138241px;font-style:normal;font-weight:normal;fill:#1793d1;fill-opacity:1;stroke:none;font-family:DejaVu Sans Mono">
+        <path
+           d="m 685.46692,263.83624 0,-5.32944 -1.99082,0 0,-0.71307 4.7895,0 0,0.71307 -1.99906,0 0,5.32944 -0.79962,0"
+           id="path3945"
+           style="fill:#1793d1;fill-opacity:1" />
+        <path
+           d="m 689.0982,263.83624 0,-6.04251 1.20355,0 1.43026,4.2784 c 0.13189,0.39843 0.22806,0.69658 0.28852,0.89442 0.0687,-0.21983 0.17586,-0.5427 0.3215,-0.96862 l 1.44674,-4.2042 1.07578,0 0,6.04251 -0.77077,0 0,-5.05741 -1.75587,5.05741 -0.72131,0 -1.74763,-5.14396 0,5.14396 -0.77077,0"
+           id="path3947"
+           style="fill:#1793d1;fill-opacity:1" />
+      </g>
+      <g
+         id="text2638"
+         style="font-size:8.25130367px;font-style:normal;font-weight:normal;fill:#1793d1;fill-opacity:1;stroke:none;font-family:DejaVu Sans Mono">
+        <path
+           d="m 239.84053,313.69965 0,-5.20945 -1.94598,0 0,-0.697 4.68164,0 0,0.697 -1.95404,0 0,5.20945 -0.78162,0"
+           id="path3940"
+           style="fill:#1793d1;fill-opacity:1" />
+        <path
+           d="m 243.39004,313.69965 0,-5.90645 1.17646,0 1.39805,4.18205 c 0.12892,0.38947 0.22293,0.6809 0.28202,0.87429 0.0671,-0.21488 0.1719,-0.53048 0.31426,-0.94681 l 1.41417,-4.10953 1.05155,0 0,5.90645 -0.75341,0 0,-4.94353 -1.71634,4.94353 -0.70506,0 -1.70828,-5.02814 0,5.02814 -0.75342,0"
+           id="path3942"
+           style="fill:#1793d1;fill-opacity:1" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/media/logos/archlinux-logo-light-1200dpi.png b/media/logos/archlinux-logo-light-1200dpi.png
new file mode 100644
index 00000000..79e0a0f1
--- /dev/null
+++ b/media/logos/archlinux-logo-light-1200dpi.png
diff --git a/media/logos/archlinux-logo-light-90dpi.png b/media/logos/archlinux-logo-light-90dpi.png
new file mode 100644
index 00000000..95803309
--- /dev/null
+++ b/media/logos/archlinux-logo-light-90dpi.png
diff --git a/media/logos/archlinux-logo-light-scalable.svg b/media/logos/archlinux-logo-light-scalable.svg
new file mode 100644
index 00000000..5fd0716f
--- /dev/null
+++ b/media/logos/archlinux-logo-light-scalable.svg
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.0"
+   width="600"
+   height="199.41692"
+   id="svg2424">
+  <defs
+     id="defs2426">
+    <linearGradient
+       x1="112.49854"
+       y1="6.1372099"
+       x2="112.49853"
+       y2="129.3468"
+       id="path1082_2_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(287,-83)">
+      <stop
+         id="stop193"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop195"
+         style="stop-color:#ffffff;stop-opacity:0.27450982"
+         offset="1" />
+      <midPointStop
+         offset="0"
+         style="stop-color:#FFFFFF"
+         id="midPointStop197" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#FFFFFF"
+         id="midPointStop199" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#000000"
+         id="midPointStop201" />
+    </linearGradient>
+    <linearGradient
+       x1="541.33502"
+       y1="104.50665"
+       x2="606.91248"
+       y2="303.14029"
+       id="linearGradient2544"
+       xlink:href="#path1082_2_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.3937741,0,0,0.393752,357.51969,122.00151)" />
+    <linearGradient
+       id="linearGradient3388">
+      <stop
+         id="stop3390"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop3392"
+         style="stop-color:#000000;stop-opacity:0.37113401"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="490.72305"
+       y1="237.72447"
+       x2="490.72305"
+       y2="183.9644"
+       id="linearGradient4416"
+       xlink:href="#linearGradient3388"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.749107,0,0,0.749107,-35.459862,91.44108)" />
+  </defs>
+  <g
+     transform="translate(-34.777313,-129.80241)"
+     id="layer1">
+    <g
+       transform="matrix(0.8746356,0,0,0.8746356,14.730518,23.408954)"
+       id="g2424">
+      <g
+         transform="matrix(0.6378586,0,0,0.6378586,36.486487,2.17139)"
+         id="g2809"
+         style="fill:#ffffff;fill-opacity:1">
+        <path
+           d="m 339.96875,309.09375 c -14.47141,-0.0239 -26.4812,2.94367 -31.125,4.5625 l -4.78125,25.8125 c -0.0116,0.0951 23.79543,-6.34855 34.28125,-5.96875 17.36158,0.62381 18.95948,6.63541 18.65625,14.75 0.29595,0.47462 -4.47933,-7.33192 -19.5,-7.59375 -18.94961,-0.32687 -45.69284,6.70947 -45.65625,35.3125 -0.51086,32.17412 24.03361,41.63882 40.75,41.8125 15.02821,-0.27364 22.0777,-5.69136 25.9375,-8.59375 5.07124,-5.30236 10.87308,-10.63447 16.40625,-17.03125 -5.23567,9.51278 -9.77472,16.0898 -14.5,21.125 l 0,4.25 22.84375,-3.84375 0.15625,-62.09375 c -0.23141,-8.78839 5.04123,-42.41827 -43.46875,-42.5 z m -3.28125,54.0625 c 9.46889,0.12995 20.32788,4.79708 20.34375,16.03125 0.049,10.21821 -12.80005,15.71183 -21.15625,15.625 -8.35976,-0.0868 -19.45093,-6.56982 -19.5,-16.53125 0.16016,-8.90444 10.45953,-15.35418 20.3125,-15.125 z"
+           id="path2284"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 398.50106,314.83145 -0.15505,102.82693 26.61213,-5.12724 0.0449,-58.30157 c 0.006,-8.68089 12.40554,-18.82451 27.9627,-18.66287 3.30202,-5.97408 9.5087,-21.24219 11.02088,-24.71514 -34.75649,-0.0833 -35.19897,9.98993 -41.24398,14.94517 -0.0631,-9.45285 -0.0213,-15.12741 -0.0213,-15.12741 l -24.2202,4.16213 z"
+           id="path2286"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 548.2688,328.33058 c -0.25696,-0.12068 -13.87938,-15.93419 -41.26638,-16.0589 -25.65249,-0.42638 -54.42578,9.51895 -54.88631,52.5328 0.22457,37.81852 27.6402,52.59809 55.0314,52.88627 29.31292,0.30451 40.97654,-18.32947 41.67615,-18.79124 -3.49762,-3.0321 -16.59792,-16.0131 -16.59792,-16.0131 0,0 -8.18236,11.65102 -24.05802,11.79913 -15.87942,0.1512 -29.68245,-12.27325 -29.87805,-29.60905 -0.20349,-17.33595 12.68881,-26.72821 29.99725,-27.48687 14.98466,-0.003 23.6297,9.67334 23.6297,9.67334 l 16.35218,-18.93238 z"
+           id="path2288"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 581.8125,278.84375 -25.125,5.90625 0.1875,133.9375 24.75,-4.46875 0.28125,-63.03125 c 0.0529,-6.60927 9.56127,-16.75916 25.4375,-16.4375 15.17973,0.15775 18.57236,10.11767 18.53125,11.375 l 0.4375,72.96875 24.40625,-4.3125 0.0937,-77.375 c 0.1607,-7.44539 -16.30833,-23.16954 -42.78125,-23.28125 -12.58087,0.0202 -19.54815,2.86825 -23.09375,4.96875 -6.06656,4.68565 -12.9998,9.17543 -19.8125,14.90625 6.29809,-8.09099 11.58551,-13.68516 16.75,-17.84375 l -0.0625,-37.3125 z"
+           id="path2290"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      </g>
+      <g
+         transform="matrix(0.9443373,0,0.01336345,0.9443373,78.345657,-412.48879)"
+         id="g5326"
+         style="fill:#1793d1;fill-opacity:1;stroke:none">
+        <path
+           d="m 400.67581,629.79609 7.68167,-1.91575 -0.92851,91.20792 -7.79574,1.32426 1.04258,-90.61643 z"
+           id="path2292"
+           style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 421.10266,657.01757 6.75064,-2.9867 -0.86808,65.39931 -6.49779,1.33915 0.61523,-63.75176 z m -1.26059,-23.58316 5.47167,-4.41533 4.42261,4.99952 -5.47558,4.53221 -4.4187,-5.1164 z"
+           id="path2294"
+           style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 440.44273,655.82614 7.67755,-1.56201 -0.1573,13.6722 c -0.007,0.58717 4.4194,-15.27364 24.68502,-14.92094 19.67986,0.10952 22.68401,15.34634 22.5291,18.76237 l -0.43759,48.0783 -6.73044,1.45631 0.63316,-47.489 c 0.0974,-1.38684 -2.88144,-13.11441 -16.78906,-13.15754 -13.90509,-0.0404 -23.68364,10.10048 -23.75821,16.57937 l -0.48127,41.83477 -7.80388,2.0313 0.63292,-65.28513 z"
+           id="path2296"
+           style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 561.53301,720.20203 -7.6776,1.56186 0.15737,-13.67198 c 0.007,-0.58742 -4.42201,15.27361 -24.68504,14.92086 -19.67983,-0.10944 -22.68399,-15.34626 -22.52908,-18.76229 l 0.43757,-48.07861 8.15674,-1.64226 -0.54644,47.48988 c -0.0149,1.29682 1.36845,13.29979 15.27604,13.3426 13.90511,0.0405 23.76622,-8.37359 24.01453,-21.04416 l 0.43105,-37.46902 7.5978,-1.93195 -0.63294,65.28507 z"
+           id="path2298"
+           style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 577.45461,655.28678 -5.42715,4.20017 20.19894,26.93328 -22.39092,31.11622 5.63499,4.226 21.04365,-28.8967 20.8779,29.58159 5.32727,-4.20103 -22.37578,-31.62866 18.56963,-25.5775 -5.53193,-4.73429 -16.92109,23.66778 -19.00551,-24.68686 z"
+           id="path2300"
+           style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      </g>
+      <path
+         d="m 105.8125,16.625 c -7.39687,18.135158 -11.858304,29.997682 -20.09375,47.59375 5.04936,5.35232 11.247211,11.585364 21.3125,18.625 C 96.210077,78.390904 88.828713,73.920352 83.3125,69.28125 72.7727,91.274163 56.259864,122.60209 22.75,182.8125 49.087628,167.60733 69.504089,158.23318 88.53125,154.65625 87.714216,151.1422 87.2497,147.34107 87.28125,143.375 l 0.03125,-0.84375 c 0.417917,-16.87382 9.195665,-29.84979 19.59375,-28.96875 10.39809,0.88104 18.48041,15.28242 18.0625,32.15625 -0.0786,3.17512 -0.43674,6.22955 -1.0625,9.0625 18.82058,3.68164 39.01873,13.03179 65,28.03125 -5.123,-9.4318 -9.69572,-17.93388 -14.0625,-26.03125 -6.87839,-5.33121 -14.05289,-12.2698 -28.6875,-19.78125 10.05899,2.61375 17.2611,5.62932 22.875,9 C 124.63297,63.338161 121.03766,52.354109 105.8125,16.625 z"
+         transform="matrix(1.1433333,0,0,1.1433333,22.920168,121.64318)"
+         id="path2518"
+         style="fill:#1793d1;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      <g
+         id="text2634"
+         style="font-size:8.44138241px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:DejaVu Sans Mono">
+        <path
+           d="m 685.46692,263.83624 0,-5.32944 -1.99082,0 0,-0.71307 4.7895,0 0,0.71307 -1.99906,0 0,5.32944 -0.79962,0"
+           id="path3660"
+           style="fill:#ffffff;fill-opacity:1" />
+        <path
+           d="m 689.0982,263.83624 0,-6.04251 1.20355,0 1.43026,4.2784 c 0.13189,0.39843 0.22806,0.69658 0.28852,0.89442 0.0687,-0.21983 0.17586,-0.5427 0.3215,-0.96862 l 1.44674,-4.2042 1.07578,0 0,6.04251 -0.77077,0 0,-5.05741 -1.75587,5.05741 -0.72131,0 -1.74763,-5.14396 0,5.14396 -0.77077,0"
+           id="path3662"
+           style="fill:#ffffff;fill-opacity:1" />
+      </g>
+      <g
+         id="text2638"
+         style="font-size:8.25130367px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:DejaVu Sans Mono">
+        <path
+           d="m 239.84053,313.69965 0,-5.20945 -1.94598,0 0,-0.697 4.68164,0 0,0.697 -1.95404,0 0,5.20945 -0.78162,0"
+           id="path2883"
+           style="fill:#ffffff;fill-opacity:1" />
+        <path
+           d="m 243.39004,313.69965 0,-5.90645 1.17646,0 1.39805,4.18205 c 0.12892,0.38947 0.22293,0.6809 0.28202,0.87429 0.0671,-0.21488 0.1719,-0.53048 0.31426,-0.94681 l 1.41417,-4.10953 1.05155,0 0,5.90645 -0.75341,0 0,-4.94353 -1.71634,4.94353 -0.70506,0 -1.70828,-5.02814 0,5.02814 -0.75342,0"
+           id="path2885"
+           style="fill:#ffffff;fill-opacity:1" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/media/logos/archlinux-logo-white-1200dpi.png b/media/logos/archlinux-logo-white-1200dpi.png
new file mode 100644
index 00000000..50e700cf
--- /dev/null
+++ b/media/logos/archlinux-logo-white-1200dpi.png
diff --git a/media/logos/archlinux-logo-white-90dpi.png b/media/logos/archlinux-logo-white-90dpi.png
new file mode 100644
index 00000000..86679601
--- /dev/null
+++ b/media/logos/archlinux-logo-white-90dpi.png
diff --git a/media/logos/archlinux-logo-white-scalable.svg b/media/logos/archlinux-logo-white-scalable.svg
new file mode 100644
index 00000000..70eb2dfe
--- /dev/null
+++ b/media/logos/archlinux-logo-white-scalable.svg
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.0"
+   width="600"
+   height="199.41692"
+   id="svg2424">
+  <defs
+     id="defs2426">
+    <linearGradient
+       x1="112.49854"
+       y1="6.1372099"
+       x2="112.49853"
+       y2="129.3468"
+       id="path1082_2_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(287,-83)">
+      <stop
+         id="stop193"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop195"
+         style="stop-color:#ffffff;stop-opacity:0.27450982"
+         offset="1" />
+      <midPointStop
+         offset="0"
+         style="stop-color:#FFFFFF"
+         id="midPointStop197" />
+      <midPointStop
+         offset="0.5"
+         style="stop-color:#FFFFFF"
+         id="midPointStop199" />
+      <midPointStop
+         offset="1"
+         style="stop-color:#000000"
+         id="midPointStop201" />
+    </linearGradient>
+    <linearGradient
+       x1="541.33502"
+       y1="104.50665"
+       x2="606.91248"
+       y2="303.14029"
+       id="linearGradient2544"
+       xlink:href="#path1082_2_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.3937741,0,0,0.393752,357.51969,122.00151)" />
+    <linearGradient
+       id="linearGradient3388">
+      <stop
+         id="stop3390"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop3392"
+         style="stop-color:#000000;stop-opacity:0.37113401"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="490.72305"
+       y1="237.72447"
+       x2="490.72305"
+       y2="183.9644"
+       id="linearGradient4416"
+       xlink:href="#linearGradient3388"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.749107,0,0,0.749107,-35.459862,91.44108)" />
+  </defs>
+  <g
+     transform="translate(-34.777313,-129.80241)"
+     id="layer1">
+    <g
+       transform="matrix(0.8746356,0,0,0.8746356,14.730518,23.408954)"
+       id="g2424"
+       style="fill:#1a1a1a">
+      <g
+         transform="matrix(0.6378586,0,0,0.6378586,36.486487,2.17139)"
+         id="g2809"
+         style="fill:#ffffff;fill-opacity:1">
+        <path
+           d="m 339.96875,309.09375 c -14.47141,-0.0239 -26.4812,2.94367 -31.125,4.5625 l -4.78125,25.8125 c -0.0116,0.0951 23.79543,-6.34855 34.28125,-5.96875 17.36158,0.62381 18.95948,6.63541 18.65625,14.75 0.29595,0.47462 -4.47933,-7.33192 -19.5,-7.59375 -18.94961,-0.32687 -45.69284,6.70947 -45.65625,35.3125 -0.51086,32.17412 24.03361,41.63882 40.75,41.8125 15.02821,-0.27364 22.0777,-5.69136 25.9375,-8.59375 5.07124,-5.30236 10.87308,-10.63447 16.40625,-17.03125 -5.23567,9.51278 -9.77472,16.0898 -14.5,21.125 l 0,4.25 22.84375,-3.84375 0.15625,-62.09375 c -0.23141,-8.78839 5.04123,-42.41827 -43.46875,-42.5 z m -3.28125,54.0625 c 9.46889,0.12995 20.32788,4.79708 20.34375,16.03125 0.049,10.21821 -12.80005,15.71183 -21.15625,15.625 -8.35976,-0.0868 -19.45093,-6.56982 -19.5,-16.53125 0.16016,-8.90444 10.45953,-15.35418 20.3125,-15.125 z"
+           id="path2284"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 398.50106,314.83145 -0.15505,102.82693 26.61213,-5.12724 0.0449,-58.30157 c 0.006,-8.68089 12.40554,-18.82451 27.9627,-18.66287 3.30202,-5.97408 9.5087,-21.24219 11.02088,-24.71514 -34.75649,-0.0833 -35.19897,9.98993 -41.24398,14.94517 -0.0631,-9.45285 -0.0213,-15.12741 -0.0213,-15.12741 l -24.2202,4.16213 z"
+           id="path2286"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 548.2688,328.33058 c -0.25696,-0.12068 -13.87938,-15.93419 -41.26638,-16.0589 -25.65249,-0.42638 -54.42578,9.51895 -54.88631,52.5328 0.22457,37.81852 27.6402,52.59809 55.0314,52.88627 29.31292,0.30451 40.97654,-18.32947 41.67615,-18.79124 -3.49762,-3.0321 -16.59792,-16.0131 -16.59792,-16.0131 0,0 -8.18236,11.65102 -24.05802,11.79913 -15.87942,0.1512 -29.68245,-12.27325 -29.87805,-29.60905 -0.20349,-17.33595 12.68881,-26.72821 29.99725,-27.48687 14.98466,-0.003 23.6297,9.67334 23.6297,9.67334 l 16.35218,-18.93238 z"
+           id="path2288"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 581.8125,278.84375 -25.125,5.90625 0.1875,133.9375 24.75,-4.46875 0.28125,-63.03125 c 0.0529,-6.60927 9.56127,-16.75916 25.4375,-16.4375 15.17973,0.15775 18.57236,10.11767 18.53125,11.375 l 0.4375,72.96875 24.40625,-4.3125 0.0937,-77.375 c 0.1607,-7.44539 -16.30833,-23.16954 -42.78125,-23.28125 -12.58087,0.0202 -19.54815,2.86825 -23.09375,4.96875 -6.06656,4.68565 -12.9998,9.17543 -19.8125,14.90625 6.29809,-8.09099 11.58551,-13.68516 16.75,-17.84375 l -0.0625,-37.3125 z"
+           id="path2290"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      </g>
+      <g
+         transform="matrix(0.9443373,0,0.01336345,0.9443373,78.345657,-412.48879)"
+         id="g5326"
+         style="fill:#ffffff;fill-opacity:1;stroke:none">
+        <path
+           d="m 400.67581,629.79609 7.68167,-1.91575 -0.92851,91.20792 -7.79574,1.32426 1.04258,-90.61643 z"
+           id="path2292"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 421.10266,657.01757 6.75064,-2.9867 -0.86808,65.39931 -6.49779,1.33915 0.61523,-63.75176 z m -1.26059,-23.58316 5.47167,-4.41533 4.42261,4.99952 -5.47558,4.53221 -4.4187,-5.1164 z"
+           id="path2294"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 440.44273,655.82614 7.67755,-1.56201 -0.1573,13.6722 c -0.007,0.58717 4.4194,-15.27364 24.68502,-14.92094 19.67986,0.10952 22.68401,15.34634 22.5291,18.76237 l -0.43759,48.0783 -6.73044,1.45631 0.63316,-47.489 c 0.0974,-1.38684 -2.88144,-13.11441 -16.78906,-13.15754 -13.90509,-0.0404 -23.68364,10.10048 -23.75821,16.57937 l -0.48127,41.83477 -7.80388,2.0313 0.63292,-65.28513 z"
+           id="path2296"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 561.53301,720.20203 -7.6776,1.56186 0.15737,-13.67198 c 0.007,-0.58742 -4.42201,15.27361 -24.68504,14.92086 -19.67983,-0.10944 -22.68399,-15.34626 -22.52908,-18.76229 l 0.43757,-48.07861 8.15674,-1.64226 -0.54644,47.48988 c -0.0149,1.29682 1.36845,13.29979 15.27604,13.3426 13.90511,0.0405 23.76622,-8.37359 24.01453,-21.04416 l 0.43105,-37.46902 7.5978,-1.93195 -0.63294,65.28507 z"
+           id="path2298"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+        <path
+           d="m 577.45461,655.28678 -5.42715,4.20017 20.19894,26.93328 -22.39092,31.11622 5.63499,4.226 21.04365,-28.8967 20.8779,29.58159 5.32727,-4.20103 -22.37578,-31.62866 18.56963,-25.5775 -5.53193,-4.73429 -16.92109,23.66778 -19.00551,-24.68686 z"
+           id="path2300"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      </g>
+      <path
+         d="m 105.8125,16.625 c -7.39687,18.135158 -11.858304,29.997682 -20.09375,47.59375 5.04936,5.35232 11.247211,11.585364 21.3125,18.625 C 96.210077,78.390904 88.828713,73.920352 83.3125,69.28125 72.7727,91.274163 56.259864,122.60209 22.75,182.8125 49.087628,167.60733 69.504089,158.23318 88.53125,154.65625 87.714216,151.1422 87.2497,147.34107 87.28125,143.375 l 0.03125,-0.84375 c 0.417917,-16.87382 9.195665,-29.84979 19.59375,-28.96875 10.39809,0.88104 18.48041,15.28242 18.0625,32.15625 -0.0786,3.17512 -0.43674,6.22955 -1.0625,9.0625 18.82058,3.68164 39.01873,13.03179 65,28.03125 -5.123,-9.4318 -9.69572,-17.93388 -14.0625,-26.03125 -6.87839,-5.33121 -14.05289,-12.2698 -28.6875,-19.78125 10.05899,2.61375 17.2611,5.62932 22.875,9 C 124.63297,63.338161 121.03766,52.354109 105.8125,16.625 z"
+         transform="matrix(1.1433333,0,0,1.1433333,22.920168,121.64318)"
+         id="path2518"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      <g
+         id="text2634"
+         style="font-size:8.44138241px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:DejaVu Sans Mono">
+        <path
+           d="m 685.46692,263.83624 0,-5.32944 -1.99082,0 0,-0.71307 4.7895,0 0,0.71307 -1.99906,0 0,5.32944 -0.79962,0"
+           id="path7858"
+           style="fill:#ffffff" />
+        <path
+           d="m 689.0982,263.83624 0,-6.04251 1.20355,0 1.43026,4.2784 c 0.13189,0.39843 0.22806,0.69658 0.28852,0.89442 0.0687,-0.21983 0.17586,-0.5427 0.3215,-0.96862 l 1.44674,-4.2042 1.07578,0 0,6.04251 -0.77077,0 0,-5.05741 -1.75587,5.05741 -0.72131,0 -1.74763,-5.14396 0,5.14396 -0.77077,0"
+           id="path7860"
+           style="fill:#ffffff" />
+      </g>
+      <g
+         id="text2638"
+         style="font-size:8.25130367px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;font-family:DejaVu Sans Mono">
+        <path
+           d="m 239.84053,313.69965 0,-5.20945 -1.94598,0 0,-0.697 4.68164,0 0,0.697 -1.95404,0 0,5.20945 -0.78162,0"
+           id="path7853"
+           style="fill:#ffffff" />
+        <path
+           d="m 243.39004,313.69965 0,-5.90645 1.17646,0 1.39805,4.18205 c 0.12892,0.38947 0.22293,0.6809 0.28202,0.87429 0.0671,-0.21488 0.1719,-0.53048 0.31426,-0.94681 l 1.41417,-4.10953 1.05155,0 0,5.90645 -0.75341,0 0,-4.94353 -1.71634,4.94353 -0.70506,0 -1.70828,-5.02814 0,5.02814 -0.75342,0"
+           id="path7855"
+           style="fill:#ffffff" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/media/logos/legacy/arch-legacy-aqua-blue.png b/media/logos/legacy/arch-legacy-aqua-blue.png
new file mode 100644
index 00000000..9637ce72
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-aqua-blue.png
diff --git a/media/logos/legacy/arch-legacy-aqua-blue.svg b/media/logos/legacy/arch-legacy-aqua-blue.svg
new file mode 100644
index 00000000..f4c80109
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-aqua-blue.svg
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="300"
+   height="248.04205"
+   id="svg1374">
+  <defs
+     id="defs1376">
+    <linearGradient
+       id="linearGradient21348">
+      <stop
+         id="stop21350"
+         style="stop-color:#edd400;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop21352"
+         style="stop-color:#baa600;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient21338">
+      <stop
+         id="stop21340"
+         style="stop-color:#baa400;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop21346"
+         style="stop-color:#baa600;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop21342"
+         style="stop-color:#604e00;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop21344"
+         style="stop-color:#604e00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient21320">
+      <stop
+         id="stop21322"
+         style="stop-color:#edd400;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop21326"
+         style="stop-color:#604e00;stop-opacity:1"
+         offset="0.583691" />
+      <stop
+         id="stop21324"
+         style="stop-color:#604e00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient16135">
+      <stop
+         id="stop16137"
+         style="stop-color:#edd400;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop16139"
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8716">
+      <stop
+         id="stop8718"
+         style="stop-color:#a4bfda;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop8720"
+         style="stop-color:#387cbf;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient639">
+      <stop
+         id="stop640"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop641"
+         style="stop-color:#8e8e8e;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2882">
+      <stop
+         id="stop2884"
+         style="stop-color:#f2f9ff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2886"
+         style="stop-color:#91afcb;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5721">
+      <stop
+         id="stop5723"
+         style="stop-color:#9c9c9c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5725"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="18.384777"
+       cy="40.575378"
+       r="21.213203"
+       fx="18.384777"
+       fy="40.575378"
+       id="radialGradient5727"
+       xlink:href="#linearGradient5721"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.943831,0,0,0.166667,1.032663,33.81282)" />
+    <linearGradient
+       x1="21"
+       y1="46.714287"
+       x2="21"
+       y2="5.9534397"
+       id="linearGradient7976"
+       xlink:href="#linearGradient2882"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.049587,0,0,6.049587,-6.7672949,-229.41232)" />
+    <radialGradient
+       cx="16.380457"
+       cy="17.796696"
+       r="17.033163"
+       fx="16.380457"
+       fy="17.796696"
+       id="radialGradient8714"
+       xlink:href="#linearGradient8716"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-4.28975,5.8394364,-3.6097583,-2.6518001,229.06139,-211.11919)" />
+    <linearGradient
+       x1="43.25"
+       y1="20"
+       x2="40.875"
+       y2="28.625"
+       id="linearGradient11647"
+       xlink:href="#linearGradient5721"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.049587,0,0,6.049587,-6.7672949,-229.41232)" />
+    <linearGradient
+       x1="7.9400997"
+       y1="-5.1101465"
+       x2="9.2488842"
+       y2="4.7730908"
+       id="linearGradient19853"
+       xlink:href="#linearGradient21348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.791154,-0.487172,0.327682,1.176225,16.97405,35.22976)" />
+    <linearGradient
+       x1="11.441825"
+       y1="-0.98001873"
+       x2="13.598524"
+       y2="-1.084087"
+       id="linearGradient22817"
+       xlink:href="#linearGradient21348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.05655608,-0.797121,1.172062,0.350025,16.04368,50.1682)" />
+  </defs>
+  <g
+     transform="translate(-1.3401681,202.61015)"
+     id="layer1">
+    <path
+       d="m 39.59798,40.575378 a 21.213203,3.5355339 0 1 1 -42.4264064,0 21.213203,3.5355339 0 1 1 42.4264064,0 z"
+       transform="matrix(6.049587,0,0,6.049587,61.788742,-221.4209)"
+       id="path4993"
+       style="opacity:0.75800003;fill:url(#radialGradient5727);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       d="m 199.6749,-130.05945 c -0.80514,-5.21726 80.32449,15.61015 75.63475,51.174694 C 272.2943,-42.526817 214.443,-8.8536668 109.88644,9.7868891 61.22048,16.547151 39.641628,17.11093 39.614886,13.571251 39.159345,10.457456 195.44786,-7.2796974 233.86883,-75.443533 254.72463,-114.97824 200.58539,-124.15944 199.6749,-130.05945 z"
+       id="path632"
+       style="font-size:12px;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       d="m 235.71765,14.109119 c 1.28598,14.283493 0.82868,17.237639 -2.75941,17.01689 -4.65407,-0.301312 -3.86845,-6.320446 -5.23544,-10.365544 -14.58932,-49.579566 -47.758,-126.717715 -97.56788,-126.717715 -49.5267,0 -70.877114,63.589737 -88.838201,116.078161 -2.657278,8.203464 -5.899296,20.7294 -22.419973,21.019913 C 7.067886,31.171943 3.8558814,20.127315 4.4278566,12.978034 13.493654,-107.28005 56.917475,-197.5748 121.1693,-199.56337 c 54.61226,-1.69066 103.80617,94.34025 114.54835,213.672489 z"
+       id="path630"
+       style="font-size:12px;fill:#dadada;fill-opacity:1;fill-rule:evenodd;stroke:#383838;stroke-width:6.04958677;stroke-opacity:1" />
+    <path
+       d="m 235.71765,14.109119 c 1.28598,14.283493 0.82868,17.237639 -2.75941,17.01689 -4.65407,-0.301312 -3.86845,-6.320446 -5.23544,-10.365544 -14.58932,-49.579566 -47.758,-126.717715 -97.56788,-126.717715 -49.5267,0 -70.877114,63.589737 -88.838201,116.078161 -2.657278,8.203464 -5.899296,20.7294 -22.419973,21.019913 C 7.067886,31.171943 3.8558814,20.127315 4.4278566,12.978034 13.493654,-107.28005 56.917475,-197.5748 121.1693,-199.56337 c 54.61226,-1.69066 103.80617,94.34025 114.54835,213.672489 z"
+       id="path5053"
+       style="font-size:12px;fill:url(#linearGradient7976);fill-opacity:1;fill-rule:evenodd;stroke:#003870;stroke-width:6.04958677;stroke-opacity:1" />
+    <path
+       d="m 121.59738,-189.71191 c -27.618072,0.85477 -51.778483,20.62549 -70.893599,56.71488 -19.115116,36.089393 -32.028124,87.561051 -36.486571,146.702485 -0.134733,1.684059 0.328558,4.543893 1.134297,5.860537 0.805739,1.316644 0.722447,1.708996 3.591943,1.701446 5.805524,-0.102086 6.81364,-1.363244 8.507231,-3.591942 1.693591,-2.228698 3.106936,-6.171353 4.537191,-10.5867771 -6.09e-4,-0.063013 -6.09e-4,-0.1260371 0,-0.1890496 8.973448,-26.2234833 18.804506,-55.6974943 33.461777,-79.5898783 14.657272,-23.892384 35.702511,-43.103311 64.654961,-43.103311 29.95424,0 52.97874,22.593499 70.1374,49.341948 7.78014,12.128387 20.44288,45.938397 20.03926,38.755166 -1.17245,-20.865564 -19.29823,-78.019704 -34.02893,-105.867774 -9.82047,-18.56538 -20.79691,-33.21568 -31.94938,-42.72521 -11.15248,-9.50952 -21.96109,-13.75514 -32.70558,-13.42252 z"
+       id="path5786"
+       style="font-size:12px;fill:url(#radialGradient8714);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       d="m 230.86804,-117.11686 c 6.79223,5.31572 12.18052,13.01615 12.85772,21.804027 0.72019,8.15085 -1.63702,16.481483 -5.89805,23.383021 -1.02797,1.967295 -5.37583,4.963311 -4.60352,5.954046 8.08567,-1.669118 11.16767,-4.733252 17.94933,-8.576881 6.98305,-3.957767 11.19471,6.893589 16.93729,-3.052851 4.68068,-8.107179 0.0257,-14.768899 -5.02515,-19.914158 -7.63806,-8.007254 -17.49751,-13.508574 -27.50561,-17.997994 -1.55104,-0.59054 -3.17397,-0.97216 -4.71201,-1.59921 z"
+       id="path9450"
+       style="font-size:12px;fill:url(#linearGradient11647);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+  </g>
+</svg>
diff --git a/media/logos/legacy/arch-legacy-aqua-white.png b/media/logos/legacy/arch-legacy-aqua-white.png
new file mode 100644
index 00000000..25fe9001
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-aqua-white.png
diff --git a/media/logos/legacy/arch-legacy-aqua-white.svg b/media/logos/legacy/arch-legacy-aqua-white.svg
new file mode 100644
index 00000000..60b554fa
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-aqua-white.svg
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="300"
+   height="248.04205"
+   id="svg1374">
+  <defs
+     id="defs1376">
+    <linearGradient
+       id="linearGradient21348">
+      <stop
+         id="stop21350"
+         style="stop-color:#edd400;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop21352"
+         style="stop-color:#baa600;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient21338">
+      <stop
+         id="stop21340"
+         style="stop-color:#baa400;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop21346"
+         style="stop-color:#baa600;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop21342"
+         style="stop-color:#604e00;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop21344"
+         style="stop-color:#604e00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient21320">
+      <stop
+         id="stop21322"
+         style="stop-color:#edd400;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop21326"
+         style="stop-color:#604e00;stop-opacity:1"
+         offset="0.583691" />
+      <stop
+         id="stop21324"
+         style="stop-color:#604e00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient16135">
+      <stop
+         id="stop16137"
+         style="stop-color:#edd400;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop16139"
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8716">
+      <stop
+         id="stop8718"
+         style="stop-color:#f2f2f2;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop8720"
+         style="stop-color:#cccccc;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient639">
+      <stop
+         id="stop640"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop641"
+         style="stop-color:#8e8e8e;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2882">
+      <stop
+         id="stop2884"
+         style="stop-color:#f9f9f9;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2886"
+         style="stop-color:#e3e3e3;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5721">
+      <stop
+         id="stop5723"
+         style="stop-color:#9c9c9c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5725"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="18.384777"
+       cy="40.575378"
+       r="21.213203"
+       fx="18.384777"
+       fy="40.575378"
+       id="radialGradient5727"
+       xlink:href="#linearGradient5721"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.943831,0,0,0.166667,1.032663,33.81282)" />
+    <linearGradient
+       x1="21"
+       y1="46.714287"
+       x2="21"
+       y2="5.9534397"
+       id="linearGradient7976"
+       xlink:href="#linearGradient2882"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.049587,0,0,6.049587,-6.7672949,-229.41232)" />
+    <radialGradient
+       cx="16.380457"
+       cy="17.796696"
+       r="17.033163"
+       fx="16.380457"
+       fy="17.796696"
+       id="radialGradient8714"
+       xlink:href="#linearGradient8716"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-4.28975,5.8394364,-3.6097583,-2.6518001,229.06139,-211.11919)" />
+    <linearGradient
+       x1="43.25"
+       y1="20"
+       x2="40.875"
+       y2="28.625"
+       id="linearGradient11647"
+       xlink:href="#linearGradient5721"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.049587,0,0,6.049587,-6.7672949,-229.41232)" />
+    <linearGradient
+       x1="7.9400997"
+       y1="-5.1101465"
+       x2="9.2488842"
+       y2="4.7730908"
+       id="linearGradient19853"
+       xlink:href="#linearGradient21348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.791154,-0.487172,0.327682,1.176225,16.97405,35.22976)" />
+    <linearGradient
+       x1="11.441825"
+       y1="-0.98001873"
+       x2="13.598524"
+       y2="-1.084087"
+       id="linearGradient22817"
+       xlink:href="#linearGradient21348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.05655608,-0.797121,1.172062,0.350025,16.04368,50.1682)" />
+  </defs>
+  <g
+     transform="translate(-1.3401681,202.61015)"
+     id="layer1">
+    <path
+       d="m 39.59798,40.575378 a 21.213203,3.5355339 0 1 1 -42.4264064,0 21.213203,3.5355339 0 1 1 42.4264064,0 z"
+       transform="matrix(6.049587,0,0,6.049587,61.788742,-221.4209)"
+       id="path4993"
+       style="opacity:0.75800003;fill:url(#radialGradient5727);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       d="m 199.6749,-130.05945 c -0.80514,-5.21726 80.32449,15.61015 75.63475,51.174694 C 272.2943,-42.526817 214.443,-8.8536668 109.88644,9.7868891 61.22048,16.547151 39.641628,17.11093 39.614886,13.571251 39.159345,10.457456 195.44786,-7.2796974 233.86883,-75.443533 254.72463,-114.97824 200.58539,-124.15944 199.6749,-130.05945 z"
+       id="path632"
+       style="font-size:12px;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       d="m 235.71765,14.109119 c 1.28598,14.283493 0.82868,17.237639 -2.75941,17.01689 -4.65407,-0.301312 -3.86845,-6.320446 -5.23544,-10.365544 -14.58932,-49.579566 -47.758,-126.717715 -97.56788,-126.717715 -49.5267,0 -70.877114,63.589737 -88.838201,116.078161 -2.657278,8.203464 -5.899296,20.7294 -22.419973,21.019913 C 7.067886,31.171943 3.8558814,20.127315 4.4278566,12.978034 13.493654,-107.28005 56.917475,-197.5748 121.1693,-199.56337 c 54.61226,-1.69066 103.80617,94.34025 114.54835,213.672489 z"
+       id="path630"
+       style="font-size:12px;fill:#dadada;fill-opacity:1;fill-rule:evenodd;stroke:#383838;stroke-width:6.04958677;stroke-opacity:1" />
+    <path
+       d="m 235.71765,14.109119 c 1.28598,14.283493 0.82868,17.237639 -2.75941,17.01689 -4.65407,-0.301312 -3.86845,-6.320446 -5.23544,-10.365544 -14.58932,-49.579566 -47.758,-126.717715 -97.56788,-126.717715 -49.5267,0 -70.877114,63.589737 -88.838201,116.078161 -2.657278,8.203464 -5.899296,20.7294 -22.419973,21.019913 C 7.067886,31.171943 3.8558814,20.127315 4.4278566,12.978034 13.493654,-107.28005 56.917475,-197.5748 121.1693,-199.56337 c 54.61226,-1.69066 103.80617,94.34025 114.54835,213.672489 z"
+       id="path5053"
+       style="font-size:12px;fill:url(#linearGradient7976);fill-opacity:1;fill-rule:evenodd;stroke:#323232;stroke-width:6.04958677;stroke-opacity:1" />
+    <path
+       d="m 121.59738,-189.71191 c -27.618072,0.85477 -51.778483,20.62549 -70.893599,56.71488 -19.115116,36.089393 -32.028124,87.561051 -36.486571,146.702485 -0.134733,1.684059 0.328558,4.543893 1.134297,5.860537 0.805739,1.316644 0.722447,1.708996 3.591943,1.701446 5.805524,-0.102086 6.81364,-1.363244 8.507231,-3.591942 1.693591,-2.228698 3.106936,-6.171353 4.537191,-10.5867771 -6.09e-4,-0.063013 -6.09e-4,-0.1260371 0,-0.1890496 8.973448,-26.2234833 18.804506,-55.6974943 33.461777,-79.5898783 14.657272,-23.892384 35.702511,-43.103311 64.654961,-43.103311 29.95424,0 52.97874,22.593499 70.1374,49.341948 7.78014,12.128387 20.44288,45.938397 20.03926,38.755166 -1.17245,-20.865564 -19.29823,-78.019704 -34.02893,-105.867774 -9.82047,-18.56538 -20.79691,-33.21568 -31.94938,-42.72521 -11.15248,-9.50952 -21.96109,-13.75514 -32.70558,-13.42252 z"
+       id="path5786"
+       style="font-size:12px;fill:url(#radialGradient8714);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       d="m 230.86804,-117.11686 c 6.79223,5.31572 12.18052,13.01615 12.85772,21.804027 0.72019,8.15085 -1.63702,16.481483 -5.89805,23.383021 -1.02797,1.967295 -5.37583,4.963311 -4.60352,5.954046 8.08567,-1.669118 11.16767,-4.733252 17.94933,-8.576881 6.98305,-3.957767 11.19471,6.893589 16.93729,-3.052851 4.68068,-8.107179 0.0257,-14.768899 -5.02515,-19.914158 -7.63806,-8.007254 -17.49751,-13.508574 -27.50561,-17.997994 -1.55104,-0.59054 -3.17397,-0.97216 -4.71201,-1.59921 z"
+       id="path9450"
+       style="font-size:12px;fill:url(#linearGradient11647);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+  </g>
+</svg>
diff --git a/media/logos/legacy/arch-legacy-aqua.png b/media/logos/legacy/arch-legacy-aqua.png
new file mode 100644
index 00000000..881e1709
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-aqua.png
diff --git a/media/logos/legacy/arch-legacy-aqua.svg b/media/logos/legacy/arch-legacy-aqua.svg
new file mode 100644
index 00000000..30860912
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-aqua.svg
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.0"
+   width="300"
+   height="264.97537"
+   id="svg602"
+   xml:space="preserve"><defs
+     id="defs604"><linearGradient
+       id="linearGradient655"><stop
+         id="stop656"
+         style="stop-color:#ffffff;stop-opacity:0.91759998"
+         offset="0" /><stop
+         id="stop657"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" /></linearGradient><linearGradient
+       id="linearGradient652"><stop
+         id="stop653"
+         style="stop-color:#ffffff;stop-opacity:0.74119997"
+         offset="0" /><stop
+         id="stop654"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" /></linearGradient><linearGradient
+       id="linearGradient649"><stop
+         id="stop650"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" /><stop
+         id="stop651"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" /></linearGradient><linearGradient
+       id="linearGradient643"><stop
+         id="stop644"
+         style="stop-color:#001e87;stop-opacity:1"
+         offset="0" /><stop
+         id="stop645"
+         style="stop-color:#85aee8;stop-opacity:1"
+         offset="1" /></linearGradient><linearGradient
+       id="linearGradient639"><stop
+         id="stop640"
+         style="stop-color:#000000;stop-opacity:0.66670001"
+         offset="0" /><stop
+         id="stop641"
+         style="stop-color:#ffffff;stop-opacity:0.66670001"
+         offset="1" /></linearGradient><linearGradient
+       x1="262.13797"
+       y1="131.27525"
+       x2="258.51834"
+       y2="412.16269"
+       id="linearGradient642"
+       xlink:href="#linearGradient643"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.54976303,0,0,0.54672932,-12.778504,-9.9453842)" /><linearGradient
+       x1="330.06006"
+       y1="210.7088"
+       x2="78.073174"
+       y2="615.28638"
+       id="linearGradient646"
+       xlink:href="#linearGradient639"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.69551382,0,0,0.43215756,-12.778504,-9.9453842)" /><linearGradient
+       x1="311.32385"
+       y1="56.541351"
+       x2="347.72528"
+       y2="225.29604"
+       id="linearGradient648"
+       xlink:href="#linearGradient652"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.54666224,0,0,0.54983046,-5.0249849,-4.1302342)" /><linearGradient
+       x1="307.68372"
+       y1="52.872341"
+       x2="304.04358"
+       y2="181.27307"
+       id="linearGradient659"
+       xlink:href="#linearGradient652"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.54666224,0,0,0.54983046,-5.0249849,-4.1302342)" /><linearGradient
+       x1="406.30573"
+       y1="222.42775"
+       x2="356.68286"
+       y2="275.92722"
+       id="linearGradient662"
+       xlink:href="#linearGradient655"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.68606785,0,0,0.43810761,-5.0249849,-4.1302342)" /></defs><path
+     d="m 216.09826,76.926076 c -0.89084,-5.77257 88.87404,17.27167 83.68513,56.621614 -3.33629,40.22779 -67.34515,77.48503 -183.03046,98.10965 -53.845848,7.4798 -77.721499,8.10359 -77.751088,4.18715 C 38.497814,232.39927 211.4213,212.77422 253.93171,137.35519 277.00736,93.612496 217.10566,83.454076 216.09826,76.926076 z"
+     id="path632"
+     style="font-size:12px;fill:url(#linearGradient646);fill-rule:evenodd;stroke-width:2.2874999" /><path
+     d="m 215.29024,77.151116 c -0.89084,-5.77257 84.83611,21.89254 79.6472,61.242484 -20.78169,33.44349 -67.34515,77.48504 -183.03046,98.10965 -53.84585,7.4798 -77.721495,8.10359 -77.751084,4.18716 C 33.651868,237.24519 208.99832,220.0431 249.08576,142.2011 281.85332,131.41084 216.29769,83.679116 215.29024,77.151116 z"
+     id="path661"
+     style="font-size:12px;fill:url(#linearGradient662);fill-rule:evenodd;stroke-width:2.2874999" /><path
+     d="m 255.97732,236.43961 c 1.42285,15.8038 0.91688,19.07237 -3.05312,18.82813 -5.14944,-0.33339 -4.2802,-6.99318 -5.79269,-11.46883 -16.14217,-54.85669 -52.84124,-140.20525 -107.95277,-140.20525 -54.798199,0 -78.421104,70.35808 -98.293926,128.43325 -2.940112,9.07662 -6.527202,22.93579 -24.8063,23.25722 C 2.9906175,255.31856 -0.5632645,243.09837 0.0695905,235.18814 10.100329,102.13007 58.146075,2.2245558 129.23672,0.02432583 189.66177,-1.8462842 244.09177,104.40594 255.97732,236.43961 z"
+     id="path630"
+     style="font-size:12px;fill:url(#linearGradient642);fill-rule:evenodd" /><path
+     d="m 255.97729,247.06089 c 1.42286,15.02381 0.91689,18.13104 -3.05311,17.89886 -5.14944,-0.31694 -4.2802,-6.64807 -5.79269,-10.90277 -16.14217,-52.1493 -52.84125,-142.0082 -107.95277,-142.0082 -54.798202,0 -78.421106,75.60828 -98.293907,130.81717 -2.940112,8.62865 -6.527202,21.80383 -24.8063,22.10937 C 2.9906175,265.00805 -0.5632655,253.39097 0.0695895,245.87115 10.100328,119.38011 58.146053,8.8986858 129.2367,6.8070558 189.66175,5.0287458 244.09175,121.54371 255.97729,247.06089 z"
+     id="path658"
+     style="font-size:12px;fill:url(#linearGradient659);fill-rule:evenodd" /><path
+     d="m 255.97729,247.06089 c 1.42286,15.02381 0.91689,18.13104 -3.05311,17.89886 -5.14944,-0.31694 -4.2802,-6.64807 -5.79269,-10.90277 -16.14217,-52.1493 -52.84125,-142.0082 -107.95277,-142.0082 -54.798202,0 -78.421106,75.60828 -98.293907,130.81717 -2.940112,8.62865 -6.527202,21.80383 -24.8063,22.10937 C 2.9906175,265.00805 -0.5632655,253.39097 0.0695895,245.87115 10.100328,119.38011 58.146053,8.8986858 129.2367,6.8070558 189.66175,5.0287458 244.09175,121.54371 255.97729,247.06089 z"
+     id="path663"
+     style="font-size:12px;fill:url(#linearGradient648);fill-rule:evenodd" /></svg>
\ No newline at end of file
diff --git a/media/logos/legacy/arch-legacy-blue1.png b/media/logos/legacy/arch-legacy-blue1.png
new file mode 100644
index 00000000..3ed6c248
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-blue1.png
diff --git a/media/logos/legacy/arch-legacy-blue1.svg b/media/logos/legacy/arch-legacy-blue1.svg
new file mode 100644
index 00000000..5a6f2c71
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-blue1.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="486.33548"
+   height="100"
+   id="svg548">
+  <defs
+     id="defs550" />
+  <path
+     d="m 84.716671,30.391226 c 5.25361,0.93458 36.268409,10.24 32.781559,22.44329 -7.94845,28.48793 -61.13637,38.03005 -100.46497,39.38466 31.362814,-6.45502 70.137021,-18.45587 79.952666,-36.82924 8.678824,-16.96165 -9.153005,-22.19399 -12.269255,-24.99871 z"
+     id="path600"
+     style="fill-rule:evenodd" />
+  <path
+     d="M 98.474241,99.220446 C 97.072371,93.768736 83.520976,40.498506 54.54941,40.342736 42.088551,39.719686 29.921495,53.851996 23.262666,69.749096 16.195565,86.093206 16.005538,99.840346 5.4845306,99.999256 -4.6262938,100.15424 1.4346852,76.011926 6.2633466,58.411076 11.092006,38.940866 26.66819,0.1562656 49.409224,4.9560049e-4 72.15046,-0.1552644 86.480671,36.448856 89.751501,46.105786 c 7.476635,24.29886 8.56698,46.72837 8.72274,53.11466 z"
+     id="path601"
+     style="fill:#759fbf;fill-rule:evenodd" />
+  <path
+     d="m 133.27777,48.677356 2.43137,-14.498 c 2.3518,-0.93438 8.43445,-2.66727 15.75985,-2.73816 24.55544,-0.2367 21.86946,18.6459 21.98033,23.57046 l -0.13016,34.80589 -11.56291,2.29096 -0.002,-5.43931 c -1.69134,1.14332 -5.07658,5.43931 -14.09923,5.72504 -8.46163,0 -20.87148,-5.15338 -20.58989,-23.19001 0.002,-16.0318 13.53604,-20.13048 23.12798,-20.05762 7.60325,0.0593 10.02103,4.4043 9.87157,4.14004 0.15931,-4.55002 -0.65062,-7.90139 -9.43854,-8.1499 -5.30757,-0.15183 -17.35411,3.59397 -17.3482,3.54061 m 16.49199,13.0847 c -4.98737,-0.0711 -10.20771,3.59574 -10.29514,8.58765 0.0177,5.58306 5.63997,9.16325 9.87157,9.16325 4.22983,0 10.73584,-3.15052 10.71832,-8.87752 0,-6.29669 -5.50173,-8.85566 -10.29475,-8.87338 z"
+     id="path551"
+     style="fill-rule:evenodd" />
+  <path
+     d="m 180.61226,34.742546 -0.15202,57.63554 13.4746,-3.02882 0.0644,-32.67837 c 0.009,-4.86568 6.29315,-10.6234 14.16796,-10.6234 1.67579,-3.36772 4.82847,-11.96167 5.59645,-13.91708 -17.59357,0.15576 -17.82475,5.80439 -20.88823,8.61699 -0.0252,-5.29792 0,-8.47875 0,-8.47875 l -12.26315,2.47389 z"
+     id="path552"
+     style="fill-rule:evenodd" />
+  <path
+     d="m 255.84925,42.301886 c -0.12997,-0.0662 -6.44911,-9.7156 -20.31224,-9.626 -12.98486,-0.0896 -27.55689,5.65237 -27.82076,29.76436 0.0866,21.196 13.9537,29.3203 27.81879,29.32227 14.83788,0 20.7553,-10.51234 21.10976,-10.77523 -1.76834,-1.67913 -8.39073,-8.56638 -8.39073,-8.56638 0,0 -4.15106,7.24171 -12.18734,7.41716 -8.03825,0.17723 -15.0151,-7.68222 -15.10175,-17.39782 -0.0906,-9.71561 4.94465,-16.4278 14.48145,-16.33821 10.68681,0 13.07348,4.67861 13.07348,4.67861 l 7.32934,-8.47876 z"
+     id="path553"
+     style="fill-rule:evenodd" />
+  <path
+     d="m 260.70725,92.027576 12.53785,-2.64916 0.1851,-35.3293 c 0.0315,-3.70484 4.85013,-9.44898 12.88641,-9.36115 7.68379,0 9.38517,5.56494 9.36351,6.26991 l 0.17526,40.89227 12.36457,-2.56133 0.0886,-43.36597 c 0.0866,-4.1741 -8.23911,-12.89645 -21.63947,-12.80488 -9.67661,0.12859 -12.81354,3.87025 -13.24479,4.15086 l 0,-23.7595 -12.71902,3.44568 0.002,75.07257 z"
+     id="path554"
+     style="fill-rule:evenodd" />
+  <path
+     d="m 319.17063,22.342736 5.7402,-1.5019 0.0906,68.36035 -5.83078,1.05962 0,-67.91807 z"
+     id="path555"
+     style="fill-rule:evenodd" />
+  <path
+     d="m 334.71347,42.566746 5.03326,-2.29647 -0.0866,49.01854 -4.858,1.05962 -0.0886,-47.78169 z m -1.14804,-17.66268 4.06244,-3.3561 3.3575,3.70859 -4.06444,3.44372 -3.3555,-3.79621 z"
+     id="path556"
+     style="fill-rule:evenodd" />
+  <path
+     d="m 349.1969,41.507126 5.7402,-1.23685 0,10.24748 c 0,0.44012 3.18023,-11.48433 18.3706,-11.39473 14.74927,-0.0876 17.13197,11.30514 17.04534,13.86647 l 0.0866,36.03427 -5.03127,1.14942 0.065,-35.59436 c 0.0611,-1.04013 -2.27243,-9.80323 -12.69537,-9.71561 -10.421,0.0896 -17.6617,7.77359 -17.6617,12.62962 l 0,31.35567 -5.8308,1.58953 -0.0886,-48.93091 z"
+     id="path567"
+     style="fill-rule:evenodd" />
+  <path
+     d="m 440.49857,88.707116 -5.7402,1.23665 0,-10.24728 c 0,-0.44032 -3.18223,11.48433 -18.37063,11.39473 -14.74924,0.0876 -17.13197,-11.30514 -17.04534,-13.86647 l -0.0866,-36.03447 6.0986,-1.30104 0,35.59416 c 0,0.97199 1.14017,9.95525 11.5631,9.86743 10.42097,-0.0896 17.7385,-6.48022 17.8153,-15.97784 l 0,-28.08346 5.67717,-1.51332 0.0886,48.93091 z"
+     id="path558"
+     style="fill-rule:evenodd" />
+  <path
+     d="m 451.87064,39.921526 -4.03094,3.19443 15.36958,20.00996 -16.51171,23.51197 4.25937,3.11842 15.5212,-21.83698 15.90124,21.9888 3.9561,-3.19423 -17.0414,-23.51 13.69573,-19.32823 -4.1865,-3.50024 -12.4768,17.88284 -14.45587,-18.33674 z"
+     id="path559"
+     style="fill-rule:evenodd" />
+</svg>
diff --git a/media/logos/legacy/arch-legacy-blue2.png b/media/logos/legacy/arch-legacy-blue2.png
new file mode 100644
index 00000000..8b5b791e
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-blue2.png
diff --git a/media/logos/legacy/arch-legacy-blue2.svg b/media/logos/legacy/arch-legacy-blue2.svg
new file mode 100644
index 00000000..48b28338
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-blue2.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="300"
+   height="236.54079"
+   id="svg548">
+  <defs
+     id="defs550" />
+  <path
+     d="m 196.89851,51.451749 c 8.89425,1.58223 61.40163,17.33611 55.49847,37.99601 C 238.94042,137.67721 148.89442,153.83182 82.312057,156.12514 135.40853,145.19694 201.05242,124.87975 217.67009,93.774039 232.36316,65.058329 202.17425,56.200089 196.89851,51.451749 z"
+     id="path553"
+     style="fill-rule:evenodd" />
+  <path
+     d="M 220.18978,167.97814 C 217.81645,158.74851 194.87422,68.563159 145.82599,68.299459 124.73002,67.244639 104.13146,91.170339 92.858206,118.08379 80.893857,145.75401 80.572145,169.02762 62.760307,169.29666 45.6429,169.55903 55.90401,128.68661 64.078826,98.888759 72.253642,65.926119 98.623684,0.26454911 137.12377,8.3911402e-4 175.62418,-0.26287089 199.88493,61.707199 205.42237,78.056159 c 12.65778,41.137451 14.50371,79.110131 14.76741,89.921981 z"
+     id="path568"
+     style="fill:#759fbf;fill-rule:evenodd" />
+  <path
+     d="m 5.1916123,200.03665 2.0303188,-12.10604 c 1.9638428,-0.78044 7.0428569,-2.22731 13.1597839,-2.28665 20.504183,-0.1977 18.261535,15.56952 18.353881,19.68176 l -0.108682,29.06342 -9.655291,1.91294 -0.0016,-4.54164 c -1.412466,0.9548 -4.23903,4.54164 -11.773256,4.78034 -7.06556,0 -17.42797554,-4.30294 -17.19283481,-19.36406 0.00162166,-13.38688 11.30297381,-16.80936 19.31233281,-16.74835 6.348793,0.0493 8.367777,3.67752 8.242893,3.45682 0.132985,-3.7992 -0.543243,-6.59793 -7.881242,-6.80529 -4.432023,-0.12669 -14.4911711,3.00109 -14.4863037,2.95675 m 13.7711367,10.92553 c -4.164419,-0.059 -8.523432,3.00276 -8.596409,7.17101 0.0146,4.66199 4.709296,7.65141 8.242892,7.65141 3.531964,0 8.964528,-2.6307 8.949926,-7.41271 0,-5.25807 -4.594146,-7.3947 -8.596409,-7.40971 z"
+     id="path578"
+     style="fill-rule:evenodd" />
+  <path
+     d="m 44.716437,188.40034 -0.126685,48.12677 11.250916,-2.52902 0.05367,-27.28717 c 0.0083,-4.06291 5.256406,-8.87058 11.83033,-8.87058 1.400197,-2.8124 4.031567,-9.98807 4.673991,-11.62097 -14.690733,0.13002 -14.884427,4.84668 -17.442786,7.19535 -0.021,-4.42396 0,-7.08 0,-7.08 l -10.23944,2.06562 z"
+     id="path579"
+     style="fill-rule:evenodd" />
+  <path
+     d="m 107.54094,194.71257 c -0.10901,-0.0553 -5.38476,-8.11281 -16.961387,-8.0378 -10.842858,-0.075 -23.009569,4.71966 -23.2306,24.85383 0.07301,17.69882 11.650971,24.48277 23.228933,24.48444 12.391414,0 17.330444,-8.7779 17.626484,-8.9976 -1.47521,-1.40186 -7.00632,-7.15301 -7.00632,-7.15301 0,0 -3.465825,6.04719 -10.176102,6.19354 -6.711944,0.14802 -12.53743,-6.41457 -12.610773,-14.52737 -0.07468,-8.11281 4.12958,-13.7176 12.0937,-13.64292 8.922255,0 10.914535,3.90688 10.914535,3.90688 l 6.12153,-7.07999 z"
+     id="path580"
+     style="fill-rule:evenodd" />
+  <path
+     d="m 111.59684,236.2344 10.47048,-2.21197 0.15302,-29.50082 c 0.026,-3.09343 4.05123,-7.88978 10.76151,-7.81676 6.4159,0 7.83577,4.64698 7.81777,5.23573 l 0.14668,34.1458 10.32379,-2.13896 0.075,-36.21143 c 0.073,-3.48549 -6.87963,-10.76851 -18.06887,-10.69217 -8.07981,0.10735 -10.69984,3.23179 -11.06089,3.46582 l 0,-19.83946 -10.61983,2.87741 0.001,62.68681 z"
+     id="path581"
+     style="fill-rule:evenodd" />
+  <path
+     d="m 160.41504,178.04622 4.79301,-1.25384 0.0747,57.08203 -4.86769,0.88479 0,-56.71298 z"
+     id="path582"
+     style="fill-rule:evenodd" />
+  <path
+     d="m 173.39353,194.93393 4.20393,-1.9176 -0.073,40.93109 -4.05624,0.88479 -0.0747,-39.89828 z m -0.9578,-14.74874 3.39248,-2.8024 2.80206,3.09677 -3.39248,2.87541 -2.80206,-3.16978 z"
+     id="path587"
+     style="fill-rule:evenodd" />
+  <path
+     d="m 185.48857,194.04914 4.79301,-1.03281 0,8.55653 c 0,0.36772 2.6557,-9.58935 15.33982,-9.51467 12.31473,-0.0733 14.30534,9.44 14.232,11.57863 l 0.0733,30.08956 -4.20259,0.95947 0.0553,-29.72184 c 0.0503,-0.86846 -1.89793,-8.18582 -10.60049,-8.11281 -8.70255,0.075 -14.7494,6.49125 -14.7494,10.54615 l 0,26.18268 -4.86769,1.32719 -0.0733,-40.85808 z"
+     id="path588"
+     style="fill-rule:evenodd" />
+  <path
+     d="m 261.72595,233.46201 -4.793,1.03282 0,-8.55687 c 0,-0.36772 -2.65571,9.58968 -15.33983,9.51467 -12.31473,0.0733 -14.30534,-9.44 -14.232,-11.57863 l -0.0733,-30.08957 5.09205,-1.08648 0,29.72184 c 0,0.81179 0.95313,8.31284 9.65569,8.23983 8.70256,-0.075 14.81275,-5.41143 14.87642,-13.34188 l 0,-23.45029 4.74067,-1.26385 0.0733,40.85841 z"
+     id="path589"
+     style="fill-rule:evenodd" />
+  <path
+     d="m 271.22196,192.72495 -3.36681,2.66738 12.8338,16.70868 -13.7866,19.63309 3.55683,2.6037 12.96016,-18.23423 13.27753,18.36125 3.30313,-2.66737 -14.229,-19.63143 11.43494,-16.13927 -3.49482,-2.92274 -10.41847,14.93243 -12.07069,-15.31149 z"
+     id="path590"
+     style="fill-rule:evenodd" />
+</svg>
diff --git a/media/logos/legacy/arch-legacy-noodle-blue.png b/media/logos/legacy/arch-legacy-noodle-blue.png
new file mode 100644
index 00000000..b24d34cf
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-noodle-blue.png
diff --git a/media/logos/legacy/arch-legacy-noodle-blue.svg b/media/logos/legacy/arch-legacy-noodle-blue.svg
new file mode 100644
index 00000000..7b6485b8
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-noodle-blue.svg
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="300"
+   height="248.04204"
+   id="svg1374">
+  <defs
+     id="defs1376">
+    <linearGradient
+       id="linearGradient21348">
+      <stop
+         id="stop21350"
+         style="stop-color:#edd400;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop21352"
+         style="stop-color:#baa600;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient21338">
+      <stop
+         id="stop21340"
+         style="stop-color:#baa400;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop21346"
+         style="stop-color:#baa600;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop21342"
+         style="stop-color:#604e00;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop21344"
+         style="stop-color:#604e00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient21320">
+      <stop
+         id="stop21322"
+         style="stop-color:#edd400;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop21326"
+         style="stop-color:#604e00;stop-opacity:1"
+         offset="0.583691" />
+      <stop
+         id="stop21324"
+         style="stop-color:#604e00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient16135">
+      <stop
+         id="stop16137"
+         style="stop-color:#edd400;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop16139"
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8716">
+      <stop
+         id="stop8718"
+         style="stop-color:#a4bfda;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop8720"
+         style="stop-color:#387cbf;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient639">
+      <stop
+         id="stop640"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop641"
+         style="stop-color:#8e8e8e;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2882">
+      <stop
+         id="stop2884"
+         style="stop-color:#f2f9ff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2886"
+         style="stop-color:#91afcb;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5721">
+      <stop
+         id="stop5723"
+         style="stop-color:#9c9c9c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5725"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="18.384777"
+       cy="40.575378"
+       r="21.213203"
+       fx="18.384777"
+       fy="40.575378"
+       id="radialGradient5727"
+       xlink:href="#linearGradient5721"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.943831,0,0,0.166667,1.032663,33.81282)" />
+    <linearGradient
+       x1="21"
+       y1="46.714287"
+       x2="21"
+       y2="5.9534397"
+       id="linearGradient7976"
+       xlink:href="#linearGradient2882"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.0495867,0,0,6.0495867,-259.76728,-20.230193)" />
+    <radialGradient
+       cx="16.380457"
+       cy="17.796696"
+       r="17.033163"
+       fx="16.380457"
+       fy="17.796696"
+       id="radialGradient8714"
+       xlink:href="#linearGradient8716"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-4.28975,5.8394365,-3.6097583,-2.6518002,-23.938604,-1.9370632)" />
+    <linearGradient
+       x1="43.25"
+       y1="20"
+       x2="40.875"
+       y2="28.625"
+       id="linearGradient11647"
+       xlink:href="#linearGradient5721"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.0495869,0,0,6.0495869,-259.76729,-20.2302)" />
+    <linearGradient
+       x1="7.9400997"
+       y1="-5.1101465"
+       x2="9.2488842"
+       y2="4.7730908"
+       id="linearGradient19853"
+       xlink:href="#linearGradient21348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.791154,-0.487172,0.327682,1.176225,16.97405,35.22976)" />
+    <linearGradient
+       x1="11.441825"
+       y1="-0.98001873"
+       x2="13.598524"
+       y2="-1.084087"
+       id="linearGradient22817"
+       xlink:href="#linearGradient21348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.05655608,-0.797121,1.172062,0.350025,16.04368,50.1682)" />
+  </defs>
+  <g
+     transform="translate(251.65983,-6.571975)"
+     id="layer1">
+    <path
+       d="m 39.59798,40.575378 a 21.213203,3.5355339 0 1 1 -42.4264064,0 21.213203,3.5355339 0 1 1 42.4264064,0 z"
+       transform="matrix(6.0495869,0,0,6.0495869,-191.21125,-12.238777)"
+       id="path4993"
+       style="opacity:0.75800003;fill:url(#radialGradient5727);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       d="m -53.325103,79.122679 c -0.805139,-5.217261 80.324496,15.610147 75.634753,51.174691 -3.015345,36.35793 -60.866652,70.03108 -165.42322,88.67164 -48.66595,6.76027 -70.2448,7.32405 -70.27155,3.78437 -0.45553,-3.11379 155.832978,-20.85096 194.253947,-89.01479 C 1.7246329,94.203881 -52.414609,85.022689 -53.325103,79.122679 z"
+       id="path632"
+       style="font-size:12px;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <g
+       transform="matrix(6.0495869,0,0,6.0495869,-259.76729,-21.299625)"
+       id="g24322">
+      <path
+         d="m 12.334411,39.271398 c -0.436762,-1.829419 1.931982,-7.76804 5.038023,-10.471368 3.028568,-2.6359 5.42847,-3.947804 8.043372,-4.179892 1.057928,-0.0939 2.250475,1.366774 2.752005,2.995398 0.402297,1.306385 -0.584888,3.636245 -0.584888,3.636245 0,0 -3.297592,0.494824 -5.620374,2.817605 -2.359798,2.359798 -3.478152,6.706882 -3.478152,6.706882 0,0 -5.451721,1.419868 -6.149986,-1.50487 z"
+         id="path13844"
+         style="fill:url(#linearGradient19853);fill-opacity:1;fill-rule:evenodd;stroke:#665409;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0" />
+      <path
+         d="m 1.53125,11.125 c -1.2356121,-5.28e-4 -3.151403,0.512926 -4.6875,1.21875 -0.7680485,0.352912 -1.2588617,0.558414 -1.7300154,0.891436 -0.3182438,0.224942 -0.2037074,0.573413 0.03125,0.78125 0.2372675,0.20988 0.3866735,0.423127 0.6908048,0.285477 C -2.9400117,13.546741 -1.2972757,12.809099 1.375,12.625 3.2322637,12.497049 5.7097,12.773677 7.4636539,13.72724 7.8712028,13.865065 8.0715674,13.669329 8.2873558,13.321715 8.433013,13.087076 8.6529123,12.915204 8.2200886,12.669122 6.3148155,11.453766 4.1279073,11.126109 1.53125,11.125 z"
+         transform="matrix(0.878226,-0.765019,0.765019,0.878226,8.798994,21.17704)"
+         id="path16157"
+         style="fill:#fff38d;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      <path
+         d="m 15.658283,38.279044 c 1.646328,0.491659 2.930449,1.624039 2.866339,2.527633 -0.06411,0.90359 -1.452295,1.237913 -3.098622,0.746254 -1.646331,-0.491661 -2.930451,-1.62404 -2.866341,-2.527633 0.06411,-0.903593 1.452294,-1.237915 3.098624,-0.746254 z"
+         id="path22815"
+         style="fill:url(#linearGradient22817);fill-opacity:1;fill-rule:evenodd;stroke:#665409;stroke-width:0.99999952;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    </g>
+    <path
+       d="m -17.282353,223.29125 c 1.285984,14.28348 0.828685,17.23763 -2.75941,17.01689 -4.654069,-0.30131 -3.868445,-6.32045 -5.23544,-10.36555 -14.589317,-49.57957 -47.757998,-126.71772 -97.567877,-126.71772 -49.5267,0 -70.87711,63.58974 -88.8382,116.07817 -2.65728,8.20346 -5.8993,20.7294 -22.41997,21.01991 -11.82886,0.0311 -15.04087,-11.01352 -14.46889,-18.16279 C -239.50634,101.90207 -196.08253,11.60732 -131.8307,9.6187545 -77.218442,7.9280903 -28.024526,103.95901 -17.282353,223.29125 z"
+       id="path630"
+       style="font-size:12px;fill:#dadada;fill-opacity:1;fill-rule:evenodd;stroke:#383838;stroke-width:6.04958725;stroke-opacity:1" />
+    <path
+       d="m -17.282353,223.29125 c 1.285984,14.28348 0.828685,17.23763 -2.75941,17.01689 -4.654069,-0.30131 -3.868445,-6.32045 -5.23544,-10.36555 -14.589317,-49.57957 -47.757998,-126.71772 -97.567877,-126.71772 -49.5267,0 -70.87711,63.58974 -88.8382,116.07817 -2.65728,8.20346 -5.8993,20.7294 -22.41997,21.01991 -11.82886,0.0311 -15.04087,-11.01352 -14.46889,-18.16279 C -239.50634,101.90207 -196.08253,11.60732 -131.8307,9.6187545 -77.218442,7.9280903 -28.024526,103.95901 -17.282353,223.29125 z"
+       id="path5053"
+       style="font-size:12px;fill:url(#linearGradient7976);fill-opacity:1;fill-rule:evenodd;stroke:#003870;stroke-width:6.04958725;stroke-opacity:1" />
+    <path
+       d="m -131.40262,19.470217 c -27.61807,0.854768 -51.77849,20.625487 -70.8936,56.714878 -19.11511,36.089395 -32.02812,87.561055 -36.48657,146.702485 -0.13473,1.68406 0.32856,4.54389 1.1343,5.86055 0.80574,1.31664 0.72244,1.70899 3.59193,1.70143 5.80553,-0.10209 6.81365,-1.36324 8.50725,-3.59194 1.69359,-2.22869 3.10693,-6.17135 4.53718,-10.58678 -6e-4,-0.0629 -6e-4,-0.12603 0,-0.18904 8.97344,-26.22348 18.8045,-55.6975 33.46178,-79.58988 14.65727,-23.89239 35.70252,-43.103312 64.65496,-43.103312 29.954241,0 52.978744,22.593492 70.137399,49.341952 7.780145,12.12838 20.442886,45.93839 20.039257,38.75516 C -33.89118,160.62016 -52.016958,103.46602 -66.74766,75.617947 -76.56813,57.052569 -87.544568,42.40226 -98.697042,32.892739 -109.84951,23.383216 -120.65813,19.137594 -131.40262,19.470217 z"
+       id="path5786"
+       style="font-size:12px;fill:url(#radialGradient8714);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       d="m -22.131956,92.065261 c 6.792228,5.315724 12.1805169,13.016149 12.8577197,21.804029 0.7201852,8.15085 -1.6370187,16.48148 -5.8980507,23.38302 -1.02797,1.9673 -5.375832,4.96331 -4.603524,5.95405 8.085672,-1.66912 11.1676707,-4.73326 17.9493364,-8.57688 6.9830498,-3.95777 11.1947055,6.89359 16.9372876,-3.05285 4.680682,-8.10719 0.02572,-14.7689 -5.025155,-19.91417 -7.6380573,-8.00725 -17.4975108,-13.508561 -27.505602,-17.997985 -1.551042,-0.590535 -3.173971,-0.972156 -4.712012,-1.599214 z"
+       id="path9450"
+       style="font-size:12px;fill:url(#linearGradient11647);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+  </g>
+</svg>
diff --git a/media/logos/legacy/arch-legacy-noodle-box.png b/media/logos/legacy/arch-legacy-noodle-box.png
new file mode 100644
index 00000000..1162ed64
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-noodle-box.png
diff --git a/media/logos/legacy/arch-legacy-noodle-box.svg b/media/logos/legacy/arch-legacy-noodle-box.svg
new file mode 100644
index 00000000..8f17f00a
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-noodle-box.svg
@@ -0,0 +1,775 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="250"
+   height="264.74301"
+   id="svg2895">
+  <defs
+     id="defs2897">
+    <linearGradient
+       id="linearGradient36806">
+      <stop
+         id="stop36808"
+         style="stop-color:#e9ebe8;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop36810"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient33893">
+      <stop
+         id="stop33895"
+         style="stop-color:#d5d9d3;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop33897"
+         style="stop-color:#eef0ed;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient30967">
+      <stop
+         id="stop30969"
+         style="stop-color:#f8f8f7;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop30971"
+         style="stop-color:#e6e6e3;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient25143">
+      <stop
+         id="stop25145"
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop25147"
+         style="stop-color:#9fa896;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient23683">
+      <stop
+         id="stop23685"
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop23687"
+         style="stop-color:#d3d7cf;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient14834">
+      <stop
+         id="stop14836"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop14838"
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient36029">
+      <stop
+         id="stop36031"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop36037"
+         style="stop-color:#000000;stop-opacity:0.49803922"
+         offset="0.7639485" />
+      <stop
+         id="stop36033"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient19847">
+      <stop
+         id="stop19849"
+         style="stop-color:#d8d8d3;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop19851"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient18995">
+      <stop
+         id="stop18997"
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop18999"
+         style="stop-color:#345180;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient18261">
+      <stop
+         id="stop18263"
+         style="stop-color:#cecece;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop18265"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient17527">
+      <stop
+         id="stop17529"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop17531"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient13880">
+      <stop
+         id="stop13882"
+         style="stop-color:#a8b0a1;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop13884"
+         style="stop-color:#edeeeb;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient13872">
+      <stop
+         id="stop13874"
+         style="stop-color:#a8b0a1;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop13876"
+         style="stop-color:#a8b0a1;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="14.595432"
+       y1="25.7218"
+       x2="32.016243"
+       y2="43.399467"
+       id="linearGradient19001"
+       xlink:href="#linearGradient18995"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99225,0,0,1,0.185736,0)" />
+    <linearGradient
+       x1="43.25"
+       y1="20"
+       x2="40.875"
+       y2="28.625"
+       id="linearGradient11647"
+       xlink:href="#linearGradient5721"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="16.380457"
+       cy="17.796696"
+       r="17.033163"
+       fx="16.380457"
+       fy="17.796696"
+       id="radialGradient8714"
+       xlink:href="#linearGradient8716"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.436773,0.522591,-0.476132,-0.397944,32.37619,9.556039)" />
+    <linearGradient
+       x1="21"
+       y1="46.714287"
+       x2="21"
+       y2="-3.9460521"
+       id="linearGradient7976"
+       xlink:href="#linearGradient2882"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="18.384777"
+       cy="40.575378"
+       r="21.213203"
+       fx="18.384777"
+       fy="40.575378"
+       id="radialGradient5727"
+       xlink:href="#linearGradient5721"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.943831,0,0,0.166667,1.032663,33.81282)" />
+    <linearGradient
+       id="linearGradient5721">
+      <stop
+         id="stop5723"
+         style="stop-color:#9c9c9c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5725"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2882">
+      <stop
+         id="stop2884"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2886"
+         style="stop-color:#dadada;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient639">
+      <stop
+         id="stop640"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop641"
+         style="stop-color:#8e8e8e;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8716">
+      <stop
+         id="stop8718"
+         style="stop-color:#e1e1e1;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop8720"
+         style="stop-color:#c1c1c1;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="18.384777"
+       cy="40.575378"
+       r="21.213203"
+       fx="18.384777"
+       fy="40.575378"
+       id="radialGradient19071"
+       xlink:href="#linearGradient5721"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.943831,0,0,0.166667,1.032663,33.81282)" />
+    <linearGradient
+       x1="21"
+       y1="46.714287"
+       x2="21"
+       y2="-3.9460521"
+       id="linearGradient19073"
+       xlink:href="#linearGradient2882"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="16.380457"
+       cy="17.796696"
+       r="17.033163"
+       fx="16.380457"
+       fy="17.796696"
+       id="radialGradient19075"
+       xlink:href="#linearGradient8716"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.436773,0.522591,-0.476132,-0.397944,32.37619,9.556039)" />
+    <linearGradient
+       x1="43.25"
+       y1="20"
+       x2="40.875"
+       y2="28.625"
+       id="linearGradient19077"
+       xlink:href="#linearGradient5721"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="43.25"
+       y1="20"
+       x2="40.875"
+       y2="28.625"
+       id="linearGradient19080"
+       xlink:href="#linearGradient5721"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.493381,0,0,0.493381,-42.24651,27.80721)" />
+    <linearGradient
+       x1="21"
+       y1="46.714287"
+       x2="21"
+       y2="-3.9460521"
+       id="linearGradient19084"
+       xlink:href="#linearGradient2882"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.493381,0,0,0.493381,-42.2465,27.80722)" />
+    <radialGradient
+       cx="16.380457"
+       cy="17.796696"
+       r="17.033163"
+       fx="16.380457"
+       fy="17.796696"
+       id="radialGradient19089"
+       xlink:href="#linearGradient8716"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.436773,0.522591,-0.476132,-0.397944,32.37619,9.556039)" />
+    <linearGradient
+       x1="21"
+       y1="46.714287"
+       x2="21"
+       y2="-3.9460521"
+       id="linearGradient19098"
+       xlink:href="#linearGradient2882"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.493381,0,0,0.493381,-42.2465,27.80722)" />
+    <radialGradient
+       cx="16.380457"
+       cy="17.796696"
+       r="17.033163"
+       fx="16.380457"
+       fy="17.796696"
+       id="radialGradient19100"
+       xlink:href="#linearGradient8716"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.436773,0.522591,-0.476132,-0.397944,32.37619,9.556039)" />
+    <linearGradient
+       x1="43.25"
+       y1="20"
+       x2="40.875"
+       y2="28.625"
+       id="linearGradient19102"
+       xlink:href="#linearGradient5721"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.493381,0,0,0.493381,-42.24651,27.80721)" />
+    <linearGradient
+       x1="43.25"
+       y1="20"
+       x2="40.875"
+       y2="28.625"
+       id="linearGradient19105"
+       xlink:href="#linearGradient5721"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.412385,0,0,0.412385,-45.67954,21.62447)" />
+    <linearGradient
+       x1="15.588248"
+       y1="24.995495"
+       x2="30.506712"
+       y2="27.646311"
+       id="linearGradient19853"
+       xlink:href="#linearGradient19847"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.341723,0,0,2.393257,9.840567,-34.82516)" />
+    <linearGradient
+       x1="14.595432"
+       y1="25.7218"
+       x2="32.016243"
+       y2="43.399467"
+       id="linearGradient19857"
+       xlink:href="#linearGradient19847"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99225,0,0,1,0.185736,0)" />
+    <linearGradient
+       x1="14.595432"
+       y1="25.7218"
+       x2="32.016243"
+       y2="43.399467"
+       id="linearGradient19861"
+       xlink:href="#linearGradient18995"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99225,0,0,1,0.185736,0)" />
+    <linearGradient
+       x1="14.595432"
+       y1="25.7218"
+       x2="32.016243"
+       y2="43.399467"
+       id="linearGradient19869"
+       xlink:href="#linearGradient18995"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99225,0,0,1,0.185736,0)" />
+    <linearGradient
+       x1="31.78125"
+       y1="43.1875"
+       x2="16.90625"
+       y2="32.0625"
+       id="linearGradient39022"
+       xlink:href="#linearGradient23683"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="13.401031"
+       y1="13.558653"
+       x2="5.976409"
+       y2="7.3714681"
+       id="linearGradient39024"
+       xlink:href="#linearGradient25143"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="31.484558"
+       y1="3.8232443"
+       x2="13.011393"
+       y2="13.457574"
+       id="linearGradient39026"
+       xlink:href="#linearGradient14834"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="13.633828"
+       y1="8.5078268"
+       x2="31.806158"
+       y2="8.5078268"
+       id="linearGradient39028"
+       xlink:href="#linearGradient36806"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="38.422016"
+       y1="13.591799"
+       x2="27.733131"
+       y2="21.635138"
+       id="linearGradient39030"
+       xlink:href="#linearGradient30967"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="34.562054"
+       y1="23.513792"
+       x2="13.48508"
+       y2="13.640475"
+       id="linearGradient39032"
+       xlink:href="#linearGradient14834"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.014523,0,0,1.009511,-0.142602,-0.293856)" />
+    <linearGradient
+       x1="12.47126"
+       y1="18.443405"
+       x2="33.490791"
+       y2="18.443405"
+       id="linearGradient39034"
+       xlink:href="#linearGradient36806"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="11.386287"
+       y1="23.346619"
+       x2="38.100643"
+       y2="26.44021"
+       id="linearGradient39036"
+       xlink:href="#linearGradient33893"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="9.2837515"
+       y1="24.937609"
+       x2="35.983704"
+       y2="24.937609"
+       id="linearGradient39038"
+       xlink:href="#linearGradient36806"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="265.71939"
+       y1="424.07321"
+       x2="265.71939"
+       y2="70.893417"
+       id="linearGradient9132"
+       xlink:href="#linearGradient8340"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.996493,0,0,0.979476,-7.530071,28.93933)" />
+    <linearGradient
+       x1="265.71939"
+       y1="424.07321"
+       x2="265.71939"
+       y2="70.893417"
+       id="linearGradient9128"
+       xlink:href="#linearGradient8340"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.002771,0,0,0.997237,-9.142415,24.39389)" />
+    <linearGradient
+       x1="265.71939"
+       y1="424.07321"
+       x2="265.71939"
+       y2="70.893417"
+       id="linearGradient9118"
+       xlink:href="#linearGradient8340"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.002771,0,0,0.997237,-9.142415,24.39389)" />
+    <linearGradient
+       x1="265.71939"
+       y1="424.07321"
+       x2="265.71939"
+       y2="70.893417"
+       id="linearGradient8348"
+       xlink:href="#linearGradient8340"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.002771,0,0,0.997237,-9.142415,24.39389)" />
+    <linearGradient
+       x1="0.91787434"
+       y1="0.10156304"
+       x2="0.78743958"
+       y2="0.24218753"
+       id="linearGradient662"
+       xlink:href="#linearGradient655" />
+    <linearGradient
+       x1="0.63565892"
+       y1="0.070311584"
+       x2="0.62790698"
+       y2="0.34375"
+       id="linearGradient659"
+       xlink:href="#linearGradient652" />
+    <linearGradient
+       x1="311.32385"
+       y1="56.541351"
+       x2="347.72528"
+       y2="225.29604"
+       id="linearGradient648"
+       xlink:href="#linearGradient652"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.997115,0,0,0.325012,5.000114,48.46051)" />
+    <linearGradient
+       x1="0.68115938"
+       y1="0.031252056"
+       x2="0.0096617993"
+       y2="1.109375"
+       id="linearGradient646"
+       xlink:href="#linearGradient639" />
+    <linearGradient
+       x1="0.51162791"
+       y1="0.2421875"
+       x2="0.50387597"
+       y2="0.84375"
+       id="linearGradient642"
+       xlink:href="#linearGradient643" />
+    <linearGradient
+       id="linearGradient39231">
+      <stop
+         id="stop39233"
+         style="stop-color:#000000;stop-opacity:0.66670001"
+         offset="0" />
+      <stop
+         id="stop39235"
+         style="stop-color:#ffffff;stop-opacity:0.66670001"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient643">
+      <stop
+         id="stop644"
+         style="stop-color:#001e87;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop645"
+         style="stop-color:#85aee8;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient649">
+      <stop
+         id="stop650"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop651"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient652">
+      <stop
+         id="stop653"
+         style="stop-color:#ffffff;stop-opacity:0.74119997"
+         offset="0" />
+      <stop
+         id="stop654"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient655">
+      <stop
+         id="stop656"
+         style="stop-color:#ffffff;stop-opacity:0.91759998"
+         offset="0" />
+      <stop
+         id="stop657"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2999">
+      <stop
+         id="stop3001"
+         style="stop-color:#001e87;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop3007"
+         style="stop-color:#d2dce8;stop-opacity:1"
+         offset="0.01" />
+      <stop
+         id="stop3003"
+         style="stop-color:#d2dce8;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8340">
+      <stop
+         id="stop8342"
+         style="stop-color:#b7b7b7;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop8344"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="11.386287"
+       y1="23.346619"
+       x2="38.100643"
+       y2="26.44021"
+       id="linearGradient45113"
+       xlink:href="#linearGradient33893"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.7595392,0,0,5.7595392,-5.2625201,-234.81394)" />
+    <linearGradient
+       x1="9.2837515"
+       y1="24.937609"
+       x2="35.983704"
+       y2="24.937609"
+       id="linearGradient45115"
+       xlink:href="#linearGradient36806"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.7595392,0,0,5.7595392,-5.2625201,-234.81394)" />
+    <linearGradient
+       x1="34.562054"
+       y1="23.513792"
+       x2="13.48508"
+       y2="13.640475"
+       id="linearGradient45119"
+       xlink:href="#linearGradient14834"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.843185,0,0,5.8143183,-6.083842,-236.50642)" />
+    <linearGradient
+       x1="12.47126"
+       y1="18.443405"
+       x2="33.490791"
+       y2="18.443405"
+       id="linearGradient45121"
+       xlink:href="#linearGradient36806"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.7595392,0,0,5.7595392,-5.2625201,-234.81394)" />
+    <linearGradient
+       x1="38.422016"
+       y1="13.591799"
+       x2="27.733131"
+       y2="21.635138"
+       id="linearGradient45124"
+       xlink:href="#linearGradient30967"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.7595392,0,0,5.7595392,-5.2625201,-234.81394)" />
+    <linearGradient
+       x1="31.484558"
+       y1="3.8232443"
+       x2="13.011393"
+       y2="13.457574"
+       id="linearGradient45127"
+       xlink:href="#linearGradient14834"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.7595392,0,0,5.2469517,-5.2625201,-227.62179)" />
+    <linearGradient
+       x1="13.633828"
+       y1="8.5078268"
+       x2="31.806158"
+       y2="8.5078268"
+       id="linearGradient45129"
+       xlink:href="#linearGradient36806"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.7595392,0,0,5.2469517,-5.2625201,-227.62179)" />
+    <linearGradient
+       x1="13.401031"
+       y1="13.558653"
+       x2="5.976409"
+       y2="7.3714681"
+       id="linearGradient45132"
+       xlink:href="#linearGradient25143"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.7595392,0,0,5.7595392,-5.2625201,-234.81394)" />
+    <linearGradient
+       x1="31.78125"
+       y1="43.1875"
+       x2="16.90625"
+       y2="32.0625"
+       id="linearGradient48795"
+       xlink:href="#linearGradient23683"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="24.262602"
+       cy="44.287689"
+       r="15.77732"
+       fx="24.262602"
+       fy="44.287689"
+       id="radialGradient2178"
+       xlink:href="#linearGradient36029"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.184874,0,36.10005)" />
+  </defs>
+  <g
+     transform="translate(-2.296875,217.7153)"
+     id="layer1">
+    <path
+       d="m 40.039922,44.287689 a 15.77732,2.9168155 0 1 1 -31.5546401,0 15.77732,2.9168155 0 1 1 31.5546401,0 z"
+       transform="matrix(5.7595392,0,0,5.7595392,-12.444533,-224.84847)"
+       id="path1443"
+       style="opacity:0.50349851;fill:url(#radialGradient2178);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       d="M 200.54192,-98.161645 189.46432,33.0467 63.156382,33.0467 52.078779,-98.161645"
+       id="rect1421"
+       style="fill:#f0f1ef;fill-opacity:1;fill-rule:evenodd;stroke:#4f4f4f;stroke-width:5.75953913;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       d="m 11.78125,25.375 1.625,19.875 18.875,0 1.625,-19.875 -22.125,0 z"
+       transform="matrix(5.7595392,0,0,5.7595392,-5.2625203,-236.34118)"
+       id="path4393"
+       style="fill:url(#linearGradient48795);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       d="m 62.953687,-171.65896 123.705503,0 16.29044,73.306951 -152.468311,0 12.472368,-73.306951 z"
+       id="rect38282"
+       style="fill:#4f4f4f;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       d="m 29.498177,-193.49181 -17.360957,43.34564 47.925316,48.52001 12.033389,-55.05376 -42.597748,-36.81189 z"
+       id="path14842"
+       style="fill:url(#linearGradient45132);fill-opacity:1;fill-rule:evenodd;stroke:#e9ebe8;stroke-width:5.75953913;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       d="m 72.556877,-156.62488 107.506963,0 -2.67266,-52.35354 -102.161651,0 -2.672652,52.35354 z"
+       id="path2163"
+       style="fill:url(#linearGradient45127);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient45129);stroke-width:5.4972744;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       d="m 225.32836,-193.74634 17.38405,43.34563 -49.69943,49.41089 -12.28332,-56.51611 44.5987,-36.24041 z"
+       id="path17751"
+       style="fill:url(#linearGradient45124);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:5.75953913;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0" />
+    <path
+       d="m 71.945416,-157.10628 108.507274,0 13.61864,57.03568 -134.344591,0 12.218677,-57.03568 z"
+       id="rect1424"
+       style="fill:url(#linearGradient45119);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient45121);stroke-width:5.75953913;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       d="m 121.1936,-89.787379 c -12.17449,0.376795 -22.307645,9.067357 -29.645955,22.940325 -7.338321,13.872962 -12.0033,33.023586 -13.646554,54.821478 -0.122737,1.534133 0.07346,3.4325697 1.058788,5.0586316 0.985325,1.6260677 2.876066,2.8300994 5.411565,2.8234241 2.795075,-0.049153 4.868821,-0.9605011 6.235058,-2.3528525 1.366238,-1.392357 2.088875,-3.1318991 2.588135,-4.5880662 l 0.11765,-0.235277 0,-0.117645 c 1.74115,0.780303 8.546563,0.483197 23.881473,-1.646997 1.17738,-0.209918 2.2672,-0.367856 3.41162,-0.588216 1.14444,-0.220355 2.30036,-0.475318 3.41164,-0.705855 1.1113,-0.230525 2.21602,-0.465434 3.294,-0.70586 1.07797,-0.240421 2.13187,-0.455799 3.17635,-0.705849 1.04448,-0.250062 2.04792,-0.564078 3.0587,-0.823505 1.0108,-0.259409 2.08178,-0.554989 3.05872,-0.823493 0.97695,-0.268498 1.88052,-0.546189 2.82342,-0.823505 0.94291,-0.27731 1.91473,-0.53763 2.82343,-0.823498 0.9087,-0.285852 1.71383,-0.529366 2.58813,-0.823494 0.87432,-0.294134 1.74842,-0.639009 2.58814,-0.941149 0.83975,-0.302122 1.66551,-0.631285 2.4705,-0.941131 0.80499,-0.309864 1.58279,-0.623839 2.35285,-0.941144 0.22571,-0.09301 0.48316,-0.141656 0.70586,-0.235283 2.34695,5.698759 4.42329,10.876274 5.41157,14.2347649 0.1595,0.4719655 0.21497,1.4099813 0.47057,2.3528409 0.12779,0.4714356 0.39919,0.938995 0.82349,1.4117149 0.4243,0.4727315 1.0646,0.7781829 1.76465,0.823499 0.50202,0.030889 1.24575,-0.0087 1.76462,-0.4705659 0.51889,-0.461869 0.60942,-1.0469806 0.70588,-1.6469921 0.19289,-1.2000576 0.116,-2.8165241 -0.11763,-5.4115647 -0.46775,-5.196049 -1.15131,-10.271125 -1.99992,-15.175914 -0.042,-0.176409 -0.0755,-0.294877 -0.11763,-0.470566 9.29338,-5.348711 14.537,-11.478733 15.05828,-17.764043 0.40401,-12.815528 -27.46561,-20.23226 -27.17546,-18.35226 0.32808,2.126048 19.75013,5.400162 12.23483,19.646324 -0.86531,1.535171 -1.88575,2.95643 -3.05871,4.352784 -0.18496,0.220192 0.42674,0.489031 0.23483,0.705855 -3.89662,-15.353244 -9.60915,-27.022388 -14.94015,-35.292798 -6.80442,-10.556198 -14.5616,-16.019864 -22.82268,-15.764118 z m 0.11764,2.588141 c 7.0576,-0.218494 13.92535,4.434741 20.46982,14.587693 6.53142,10.132693 12.61955,25.628762 17.52875,46.233559 l -0.11763,0 c 0.83706,4.837979 1.53878,9.817746 1.99994,14.940626 0.20684,2.2973876 0.29706,3.5240888 0.23529,4.2351327 -0.1305,-0.5441095 -0.27014,-1.411617 -0.58823,-2.3528524 -1.31432,-4.4665633 -3.08887,-9.5122823 -7.1762,-18.8228243 0.001,-0.03919 0.001,-0.07846 0,-0.11765 -4.18077,-8.28114 -8.41861,-15.046192 -13.17599,-19.881613 -4.75735,-4.835415 -10.07616,-7.764417 -15.99938,-7.764417 -9.47877,0 -16.3314,6.187593 -21.41097,14.470053 -5.079577,8.282454 -8.646794,18.780112 -11.881915,28.234235 l -0.352928,1.058781 0,0.235289 -0.11765,0.235295 c -0.457083,1.333113 -1.080006,2.5917685 -1.999926,3.5292717 -0.919931,0.9375148 -2.105354,1.6074816 -4.352777,1.6470036 -1.72698,0.00454 -2.567234,-0.6417681 -3.176358,-1.6470036 -0.609122,-1.0052239 -0.789229,-2.3695547 -0.705854,-3.4116287 1.623557,-21.536599 6.318762,-40.354465 13.41126,-53.762701 7.092508,-13.408241 16.432358,-21.30647 27.410748,-21.646249 z m 3.17635,33.763439 c 5.09965,0 9.67115,2.304373 14.11712,6.823273 3.60061,3.659693 7.47256,9.532367 10.85166,15.64648 -1.26244,0.827254 -3.03135,1.592133 -4.38131,2.352858 -3.61208,2.035416 -7.55598,3.817994 -11.52899,5.411566 -3.97301,1.59356 -8.05215,3.033013 -11.99955,4.235127 -3.94739,1.202114 -7.75847,2.19765 -11.29369,3.058707 -3.53523,0.861057 -6.79255,1.547179 -9.52906,2.117564 -2.736523,0.570401 -4.919065,1.081589 -6.470345,1.411714 -0.448789,0.09552 -0.377123,0.157173 -0.70586,0.235289 l 0,-0.117644 0.11765,-0.235283 c 3.23708,-9.459859 6.800355,-19.861639 11.646625,-27.763669 4.84627,-7.902036 10.8078,-13.175982 19.17576,-13.175982 z"
+       id="path632"
+       style="font-size:12px;fill:#cc0000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       d="m 185.34223,-168.39924 42.29661,-34.73723 21.77827,54.17565 -48.05617,47.78618 28.97769,24.928001 -208.063354,0 30.147589,-24.928001 -47.2462204,-47.78618 21.9582424,-54.17565 40.13679,34.73723 2.519798,-46.43629 113.030955,0 2.5198,46.43629 z"
+       id="path5121"
+       style="fill:none;stroke:#4f4f4f;stroke-width:5.75953913;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       d="m 57.10249,-73.460307 138.46164,0.03089 -4.03797,50.905043 C 146.10517,-28.841847 103.7931,-50.834446 58.36239,-57.081617 l -1.2599,-16.37869 z"
+       id="rect47340"
+       style="opacity:0.34265131;fill:#87927c;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       d="m 72.908521,-157.30393 c -9.103257,18.3141 2.595921,40.65658 20.246277,48.53673 14.436812,7.70638 36.190162,5.83663 44.410212,-9.89615 8.3254,-15.39853 -2.68255,-34.77559 -18.33662,-39.96746 -12.00324,-5.30536 -29.700759,-0.49422 -32.125151,13.90778 -3.408743,16.5544 18.668811,31.97598 32.370381,21.23878 8.17356,-6.75952 2.64973,-21.28809 -7.76793,-21.74352 -13.009189,-3.39709 -7.76942,17.6184 -1.00216,11.02957 -2.81429,-2.94459 -3.75659,-7.92213 -0.13991,-3.88879 12.5586,1.25028 -0.40324,17.69662 -8.56882,9.58181 -9.123365,-4.00748 -10.320128,-18.34949 -1.19672,-23.07094 15.76732,-8.46535 37.26845,9.29013 31.05728,26.4564 -4.90748,14.58278 -23.86803,16.88983 -35.935839,10.29798 -15.218337,-6.60437 -24.144605,-26.88898 -14.61236,-41.53623 9.751891,-15.5834 32.247289,-16.01405 46.808919,-7.34252 17.59219,8.84611 27.9685,32.35176 17.85916,50.32695 -5.52971,4.65801 -2.82088,7.49605 2.16478,10.51354 14.84487,-16.1335 10.98519,-42.81962 -4.32586,-57.26942 -15.72087,-16.29742 -44.51023,-22.85497 -63.005038,-7.47945 -3.30396,2.84414 -6.018568,6.3714 -7.900601,10.30494 z"
+       id="path2180"
+       style="fill:#fffa66;fill-opacity:1;fill-rule:evenodd;stroke:#554500;stroke-width:2.87976956;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 124.97164,-157.30392 c -6.78915,18.31409 1.93603,40.65657 15.09955,48.53672 10.7669,7.70638 26.9904,5.83663 33.12088,-9.89615 6.20902,-15.39854 -2.00064,-34.77559 -13.67535,-39.96744 -8.95195,-5.30538 -22.15064,-0.49424 -23.95874,13.90775 -2.54222,16.55442 13.9231,31.97598 24.14164,21.23879 6.09579,-6.75952 1.97614,-21.28809 -5.79328,-21.74352 -9.70217,-3.39709 -5.79438,17.6184 -0.7474,11.02957 -2.09886,-2.94459 -2.80165,-7.92214 -0.10437,-3.88879 9.36612,1.25028 -0.30074,17.69663 -6.39059,9.58181 -6.80415,-4.00748 -7.69669,-18.34949 -0.8925,-23.07094 11.75918,-8.46535 27.79459,9.29013 23.16234,26.4564 -3.65996,14.58278 -17.80064,16.88983 -26.80074,10.29798 -11.34974,-6.60437 -18.00689,-26.88898 -10.89781,-41.53623 7.2729,-15.5834 24.04985,-16.01404 34.90981,-7.34252 13.12015,8.84611 20.85874,32.35176 13.31926,50.32695 -4.12403,4.65802 -2.10378,7.49605 1.61449,10.51354 11.07121,-16.13351 8.19268,-42.81963 -3.22622,-57.26942 -11.72453,-16.29742 -33.19545,-22.85497 -46.98877,-7.47945 -2.46407,2.84414 -4.48861,6.3714 -5.89222,10.30495 z"
+       id="path4422"
+       style="fill:#fffa66;fill-opacity:1;fill-rule:evenodd;stroke:#554500;stroke-width:2.87976956;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 192.02729,-138.98778 c 8.66685,14.08532 -2.47147,31.26885 -19.27566,37.32945 -13.74472,5.926957 -34.4552,4.488932 -42.2812,-7.61109 -7.92628,-11.84298 2.55398,-26.74581 17.45759,-30.73885 11.4278,-4.08035 28.27689,-0.3801 30.58505,10.69642 3.24532,12.73195 -17.77383,24.59263 -30.81854,16.33469 -7.78171,-5.19873 -2.52269,-16.37261 7.39553,-16.72288 12.38553,-2.61268 7.39696,13.55025 0.95412,8.48281 2.67936,-2.26467 3.57653,-6.09289 0.1332,-2.99085 -11.95655,0.96158 0.38391,13.61041 8.15804,7.36933 8.68597,-3.08214 9.82537,-14.11253 1.13935,-17.74378 -15.01144,-6.51069 -35.4818,7.145 -29.56839,20.34753 4.6722,11.21558 22.72379,12.98992 34.21306,7.92014 14.48878,-5.0794 22.98712,-20.68023 13.91185,-31.94538 -9.28438,-11.98514 -30.70136,-12.31635 -44.5649,-5.64712 -16.74882,6.80353 -26.62771,24.88164 -17.003,38.70631 5.2646,3.58245 2.68567,-3.0941 -2.06098,-0.77335 -14.13323,-12.40822 -10.45857,-24.07316 4.11847,-35.18646 14.96721,-12.5343 42.37641,-17.57768 59.98458,-5.75242 3.14556,2.18742 5.73005,4.90024 7.52183,7.9255 z"
+       id="path4418"
+       style="fill:#fffa66;fill-opacity:1;fill-rule:evenodd;stroke:#554500;stroke-width:2.87976956;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 60.393249,-100.36747 133.049121,0 21.42102,18.365301 -176.611108,0 22.140967,-18.365301 z"
+       id="rect2158"
+       style="fill:url(#linearGradient45113);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient45115);stroke-width:5.75954056;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       d="m 129.62822,-102.88026 c 9.49834,-10.46229 14.12292,-25.6723 7.5594,-38.87688 -1.88198,-3.93352 -4.61544,-7.41505 -7.91936,-10.25919 -9.24741,-7.68776 -21.10311,-9.85398 -32.577404,-8.09935 -11.474297,1.75462 -22.557131,7.51004 -30.417566,15.65875 -15.31105,14.44978 -19.164533,41.10192 -4.319655,57.23542 4.98567,-3.017492 7.689532,-5.961147 2.159827,-10.61915 -10.109338,-17.9752 0.226379,-41.36987 17.818575,-50.21598 14.561624,-8.67152 37.044343,-8.20399 46.796253,7.37941 8.34072,12.81634 2.23407,29.2897 -9.53923,37.79697 m -36.357095,0 c -1.83272,-1.91981 -3.736426,-3.85671 -4.679626,-6.65946 -6.211173,-17.16628 15.370206,-34.92325 31.137511,-26.45789 9.1234,4.72144 7.86347,19.03067 -1.2599,23.03816 -8.165588,8.11482 -21.017919,-8.28896 -8.459324,-9.53924 3.616704,-4.03334 2.634294,1.0151 -0.179986,3.95969 6.76726,6.58882 11.92928,-14.5562 -1.079914,-11.15911 -10.417646,0.45542 -15.912932,15.01874 -7.73938,21.77826 13.701564,10.737193 35.806134,-4.68389 32.397404,-21.23831 -1.81829,-10.80148 -12.16327,-16.22868 -22.31821,-16.01871 -3.38498,0.07 -6.898397,0.83349 -9.899209,2.15983 -15.65407,5.19186 -26.503947,24.55825 -18.178545,39.9568 0.04178,0.08 0.179985,0.17998 0.179985,0.17998"
+       id="path4420"
+       style="fill:#fffa66;fill-opacity:1;fill-rule:evenodd;stroke:#554500;stroke-width:2.87976956;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+</svg>
diff --git a/media/logos/legacy/arch-legacy-noodle-cup.png b/media/logos/legacy/arch-legacy-noodle-cup.png
new file mode 100644
index 00000000..b4f93078
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-noodle-cup.png
diff --git a/media/logos/legacy/arch-legacy-noodle-cup.svg b/media/logos/legacy/arch-legacy-noodle-cup.svg
new file mode 100644
index 00000000..8d6a0442
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-noodle-cup.svg
@@ -0,0 +1,474 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="200"
+   height="232.31387"
+   id="svg2895">
+  <defs
+     id="defs2897">
+    <linearGradient
+       id="linearGradient36029">
+      <stop
+         id="stop36031"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop36037"
+         style="stop-color:#000000;stop-opacity:0.49803922"
+         offset="0.7639485" />
+      <stop
+         id="stop36033"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient19847">
+      <stop
+         id="stop19849"
+         style="stop-color:#d8d8d3;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop19851"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient18995">
+      <stop
+         id="stop18997"
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop18999"
+         style="stop-color:#345180;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient18261">
+      <stop
+         id="stop18263"
+         style="stop-color:#cecece;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop18265"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient17527">
+      <stop
+         id="stop17529"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop17531"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient13880">
+      <stop
+         id="stop13882"
+         style="stop-color:#a8b0a1;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop13884"
+         style="stop-color:#edeeeb;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient13872">
+      <stop
+         id="stop13874"
+         style="stop-color:#a8b0a1;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop13876"
+         style="stop-color:#a8b0a1;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="14.595432"
+       y1="25.7218"
+       x2="32.016243"
+       y2="43.399467"
+       id="linearGradient19001"
+       xlink:href="#linearGradient18995"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99225,0,0,1,0.185736,0)" />
+    <linearGradient
+       x1="43.25"
+       y1="20"
+       x2="40.875"
+       y2="28.625"
+       id="linearGradient11647"
+       xlink:href="#linearGradient5721"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="16.380457"
+       cy="17.796696"
+       r="17.033163"
+       fx="16.380457"
+       fy="17.796696"
+       id="radialGradient8714"
+       xlink:href="#linearGradient8716"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.436773,0.522591,-0.476132,-0.397944,32.37619,9.556039)" />
+    <linearGradient
+       x1="21"
+       y1="46.714287"
+       x2="21"
+       y2="-3.9460521"
+       id="linearGradient7976"
+       xlink:href="#linearGradient2882"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="18.384777"
+       cy="40.575378"
+       r="21.213203"
+       fx="18.384777"
+       fy="40.575378"
+       id="radialGradient5727"
+       xlink:href="#linearGradient5721"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.943831,0,0,0.166667,1.032663,33.81282)" />
+    <linearGradient
+       id="linearGradient5721">
+      <stop
+         id="stop5723"
+         style="stop-color:#9c9c9c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5725"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2882">
+      <stop
+         id="stop2884"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2886"
+         style="stop-color:#dadada;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient639">
+      <stop
+         id="stop640"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop641"
+         style="stop-color:#8e8e8e;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8716">
+      <stop
+         id="stop8718"
+         style="stop-color:#e1e1e1;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop8720"
+         style="stop-color:#c1c1c1;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="18.384777"
+       cy="40.575378"
+       r="21.213203"
+       fx="18.384777"
+       fy="40.575378"
+       id="radialGradient19071"
+       xlink:href="#linearGradient5721"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.943831,0,0,0.166667,1.032663,33.81282)" />
+    <linearGradient
+       x1="21"
+       y1="46.714287"
+       x2="21"
+       y2="-3.9460521"
+       id="linearGradient19073"
+       xlink:href="#linearGradient2882"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="16.380457"
+       cy="17.796696"
+       r="17.033163"
+       fx="16.380457"
+       fy="17.796696"
+       id="radialGradient19075"
+       xlink:href="#linearGradient8716"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.436773,0.522591,-0.476132,-0.397944,32.37619,9.556039)" />
+    <linearGradient
+       x1="43.25"
+       y1="20"
+       x2="40.875"
+       y2="28.625"
+       id="linearGradient19077"
+       xlink:href="#linearGradient5721"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="43.25"
+       y1="20"
+       x2="40.875"
+       y2="28.625"
+       id="linearGradient19080"
+       xlink:href="#linearGradient5721"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.493381,0,0,0.493381,-42.24651,27.80721)" />
+    <linearGradient
+       x1="21"
+       y1="46.714287"
+       x2="21"
+       y2="-3.9460521"
+       id="linearGradient19084"
+       xlink:href="#linearGradient2882"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.493381,0,0,0.493381,-42.2465,27.80722)" />
+    <radialGradient
+       cx="16.380457"
+       cy="17.796696"
+       r="17.033163"
+       fx="16.380457"
+       fy="17.796696"
+       id="radialGradient19089"
+       xlink:href="#linearGradient8716"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.436773,0.522591,-0.476132,-0.397944,32.37619,9.556039)" />
+    <linearGradient
+       x1="21"
+       y1="46.714287"
+       x2="21"
+       y2="-3.9460521"
+       id="linearGradient19098"
+       xlink:href="#linearGradient2882"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.493381,0,0,0.493381,-42.2465,27.80722)" />
+    <radialGradient
+       cx="16.380457"
+       cy="17.796696"
+       r="17.033163"
+       fx="16.380457"
+       fy="17.796696"
+       id="radialGradient19100"
+       xlink:href="#linearGradient8716"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.436773,0.522591,-0.476132,-0.397944,32.37619,9.556039)" />
+    <linearGradient
+       x1="43.25"
+       y1="20"
+       x2="40.875"
+       y2="28.625"
+       id="linearGradient19102"
+       xlink:href="#linearGradient5721"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.493381,0,0,0.493381,-42.24651,27.80721)" />
+    <linearGradient
+       x1="43.25"
+       y1="20"
+       x2="40.875"
+       y2="28.625"
+       id="linearGradient19105"
+       xlink:href="#linearGradient5721"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.412385,0,0,0.412385,-45.67954,21.62447)" />
+    <linearGradient
+       x1="15.588248"
+       y1="24.995495"
+       x2="30.506712"
+       y2="27.646311"
+       id="linearGradient19853"
+       xlink:href="#linearGradient19847"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.341723,0,0,2.393257,9.840567,-34.82516)" />
+    <linearGradient
+       x1="14.595432"
+       y1="25.7218"
+       x2="32.016243"
+       y2="43.399467"
+       id="linearGradient19857"
+       xlink:href="#linearGradient19847"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99225,0,0,1,0.185736,0)" />
+    <linearGradient
+       x1="14.595432"
+       y1="25.7218"
+       x2="32.016243"
+       y2="43.399467"
+       id="linearGradient19861"
+       xlink:href="#linearGradient18995"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99225,0,0,1,0.185736,0)" />
+    <linearGradient
+       x1="14.595432"
+       y1="25.7218"
+       x2="32.016243"
+       y2="43.399467"
+       id="linearGradient19869"
+       xlink:href="#linearGradient18995"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99225,0,0,1,0.185736,0)" />
+    <radialGradient
+       cx="16.380457"
+       cy="17.796696"
+       r="17.033163"
+       fx="16.380457"
+       fy="17.796696"
+       id="radialGradient33818"
+       xlink:href="#linearGradient8716"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.436773,0.522591,-0.476132,-0.397944,32.37619,9.556039)" />
+    <linearGradient
+       x1="16.10977"
+       y1="33.78125"
+       x2="24.845407"
+       y2="37.786808"
+       id="linearGradient33820"
+       xlink:href="#linearGradient19847"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99225,0,0,1,0.185736,0)" />
+    <linearGradient
+       x1="21"
+       y1="46.714287"
+       x2="21"
+       y2="-3.9460521"
+       id="linearGradient35282"
+       xlink:href="#linearGradient2882"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1089431,0,0,2.1089431,39.225419,-70.464662)" />
+    <linearGradient
+       x1="12.422917"
+       y1="22.117067"
+       x2="33.03495"
+       y2="43.351715"
+       id="linearGradient35299"
+       xlink:href="#linearGradient18995"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.1140151,0,0,5.1140151,-34.00968,-193.83759)" />
+    <linearGradient
+       x1="18.746035"
+       y1="15.474086"
+       x2="25.149832"
+       y2="20.9375"
+       id="linearGradient35301"
+       xlink:href="#linearGradient13880"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="29"
+       cy="42.3125"
+       r="16.375"
+       fx="29"
+       fy="42.3125"
+       id="radialGradient36035"
+       xlink:href="#linearGradient36029"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.935227,-1.310122e-6,2.442748e-7,0.174375,1.878411,34.93429)" />
+  </defs>
+  <g
+     transform="translate(-8.266785,185.56388)"
+     id="layer1">
+    <path
+       d="m 45.375,42.3125 a 16.375,3.5625 0 1 1 -32.75,0 16.375,3.5625 0 1 1 32.75,0 z"
+       transform="matrix(5.1140151,0,0,5.1140151,-23.781651,-187.85544)"
+       id="path33822"
+       style="opacity:0.64351585;fill:url(#radialGradient36035);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+    <path
+       d="m 18.226332,-154.97217 141.000698,0 -2.83097,57.514384 -11.59786,123.906828 c 0,0 -9.35469,17.370116 -56.071523,17.370116 -47.081715,0 -56.071519,-17.370116 -56.071519,-17.370116 L 21.057303,-97.457786 18.226332,-154.97217 z"
+       id="rect2909"
+       style="fill:url(#linearGradient35299);fill-opacity:1;fill-rule:evenodd;stroke:#323232;stroke-width:5.11401558;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       d="m 10.920596,-153.28598 155.612174,0.36529 -9.58878,31.2496 -2.28305,31.61488 c 0,0 -19.21743,14.000838 -65.934263,14.000838 -47.081715,0 -65.934261,-15.461984 -65.934261,-15.461984 l -2.283044,-30.884314 -9.588776,-30.88431 z"
+       id="path7304"
+       style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#323232;stroke-width:5.1140151;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       d="m 88.726682,-76.215241 0,-40.912119"
+       id="path8032"
+       style="fill:none;stroke:#323232;stroke-width:5.1140151;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 30.235134,-87.734764 0,-26.848576 -3.515885,-15.02242"
+       id="path9492"
+       style="fill:none;stroke:#323232;stroke-width:5.1140151;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 48.453813,-79.314825 0,-25.570075 -2.237382,-16.30092"
+       id="path9494"
+       style="fill:none;stroke:#323232;stroke-width:5.1140151;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 68.270622,-76.990137 0,-27.807453 -1.278504,-13.74392"
+       id="path9496"
+       style="fill:none;stroke:#323232;stroke-width:5.1140151;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 146.57898,-87.734764 0,-26.848576 3.51588,-15.02242"
+       id="path10230"
+       style="fill:none;stroke:#323232;stroke-width:5.1140151;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 128.3603,-79.314825 0,-25.570075 2.23738,-16.30092"
+       id="path10232"
+       style="fill:none;stroke:#323232;stroke-width:5.1140151;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 108.54349,-76.990137 0,-27.807453 1.2785,-13.74392"
+       id="path10234"
+       style="fill:none;stroke:#323232;stroke-width:5.1140151;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 10.920596,-153.28598 155.612174,0.36529 -9.58878,31.2496 -2.28305,31.61488 c -32.63295,0 -26.09489,-27.37324 -134.151568,-38.67373 l -9.588776,-24.55604 z"
+       id="path11688"
+       style="opacity:0.49999988;fill:#535b4c;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       d="m 10.920596,-153.28598 155.612174,0.36529 -9.58878,31.2496 -2.28305,31.61488 c 0,0 -19.21743,14.000838 -65.934263,14.000838 -47.081715,0 -65.934261,-15.461984 -65.934261,-15.461984 l -2.283044,-30.884314 -9.588776,-30.88431 z"
+       id="path14616"
+       style="fill:none;stroke:#323232;stroke-width:5.1140151;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       d="m 39.714286,17.214285 a 13.785714,5 0 1 1 -27.571428,0 13.785714,5 0 1 1 27.571428,0 z"
+       transform="matrix(5.6509867,0,0,5.6509867,-57.795334,-252.02963)"
+       id="path2903"
+       style="fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#323232;stroke-width:0.90497738;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       d="m 25.9375,13.5 c -3.680316,0 -7.012901,0.540575 -9.3125,1.375 -1.1498,0.417212 -2.038404,0.925563 -2.5625,1.375 -0.524096,0.449437 -0.625,0.751777 -0.625,0.96875 0,0.216973 0.100904,0.519313 0.625,0.96875 0.524096,0.449437 1.4127,0.957788 2.5625,1.375 2.299599,0.834425 5.632184,1.375 9.3125,1.375 3.680316,0 7.012901,-0.540575 9.3125,-1.375 1.149799,-0.417212 2.038404,-0.925563 2.5625,-1.375 0.524096,-0.449437 0.625,-0.751777 0.625,-0.96875 0,-0.216973 -0.100904,-0.519313 -0.625,-0.96875 C 37.288404,15.800563 36.3998,15.292212 35.25,14.875 32.950401,14.040575 29.617816,13.5 25.9375,13.5 z"
+       transform="matrix(5.6509867,0,0,5.6509867,-57.795334,-252.02963)"
+       id="path12418"
+       style="fill:url(#linearGradient35301);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       d="m 111.19306,-35.829326 c -0.28068,-1.818779 28.00187,5.441849 26.36698,17.839981 -1.05118,12.6747179 -21.21868,24.4134947 -57.66808,30.911766 -16.965408,2.356692 -24.487996,2.553229 -24.497319,1.319263 -0.158805,-1.085496 54.324829,-7.2688363 67.718739,-31.031389 7.27053,-13.782168 -11.60292,-16.982821 -11.92032,-19.039621 z"
+       id="path632"
+       style="font-size:12px;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       d="m 123.75789,14.429143 c 0.4483,4.979358 0.28888,6.009203 -0.96196,5.932247 -1.62245,-0.105041 -1.34857,-2.203368 -1.82512,-3.613527 -5.08597,-17.28389301 -16.64888,-44.174955 -34.013056,-44.174955 -17.265467,0 -24.708415,22.1679673 -30.969815,40.465913 -0.926348,2.859799 -2.05655,7.226457 -7.815806,7.327735 -4.12365,0.01084 -5.243384,-3.839414 -5.043984,-6.331719 3.160415,-41.92307 18.298361,-73.400646 40.697133,-74.093881 19.038328,-0.589385 36.187778,32.887873 39.932608,74.488187 z"
+       id="path630"
+       style="font-size:12px;fill:#dadada;fill-opacity:1;fill-rule:evenodd;stroke:#383838;stroke-width:5.1140151;stroke-opacity:1" />
+    <path
+       d="m 123.75789,14.429143 c 0.4483,4.979358 0.28888,6.009203 -0.96196,5.932247 -1.62245,-0.105041 -1.34857,-2.203368 -1.82512,-3.613527 -5.08597,-17.28389301 -16.64888,-44.174955 -34.013056,-44.174955 -17.265467,0 -24.708415,22.1679673 -30.969815,40.465913 -0.926348,2.859799 -2.05655,7.226457 -7.815806,7.327735 -4.12365,0.01084 -5.243384,-3.839414 -5.043984,-6.331719 3.160415,-41.92307 18.298361,-73.400646 40.697133,-74.093881 19.038328,-0.589385 36.187778,32.887873 39.932608,74.488187 z"
+       id="path5053"
+       style="font-size:12px;fill:url(#linearGradient35282);fill-opacity:1;fill-rule:evenodd;stroke:#383838;stroke-width:5.1140151;stroke-opacity:1" />
+    <path
+       d="m 21.28125,8.625 c -3.604616,0.1115613 -6.9756,2.689174 -9.9375,8.28125 C 9.2245844,20.90724 7.5567401,26.322951 6.5,32.5625 c 1.0125277,-2.663341 2.1592155,-5.309728 3.65625,-7.75 2.610374,-4.255093 6.790157,-8.125 12.46875,-8.125 3.74341,0 6.758167,1.806505 9.28125,4.21875 -0.581265,-1.450173 -1.19547,-2.868191 -1.84375,-4.09375 -1.534806,-2.901517 -3.216619,-5.103367 -4.78125,-6.4375 -1.564631,-1.3341335 -2.843776,-1.7857939 -4,-1.75 z"
+       transform="matrix(2.1089431,0,0,2.1089431,39.225368,-70.464659)"
+       id="path5786"
+       style="font-size:12px;fill:url(#radialGradient33818);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       d="m 91.763129,-167.78807 c -2.315713,0.13341 -4.540325,-0.0364 -6.871958,0.15981 -13.668167,1.15019 -27.231093,3.47616 -36.277545,4.9542 -2.733615,0.44662 -5.042511,1.34475 -7.191584,2.55701 -3.032749,0.28666 -5.74196,0.5048 -8.789713,0.79906 -1.914217,0.18482 -3.26376,0.29603 -5.114015,0.47944 -0.973044,1.09628 -1.697582,3.00371 -2.716821,4.31495 2.984514,2.49854 7.866358,5.36435 14.223355,7.67103 1.37525,0.49902 3.452783,0.65852 4.954202,1.11869 1.282426,-1.18274 2.289197,-2.23954 3.356072,-3.03645 2.950081,-0.27341 6.183704,-0.57279 8.789714,-0.79907 3.131408,-1.90178 4.787347,-3.04576 8.150461,-4.9542 5.153603,-0.67837 10.832814,-1.22501 16.780362,-1.43831 1.134238,-0.0407 1.914171,0.0231 3.036447,0 -3.488065,2.52736 -6.510233,5.36785 -9.428966,7.99064 -2.39295,2.15033 -3.720538,4.69049 -5.114015,7.19159 4.667552,0.52374 9.511174,0.92935 14.542981,1.11869 3.250984,-2.91504 6.396482,-5.49503 9.588778,-7.67102 1.05811,1.09811 1.876562,1.90883 2.876634,3.03644 1.341089,1.51216 2.483371,3.05546 3.196259,4.15514 0.257103,0.39661 0.213648,0.0606 0.319623,0.31963 8.93384,-0.37947 17.32802,-1.01738 24.93083,-2.3972 -1.16727,-1.4122 -1.63272,-2.34775 -3.35608,-3.99532 -0.20297,-1.05074 -0.6445,-2.11587 -0.95887,-3.19626 1.65235,0.46435 3.88231,0.66878 5.43364,1.59813 2.72848,1.63454 4.23062,2.65502 6.07289,3.83551 4.07119,-0.97272 8.78748,-1.65805 12.14579,-2.87663 1.02211,-0.37088 1.29059,-0.88544 2.23738,-1.27851 -0.2725,-0.33302 -0.4158,-0.72508 -0.79907,-1.11869 -4.20646,-4.31998 -9.02291,-6.24798 -12.46541,-8.31027 -5.44413,-3.26141 -10.69657,-4.22168 -15.66167,-5.11402 -3.11094,-0.5591 -4.92052,-0.99908 -7.03177,-1.75794 -0.16184,-0.0582 -0.16144,-0.10904 -0.31963,-0.15981 -2.36441,-1.47277 -5.09888,-2.58806 -8.31027,-2.87664 -2.858061,-0.25681 -6.596482,-0.0809 -9.908406,-0.15981 -0.07612,-0.0804 -0.243227,-0.0794 -0.319625,-0.15981 z m 29.725211,14.54298 c 0.0764,-0.0121 0.24313,0.0119 0.31963,0 0.63039,0.21562 1.21893,0.4246 1.75794,0.63925 -0.17085,0.0315 -0.30894,0.12729 -0.47944,0.15981 -0.46379,-0.21558 -1.15499,-0.58303 -1.59813,-0.79906 z"
+       id="path21330"
+       style="fill:#fce94f;fill-opacity:1;fill-rule:evenodd;stroke:#7c6f00;stroke-width:5.1140151;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       d="m 63.156606,-175.77872 c -1.206994,0.18629 -2.336138,0.60466 -3.196259,1.11869 -1.720263,1.02804 -3.064753,2.39181 -4.634576,4.15513 -5.995012,6.73395 -11.649251,12.66004 -18.698118,18.21868 -1.438619,0.95223 -2.215182,2.57195 -1.917756,4.15514 0.297437,1.58318 1.649321,2.88101 3.356073,3.35607 1.706766,0.47508 3.553141,0.0362 4.794389,-1.11869 7.695861,-6.06885 13.721762,-12.49106 19.816808,-19.33737 0.648734,-0.72868 0.848318,-0.72977 1.278504,-1.11869 0.102224,0.14581 0.205911,0.31248 0.319626,0.47944 -0.08272,0.0678 -0.243309,0.0932 -0.319626,0.15981 -1.050679,0.91666 -1.846579,1.96211 -2.876633,3.19626 -0.191341,0.22924 -2.74237,2.9756 -4.634576,5.75327 -0.946093,1.38884 -1.663411,2.77193 -2.237382,4.47476 -0.286983,0.85143 -0.601782,1.80403 -0.479439,3.03645 0.0837,0.8433 0.898466,1.80714 1.59813,2.71682 -1.010028,1.02291 -2.101656,1.97462 -3.19626,3.6757 -0.531801,0.82645 -0.940339,1.94753 -1.278503,3.03645 3.145804,0.68188 5.646972,1.56236 9.109339,2.07756 2.3e-4,-0.16598 -0.04145,-0.14938 0.479439,-0.95887 0.486159,-0.75553 1.279358,-1.5578 2.077569,-2.3972 0.381336,0.24456 0.797975,0.43562 1.11869,0.63925 0.414793,0.26338 0.837175,0.46674 1.118691,0.63926 0.140769,0.0862 0.1673,0.23271 0.319626,0.31962 0.07615,0.0435 0.127549,0.0651 0.319626,0.15982 0.09604,0.0473 0.296045,0.0363 0.639252,0.15981 0.159562,0.0574 0.703024,0.29722 0.799065,0.31962 -0.361546,0.52695 -0.720504,1.05493 -1.118691,1.59813 3.415313,0.40059 7.082011,0.57511 10.707469,0.79907 0.214144,-0.29456 0.425256,-0.67033 0.639252,-0.95888 0.674692,0.20394 1.404503,0.45409 2.077569,0.63925 -0.01544,0.1252 -0.145085,0.29667 -0.159813,0.47944 3.337907,0.16313 6.283692,0.63925 9.748591,0.63925 13.787388,0 25.984838,-1.55666 36.916798,-3.83551 5.84105,-5.35579 7.90466,-11.94508 9.10934,-17.89905 0.30294,-1.49727 -0.0611,-3.1402 -0.79907,-4.31495 -0.738,-1.17475 -1.61233,-1.87351 -2.39719,-2.3972 -1.56975,-1.04734 -3.00374,-1.63883 -2.71682,-1.43831 -2.43263,-1.70019 -4.74438,-1.89704 -6.55233,-1.91776 -1.80796,-0.0207 -3.69856,0.15981 -3.51589,0.15981 -2.68717,1e-5 -5.41058,0.59601 -8.15046,1.27851 -1.65083,-0.54031 -3.30196,-0.8686 -4.79439,-0.95888 -3.67926,-0.22256 -7.185994,0.15981 -8.789713,0.15981 -6.983439,10e-6 -12.610456,3.2251 -16.940175,6.39252 -1.071474,-1.18935 -2.008351,-2.4562 -3.356073,-3.51588 -0.630752,-0.49594 -1.196526,-0.85425 -1.757943,-1.27851 -0.457735,-1.10625 -0.875294,-2.2735 -1.598129,-3.35607 -0.870355,-1.3035 -1.482635,-2.51524 -2.397195,-3.6757 -0.914549,-1.16045 -2.056228,-2.41202 -4.31495,-3.19626 -1.129354,-0.39211 -2.308901,-0.50591 -3.515886,-0.31962 z m 58.970984,16.94017 c 0.92791,0.0106 1.41873,0.32139 0.95888,0 1.22156,0.85376 1.61277,0.90467 2.07757,1.11869 -0.93371,4.52617 -1.85669,8.08166 -4.47476,11.0271 0.25473,-1.87195 0.17286,-3.73032 -0.15982,-5.43364 -0.488,-2.49857 -1.57746,-4.3751 -2.557,-6.39252 0.2342,-0.0118 0.58095,-0.15982 0.79906,-0.15982 1.49487,2e-5 2.42815,-0.17045 3.35607,-0.15981 z m -25.090633,0.47944 c 0.128719,0 0.190369,10e-4 0.319626,0 -0.03845,0.0494 0.03771,0.11104 0,0.15981 -1.876793,1.09964 -3.777013,2.3281 -4.79439,2.87664 -0.297963,0.16065 -0.51025,0.30767 -0.799064,0.47944 -0.02262,-0.7457 0.04938,-1.58927 0,-2.23739 1.83005,-0.73611 3.616657,-1.2785 5.273828,-1.2785 z m -29.725213,2.71682 c 0.03169,1.54649 0.02887,3.24472 0,4.9542 -0.983344,-0.29593 -2.289535,-0.31935 -3.515886,-0.31962 0.254141,-0.46918 0.412507,-0.71106 0.799065,-1.27851 0.939578,-1.37925 1.867516,-2.34654 2.716821,-3.35607 z m 37.715866,3.35607 c 0.36701,0.15314 0.75471,0.34019 1.11869,0.47944 0.22483,0.086 0.40694,0.068 0.63925,0.15982 -0.42356,1.62724 -0.72256,3.37102 -1.43832,5.27382 -0.0121,0.0321 -0.14767,-0.032 -0.15981,0 -0.48582,-0.24673 -0.783,-0.55212 -0.63925,-0.31962 -0.91846,-1.48558 -1.50205,-2.48071 -1.59813,-3.03645 -0.0935,-0.54087 -0.006,-0.81738 0.95887,-2.07757 0.45837,-0.20327 0.95616,-0.44183 1.1187,-0.47944 z m -10.228035,6.39252 c 0.530743,1.14342 0.923468,2.52329 1.438317,3.35608 0.418035,0.67617 0.924588,1.12158 1.438317,1.59813 -0.639687,0.0157 -1.191653,0.0774 -1.917756,-0.15982 -1.667123,-0.54477 -3.52213,-0.97693 -5.273828,-1.43831 1.424355,-1.30308 2.918752,-2.2376 4.31495,-3.35608 z"
+       id="path24281"
+       style="fill:#fce94f;fill-opacity:1;fill-rule:evenodd;stroke:#7c6f00;stroke-width:5.11401367;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 33.906122,-82.562347 c 0,0 54.341888,22.373816 116.503658,22.373816 l 2.55701,-25.570076 c -0.14404,0.06059 -9.38799,4.36584 -19.33737,7.031771 -10.01454,2.683385 -24.57961,5.141442 -42.35044,5.141437 -17.659881,0 -32.106171,-1.792954 -42.190625,-4.342372 -5.04223,-1.274709 -8.98666,-2.418556 -11.666347,-3.356072 -1.339841,-0.468756 -2.348151,-0.856966 -3.036447,-1.118691 -0.201742,-0.07672 -0.336773,-0.105753 -0.479439,-0.159813 z"
+       id="path28691"
+       style="opacity:0.34351579;fill:#535b4c;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+    <path
+       d="m 12.75,22.875 1.78125,19.375 0,0.03125 c 0.01965,0.01819 0.05938,0.0336 0.09375,0.0625 0.08249,0.06936 0.203097,0.164602 0.375,0.28125 0.343806,0.233295 0.877234,0.535896 1.625,0.84375 1.495532,0.615708 3.855927,1.21875 7.34375,1.21875 3.553615,0 5.921641,-0.59807 7.40625,-1.21875 0.742304,-0.31034 1.262564,-0.643841 1.59375,-0.875 0.165593,-0.11558 0.29917,-0.183662 0.375,-0.25 0.02916,-0.02551 0.04592,-0.04649 0.0625,-0.0625 0.005,-0.0048 -0.0038,-0.0274 0,-0.03125 L 35.1875,22.875 c -0.02817,0.01185 -0.05437,0.01527 -0.09375,0.03125 -0.13436,0.05452 -0.333243,0.125981 -0.59375,0.21875 -0.521013,0.185537 -1.266767,0.440977 -2.25,0.6875 -1.966465,0.493046 -4.806323,1.000001 -8.28125,1 -3.453232,0 -6.278075,-0.532734 -8.25,-1.03125 -0.985963,-0.249258 -1.757261,-0.472927 -2.28125,-0.65625 -0.261994,-0.09166 -0.45916,-0.167572 -0.59375,-0.21875 -0.03945,-0.015 -0.06585,-0.02068 -0.09375,-0.03125 z"
+       transform="matrix(5.1140151,0,0,5.1140151,-34.00968,-193.83759)"
+       id="path19871"
+       style="opacity:0.64351585;fill:url(#linearGradient33820);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  </g>
+</svg>
diff --git a/media/logos/legacy/arch-legacy-noodle-white.png b/media/logos/legacy/arch-legacy-noodle-white.png
new file mode 100644
index 00000000..a12ee21c
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-noodle-white.png
diff --git a/media/logos/legacy/arch-legacy-noodle-white.svg b/media/logos/legacy/arch-legacy-noodle-white.svg
new file mode 100644
index 00000000..03e1b15a
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-noodle-white.svg
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="300"
+   height="248.04205"
+   id="svg1374">
+  <defs
+     id="defs1376">
+    <linearGradient
+       id="linearGradient21348">
+      <stop
+         id="stop21350"
+         style="stop-color:#edd400;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop21352"
+         style="stop-color:#baa600;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient21338">
+      <stop
+         id="stop21340"
+         style="stop-color:#baa400;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop21346"
+         style="stop-color:#baa600;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop21342"
+         style="stop-color:#604e00;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop21344"
+         style="stop-color:#604e00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient21320">
+      <stop
+         id="stop21322"
+         style="stop-color:#edd400;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop21326"
+         style="stop-color:#604e00;stop-opacity:1"
+         offset="0.583691" />
+      <stop
+         id="stop21324"
+         style="stop-color:#604e00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient16135">
+      <stop
+         id="stop16137"
+         style="stop-color:#edd400;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop16139"
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8716">
+      <stop
+         id="stop8718"
+         style="stop-color:#f2f2f2;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop8720"
+         style="stop-color:#cccccc;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient639">
+      <stop
+         id="stop640"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop641"
+         style="stop-color:#8e8e8e;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2882">
+      <stop
+         id="stop2884"
+         style="stop-color:#f9f9f9;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2886"
+         style="stop-color:#e3e3e3;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5721">
+      <stop
+         id="stop5723"
+         style="stop-color:#9c9c9c;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5725"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="18.384777"
+       cy="40.575378"
+       r="21.213203"
+       fx="18.384777"
+       fy="40.575378"
+       id="radialGradient5727"
+       xlink:href="#linearGradient5721"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.943831,0,0,0.166667,1.032663,33.81282)" />
+    <linearGradient
+       x1="21"
+       y1="46.714287"
+       x2="21"
+       y2="5.9534397"
+       id="linearGradient7976"
+       xlink:href="#linearGradient2882"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.049587,0,0,6.049587,-6.7672949,-229.41232)" />
+    <radialGradient
+       cx="16.380457"
+       cy="17.796696"
+       r="17.033163"
+       fx="16.380457"
+       fy="17.796696"
+       id="radialGradient8714"
+       xlink:href="#linearGradient8716"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-4.28975,5.8394364,-3.6097583,-2.6518001,229.06139,-211.11919)" />
+    <linearGradient
+       x1="43.25"
+       y1="20"
+       x2="40.875"
+       y2="28.625"
+       id="linearGradient11647"
+       xlink:href="#linearGradient5721"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.049587,0,0,6.049587,-6.7672949,-229.41232)" />
+    <linearGradient
+       x1="7.9400997"
+       y1="-5.1101465"
+       x2="9.2488842"
+       y2="4.7730908"
+       id="linearGradient19853"
+       xlink:href="#linearGradient21348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.791154,-0.487172,0.327682,1.176225,16.97405,35.22976)" />
+    <linearGradient
+       x1="11.441825"
+       y1="-0.98001873"
+       x2="13.598524"
+       y2="-1.084087"
+       id="linearGradient22817"
+       xlink:href="#linearGradient21348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.05655608,-0.797121,1.172062,0.350025,16.04368,50.1682)" />
+  </defs>
+  <g
+     transform="translate(-1.3401681,202.61015)"
+     id="layer1">
+    <path
+       d="m 39.59798,40.575378 a 21.213203,3.5355339 0 1 1 -42.4264064,0 21.213203,3.5355339 0 1 1 42.4264064,0 z"
+       transform="matrix(6.049587,0,0,6.049587,61.788742,-221.4209)"
+       id="path4993"
+       style="opacity:0.75800003;fill:url(#radialGradient5727);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       d="m 199.6749,-130.05945 c -0.80514,-5.21726 80.32449,15.61015 75.63475,51.174694 C 272.2943,-42.526817 214.443,-8.8536668 109.88644,9.7868891 61.22048,16.547151 39.641628,17.11093 39.614886,13.571251 39.159345,10.457456 195.44786,-7.2796974 233.86883,-75.443533 254.72463,-114.97824 200.58539,-124.15944 199.6749,-130.05945 z"
+       id="path632"
+       style="font-size:12px;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <g
+       transform="matrix(6.049587,0,0,6.049587,-6.7672949,-230.48175)"
+       id="g24322">
+      <path
+         d="m 12.334411,39.271398 c -0.436762,-1.829419 1.931982,-7.76804 5.038023,-10.471368 3.028568,-2.6359 5.42847,-3.947804 8.043372,-4.179892 1.057928,-0.0939 2.250475,1.366774 2.752005,2.995398 0.402297,1.306385 -0.584888,3.636245 -0.584888,3.636245 0,0 -3.297592,0.494824 -5.620374,2.817605 -2.359798,2.359798 -3.478152,6.706882 -3.478152,6.706882 0,0 -4.014221,1.419868 -6.149986,-1.50487 z"
+         id="path13844"
+         style="fill:url(#linearGradient19853);fill-opacity:1;fill-rule:evenodd;stroke:#665409;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0" />
+      <path
+         d="m 1.53125,11.125 c -1.2356121,-5.28e-4 -3.151403,0.512926 -4.6875,1.21875 -0.7680485,0.352912 -1.2588617,0.558414 -1.7300154,0.891436 -0.3182438,0.224942 -0.2037074,0.573413 0.03125,0.78125 0.2372675,0.20988 0.3866735,0.423127 0.6908048,0.285477 C -2.9400117,13.546741 -1.2972757,12.809099 1.375,12.625 3.2322637,12.497049 5.7097,12.773677 7.4636539,13.72724 7.8712028,13.865065 8.0715674,13.669329 8.2873558,13.321715 8.433013,13.087076 8.6529123,12.915204 8.2200886,12.669122 6.3148155,11.453766 4.1279073,11.126109 1.53125,11.125 z"
+         transform="matrix(0.878226,-0.765019,0.765019,0.878226,8.798994,21.17704)"
+         id="path16157"
+         style="fill:#fff38d;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      <path
+         d="m 15.658283,38.279044 c 1.646328,0.491659 2.930449,1.624039 2.866339,2.527633 -0.06411,0.90359 -1.452295,1.237913 -3.098622,0.746254 -1.646331,-0.491661 -2.930451,-1.62404 -2.866341,-2.527633 0.06411,-0.903593 1.452294,-1.237915 3.098624,-0.746254 z"
+         id="path22815"
+         style="fill:url(#linearGradient22817);fill-opacity:1;fill-rule:evenodd;stroke:#665409;stroke-width:0.99999952;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    </g>
+    <path
+       d="m 235.71765,14.109119 c 1.28598,14.283493 0.82868,17.237639 -2.75941,17.01689 -4.65407,-0.301312 -3.86845,-6.320446 -5.23544,-10.365544 -14.58932,-49.579566 -47.758,-126.717715 -97.56788,-126.717715 -49.5267,0 -70.877114,63.589737 -88.838201,116.078161 -2.657278,8.203464 -5.899296,20.7294 -22.419973,21.019913 C 7.067886,31.171943 3.8558814,20.127315 4.4278566,12.978034 13.493654,-107.28005 56.917475,-197.5748 121.1693,-199.56337 c 54.61226,-1.69066 103.80617,94.34025 114.54835,213.672489 z"
+       id="path630"
+       style="font-size:12px;fill:#dadada;fill-opacity:1;fill-rule:evenodd;stroke:#383838;stroke-width:6.04958677;stroke-opacity:1" />
+    <path
+       d="m 235.71765,14.109119 c 1.28598,14.283493 0.82868,17.237639 -2.75941,17.01689 -4.65407,-0.301312 -3.86845,-6.320446 -5.23544,-10.365544 -14.58932,-49.579566 -47.758,-126.717715 -97.56788,-126.717715 -49.5267,0 -70.877114,63.589737 -88.838201,116.078161 -2.657278,8.203464 -5.899296,20.7294 -22.419973,21.019913 C 7.067886,31.171943 3.8558814,20.127315 4.4278566,12.978034 13.493654,-107.28005 56.917475,-197.5748 121.1693,-199.56337 c 54.61226,-1.69066 103.80617,94.34025 114.54835,213.672489 z"
+       id="path5053"
+       style="font-size:12px;fill:url(#linearGradient7976);fill-opacity:1;fill-rule:evenodd;stroke:#323232;stroke-width:6.04958677;stroke-opacity:1" />
+    <path
+       d="m 121.59738,-189.71191 c -27.618072,0.85477 -51.778483,20.62549 -70.893599,56.71488 -19.115116,36.089393 -32.028124,87.561051 -36.486571,146.702485 -0.134733,1.684059 0.328558,4.543893 1.134297,5.860537 0.805739,1.316644 0.722447,1.708996 3.591943,1.701446 5.805524,-0.102086 6.81364,-1.363244 8.507231,-3.591942 1.693591,-2.228698 3.106936,-6.171353 4.537191,-10.5867771 -6.09e-4,-0.063013 -6.09e-4,-0.1260371 0,-0.1890496 8.973448,-26.2234833 18.804506,-55.6974943 33.461777,-79.5898783 14.657272,-23.892384 35.702511,-43.103311 64.654961,-43.103311 29.95424,0 52.97874,22.593499 70.1374,49.341948 7.78014,12.128387 20.44288,45.938397 20.03926,38.755166 -1.17245,-20.865564 -19.29823,-78.019704 -34.02893,-105.867774 -9.82047,-18.56538 -20.79691,-33.21568 -31.94938,-42.72521 -11.15248,-9.50952 -21.96109,-13.75514 -32.70558,-13.42252 z"
+       id="path5786"
+       style="font-size:12px;fill:url(#radialGradient8714);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       d="m 230.86804,-117.11686 c 6.79223,5.31572 12.18052,13.01615 12.85772,21.804027 0.72019,8.15085 -1.63702,16.481483 -5.89805,23.383021 -1.02797,1.967295 -5.37583,4.963311 -4.60352,5.954046 8.08567,-1.669118 11.16767,-4.733252 17.94933,-8.576881 6.98305,-3.957767 11.19471,6.893589 16.93729,-3.052851 4.68068,-8.107179 0.0257,-14.768899 -5.02515,-19.914158 -7.63806,-8.007254 -17.49751,-13.508574 -27.50561,-17.997994 -1.55104,-0.59054 -3.17397,-0.97216 -4.71201,-1.59921 z"
+       id="path9450"
+       style="font-size:12px;fill:url(#linearGradient11647);fill-opacity:1;fill-rule:evenodd;stroke:none" />
+  </g>
+</svg>
diff --git a/media/logos/legacy/arch-legacy-ribbon1.png b/media/logos/legacy/arch-legacy-ribbon1.png
new file mode 100644
index 00000000..fb8e7720
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-ribbon1.png
diff --git a/media/logos/legacy/arch-legacy-ribbon2.png b/media/logos/legacy/arch-legacy-ribbon2.png
new file mode 100644
index 00000000..66635999
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-ribbon2.png
diff --git a/media/logos/legacy/arch-legacy-ribbon3.png b/media/logos/legacy/arch-legacy-ribbon3.png
new file mode 100644
index 00000000..c3c00b85
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-ribbon3.png
diff --git a/media/logos/legacy/arch-legacy-ribbon4.png b/media/logos/legacy/arch-legacy-ribbon4.png
new file mode 100644
index 00000000..33a78edf
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-ribbon4.png
diff --git a/media/logos/legacy/arch-legacy-ribbon5.png b/media/logos/legacy/arch-legacy-ribbon5.png
new file mode 100644
index 00000000..abf7cce4
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-ribbon5.png
diff --git a/media/logos/legacy/arch-legacy-ribbon6.png b/media/logos/legacy/arch-legacy-ribbon6.png
new file mode 100644
index 00000000..9f275f22
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-ribbon6.png
diff --git a/media/logos/legacy/arch-legacy-wombat-lg.png b/media/logos/legacy/arch-legacy-wombat-lg.png
new file mode 100644
index 00000000..0661b6f5
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-wombat-lg.png
diff --git a/media/logos/legacy/arch-legacy-wombat.png b/media/logos/legacy/arch-legacy-wombat.png
new file mode 100644
index 00000000..67e1afac
--- /dev/null
+++ b/media/logos/legacy/arch-legacy-wombat.png
diff --git a/media/titlebar.png b/media/titlebar.png
deleted file mode 100644
index 4e17b609..00000000
--- a/media/titlebar.png
+++ /dev/null
diff --git a/media/titlelogo.png b/media/titlelogo.png
deleted file mode 100644
index be7f14c7..00000000
--- a/media/titlelogo.png
+++ /dev/null
diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py
index 38c92c22..ff66a9f2 100644
--- a/packages/templatetags/package_extras.py
+++ b/packages/templatetags/package_extras.py
@@ -30,7 +30,3 @@ def do_buildsortqs(parser, token):
                 "%r tag's argument should be in quotes" % tagname)
     return BuildQueryStringNode(sortfield[1:-1])
 
-@register.inclusion_tag('forms/td_input.html')
-def td_input(form_element):
-    return {'form_element': form_element}
-
diff --git a/settings.py b/settings.py
index 88adf19d..30f594e6 100644
--- a/settings.py
+++ b/settings.py
@@ -34,6 +34,7 @@ ADMIN_MEDIA_PREFIX = '/media/admin_media/'
 
 # login url
 LOGIN_URL = '/login/'
+LOGIN_REDIRECT_URL = '/'
 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
diff --git a/templates/403.html b/templates/403.html
index c853fef1..6b5fc084 100644
--- a/templates/403.html
+++ b/templates/403.html
@@ -1,9 +1,9 @@
 {% extends "base.html" %}
 
 {% block content %}
-	<div class="box">
-		<h2>403 - Access Forbidden</h2>
-		Sorry, the page you've requested is not available.
-	</div>
+    <div id="error-page" class="box 403">
+        <h2>403 - Access Forbidden</h2>
+        <p>Sorry, the page you've requested is not available.</p>
+    </div>
 {% endblock %}
 
diff --git a/templates/404.html b/templates/404.html
index 9e389ba9..33271c66 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -2,9 +2,9 @@
 {% block title %}Arch Linux - Page Not Found{% endblock %}
 
 {% block content %}
-	<div class="box">
-		<h2>404 - Page Not Found</h2>
-		Sorry, the page you've requested does not exist.
-	</div>
+    <div id="error-page" class="box 404">
+        <h2>404 - Page Not Found</h2>
+        <p>Sorry, the page you've requested does not exist.</p>
+    </div>
 {% endblock %}
 
diff --git a/templates/500.html b/templates/500.html
index 9566fc29..7f040638 100644
--- a/templates/500.html
+++ b/templates/500.html
@@ -1,9 +1,9 @@
 {% extends "base.html" %}
 
 {% block content %}
-	<div class="box">
-		<h2>500 - Internal Server Error</h2>
-		Something has gone horribly wrong.  Back away slowly.
-	</div>
+    <div id="error-page" class="box 500">
+        <h2>500 - Internal Server Error</h2>
+        <p>Something has gone horribly wrong.  Back away slowly.</p>
+    </div>
 {% endblock %}
 
diff --git a/templates/base.html b/templates/base.html
index cc5fadd2..3227fbbf 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,73 +1,90 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-    <head>
-        <title>{% block title %}Arch Linux{% endblock %}</title>
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        <link rel="stylesheet" type="text/css" href="/media/arch.css" />
-        <link rel="icon" type="image/x-icon" href="/media/favicon.ico" />
-        <link rel="shortcut icon" type="image/x-icon" href="/media/favicon.ico" />
-        <link rel="search" type="application/opensearchdescription+xml" href="{% url opensearch-packages %}" title="Arch Linux Packages" />
-        {% block head %}
-        {% endblock %}
-    </head>
-    <body>
-        <div id="head_container">
-            <div id="title">
-              <div id="logo"><h1 id="archtitle"><a href="/" title="Arch Linux (Home)">Arch Linux</a></h1></div>
-            </div>
-            <div id="main_nav">
-                {% block topmenu %}
+<head>
+    <title>{% block title %}Arch Linux{% endblock %}</title>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <link rel="stylesheet" type="text/css" href="/media/archweb.css" media="screen, projection" />
+    <link rel="stylesheet" type="text/css" href="/media/archweb-print.css" media="print" />
+    <link rel="icon" type="image/x-icon" href="/media/favicon.ico" />
+    <link rel="shortcut icon" type="image/x-icon" href="/media/favicon.ico" />
+    <link rel="search" type="application/opensearchdescription+xml" href="{% url opensearch-packages %}" title="Arch Linux Packages" />
+    {% block head %}{% endblock %}
+</head>
+<body class="{% if user.is_authenticated %}devmode{% endif %} {% block bodyclass %}{% endblock %}">
+
+    <div id="archnavbar">
+        <div id="archnavbarlogo"><h1><a href="/" title="Return to the main page">Arch Linux</a></h1></div>
+        <div id="archnavbarmenu">
+            <ul id="archnavbarlist">
+                <li id="anb-home" {% ifnotequal path '/download/' %}class="selected"{% endifnotequal %}>
+                <a href="/" title="Arch news, packages, projects and more">Home</a></li>
+                <li id="anb-packages" {% ifequal path '/packages/' %} class="selected"{% endifequal %}>
+                <a href="/packages/" title="Arch Package Database">Packages</a></li>
+                <li id="anb-forums"><a href="http://bbs.archlinux.org/" title="Community forums">Forums</a></li>
+                <li id="anb-wiki"><a href="http://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>
+                <li id="anb-bugs"><a href="http://bugs.archlinux.org/" title="Report and track bugs">Bugs</a></li>
+                <li id="anb-aur"><a href="http://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li>
+                <li id="anb-download" {% ifequal path '/download/' %} class="selected"{% endifequal %}>
+                <a href="{% url page-download %}" title="Get Arch Linux">Download</a></li>
+            </ul>
+        </div>
+    </div><!-- #archnavbar -->
+
+    <div id="content">
+        <div id="archdev-navbar">
+            {% if user.is_authenticated %}
                 <ul>
-                    <li{% ifnotequal path '/download/' %} class="selected"{% endifnotequal %}><a href="/">Home</a></li>
-                    <li><a href="http://bbs.archlinux.org/">Forums</a></li>
-                    <li><a href="http://wiki.archlinux.org/">Wiki</a></li>
-                    <li><a href="http://bugs.archlinux.org/">Bugs</a></li>
-                    <li><a href="http://aur.archlinux.org/">AUR</a></li>
-                    <li{% ifequal path '/download/' %} class="selected"{% endifequal %}><a href="{% url page-download %}">Download</a></li>
+                    <li><a href="/devel/" title="Developer Dashboard">Dashboard</a></li>
+                    <li><a href="http://wiki.archlinux.org/index.php/DeveloperWiki"
+                        title="Developer HOWTOs and documentation">DevWiki</a></li>
+                    <li><a href="http://projects.archlinux.org/" title="Git Projects">Projects</a></li>
+                    <li><a href="{% url news-list %}" title="Manage news articles">News</a></li>
+                    <li><a href="/packages/signoffs/" title="Package signoffs">Signoffs</a></li>
+                    <li><a href="/todo/" title="Developer to-do lists">Todos</a></li>
+                    <li><a href="http://www.archlinux.org/mailman/private/arch-dev/"
+                        title="arch-dev mailing list archives">Archives</a></li>
+                    <li><a href="/mirrors/" title="Mirror server statistics">Mirrors</a></li>
+                    <li><a href="/devel/profile/" title="Modify your account profile">Profile</a></li>
+                    <li><a href="/accounts/logout/" title="Logout of the developer interface">Logout</a></li>
                 </ul>
-                {% endblock %}
-            </div>
-            <div id="dev_nav">
-                {% if user.is_authenticated %}
-                    <ul>
-                        <li><a href="/devel/">Dashboard</a></li>
-                        <li><a href="{% url news-list %}">News</a></li>
-                        <li><a href="/packages/signoffs/">Signoffs</a></li>
-                        <li><a href="/todo/">Todos</a></li>
-                        <li><a href="http://www.archlinux.org/mailman/private/arch-dev/">Archives</a></li>
-                        <li><a href="/mirrors/">Mirrors</a></li>
-                        <li><a href="/devel/profile/">Profile</a></li>
-                        <li><a href="/accounts/logout/">Logout</a></li>
-                     </ul>
-                {% endif %}
-            </div>
-        </div>
-        <div id="content">
-            {% if messages %}
-            <div class="box" style="width: 50%; text-align: center; margin-left: auto; margin-right: auto">
+            {% endif %}
+        </div><!-- #archdev-navbar -->
+
+        {% if messages %}
+            <div id="sys-message" class="box">
                 {% for message in messages %}
-                <p>{{message}}</p>
+                    <p>{{message}}</p>
                 {% endfor %}
             </div>
-            <br />
-            {% endif %}
-            {% block content %}
-            <div class="right">
-                {% block content_right %}
-                {% endblock %}
-            </div>
-            <div class="left">
-                {% block content_left %}
-                {% endblock %}
+        {% endif %}
+
+        {% block content %}
+            <div id="content-left-wrapper">
+                <div id="content-left">
+                    {% block content_left %}{% endblock %}
+                </div><!-- #content_left -->
             </div>
-            {% endblock %}
-        </div>
-        <div class="foot">
-          Copyright &copy; 2002-{% now "Y" %} <a href="mailto:jvinet@zeroflux.org" title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org" title="contact Aaron Griffin">Aaron Griffin</a>.<br />
-          The Arch Linux name and logo are recognized trademarks. Some rights
-          reserved.<br />
-          The registered trademark Linux® is used pursuant to a sublicense from LMI, the exclusive licensee of Linus Torvalds, owner of the mark on a world-wide basis.
-        </div>
-    </body>
+
+            <div id="content-right">
+                {% block content_right %}{% endblock %}
+            </div><!-- #content_right -->
+        {% endblock %}
+
+        <div id="footer">
+            <p>Copyright &copy; 2002-{% now "Y" %} <a href="mailto:jvinet@zeroflux.org"
+                title="Contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org"
+                title="Contact Aaron Griffin">Aaron Griffin</a>.</p>
+
+            <p>The Arch Linux name and logo are recognized
+            <a href="http://wiki.archlinux.org/index.php/DeveloperWiki:TrademarkPolicy"
+                title="Arch Linux Trademark Policy">trademarks</a>. Some rights reserved.</p>
+
+            <p>The registered trademark Linux® is used pursuant to a sublicense from LMI,
+            the exclusive licensee of Linus Torvalds, owner of the mark on a world-wide basis.</p>
+        </div><!-- #footer -->
+
+    </div><!-- #content -->
+
+</body>
 </html>
diff --git a/templates/devel/index.html b/templates/devel/index.html
index acbe90bf..662e8246 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -6,107 +6,161 @@
 {% endblock %}
 
 {% block content %}
-	{% if todos %}
-	<div class="greybox">
-		<h3 class="title">Package ToDo Lists</h3>
-		<table class="results" width="100%">
-			<tr>
-				<th>Name</th>
-				<th>Creation Date</th>
-				<th>Description</th>
-			</tr>
-		{% for todo in todos %}
-            <tr class="{% cycle pkgr2,pkgr1 %}">
-				<td style="white-space:nowrap"><a href="/todo/{{ todo.id }}/">{{ todo.name }}</a></td>
-				<td>{{ todo.date_added }}</td>
-				<td>{{ todo.description }}</td>
-			</tr>
-		{% endfor %}
-		</table>
-	</div>
-	<br /><br />
-	{% endif %}
-	
-    <div class="greybox">
-		<h3 class="title" style="cursor: pointer" onclick="$(this).next().toggle();">Stats by Architecture</h3>
-        <table class="results" width="100%" style="display: none">
-			<tr>
-				<th width="50%">Arch</th>
-				<th># Packages</th>
-				<th># Flagged</th>
-			</tr>
-		{% for arch in arches %}
-            <tr class="{% cycle pkgr2,pkgr1 %}">
-				<td><strong>{{ arch.name }}</strong></td>
-				<td><a href="/packages/?arch={{ arch.name }}"><strong>{{ arch.packages.count }}</strong> packages</a></td>
-				<td><a href="/packages/?arch={{ arch.name }}&flagged=Flagged"><strong>{{ arch.packages.flagged.count }}</strong> packages</a></td>
-			</tr>
-		{% endfor %}
-		</table>
-	</div>
-	<br /><br />
-    <div class="greybox">
-		<h3 class="title" style="cursor: pointer" onclick="$(this).next().toggle();">Stats by Repository</h3>
-        <table class="results" width="100%" style="display: none">
-			<tr>
-				<th width="50%">Repository</th>
-				<th># Packages</th>
-				<th># Flagged</th>
-			</tr>
-		{% for repo in repos %}
-            <tr class="{% cycle pkgr2,pkgr1 %}">
-				<td><strong>{{ repo.name }}</strong></td>
-				<td><a href="/packages/?repo={{ repo.name }}"><strong>{{ repo.packages.count }}</strong> packages</a></td>
-				<td><a href="/packages/?repo={{ repo.name }}&flagged=Flagged"><strong>{{ repo.packages.flagged.count }}</strong> packages</a></td>
-			</tr>
-		{% endfor %}
-		</table>
-	</div>
-	<br /><br />
-
-	<div class="greybox">
-        <div>Counts are by 'pkgbase' and not raw number of packages.</div>
-        <h3 class="title" style="cursor: pointer" onclick="$(this).next().toggle();">Stats by Maintainer</h3>
-        <table class="results" width="100%" style="display: none">
-			<tr>
-				<th width="50%">Maintainer</th>
-				<th># Packages</th>
-			</tr>
-		{% for maint in maintainers %}
-            <tr class="{% cycle pkgr2,pkgr1 %}">
-				<td><strong>{{ maint.get_full_name }}</strong></td>
-				<td><a href="/packages/?maintainer={{ maint.username }}"><strong>{{ maint.package_relations.count }}</strong> packages</a></td>
-			</tr>
-		{% endfor %}
-		</table>
-	</div>
-	<br /><br />
-
-	<div class="greybox">
-		<h3 class="title">My Flagged Packages</h3>
-        <form method="post" action="/devel/notify/">
-            <input name="notify" type="checkbox" value="yes"
-            {% if user.get_profile.notify %} checked="checked"{% endif %} />
-            Notify me when packages are flagged&nbsp;&nbsp;
-            <input type="submit" value="Update" />
-        </form>
-		<br />
-		<table class="results" width="100%">
-			<tr>
-				<th style="width: 50%">Name</th>
-				<th>Repo</th>
-				<th>Version</th>
-				<th>Arch</th>
-			</tr>
-                {% for pkg in flagged %}
-                <tr class="{% cycle pkgr2,pkgr1 %}">
-                    <td>
-                        <a href="{{ pkg.get_absolute_url }}">{{ pkg.pkgname }}</a>
-                    </td>
+<div id="dev-dashboard" class="box">
+
+    <h2>Developer Dashboard</h2>
+
+    {% if todos %}
+        <h3>Package Todo Lists</h3>
+
+        <table id="dash-todo" class="results dash-stats">
+            <thead>
+                <tr>
+                    <th>Name</th>
+                    <th>Creation Date</th>
+                    <th>Description</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for todo in todos %}
+                    <tr class="{% cycle 'odd' 'even' %}">
+                        <td class="key"><a href="/todo/{{ todo.id }}/"
+                                title="View todo list: {{ todo.name }}">{{ todo.name }}</a></td>
+                        <td>{{ todo.date_added }}</td>
+                        <td>{{ todo.description }}</td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    {% endif %}
+
+    <h3>My Flagged Packages</h3>
+
+    <table id="dash-myflagged" class="results dash-stats">
+        <thead>
+            <tr>
+                <th class="key">Name</th>
+                <th>Repo</th>
+                <th>Version</th>
+                <th>Arch</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for pkg in flagged %}
+                <tr class="{% cycle 'odd' 'even' %}">
+                    <td><a href="{{ pkg.get_absolute_url }}"
+                            title="View package details for {{ pkg.pkgname }}">{{ pkg.pkgname }}</a></td>
                     <td>{{ pkg.repo.name }}</td>
                     <td>{{ pkg.pkgver }}</td>
                     <td>{{ pkg.arch.name }}</td>
                 </tr>
-                {% endfor %}
-		</table>
+            {% empty %}
+                <tr><td colspan="4"><em>No flagged packages to display</em></td></tr>
+            {% endfor %}
+        </tbody>
+    </table>
+
+    <form id="dash-pkg-notify" method="post" action="/devel/notify/">
+        <fieldset>
+            <p><input id="notify" name="notify" type="checkbox" value="yes"
+            {% if user.get_profile.notify %} checked="checked"{% endif %} />
+            <label for="notify">Notify me when packages are flagged out-of-date</label>
+            <input title="Update notification status" type="submit" value="Update" /></p>
+        </fieldset>
+    </form>
+
+</div><!-- #dev-dashboard -->
+
+<div id="dash-by-arch" class="dash-stats box">
+
+    <h3 class="dash-stats" style="cursor: pointer"
+        title="Click to toggle stats by architecture" onclick="$(this).next().toggle();">
+        Stats by Architecture <span class="dash-click">(click to toggle)</span></h3>
+
+    <table id="stats-by-arch" class="results dash-stats">
+        <thead>
+            <tr>
+                <th class="key">Arch</th>
+                <th># Packages</th>
+                <th># Flagged</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for arch in arches %}
+                <tr class="{% cycle 'odd' 'even' %}">
+                    <td>{{ arch.name }}</td>
+                    <td><a href="/packages/?arch={{ arch.name }}"
+                            title="View all packages for the {{ arch.name }} architecture">
+                            <strong>{{ arch.packages.count }}</strong> packages</a></td>
+                    <td><a href="/packages/?arch={{ arch.name }}&amp;flagged=Flagged"
+                            title="View all flagged packages for the {{ arch.name }} architecture">
+                            <strong>{{ arch.packages.flagged.count }}</strong> packages</a></td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+
+</div><!-- #dash-by-arch -->
+
+<div id="dash-by-repo" class="dash-stats box">
+
+    <h3 class="dashboard dash-stats" style="cursor: pointer"
+        title="Click to toggle stats by repository" onclick="$(this).next().toggle();">
+        Stats by Repository <span class="dash-click">(click to toggle)</span></h3>
+
+    <table id="stats-by-repo" class="results dash-stats">
+        <thead>
+            <tr>
+                <th class="key">Repository</th>
+                <th># Packages</th>
+                <th># Flagged</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for repo in repos %}
+                <tr class="{% cycle 'odd' 'even' %}">
+                    <td>{{ repo.name }}</td>
+                    <td><a href="/packages/?repo={{ repo.name }}"
+                            title="View all packages in the {{ repo.name }} repository">
+                            <strong>{{ repo.packages.count }}</strong> packages</a></td>
+                    <td><a href="/packages/?repo={{ repo.name }}&amp;flagged=Flagged"
+                            title="View all flagged packages in the {{ repo.name }} repository">
+                            <strong>{{ repo.packages.flagged.count }}</strong> packages</a></td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+
+</div><!-- dash-by-arch -->
+
+<div id="dash-by-maintainer" class="dash-stats box">
+
+    <h3 class="dashboard dash-stats" style="cursor: pointer"
+        title="Click to toggle stats by maintainer" onclick="$(this).next().toggle();">
+        Stats by Maintainer <span class="dash-click">(click to toggle)</span></h3>
+
+    <table id="stats-by-maintainer" class="results dash-stats">
+        <thead>
+            <tr>
+                <th class="key">Maintainer</th>
+                <th># Base Packages</th>
+                <th># Flagged</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for maint in maintainers %}
+                <tr class="{% cycle 'odd' 'even' %}">
+                    <td>{{ maint.get_full_name }}</td>
+                    <td><a href="/packages/?maintainer={{ maint.username }}"
+                            title="View all packages maintained by {{ maint.get_full_name }}">
+                            <strong>{{ maint.package_relations.count }}</strong> base packages</a></td>
+                    <td><a href="/packages/?maintainer={{ maint.username }}&amp;flagged=Flagged"
+                            title="View all flagged packages maintained by {{ maint.get_full_name }}">
+                            Flagged packages</a></td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+
+</div><!-- #dash-by-maintainer -->
 {% endblock %}
diff --git a/templates/devel/mirrorlist.html b/templates/devel/mirrorlist.html
index bd09d7f2..5084ccac 100644
--- a/templates/devel/mirrorlist.html
+++ b/templates/devel/mirrorlist.html
@@ -2,34 +2,42 @@
 {% block title %}Arch Linux - Mirror Overview{% endblock %}
 
 {% block content %}
-<div class="greybox">
-	<table class="results" width="100%">
-		<tr>
-			<th>Name</th>
-			<th>Tier</th>
-			<th>Country</th>
-			<th>Admin Email</th>
-			<th>Public</th>
-			<th>Active</th>
-			<th>ISOs</th>
-			<th>Protocols</th>
-			<th>Rsync IPs</th>
-			<th>Notes</th>
-		</tr>
-		{% for mirror in mirror_list %}
-		<tr>
-			<td>{{mirror.name}}</td>
-			<td>{{mirror.get_tier_display}}</td>
-			<td>{{mirror.country}}</td>
-			<td>{{mirror.admin_email}}</td>
-			<td>{{mirror.public|yesno}}</td>
-			<td>{{mirror.active|yesno}}</td>
-			<td>{{mirror.isos|yesno}}</td>
-			<td>{{mirror.supported_protocols}}</td>
-			<td>{{mirror.rsync_ips.count}}</td>
-			<td>{{mirror.notes}}</td>
-		</tr>
-		{% endfor %}
-	</table>
+<div id="dev-mirrorlist" class="box">
+
+    <h2>Mirror List</h2>
+
+    <table class="results">
+        <thead>
+            <tr>
+                <th>Server</th>
+                <th>Tier</th>
+                <th>Country</th>
+                <th>Admin Email</th>
+                <th>Public</th>
+                <th>Active</th>
+                <th>ISOs</th>
+                <th>Protocols</th>
+                <th>Rsync IPs</th>
+                <th>Notes</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for mirror in mirror_list %}
+                <tr class="{% cycle 'odd' 'even' %}">
+                    <td>{{mirror.name}}</td>
+                    <td>{{mirror.get_tier_display}}</td>
+                    <td>{{mirror.country}}</td>
+                    <td>{{mirror.admin_email}}</td>
+                    <td>{{mirror.public|yesno}}</td>
+                    <td>{{mirror.active|yesno}}</td>
+                    <td>{{mirror.isos|yesno}}</td>
+                    <td class="wrap">{{mirror.supported_protocols}}</td>
+                    <td>{{mirror.rsync_ips.count}}</td>
+                    <td class="wrap">{{mirror.notes}}</td>
+                </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+
 </div>
 {% endblock %}
diff --git a/templates/devel/profile.html b/templates/devel/profile.html
index 5b5a586b..178a59aa 100644
--- a/templates/devel/profile.html
+++ b/templates/devel/profile.html
@@ -1,21 +1,18 @@
 {% extends "base.html" %}
+{% block title %}Arch Linux - Edit Profile{% endblock %}
 
 {% block content %}
-	<div class="greybox">
-		<h2 class="title">Developer Profile</h2>
-		<form method="post" action=".">
-		<table>
-			<tr>
-				<th>Username:</th>
-				<td><strong>{{ user.username }}</strong></td>
-			</tr>
-            {{form}}
-			<tr>
-				<td colspan="2" align="right">
-					<input type="submit" value=" Save ">
-				</td>
-			</tr>
-		</table>
-		</form>
-	</div>
+<div id="dev-edit-profile" class="box">
+
+    <h2>Developer Profile</h2>
+
+    <form id="edit-profile-form" method="post" action=".">
+        <fieldset>
+            <legend>Username: <strong>{{ user.username }}</strong></legend>
+            {{ form.as_p }}
+        </fieldset>
+        <p><label></label> <input title="Save changes" type="submit" value="Save" /></p>
+    </form>
+
+</div>
 {% endblock %}
diff --git a/templates/forms/td_input.html b/templates/forms/td_input.html
deleted file mode 100644
index 38ff5a13..00000000
--- a/templates/forms/td_input.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<td>
-    {{form_element.errors}}
-    {{form_element}}
-    {{form_element.help_text}}
-</td>
diff --git a/templates/general_form.html b/templates/general_form.html
index 776f3672..d499919a 100644
--- a/templates/general_form.html
+++ b/templates/general_form.html
@@ -1,25 +1,23 @@
 {% extends "base.html" %}
+{% block title %}Arch Linux - {{title}}{% endblock %}
 
 {% block content %}
-	<div class="greybox">
-        <h2 class="title">{{title}}</h2>
-        {% if description %}{{description}}{% endif %}
-		<form method="post" action=".">
-		<table>
+<div id="generic-form" class="box">
+
+    <h2>{{title}}</h2>
+
+    {% if description %}{{description}}{% endif %}
+
+    <form class="general-form" method="post" action=".">
+        <fieldset>
             {% for field in form %}
-                <tr>
-                    <td style="vertical-align:top">
-                        <span {% if field.required %}style="fontweight: bold"{% endif%}>{{field.label}}:</span>
-                        <br /><span style="font-size:x-small">{{field.help_text}}</span></td>
-                    <td>{{field}}</td>
-                </tr>
+                <p><label>{{field.label}}{% if field.help_text %}:</label><br />
+                <span class="form-help">{{field.help_text}}</span> {% else %}:</label> {% endif %}
+                {{field}} {% if field.required %}<span class="form-req-field">*</span>{% endif%}</p>
             {% endfor %}
-            <tr>
-				<td colspan="2" style="text-align:right">
-                    <input type="submit" value=" {{submit_text}} " />
-				</td>
-			</tr>
-		</table>
-		</form>
-	</div>
+        </fieldset>
+        <p><label></label> <input type="submit" value="{{submit_text}}" /></p>
+    </form>
+
+</div>
 {% endblock %}
diff --git a/templates/mirrors/index.html b/templates/mirrors/index.html
index 73949c6f..b347a086 100644
--- a/templates/mirrors/index.html
+++ b/templates/mirrors/index.html
@@ -1,24 +1,21 @@
 {% extends "base.html" %}
 {% load package_extras %}
-{% block title %}Arch Linux - Generate Mirrorlist{% endblock %}
+{% block title %}Arch Linux - Pacman Mirrorlist Generator{% endblock %}
 
 {% block content %}
-<div class="box">
-    <h2 class="title">Generate Custom Mirrorlist</h2>
-    <form method="post">
-        <table>
-            <tr>
-                <td>Architecture</td>
-                {% td_input mirrorlist_form.arch %}
-            </tr>
-            <tr>
-                <td>Country</td>
-                {% td_input mirrorlist_form.country %}
-            </tr>
-            <tr>
-                <td><input type="submit" value="Generate" /></td>
-            </tr>
-        </table>
+<div id="mirrorlist-gen" class="box">
+
+    <h2>Pacman Mirrorlist Generator</h2>
+
+    <p>The following form can generate a custom up-to-date
+    <a href="http://wiki.archlinux.org/index.php/Pacman"
+        title="ArchWiki: Pacman">pacman</a> mirrorlist based on geography.
+    Simply replace the contents of <code>/etc/pacman.d/mirrorlist</code> with
+    the generated code.</p>
+
+    <form id="list-generator" method="post" action=".">
+        {{ mirrorlist_form.as_p }}
+        <p><label></label> <input type="submit" value="Generate List" /></p>
     </form>
 </div>
 {% endblock %}
diff --git a/templates/news/add.html b/templates/news/add.html
index ef3f211c..38b5b21d 100644
--- a/templates/news/add.html
+++ b/templates/news/add.html
@@ -1,22 +1,25 @@
 {% extends "base.html" %}
-{% block title %}Arch Linux - {% if form.instance.id %}Edit{% else %}Add{% endif %} News{% endblock %}
+{% block title %}Arch Linux - News: {% if form.instance.id %}Edit{% else %}Add{% endif %} Article{% endblock %}
 
 {% block content %}
-	<div class="greybox">
-	{% if form.instance.id %}
-		<h2 class="title">Edit News</h2>
-	{% else %}
-		<h2 class="title">Add News</h2>
-	{% endif %}
-		<form method="post" id="newsform" action=".">
-		<table>
-            {{form}}
-			<tr>
-				<td colspan="2" align="right">
-					<input type="submit" value=" Save " />
-				</td>
-			</tr>
-		</table>
-		</form>
-	</div>
+<div id="news-add-article" class="box">
+
+    {% if form.instance.id %}
+    <h2>News: Edit Article</h2>
+    {% else %}
+    <h2>News: Add Article</h2>
+    {% endif %}
+
+    <form id="newsform" method="post" action=".">
+        <fieldset>
+            {{ form.as_p }}
+        </fieldset>
+        {% if form.instance.id %}
+        <p><label></label> <input title="Save changes" type="submit" value="Save" /></p>
+        {% else %}
+        <p><label></label> <input title="Publish this article" type="submit" value="Publish" /></p>
+        {% endif %}
+    </form>
+
+</div>
 {% endblock %}
diff --git a/templates/news/delete.html b/templates/news/delete.html
index c3824a26..6a2fa1e8 100644
--- a/templates/news/delete.html
+++ b/templates/news/delete.html
@@ -2,15 +2,22 @@
 {% block title %}Arch Linux - Delete News{% endblock %}
 
 {% block content %}
-	<div class="greybox">
-		<h2>Confirm Delete</h2>
-		<hr />
-        You are about to delete the news item '{{news}}'.
-        <br /><br />
-        Are you sure?
-        <br /><br />
-		<form method="post" action=".">
-				<td>&nbsp; &nbsp; <input name="delete" type="submit" value=" Yes " />
-		</form>
-	</div>
+<div id="news-delete-entry" class="box">
+
+    <h2>News: Delete Entry Confirmation</h2>
+
+    <p>You are about to delete the following news item:</p>
+
+    <blockquote>
+        <strong>{{news}}</strong>
+    </blockquote>
+
+    <p>Are you sure?</p>
+
+    <form method="post" action=".">
+        <input title="Delete this article" id="delete" name="delete"
+        type="submit" value="Delete" /></p>
+    </form>
+
+</div>
 {% endblock %}
diff --git a/templates/news/list.html b/templates/news/list.html
index a35c41e0..cadc24a2 100644
--- a/templates/news/list.html
+++ b/templates/news/list.html
@@ -1,28 +1,49 @@
 {% extends "base.html" %}
 {% block title %}Arch Linux - News{% endblock %}
+
 {% block content %}
-	<div class="greybox">
-	{% if perms.main.add_news %}
-		<div style="float:right">
-			<a href="/news/add/">Add News Item</a>
-		</div>
-	{% endif %}
-		<h2 class="title">News Updates</h2>
-		<table class="results" width="100%">
-		{% for item in news_list %}
-            <tr class="{% cycle pkgr2,pkgr1 %}">
-				<td>{{ item.postdate }}</td>
-				<td><a href="{{ item.get_absolute_url }}">{{ item.title }}</a></td>
-				<td>
-        {% if perms.main.change_news %}
-					<a href="/news/edit/{{ item.id }}/">edit</a>
-        {% endif %}
-        {% if perms.main.delete_news %}
-					<a href="/news/delete/{{ item.id }}/">delete</a>
-        {% endif %}
-				</td>
-			</tr>
-		{% endfor %}
-		</table>
-	</div>
+<div id="news-article-list" class="box">
+
+    <h2>News Archives</h2>
+
+    {% if perms.main.add_news %}
+    <ul class="admin-actions">
+        <li><a href="/news/add/" title="Add a news item">Add News Item</a></li>
+    </ul>
+    {% endif %}
+
+    <table id="article-list" class="results">
+        <thead>
+            <tr>
+                <th>Published</th>
+                <th>Title</th>
+                <th>Author</th>
+                {% if perms.main.change_news %}
+                <th></th>
+                {% endif %}
+            </tr>
+        </thead>
+        <tbody>
+            {% for item in news_list %}
+            <tr class="{% cycle 'odd' 'even' %}">
+                <td>{{ item.postdate }}</td>
+                <td class="wrap"><a href="{{ item.get_absolute_url }}"
+                        title="View: {{ item.title }}">{{ item.title }}</a></td>
+                <td>{{ item.author.get_full_name }}</td>
+                {% if perms.main.change_news %}
+                <td>
+                    <a href="/news/edit/{{ item.id }}/"
+                        title="Edit: {{ item.title }}">Edit</a>
+                    {% endif %}
+                    {% if perms.main.delete_news %}
+                    &nbsp;&nbsp;<a href="/news/delete/{{ item.id }}/"
+                        title="Delete: {{ item.title }}">Delete</a>
+                </td>
+                {% endif %}
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+
+</div>
 {% endblock %}
diff --git a/templates/news/view.html b/templates/news/view.html
index 2f7c3d87..1b82bc08 100644
--- a/templates/news/view.html
+++ b/templates/news/view.html
@@ -1,14 +1,23 @@
 {% extends "base.html" %}
-{% block title %}Arch Linux - {{ news.title }}{% endblock %}
+{% block title %}Arch Linux - News: {{ news.title }}{% endblock %}
 
 {% block content %}
-	<div class="box">
-		<div style="float: right; font-size: small">
-			{{ news.author.get_full_name }}<br />
-			{{ news.postdate }}
-		</div>
-		<h3>{{ news.title }}</h3>
-		<hr /><br />
-		{{ news.content|safe|linebreaks }}
-	</div>
+<div id="news-article" class="box">
+
+    <h2>News: {{ news.title }}</h2>
+
+    {% if perms.main.change_news %}
+    <ul class="admin-actions">
+        <li><a href="/news/edit/{{ news.id }}/" title="Edit this article">Edit News Item</a></li>
+        {% if perms.main.delete_news %}
+        <li><a href="/news/delete/{{ news.id }}/" title="Delete this article">Delete News Item</a></li>
+        {% endif %}
+    </ul>
+    {% endif %}
+
+    <p class="article-info">{{ news.postdate }} - {{ news.author.get_full_name }}</p>
+
+    {{ news.content|safe|linebreaks }}
+
+</div>
 {% endblock %}
diff --git a/templates/packages/details.html b/templates/packages/details.html
index 78209d83..19a4b2bc 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -1,134 +1,166 @@
 {% extends "base.html" %}
 {% block title %}Arch Linux - {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }} - Package Details{% endblock %}
+
 {% block content %}
-    <div class="box">
-        <h2 class="title">{{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}</h2>
-        <div style="float:right" class="listing">
-            <ul class="small">
-                <li><a href="{{ pkg.get_arch_svn_link }}">SVN Entries ({{pkg.repo|lower}}-{{pkg.arch}})</a></li>
-                <li><a href="{{ pkg.get_trunk_svn_link }}">SVN Entries (trunk)</a></li>
-                <li><a href="{{ pkg.get_bugs_link }}">Bug Reports</a></li>
-                <li>
+<div id="pkgdetails" class="box">
+
+    <h2>Package Details: {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}</h2>
+
+    <div id="actionlist" class="listing">
+
+        <ul class="small">
+            <li><a href="{{ pkg.get_arch_svn_link }}" title="View PKGBUILD
+                files for {{ pkg.pkgname }} in the {{pkg.repo|lower}}-{{pkg.arch}}
+                subversion branch">SVN Entries ({{pkg.repo|lower}}-{{pkg.arch}})</a></li>
+            <li><a href="{{ pkg.get_trunk_svn_link }}" title="View PKGBUILD
+                files for {{ pkg.pkgname }} in the subversion trunk">SVN Entries (trunk)</a></li>
+            <li><a href="{{ pkg.get_bugs_link }}" title="View existing bug
+                tickets for {{ pkg.pkgname }}">Bug Reports</a></li>
+            <li>
             {% if pkg.needupdate %}
-                <span style="font-size:x-small"><em>This package has been flagged out-of-date</em></span>
+                <span class="flagged">This package has been flagged out-of-date</span>
                 {% if user.is_authenticated %}
-                <br />&nbsp; &nbsp; <a href="/packages/unflag/{{ pkg.id }}/">Click here to unflag</a>
+                <br />&nbsp; &nbsp; <a href="/packages/unflag/{{ pkg.id }}/"
+                    title="Unflag this package">Click here to unflag</a>
                 {% endif %}
             {% else %}
-                <a href="/packages/flag/{{ pkg.id }}/">Flag Package Out-of-Date</a>
-                <a href="/packages/flaghelp/" onclick="return !window.open('/packages/flaghelp','FlagHelp','height=350,width=450,location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=no');"><span style="font-size:x-small">(?)</span></a>
+            <a href="/packages/flag/{{ pkg.id }}/" title="Flag {{ pkg.pkgname }} as out-of-date">Flag Package Out-of-Date</a>
+            <a href="/packages/flaghelp/"
+                title="Get help on package flagging"
+                onclick="return !window.open('/packages/flaghelp','FlagHelp',
+                'height=350,width=450,location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=no');">(?)</a>
             {% endif %}
-                </li>
-                {% if user.is_authenticated %}
-                  <li>&nbsp;</li>
-                  <li>
-                  <form name="devaction" method="post" action="/packages/update/">
-                      <input type="hidden" name="pkgid" value="{{ pkg.id }}" />
-                      <input type="submit" style="background: #e1e3e6;" name="adopt" value="Adopt Package" />
-                      <input type="submit" style="background: #e1e3e6;" name="disown" value="Disown Package" />
-                  </form>
-                  </li>
-                {% endif %}
+            </li>
+        </ul>
+
+        {% if user.is_authenticated %}
+        <form id="pkg-action" method="post" action="/packages/update/">
+            <div><input type="hidden" name="pkgid" value="{{ pkg.id }}" /></div>
+            <p><input title="Adopt this package" type="submit" class="adopt" name="adopt" value="Adopt" />
+            &nbsp;&nbsp;<input title="Orphan this package" type="submit" class="disown" name="disown" value="Disown" /></p>
+        </form>
+        {% endif %}
+
+    </div><!-- #actionlist -->
+
+    <table id="pkginfo">
+        <tr>
+            <th>Architecture:</th>
+            <td><a href="/packages/?arch={{ pkg.arch.name }}"
+                    title="Browse packages for {{ pkg.arch.name }} architecture">{{ pkg.arch.name }}</a></td>
+        </tr><tr>
+            <th>Repository:</th>
+            <td><a href="/packages/?repo={{ pkg.repo.name|capfirst }}"
+                    title="Browse the {{ pkg.repo.name|capfirst }} repository">{{ pkg.repo.name|capfirst }}</a></td>
+        </tr><tr>
+        </tr>{% ifnotequal pkg.pkgname pkg.pkgbase %}<tr>
+            <th>Base Package Name:</th>
+            <td>{{ pkg.pkgbase }}</td>
+        </tr>{% endifnotequal %}<tr>
+            <th>Description:</th>
+            <td>{% if pkg.pkgdesc %}{{ pkg.pkgdesc }}{% endif %}</td>
+        </tr><tr>
+            <th>Upstream URL:</th>
+            <td>{% if pkg.url %}<a href="{{ pkg.url }}">{{ pkg.url }}</a>{% endif %}</td>
+        </tr><tr>
+            <th>License:</th>
+            <td>{{ pkg.license }}</td>
+        </tr><tr>
+            <th>Maintainers:</th>
+            {% with pkg.maintainers as maints %}
+            <td>{% if maints %}
+                {% for m in maints %}
+                {{ m.get_full_name }}<br/>
+                {% endfor %}
+                {% else %}Orphan{% endif %}
+            </td>
+            {% endwith %}
+        </tr><tr>
+            <th>Package Size:</th>
+            <td>{{ pkg.compressed_size|filesizeformat }}</td>
+        </tr><tr>
+            <th>Installed Size:</th>
+            <td>{{ pkg.installed_size|filesizeformat }}</td>
+        </tr><tr>
+            <th>Build Date:</th>
+            <td>{{ pkg.build_date }} UTC</td>
+        </tr><tr>
+            <th>Last Updated:</th>
+            <td>{{ pkg.last_update|date:"Y-m-d" }}</td>
+        </tr>
+    </table>
+
+    <div id="metadata">
+
+        {% with pkg.get_depends as deps %}
+        <div id="pkgdeps" class="listing">
+
+            <h3 title="{{ pkg.pkgname }} has the following dependencies">
+                Dependencies ({{deps|length}})</h3>
+
+            {% if deps %}
+            <ul>
+            {% for depend in deps %}
+            {% ifequal depend.pkg None %}
+                <li>{{ depend.dep.depname }} (virtual)</li>
+            {% else %}
+                <li><a href="{{ depend.pkg.get_absolute_url }}"
+                    title="View package details for {{ depend.dep.depname }}">{{ depend.dep.depname }}</a>
+                    {{ depend.dep.depvcmp }}{% if depend.pkg.repo.testing %}
+                    <span class="testing-dep">(testing)</span>{% endif %}</li>
+            {% endifequal %}
+            {% endfor %}
             </ul>
-        </div>
-        <table class="listing">
-            <tr>
-                <th>Architecture:</th>
-                <td>{{ pkg.arch.name }}</td>
-            </tr><tr>
-                <th>Repository:</th>
-                <td>{{ pkg.repo.name|capfirst }}</td>
-            </tr>{% ifnotequal pkg.pkgname pkg.pkgbase %}<tr>
-                <th>Base Package Name:</th>
-                <td>{{ pkg.pkgbase }}</td>
-            </tr>{% endifnotequal %}<tr>
-                <th>Description:</th>
-                <td>{% if pkg.pkgdesc %}{{ pkg.pkgdesc }}{% endif %}</td>
-            </tr><tr>
-                <th>Upstream URL:</th>
-                <td>{% if pkg.url %}<a href="{{ pkg.url }}">{{ pkg.url }}</a>{% endif %}</td>
-            </tr><tr>
-                <th>License:</th>
-                <td>{{ pkg.license }}</td>
-            </tr><tr>
-                <th>Maintainer:</th>
-                {% with pkg.maintainers as maints %}
-                <td>{% if maints %}
-                    {% for m in maints %}
-                    {{ m.get_full_name }}<br/>
-                    {% endfor %}
-                    {% else %}Orphan{% endif %}
-                </td>
-                {% endwith %}
-            </tr><tr>
-                <th>Package Size:</th>
-                <td>{{ pkg.compressed_size|filesizeformat }}</td>
-            </tr><tr>
-                <th>Installed Size:</th>
-                <td>{{ pkg.installed_size|filesizeformat }}</td>
-            </tr><tr>
-                <th>Build Date:</th>
-                <td>{{ pkg.build_date }} UTC</td>
-            </tr><tr>
-                <th>Last Updated:</th>
-                <td>{{ pkg.last_update|date:"Y-m-d" }}</td>
-            </tr>
-        </table>
-        <br />
-        <table width="100%">
-            <tr>
-                <td valign="top" width="50%">
-                    {% with pkg.get_depends as deps %}
-                    <div class="listing">
-                        <h4>Dependencies ({{deps|length}}):</h4>
-                        {% if deps %}
-                        <ul style="font-size:small;list-style:none">
-                        {% for depend in deps %}
-                          {% ifequal depend.pkg None %}
-                            <li>{{ depend.dep.depname }} (virtual)</li>
-                          {% else %}
-                            <li><a href="{{ depend.pkg.get_absolute_url }}">{{ depend.dep.depname }}</a>{{ depend.dep.depvcmp }}{% if depend.pkg.repo.testing %} (testing){% endif %}</li>
-                          {% endifequal %}
-                        {% endfor %}
-                        </ul>
-                        {% endif %}
-                    </div>
-                    {% endwith %}
-                </td>
-                <td valign="top">
-                    {% with pkg.get_requiredby as rqdby %}
-                    <div class="listing">
-                        <h4>Required By ({{rqdby|length}}):</h4>
-                        {% if rqdby %}
-                        <ul style="font-size:small;list-style:none">
-                        {% for req in rqdby %}
-                        <li><a href="{{req.get_absolute_url}}">{{ req.pkgname }}</a>{% if req.repo.testing %} (testing){% endif %}</li>
-                        {% endfor %}
-                        </ul>
-                        {% endif %}
-                    </div>
-                    {% endwith %}
-                </td>
-            </tr>
-        </table>
-        <div class="listing" id="filelist">
-            <h4>Files:</h4>
-            <p style="padding: 10px 20px;">
-                <a id="filelink" href="files/">View File List</a>
-            </p>
-        </div>
-    </div>
+            {% endif %}
+
+        </div><!-- #pkgdeps -->
+        {% endwith %}
+
+        {% with pkg.get_requiredby as rqdby %}
+        <div id="pkgreqs" class="listing">
+
+            <h3 title="Packages that require {{ pkg.pkgname }}">
+                Required By ({{rqdby|length}})</h3>
+
+            {% if rqdby %}
+            <ul>
+                {% for req in rqdby %}
+                <li><a href="{{req.get_absolute_url}}"
+                    title="View package details for {{ req.pkgname }}">{{ req.pkgname }}</a>
+                    {% if req.repo.testing %} (testing){% endif %}</li>
+                {% endfor %}
+            </ul>
+            {% endif %}
+
+        </div><!-- #pkgreqs -->
+        {% endwith %}
+
+        <div id="pkgfiles" class="listing">
+
+            <h3 title="Complete list of files contained within this package">
+                Package Contents</h3>
+
+            <div id="pkgfilelist">
+                <p><a id="filelink" href="files/"
+                    title="Click to view the complete file list for {{ pkg.pkgname }}">
+                    View the file list for {{ pkg.pkgname }}</a></p>
+            </div>
+
+        </div><!-- #pkgfiles -->
+
+    </div><!-- #metadata -->
+</div><!-- #pkgdetails -->
+
 {% load cdn %}{% jquery %}
 <script type="text/javascript">
 function ajaxifyFiles() {
     $('#filelink').click(function(event) {
         event.preventDefault();
         $.get(this.href, function(data) {
-            $('#filelist').html(data);
+            $('#pkgfilelist').html(data);
         });
     });
 }
 $(document).ready(ajaxifyFiles);
 </script>
 {% endblock %}
-
diff --git a/templates/packages/files-list.html b/templates/packages/files-list.html
index dee18ecd..c45e0f10 100644
--- a/templates/packages/files-list.html
+++ b/templates/packages/files-list.html
@@ -1,10 +1,9 @@
-<h4>Files:</h4>
 {% if files.count %}
-<ul style="font-size:small;list-style:none">
-{% for file in files %}
-<li>{{ file.path }}</li>
-{% endfor %}
+<ul>
+    {% for file in files %}
+    <li>{{ file.path }}</li>
+    {% endfor %}
 </ul>
 {% else %}
-<p style="padding: 10px 20px;">No filelist available.</p>
+<p>No file list available.</p>
 {% endif %}
diff --git a/templates/packages/files.html b/templates/packages/files.html
index 2f951062..7dc111b4 100644
--- a/templates/packages/files.html
+++ b/templates/packages/files.html
@@ -1,14 +1,16 @@
 {% extends "base.html" %}
 {% block title %}Arch Linux - {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }} - Package File List{% endblock %}
+
 {% block content %}
-    <div class="box">
-        <h2 class="title">{{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}</h2>
-        <p style="padding: 10px 20px;">
-            <a href="{{ pkg.get_absolute_url }}">Back to Package</a>
-        </p>
-        <div class="listing" id="filelist">
+<div id="pkgdetails" class="box">
+
+    <h2>Package File List: {{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}</h2>
+    <p><a href="{{ pkg.get_absolute_url }}">Back to Package</a></p>
+
+    <div id="metadata">
         {% include "packages/files-list.html" %}
-        </div>
     </div>
+
+</div>
 {% endblock %}
 
diff --git a/templates/packages/flag.html b/templates/packages/flag.html
index 1071fdf8..1e85be89 100644
--- a/templates/packages/flag.html
+++ b/templates/packages/flag.html
@@ -2,28 +2,40 @@
 {% block title %}Arch Linux - Flag Package - {{ pkg.pkgname }}{% endblock %}
 
 {% block content %}
-<div>
-    {% if confirmed %}
-	<p>Thank you. Maintainers have been notified.</p>
-    {% else %}
-	<p>If you notice that one of Arch's packages is out of date (ie, there is a
-    newer <b>stable</b> release available), then please notify us using the
-	form below.</p>
-	<p>The message box portion of the flag utility is optional, and meant for
-	short messages only. If you need more than 200 characters for your
-	message, then file a bug report, email the maintainer directly, or send an
-	email to the arch-general mailing list with your additional text.</p>
-
-	<p><b>Note:</b> Please do <i>not</i> use this facility if the package is
-	broken!  Use the <a href='http://bugs.archlinux.org'>bug tracker</a>
-	instead.</p>
+<div id="pkg-flag" class="box">
+{% if confirmed %}
+    <h2>Package Flagged</h2>
+
+    <p>Thank you, the maintainers have been notified about <strong>{{ pkg.pkgname }}</strong>.</p>
+
+    <p>You can return to the package details page for
+    <a href="{{ pkg.get_absolute_url }}" title="Package details for {{pkg.pkgname}}">{{pkg.pkgname}}</a>.</p>
+{% else %}
+    <h2>Flag Package: {{ pkg.pkgname }}</h2>
+
+    <p>If you notice a package is out of date (i.e., there is a newer
+    <strong>stable</strong> release available), then please notify us using
+    the form below.</p>
+
+    <p>The message box portion of the flag utility is optional, and meant
+    for short messages only. If you need more than 200 characters for your
+    message, then file a bug report, email the maintainer directly, or send
+    an email to the <a href="http://mailman.archlinux.org/mailman/listinfo/arch-general"
+        title="Visit the arch-general mailing list">arch-general mailing list</a>
+    with your additional text.</p>
+
+    <p><strong>Note:</strong> Please do <em>not</em> use this facility if the
+    package is broken!  Use the <a href="http://bugs.archlinux.org"
+        title="Arch Linux Bugtracker">bug tracker</a> instead.</p>
+
     <p>Please confirm your flag request for {{pkg.pkgname}}:</p>
-	<form method="post" action=".">
-		<table>
-			{{form}}
-		</table>
-		<input type="submit" value=" Confirm " />
-	</form>
-    {% endif %}
+
+    <form id="flag-pkg-form" method="post" action=".">
+        <fieldset>
+            {{ form.as_p }}
+        </fieldset>
+		<p><label></label> <input title="Flag {{ pkg.pkgname }} as out-of-date" type="submit" value="Flag Package" /></p>
+    </form>
+{% endif %}
 </div>
 {% endblock %}
diff --git a/templates/packages/flagged.html b/templates/packages/flagged.html
index 3461bbda..7d5e1c60 100644
--- a/templates/packages/flagged.html
+++ b/templates/packages/flagged.html
@@ -2,7 +2,14 @@
 {% block title %}Arch Linux - Flag Package - {{ pkg.pkgname }}{% endblock %}
 
 {% block content %}
-    <p>
-    {{pkg.pkgname}} has already been flagged out of date.
-    </p>
+<div id="pkg-flagged-error" class="box">
+
+    <h2>Error: Package already flagged</h2>
+
+    <p><strong>{{pkg.pkgname}}</strong> has already been flagged out-of-date.</p>
+
+    <p>You can return to the package details page for
+    <a href="{{ pkg.get_absolute_url }}" title="Package details for {{pkg.pkgname}}">{{pkg.pkgname}}</a>.</p>
+
+</div>
 {% endblock %}
diff --git a/templates/packages/flaghelp.html b/templates/packages/flaghelp.html
index c376175e..d8ca643b 100644
--- a/templates/packages/flaghelp.html
+++ b/templates/packages/flaghelp.html
@@ -1,27 +1,37 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-	<head>
-		<title>Flagging Packages</title>
-		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-	</head>
-	<body>
-		<div style="font-family: sans-serif;">
-			<p>If you notice that one of Arch's packages is out of date (ie,
-			there is a newer <b>stable</b> release available), then please
-			notify us by using the <b>Flag</b> button in the <i>Package
-				Details</i> screen. This will notify the maintainer responsible
-			for that package so they can update it.</p>
+    <head>
+        <title>Flagging Packages</title>
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        <style  type="text/css" media="screen, projection">
+            <!--
+                body { background: #eef; color: #444; font-family: sans-serif; }
+                a { color: #07b; text-decoration: none; }
+                a:hover { text-decoration: underline; }
+            -->
+        </style>
+    </head>
+    <body>
 
-			<p>The message box portion of the flag utility is optional, and
-			meant for short messages only. If you need more than 200 characters
-			for your message, then file a bug report, email the maintainer
-			directly, or send an email to the arch-general mailing list with
-			your additional text.</p>
+        <h3>Flagging Packages</h3>
 
-			<p><b>Note:</b> Please do <i>not</i> use this facility if the
-			package is broken! Use the
-			<a target="_blank" href='http://bugs.archlinux.org'>bugtracker</a> instead.</p>
-		</div>
-	</body>
+        <p>If you notice that a package is out-of-date (i.e., there is a newer
+        <strong>stable</strong> release available), then please notify us by
+        using the <strong>Flag</strong> button in the <em>Package Details</em>
+        screen.  This will notify the maintainer(s) responsible for that
+        package so they can update it.</p>
+
+        <p>The message box portion of the flag utility is optional, and meant
+        for short messages only. If you need more than 200 characters for your
+        message, then file a bug report, email the maintainer directly, or send
+        an email to the <a target="_blank" href="http://mailman.archlinux.org/mailman/listinfo/arch-general"
+            title="Visit the arch-general mailing list">arch-general mailing list</a>
+        with your additional text.</p>
+
+        <p><strong>Note:</strong> Please do <em>not</em> use this facility if the
+        package is broken! Use the <a target="_blank" href="http://bugs.archlinux.org"
+            title="Arch Linux Bugtracker">bugtracker</a> instead.</p>
+
+    </body>
 </html>
diff --git a/templates/packages/search.html b/templates/packages/search.html
index 4f7bc776..2c85f0bc 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load package_extras %}
-{% block title %}Arch Linux - Package Search{% endblock %}
+{% block title %}Arch Linux - Package Database{% endblock %}
+
 {% block head %}
 <link rel="stylesheet" type="text/css" href="/media/admin_media/css/widgets.css" />
 <script type="text/javascript" src="/jsi18n/"></script>
@@ -9,129 +10,145 @@
 {% endblock %}
 
 {% block content %}
-    <div class="greybox">
-        <h4 style="text-align: right">Search Criteria</h4>
-        <form method="get" action="/packages/">
-            <input type="hidden" name="sort" value='{{sort}}' />
-            <table width="100%">
-                <tr>
-                    <td><span class="smalltext">Arch</span></td>
-                    <td><span class="smalltext">Repository</span></td>
-                    <td><span class="smalltext">Keywords</span></td>
-                    <td><span class="smalltext">Maintainer</span></td>
-                    <td><span class="smalltext">Last Update</span></td>
-                    <td><span class="smalltext">Flagged</span></td>
-                    <td><span class="smalltext">Per Page</span></td>
-                </tr>
-                <tr>
-                    {% td_input search_form.arch %}
-                    {% td_input search_form.repo %}
-                    {% td_input search_form.q %}
-                    {% td_input search_form.maintainer%}
-                    {% td_input search_form.last_update %}
-                    {% td_input search_form.flagged %}
-                    {% td_input search_form.limit %}
-                    <td><input type="submit" value="Search" /></td>
-                </tr>
-            </table>
-        </form>
+<div id="pkglist-search" class="box">
+
+    <h2>Package Database</h2>
+
+    <h3>Package Search</h3>
+
+	<form id="pkg-search" method="get" action="/packages/">
+		<p><input type="hidden" name="sort" value='{{sort}}' /></p>
+		<fieldset>
+			<legend>Enter search criteria</legend>
+			<div><label title="Limit results a specific CPU architecture">
+					Arch</label>{{ search_form.arch }}</div>
+			<div><label title="Limit results to a specific respository">
+					Repository</label>{{ search_form.repo }}</div>
+			<div><label title="Enter keywords as desired">
+					Keywords</label>{{ search_form.q }}</div>
+			<div><label title="Limit results to a specific maintainer">
+					Maintainer</label>{{ search_form.maintainer}}</div>
+			<div><label title="Limit results to a date after the date entered">
+					Last Update</label>{{ search_form.last_update }}</div>
+			<div><label title="Limit results based on out-of-date status">
+					Flagged</label>{{ search_form.flagged }}</div>
+			<div><label title="Select the number of results to display per page">
+					Per Page</label>{{ search_form.limit }}</div>
+			<div ><label>&nbsp;</label><input title="Search for packages using this criteria"
+				type="submit" value="Search" /></div>
+		</fieldset>
+	</form>
+
+</div><!-- #pkglist-search -->
+
+{% if package_list %}
+<div id="pkglist-results" class="box">
+
+    {% if paginator %}
+    <div id="pkglist-stats-top">
+
+        <p>{{paginator.count}} packages found.
+        Page {{page_obj.number}} of {{paginator.num_pages}}.</p>
+
+        <p class="pkglist-nav">
+            {% if page_obj.has_previous %}
+            <a class="prev" href="/packages/{{page_obj.previous_page_number}}/{{current_query}}"
+                title="Go to previous page">&lt; Prev</a>
+            {% else %}
+            <span class="prev">&lt; Prev</span>
+            {% endif %}
+            {% if page_obj.has_next %}
+            <a class="next" href="/packages/{{page_obj.next_page_number}}/{{current_query}}"
+                title="Go to next page">Next &gt;</a>
+            {% else %}
+            <span class="next">Next &gt;</span>
+            {% endif %}
+        </p>
+
     </div>
-    <br /><br />
+    {% endif %}
+
+    <form id="pkglist-results-form" method="post" action="/packages/update/">
 
-    {% if package_list %}
-    <div class="greybox">
-        <form method="post" action="/packages/update/">
-        <table class="results" width="100%">
-            {% if paginator %}
+        <table class="results">
+            <thead>
                 <tr>
-                    <td colspan="{% if user.is_authenticated %}5{% else %}4{% endif %}">
-                        {{paginator.count}} packages found.
-                        Page {{page_obj.number}} of {{paginator.num_pages}}.
-                    </td>
-                    <td>
-                        {% if page_obj.has_previous %}
-                        <a href="/packages/{{page_obj.previous_page_number}}/{{current_query}}">
-                            &lt;&lt;&lt; Previous
-                        </a>
-                        {% else %}
-                            &lt;&lt;&lt; Previous
-                        {% endif %}
-                    </td>
-                    <td>
-                        {% if page_obj.has_next %}
-                        <a href="/packages/{{page_obj.next_page_number}}/{{current_query}}">
-                            Next &gt;&gt;&gt;
-                        </a>
-                        {% else %} 
-                            Next &gt;&gt;&gt;
-                        {% endif %}
-                    </td>
+                    {% if user.is_authenticated %}
+                    <th>&nbsp;</th>
+                    {% endif %}
+                    <th><a href="/packages/{% buildsortqs "arch" %}"
+                            title="Sort packages by architecture">Arch</a></th>
+                    <th><a href="/packages/{% buildsortqs "repo" %}"
+                            title="Sort packages by repository">Repo</a></th>
+                    <th><a href="/packages/{% buildsortqs "pkgname" %}"
+                            title="Sort packages by package name">Name</a></th>
+                    <th>Version</th>
+                    <th>Description</th>
+                    <th><a href="/packages/{% buildsortqs "-last_update" %}"
+                            title="Sort packages by last update">Last Updated</a></th>
                 </tr>
-            {% endif %}
-            <tr>
-                {% if user.is_authenticated %}
-                <th>&nbsp;</th>
-                {% endif %}
-                <th><a href="/packages/{% buildsortqs "arch" %}">Arch</a></th>
-                <th><a href="/packages/{% buildsortqs "repo" %}">Repo</a></th>
-                <th><a href="/packages/{% buildsortqs "pkgname" %}">Name</a></th>
-                <th>Version</th>
-                <th>Description</th>
-                <th><a href="/packages/{% buildsortqs "-last_update" %}">Last Updated</a></th>
-
-            </tr>
+            </thead>
+            <tbody>
             {% for pkg in package_list %}
-                <tr class="{% cycle pkgr2,pkgr1 %}">
+                <tr class="{% cycle 'odd' 'even' %}">
                     {% if user.is_authenticated %}
                     <td><input type="checkbox" name="pkgid" value="{{ pkg.id }}" /></td>
                     {% endif %}
                     <td>{{ pkg.arch.name }}</td>
                     <td>{{ pkg.repo.name|capfirst }}</td>
-                    <td><a href="{{ pkg.get_absolute_url }}">{{ pkg.pkgname }}</a></td>
-                {% if pkg.needupdate %}
-                    <td><span style="color:red">{{ pkg.pkgver }}-{{ pkg.pkgrel }}</span></td>
-                {% else %}
+                    <td><a href="{{ pkg.get_absolute_url }}"
+                            title="View package details for {{ pkg.pkgname }}">{{ pkg.pkgname }}</a></td>
+                    {% if pkg.needupdate %}
+                    <td><span style="flagged">{{ pkg.pkgver }}-{{ pkg.pkgrel }}</span></td>
+                    {% else %}
                     <td>{{ pkg.pkgver }}-{{ pkg.pkgrel }}</td>
-                {% endif %}
-                    <td>{{ pkg.pkgdesc }}</td>
+                    {% endif %}
+                    <td class="wrap">{{ pkg.pkgdesc }}</td>
                     <td>{{ pkg.last_update|date:"Y-m-d" }}</td>
                 </tr>
             {% endfor %}
-            {% if paginator %}
-                <tr>
-                    <td colspan="{% if user.is_authenticated %}5{% else %}4{% endif %}">
-                        {{paginator.count}} packages found.
-                        Page {{page_obj.number}} of {{paginator.num_pages}}.
-                    </td>
-                    <td>
-                        {% if page_obj.has_previous %}
-                        <a href="/packages/{{page_obj.previous_page_number}}/{{current_query}}">
-                            &lt;&lt;&lt; Previous
-                        </a>
-                        {% else %}
-                            &lt;&lt;&lt; Previous
-                        {% endif %}
-                    </td>
-                    <td>
-                        {% if page_obj.has_next %}
-                        <a href="/packages/{{page_obj.next_page_number}}/{{current_query}}">
-                            Next &gt;&gt;&gt;
-                        </a>
-                        {% else %} 
-                            Next &gt;&gt;&gt;
-                        {% endif %}
-                    </td>
-                </tr>
-            {% endif %}
+            </tbody>
         </table>
-        {% if user.is_authenticated %}
-        <div id="adoptbox">
-            <input type="submit" name="adopt" value="Adopt Packages">
-            <input type="submit" name="disown" value="Disown Packages">
+
+        {% if paginator %}
+        <div id="pkglist-stats-bottom">
+
+            <p>{{paginator.count}} packages found. Page {{page_obj.number}} of {{paginator.num_pages}}.</p>
+
+                <p class="pkglist-nav">
+                    {% if page_obj.has_previous %}
+                    <a class="prev" href="/packages/{{page_obj.previous_page_number}}/{{current_query}}"
+                        title="Go to previous page">&lt; Prev</a>
+                    {% else %}
+                    <span class="prev">&lt; Prev</span>
+                    {% endif %}
+                    {% if page_obj.has_next %}
+                    <a class="next" href="/packages/{{page_obj.next_page_number}}/{{current_query}}"
+                        title="Go to next page">Next &gt;</a>
+                    {% else %}
+                    <span class="next">Next &gt;</span>
+                    {% endif %}
+                </p>
+
         </div>
         {% endif %}
-        </form>
-    </div>
-    {% endif %}
-{% endblock %}
 
+        {% if user.is_authenticated %}
+        <p><input title="Adopt selected packages" type="submit" id="adopt-btn"
+        name="adopt" value="Adopt Packages" />
+        <input title="Orphan selected packages" type="submit" id="disown-btn"
+        name="disown" value="Disown Packages" /></p>
+        {% endif %}
+
+    </form>
+
+</div><!-- #pkglist-results -->
+
+<div id="pkglist-about" class="box">
+    <p>You are browsing the Arch Linux package database. From here you can find
+    detailed information about packages located in the official supported repositories.
+    For unsupported packages, browse the <a href="http://aur.archlinux.org/"
+        title="AUR package database">Arch User Repository (AUR).</a></p>
+</div>
+{% endif %}
+{% endblock %}
diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index cb6a848e..930b606e 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -2,9 +2,13 @@
 {% block title %}Arch Linux - Package Signoffs{% endblock %}
 
 {% block content %}
-    {% if packages %}
-    <div class="greybox">
-        <table class="results" width="100%">
+{% if packages %}
+<div id="dev-signoffs" class="box">
+
+    <h2>Package Signoffs</h2>
+
+    <table id="signoffs" class="results">
+        <thead>
             <tr>
                 <th>Arch</th>
                 <th>Package</th>
@@ -14,28 +18,33 @@
                 <th>Approved</th>
                 <th>Signoff</th>
             </tr>
-        {% for pkg,target in packages %}
-        <tr class="{% cycle pkgr2,pkgr1 %}">
+        </thead>
+        <tbody>
+            {% for pkg,target in packages %}
+            <tr class="{% cycle 'odd' 'even' %}">
                 <td>{{ pkg.arch.name }}</td>
-                <td><a href="{{ pkg.get_absolute_url }}">{{ pkg.pkgname }}</a></td>
+                <td><a href="{{ pkg.get_absolute_url }}"
+                        title="View package details for {{ pkg.pkgname }}">{{ pkg.pkgname }}</a></td>
                 <td>{{ pkg.pkgver }}-{{ pkg.pkgrel }}</td>
                 <td>{{ pkg.last_update }}</td>
                 <td>{{ target }}</td>
-                <td class="signoff_{{pkg.approved_for_signoff|yesno}}">{{ pkg.approved_for_signoff|yesno:"Yes,No" }}</td>
+                <td class="signoff-{{pkg.approved_for_signoff|yesno}}">
+                    {{ pkg.approved_for_signoff|yesno:"Yes,No" }}</td>
                 <td>
                     <ul>
-                    {% for signoff in pkg.signoffs %}
-                    <li>{{signoff.packager}}</li>
-                    {% endfor %}
-                    <li>
-                    <a href="/packages/signoff_package/{{pkg.arch}}/{{pkg.pkgname}}/">Signoff</a>
-                    </li>
+                        <li><a href="/packages/signoff_package/{{pkg.arch}}/{{pkg.pkgname}}/"
+                            title="Signoff {{pkg.pkgname}} for {{pkg.arch}}">Signoff</a>
+                        </li>
+                        {% for signoff in pkg.signoffs %}
+                        <li class="signed-username" title="Signed off by {{signoff.packager}}">
+                        {{signoff.packager}}</li>
+                        {% endfor %}
                     </ul>
                 </td>
             </tr>
         {% endfor %}
-        </table>
-    </div>
-    {% endif %}
+        </tbody>
+    </table>
+</div>
+{% endif %}
 {% endblock %}
-
diff --git a/templates/public/art.html b/templates/public/art.html
index 960a566c..9b0bd62f 100644
--- a/templates/public/art.html
+++ b/templates/public/art.html
@@ -1,78 +1,129 @@
 {% extends "base.html" %}
 {% block title %}Arch Linux - Artwork{% endblock %}
+
 {% block content %}
-<div class="box">
-    <h2 class="title">Arch Linux Logos and Artwork</h2>
-    <h3>Official Packages</h3>
-    <p>Official logos, artwork, and more are available from the Extra repository. Currently, these packages are:</p>
+<div id="artwork" class="box">
+
+    <h2>Arch Linux Logos and Artwork</h2>
+
+    <h3>Logos for Press Usage</h3>
+
+    <p>The following Arch Linux logos are available for press and other use, subject to
+    the restrictions of our <a href="http://wiki.archlinux.org/index.php/DeveloperWiki:TrademarkPolicy"
+        title="Arch Linux Trademark Policy">trademark policy</a>.</p>
+
+    <p><strong>Two-color standard version</strong><br />
+    <em>Also available in print-quality
+        <a href="/media/logos/archlinux-logo-dark-1200dpi.png"
+            title="Download 1200dpi PNG format">PNG</a> and scalable
+        <a href="/media/logos/archlinux-logo-dark-scalable.svg"
+            title="Download scalable SVG format">SVG</a> formats.</em></p>
+
+    <img src="/media/logos/archlinux-logo-dark-90dpi.png"
+    alt="Arch Linux PNG logo @ 90dpi" title="Arch Linux PNG logo @ 90dpi" />
+
+    <p><strong>Two-color inverted version</strong> (for dark backgrounds)<br />
+    <em>Also available in print-quality
+        <a href="/media/logos/archlinux-logo-light-1200dpi.png"
+            title="Download 1200dpi PNG format">PNG</a> and scalable
+        <a href="/media/logos/archlinux-logo-light-scalable.svg"
+            title="Download scalable SVG format">SVG</a> formats.</em></p>
+
+    <img src="/media/logos/archlinux-logo-light-90dpi.png"
+    alt="Arch Linux PNG logo @ 90dpi" title="Arch Linux PNG logo @ 90dpi" class="inverted" />
+
+    <p><strong>One-color standard version</strong><br />
+    <em>Also available in print-quality
+            <a href="/media/logos/archlinux-logo-black-1200dpi.png"
+                title="Download 1200dpi PNG format">PNG</a> and scalable
+            <a href="/media/logos/archlinux-logo-black-scalable.svg"
+                title="Download scalable SVG format">SVG</a> formats.</em></p>
+
+            <img src="/media/logos/archlinux-logo-black-90dpi.png"
+            alt="Arch Linux PNG logo @ 90dpi" title="Arch Linux PNG logo @ 90dpi" />
+
+    <p><strong>One-colour inverted version</strong> (for dark backgrounds)<br />
+    <em>Also available in print-quality
+        <a href="/media/logos/archlinux-logo-white-1200dpi.png"
+            title="Download 1200dpi PNG format">PNG</a> and scalable
+        <a href="/media/logos/archlinux-logo-white-scalable.svg"
+            title="Download scalable SVG format">SVG</a> formats.</em></p>
+
+    <img src="/media/logos/archlinux-logo-white-90dpi.png"
+    alt="Arch Linux PNG logo @ 90dpi" title="Arch Linux PNG logo @ 90dpi" class="inverted" />
+
+    <h3>Logos and Artwork for the Community</h3>
+
+    <p>Official logos and artwork are also available directly from the
+    repositories. Currently, these packages are:</p>
+
     <ul>
-      <li><strong>archlinux-artwork</strong> - official logos, icons and CD labels</li>
-      <li><strong>archlinux-wallpaper</strong> - a variety of desktop wallpapers for standard and widescreen resolutions</li>
-      <li><strong>archlinux-themes-gdm</strong> - GDM login themes</li>
-      <li><strong>archlinux-themes-kde</strong> - KDE themes and icons</li>
-      <li><strong>archlinux-themes-kdm</strong> - KDM login themes</li>
-      <li><strong>archlinux-themes-ksplash</strong> - Ksplash themes</li>
-      <li><strong>archlinux-themes-slim</strong> - SLiM login themes</li>
+        <li><strong>archlinux-artwork</strong> - official logos, icons and CD labels</li>
+        <li><strong>archlinux-wallpaper</strong> - a variety of desktop wallpapers
+            for standard and widescreen resolutions</li>
+        <li><strong>archlinux-themes-kde</strong> - KDE themes and icons</li>
+        <li><strong>archlinux-themes-kdm</strong> - KDM login themes</li>
+        <li><strong>archlinux-themes-slim</strong> - SLiM login themes</li>
     </ul>
-    <p>Alternatively, you can <a href="ftp://ftp.archlinux.org/other/artwork/" title="Browse the FTP archives">download the source files via FTP</a>.</p>
+
+    <p>Alternatively, you can <a href="ftp://ftp.archlinux.org/other/artwork/"
+        title="Browse the FTP archives">download the source files via FTP</a>.</p>
+
     <h3>Former Logos</h3>
-    <p>Arch has gone through a few iterations of logos and associated artwork.
-    Here is a good selection of these logos. Several of the later logos can be
-    clicked on to get either a larger PNG or SVG version of the logo.</p>
-    <h4>Original Ribbon Logos</h4>
-    <p>
-    <img src="/logos/old/archlogo.gif" alt="Ribbon Logo 1"/>
-    <img src="/logos/old/archlogo2.gif" alt="Ribbon Logo 2"/>
-    <img src="/logos/old/archlogo_black_plain.png" alt="Ribbon Logo Black"/>
-    </p>
-    <p>
-    <img src="/logos/old/archlogo3.gif" alt="Ribbon Logo Binary 1"/>
-    <img src="/logos/old/archlogo_white.gif" alt="Ribbon Logo Binary 2"/>
-    <img src="/logos/old/archlogo_black.gif" alt="Ribbon Logo Binary Black"/>
-    </p>
-    <h4>"Arch Blue" Logos</h4>
-    <p>
-    <a href="/logos/old/archlinux_logo_2.svg">
-        <img src="/logos/old/archblue.png" alt="Arch Blue Full"/>
-    </a>
-    <span style="margin-left: 1em;">
-    <a href="/logos/old/archlinux_logo_1.svg">
-        <img src="/logos/old/archblue2.png" alt="Arch Blue Compact"/>
-    </a>
-    </span>
-    </p>
-    <h4>"Arch Aqua" Logos</h4>
-    <p>
-    <a href="/logos/old/archlinux_logo_aqua.svg">
-        <img src="/logos/old/sml_128-archlinux_logo_aqua.png" alt="Arch Aqua"/>
-    </a>
-    <a href="/logos/old/scalable/arch_linux_blue.svg">
-        <img src="/logos/old/128x128/arch_linux_blue.png" alt="Arch Aqua Blue"/>
-    </a>
-    <a href="/logos/old/scalable/arch_linux_white.svg">
-        <img src="/logos/old/128x128/arch_linux_white.png" alt="Arch Aqua White"/>
-    </a>
-    </p>
-    <h4>Release-specific Logos</h4>
-    <p>
-    <a href="/logos/old/wombat.png" title="Wombat">
-        <img src="/logos/old/sml-wombat.png" height="128" alt="Arch Wombat"/>
-    </a>
-    </p>
-    <p>
-    <a href="/logos/old/scalable/arch_linux_blue_noodle.svg" title="Noodle">
-        <img src="/logos/old/128x128/arch_linux_blue_noodle.png" alt="Arch Noodle Blue"/>
-    </a>
-    <a href="/logos/old/scalable/arch_linux_white_noodle.svg" title="Noodle">
-        <img src="/logos/old/128x128/arch_linux_white_noodle.png" alt="Arch Noodle White"/>
-    </a>
-    <a href="/logos/old/scalable/arch_noodles.svg" title="Noodle">
-        <img src="/logos/old/128x128/arch_noodles.png" alt="Arch Box of Noodles"/>
-    </a>
-    <a href="/logos/old/scalable/pot_arch.svg" title="Noodle">
-        <img src="/logos/old/128x128/pot_arch.png" alt="Arch Cup of Noodles"/>
-    </a>
-    </p>
-</div>
-{% endblock %}
 
+    <p>Arch has gone through a few generations of branding and what follows are
+    some of our past logos. Although these images are no longer used frequently,
+    they remain subject to license restrictions.  Email
+    <strong>tradermarks@archlinux.org</strong> with any questions.</p>
+
+    <h4>Original Ribbon Series</h4>
+
+    <div class="imagelist">
+        <img src="/media/logos/legacy/arch-legacy-ribbon1.png" alt="Arch Ribbon Logo 1"/>
+        <img src="/media/logos/legacy/arch-legacy-ribbon2.png" alt="Arch Ribbon Logo 2"/>
+        <img src="/media/logos/legacy/arch-legacy-ribbon5.png" alt="Arch Ribbon Logo 5"/>
+    </div>
+
+    <div class="imagelist">
+        <img src="/media/logos/legacy/arch-legacy-ribbon3.png" alt="Arch Ribbon Logo 3"/>
+        <img src="/media/logos/legacy/arch-legacy-ribbon4.png" alt="Arch Ribbon Logo 4"/>
+        <img src="/media/logos/legacy/arch-legacy-ribbon6.png" alt="Arch Ribbon Logo 6"/>
+    </div>
+
+    <h4>"Arch Blue" Series</h4>
+
+    <div class="imagelist">
+        <a href="/media/logos/legacy/arch-legacy-blue1.svg" title="Arch Blue">
+            <img src="/media/logos/legacy/arch-legacy-blue1.png" alt="Arch Blue"/></a>
+        <a href="/media/logos/legacy/arch-legacy-blue2.svg" title="Arch Blue Vertical">
+            <img src="/media/logos/legacy/arch-legacy-blue2.png" alt="Arch Blue Vertical"/></a>
+    </div>
+
+    <h4>"Arch Aqua" Series</h4>
+
+    <div class="imagelist">
+        <a href="/media/logos/legacy/arch-legacy-aqua.svg" title="Arch Aqua">
+            <img src="/media/logos/legacy/arch-legacy-aqua.png" alt="Arch Aqua" /></a>
+        <a href="/media/logos/legacy/arch-legacy-aqua-blue.svg" title="Arch Aqua Blue">
+            <img src="/media/logos/legacy/arch-legacy-aqua-blue.png" alt="Arch Aqua Blue" /></a>
+        <a href="/media/logos/legacy/arch-legacy-aqua-white.svg" title="Arch Aqua White">
+            <img src="/media/logos/legacy/arch-legacy-aqua-white.png" alt="Arch Aqua White" /></a>
+    </div>
+
+    <h4>Release-specific Series</h4>
+
+    <div class="imagelist">
+        <a href="/media/logos/legacy/arch-legacy-wombat-lg.png" title="Arch Wombat">
+            <img src="/media/logos/legacy/arch-legacy-wombat.png" alt="Arch Wombat" /></a>
+        <a href="/media/logos/legacy/arch-legacy-noodle-blue.svg" title="Arch Noodle Blue">
+            <img src="/media/logos/legacy/arch-legacy-noodle-blue.png" alt="Arch Noodle Blue" /></a>
+        <a href="/media/logos/legacy/arch-legacy-noodle-white.svg" title="Arch Noodle White">
+            <img src="/media/logos/legacy/arch-legacy-noodle-white.png" alt="Arch Noodle White" /></a>
+        <a href="/media/logos/legacy/arch-legacy-noodle-box.svg" title="Arch Box of Noodles">
+            <img src="/media/logos/legacy/arch-legacy-noodle-box.png" alt="Arch Box of Noodles" /></a>
+        <a href="/media/logos/legacy/arch-legacy-noodle-cup.svg" title="Arch Cup of Noodles">
+            <img src="/media/logos/legacy/arch-legacy-noodle-cup.png" alt="Arch Cup of Noodles" /></a>
+    </div>
+
+</div><!-- #artwork -->
+{% endblock %}
diff --git a/templates/public/blank.html b/templates/public/blank.html
index f0bcedf4..2a8c83f4 100644
--- a/templates/public/blank.html
+++ b/templates/public/blank.html
@@ -1,10 +1,8 @@
 {% extends "base.html" %}
+{% block title %}Arch Linux - Sample Page Title{% endblock %}
 
 {% block content %}
-<div class="box">
-    <h2 class="title">Download Arch Linux</h2>
-    <br /><br />
+<div id="sample-page-id" class="box">
+    <h2>Sample page title</h2>
 </div>
-<br /><br />
 {% endblock %}
-
diff --git a/templates/public/developer_list.html b/templates/public/developer_list.html
index ff38b26a..61a612c6 100644
--- a/templates/public/developer_list.html
+++ b/templates/public/developer_list.html
@@ -1,59 +1,67 @@
-    <div id="devlist">
+<div id="arch-bio-toc">
+
+    <p>
     {% for dev in dev_list %}
-        <a href="#{{ dev.username }}">{{ dev.first_name }}{{ dev.last_name.0|capfirst}}</a>  &nbsp;
+    <a href="#{{ dev.username }}" title="Jump to profile for {{ dev.get_full_name }}">
+        {{ dev.first_name }}{{ dev.last_name.0|capfirst}}</a> &nbsp;&nbsp;
     {% endfor %}
-    </div><br /><br />
+    </p>
+
+</div>
 
-    <table class="center" cellpadding="20">
+<table class="arch-bio-entry">
     {% for dev in dev_list %}
     {% with dev.get_profile as prof %}
-        <tr>
-            <td class="devpic">
-                <img src="{{ prof.picture.url }}" height="175" width="175" style="border:1px solid black" alt="Image for {{ prof.alias }}"/>
-            </td><td>
-                <a name="{{ dev.username }}"></a>
-                <table class="deventry" cellspacing="5">
-                    <tr>
-                        <th>Name:</th>
-                        <td>{{ dev.get_full_name }}</td>
-                    </tr><tr>
-                        <th>Alias:</th>
-                        <td>{{ prof.alias }}</td>
-                    </tr><tr>
-                        <th>Email:</th>
-                        <td>{{ prof.public_email }}</td>
-                    </tr><tr>
-                        <th>Other Contact:</th>
-                        <td>{{ prof.other_contact }}</td>
-                    </tr><tr>
-                        <th>Roles:</th>
-                        <td>{{ prof.roles }}<br />
-                        </td>
-                    </tr><tr>
-                        <th>Website:</th>
-                        <td>{% if prof %}<a href="{{ prof.website }}">{{ prof.website }}</a>{% endif %}</td>
-                    </tr><tr>
-                        <th>Occupation:</th>
-                        <td>{{ prof.occupation }}</td>
-                    </tr><tr>
-                        <th>YOB:</th>
-                        <td>{% if prof.yob %}{{ prof.yob }}{% endif %}</td>
-                    </tr><tr>
-                        <th>Location:</th>
-                        <td>{{ prof.location }}</td>
-                    </tr><tr>
-                        <th>Languages:</th>
-                        <td>{{ prof.languages }}</td>
-                    </tr><tr>
-                        <th>Interests:</th>
-                        <td>{{ prof.interests }}</td>
-                    </tr><tr>
-                        <th>Favorite Distros:</th>
-                        <td>{{ prof.favorite_distros }}</td>
-                    </tr>
-                </table>
-            </td>
-        </tr>
+    <tr>
+        <td class="pic pic-{{ dev.username }}">
+            <img src="{{ prof.picture.url }}" height="125" width="125" alt="Image for {{ prof.alias }}"/>
+        </td>
+        <td>
+            <a name="{{ dev.username }}"></a>
+            <table class="bio bio-{{ dev.username }}" cellspacing="0">
+                <tr>
+                    <th>Name:</th>
+                    <td>{{ dev.get_full_name }}</td>
+                </tr><tr>
+                    <th>Alias:</th>
+                    <td>{{ prof.alias }}</td>
+                </tr><tr>
+                    <th>Email:</th>
+                    <td>{{ prof.public_email }}</td>
+                </tr><tr>
+                    <th>Other Contact:</th>
+                    <td>{{ prof.other_contact }}</td>
+                </tr><tr>
+                    <th>Roles:</th>
+                    <td>{{ prof.roles }}<br />
+                    </td>
+                </tr><tr>
+                    <th>Website:</th>
+                    <td>{% if prof %}<a href="{{ prof.website }}"
+                            title="Visit the website for {{ dev.get_full_name }}">
+                            {{ prof.website }}</a>{% endif %}</td>
+                </tr><tr>
+                    <th>Occupation:</th>
+                    <td>{{ prof.occupation }}</td>
+                </tr><tr>
+                    <th>YOB:</th>
+                    <td>{% if prof.yob %}{{ prof.yob }}{% endif %}</td>
+                </tr><tr>
+                    <th>Location:</th>
+                    <td>{{ prof.location }}</td>
+                </tr><tr>
+                    <th>Languages:</th>
+                    <td>{{ prof.languages }}</td>
+                </tr><tr>
+                    <th>Interests:</th>
+                    <td>{{ prof.interests }}</td>
+                </tr><tr>
+                    <th>Favorite Distros:</th>
+                    <td>{{ prof.favorite_distros }}</td>
+                </tr>
+            </table>
+        </td>
+    </tr>
     {% endwith %}
     {% endfor %}
-    </table>
+</table>
diff --git a/templates/public/donate.html b/templates/public/donate.html
index a14f20ed..acbb077c 100644
--- a/templates/public/donate.html
+++ b/templates/public/donate.html
@@ -1,58 +1,86 @@
 {% extends "base.html" %}
-{% block title %}Arch Linux - Donors{% endblock %}
+{% block title %}Arch Linux - Donate{% endblock %}
+
 {% block content %}
-<div class="box">
-    <h2 class="title">Donate to Arch Linux</h2>
-    <p>
-    Arch Linux survives because of the tireless efforts of many people in
-    the community and the core development circle.  None of us are paid for our
-    work, and we don't have the personal funds to sustain server costs ourselves.
-    </p><p>
-    There are many ways to help Arch Linux.  If technical development,
+<div id="donations" class="box">
+
+    <h2>Donate to Arch Linux</h2>
+
+    <p>Arch Linux survives because of the tireless efforts of many people in
+    the community and the core development circle.  None of us are paid for
+    our work, and we don't have the personal funds to sustain server costs
+    ourselves.</p>
+
+    <p>There are many ways to help support Arch Linux.  If technical development,
     documentation, or support aren't your strong points, you could certainly
-    help us by dropping a few bucks our way.
-    </p><p>
-    Many thanks!
-    </p>
-    <div style="text-align:center">
+    help us by dropping a few bucks our way.</p>
+
+    <p>Many thanks!</p>
+
+    <h3>Monetary donations</h3>
+
+    <p>Financial contributions are accepted via <a title="Click to donate now"
+        href="https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=aaronmgriffin@gmail.com&currency_code=USD">PayPal</a>.
+    Funds are used for server hardware upgrades, conventions, schwag giveaways and more.</p>
+
+    <div id="paypal-button">
         <!-- paypal code -->
-        <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-        <input type="hidden" name="cmd" value="_xclick"/>
-        <input type="hidden" name="business" value="aaronmgriffin@gmail.com"/>
-        <input type="hidden" name="currency_code" value="USD"/>
-        <input type="hidden" name="tax" value="0"/>
-        <input type="hidden" name="lc" value="US"/>
-        <input type="hidden" name="bn" value="PP-DonationsBF"/>
-        <input type="hidden" name="item_name" value="Arch Linux Donation"/>
-        <input type="hidden" name="image_url" value="/logos/arch-paypal.jpg"/>
-        <input type="hidden" name="no_shipping" value="1"/>
-        <input type="hidden" name="cn" value="Suggestions/Comments"/>
-        <input type="hidden" name="no_note" value="1"/>
-        <input type="image" src="/media/donate.gif" border="0" name="submit"
-        alt="Make payments with PayPal - it's fast, free and secure!"
-        style="background: transparent; border: none"/>
+        <form id="paypal-form" name="_xclick" action="https://www.paypal.com/cgi-bin/webscr" method="post">
+            <p><input type="hidden" name="cmd" value="_xclick"/></p>
+            <p><input type="hidden" name="business" value="aaronmgriffin@gmail.com"/></p>
+            <p><input type="hidden" name="currency_code" value="USD"/></p>
+            <p><input type="hidden" name="tax" value="0"/></p>
+            <p><input type="hidden" name="lc" value="US"/></p>
+            <p><input type="hidden" name="bn" value="PP-DonationsBF"/></p>
+            <p><input type="hidden" name="item_name" value="Arch Linux Donation"/></p>
+            <p><input type="hidden" name="no_shipping" value="1"/></p>
+            <p><input type="hidden" name="cn" value="Suggestions/Comments"/></p>
+            <p><input type="hidden" name="no_note" value="1"/></p>
+            <p><input type="image" src="/media/donate.gif" name="submit"
+            title="Make a PayPal donation to the Arch Linux project"
+            alt="Make a PayPal donation to the Arch Linux project"
+            style="background:transparent;border:none;" /></p>
         </form>
     </div>
-    <br />
-    <h2 class="title">Sponsors and Contributions</h2>
-    <p>We'd like to thank <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="velocity network">Velocity Network</a> for contributing space in a server rack, bandwidth, and electricity for our main server for the last couple of years.</p>
-    <div style="text-align:center">
-    <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="velocity network"><img src="/media/vnet_button.png" class="" title="" alt="velocity network - it's about time" /></a>
-    </div>
-    <p>We also wish to extend a special Thank You to <a href="https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl" title="SevenL Networks - Dedicated Arch Linux servers">SevenL Networks</a> for their generous and ongoing contribution of a dedicated Arch Linux server. You too can have a dedicated Arch Linux server hosted by SevenL...head over to their <a href="https://www.sevenl.net/dedicated-server/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl" title="SevenL Networks - dedicated server hosting">website</a> for more details.</p>
-    <div style="text-align:center">
-    <a href="https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl" title="SevenL Networks - Dedicated Arch Linux servers"><img src="/media/sevenl_button.png" class="" title="A big Thank You to SevenL Networks for their generous contribution" alt="We would like to express our thanks to SevenL Networks for their generous contribution" /></a>
-    </div>
-    <p>More thanks go to <a href="http://www.airvm.com/VirtualServers" title="AirVM.com">AirVM.com</a> for contributing a VMWare-based Virtual Machine.</p>
-    <div style="text-align:center">
-    <a href="http://www.airvm.com/VirtualServers" title="AirVM.com - Your Green Technology Partner"><img src="/media/airvm_button.jpg" class="" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" /></a>
+
+    <h3>Commercial sponsors and contributions</h3>
+
+    <p>We'd like to thank <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux"
+        title="velocity network">Velocity Network</a> for contributing space
+    in a server rack, bandwidth, and electricity for our main server.</p>
+
+    <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux"
+        title="velocity network"><img src="/media/vnet_button.png" class="sponsor-btn-vnet"
+        title="" alt="velocity network - it's about time" /></a>
+
+    <p>We also wish to extend a special Thank You to <a
+        href="https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl"
+        title="SevenL Networks - Dedicated Arch Linux servers">SevenL Networks</a>
+    for their generous and ongoing contribution of a dedicated Arch Linux
+    server . You too can have a dedicated Arch Linux server hosted by SevenL...
+    head over to their website for more details.</p>
+
+    <a href="https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl"
+        title="SevenL Networks - Dedicated Arch Linux servers"><img src="/media/sevenl_button.png"
+        class="sponsor-btn-sevenl" title="A big Thank You to SevenL Networks for their generous contribution"
+        alt="We would like to express our thanks to SevenL Networks for their generous contribution" /></a>
+
+    <p>More thanks go to <a href="http://www.airvm.com/VirtualServers"
+        title="AirVM.com">AirVM.com</a> for contributing a VMWare-based Virtual Machine.</p>
+
+    <a href="http://www.airvm.com/VirtualServers"
+        title="AirVM.com - Your Green Technology Partner"><img src="/media/airvm_button.jpg"
+        class="sponsor-btn-airvm" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" /></a>
+
+    <h3>Past donors</h3>
+
+    <div id="donor-list">
+        <ul>
+            {% for donor in donors %}
+            <li>{{ donor.name }}</li>{% endfor %}
+        </ul>
     </div>
-    <h2 class="title">Past Donors</h2>
-    <ul id="donorlist">
-        {% for donor in donors %}
-        <li>{{ donor.name }}</li>{% endfor %}
-    </ul>
-    <div class="clear"/>
+    <div class="clear"></div>
+    <p>A huge thanks to you all for your contributions!</p>
 </div>
 {% endblock %}
-
diff --git a/templates/public/download.html b/templates/public/download.html
index 6d7656b0..3808222a 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -1,113 +1,157 @@
 {% extends "base.html" %}
+{% block title %}Arch Linux - Downloads{% endblock %}
 
 {% block content %}
-<div class="box">
-    <h2 class="title">Release Info</h2>
-    <div style="text-align:center">
-        <p>All available images can be burned to a CD, mounted as an ISO file,
-        or be directly written to a USB stick using a utility like `dd`. These
-        are intended for new installations only; an existing Arch Linux system
-        can always be updated with `pacman -Syu`.</p>
-
-        <b>Current Release:</b> 2010.05 <br />
-        <b>Included Kernel:</b> 2.6.33.4 <br />
-        <b>Resources:</b>
-            <a href="http://bugs.archlinux.org/index.php?project=6">Bug Tracker</a>
-            -
-            <a href="http://www.archlinux.org/mailman/listinfo/arch-releng">Mailing List</a>
-            <br />
-            <br />
-        <b>Links and Instructions:</b><br />
-        <a href="http://www.archlinux.org/iso/2010.05/README">
-            Downloading Instructions
-        </a>
-        <br />
-        <a href="http://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide">
-            Arch Linux Install Guide
-        </a>
-    </div>
-    <h2 class="title">BitTorrent Download (recommended)</h2>
-    <div style="text-align:center">
-        <p>If you can spare the bytes, please leave the client open after your
-        download is finished, so you can seed it back to others. A web-seed
-        capable client is recommended for fastest download speeds.</p>
-
-        <h3>Netinstall ISOs</h3>
-        <p>
-        <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-netinstall-i686.iso.torrent">i686</a>
-        <br />
-        <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-netinstall-x86_64.iso.torrent">x86_64</a>
-        <br />
-        <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-netinstall-dual.iso.torrent">Dual Arch</a>
-        </p>
-
-        <h3>Core ISOs</h3>
-        <p>
-        <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-core-i686.iso.torrent">i686</a>
-        <br />
-        <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-core-x86_64.iso.torrent">x86_64</a>
-        <br />
-        <a href="http://www.archlinux.org/iso/2010.05/archlinux-2010.05-core-dual.iso.torrent">Dual Arch</a>
-        </p>
-
-    </div>
-    <h2 class="title">Buy A CD</h2>
-    <div style="text-align:center">
-        These suppliers donate a small percentage of each CD purchased to
-        the Arch Linux project:
-        <table class="center" cellspacing="10">
-            <tr><td>
-        <a href="http://www.osdisc.com/cgi-bin/distro/index.cgi?distro=archlinux">
-            Purchase CD from OSDisc</a>
-            </td></tr>
-            <tr><td>
-        <a href="http://www.shoplinuxonline.com/index.php?main_page=index&amp;cPath=1_46&amp;zenid=ecd15b48affe8976130bc575c1276ee4">
-            Purchase CD from Shop Linux Online</a>
-            </td></tr>
-        </table>
-        You can also purchase Arch on CD from these suppliers:
-        <table class="center" cellspacing="10">
+<div id="arch-downloads" class="box">
+
+    <h2>Arch Linux Downloads</h2>
+
+    {% with "2010.05" as version %}
+    <h3>Release Info</h3>
+
+    <p>All available images can be burned to a CD, mounted as an ISO file,
+    or be directly written to a USB stick using a utility like `dd`. These
+    are intended for new installations only; an existing Arch Linux system
+    can always be updated with `pacman -Syu`.</p>
+
+    <ul>
+        <li><strong>Current Release:</strong> {{ version }}</li>
+        <li><strong>Included Kernel:</strong> 2.6.33.4</li>
+        <li><strong>Resources:</strong>
+            <ul>
+                <li><a href="http://bugs.archlinux.org/index.php?project=6" 
+                    title="Arch Linux Bugtracker:Release Engineering">Bug Tracker</a></li>
+                <li><a href="http://www.archlinux.org/mailman/listinfo/arch-releng" 
+                    title="Arch Linux Release Engineering mailing list">Mailing List</a></li>
+            </ul>
+        </li>
+    </ul>
+
+    <p><strong>Links and Instructions:</strong></p>
+
+    <ul id="download-help">
+        <li><a href="http://www.archlinux.org/iso/{{ version }}/README"
+            title="Official download instructions">Readme and Instructions</a></li>
+        <li><a href="http://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide" 
+            title="Official Installation Guide">Arch Linux Install Guide</a></li>
+    </ul>
+
+    <h3>BitTorrent Download (recommended)</h3>
+
+    <p>If you can spare the bytes, please leave the client open after your
+    download is finished, so you can seed it back to others.
+    <em>A web-seed capable client is recommended for fastest download speeds.</em></p>
+
+    <table id="download-torrents" class="pretty1">
+        <thead>
+            <tr>
+                <th>Format</th>
+                <th class="cpu-arch">i686 CPU</th>
+                <th class="cpu-arch">x86-64 CPU</th>
+                <th class="cpu-arch">Dual Architecture</th>
+                <th>Description</th>
+            </tr>
+        </thead>
+        <tbody>
             <tr>
                 <td>
-        <a href="http://www.linuxcd.org/view_distro.php?id_distro=48">Purchase CD from LinuxCD</a>
+                    Netinstall Image
+                </td><td class="cpu-arch">
+                    <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-netinstall-i686.iso.torrent" 
+                        title="Download for i686 architecture">Download</a>
+                </td><td class="cpu-arch">
+                    <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-netinstall-x86_64.iso.torrent" 
+                    title="Download for x86-64 architecture">Download</a>
+                </td><td class="cpu-arch">
+                    <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-netinstall-dual.iso.torrent" 
+                    title="Download for both architectures">Download</a>
+                </td><td class="wrap">
+                    Downloads and installs packages versions via FTP for absolute freshness.
+                </td>
+            </tr><tr>
+                <td>
+                    Core Image
+                </td><td class="cpu-arch">
+                    <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-i686.iso.torrent" 
+                    title="Download for i686 architecture">Download</a>
+                </td><td class="cpu-arch">
+                    <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-x86_64.iso.torrent" 
+                    title="Download for x86-64 architecture">Download</a>
+                </td><td class="cpu-arch">
+                    <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-dual.iso.torrent" 
+                    title="Download for both architectures">Download</a>
+                </td><td class="wrap">
+                    Core packages are included on the media. Good for basic off-line installation.
+                </td>
+        </tbody>
+    </table>
+    {% endwith %}
+
+    <h3>Get Arch Linux on CD</h3>
+
+    <p>The following suppliers donate a portion of their proceeds to the
+    Arch Linux project:</p>
+
+    <ul id="cd-vendors-donate">
+        <li><a href="http://www.osdisc.com/cgi-bin/distro/index.cgi?distro=archlinux" 
+            title="Purchase a CD from OSDisc">Purchase a CD from OSDisc</a></li>
+        <li><a href="http://www.shoplinuxonline.com/index.php?main_page=index&amp;cPath=1_46&amp;zenid=ecd15b48affe8976130bc575c1276ee4"
+            title="Purchase a CD from Shop Linux Online">Purchase a CD from Shop Linux Online</a></li>
+    </ul>
+
+    <p>Arch Linux CDs are also available for purchase from these suppliers:</p>
+
+    <ul id="cd-vendors">
+        <li><a href="http://www.linuxcd.org/view_distro.php?id_distro=48" 
+            title="Purchase a CD from LinuxCD">Purchase a CD from LinuxCD</a></li>
+    </ul>
+
+
+    <h3>HTTP/FTP Direct Downloads</h3>
+
+    <p>In addition to the BitTorrent links above, install images can also be
+    downloaded via HTTP or FTP from the mirror sites listed below. Please
+    ensure the download image matches the checksum from the md5sums.txt or
+    sha1sums.txt file in the same directory as the image.</p>
+
+    <h4>Checksums</h4>
+
+    <p>File integrity checksums for the latest releases can be found below:</p>
+
+    <ul>
+        <li><a href="http://www.archlinux.org/iso/{{version}}/sha1sums.txt" 
+            title="Get the latest SHA1 checksums">SHA1 checksums</a></li>
+        <li><a href="http://www.archlinux.org/iso/{{version}}/md5sums.txt" 
+            title="Get the latest MD5 checksums">MD5 checksums</a></li>
+    </ul>
+
+    <table id="download-mirrors">
+        <thead>
+            <tr>
+                <th><h4>Server Location</h4></th>
+                <th><h4>Download</h4></th>
+            </tr>
+        </thead> 
+        <tbody>
+            <tr><td colspan="2">
+                    {% for mirror_url in mirror_url_list %}
+                    {% ifchanged mirror_url.mirror.country %}
+            </td></tr>
+            <tr><td class="mirror-country" colspan="2"><strong>{{mirror_url.mirror.country}}</strong>
+                    {% endifchanged %}
+                    {% ifchanged mirror_url.mirror.name %}
             </td></tr>
-        </table>
-    </div>
-
-    
-    <h2 class="title">HTTP/FTP Download</h2>
-    <div style="text-align:center">
-        <p>In addition to the BitTorrent links above, ISO images can also be
-        downloaded via HTTP or FTP from the mirror sites listed below. Please
-        ensure the download image matches the checksum from the md5sums.txt or
-        sha1sums.txt file in the same directory as the image.</p>
-        <h3>Checksums</h3>
-        <p>
-            <a href="http://www.archlinux.org/iso/2010.05/sha1sums.txt">SHA1</a>
-            <br />
-            <a href="http://www.archlinux.org/iso/2010.05/md5sums.txt">MD5</a>
-        </p>
-
-        <table class="center">
-            <tr><td colspan="2"><h3>Mirror Sites</h3>
-            {% for mirror_url in mirror_url_list %}
-                {% ifchanged mirror_url.mirror.country %}
-                </td></tr>
-                <tr><td colspan="2" style="text-align: left"><br /><h4>{{mirror_url.mirror.country}}</h4>
-                {% endifchanged %}
-                {% ifchanged mirror_url.mirror.name %}
-                    </td></tr>
-                    <tr><td style="text-align: left">{{mirror_url.mirror.name}}</td><td style="text-align: right">
-                {% endifchanged %}
-                (<a href="{{mirror_url.url}}iso/">{{mirror_url.protocol.protocol}}</a>)
-            {% endfor %}
+            <tr><td class="mirror-server">{{mirror_url.mirror.name}}</td><td>
+                    {% endifchanged %}
+                    <a href="{{mirror_url.url}}iso/" 
+                        title="Download from {{mirror_url.url}}iso/">{{mirror_url.protocol.protocol|upper}}</a>
+                    {% endfor %}
             </td></tr>
-        </table>
-    <p>If you want to become an Official Arch Linux Mirror please follow
-    the instructions listed <a href="http://wiki.archlinux.org/index.php/DeveloperWiki:NewMirrors">here</a>.
-    </p>
-    </div>
+        </tbody>
+    </table>
+
+    <p>If you want to become an Official Arch Linux Mirror please follow the
+    instructions listed <a href="http://wiki.archlinux.org/index.php/DeveloperWiki:NewMirrors">here</a>.</p>
+
 </div>
-<br /><br />
 {% endblock %}
-
diff --git a/templates/public/feeds.html b/templates/public/feeds.html
index a3502cf5..553aa3e5 100644
--- a/templates/public/feeds.html
+++ b/templates/public/feeds.html
@@ -1,16 +1,29 @@
 {% extends "base.html" %}
 {% block title %}Arch Linux - RSS Feeds{% endblock %}
+
 {% block content %}
-<div class="box">
-    <h2 class="title">RSS Feeds</h2>
-    <br /><br />
+<div id="rss-feeds" class="box">
+
+    <h2>RSS Feeds</h2>
+
     <p>Several RSS feeds are available for consumption from the Arch website.
-    The majority of these are package related and allow feeds to be customized
+    The majority of these are package-related and allow feeds to be customized
     for the updates you care about.</p>
-    <p>Grab the <a href="/feeds/news/">news item feed <img src="/media/rss.png" alt="RSS Feed" /></a>
+
+    <h3>News and Activity Feeds</h3>
+
+    <p>Grab the <a href="/feeds/news/" class="rss" title="Arch Linux News feed">news item feed</a>
     to keep up-to-date with the latest news from the Arch Linux development staff.</p>
-    <p>If you are interested in
-    <a href="/feeds/packages/">all package updates <img src="/media/rss.png" alt="RSS Feed" /></a>,
+
+    <p>The <a href="http://wiki.archlinux.org/index.php?title=Special:RecentChanges&amp;feed=rss"
+    title="ArchWiki Recent Changes feed" class="rss">Arch Wiki: Recent changes feed</a>
+    is also available to track document changes from the <a href="http://wiki.archlinux.org/"
+    title="Arch Wiki community documentation">Arch Wiki</a>.</p>
+
+    <h3>Package Feeds</h3>
+
+    <p>If you are interested in <a href="/feeds/packages/" class="rss"
+        title="Arch Linux all package update feed">all package updates</a>,
     then grab this feed. Note that when a package is updated for multiple
     architectures, you will see each individual update show up here.
     Alternatively, you can select a packages feed from the below table that is
@@ -18,25 +31,84 @@
     architecture, there are a variety of feeds you can choose from. Note that
     feeds for a specific architecture, such as 'i686', will also include all
     package updates for 'any' (architecture-independent) packages.</p>
-    <table id="feedlist" class="center">
-        <tr>
-            <th>Architecture</th>
-            <th>All Repos</th>
-            {% for repo in repos %}
-            <th>{{ repo }}</th>
-            {% endfor %}
-        </tr>
-        {% for arch in arches %}
-        <tr>
-            <td><strong>{{ arch }}</strong></td>
-            <td><a href="/feeds/packages/{{ arch }}/">Feed <img src="/media/rss.png" alt="RSS Feed" /></a></td>
-            {% for repo in repos %}
-            <td><a href="/feeds/packages/{{ arch }}/{{ repo|lower }}/">Feed <img src="/media/rss.png" alt="RSS Feed" /></a></td>
+
+    <table class="pretty2">
+        <thead>
+            <tr>
+                <th>Architecture</th>
+                <th>All Repos</th>
+                {% for repo in repos %}
+                <th>{{ repo }}</th>
+                {% endfor %}
+            </tr>
+        </thead>
+        <tbody>
+            {% for arch in arches %}
+            <tr>
+                <td><strong>{{ arch }}</strong></td>
+                <td><a href="/feeds/packages/{{ arch }}/" class="rss">Feed</a></td>
+                {% for repo in repos %}
+                <td><a href="/feeds/packages/{{ arch }}/{{ repo|lower }}/" class="rss">Feed</a></td>
+                {% endfor %}
+            </tr>
             {% endfor %}
-        </tr>
-        {% endfor %}
+        </tbody>
     </table>
-</div>
-<br /><br />
-{% endblock %}
 
+    <p>A <a href="http://aur.archlinux.org/rss.php" class="rss" title="AUR
+        newest packages feed">Newest Packages feed</a> is also available from
+    the <a href="http://aur.archlinux.org/" title="AUR Homepage">Arch User
+        Repository (AUR)</a>.</p>
+
+    <h3>Development Feeds</h3>
+
+    <p>Subscribe to any of the following to track bug tickets and feature
+    requests from the <a href="http://bugs.archlinux.org/" title="Arch Linux
+        Bugs">Arch Linux Bugtracker</a>:</p>
+
+    <table class="pretty2">
+        <thead>
+            <tr>
+                <th>Project</th>
+                <th>Recently Opened Tasks</th>
+                <th>Recently Edited Tasks</th>
+                <th>Recently Closed Tasks</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td>All Projects</td>
+                <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;project=99" class="rss">Feed</a></td>
+                <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=edit&amp;project=99" class="rss">Feed</a></td>
+                <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=clo&amp;project=99" class="rss">Feed</a></td>
+            </tr><tr>
+                <td>Arch Linux</td>
+                <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;project=1" class="rss">Feed</a></td>
+                <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=edit&amp;project=1" class="rss">Feed</a></td>
+                <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=clo&amp;project=1" class="rss">Feed</a></td>
+            </tr><tr>
+                <td>Release Engineering</td>
+                <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;project=6" class="rss">Feed</a></td>
+                <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=edit&amp;project=6" class="rss">Feed</a></td>
+                <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=clo&amp;project=6" class="rss">Feed</a></td>
+            </tr><tr>
+                <td>Pacman Development</td>
+                <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;project=3" class="rss">Feed</a></td>
+                <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=edit&amp;project=3" class="rss">Feed</a></td>
+                <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=clo&amp;project=3" class="rss">Feed</a></td>
+            </tr><tr>
+                <td>Community Packages</td>
+                <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;project=5" class="rss">Feed</a></td>
+                <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=edit&amp;project=5" class="rss">Feed</a></td>
+                <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=clo&amp;project=5" class="rss">Feed</a></td>
+            </tr><tr>
+                <td>AUR</td>
+                <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;project=2" class="rss">Feed</a></td>
+                <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=edit&amp;project=2" class="rss">Feed</a></td>
+                <td><a href="http://bugs.archlinux.org/feed.php?feed_type=rss2&amp;topic=clo&amp;project=2" class="rss">Feed</a></td>
+            </tr>
+        </tbody>
+    </table>
+
+ </div>
+{% endblock %}
diff --git a/templates/public/index.html b/templates/public/index.html
index c403e08a..09239bde 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -6,127 +6,191 @@
 {% endblock %}
 
 {% block content_left %}
-    <div id="about" class="box">
-        <h2>Welcome to Arch!</h2>
-        <p>
-            You've reached the website for <strong>Arch Linux</strong>, a lightweight
-            and flexible Linux&reg; distribution that tries to Keep It Simple.
-        </p><p>
-            Currently we have official packages optimized for the i686 and x86-64
-            architectures.  We complement our official package sets with a
-            <a href="http://aur.archlinux.org">community-operated package repository</a>
-            that grows in size and quality each and every day.
-        </p><p>
-            Our strong community is diverse and helpful, and we pride ourselves on
-            the range of skillsets and uses for Arch that stem from it.  Please
-            check out our <a href="http://bbs.archlinux.org">forums</a> and
-            <a href="http://www.archlinux.org/mailman/listinfo/">mailing lists</a>
-            to get your feet wet.  Also glance through our <a href="http://wiki.archlinux.org">wiki</a>
-            if you want to learn more about Arch.
-        </p><p style="text-align: right">
-            <a href="{% url page-about %}"><span style="font-size:x-small">Learn more...</span></a>
-        </p>
-    </div>
-    <br /><br />
-    <div style="float:right;position:relative;bottom:-25px">
-        <a href="/feeds/news/"><img src="/media/rss.png" alt="RSS Feed" /></a>
-    </div>
-    <h2 class="title">Latest News</h2>
-    <div>
+<div id="intro" class="box">
+
+    <h2>A simple, lightweight distribution</h2>
+
+    <p>You've reached the website for <strong>Arch Linux</strong>, a
+    lightweight and flexible Linux® distribution that tries to Keep It
+    Simple.</p>
+
+    <p>Currently we have official packages optimized for the i686 and
+    x86-64 architectures. We complement our official package sets with a
+    <a href="http://aur.archlinux.org" title="Arch User Repository (AUR)">
+        community-operated package repository</a> that grows in size and
+    quality each and every day.</p>
+
+    <p>Our strong community is diverse and helpful, and we pride ourselves
+    on the range of skillsets and uses for Arch that stem from it. Please
+    check out our <a href="http://bbs.archlinux.org" title="Arch Forums">forums</a>
+    and <a href="http://www.archlinux.org/mailman/listinfo/" title="Arch Mailing Lists">mailing lists</a>
+    to get your feet wet.  Also glance through our <a href="http://wiki.archlinux.org" title="Arch Wiki">wiki</a>
+    if you want to learn more about Arch.</p>
+
+    <p class="readmore"><a href="{% url page-about %}"
+        title="Learn more about Arch Linux">Learn more...</a></p>
+
+</div><!-- #intro -->
+
+<div id="news">
+
+    <h3>Latest News <span class="more">(<a href="{% url news-list %}"
+                title="Browse the news archives">more</a>)</span></h3>
+
+    <a href="/feeds/news/" title="Arch News RSS Feeds"
+        class="rss-icon"><img src="/media/rss.png" alt="RSS Feed" /></a>
+
     {% for news in news_updates %}
-        <br />
-        <span style="float:right; font-size:x-small">{{ news.postdate }}</span>
-        <h4 class="news"><a href="{{ news.get_absolute_url }}">{{ news.title }}</a></h4>
-        <p class="news">{{ news.content|striptags|truncatewords:60 }}</p>
-        <br />
+    <h4><a href="{{ news.get_absolute_url }}"
+            title="View full article: {{ news.title }}">{{ news.title }}</a></h4>
+    <p class="timestamp">{{ news.postdate }}</p>
+    <p>{{ news.content|striptags|truncatewords:50 }}</p>
     {% endfor %}
-        <span style="float:right;font-size:x-small"><a href="{% url news-list %}">More News...</a></span>
-        <br /><br />
-    </div>
+
+</div><!-- #news -->
 {% endblock %}
 
 {% block content_right %}
-    <div id="search">
-        <form method="get" action="/packages/">
-            <p>Package Search:&nbsp;&nbsp;<input type="text" name="q" size="20" maxlength="200" /></p>
-        </form>
-    </div>
-    <div id="updates">
-        <table width="100%">
-            <tr>
-                <td><h3>Recent Updates</h3></td>
-                <td style="vertical-align:top;text-align:right"><a href="/feeds/packages/"><img src="/media/rss.png" alt="RSS Feed" /></a></td>
-            </tr>
+<div id="pkgsearch" class="widget">
+
+    <form id="pkgsearch-form" method="get" action="/packages/">
+        <fieldset>
+            <p>Package Search:&nbsp;&nbsp;<input id="pkgsearch-field"
+            type="text" name="q" size="18" maxlength="200" /></p>
+        </fieldset>
+    </form>
+
+</div>
+
+<div id="pkg-updates" class="widget box">
+
+    <h3>Recent Updates <span class="more">(<a href="/packages/?sort=-last_update"
+            title="Browse all of the latest packages">more</a>)</span></h3>
+
+    <a href="/feeds/packages/" title="Arch Package Updates RSS Feeds"
+        class="rss-icon"><img src="/media/rss.png" alt="RSS Feed" /></a>
+
+    <table>
         {% for update in pkg_updates %}
         {% with update|first as fpkg %}
-            <tr>
-                <td><span class="{{ fpkg.repo.name|lower }}">{{ fpkg.pkgname }} {{ fpkg.pkgver }}-{{ fpkg.pkgrel }}</span></td>
-                <td style="text-align:right">
-                    {% for pkg in update %}<a href="{{ pkg.get_absolute_url }}">{{ pkg.arch }}</a>{% if not forloop.last %}/{% endif %}{% endfor %}
+        <tr>
+            <td class="pkg-name"><span class="{{ fpkg.repo.name|lower }}">{{ fpkg.pkgname }} {{ fpkg.pkgver }}-{{ fpkg.pkgrel }}</span></td>
+            <td class="pkg-arch">
+                {% for pkg in update %}<a href="{{ pkg.get_absolute_url }}"
+                    title="View package details for {{ pkg.pkgname }}">{{ pkg.arch }}</a>{% if not forloop.last %}/{% endif %}{% endfor %}
             </td>
-            </tr>
+        </tr>
         {% endwith %}
         {% endfor %}
-            <tr>
-                <td style="font-size:x-small;white-space:nowrap;"><br /><a href="{% url feeds-list %}">More Feeds...</a></td>
-                <td style="text-align:right;font-size:x-small;white-space:nowrap;"><br /><a href="/packages/?sort=-last_update">More Updates...</a></td>
-            </tr>
-        </table>
-    </div>
-    <br />
+    </table>
+
+</div>
+
+<div id="nav-sidebar" class="widget">
+
     <div style="text-align: center;">
         <a href="http://www.archlinux.ca/archcon2010/" title="ArchCon 2010"><img src="/media/archcon.png" class="" title="" alt="ArchCon 2010" /></a>
     </div>
-    <br />
-    {% if user.is_authenticated %}
-      <h3>Dev Links:</h3>
-      <ul class="links">
-          <li><a href="/devel/">Dev Dashboard</a></li>
-          <li><a href="{% url news-list %}">News</a></li>
-          <li><a href="/packages/signoffs/">Signoffs</a></li>
-          <li><a href="/todo/">Todos</a></li>
-          <li><a href="http://www.archlinux.org/mailman/private/arch-dev/">Archives</a></li>
-          <li><a href="http://wiki.archlinux.org/index.php/DeveloperWiki:HOWTO_Be_A_Packager">Package Maintainer's Guide</a></li>
-          <li><a href="/devel/profile/">Profile</a></li>
-      </ul>
-    {% endif %}
-    <h3>Documentation:</h3>
-    <ul class="links">
-        <li><a href="http://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide">Installation Guide</a></li>
-        <li><a href="http://wiki.archlinux.org/index.php/Beginners'_Guide">Beginners' Guide</a></li>
-        <li><a href="http://wiki.archlinux.org">Wiki</a></li>
+
+    <h4>Documentation</h4>
+
+    <ul>
+        <li><a href="http://wiki.archlinux.org/"
+            title="Community documentation">Wiki</a></li>
+        <li><a href="http://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide"
+            title="Official installation guide">Official Installation Guide</a></li>
+        <li><a href="http://wiki.archlinux.org/index.php/Beginners'_Guide"
+            title="A good place to start for beginners">Unofficial Beginners' Guide</a></li>
     </ul>
-    <h3>Support Arch:</h3>
-    <ul class="links">
-        <li><a href="{% url page-donate %}">Donate</a></li>
+
+    <h4>Community</h4>
+
+    <ul>
+        <li><a href="http://mailman.archlinux.org/mailman/listinfo/"
+            title="Community and developer mailing lists">Mailing Lists</a></li>
+        <li><a href="http://wiki.archlinux.org/index.php/IRC_Channels"
+            title="Official and regional IRC communities">IRC Channels</a></li>
+        <li><a href="http://planet.archlinux.org/"
+            title="Arch in the blogosphere">Planet Arch</a></li>
+        <li><a href="/static/magazine/"
+            title="Community newsletters and magazines">Magazines</a></li>
+        <li><a href="http://wiki.archlinux.org/index.php/International_Communities"
+            title="Arch communities in your native language">International Communities</a></li>
+        <li><a href="http://wiki.archlinux.org/index.php/Related_Projects"
+            title="Projects that are in some way related to Arch Linux">Related Projects</a></li>
+    </ul>
+
+    <h4>Support</h4>
+
+    <ul>
+        <li><a href="{% url page-donate %}" title="Help support Arch Linux">Donate</a></li>
         <li><a href="http://schwag.archlinux.ca/"
-            title="USB keys, Jewellery, case badges">Arch Schwag</a></li>
+            title="USB keys, jewellery, case badges">Arch Schwag</a></li>
         <li><a href="http://www.zazzle.com/archlinux*"
             title="T-shirts, mugs, mouse pads, hoodies, posters, skateboards, shoes, etc.">Schwag via Zazzle</a></li>
         <li><a href="http://www.freewear.org/?page=list_items&amp;org=Archlinux"
             title="T-shirts">Schwag via Freewear</a></li>
-        <li><a href="{% url page-art %}">Logos &amp; Artwork</a></li>
     </ul>
-    <h3>Community Links:</h3>
-    <ul class="links">
-        <li><a href="http://www.archlinux.org/mailman/listinfo/">Mailing Lists</a></li>
-        <li><a href="http://wiki.archlinux.org/index.php/IRC_Channels">IRC Channels</a></li>
-        <li><a href="http://planet.archlinux.org">Planet Arch</a></li>
-        <li><a href="/static/magazine/">Magazines</a></li>
-        <li><a href="http://wiki.archlinux.org/index.php/Arch_Related_Projects">Arch-Based Projects</a></li>
-        <li><a href="http://wiki.archlinux.org/index.php/International_Communities">International Communities</a></li>
-        <li><a href="http://wiki.archlinux.org/index.php/Arch_Linux_Press_Review">Press</a></li>
+
+    <h4>Development</h4>
+
+    <ul>
+        <li><a href="/packages/"
+            title="View/search the package repository database">Packages</a></li>
+        <li><a href="http://bugs.archlinux.org/"
+            title="Report/track bugs or make feature requests">Bug Tracker</a></li>
+        <li><a href="{% url page-svn %}"
+            title="View SVN entries for packages">SVN Repositories</a></li>
+        <li><a href="http://projects.archlinux.org/"
+            title="Official Arch projects (git)">Projects in Git</a></li>
+        <li><a href="http://wiki.archlinux.org/index.php/DeveloperWiki"
+            title="Developer Wiki articles">DeveloperWiki</a></li>
     </ul>
-    <h3>Development:</h3>
-    <ul class="links">
-        <li><a href="{% url page-devs %}">Developers</a></li>
-        <li><a href="{% url page-tus %}">Trusted Users</a></li>
-        <li><a href="{% url page-fellows %}">Fellows</a></li>
-        <li><a href="http://bugs.archlinux.org">Bug Tracker</a></li>
-        <li><a href="{% url page-svn %}">SVN</a></li>
-        <li><a href="http://projects.archlinux.org">Projects</a></li>
+
+    <h4>About</h4>
+
+    <ul>
+        <li><a href="http://wiki.archlinux.org/index.php/ArchLinux:About"
+            title="Learn more about Arch Linux">About Arch</a></li>
+        <li><a href="/download/" title="Get Arch Linux">Download Arch</a></li>
+        <li><a href="http://wiki.archlinux.org/index.php/Arch_Linux_Press_Review"
+            title="Arch Linux in the media">Press Coverage</a></li>
+        <li><a href="{% url page-art %}" title="Arch logos and other artwork for promotional use">Logos &amp; Artwork</a></li>
+        <li><a href="{% url news-list %}" title="News Archives">News Archives</a></li>
+        <li><a href="/feeds/" title="Various RSS Feeds">RSS Feeds</a></li>
+        <li><a href="{% url page-devs %}" title="Active developers">Developer Profiles</a></li>
+        <li><a href="{% url page-tus %}" title="Active Trusted Users (TUs)">Trusted User Profiles</a></li>
+        <li><a href="{% url page-fellows %}" title="Retired Developers">Fellows Profiles</a></li>
     </ul>
-    <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="velocity network"><img src="/media/vnet_button.png" class="" title="" alt="velocity network - it's about time" /></a>
-    <a href="https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl" title="SevenL Networks - Dedicated Arch Linux servers"><img src="/media/sevenl_button.png" class="" title="A big Thank You to SevenL Networks for their generous contribution" alt="We would like to express our thanks to SevenL Networks for their generous contribution" /></a>
-    <a href="http://www.airvm.com/VirtualServers" title="AirVM.com - Your Green Technology Partner"><img src="/media/airvm_button.jpg" class="" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" /></a>
+
+</div><!-- #nav-sidebar -->
+
+<div id="home-paypal-button" class="widget">
+
+    <form id="paypal-form" name="_xclick" action="https://www.paypal.com/cgi-bin/webscr" method="post">
+        <p><input type="hidden" name="cmd" value="_xclick"/></p>
+        <p><input type="hidden" name="business" value="aaronmgriffin@gmail.com"/></p>
+        <p><input type="hidden" name="currency_code" value="USD"/></p>
+        <p><input type="hidden" name="tax" value="0"/></p>
+        <p><input type="hidden" name="lc" value="US"/></p>
+        <p><input type="hidden" name="bn" value="PP-DonationsBF"/></p>
+        <p><input type="hidden" name="item_name" value="Arch Linux Donation"/></p>
+        <p><input type="hidden" name="no_shipping" value="1"/></p>
+        <p><input type="hidden" name="cn" value="Suggestions/Comments"/></p>
+        <p><input type="hidden" name="no_note" value="1"/></p>
+        <p><input type="image" src="/media/donate.gif" name="submit"
+        title="Make a PayPal donation to the Arch Linux project"
+        alt="Make a PayPal donation to the Arch Linux project"
+        style="background:transparent;border:none;" /></p>
+    </form>
+
+</div>
+
+<div id="sponsors" class="widget">
+
+    <a href="http://www.velocitynetwork.net/?hosting_by=ArchLinux" title="Velocity Network"><img src="/media/vnet_button.png" alt="Velocity Network - It's about time" /></a>
+    <a href="https://www.sevenl.net/?utm_source=archlinux-org&amp;utm_medium=sponsored-banner&amp;utm_campaign=thanks-to-sevenl" title="SevenL Networks - Dedicated Arch Linux servers"><img src="/media/sevenl_button.png" title="A big Thank You to SevenL Networks for their generous contribution" alt="We would like to express our thanks to SevenL Networks for their generous contribution" /></a>
+    <a href="http://www.airvm.com/VirtualServers" title="AirVM.com - Your Green Technology Partner"><img src="/media/airvm_button.jpg" title="AirVM.com - Your Green Technology Partner" alt="AirVM.com - Your Green Technology Partner" /></a>
+
+</div>
 {% endblock %}
diff --git a/templates/public/userlist.html b/templates/public/userlist.html
index ce8cb145..658e64e6 100644
--- a/templates/public/userlist.html
+++ b/templates/public/userlist.html
@@ -1,13 +1,16 @@
 {% extends "base.html" %}
+{% block title %}Arch Linux - {{ user_type }}{% endblock %}
 
 {% block content %}
-<div class="box">
-    <h2 class="title">Arch Linux {{user_type}}</h2>
-	<p>{{description}}</p>
+<div id="dev-tu-profiles" class="box">
+
+    <h2>Arch Linux {{user_type}}</h2>
+
+    <p>{{description}}</p>
+
     {% with users as dev_list %}
     {% include 'public/developer_list.html' %}
     {% endwith %}
+
 </div>
-<br /><br />
 {% endblock %}
-
diff --git a/templates/registration/login.html b/templates/registration/login.html
index b3b264c3..2f626566 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -1,23 +1,22 @@
 {% extends "base.html" %}
+{% block title %}Arch Linux - Developer Login{% endblock %}
 
 {% block content %}
+<div id="dev-login" class="box">
 
-<div class="greybox">
-<h2 class="title">Developer Login</h2>
-{% if form.has_errors %}
-<p class="error">Your username and password didn't match. Please try again.</p>
-{% endif %}
-<br /><br />
+    <h2>Developer Login</h2>
 
-<form method="post" action=".">
-<input type="hidden" name="next" value="{% if next %}{{ next }}{% else %}/{% endif %}" />
-<table>
-	<tr><td><label for="id_username">Username:</label></td><td>{{ form.username }}</td></tr>
-	<tr><td><label for="id_password">Password:</label></td><td>{{ form.password }}</td></tr>
-	<tr><td colspan="2" align="right"><input type="submit" value="Login" /></td></tr>
-</table>
-</form>
-</div>
+    {% if form.has_errors %}
+    <p class="login-error">Your username and password didn't match. Please try again.</p>
+    {% endif %}
 
-{% endblock %}
+    <form id="dev-login-form" method="post" action=".">
+        <fieldset>
+            <legend>Enter login credentials</legend>
+            {{ form.as_p }}
+            <p><label></label> <input type="submit" value="Login" /></p>
+        </fieldset>
+    </form>
 
+</div>
+{% endblock %}
diff --git a/templates/registration/logout.html b/templates/registration/logout.html
index 2b829869..f8e07621 100644
--- a/templates/registration/logout.html
+++ b/templates/registration/logout.html
@@ -1,10 +1,9 @@
 {% extends "base.html" %}
+{% block title %}Arch Linux - Logout successful{% endblock %}
 
 {% block content %}
-
-<div class="greybox">
-You've been logged out.
+<div id="dev-logout" class="box">
+	<p>Logout successful.<p>
 </div>
-
 {% endblock %}
 
diff --git a/templates/todolists/addedtotodolist b/templates/todolists/addedtotodolist
index c325c470..24fded59 100644
--- a/templates/todolists/addedtotodolist
+++ b/templates/todolists/addedtotodolist
@@ -8,7 +8,7 @@ The following package:
     Repository:   {{ pkg.repo.name }}
     ({{ weburl }})
 
-has been added to this to-do list:
+has been added to this todo list:
 
 Creator: {{todolist.creator.get_full_name}}
 Name: {{todolist.name}}
diff --git a/templates/todolists/list.html b/templates/todolists/list.html
index ffbab2af..e4b426bb 100644
--- a/templates/todolists/list.html
+++ b/templates/todolists/list.html
@@ -2,34 +2,40 @@
 {% block title %}Arch Linux - Todo Lists{% endblock %}
 
 {% block content %}
-	<div class="greybox">
-        {% if perms.main.add_todolist %}
-            <div style="float:right">
-                <a href="/todo/add/">Add Todo List</a>
-            </div>
-        {% endif %}
-		<h2 class="title">Package ToDo lists</h2>
-		<table class="results" width="100%">
-            <thead>
-		    	<tr>
-                    <th>Name</th>
-                    <th>Creation Date</th>
-                    <th>Creator</th>
-                    <th>Description</th>
-                    <th>Status</th>
-                </tr>
-            </thead>
-            <tbody>
+<div id="dev-todo" class="box">
+
+    <h2>Package Todo Lists</h2>
+
+    {% if perms.main.add_todolist %}
+    <ul class="admin-actions">
+        <li><a href="/todo/add/" title="Add new todo list">Add Todo List</a></li>
+    </ul>
+    {% endif %}
+
+    <table id="dev-todo-lists" class="results">
+        <thead>
+            <tr>
+                <th>Name</th>
+                <th>Creation Date</th>
+                <th>Creator</th>
+                <th>Description</th>
+                <th>Status</th>
+            </tr>
+        </thead>
+        <tbody>
             {% for list in lists %}
-                <tr class="{% cycle pkgr2,pkgr1 %}">
-                    <td style="white-space:nowrap"><a href="/todo/{{ list.id }}/">{{ list.name }}</a></td>
-                    <td>{{ list.date_added }}</td>
-                    <td>{{ list.creator.get_full_name }}</td>
-                    <td>{{ list.description }}</td>
-                    <td>{% if list.complete %}<span style="color:blue">Complete</span>{% else %}<span style="color:red">Incomplete</span>{% endif %}</td>
-                </tr>
+            <tr class="{% cycle 'odd' 'even' %}">
+                <td><a href="/todo/{{ list.id }}/"
+                        title="View todo list: {{ list.name }}">{{ list.name }}</a></td>
+                <td>{{ list.date_added }}</td>
+                <td>{{ list.creator.get_full_name }}</td>
+                <td class="wrap">{{ list.description }}</td>
+                <td>{% if list.complete %}<span class="complete">Complete</span>
+                    {% else %}<span class="incomplete">Incomplete</span>{% endif %}</td>
+            </tr>
             {% endfor %}
-            </tbody>
-		</table>
-	</div>
+        </tbody>
+    </table>
+
+</div><!-- #dev-todo -->
 {% endblock %}
diff --git a/templates/todolists/todolist_confirm_delete.html b/templates/todolists/todolist_confirm_delete.html
index c0742d2b..c1e87834 100644
--- a/templates/todolists/todolist_confirm_delete.html
+++ b/templates/todolists/todolist_confirm_delete.html
@@ -1,25 +1,22 @@
 {% extends "base.html" %}
-{% block title %}Arch Linux - Delete Todo List{% endblock %}
+{% block title %}Arch Linux - Delete Todo List: {{object.name}}{% endblock %}
 
 {% block content %}
-	<div class="greybox">
-		<h2 class="title">Confirm Delete</h2>
-        <p>
-        Are you sure you want to delete this todo list?
-        </p>
-        <div class="box">
-            <h3>{{object.name}}</h3>
-            <p>
-            {{object.description}}
-            </p>
-        </div>
-        <br />
-        <form method="POST">
-            <input type="submit" value="Yes" />
-            <button type="reset" value="No"
-                onclick="document.location='/todos/{{object.id}}/';">No</button>
-        </form>
+<div id="dev-todo-delete" class="box">
 
-        
-	</div>
+    <h2>Delete Todo List: {{object.name}}</h2>
+
+    <p>You are about to delete the following todo list:</p>
+
+    <blockquote>
+        <p><strong>{{object.name}}:</strong> {{object.description}}</p>
+    </blockquote>
+
+    <p>Are you sure?</p>
+
+    <form id="delete-todo-form" method="post" action=".">
+        <p><input type="submit" value="Delete" /></p>
+    </form>
+
+</div>
 {% endblock %}
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index ae8a6563..6b6e9845 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -1,68 +1,74 @@
 {% extends "base.html" %}
-{% block title %}Arch Linux - Todo - {{ list.name }}{% endblock %}
+{% block title %}Arch Linux - Todo: {{ list.name }}{% endblock %}
 
 {% block content %}
-	<div class="greybox">
-            <div style="float:right">
-                {% if perms.main.delete_todolist %}
-                    <a href="/todo/delete/{{list.id}}/">Delete Todo List</a> |
-                {% endif %}
-                {% if perms.main.change_todolist %}
-                    <a href="/todo/edit/{{list.id}}/">Edit Todo List</a>
-                {% endif %}
-            </div>
-		<h2 class="title">Todo List: {{ list.name }}</h2>
-		<table id="todotable" class="results" width="100%">
-            <thead>
-                <tr>
-                    <th>Name</th>
-                    <th>Arch</th>
-                    <th>Repo</th>
-                    <th>Maintainer</th>
-                    <th>Status</th>
-                </tr>
-            </thead>
-            <tbody>
+<div id="dev-todo-details" class="box">
+
+    <h2>Todo List: {{ list.name }}</h2>
+
+    <ul class="admin-actions">
+        {% if perms.main.delete_todolist %}
+        <li><a href="/todo/delete/{{list.id}}/"
+            title="Delete this todo list">Delete Todo List</a></li>
+        {% endif %}
+        {% if perms.main.change_todolist %}
+        <li><a href="/todo/edit/{{list.id}}/"
+            title="Edit this todo list">Edit Todo List</a></li>
+        {% endif %}
+    </ul>
+
+    <p>{{list.description|linebreaks}}</p>
+
+    <table id="dev-todo-pkglist" class="results">
+        <thead>
+            <tr>
+                <th>Name</th>
+                <th>Arch</th>
+                <th>Repo</th>
+                <th>Maintainer</th>
+                <th>Status</th>
+            </tr>
+        </thead>
+        <tbody>
             {% for pkg in list.packages %}
-                <tr class="{% cycle pkgr2,pkgr1 %}">
-                    <td><a href="{{ pkg.pkg.get_absolute_url }}">{{ pkg.pkg.pkgname }}</a></td>
-                    <td>{{ pkg.pkg.arch.name }}</td>
-                    <td>{{ pkg.pkg.repo.name|capfirst }}</td>
-                    <td>{{ pkg.pkg.maintainers|join:', ' }}</td>
-                    <td>
+            <tr class="{% cycle 'odd' 'even' %}">
+                <td><a href="{{ pkg.pkg.get_absolute_url }}"
+                        title="View package details for {{ pkg.pkg.pkgname }}">{{ pkg.pkg.pkgname }}</a></td>
+                <td>{{ pkg.pkg.arch.name }}</td>
+                <td>{{ pkg.pkg.repo.name|capfirst }}</td>
+                <td>{{ pkg.pkg.maintainers|join:', ' }}</td>
+                <td>
                     {% if pkg.complete %}
-                        <a href="/todo/flag/{{ list.id }}/{{ pkg.id }}/"><span style="color:blue">Complete</span></a>
+                    <a href="/todo/flag/{{ list.id }}/{{ pkg.id }}/"
+                        class="complete" title="Toggle completion status">Complete</a>
                     {% else %}
-                        <a href="/todo/flag/{{ list.id }}/{{ pkg.id }}/"><span style="color:red">Incomplete</span></a>
+                    <a href="/todo/flag/{{ list.id }}/{{ pkg.id }}/"
+                        class="incomplete" title="Toggle completion status">Incomplete</a>
                     {% endif %}
-                    </td>
-                </tr>
+                </td>
+            </tr>
             {% endfor %}
-            </tbody>
-		</table>
-        <br />
-        <div class="box">
-            <h3>List Description</h3>
-            {{list.description|linebreaks}}
-        </div>
-	</div>
+        </tbody>
+    </table>
 
-    {% load cdn %}{% jquery %}
-    <script type="text/javascript">
-        $(function() {
-            $('a[href*=todo/flag]').click(function() {
-                var link = this;
+</div><!-- #dev-todo-details -->
 
-                $.getJSON(link.href, function(data) {
-                    if (data.complete) {
-                        $(link).text('Complete').css('color', 'blue');
-                    } else {
-                        $(link).text('Incomplete').css('color', 'red');
-                    }
-                });
+{% load cdn %}{% jquery %}
+<script type="text/javascript">
+    $(function() {
+        $('a[href*=todo/flag]').click(function() {
+            var link = this;
 
-                return false;
+            $.getJSON(link.href, function(data) {
+                if (data.complete) {
+                    $(link).text('Complete').addClass('complete').removeClass('incomplete');
+                } else {
+                    $(link).text('Incomplete').addClass('incomplete').removeClass('complete');
+                }
             });
+
+            return false;
         });
-    </script>
+    });
+</script>
 {% endblock %}