diff --git a/django-error.log b/django-error.log
new file mode 100644
index 00000000000..a7580e47f6d
--- /dev/null
+++ b/django-error.log
@@ -0,0 +1,227 @@
+Not Found: /
+Not Found: /favicon.ico
+Not Found: /favicon.ico
+Not Found: /
+Not Found: /
+Not Found: /
+Not Found: /desktop
+Not Found: /
+Not Found: /
+Not Found: /
+Not Found: /
+Not Found: /
+Not Found: /
+Not Found: /
+Not Found: /favicon.ico
+Not Found: /favicon.ico
+Not Found: /desktop
+Internal Server Error: /desktop
+Traceback (most recent call last):
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/core/handlers/base.py", line 139, in get_response
+    response = response.render()
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/response.py", line 105, in render
+    self.content = self.rendered_content
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/response.py", line 82, in rendered_content
+    content = template.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 140, in render
+    return self._render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 134, in _render
+    return self.nodelist.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 840, in render
+    bit = self.render_node(node, context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 854, in render_node
+    return node.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader_tags.py", line 101, in render
+    compiled_parent = self.get_parent(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader_tags.py", line 98, in get_parent
+    return get_template(parent)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader.py", line 138, in get_template
+    template, origin = find_template(template_name)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader.py", line 131, in find_template
+    raise TemplateDoesNotExist(name)
+TemplateDoesNotExist: ubuntu/desktop/base_desktop.html
+Internal Server Error: /
+Traceback (most recent call last):
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/core/handlers/base.py", line 139, in get_response
+    response = response.render()
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/response.py", line 105, in render
+    self.content = self.rendered_content
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/response.py", line 82, in rendered_content
+    content = template.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 140, in render
+    return self._render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 134, in _render
+    return self.nodelist.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 840, in render
+    bit = self.render_node(node, context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 854, in render_node
+    return node.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader_tags.py", line 101, in render
+    compiled_parent = self.get_parent(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader_tags.py", line 98, in get_parent
+    return get_template(parent)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader.py", line 138, in get_template
+    template, origin = find_template(template_name)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader.py", line 131, in find_template
+    raise TemplateDoesNotExist(name)
+TemplateDoesNotExist: ubuntu/base_index.html
+Internal Server Error: /
+Traceback (most recent call last):
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/core/handlers/base.py", line 139, in get_response
+    response = response.render()
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/response.py", line 105, in render
+    self.content = self.rendered_content
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/response.py", line 82, in rendered_content
+    content = template.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 140, in render
+    return self._render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 134, in _render
+    return self.nodelist.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 840, in render
+    bit = self.render_node(node, context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 854, in render_node
+    return node.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader_tags.py", line 101, in render
+    compiled_parent = self.get_parent(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader_tags.py", line 98, in get_parent
+    return get_template(parent)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader.py", line 138, in get_template
+    template, origin = find_template(template_name)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader.py", line 131, in find_template
+    raise TemplateDoesNotExist(name)
+TemplateDoesNotExist: ubuntu/base_index.html
+Internal Server Error: /
+Traceback (most recent call last):
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/core/handlers/base.py", line 139, in get_response
+    response = response.render()
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/response.py", line 105, in render
+    self.content = self.rendered_content
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/response.py", line 82, in rendered_content
+    content = template.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 140, in render
+    return self._render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 134, in _render
+    return self.nodelist.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 840, in render
+    bit = self.render_node(node, context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 854, in render_node
+    return node.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader_tags.py", line 101, in render
+    compiled_parent = self.get_parent(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader_tags.py", line 98, in get_parent
+    return get_template(parent)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader.py", line 138, in get_template
+    template, origin = find_template(template_name)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader.py", line 131, in find_template
+    raise TemplateDoesNotExist(name)
+TemplateDoesNotExist: ubuntu/base_index.html
+Internal Server Error: /
+Traceback (most recent call last):
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/core/handlers/base.py", line 139, in get_response
+    response = response.render()
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/response.py", line 105, in render
+    self.content = self.rendered_content
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/response.py", line 82, in rendered_content
+    content = template.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 140, in render
+    return self._render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 134, in _render
+    return self.nodelist.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 840, in render
+    bit = self.render_node(node, context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 854, in render_node
+    return node.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader_tags.py", line 101, in render
+    compiled_parent = self.get_parent(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader_tags.py", line 98, in get_parent
+    return get_template(parent)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader.py", line 138, in get_template
+    template, origin = find_template(template_name)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader.py", line 131, in find_template
+    raise TemplateDoesNotExist(name)
+TemplateDoesNotExist: ubuntu/base_index.html
+Internal Server Error: /
+Traceback (most recent call last):
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/core/handlers/base.py", line 139, in get_response
+    response = response.render()
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/response.py", line 105, in render
+    self.content = self.rendered_content
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/response.py", line 82, in rendered_content
+    content = template.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 140, in render
+    return self._render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 134, in _render
+    return self.nodelist.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 840, in render
+    bit = self.render_node(node, context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 854, in render_node
+    return node.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader_tags.py", line 101, in render
+    compiled_parent = self.get_parent(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader_tags.py", line 98, in get_parent
+    return get_template(parent)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader.py", line 138, in get_template
+    template, origin = find_template(template_name)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader.py", line 131, in find_template
+    raise TemplateDoesNotExist(name)
+TemplateDoesNotExist: ubuntu/base_index.html
+Internal Server Error: /
+Traceback (most recent call last):
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/core/handlers/base.py", line 139, in get_response
+    response = response.render()
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/response.py", line 105, in render
+    self.content = self.rendered_content
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/response.py", line 82, in rendered_content
+    content = template.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 140, in render
+    return self._render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 134, in _render
+    return self.nodelist.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 840, in render
+    bit = self.render_node(node, context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 854, in render_node
+    return node.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader_tags.py", line 123, in render
+    return compiled_parent._render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 134, in _render
+    return self.nodelist.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 840, in render
+    bit = self.render_node(node, context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 854, in render_node
+    return node.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader_tags.py", line 101, in render
+    compiled_parent = self.get_parent(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader_tags.py", line 98, in get_parent
+    return get_template(parent)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader.py", line 138, in get_template
+    template, origin = find_template(template_name)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader.py", line 131, in find_template
+    raise TemplateDoesNotExist(name)
+TemplateDoesNotExist: ubuntu/templates/base.html
+Internal Server Error: /desktop
+Traceback (most recent call last):
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/core/handlers/base.py", line 139, in get_response
+    response = response.render()
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/response.py", line 105, in render
+    self.content = self.rendered_content
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/response.py", line 82, in rendered_content
+    content = template.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 140, in render
+    return self._render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 134, in _render
+    return self.nodelist.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 840, in render
+    bit = self.render_node(node, context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/base.py", line 854, in render_node
+    return node.render(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader_tags.py", line 101, in render
+    compiled_parent = self.get_parent(context)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader_tags.py", line 98, in get_parent
+    return get_template(parent)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader.py", line 138, in get_template
+    template, origin = find_template(template_name)
+  File "/Users/grahambancroft/Sites/canonical/ubuntu-website/env/lib/python2.7/site-packages/django/template/loader.py", line 131, in find_template
+    raise TemplateDoesNotExist(name)
+TemplateDoesNotExist: ubuntu/desktop/base_desktop.html
+Not Found: /favicon.ico
+Not Found: /favicon.ico
diff --git a/etc/mirrors.rss b/etc/mirrors.rss
index 248fcd7497b..543567d6055 100644
--- a/etc/mirrors.rss
+++ b/etc/mirrors.rss
@@ -5,11 +5,11 @@
     <link>https://launchpad.net/ubuntu/+cdmirrors-rss</link>
     <description>Status of Ubuntu CD Mirrors</description>
 
-    <lastBuildDate>Fri, 12 Sep 2014 11:10:01 -0000</lastBuildDate>
+    <lastBuildDate>Mon, 27 Apr 2015 15:14:01 -0000</lastBuildDate>
 
     <item>
-      <title>Brno University of Technology</title>
-      <link>http://mirror.vutbr.cz/ubuntu/releases/</link>
+      <title>EasySpeedy</title>
+      <link>http://mirror.easyspeedy.com/ubuntu-iso/</link>
 
       <description>
         
@@ -19,17 +19,17 @@
 
       <mirror:location>
         <mirror:continent>Europe</mirror:continent>
-        <mirror:country>Czech Republic</mirror:country>
-        <mirror:countrycode>CZ</mirror:countrycode>
+        <mirror:country>Denmark</mirror:country>
+        <mirror:countrycode>DK</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 09:51:40 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 19:40:49 -0000</pubDate>
 
-      <guid>http://mirror.vutbr.cz/ubuntu/releases/</guid>
+      <guid>http://mirror.easyspeedy.com/ubuntu-iso/</guid>
     </item>
     <item>
-      <title>SkyLink Data Center</title>
-      <link>http://mirror.skylink-datacenter.de/ubuntu-releases/</link>
+      <title>Brno University of Technology</title>
+      <link>http://mirror.vutbr.cz/ubuntu/releases/</link>
 
       <description>
         
@@ -39,17 +39,17 @@
 
       <mirror:location>
         <mirror:continent>Europe</mirror:continent>
-        <mirror:country>Germany</mirror:country>
-        <mirror:countrycode>DE</mirror:countrycode>
+        <mirror:country>Czech Republic</mirror:country>
+        <mirror:countrycode>CZ</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 08:05:20 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 19:40:49 -0000</pubDate>
 
-      <guid>http://mirror.skylink-datacenter.de/ubuntu-releases/</guid>
+      <guid>http://mirror.vutbr.cz/ubuntu/releases/</guid>
     </item>
     <item>
-      <title>Nexicom Inc.</title>
-      <link>http://ubuntu-releases.mirror.nexicom.net/</link>
+      <title>SkyLink Data Center</title>
+      <link>http://mirror.skylink-datacenter.de/ubuntu-releases/</link>
 
       <description>
         
@@ -58,18 +58,18 @@
       <mirror:bandwidth>120</mirror:bandwidth>
 
       <mirror:location>
-        <mirror:continent>North America</mirror:continent>
-        <mirror:country>Canada</mirror:country>
-        <mirror:countrycode>CA</mirror:countrycode>
+        <mirror:continent>Europe</mirror:continent>
+        <mirror:country>Germany</mirror:country>
+        <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 08:05:21 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 19:40:49 -0000</pubDate>
 
-      <guid>http://ubuntu-releases.mirror.nexicom.net/</guid>
+      <guid>http://mirror.skylink-datacenter.de/ubuntu-releases/</guid>
     </item>
     <item>
-      <title>Romtelecom</title>
-      <link>http://ubuntu.mirrors.romtelecom.ro/ubuntureleases/</link>
+      <title>Telekom Romania</title>
+      <link>http://ubuntu.mirrors.telekom.ro/ubuntureleases/</link>
 
       <description>
         Hosting Data Center
@@ -83,9 +83,9 @@
         <mirror:countrycode>RO</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 09:24:11 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 19:40:49 -0000</pubDate>
 
-      <guid>http://ubuntu.mirrors.romtelecom.ro/ubuntureleases/</guid>
+      <guid>http://ubuntu.mirrors.telekom.ro/ubuntureleases/</guid>
     </item>
     <item>
       <title>BIT B.V.</title>
@@ -103,7 +103,7 @@
         <mirror:countrycode>NL</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 09:24:11 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 19:40:49 -0000</pubDate>
 
       <guid>http://nl.releases.ubuntu.com/releases/</guid>
     </item>
@@ -123,7 +123,7 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 09:24:11 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 19:40:49 -0000</pubDate>
 
       <guid>http://ftp-stud.hs-esslingen.de/pub/Mirrors/releases.ubuntu.com/</guid>
     </item>
@@ -143,7 +143,7 @@
         <mirror:countrycode>BE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 11:45:49 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 19:40:49 -0000</pubDate>
 
       <guid>http://ftp.belnet.be/ubuntu.com/ubuntu/releases/</guid>
     </item>
@@ -163,7 +163,7 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 11:45:49 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 19:40:49 -0000</pubDate>
 
       <guid>http://ftp.halifax.rwth-aachen.de/ubuntu-releases/</guid>
     </item>
@@ -183,13 +183,13 @@
         <mirror:countrycode>IE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 11:45:49 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 19:40:49 -0000</pubDate>
 
       <guid>http://ftp.heanet.ie/pub/ubuntu-releases/</guid>
     </item>
     <item>
       <title>RIKEN</title>
-      <link>http://ftp.riken.jp/Linux/ubuntu-iso/CDs/</link>
+      <link>http://ftp.riken.jp/Linux/ubuntu-releases/</link>
 
       <description>
         
@@ -203,9 +203,9 @@
         <mirror:countrycode>JP</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 13:43:24 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 19:40:49 -0000</pubDate>
 
-      <guid>http://ftp.riken.jp/Linux/ubuntu-iso/CDs/</guid>
+      <guid>http://ftp.riken.jp/Linux/ubuntu-releases/</guid>
     </item>
     <item>
       <title>University of Twente, The Netherlands</title>
@@ -223,7 +223,7 @@
         <mirror:countrycode>NL</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 13:43:24 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 19:40:50 -0000</pubDate>
 
       <guid>http://ftp.snt.utwente.nl/pub/os/linux/ubuntu-releases/</guid>
     </item>
@@ -243,50 +243,10 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 15:30:37 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 19:40:50 -0000</pubDate>
 
       <guid>http://ftp.stw-bonn.de/ubuntu-cd/</guid>
     </item>
-    <item>
-      <title>Argonne National Laboratory</title>
-      <link>http://mirror.anl.gov/pub/ubuntu-iso/CDs/</link>
-
-      <description>
-        The Argonne Public Software Mirror
-      </description>
-
-      <mirror:bandwidth>110</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>North America</mirror:continent>
-        <mirror:country>United States</mirror:country>
-        <mirror:countrycode>US</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Thu, 11 Sep 2014 15:30:37 -0000</pubDate>
-
-      <guid>http://mirror.anl.gov/pub/ubuntu-iso/CDs/</guid>
-    </item>
-    <item>
-      <title>Arbitrary.NL</title>
-      <link>http://mirror.arbitrary.nl/ubuntu-releases/</link>
-
-      <description>
-        Update all 8 hours.
-      </description>
-
-      <mirror:bandwidth>110</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Europe</mirror:continent>
-        <mirror:country>Netherlands</mirror:country>
-        <mirror:countrycode>NL</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Thu, 11 Sep 2014 15:30:38 -0000</pubDate>
-
-      <guid>http://mirror.arbitrary.nl/ubuntu-releases/</guid>
-    </item>
     <item>
       <title>Trabia-Network</title>
       <link>http://mirror.as43289.net/ubuntu-releases/</link>
@@ -303,7 +263,7 @@
         <mirror:countrycode>MD</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 17:42:34 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 19:40:50 -0000</pubDate>
 
       <guid>http://mirror.as43289.net/ubuntu-releases/</guid>
     </item>
@@ -323,7 +283,7 @@
         <mirror:countrycode>DK</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 05:27:54 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 21:16:40 -0000</pubDate>
 
       <guid>http://mirror.one.com/ubuntu-cd/</guid>
     </item>
@@ -343,7 +303,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 19:54:34 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 21:16:40 -0000</pubDate>
 
       <guid>http://mirror.pnl.gov/releases/</guid>
     </item>
@@ -363,10 +323,30 @@
         <mirror:countrycode>CH</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 19:54:34 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 21:16:41 -0000</pubDate>
 
       <guid>http://mirror.switch.ch/ftp/mirror/ubuntu-cdimage/</guid>
     </item>
+    <item>
+      <title>Vorboss Ltd</title>
+      <link>http://mirror.vorboss.net/ubuntu-releases/</link>
+
+      <description>
+        
+      </description>
+
+      <mirror:bandwidth>110</mirror:bandwidth>
+
+      <mirror:location>
+        <mirror:continent>Europe</mirror:continent>
+        <mirror:country>United Kingdom</mirror:country>
+        <mirror:countrycode>GB</mirror:countrycode>
+      </mirror:location>
+
+      <pubDate>Sat, 25 Apr 2015 21:16:41 -0000</pubDate>
+
+      <guid>http://mirror.vorboss.net/ubuntu-releases/</guid>
+    </item>
     <item>
       <title>Esslingen University of Applied Sciences</title>
       <link>http://mirror2.hs-esslingen.de/releases.ubuntu.com/</link>
@@ -383,7 +363,7 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 21:45:09 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 21:16:41 -0000</pubDate>
 
       <guid>http://mirror2.hs-esslingen.de/releases.ubuntu.com/</guid>
     </item>
@@ -403,7 +383,7 @@
         <mirror:countrycode>CH</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 21:45:09 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 21:16:41 -0000</pubDate>
 
       <guid>http://releases.ubuntu.csg.uzh.ch/ubuntu/</guid>
     </item>
@@ -423,7 +403,7 @@
         <mirror:countrycode>CZ</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 21:45:10 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 21:16:41 -0000</pubDate>
 
       <guid>http://cz.releases.ubuntu.com/releases/</guid>
     </item>
@@ -443,7 +423,7 @@
         <mirror:countrycode>SE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 23:55:11 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 21:16:41 -0000</pubDate>
 
       <guid>http://se.releases.ubuntu.com/</guid>
     </item>
@@ -463,7 +443,7 @@
         <mirror:countrycode>TW</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 23:55:11 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 21:16:41 -0000</pubDate>
 
       <guid>http://tw.releases.ubuntu.com/</guid>
     </item>
@@ -483,30 +463,10 @@
         <mirror:countrycode>BR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 01:40:38 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 21:16:41 -0000</pubDate>
 
       <guid>http://ubuntu.c3sl.ufpr.br/releases/</guid>
     </item>
-    <item>
-      <title>LES.NET</title>
-      <link>http://ubuntu.les.net/</link>
-
-      <description>
-        LES.NET
-      </description>
-
-      <mirror:bandwidth>110</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>North America</mirror:continent>
-        <mirror:country>Canada</mirror:country>
-        <mirror:countrycode>CA</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Fri, 12 Sep 2014 01:40:38 -0000</pubDate>
-
-      <guid>http://ubuntu.les.net/</guid>
-    </item>
     <item>
       <title>Technische Universität Dresden</title>
       <link>http://ubuntu.mirror.tudos.de/ubuntu-releases/</link>
@@ -523,7 +483,7 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 03:49:21 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 21:16:41 -0000</pubDate>
 
       <guid>http://ubuntu.mirror.tudos.de/ubuntu-releases/</guid>
     </item>
@@ -543,7 +503,7 @@
         <mirror:countrycode>UA</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 03:49:21 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 21:16:42 -0000</pubDate>
 
       <guid>http://ubuntu.volia.net/ubuntu-releases/</guid>
     </item>
@@ -563,30 +523,10 @@
         <mirror:countrycode>GB</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 03:49:21 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 21:16:42 -0000</pubDate>
 
       <guid>http://www.mirrorservice.org/sites/releases.ubuntu.com/</guid>
     </item>
-    <item>
-      <title>Fondation d'entreprise Free</title>
-      <link>http://ubuntu-releases.mirrors.free.org/</link>
-
-      <description>
-        
-      </description>
-
-      <mirror:bandwidth>100</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Europe</mirror:continent>
-        <mirror:country>France</mirror:country>
-        <mirror:countrycode>FR</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Fri, 12 Sep 2014 07:55:18 -0000</pubDate>
-
-      <guid>http://ubuntu-releases.mirrors.free.org/</guid>
-    </item>
     <item>
       <title>JAIST</title>
       <link>http://ftp.jaist.ac.jp/pub/Linux/ubuntu-releases/</link>
@@ -603,7 +543,7 @@
         <mirror:countrycode>JP</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 07:55:18 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 21:16:42 -0000</pubDate>
 
       <guid>http://ftp.jaist.ac.jp/pub/Linux/ubuntu-releases/</guid>
     </item>
@@ -623,7 +563,7 @@
         <mirror:countrycode>TW</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 07:55:19 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 21:16:42 -0000</pubDate>
 
       <guid>http://ftp.ubuntu-tw.net/mirror/ubuntu-releases/</guid>
     </item>
@@ -643,7 +583,7 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 09:37:49 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 23:05:24 -0000</pubDate>
 
       <guid>http://ftp.fau.de/ubuntu-releases/</guid>
     </item>
@@ -663,7 +603,7 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 05:27:54 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 23:05:24 -0000</pubDate>
 
       <guid>http://mirror.23media.de/ubuntu-releases/</guid>
     </item>
@@ -683,7 +623,7 @@
         <mirror:countrycode>NL</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 09:37:49 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 23:05:24 -0000</pubDate>
 
       <guid>http://mirror.nl.leaseweb.net/ubuntu-releases/</guid>
     </item>
@@ -703,7 +643,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 09:37:49 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 23:05:24 -0000</pubDate>
 
       <guid>http://mirror.us.leaseweb.net/ubuntu-releases/</guid>
     </item>
@@ -723,30 +663,10 @@
         <mirror:countrycode>CA</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 15:57:05 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 23:05:24 -0000</pubDate>
 
       <guid>http://ubuntu-cd.mirror.iweb.ca/</guid>
     </item>
-    <item>
-      <title>RCS&amp;RDS</title>
-      <link>http://ubuntu.mirrors.linux.ro/releases/</link>
-
-      <description>
-        Linux.RO
-      </description>
-
-      <mirror:bandwidth>100</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Europe</mirror:continent>
-        <mirror:country>Romania</mirror:country>
-        <mirror:countrycode>RO</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Fri, 12 Sep 2014 09:37:49 -0000</pubDate>
-
-      <guid>http://ubuntu.mirrors.linux.ro/releases/</guid>
-    </item>
     <item>
       <title>IPACCT</title>
       <link>http://ubuntu.ipacct.com/releases/</link>
@@ -763,7 +683,7 @@
         <mirror:countrycode>BG</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Tue, 09 Sep 2014 23:31:03 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 23:05:25 -0000</pubDate>
 
       <guid>http://ubuntu.ipacct.com/releases/</guid>
     </item>
@@ -783,10 +703,50 @@
         <mirror:countrycode>BY</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Tue, 09 Sep 2014 23:31:03 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 23:05:25 -0000</pubDate>
 
       <guid>http://by.releases.ubuntu.com/</guid>
     </item>
+    <item>
+      <title>Energotel, a.s.</title>
+      <link>http://ftp.energotel.sk/pub/linux/ubuntu-releases/</link>
+
+      <description>
+        ISP Provider
+      </description>
+
+      <mirror:bandwidth>90</mirror:bandwidth>
+
+      <mirror:location>
+        <mirror:continent>Europe</mirror:continent>
+        <mirror:country>Slovakia</mirror:country>
+        <mirror:countrycode>SK</mirror:countrycode>
+      </mirror:location>
+
+      <pubDate>Sat, 25 Apr 2015 23:05:25 -0000</pubDate>
+
+      <guid>http://ftp.energotel.sk/pub/linux/ubuntu-releases/</guid>
+    </item>
+    <item>
+      <title>Free</title>
+      <link>http://ubuntu.mirrors.proxad.net/</link>
+
+      <description>
+        
+      </description>
+
+      <mirror:bandwidth>90</mirror:bandwidth>
+
+      <mirror:location>
+        <mirror:continent>Europe</mirror:continent>
+        <mirror:country>France</mirror:country>
+        <mirror:countrycode>FR</mirror:countrycode>
+      </mirror:location>
+
+      <pubDate>Sat, 25 Apr 2015 23:05:25 -0000</pubDate>
+
+      <guid>http://ubuntu.mirrors.proxad.net/</guid>
+    </item>
     <item>
       <title>Sunet FTP archive</title>
       <link>http://ftp.sunet.se/pub/os/Linux/distributions/ubuntu/ubuntu-cd/</link>
@@ -803,7 +763,7 @@
         <mirror:countrycode>SE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 01:54:08 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 23:05:25 -0000</pubDate>
 
       <guid>http://ftp.sunet.se/pub/os/Linux/distributions/ubuntu/ubuntu-cd/</guid>
     </item>
@@ -823,7 +783,7 @@
         <mirror:countrycode>ES</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 03:46:23 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 23:05:25 -0000</pubDate>
 
       <guid>http://ftp.udc.es/ubuntu-releases/</guid>
     </item>
@@ -843,7 +803,7 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 03:46:23 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 23:05:25 -0000</pubDate>
 
       <guid>http://ftp.uni-kl.de/pub/linux/ubuntu.iso/</guid>
     </item>
@@ -863,7 +823,7 @@
         <mirror:countrycode>JP</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 15:30:38 -0000</pubDate>
+      <pubDate>Sat, 25 Apr 2015 23:05:25 -0000</pubDate>
 
       <guid>http://ftp.yz.yamagata-u.ac.jp/pub/linux/ubuntu/releases/</guid>
     </item>
@@ -883,7 +843,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 03:46:23 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 01:19:41 -0000</pubDate>
 
       <guid>http://isos.ubuntu.mirror.constant.com/</guid>
     </item>
@@ -903,7 +863,7 @@
         <mirror:countrycode>NL</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 05:27:55 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 01:19:41 -0000</pubDate>
 
       <guid>http://mirror.amsiohosting.net/releases.ubuntu.com/</guid>
     </item>
@@ -923,10 +883,30 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 05:30:07 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 01:19:41 -0000</pubDate>
 
       <guid>http://mirror.de.leaseweb.net/ubuntu-releases/</guid>
     </item>
+    <item>
+      <title>UPC Česká republika, a.s.</title>
+      <link>http://releases.ubuntu.mirror.dkm.cz/releases/</link>
+
+      <description>
+        
+      </description>
+
+      <mirror:bandwidth>90</mirror:bandwidth>
+
+      <mirror:location>
+        <mirror:continent>Europe</mirror:continent>
+        <mirror:country>Czech Republic</mirror:country>
+        <mirror:countrycode>CZ</mirror:countrycode>
+      </mirror:location>
+
+      <pubDate>Sun, 26 Apr 2015 01:19:41 -0000</pubDate>
+
+      <guid>http://releases.ubuntu.mirror.dkm.cz/releases/</guid>
+    </item>
     <item>
       <title>Exetel</title>
       <link>http://mirror.exetel.com.au/pub/ubuntu/ubuntu-releases/</link>
@@ -943,7 +923,7 @@
         <mirror:countrycode>AU</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 05:30:07 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 01:19:41 -0000</pubDate>
 
       <guid>http://mirror.exetel.com.au/pub/ubuntu/ubuntu-releases/</guid>
     </item>
@@ -963,13 +943,13 @@
         <mirror:countrycode>BR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 05:30:08 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 01:19:41 -0000</pubDate>
 
       <guid>http://mirror.globo.com/ubuntu/releases/</guid>
     </item>
     <item>
-      <title>InternetONE SRL</title>
-      <link>http://mirror.internetone.it/ubuntu-cd/</link>
+      <title>Limestone Networks</title>
+      <link>http://mirror.lstn.net/ubuntu-releases/</link>
 
       <description>
         
@@ -978,34 +958,34 @@
       <mirror:bandwidth>90</mirror:bandwidth>
 
       <mirror:location>
-        <mirror:continent>Europe</mirror:continent>
-        <mirror:country>Italy</mirror:country>
-        <mirror:countrycode>IT</mirror:countrycode>
+        <mirror:continent>North America</mirror:continent>
+        <mirror:country>United States</mirror:country>
+        <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 05:27:55 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 01:19:42 -0000</pubDate>
 
-      <guid>http://mirror.internetone.it/ubuntu-cd/</guid>
+      <guid>http://mirror.lstn.net/ubuntu-releases/</guid>
     </item>
     <item>
-      <title>Limestone Networks</title>
-      <link>http://mirror.lstn.net/ubuntu-releases/</link>
+      <title>PoP-SC/RNP</title>
+      <link>http://ubuntu.mirror.pop-sc.rnp.br/mirror/ubuntu-releases/</link>
 
       <description>
-        
+        Ponto de Presença da RNP em Santa Catarina - Florianópolis/SC - Brasil
       </description>
 
       <mirror:bandwidth>90</mirror:bandwidth>
 
       <mirror:location>
-        <mirror:continent>North America</mirror:continent>
-        <mirror:country>United States</mirror:country>
-        <mirror:countrycode>US</mirror:countrycode>
+        <mirror:continent>South America</mirror:continent>
+        <mirror:country>Brazil</mirror:country>
+        <mirror:countrycode>BR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 07:50:34 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 01:19:42 -0000</pubDate>
 
-      <guid>http://mirror.lstn.net/ubuntu-releases/</guid>
+      <guid>http://ubuntu.mirror.pop-sc.rnp.br/mirror/ubuntu-releases/</guid>
     </item>
     <item>
       <title>PlusServer - serverloft - SERVER4YOU</title>
@@ -1023,7 +1003,7 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 09:51:41 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 01:19:42 -0000</pubDate>
 
       <guid>http://mirror.serverloft.eu/ubuntu/releases/</guid>
     </item>
@@ -1043,10 +1023,30 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 11:43:05 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 01:19:42 -0000</pubDate>
 
       <guid>http://mirror.solarvps.com/ubuntu/</guid>
     </item>
+    <item>
+      <title>Universidad de Chile - Direccion de Tecnologias de la Informacion</title>
+      <link>http://mirror.uchile.cl/ubuntu-releases/</link>
+
+      <description>
+        STI
+      </description>
+
+      <mirror:bandwidth>90</mirror:bandwidth>
+
+      <mirror:location>
+        <mirror:continent>South America</mirror:continent>
+        <mirror:country>Chile</mirror:country>
+        <mirror:countrycode>CL</mirror:countrycode>
+      </mirror:location>
+
+      <pubDate>Sun, 26 Apr 2015 01:19:42 -0000</pubDate>
+
+      <guid>http://mirror.uchile.cl/ubuntu-releases/</guid>
+    </item>
     <item>
       <title>AdvancedHosters</title>
       <link>http://mirrors.advancedhosters.com/ubuntu-releases/</link>
@@ -1063,7 +1063,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 11:43:05 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 01:19:42 -0000</pubDate>
 
       <guid>http://mirrors.advancedhosters.com/ubuntu-releases/</guid>
     </item>
@@ -1083,7 +1083,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 11:43:06 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 03:26:54 -0000</pubDate>
 
       <guid>http://mirrors.us.kernel.org/ubuntu-releases/</guid>
     </item>
@@ -1103,7 +1103,7 @@
         <mirror:countrycode>NL</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 14:03:59 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 03:26:54 -0000</pubDate>
 
       <guid>http://nl3.releases.ubuntu.com/releases/</guid>
     </item>
@@ -1123,7 +1123,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 14:03:59 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 03:26:54 -0000</pubDate>
 
       <guid>http://ubuntu.cs.utah.edu/releases/</guid>
     </item>
@@ -1143,7 +1143,7 @@
         <mirror:countrycode>UA</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 14:04:00 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 03:26:54 -0000</pubDate>
 
       <guid>http://ubuntu-releases.ip-connect.vn.ua/</guid>
     </item>
@@ -1163,29 +1163,29 @@
         <mirror:countrycode>ES</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 15:57:06 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 03:26:54 -0000</pubDate>
 
       <guid>http://ubuntu.cica.es/releases/</guid>
     </item>
     <item>
-      <title>Bouygues Telecom</title>
-      <link>http://ubuntu.lafibre.info/</link>
+      <title>Cu.be Solutions</title>
+      <link>http://ubuntu.cu.be/</link>
 
       <description>
-        http://www.bouyguestelecom.fr/
+        New mirror for Belgium
       </description>
 
       <mirror:bandwidth>90</mirror:bandwidth>
 
       <mirror:location>
         <mirror:continent>Europe</mirror:continent>
-        <mirror:country>France</mirror:country>
-        <mirror:countrycode>FR</mirror:countrycode>
+        <mirror:country>Belgium</mirror:country>
+        <mirror:countrycode>BE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 15:57:06 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 03:26:54 -0000</pubDate>
 
-      <guid>http://ubuntu.lafibre.info/</guid>
+      <guid>http://ubuntu.cu.be/</guid>
     </item>
     <item>
       <title>OVH</title>
@@ -1203,7 +1203,7 @@
         <mirror:countrycode>FR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 15:57:06 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 03:26:54 -0000</pubDate>
 
       <guid>http://ubuntu.mirrors.ovh.net/ubuntu-releases/</guid>
     </item>
@@ -1223,7 +1223,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 17:36:21 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 03:26:54 -0000</pubDate>
 
       <guid>http://ubuntu.osuosl.org/releases/</guid>
     </item>
@@ -1243,7 +1243,7 @@
         <mirror:countrycode>CZ</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 17:36:21 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 03:26:54 -0000</pubDate>
 
       <guid>http://ucho.ignum.cz/ubuntu-releases/</guid>
     </item>
@@ -1263,7 +1263,7 @@
         <mirror:countrycode>NL</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 17:36:22 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 03:26:54 -0000</pubDate>
 
       <guid>http://ftp.snt.utwente.nl/pub/linux/ubuntu-releases/</guid>
     </item>
@@ -1283,7 +1283,7 @@
         <mirror:countrycode>NO</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 19:37:49 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 03:26:55 -0000</pubDate>
 
       <guid>http://releases.mirror.blix.com/ubuntu/</guid>
     </item>
@@ -1303,30 +1303,10 @@
         <mirror:countrycode>ID</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 19:37:49 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 05:08:28 -0000</pubDate>
 
       <guid>http://buaya.klas.or.id/iso/ubuntu/releases/</guid>
     </item>
-    <item>
-      <title>CeSIUM - Universidade do Minho</title>
-      <link>http://cesium.di.uminho.pt/pub/ubuntu-releases/</link>
-
-      <description>
-        Universidade do Minho
-      </description>
-
-      <mirror:bandwidth>80</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Europe</mirror:continent>
-        <mirror:country>Portugal</mirror:country>
-        <mirror:countrycode>PT</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Wed, 10 Sep 2014 21:34:50 -0000</pubDate>
-
-      <guid>http://cesium.di.uminho.pt/pub/ubuntu-releases/</guid>
-    </item>
     <item>
       <title>TECNOERA</title>
       <link>http://cl.releases.ubuntu.com/</link>
@@ -1343,30 +1323,10 @@
         <mirror:countrycode>CL</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 21:34:50 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 05:08:28 -0000</pubDate>
 
       <guid>http://cl.releases.ubuntu.com/</guid>
     </item>
-    <item>
-      <title>Edugraf - INE - CTC - UFSC</title>
-      <link>http://espelhos.edugraf.ufsc.br/ubuntu-releases/</link>
-
-      <description>
-        Laboratório de Software Educacional - EDUGRAF - Universidade Federal de Santa Catarina
-      </description>
-
-      <mirror:bandwidth>80</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>South America</mirror:continent>
-        <mirror:country>Brazil</mirror:country>
-        <mirror:countrycode>BR</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Wed, 10 Sep 2014 23:39:34 -0000</pubDate>
-
-      <guid>http://espelhos.edugraf.ufsc.br/ubuntu-releases/</guid>
-    </item>
     <item>
       <title>Elion Enterprises Ltd</title>
       <link>http://ftp.estpak.ee/pub/ubuntu-releases/</link>
@@ -1383,7 +1343,7 @@
         <mirror:countrycode>EE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 23:39:34 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 05:08:29 -0000</pubDate>
 
       <guid>http://ftp.estpak.ee/pub/ubuntu-releases/</guid>
     </item>
@@ -1403,89 +1363,109 @@
         <mirror:countrycode>SK</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 23:39:34 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 05:08:29 -0000</pubDate>
 
       <guid>http://ftp.antik.sk/ubuntu-releases/</guid>
     </item>
     <item>
-      <title>University of Crete</title>
-      <link>http://ftp.cc.uoc.gr/mirrors/linux/ubuntu/releases/</link>
+      <title>UPC Romania</title>
+      <link>http://ftp.astral.ro/mirrors/ubuntu.com/releases/</link>
 
       <description>
-        Computer Center
+        
       </description>
 
       <mirror:bandwidth>80</mirror:bandwidth>
 
       <mirror:location>
         <mirror:continent>Europe</mirror:continent>
-        <mirror:country>Greece</mirror:country>
-        <mirror:countrycode>GR</mirror:countrycode>
+        <mirror:country>Romania</mirror:country>
+        <mirror:countrycode>RO</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 01:52:43 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 05:08:29 -0000</pubDate>
 
-      <guid>http://ftp.cc.uoc.gr/mirrors/linux/ubuntu/releases/</guid>
+      <guid>http://ftp.astral.ro/mirrors/ubuntu.com/releases/</guid>
     </item>
     <item>
-      <title>Citylink</title>
-      <link>http://ftp.citylink.co.nz/ubuntu-releases/</link>
+      <title>ftp.availo.se</title>
+      <link>http://ftp.availo.se/ubuntu-cd/</link>
 
       <description>
-        This mirror is nz.releases.ubuntu.com.
+        
       </description>
 
       <mirror:bandwidth>80</mirror:bandwidth>
 
       <mirror:location>
-        <mirror:continent>Oceania</mirror:continent>
-        <mirror:country>New Zealand</mirror:country>
-        <mirror:countrycode>NZ</mirror:countrycode>
-      </mirror:location>
+        <mirror:continent>Europe</mirror:continent>
+        <mirror:country>Sweden</mirror:country>
+        <mirror:countrycode>SE</mirror:countrycode>
+      </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 03:32:43 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 05:08:29 -0000</pubDate>
 
-      <guid>http://ftp.citylink.co.nz/ubuntu-releases/</guid>
+      <guid>http://ftp.availo.se/ubuntu-cd/</guid>
     </item>
     <item>
-      <title>CRIHAN</title>
-      <link>http://ftp.crihan.fr/releases/</link>
+      <title>University of Crete</title>
+      <link>http://ftp.cc.uoc.gr/mirrors/linux/ubuntu/releases/</link>
 
       <description>
-        
+        Computer Center
       </description>
 
       <mirror:bandwidth>80</mirror:bandwidth>
 
       <mirror:location>
         <mirror:continent>Europe</mirror:continent>
-        <mirror:country>France</mirror:country>
-        <mirror:countrycode>FR</mirror:countrycode>
+        <mirror:country>Greece</mirror:country>
+        <mirror:countrycode>GR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 03:32:43 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 05:08:29 -0000</pubDate>
 
-      <guid>http://ftp.crihan.fr/releases/</guid>
+      <guid>http://ftp.cc.uoc.gr/mirrors/linux/ubuntu/releases/</guid>
     </item>
     <item>
-      <title>ftp.cse.yzu.edu.tw</title>
-      <link>http://ftp.cse.yzu.edu.tw/pub/Linux/Ubuntu/ubuntu-cd/</link>
+      <title>Citylink</title>
+      <link>http://ftp.citylink.co.nz/ubuntu-releases/</link>
 
       <description>
-        Yuan Ze University ,Department of Computer Science &amp; Engineering
+        This mirror is nz.releases.ubuntu.com.
       </description>
 
       <mirror:bandwidth>80</mirror:bandwidth>
 
       <mirror:location>
-        <mirror:continent>Asia</mirror:continent>
-        <mirror:country>Taiwan</mirror:country>
-        <mirror:countrycode>TW</mirror:countrycode>
+        <mirror:continent>Oceania</mirror:continent>
+        <mirror:country>New Zealand</mirror:country>
+        <mirror:countrycode>NZ</mirror:countrycode>
+      </mirror:location>
+
+      <pubDate>Sun, 26 Apr 2015 05:08:29 -0000</pubDate>
+
+      <guid>http://ftp.citylink.co.nz/ubuntu-releases/</guid>
+    </item>
+    <item>
+      <title>CRIHAN</title>
+      <link>http://ftp.crihan.fr/releases/</link>
+
+      <description>
+        
+      </description>
+
+      <mirror:bandwidth>80</mirror:bandwidth>
+
+      <mirror:location>
+        <mirror:continent>Europe</mirror:continent>
+        <mirror:country>France</mirror:country>
+        <mirror:countrycode>FR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 03:32:43 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 05:08:29 -0000</pubDate>
 
-      <guid>http://ftp.cse.yzu.edu.tw/pub/Linux/Ubuntu/ubuntu-cd/</guid>
+      <guid>http://ftp.crihan.fr/releases/</guid>
     </item>
     <item>
       <title>The Chinese University of Hong Kong</title>
@@ -1503,7 +1483,7 @@
         <mirror:countrycode>HK</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 03:32:43 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 07:20:36 -0000</pubDate>
 
       <guid>http://ftp.cuhk.edu.hk/pub/Linux/ubuntu-releases/</guid>
     </item>
@@ -1523,7 +1503,7 @@
         <mirror:countrycode>KR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 06:14:48 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 07:20:36 -0000</pubDate>
 
       <guid>http://ftp.daum.net/ubuntu-releases/</guid>
     </item>
@@ -1543,7 +1523,7 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 08:05:21 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 07:20:37 -0000</pubDate>
 
       <guid>ftp://ftp.fu-berlin.de/linux/ubuntu/releases/</guid>
     </item>
@@ -1563,7 +1543,7 @@
         <mirror:countrycode>FI</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 08:05:21 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 07:20:37 -0000</pubDate>
 
       <guid>http://www.nic.funet.fi/pub/mirrors/releases.ubuntu.com/</guid>
     </item>
@@ -1583,7 +1563,7 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 08:05:21 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 07:20:37 -0000</pubDate>
 
       <guid>http://ftp.hawo.stw.uni-erlangen.de/ubuntu-releases/</guid>
     </item>
@@ -1603,7 +1583,7 @@
         <mirror:countrycode>PL</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 09:24:11 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 07:20:37 -0000</pubDate>
 
       <guid>http://ftp.icm.edu.pl/pub/Linux/ubuntu-releases/</guid>
     </item>
@@ -1623,7 +1603,7 @@
         <mirror:countrycode>AU</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 09:24:11 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 07:20:37 -0000</pubDate>
 
       <guid>http://ftp.iinet.net.au/pub/ubuntu-releases/</guid>
     </item>
@@ -1643,7 +1623,7 @@
         <mirror:countrycode>SE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 13:43:24 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 07:20:37 -0000</pubDate>
 
       <guid>http://ftp.lysator.liu.se/ubuntu-releases/</guid>
     </item>
@@ -1663,7 +1643,7 @@
         <mirror:countrycode>RU</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 13:43:24 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 07:20:37 -0000</pubDate>
 
       <guid>http://ftp.mtu.ru/pub/ubuntu/releases/</guid>
     </item>
@@ -1683,7 +1663,7 @@
         <mirror:countrycode>KR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 13:43:24 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 09:14:27 -0000</pubDate>
 
       <guid>http://ftp.neowiz.com/ubuntu-releases/</guid>
     </item>
@@ -1703,7 +1683,7 @@
         <mirror:countrycode>TW</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 15:30:38 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 09:14:27 -0000</pubDate>
 
       <guid>http://ftp.nsysu.edu.tw/Ubuntu/ubuntu-cd/</guid>
     </item>
@@ -1723,7 +1703,7 @@
         <mirror:countrycode>FR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 17:42:35 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 09:14:27 -0000</pubDate>
 
       <guid>http://ftp.oleane.net/ubuntu-cd/</guid>
     </item>
@@ -1743,7 +1723,7 @@
         <mirror:countrycode>GR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 17:42:35 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 09:14:27 -0000</pubDate>
 
       <guid>ftp://ftp.otenet.gr/pub/linux/ubuntu-releases/</guid>
     </item>
@@ -1763,7 +1743,7 @@
         <mirror:countrycode>ES</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 19:54:35 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 09:14:28 -0000</pubDate>
 
       <guid>ftp://ftp.rediris.es/sites/releases.ubuntu.com/releases</guid>
     </item>
@@ -1783,7 +1763,7 @@
         <mirror:countrycode>PT</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 19:54:35 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 09:14:28 -0000</pubDate>
 
       <guid>http://ftp.rnl.tecnico.ulisboa.pt/pub/ubuntu/releases/</guid>
     </item>
@@ -1803,7 +1783,7 @@
         <mirror:countrycode>RO</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 21:45:10 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 09:14:28 -0000</pubDate>
 
       <guid>http://ftp.roedu.net/mirrors/ubuntulinux.org/releases/</guid>
     </item>
@@ -1823,7 +1803,7 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 21:45:10 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 09:14:28 -0000</pubDate>
 
       <guid>ftp://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu-releases</guid>
     </item>
@@ -1843,7 +1823,7 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 21:45:10 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 09:14:28 -0000</pubDate>
 
       <guid>ftp://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu-releases/</guid>
     </item>
@@ -1863,7 +1843,7 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 23:55:11 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 09:14:28 -0000</pubDate>
 
       <guid>http://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu-releases/</guid>
     </item>
@@ -1883,16 +1863,16 @@
         <mirror:countrycode>CN</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 23:55:13 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 09:14:28 -0000</pubDate>
 
       <guid>http://ftp.sjtu.edu.cn/ubuntu-cd/</guid>
     </item>
     <item>
-      <title>TaiChung City Education Network Center</title>
-      <link>http://ftp.tc.edu.tw/iso/Ubuntu/</link>
+      <title>Southern Taiwan University of Science and Technology</title>
+      <link>http://ftp.stust.edu.tw/pub/Linux/ubuntu-cd/</link>
 
       <description>
-        tc
+        stust's  ftp
       </description>
 
       <mirror:bandwidth>80</mirror:bandwidth>
@@ -1903,29 +1883,9 @@
         <mirror:countrycode>TW</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 01:40:38 -0000</pubDate>
-
-      <guid>http://ftp.tc.edu.tw/iso/Ubuntu/</guid>
-    </item>
-    <item>
-      <title>KPN - Telfort</title>
-      <link>http://ftp.telfort.nl/pub/mirror/ubuntu-releases/</link>
-
-      <description>
-        
-      </description>
-
-      <mirror:bandwidth>80</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Europe</mirror:continent>
-        <mirror:country>Netherlands</mirror:country>
-        <mirror:countrycode>NL</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Fri, 12 Sep 2014 01:40:38 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 09:14:28 -0000</pubDate>
 
-      <guid>http://ftp.telfort.nl/pub/mirror/ubuntu-releases/</guid>
+      <guid>http://ftp.stust.edu.tw/pub/Linux/ubuntu-cd/</guid>
     </item>
     <item>
       <title>TKU-TamKangUniversity</title>
@@ -1943,7 +1903,7 @@
         <mirror:countrycode>TW</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 01:40:38 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 09:14:28 -0000</pubDate>
 
       <guid>http://ftp.tku.edu.tw/ubuntu-releases/</guid>
     </item>
@@ -1963,7 +1923,7 @@
         <mirror:countrycode>PL</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 03:49:21 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 09:14:28 -0000</pubDate>
 
       <guid>ftp://ftp.tpnet.pl/pub/linux/ubuntu-releases/</guid>
     </item>
@@ -1983,7 +1943,7 @@
         <mirror:countrycode>JP</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 03:49:21 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 09:14:29 -0000</pubDate>
 
       <guid>http://ftp.tsukuba.wide.ad.jp/Linux/ubuntu-releases/</guid>
     </item>
@@ -2003,7 +1963,7 @@
         <mirror:countrycode>NL</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 03:49:22 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 11:47:47 -0000</pubDate>
 
       <guid>http://ftp.tudelft.nl/releases.ubuntu.com/</guid>
     </item>
@@ -2023,7 +1983,7 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 07:55:19 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 11:47:47 -0000</pubDate>
 
       <guid>http://ftp.uni-bayreuth.de/linux/ubuntu/releases/</guid>
     </item>
@@ -2043,7 +2003,7 @@
         <mirror:countrycode>NO</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 09:37:50 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 11:47:47 -0000</pubDate>
 
       <guid>http://ftp.uninett.no/linux/ubuntu-iso/</guid>
     </item>
@@ -2063,7 +2023,7 @@
         <mirror:countrycode>PL</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Tue, 09 Sep 2014 23:31:04 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 11:47:47 -0000</pubDate>
 
       <guid>http://ftp.wcss.pl/ubuntu-releases/</guid>
     </item>
@@ -2083,7 +2043,7 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Tue, 09 Sep 2014 23:31:04 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 11:47:47 -0000</pubDate>
 
       <guid>http://ftp5.gwdg.de/pub/linux/debian/ubuntu/iso/</guid>
     </item>
@@ -2103,7 +2063,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Tue, 09 Sep 2014 23:31:04 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 11:47:47 -0000</pubDate>
 
       <guid>http://mirrors.fwankie.com/ubuntu-releases/</guid>
     </item>
@@ -2123,30 +2083,10 @@
         <mirror:countrycode>FR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 01:54:08 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 11:47:48 -0000</pubDate>
 
       <guid>http://helpfulhosting.net/ubuntu/</guid>
     </item>
-    <item>
-      <title>Honesty Net Solutions (I) Pvt Ltd</title>
-      <link>http://ubuntu-releases.mirror.net.in/releases/</link>
-
-      <description>
-        HNS Ubuntu CD Mirror
-      </description>
-
-      <mirror:bandwidth>80</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Asia</mirror:continent>
-        <mirror:country>India</mirror:country>
-        <mirror:countrycode>IN</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Wed, 10 Sep 2014 01:54:08 -0000</pubDate>
-
-      <guid>http://ubuntu-releases.mirror.net.in/releases/</guid>
-    </item>
     <item>
       <title>Faculty of civil engineering, Zagreb</title>
       <link>http://hr.releases.ubuntu.com/</link>
@@ -2163,7 +2103,7 @@
         <mirror:countrycode>HR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 01:54:08 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 11:47:48 -0000</pubDate>
 
       <guid>http://hr.releases.ubuntu.com/</guid>
     </item>
@@ -2183,7 +2123,7 @@
         <mirror:countrycode>ID</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 01:54:08 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 11:47:48 -0000</pubDate>
 
       <guid>http://kartolo.sby.datautama.net.id/ubuntu-cd/</guid>
     </item>
@@ -2203,30 +2143,10 @@
         <mirror:countrycode>TW</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 03:46:23 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 11:47:48 -0000</pubDate>
 
       <guid>http://ftp.yzu.edu.tw/Linux/ubuntu-releases/</guid>
     </item>
-    <item>
-      <title>0x2a datacenter</title>
-      <link>http://mirror.0x2a.com.ua/ubuntu-releases/</link>
-
-      <description>
-        datacenter (dedicated, colocation, vps, hosting)
-      </description>
-
-      <mirror:bandwidth>80</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Europe</mirror:continent>
-        <mirror:country>Ukraine</mirror:country>
-        <mirror:countrycode>UA</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Wed, 10 Sep 2014 03:46:24 -0000</pubDate>
-
-      <guid>http://mirror.0x2a.com.ua/ubuntu-releases/</guid>
-    </item>
     <item>
       <title>AARNet Pty Ltd</title>
       <link>http://mirror.aarnet.edu.au/pub/ubuntu/releases/</link>
@@ -2243,7 +2163,7 @@
         <mirror:countrycode>AU</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 05:30:08 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 13:13:10 -0000</pubDate>
 
       <guid>http://mirror.aarnet.edu.au/pub/ubuntu/releases/</guid>
     </item>
@@ -2263,7 +2183,7 @@
         <mirror:countrycode>AU</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 05:30:08 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 13:13:10 -0000</pubDate>
 
       <guid>http://mirror.as24220.net/pub/ubuntu-releases/</guid>
     </item>
@@ -2283,7 +2203,7 @@
         <mirror:countrycode>GB</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 05:30:08 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 13:13:11 -0000</pubDate>
 
       <guid>http://mirror.as29550.net/releases.ubuntu.com/</guid>
     </item>
@@ -2303,7 +2223,7 @@
         <mirror:countrycode>MK</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 07:50:34 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 13:13:11 -0000</pubDate>
 
       <guid>http://mirror.blizoo.mk/ubuntu-releases/</guid>
     </item>
@@ -2323,7 +2243,7 @@
         <mirror:countrycode>GB</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 07:50:34 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 13:13:11 -0000</pubDate>
 
       <guid>http://mirror.bytemark.co.uk/ubuntu-releases/</guid>
     </item>
@@ -2343,7 +2263,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 07:50:35 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 13:13:11 -0000</pubDate>
 
       <guid>http://mirror.clarkson.edu/ubuntu-releases/</guid>
     </item>
@@ -2363,7 +2283,7 @@
         <mirror:countrycode>CA</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 07:50:35 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 13:13:11 -0000</pubDate>
 
       <guid>http://mirror.clibre.uqam.ca/ubuntu-releases/</guid>
     </item>
@@ -2383,7 +2303,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 09:51:41 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 13:13:11 -0000</pubDate>
 
       <guid>http://mirror.cogentco.com/pub/linux/ubuntu-releases/</guid>
     </item>
@@ -2403,7 +2323,7 @@
         <mirror:countrycode>RU</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 09:51:41 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 13:13:11 -0000</pubDate>
 
       <guid>http://mirror.corbina.net/ubuntu-cd/</guid>
     </item>
@@ -2423,7 +2343,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 09:51:41 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 13:13:11 -0000</pubDate>
 
       <guid>http://mirror.cs.pitt.edu/ubuntu/releases/</guid>
     </item>
@@ -2443,50 +2363,10 @@
         <mirror:countrycode>CA</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 09:51:41 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 13:13:11 -0000</pubDate>
 
       <guid>http://mirror.csclub.uwaterloo.ca/ubuntu-releases/</guid>
     </item>
-    <item>
-      <title>Mongolian National Data Center</title>
-      <link>http://mirror.datacenter.mn/ubuntu-releases/</link>
-
-      <description>
-        
-      </description>
-
-      <mirror:bandwidth>80</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Asia</mirror:continent>
-        <mirror:country>Mongolia</mirror:country>
-        <mirror:countrycode>MN</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Wed, 10 Sep 2014 11:43:06 -0000</pubDate>
-
-      <guid>http://mirror.datacenter.mn/ubuntu-releases/</guid>
-    </item>
-    <item>
-      <title>dhakaCom Limited</title>
-      <link>http://mirror.dhakacom.com/ubuntu-releases/</link>
-
-      <description>
-        Ubuntu mirror of dhakaCom Limited
-      </description>
-
-      <mirror:bandwidth>80</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Asia</mirror:continent>
-        <mirror:country>Bangladesh</mirror:country>
-        <mirror:countrycode>BD</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Wed, 10 Sep 2014 11:43:06 -0000</pubDate>
-
-      <guid>http://mirror.dhakacom.com/ubuntu-releases/</guid>
-    </item>
     <item>
       <title>dmm.com labs</title>
       <link>http://mirror.dmmlabs.jp/linux/ubuntu/</link>
@@ -2503,30 +2383,10 @@
         <mirror:countrycode>JP</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 11:43:06 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 15:23:43 -0000</pubDate>
 
       <guid>http://mirror.dmmlabs.jp/linux/ubuntu/</guid>
     </item>
-    <item>
-      <title>EasySpeedy</title>
-      <link>http://mirror.easyspeedy.com/ubuntu-iso/</link>
-
-      <description>
-        
-      </description>
-
-      <mirror:bandwidth>80</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Europe</mirror:continent>
-        <mirror:country>Denmark</mirror:country>
-        <mirror:countrycode>DK</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Wed, 10 Sep 2014 11:43:06 -0000</pubDate>
-
-      <guid>http://mirror.easyspeedy.com/ubuntu-iso/</guid>
-    </item>
     <item>
       <title>EDATEL ISP</title>
       <link>http://mirror.edatel.net.co/ubuntu-releases/</link>
@@ -2543,7 +2403,7 @@
         <mirror:countrycode>CO</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 14:04:00 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 15:23:44 -0000</pubDate>
 
       <guid>http://mirror.edatel.net.co/ubuntu-releases/</guid>
     </item>
@@ -2563,7 +2423,7 @@
         <mirror:countrycode>CA</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 14:04:01 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 15:23:44 -0000</pubDate>
 
       <guid>http://mirror.it.ubc.ca/ubuntu-releases/</guid>
     </item>
@@ -2583,7 +2443,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 14:04:01 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 15:23:44 -0000</pubDate>
 
       <guid>http://mirror.jmu.edu/pub/ubuntu-iso/</guid>
     </item>
@@ -2603,7 +2463,7 @@
         <mirror:countrycode>TH</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 14:04:01 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 15:23:44 -0000</pubDate>
 
       <guid>http://mirror.kku.ac.th/ubuntu-releases/</guid>
     </item>
@@ -2623,7 +2483,7 @@
         <mirror:countrycode>NC</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 14:04:01 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 15:23:44 -0000</pubDate>
 
       <guid>http://ubuntu.lagoon.nc/ubuntu-releases/</guid>
     </item>
@@ -2643,7 +2503,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 14:04:02 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 15:23:44 -0000</pubDate>
 
       <guid>http://mirror.metrocast.net/ubuntu-releases/</guid>
     </item>
@@ -2663,7 +2523,7 @@
         <mirror:countrycode>AU</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 15:57:06 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 15:23:44 -0000</pubDate>
 
       <guid>http://mirror.netspace.net.au/pub/ubuntu-releases/</guid>
     </item>
@@ -2683,7 +2543,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 15:57:06 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 15:23:44 -0000</pubDate>
 
       <guid>http://mirror.nexcess.net/ubuntu-releases/</guid>
     </item>
@@ -2703,7 +2563,7 @@
         <mirror:countrycode>SG</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 15:57:06 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 15:23:44 -0000</pubDate>
 
       <guid>http://mirror.nus.edu.sg/ubuntu-ISO/</guid>
     </item>
@@ -2723,7 +2583,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 15:57:06 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 15:23:44 -0000</pubDate>
 
       <guid>http://mirror.os6.org/ubuntu-releases/</guid>
     </item>
@@ -2743,7 +2603,7 @@
         <mirror:countrycode>AU</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 15:57:07 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 15:23:44 -0000</pubDate>
 
       <guid>http://mirror.overthewire.com.au/pub/ubuntu-releases/</guid>
     </item>
@@ -2763,7 +2623,7 @@
         <mirror:countrycode>GB</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 17:36:22 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 15:23:44 -0000</pubDate>
 
       <guid>http://mirror.ox.ac.uk/sites/releases.ubuntu.com/releases/</guid>
     </item>
@@ -2783,30 +2643,10 @@
         <mirror:countrycode>AU</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 17:36:22 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 15:23:44 -0000</pubDate>
 
       <guid>http://mirror.rackcentral.com.au/ubuntu-releases/</guid>
     </item>
-    <item>
-      <title>mirror.soften.ktu.lt</title>
-      <link>http://mirror.soften.ktu.lt/ubuntu-releases/</link>
-
-      <description>
-        Software Engineering Department at Faculty Of Informatics at Kaunas University Of Technology
-      </description>
-
-      <mirror:bandwidth>80</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Europe</mirror:continent>
-        <mirror:country>Lithuania</mirror:country>
-        <mirror:countrycode>LT</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Wed, 10 Sep 2014 17:36:22 -0000</pubDate>
-
-      <guid>http://mirror.soften.ktu.lt/ubuntu-releases/</guid>
-    </item>
     <item>
       <title>Goscomb Technologies Limited</title>
       <link>http://mirror.sov.uk.goscomb.net/ubuntu-releases/</link>
@@ -2823,7 +2663,7 @@
         <mirror:countrycode>GB</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 17:36:22 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 17:22:08 -0000</pubDate>
 
       <guid>http://mirror.sov.uk.goscomb.net/ubuntu-releases/</guid>
     </item>
@@ -2843,7 +2683,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 19:37:49 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 17:22:08 -0000</pubDate>
 
       <guid>http://mirror.steadfast.net/ubuntu-releases/</guid>
     </item>
@@ -2863,10 +2703,30 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 19:37:49 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 17:22:08 -0000</pubDate>
 
       <guid>http://mirror.symnds.com/distributions/ubuntu-releases/</guid>
     </item>
+    <item>
+      <title>Macedonian Telecom</title>
+      <link>http://mirror.t-home.mk/ubuntu-releases/</link>
+
+      <description>
+        
+      </description>
+
+      <mirror:bandwidth>80</mirror:bandwidth>
+
+      <mirror:location>
+        <mirror:continent>Europe</mirror:continent>
+        <mirror:country>Macedonia, Republic of</mirror:country>
+        <mirror:countrycode>MK</mirror:countrycode>
+      </mirror:location>
+
+      <pubDate>Sun, 26 Apr 2015 17:22:08 -0000</pubDate>
+
+      <guid>http://mirror.t-home.mk/ubuntu-releases/</guid>
+    </item>
     <item>
       <title>TCPDIAG</title>
       <link>http://mirror.tcpdiag.net/ubuntu-releases/</link>
@@ -2883,7 +2743,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 19:37:50 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 17:22:08 -0000</pubDate>
 
       <guid>http://mirror.tcpdiag.net/ubuntu-releases/</guid>
     </item>
@@ -2903,7 +2763,7 @@
         <mirror:countrycode>PY</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 19:37:50 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 17:22:08 -0000</pubDate>
 
       <guid>http://mirror.tigo.com.py/ubuntu/releases/</guid>
     </item>
@@ -2923,7 +2783,7 @@
         <mirror:countrycode>RU</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 19:37:50 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 17:22:08 -0000</pubDate>
 
       <guid>http://mirror.timeweb.ru/ubuntu-releases/</guid>
     </item>
@@ -2943,10 +2803,30 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 21:34:51 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 17:22:08 -0000</pubDate>
 
       <guid>http://mirror.umd.edu/ubuntu-iso/</guid>
     </item>
+    <item>
+      <title>Universitas Jember</title>
+      <link>http://mirror.unej.ac.id/pub/ubuntu-cd/</link>
+
+      <description>
+        Ubuntu CD Archive at Jember University
+      </description>
+
+      <mirror:bandwidth>80</mirror:bandwidth>
+
+      <mirror:location>
+        <mirror:continent>Asia</mirror:continent>
+        <mirror:country>Indonesia</mirror:country>
+        <mirror:countrycode>ID</mirror:countrycode>
+      </mirror:location>
+
+      <pubDate>Sun, 26 Apr 2015 17:22:08 -0000</pubDate>
+
+      <guid>http://mirror.unej.ac.id/pub/ubuntu-cd/</guid>
+    </item>
     <item>
       <title>UNESP</title>
       <link>http://mirror.unesp.br/ubuntu-releases/</link>
@@ -2963,7 +2843,7 @@
         <mirror:countrycode>BR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 21:34:51 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 17:22:08 -0000</pubDate>
 
       <guid>http://mirror.unesp.br/ubuntu-releases/</guid>
     </item>
@@ -2983,30 +2863,10 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 21:34:51 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 17:22:08 -0000</pubDate>
 
       <guid>http://mirror.uoregon.edu/ubuntu-releases/</guid>
     </item>
-    <item>
-      <title>Vorboss Ltd</title>
-      <link>http://mirror.vorboss.net/ubuntu-releases/</link>
-
-      <description>
-        
-      </description>
-
-      <mirror:bandwidth>80</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Europe</mirror:continent>
-        <mirror:country>United Kingdom</mirror:country>
-        <mirror:countrycode>GB</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Wed, 10 Sep 2014 21:34:52 -0000</pubDate>
-
-      <guid>http://mirror.vorboss.net/ubuntu-releases/</guid>
-    </item>
     <item>
       <title>WorldxChange Communications Ltd</title>
       <link>http://mirror.xnet.co.nz/pub/ubuntu-releases/</link>
@@ -3023,7 +2883,7 @@
         <mirror:countrycode>NZ</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 21:34:52 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 17:22:09 -0000</pubDate>
 
       <guid>http://mirror.xnet.co.nz/pub/ubuntu-releases/</guid>
     </item>
@@ -3043,7 +2903,7 @@
         <mirror:countrycode>RU</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 21:34:52 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 19:24:30 -0000</pubDate>
 
       <guid>http://mirror.yandex.ru/ubuntu-releases/</guid>
     </item>
@@ -3063,50 +2923,10 @@
         <mirror:countrycode>ZW</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 23:39:34 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 19:24:31 -0000</pubDate>
 
       <guid>http://mirror.zol.co.zw/ubuntu-releases/</guid>
     </item>
-    <item>
-      <title>Portland State University</title>
-      <link>http://mirrors.cat.pdx.edu/ubuntu-releases/</link>
-
-      <description>
-        College of Engineering and Computer Science Computer Action Team (CAT)
-      </description>
-
-      <mirror:bandwidth>80</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>North America</mirror:continent>
-        <mirror:country>United States</mirror:country>
-        <mirror:countrycode>US</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Wed, 10 Sep 2014 23:39:35 -0000</pubDate>
-
-      <guid>http://mirrors.cat.pdx.edu/ubuntu-releases/</guid>
-    </item>
-    <item>
-      <title>Northeastern University College of Computer and Information Science</title>
-      <link>http://mirrors.ccs.neu.edu/releases.ubuntu.com/</link>
-
-      <description>
-        
-      </description>
-
-      <mirror:bandwidth>80</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>North America</mirror:continent>
-        <mirror:country>United States</mirror:country>
-        <mirror:countrycode>US</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Wed, 10 Sep 2014 23:39:35 -0000</pubDate>
-
-      <guid>http://mirrors.ccs.neu.edu/releases.ubuntu.com/</guid>
-    </item>
     <item>
       <title>dotsrc.org</title>
       <link>http://mirrors.dotsrc.org/ubuntu-cd/</link>
@@ -3123,7 +2943,7 @@
         <mirror:countrycode>DK</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 01:52:43 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 19:24:31 -0000</pubDate>
 
       <guid>http://mirrors.dotsrc.org/ubuntu-cd/</guid>
     </item>
@@ -3143,7 +2963,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 01:52:43 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 19:24:31 -0000</pubDate>
 
       <guid>http://mirrors.easynews.com/linux/ubuntu-releases/</guid>
     </item>
@@ -3163,7 +2983,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 01:52:44 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 19:24:31 -0000</pubDate>
 
       <guid>http://mirrors.einstein.yu.edu/ubuntu/ubuntureleases/</guid>
     </item>
@@ -3183,7 +3003,7 @@
         <mirror:countrycode>PT</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 01:52:44 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 19:24:31 -0000</pubDate>
 
       <guid>http://mirrors.fe.up.pt/pub/ubuntu-releases/</guid>
     </item>
@@ -3203,7 +3023,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 01:52:44 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 19:24:31 -0000</pubDate>
 
       <guid>http://mirrors.gigenet.com/ubuntu/</guid>
     </item>
@@ -3223,7 +3043,7 @@
         <mirror:countrycode>FR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 01:52:44 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 19:24:31 -0000</pubDate>
 
       <guid>http://mirrors.ircam.fr/pub/ubuntu/releases/</guid>
     </item>
@@ -3243,7 +3063,7 @@
         <mirror:countrycode>BD</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 07:55:19 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 19:24:31 -0000</pubDate>
 
       <guid>http://mirrors.ispros.com.bd/ubuntu-release/</guid>
     </item>
@@ -3263,7 +3083,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 01:52:44 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 19:24:31 -0000</pubDate>
 
       <guid>http://mirrors.koehn.com/ubuntureleases/</guid>
     </item>
@@ -3283,7 +3103,7 @@
         <mirror:countrycode>RO</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 01:52:44 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 21:20:31 -0000</pubDate>
 
       <guid>http://mirrors.m247.ro/ubuntu-releases/</guid>
     </item>
@@ -3303,30 +3123,10 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 01:52:45 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 21:20:31 -0000</pubDate>
 
       <guid>http://mirrors.mit.edu/ubuntu-releases/</guid>
     </item>
-    <item>
-      <title>nfsi telecom </title>
-      <link>http://mirrors.nfsi.pt/ubuntu-releases/</link>
-
-      <description>
-        
-      </description>
-
-      <mirror:bandwidth>80</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Europe</mirror:continent>
-        <mirror:country>Portugal</mirror:country>
-        <mirror:countrycode>PT</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Thu, 11 Sep 2014 03:32:43 -0000</pubDate>
-
-      <guid>http://mirrors.nfsi.pt/ubuntu-releases/</guid>
-    </item>
     <item>
       <title>Kernel.org</title>
       <link>http://mirrors.nl.eu.kernel.org/ubuntu-releases/</link>
@@ -3343,7 +3143,7 @@
         <mirror:countrycode>NL</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 03:32:44 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 21:20:32 -0000</pubDate>
 
       <guid>http://mirrors.nl.eu.kernel.org/ubuntu-releases/</guid>
     </item>
@@ -3363,7 +3163,7 @@
         <mirror:countrycode>RO</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 03:32:44 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 21:20:32 -0000</pubDate>
 
       <guid>http://mirrors.pidginhost.com/ubuntu-releases/</guid>
     </item>
@@ -3383,7 +3183,7 @@
         <mirror:countrycode>TH</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 03:32:44 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 21:20:32 -0000</pubDate>
 
       <guid>http://mirrors.psu.ac.th/ubuntu-releases/</guid>
     </item>
@@ -3403,7 +3203,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 03:32:44 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 21:20:32 -0000</pubDate>
 
       <guid>http://mirrors.rit.edu/ubuntu-releases/</guid>
     </item>
@@ -3423,7 +3223,7 @@
         <mirror:countrycode>SE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 03:32:44 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 21:20:32 -0000</pubDate>
 
       <guid>http://mirrors.se.eu.kernel.org/ubuntu-releases/</guid>
     </item>
@@ -3443,7 +3243,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 03:32:45 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 21:20:32 -0000</pubDate>
 
       <guid>http://mirrors.syringanetworks.net/ubuntu-releases/</guid>
     </item>
@@ -3463,7 +3263,7 @@
         <mirror:countrycode>CL</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 03:32:45 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 21:20:32 -0000</pubDate>
 
       <guid>http://mirrors.tecnoera.com/ubuntu-releases/</guid>
     </item>
@@ -3483,13 +3283,13 @@
         <mirror:countrycode>DK</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 03:32:45 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 21:20:32 -0000</pubDate>
 
       <guid>http://mirrors.telianet.dk/ubuntu-releases/</guid>
     </item>
     <item>
-      <title>www.abn-ad.com</title>
-      <link>http://mirrors.uaip.org/ubuntu-releases/</link>
+      <title>TripAdvisor</title>
+      <link>http://mirrors.tripadvisor.com/releases/</link>
 
       <description>
         
@@ -3498,12 +3298,52 @@
       <mirror:bandwidth>80</mirror:bandwidth>
 
       <mirror:location>
-        <mirror:continent>Europe</mirror:continent>
-        <mirror:country>Ukraine</mirror:country>
+        <mirror:continent>North America</mirror:continent>
+        <mirror:country>United States</mirror:country>
+        <mirror:countrycode>US</mirror:countrycode>
+      </mirror:location>
+
+      <pubDate>Sun, 26 Apr 2015 21:20:32 -0000</pubDate>
+
+      <guid>http://mirrors.tripadvisor.com/releases/</guid>
+    </item>
+    <item>
+      <title>Tsinghua University</title>
+      <link>http://mirrors.tuna.tsinghua.edu.cn/ubuntu-releases/</link>
+
+      <description>
+        Tsinghua University Network Administrators
+      </description>
+
+      <mirror:bandwidth>80</mirror:bandwidth>
+
+      <mirror:location>
+        <mirror:continent>Asia</mirror:continent>
+        <mirror:country>China</mirror:country>
+        <mirror:countrycode>CN</mirror:countrycode>
+      </mirror:location>
+
+      <pubDate>Sun, 26 Apr 2015 21:20:32 -0000</pubDate>
+
+      <guid>http://mirrors.tuna.tsinghua.edu.cn/ubuntu-releases/</guid>
+    </item>
+    <item>
+      <title>www.abn-ad.com</title>
+      <link>http://mirrors.uaip.org/ubuntu-releases/</link>
+
+      <description>
+        
+      </description>
+
+      <mirror:bandwidth>80</mirror:bandwidth>
+
+      <mirror:location>
+        <mirror:continent>Europe</mirror:continent>
+        <mirror:country>Ukraine</mirror:country>
         <mirror:countrycode>UA</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 03:32:45 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 21:20:32 -0000</pubDate>
 
       <guid>http://mirrors.uaip.org/ubuntu-releases/</guid>
     </item>
@@ -3523,7 +3363,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 06:14:50 -0000</pubDate>
+      <pubDate>Sun, 26 Apr 2015 21:20:32 -0000</pubDate>
 
       <guid>http://mirrors.usinternet.com/ubuntu/releases/</guid>
     </item>
@@ -3543,7 +3383,7 @@
         <mirror:countrycode>CN</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 06:14:50 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 00:00:24 -0000</pubDate>
 
       <guid>http://mirrors.ustc.edu.cn/ubuntu-releases/</guid>
     </item>
@@ -3563,7 +3403,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 06:14:50 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 00:00:24 -0000</pubDate>
 
       <guid>http://mirrors.xmission.com/ubuntu-cd/</guid>
     </item>
@@ -3583,7 +3423,7 @@
         <mirror:countrycode>RO</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 06:14:50 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 00:00:24 -0000</pubDate>
 
       <guid>http://mirrors.xservers.ro/ubuntu/releases/</guid>
     </item>
@@ -3603,7 +3443,7 @@
         <mirror:countrycode>CN</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 06:14:50 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 00:00:24 -0000</pubDate>
 
       <guid>http://mirrors.yun-idc.com/ubuntu-releases/</guid>
     </item>
@@ -3623,7 +3463,7 @@
         <mirror:countrycode>NO</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 06:14:51 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 00:00:24 -0000</pubDate>
 
       <guid>http://no.releases.ubuntu.com/</guid>
     </item>
@@ -3643,7 +3483,7 @@
         <mirror:countrycode>MY</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 06:14:51 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 00:00:24 -0000</pubDate>
 
       <guid>http://ossm.utm.my/ubuntu-DVD/</guid>
     </item>
@@ -3663,7 +3503,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 06:14:51 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 00:00:25 -0000</pubDate>
 
       <guid>http://reflection.oss.ou.edu/ubuntu-release/</guid>
     </item>
@@ -3683,10 +3523,30 @@
         <mirror:countrycode>BA</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 08:05:21 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 00:00:25 -0000</pubDate>
 
       <guid>http://releases.ubuntu.com.ba/</guid>
     </item>
+    <item>
+      <title>Rafał Rzeczkowski</title>
+      <link>http://releases.ubuntu.mirror.rafal.ca/</link>
+
+      <description>
+        
+      </description>
+
+      <mirror:bandwidth>80</mirror:bandwidth>
+
+      <mirror:location>
+        <mirror:continent>North America</mirror:continent>
+        <mirror:country>Canada</mirror:country>
+        <mirror:countrycode>CA</mirror:countrycode>
+      </mirror:location>
+
+      <pubDate>Mon, 27 Apr 2015 00:00:25 -0000</pubDate>
+
+      <guid>http://releases.ubuntu.mirror.rafal.ca/</guid>
+    </item>
     <item>
       <title>UK2</title>
       <link>http://releases.ubuntu.mirrors.uk2.net/</link>
@@ -3703,7 +3563,7 @@
         <mirror:countrycode>GB</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 08:05:21 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 00:00:25 -0000</pubDate>
 
       <guid>http://releases.ubuntu.mirrors.uk2.net/</guid>
     </item>
@@ -3723,10 +3583,30 @@
         <mirror:countrycode>NL</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 08:05:22 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 00:00:25 -0000</pubDate>
 
       <guid>http://releases.ubuntu.totaal.net/</guid>
     </item>
+    <item>
+      <title>Bigstep Cloud LTD</title>
+      <link>http://repo.bigstepcloud.com/ubuntu-releases/</link>
+
+      <description>
+        
+      </description>
+
+      <mirror:bandwidth>80</mirror:bandwidth>
+
+      <mirror:location>
+        <mirror:continent>Europe</mirror:continent>
+        <mirror:country>United Kingdom</mirror:country>
+        <mirror:countrycode>GB</mirror:countrycode>
+      </mirror:location>
+
+      <pubDate>Mon, 27 Apr 2015 00:00:25 -0000</pubDate>
+
+      <guid>http://repo.bigstepcloud.com/ubuntu-releases/</guid>
+    </item>
     <item>
       <title>UDomain Web Hosting Co. Ltd.</title>
       <link>http://repo.virtualhosting.hk/ubuntu-releases/</link>
@@ -3743,7 +3623,7 @@
         <mirror:countrycode>HK</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 08:05:22 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 01:28:26 -0000</pubDate>
 
       <guid>http://repo.virtualhosting.hk/ubuntu-releases/</guid>
     </item>
@@ -3763,7 +3643,7 @@
         <mirror:countrycode>TW</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 08:05:22 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 01:28:26 -0000</pubDate>
 
       <guid>http://shadow.ind.ntou.edu.tw/ubuntu-releases/</guid>
     </item>
@@ -3783,7 +3663,7 @@
         <mirror:countrycode>ES</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 08:05:22 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 01:28:26 -0000</pubDate>
 
       <guid>http://softlibre.unizar.es/ubuntu/releases/</guid>
     </item>
@@ -3803,50 +3683,10 @@
         <mirror:countrycode>IS</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 08:05:22 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 01:28:26 -0000</pubDate>
 
       <guid>http://speglar.simnet.is/ubuntu-releases/</guid>
     </item>
-    <item>
-      <title>STC</title>
-      <link>http://ubuntu.saudi.net.sa/releases/</link>
-
-      <description>
-        Saudi telecom  company
-      </description>
-
-      <mirror:bandwidth>80</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Asia</mirror:continent>
-        <mirror:country>Saudi Arabia</mirror:country>
-        <mirror:countrycode>SA</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Thu, 11 Sep 2014 08:05:22 -0000</pubDate>
-
-      <guid>http://ubuntu.saudi.net.sa/releases/</guid>
-    </item>
-    <item>
-      <title>Cyber Internet Services (Pvt) Ltd</title>
-      <link>http://stingray.cyber.net.pk/pub/ubuntu-releases/</link>
-
-      <description>
-        Mirror @Cybernet
-      </description>
-
-      <mirror:bandwidth>80</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Asia</mirror:continent>
-        <mirror:country>Pakistan</mirror:country>
-        <mirror:countrycode>PK</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Thu, 11 Sep 2014 08:05:23 -0000</pubDate>
-
-      <guid>http://stingray.cyber.net.pk/pub/ubuntu-releases/</guid>
-    </item>
     <item>
       <title>SunSITE.RWTH-Aachen.de</title>
       <link>http://vesta.informatik.rwth-aachen.de/ftp/pub/Linux/ubuntu/releases/</link>
@@ -3863,7 +3703,7 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 08:05:23 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 01:28:26 -0000</pubDate>
 
       <guid>http://vesta.informatik.rwth-aachen.de/ftp/pub/Linux/ubuntu/releases/</guid>
     </item>
@@ -3883,7 +3723,7 @@
         <mirror:countrycode>ES</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 09:24:12 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 01:28:26 -0000</pubDate>
 
       <guid>http://sunsite.rediris.es/mirror/ubuntu-releases/</guid>
     </item>
@@ -3903,7 +3743,7 @@
         <mirror:countrycode>GB</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 09:24:12 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 01:28:26 -0000</pubDate>
 
       <guid>http://ftp.ticklers.org/releases.ubuntu.org/releases/</guid>
     </item>
@@ -3923,7 +3763,7 @@
         <mirror:countrycode>SK</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 09:24:12 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 01:28:26 -0000</pubDate>
 
       <guid>http://tux.rainside.sk/ubuntu-releases/</guid>
     </item>
@@ -3943,7 +3783,7 @@
         <mirror:countrycode>TH</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 09:24:12 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 01:28:26 -0000</pubDate>
 
       <guid>http://ubuntu-mirror.totbb.net/ubuntu-releases/</guid>
     </item>
@@ -3963,7 +3803,7 @@
         <mirror:countrycode>LV</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 09:24:12 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 01:28:26 -0000</pubDate>
 
       <guid>http://ubuntu-rel.linux.edu.lv/</guid>
     </item>
@@ -3983,7 +3823,7 @@
         <mirror:countrycode>BR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 09:24:12 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 01:28:26 -0000</pubDate>
 
       <guid>http://ubuntu-release.locaweb.com.br/</guid>
     </item>
@@ -4003,7 +3843,7 @@
         <mirror:countrycode>LT</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 09:24:12 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 01:28:27 -0000</pubDate>
 
       <guid>http://ubuntu-release.mirror.serveriai.lt/</guid>
     </item>
@@ -4023,7 +3863,7 @@
         <mirror:countrycode>KE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 09:24:13 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 01:28:27 -0000</pubDate>
 
       <guid>http://ubuntu-releases.mirror.liquidtelecom.com/</guid>
     </item>
@@ -4043,7 +3883,7 @@
         <mirror:countrycode>BE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 09:24:13 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 01:28:27 -0000</pubDate>
 
       <guid>http://ubuntu-releases.mirror.nucleus.be/</guid>
     </item>
@@ -4063,30 +3903,10 @@
         <mirror:countrycode>AU</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 09:24:13 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 04:12:02 -0000</pubDate>
 
       <guid>http://mirror.optus.net/ubuntu-releases/</guid>
     </item>
-    <item>
-      <title>School of Information Technology, KMUTT</title>
-      <link>http://ubuntu-releases.sit.kmutt.ac.th/</link>
-
-      <description>
-        SIT's Ubuntu Releases Mirror, Location in Thailand
-      </description>
-
-      <mirror:bandwidth>80</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Asia</mirror:continent>
-        <mirror:country>Thailand</mirror:country>
-        <mirror:countrycode>TH</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Thu, 11 Sep 2014 09:24:13 -0000</pubDate>
-
-      <guid>http://ubuntu-releases.sit.kmutt.ac.th/</guid>
-    </item>
     <item>
       <title>Walla Walla University</title>
       <link>http://ubuntu-releases.wallawalla.edu/</link>
@@ -4103,30 +3923,10 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 11:45:50 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 04:12:02 -0000</pubDate>
 
       <guid>http://ubuntu-releases.wallawalla.edu/</guid>
     </item>
-    <item>
-      <title>Shaw Cable</title>
-      <link>ftp://ubuntu.arcticnetwork.ca/pub/ubuntu/releases/</link>
-
-      <description>
-        
-      </description>
-
-      <mirror:bandwidth>80</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>North America</mirror:continent>
-        <mirror:country>Canada</mirror:country>
-        <mirror:countrycode>CA</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Thu, 11 Sep 2014 11:45:50 -0000</pubDate>
-
-      <guid>ftp://ubuntu.arcticnetwork.ca/pub/ubuntu/releases/</guid>
-    </item>
     <item>
       <title>OVH.COM</title>
       <link>http://ubuntu.bhs.mirrors.ovh.net/ftp.ubuntu.com/releases/</link>
@@ -4143,7 +3943,7 @@
         <mirror:countrycode>CA</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 11:45:50 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 04:12:02 -0000</pubDate>
 
       <guid>http://ubuntu.bhs.mirrors.ovh.net/ftp.ubuntu.com/releases/</guid>
     </item>
@@ -4163,7 +3963,7 @@
         <mirror:countrycode>GB</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 11:45:51 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 04:12:03 -0000</pubDate>
 
       <guid>http://gb.releases.ubuntu.com/</guid>
     </item>
@@ -4183,7 +3983,7 @@
         <mirror:countrycode>FR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 11:45:51 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 04:12:03 -0000</pubDate>
 
       <guid>http://ubuntu.daupheus.com/</guid>
     </item>
@@ -4203,30 +4003,10 @@
         <mirror:countrycode>IN</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 11:45:51 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 04:12:03 -0000</pubDate>
 
       <guid>http://ubuntu.excellmedia.net/releases/</guid>
     </item>
-    <item>
-      <title>Fastbull</title>
-      <link>http://releases.ubuntu.fastbull.org/ubuntu-releases/</link>
-
-      <description>
-        Fastbull.org - Non profit association
-      </description>
-
-      <mirror:bandwidth>80</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Europe</mirror:continent>
-        <mirror:country>Italy</mirror:country>
-        <mirror:countrycode>IT</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Thu, 11 Sep 2014 11:45:51 -0000</pubDate>
-
-      <guid>http://releases.ubuntu.fastbull.org/ubuntu-releases/</guid>
-    </item>
     <item>
       <title>ICT Valle Umbra s.r.l.</title>
       <link>http://ubuntu.ictvalleumbra.it/</link>
@@ -4243,7 +4023,7 @@
         <mirror:countrycode>IT</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 11:45:51 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 04:12:03 -0000</pubDate>
 
       <guid>http://ubuntu.ictvalleumbra.it/</guid>
     </item>
@@ -4263,7 +4043,7 @@
         <mirror:countrycode>LV</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 13:43:25 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 04:12:03 -0000</pubDate>
 
       <guid>http://ubuntu.koyanet.lv/releases/</guid>
     </item>
@@ -4283,10 +4063,30 @@
         <mirror:countrycode>BR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 13:43:25 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 04:12:03 -0000</pubDate>
 
       <guid>http://ubuntu.laps.ufpa.br/releases/</guid>
     </item>
+    <item>
+      <title>PoP-SC/RNP</title>
+      <link>http://ubuntu.mirror.pop-sc.rnp.br/ubuntu-releases/</link>
+
+      <description>
+        PoP-SC Mirror Service located in Florianópolis/SC
+      </description>
+
+      <mirror:bandwidth>80</mirror:bandwidth>
+
+      <mirror:location>
+        <mirror:continent>South America</mirror:continent>
+        <mirror:country>Brazil</mirror:country>
+        <mirror:countrycode>BR</mirror:countrycode>
+      </mirror:location>
+
+      <pubDate>Mon, 27 Apr 2015 05:21:17 -0000</pubDate>
+
+      <guid>http://ubuntu.mirror.pop-sc.rnp.br/ubuntu-releases/</guid>
+    </item>
     <item>
       <title>Servers Australia</title>
       <link>http://ubuntu.mirror.serversaustralia.com.au/ubuntu-releases/</link>
@@ -4303,7 +4103,7 @@
         <mirror:countrycode>AU</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 13:43:26 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 05:21:17 -0000</pubDate>
 
       <guid>http://ubuntu.mirror.serversaustralia.com.au/ubuntu-releases/</guid>
     </item>
@@ -4323,7 +4123,7 @@
         <mirror:countrycode>AU</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 13:43:26 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 05:21:17 -0000</pubDate>
 
       <guid>http://ubuntu.mirror.uber.com.au/releases/</guid>
     </item>
@@ -4343,29 +4143,29 @@
         <mirror:countrycode>LT</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 13:43:26 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 05:21:17 -0000</pubDate>
 
       <guid>http://ubuntu.mirror.vu.lt/releases/</guid>
     </item>
     <item>
-      <title>MirrorCatalogs</title>
-      <link>http://ubuntu.mirrorcatalogs.com/ubuntu-releases/</link>
+      <title>KACST/ISU</title>
+      <link>http://ubuntu.mirrors.isu.net.sa/pub/ubuntu-releases/</link>
 
       <description>
-        
+        Internet Services for Saudi Universities
       </description>
 
       <mirror:bandwidth>80</mirror:bandwidth>
 
       <mirror:location>
-        <mirror:continent>North America</mirror:continent>
-        <mirror:country>United States</mirror:country>
-        <mirror:countrycode>US</mirror:countrycode>
+        <mirror:continent>Asia</mirror:continent>
+        <mirror:country>Saudi Arabia</mirror:country>
+        <mirror:countrycode>SA</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 15:30:38 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 05:21:18 -0000</pubDate>
 
-      <guid>http://ubuntu.mirrorcatalogs.com/ubuntu-releases/</guid>
+      <guid>http://ubuntu.mirrors.isu.net.sa/pub/ubuntu-releases/</guid>
     </item>
     <item>
       <title>pair Networks</title>
@@ -4383,7 +4183,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 15:30:38 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 05:21:18 -0000</pubDate>
 
       <guid>http://ubuntu.mirrors.pair.com/releases/</guid>
     </item>
@@ -4403,7 +4203,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 15:30:38 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 05:21:18 -0000</pubDate>
 
       <guid>http://ubuntu.mirrors.tds.net/pub/releases/</guid>
     </item>
@@ -4423,7 +4223,7 @@
         <mirror:countrycode>ZA</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 15:30:39 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 05:21:18 -0000</pubDate>
 
       <guid>http://ubuntu.saix.net/ubuntu-releases/</guid>
     </item>
@@ -4443,7 +4243,7 @@
         <mirror:countrycode>TW</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 15:30:39 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 07:23:58 -0000</pubDate>
 
       <guid>http://ubuntu.stu.edu.tw/ubuntu-cd/</guid>
     </item>
@@ -4463,7 +4263,7 @@
         <mirror:countrycode>PL</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 15:30:39 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 07:23:58 -0000</pubDate>
 
       <guid>http://ubuntu.task.gda.pl/ubuntu-releases/</guid>
     </item>
@@ -4483,7 +4283,7 @@
         <mirror:countrycode>FI</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 15:30:39 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 07:23:58 -0000</pubDate>
 
       <guid>http://ubuntu.trumpetti.atm.tut.fi/releases/</guid>
     </item>
@@ -4503,7 +4303,7 @@
         <mirror:countrycode>NL</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 17:42:35 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 07:23:58 -0000</pubDate>
 
       <guid>http://ubuntu.tuxis.nl/</guid>
     </item>
@@ -4523,7 +4323,7 @@
         <mirror:countrycode>ES</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 17:42:35 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 07:23:58 -0000</pubDate>
 
       <guid>http://ubuntu.uc3m.es/ubuntu-releases/</guid>
     </item>
@@ -4543,7 +4343,7 @@
         <mirror:countrycode>NO</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 17:42:35 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 07:23:58 -0000</pubDate>
 
       <guid>http://ubuntu.uib.no/releases/</guid>
     </item>
@@ -4563,7 +4363,7 @@
         <mirror:countrycode>FR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 17:42:36 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 07:23:58 -0000</pubDate>
 
       <guid>http://ubuntu.univ-nantes.fr/ubuntu-cd/</guid>
     </item>
@@ -4583,7 +4383,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 17:42:36 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 07:23:59 -0000</pubDate>
 
       <guid>http://ubunturelease.mirror.nac.net/</guid>
     </item>
@@ -4603,7 +4403,7 @@
         <mirror:countrycode>GR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 17:42:36 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 07:23:59 -0000</pubDate>
 
       <guid>http://ubuntureleases.tsl.gr/</guid>
     </item>
@@ -4623,10 +4423,30 @@
         <mirror:countrycode>JP</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 17:42:36 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 07:23:59 -0000</pubDate>
 
       <guid>http://ubuntutym2.u-toyama.ac.jp/ubuntu/</guid>
     </item>
+    <item>
+      <title>University of Canterbury</title>
+      <link>http://ucmirror.canterbury.ac.nz/linux/ubuntu-releases/</link>
+
+      <description>
+        
+      </description>
+
+      <mirror:bandwidth>80</mirror:bandwidth>
+
+      <mirror:location>
+        <mirror:continent>Oceania</mirror:continent>
+        <mirror:country>New Zealand</mirror:country>
+        <mirror:countrycode>NZ</mirror:countrycode>
+      </mirror:location>
+
+      <pubDate>Mon, 27 Apr 2015 07:23:59 -0000</pubDate>
+
+      <guid>http://ucmirror.canterbury.ac.nz/linux/ubuntu-releases/</guid>
+    </item>
     <item>
       <title>University of Minnesota Ubuntu Releases</title>
       <link>http://ubuntu-releases.cs.umn.edu/</link>
@@ -4643,7 +4463,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 17:42:36 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 07:23:59 -0000</pubDate>
 
       <guid>http://ubuntu-releases.cs.umn.edu/</guid>
     </item>
@@ -4663,7 +4483,7 @@
         <mirror:countrycode>PL</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 17:42:36 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 07:23:59 -0000</pubDate>
 
       <guid>http://ftp.vectranet.pl/ubuntu-releases/</guid>
     </item>
@@ -4683,7 +4503,7 @@
         <mirror:countrycode>FR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 19:54:35 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 07:23:59 -0000</pubDate>
 
       <guid>http://www-ftp.lip6.fr/pub/linux/distributions/Ubuntu/releases/</guid>
     </item>
@@ -4703,10 +4523,30 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 19:54:35 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 09:07:47 -0000</pubDate>
 
       <guid>http://www.gtlib.gatech.edu/pub/ubuntu-releases/</guid>
     </item>
+    <item>
+      <title>LAS-IC-Unicamp</title>
+      <link>http://www.las.ic.unicamp.br/pub/ubuntu-releases/</link>
+
+      <description>
+        Laboratório de Administração e Segurança de Sistemas
+      </description>
+
+      <mirror:bandwidth>80</mirror:bandwidth>
+
+      <mirror:location>
+        <mirror:continent>South America</mirror:continent>
+        <mirror:country>Brazil</mirror:country>
+        <mirror:countrycode>BR</mirror:countrycode>
+      </mirror:location>
+
+      <pubDate>Mon, 27 Apr 2015 09:07:47 -0000</pubDate>
+
+      <guid>http://www.las.ic.unicamp.br/pub/ubuntu-releases/</guid>
+    </item>
     <item>
       <title>Université de lorraine</title>
       <link>http://wwwftp.ciril.fr/pub/linux/ubuntu/releases/</link>
@@ -4723,7 +4563,7 @@
         <mirror:countrycode>FR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 19:54:36 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 09:07:47 -0000</pubDate>
 
       <guid>http://wwwftp.ciril.fr/pub/linux/ubuntu/releases/</guid>
     </item>
@@ -4743,7 +4583,7 @@
         <mirror:countrycode>BW</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 19:54:36 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 09:07:47 -0000</pubDate>
 
       <guid>http://bw.releases.ubuntu.com/</guid>
     </item>
@@ -4763,7 +4603,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 19:54:36 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 09:07:47 -0000</pubDate>
 
       <guid>http://cosmos.cites.illinois.edu/pub/ubuntu-iso/</guid>
     </item>
@@ -4783,7 +4623,7 @@
         <mirror:countrycode>SI</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 21:45:10 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 09:07:47 -0000</pubDate>
 
       <guid>http://ftp.arnes.si/pub/mirrors/ubuntu-cdimage/</guid>
     </item>
@@ -4803,7 +4643,7 @@
         <mirror:countrycode>ES</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 21:45:11 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 09:07:47 -0000</pubDate>
 
       <guid>http://ftp.caliu.cat/pub/distribucions/ubuntu/releases/</guid>
     </item>
@@ -4823,7 +4663,7 @@
         <mirror:countrycode>ES</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 21:45:11 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 09:07:47 -0000</pubDate>
 
       <guid>ftp://ftp.cesca.cat/ubuntu/release/</guid>
     </item>
@@ -4843,7 +4683,7 @@
         <mirror:countrycode>HU</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 21:45:11 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 09:07:48 -0000</pubDate>
 
       <guid>http://ftp.freepark.org/pub/CDROM-Images/ubuntu/</guid>
     </item>
@@ -4863,49 +4703,49 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 21:45:12 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 09:07:48 -0000</pubDate>
 
       <guid>http://ftp.hosteurope.de/mirror/releases.ubuntu.com/</guid>
     </item>
     <item>
-      <title>LitNET</title>
-      <link>http://ftp.litnet.lt/pub/ubuntu-cd/</link>
+      <title>Linux Kullanıcıları Derneği</title>
+      <link>http://ftp.linux.org.tr/ubuntu-releases/</link>
 
       <description>
-        Academic and Research Network in Lithuania
+        
       </description>
 
       <mirror:bandwidth>70</mirror:bandwidth>
 
       <mirror:location>
-        <mirror:continent>Europe</mirror:continent>
-        <mirror:country>Lithuania</mirror:country>
-        <mirror:countrycode>LT</mirror:countrycode>
+        <mirror:continent>Asia</mirror:continent>
+        <mirror:country>Turkey</mirror:country>
+        <mirror:countrycode>TR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 23:55:17 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 11:18:37 -0000</pubDate>
 
-      <guid>http://ftp.litnet.lt/pub/ubuntu-cd/</guid>
+      <guid>http://ftp.linux.org.tr/ubuntu-releases/</guid>
     </item>
     <item>
-      <title>National Chi Nan University</title>
-      <link>http://ftp.ncnu.edu.tw/Linux/ubuntu/ubuntu-cd/</link>
+      <title>LitNET</title>
+      <link>http://ftp.litnet.lt/pub/ubuntu-cd/</link>
 
       <description>
-        A public ftp server of NCNU
+        Academic and Research Network in Lithuania
       </description>
 
       <mirror:bandwidth>70</mirror:bandwidth>
 
       <mirror:location>
-        <mirror:continent>Asia</mirror:continent>
-        <mirror:country>Taiwan</mirror:country>
-        <mirror:countrycode>TW</mirror:countrycode>
+        <mirror:continent>Europe</mirror:continent>
+        <mirror:country>Lithuania</mirror:country>
+        <mirror:countrycode>LT</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 23:55:17 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 11:18:37 -0000</pubDate>
 
-      <guid>http://ftp.ncnu.edu.tw/Linux/ubuntu/ubuntu-cd/</guid>
+      <guid>http://ftp.litnet.lt/pub/ubuntu-cd/</guid>
     </item>
     <item>
       <title>Technische Universitaet Clausthal</title>
@@ -4923,7 +4763,7 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 23:55:19 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 11:18:38 -0000</pubDate>
 
       <guid>http://ftp.tu-clausthal.de/ftp/mirror/ubuntu/releases/</guid>
     </item>
@@ -4943,7 +4783,7 @@
         <mirror:countrycode>FR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 23:55:19 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 11:18:38 -0000</pubDate>
 
       <guid>http://ftp.u-picardie.fr/mirror/ubuntu/releases/</guid>
     </item>
@@ -4963,7 +4803,7 @@
         <mirror:countrycode>ID</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 23:55:20 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 11:18:38 -0000</pubDate>
 
       <guid>http://jaran.undip.ac.id/ubuntu-iso/</guid>
     </item>
@@ -4983,7 +4823,7 @@
         <mirror:countrycode>RU</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 23:55:20 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 11:18:38 -0000</pubDate>
 
       <guid>http://linux.nsu.ru/ubuntu-releases/</guid>
     </item>
@@ -5003,29 +4843,29 @@
         <mirror:countrycode>LS</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 23:55:20 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 11:18:38 -0000</pubDate>
 
       <guid>http://ls.releases.ubuntu.com/</guid>
     </item>
     <item>
-      <title>Michigan Tech Linux Users' Group</title>
-      <link>http://lug.mtu.edu/ubuntu-iso/</link>
+      <title>FPT Telecom</title>
+      <link>http://mirror-fpt-telecom.fpt.net/ubuntu-releases/</link>
 
       <description>
-        MTU LUG
+        The FPT aims to be a company guided by technology innovations, committed to the highest level of customer and shareholder satisfaction, contributing at best to the society, and having the most favorable working environment for all employees that enables them to explore their maximum potential in professional career as well as cultural life
       </description>
 
       <mirror:bandwidth>70</mirror:bandwidth>
 
       <mirror:location>
-        <mirror:continent>North America</mirror:continent>
-        <mirror:country>United States</mirror:country>
-        <mirror:countrycode>US</mirror:countrycode>
+        <mirror:continent>Asia</mirror:continent>
+        <mirror:country>Viet Nam</mirror:country>
+        <mirror:countrycode>VN</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 01:40:39 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 13:45:20 -0000</pubDate>
 
-      <guid>http://lug.mtu.edu/ubuntu-iso/</guid>
+      <guid>http://mirror-fpt-telecom.fpt.net/ubuntu-releases/</guid>
     </item>
     <item>
       <title>Aptus Solutions</title>
@@ -5043,7 +4883,7 @@
         <mirror:countrycode>TZ</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 01:40:40 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 13:45:20 -0000</pubDate>
 
       <guid>http://mirror.aptus.co.tz/pub/ubuntu/</guid>
     </item>
@@ -5063,7 +4903,7 @@
         <mirror:countrycode>ZA</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 01:40:40 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 13:45:20 -0000</pubDate>
 
       <guid>http://mirror.bitco.co.za/ubuntu-releases/</guid>
     </item>
@@ -5083,7 +4923,7 @@
         <mirror:countrycode>CN</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 01:40:40 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 13:45:20 -0000</pubDate>
 
       <guid>http://mirror.bjtu.edu.cn/ubuntu-releases/</guid>
     </item>
@@ -5103,13 +4943,13 @@
         <mirror:countrycode>EC</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 01:40:40 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 13:45:20 -0000</pubDate>
 
       <guid>http://mirror.cedia.org.ec/ubuntu-releases/</guid>
     </item>
     <item>
-      <title>Crazy Network</title>
-      <link>http://mirror.crazynetwork.it/ubuntu/release/</link>
+      <title>CityNet Host</title>
+      <link>http://mirror.city.net.tr/ubuntu-releases/</link>
 
       <description>
         
@@ -5118,98 +4958,118 @@
       <mirror:bandwidth>70</mirror:bandwidth>
 
       <mirror:location>
-        <mirror:continent>Europe</mirror:continent>
-        <mirror:country>Italy</mirror:country>
-        <mirror:countrycode>IT</mirror:countrycode>
+        <mirror:continent>Asia</mirror:continent>
+        <mirror:country>Turkey</mirror:country>
+        <mirror:countrycode>TR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 03:49:22 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 13:45:20 -0000</pubDate>
 
-      <guid>http://mirror.crazynetwork.it/ubuntu/release/</guid>
+      <guid>http://mirror.city.net.tr/ubuntu-releases/</guid>
     </item>
     <item>
-      <title>Harvey Mudd College</title>
-      <link>http://mirror.hmc.edu/ubuntu-releases/</link>
+      <title>Crazy Network</title>
+      <link>http://mirror.crazynetwork.it/ubuntu/release/</link>
 
       <description>
-        Release mirror
+        
       </description>
 
       <mirror:bandwidth>70</mirror:bandwidth>
 
       <mirror:location>
-        <mirror:continent>North America</mirror:continent>
-        <mirror:country>United States</mirror:country>
-        <mirror:countrycode>US</mirror:countrycode>
+        <mirror:continent>Europe</mirror:continent>
+        <mirror:country>Italy</mirror:country>
+        <mirror:countrycode>IT</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 03:49:23 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 13:45:21 -0000</pubDate>
 
-      <guid>http://mirror.hmc.edu/ubuntu-releases/</guid>
+      <guid>http://mirror.crazynetwork.it/ubuntu/release/</guid>
     </item>
     <item>
-      <title>Internode</title>
-      <link>http://mirror.internode.on.net/pub/ubuntu/releases/</link>
+      <title>ESPOCH</title>
+      <link>http://mirror.espoch.edu.ec/ubuntu-releases/</link>
 
       <description>
-        Internode
+        Escuela Superior Politécnica de Chimborazo
       </description>
 
       <mirror:bandwidth>70</mirror:bandwidth>
 
       <mirror:location>
-        <mirror:continent>Oceania</mirror:continent>
-        <mirror:country>Australia</mirror:country>
-        <mirror:countrycode>AU</mirror:countrycode>
+        <mirror:continent>South America</mirror:continent>
+        <mirror:country>Ecuador</mirror:country>
+        <mirror:countrycode>EC</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 03:49:23 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 13:45:21 -0000</pubDate>
 
-      <guid>http://mirror.internode.on.net/pub/ubuntu/releases/</guid>
+      <guid>http://mirror.espoch.edu.ec/ubuntu-releases/</guid>
     </item>
     <item>
-      <title>Iranserver</title>
-      <link>http://mirror.iranserver.com/releases/</link>
+      <title>Escuela Superior Politécnica del Litoral (ESPOL)</title>
+      <link>http://mirror.espol.edu.ec/ubuntu-releases/</link>
 
       <description>
-        
+        Escuela Superior Politécnica del Litoral
       </description>
 
       <mirror:bandwidth>70</mirror:bandwidth>
 
       <mirror:location>
-        <mirror:continent>Asia</mirror:continent>
-        <mirror:country>Iran, Islamic Republic of</mirror:country>
-        <mirror:countrycode>IR</mirror:countrycode>
+        <mirror:continent>South America</mirror:continent>
+        <mirror:country>Ecuador</mirror:country>
+        <mirror:countrycode>EC</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Thu, 11 Sep 2014 19:54:36 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 13:45:21 -0000</pubDate>
 
-      <guid>http://mirror.iranserver.com/releases/</guid>
+      <guid>http://mirror.espol.edu.ec/ubuntu-releases/</guid>
     </item>
     <item>
-      <title>Israel Internet Association</title>
-      <link>http://mirror.isoc.org.il/pub/ubuntu-releases/</link>
+      <title>Harvey Mudd College</title>
+      <link>http://mirror.hmc.edu/ubuntu-releases/</link>
 
       <description>
-        
+        Release mirror
       </description>
 
       <mirror:bandwidth>70</mirror:bandwidth>
 
       <mirror:location>
-        <mirror:continent>Asia</mirror:continent>
-        <mirror:country>Israel</mirror:country>
-        <mirror:countrycode>IL</mirror:countrycode>
+        <mirror:continent>North America</mirror:continent>
+        <mirror:country>United States</mirror:country>
+        <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 03:49:23 -0000</pubDate>
+      <pubDate>Mon, 27 Apr 2015 13:45:21 -0000</pubDate>
 
-      <guid>http://mirror.isoc.org.il/pub/ubuntu-releases/</guid>
+      <guid>http://mirror.hmc.edu/ubuntu-releases/</guid>
     </item>
     <item>
-      <title>Dalhousie University</title>
-      <link>http://mirror.its.dal.ca/ubuntu-releases/</link>
+      <title>Internode</title>
+      <link>http://mirror.internode.on.net/pub/ubuntu/releases/</link>
+
+      <description>
+        Internode
+      </description>
+
+      <mirror:bandwidth>70</mirror:bandwidth>
+
+      <mirror:location>
+        <mirror:continent>Oceania</mirror:continent>
+        <mirror:country>Australia</mirror:country>
+        <mirror:countrycode>AU</mirror:countrycode>
+      </mirror:location>
+
+      <pubDate>Mon, 27 Apr 2015 13:45:21 -0000</pubDate>
+
+      <guid>http://mirror.internode.on.net/pub/ubuntu/releases/</guid>
+    </item>
+    <item>
+      <title>Iranserver</title>
+      <link>http://mirror.iranserver.com/releases/</link>
 
       <description>
         
@@ -5218,34 +5078,34 @@
       <mirror:bandwidth>70</mirror:bandwidth>
 
       <mirror:location>
-        <mirror:continent>North America</mirror:continent>
-        <mirror:country>Canada</mirror:country>
-        <mirror:countrycode>CA</mirror:countrycode>
+        <mirror:continent>Asia</mirror:continent>
+        <mirror:country>Iran, Islamic Republic of</mirror:country>
+        <mirror:countrycode>IR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 03:49:24 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:06 -0000</pubDate>
 
-      <guid>http://mirror.its.dal.ca/ubuntu-releases/</guid>
+      <guid>http://mirror.iranserver.com/releases/</guid>
     </item>
     <item>
-      <title>Lanka Education and Research Network (LEARN)</title>
-      <link>http://mirror.learn.ac.lk/ubuntu-releases/</link>
+      <title>Israel Internet Association</title>
+      <link>http://mirror.isoc.org.il/pub/ubuntu-releases/</link>
 
       <description>
-        Lanka Education and Research Network (LEARN)
+        
       </description>
 
       <mirror:bandwidth>70</mirror:bandwidth>
 
       <mirror:location>
         <mirror:continent>Asia</mirror:continent>
-        <mirror:country>Sri Lanka</mirror:country>
-        <mirror:countrycode>LK</mirror:countrycode>
+        <mirror:country>Israel</mirror:country>
+        <mirror:countrycode>IL</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 05:27:55 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:06 -0000</pubDate>
 
-      <guid>http://mirror.learn.ac.lk/ubuntu-releases/</guid>
+      <guid>http://mirror.isoc.org.il/pub/ubuntu-releases/</guid>
     </item>
     <item>
       <title>University of Cyprus, Library</title>
@@ -5263,7 +5123,7 @@
         <mirror:countrycode>CY</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 05:27:55 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:07 -0000</pubDate>
 
       <guid>http://mirror.library.ucy.ac.cy/linux/ubuntu/releases/</guid>
     </item>
@@ -5283,7 +5143,7 @@
         <mirror:countrycode>RU</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 05:27:56 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:07 -0000</pubDate>
 
       <guid>http://mirror.logol.ru/ubuntu-cd/</guid>
     </item>
@@ -5303,7 +5163,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 05:27:56 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:07 -0000</pubDate>
 
       <guid>http://mirror.picosecond.org/ubuntu-releases/</guid>
     </item>
@@ -5323,7 +5183,7 @@
         <mirror:countrycode>KR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 05:27:56 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:07 -0000</pubDate>
 
       <guid>http://mirror.premi.st/ubuntu-releases/</guid>
     </item>
@@ -5343,7 +5203,7 @@
         <mirror:countrycode>OM</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 07:55:19 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:07 -0000</pubDate>
 
       <guid>http://mirror.squ.edu.om/ubuntureleases/</guid>
     </item>
@@ -5363,7 +5223,7 @@
         <mirror:countrycode>VN</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 07:55:20 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:07 -0000</pubDate>
 
       <guid>http://mirrors.digipower.vn/ubuntu/releases/</guid>
     </item>
@@ -5383,7 +5243,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 07:55:21 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:07 -0000</pubDate>
 
       <guid>http://mirrors.einstein.yu.edu/ubuntu/releases/</guid>
     </item>
@@ -5403,7 +5263,7 @@
         <mirror:countrycode>CN</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 07:55:21 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:07 -0000</pubDate>
 
       <guid>http://mirrors.hust.edu.cn/ubuntu-releases/</guid>
     </item>
@@ -5423,13 +5283,13 @@
         <mirror:countrycode>CN</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 07:55:21 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:08 -0000</pubDate>
 
       <guid>http://mirrors.hustunique.com/ubuntu-releases/</guid>
     </item>
     <item>
-      <title>Nayatel (Pvt) Ltd</title>
-      <link>http://mirrors.nayatel.com/ubuntu-releases/</link>
+      <title>Melbourne Server Hosting Ltd.</title>
+      <link>http://mirrors.melbourne.co.uk/ubuntu-releases/</link>
 
       <description>
         
@@ -5438,41 +5298,41 @@
       <mirror:bandwidth>70</mirror:bandwidth>
 
       <mirror:location>
-        <mirror:continent>Asia</mirror:continent>
-        <mirror:country>Pakistan</mirror:country>
-        <mirror:countrycode>PK</mirror:countrycode>
+        <mirror:continent>Europe</mirror:continent>
+        <mirror:country>United Kingdom</mirror:country>
+        <mirror:countrycode>GB</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 19:37:50 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:08 -0000</pubDate>
 
-      <guid>http://mirrors.nayatel.com/ubuntu-releases/</guid>
+      <guid>http://mirrors.melbourne.co.uk/ubuntu-releases/</guid>
     </item>
     <item>
-      <title>Dalian Neusoft University of Information</title>
-      <link>http://mirrors.neusoft.edu.cn/ubuntu-releases/</link>
+      <title>Nayatel (Pvt) Ltd</title>
+      <link>http://mirrors.nayatel.com/ubuntu-releases/</link>
 
       <description>
-        Dalian Neusoft University of Information
+        
       </description>
 
       <mirror:bandwidth>70</mirror:bandwidth>
 
       <mirror:location>
         <mirror:continent>Asia</mirror:continent>
-        <mirror:country>China</mirror:country>
-        <mirror:countrycode>CN</mirror:countrycode>
+        <mirror:country>Pakistan</mirror:country>
+        <mirror:countrycode>PK</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 17:36:23 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:08 -0000</pubDate>
 
-      <guid>http://mirrors.neusoft.edu.cn/ubuntu-releases/</guid>
+      <guid>http://mirrors.nayatel.com/ubuntu-releases/</guid>
     </item>
     <item>
-      <title>China OSS Promotion Union</title>
-      <link>http://mirrors.oss.org.cn/ubuntuiso/</link>
+      <title>Dalian Neusoft University of Information</title>
+      <link>http://mirrors.neusoft.edu.cn/ubuntu-releases/</link>
 
       <description>
-        provide ubuntu CD for users
+        Dalian Neusoft University of Information
       </description>
 
       <mirror:bandwidth>70</mirror:bandwidth>
@@ -5483,9 +5343,9 @@
         <mirror:countrycode>CN</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 09:37:50 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:08 -0000</pubDate>
 
-      <guid>http://mirrors.oss.org.cn/ubuntuiso/</guid>
+      <guid>http://mirrors.neusoft.edu.cn/ubuntu-releases/</guid>
     </item>
     <item>
       <title>TENET</title>
@@ -5503,7 +5363,7 @@
         <mirror:countrycode>MZ</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 09:37:51 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:08 -0000</pubDate>
 
       <guid>http://mz.releases.ubuntu.com/</guid>
     </item>
@@ -5523,7 +5383,7 @@
         <mirror:countrycode>NA</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 09:37:51 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:08 -0000</pubDate>
 
       <guid>http://na.releases.ubuntu.com/</guid>
     </item>
@@ -5543,30 +5403,10 @@
         <mirror:countrycode>MY</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 09:37:51 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:08 -0000</pubDate>
 
       <guid>http://oss.mmu.edu.my/pub/ubuntu-releases/</guid>
     </item>
-    <item>
-      <title>Piotrkosoft.net - Data Storage Center</title>
-      <link>http://piotrkosoft.net/pub/mirrors/ubuntu-releases/</link>
-
-      <description>
-        Piotrkosoft.net - Data Storage Center.  Worldwide mirror service. Polish Public FTP archive
-      </description>
-
-      <mirror:bandwidth>70</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Europe</mirror:continent>
-        <mirror:country>Poland</mirror:country>
-        <mirror:countrycode>PL</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Fri, 12 Sep 2014 09:37:51 -0000</pubDate>
-
-      <guid>http://piotrkosoft.net/pub/mirrors/ubuntu-releases/</guid>
-    </item>
     <item>
       <title>GARR/CILEA mirror service</title>
       <link>http://na.mirror.garr.it/mirrors/ubuntu-releases/</link>
@@ -5583,7 +5423,7 @@
         <mirror:countrycode>IT</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 09:37:51 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:08 -0000</pubDate>
 
       <guid>http://na.mirror.garr.it/mirrors/ubuntu-releases/</guid>
     </item>
@@ -5603,7 +5443,7 @@
         <mirror:countrycode>GB</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 09:37:51 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:08 -0000</pubDate>
 
       <guid>http://releases.ubuntu.com/</guid>
     </item>
@@ -5623,7 +5463,7 @@
         <mirror:countrycode>NC</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 09:37:51 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:08 -0000</pubDate>
 
       <guid>http://releases.ubuntu.nautile.nc/</guid>
     </item>
@@ -5643,7 +5483,7 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Tue, 09 Sep 2014 21:39:52 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:08 -0000</pubDate>
 
       <guid>http://releases.ubuntu.repulsive.eu/</guid>
     </item>
@@ -5663,29 +5503,29 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Tue, 09 Sep 2014 21:39:52 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:08 -0000</pubDate>
 
       <guid>http://releases.ubuntu.uasw.edu/</guid>
     </item>
     <item>
-      <title>ShellMix.com</title>
-      <link>http://mirror.shellmix.com/ubuntu-releases/</link>
+      <title>Webxcreen</title>
+      <link>http://releases.ubuntu.webxcreen.org/</link>
 
       <description>
-        HTTP Mirror, Releases/Images Only No Packages
+        Internet Services
       </description>
 
       <mirror:bandwidth>70</mirror:bandwidth>
 
       <mirror:location>
-        <mirror:continent>Europe</mirror:continent>
-        <mirror:country>Germany</mirror:country>
-        <mirror:countrycode>DE</mirror:countrycode>
+        <mirror:continent>North America</mirror:continent>
+        <mirror:country>Mexico</mirror:country>
+        <mirror:countrycode>MX</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 01:40:40 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:08 -0000</pubDate>
 
-      <guid>http://mirror.shellmix.com/ubuntu-releases/</guid>
+      <guid>http://releases.ubuntu.webxcreen.org/</guid>
     </item>
     <item>
       <title>TENET</title>
@@ -5703,7 +5543,7 @@
         <mirror:countrycode>SZ</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Tue, 09 Sep 2014 21:39:53 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:09 -0000</pubDate>
 
       <guid>http://sz.releases.ubuntu.com/</guid>
     </item>
@@ -5723,29 +5563,29 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Tue, 09 Sep 2014 23:31:04 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:09 -0000</pubDate>
 
       <guid>http://ubuntu-releases.eecs.wsu.edu/</guid>
     </item>
     <item>
-      <title>Cohesion Network Security Studio</title>
-      <link>http://ubuntu.cnssuestc.org/ubuntu-releases/</link>
+      <title>Ubuntu.grantbrooks.org</title>
+      <link>http://ubuntu.grantbrooks.org/releases/</link>
 
       <description>
-        Cohesion Network Security Studio
+        
       </description>
 
       <mirror:bandwidth>70</mirror:bandwidth>
 
       <mirror:location>
-        <mirror:continent>Asia</mirror:continent>
-        <mirror:country>China</mirror:country>
-        <mirror:countrycode>CN</mirror:countrycode>
+        <mirror:continent>North America</mirror:continent>
+        <mirror:country>United States</mirror:country>
+        <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Tue, 09 Sep 2014 23:31:05 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:09 -0000</pubDate>
 
-      <guid>http://ubuntu.cnssuestc.org/ubuntu-releases/</guid>
+      <guid>http://ubuntu.grantbrooks.org/releases/</guid>
     </item>
     <item>
       <title>GRN Serveis telemàtics</title>
@@ -5763,30 +5603,10 @@
         <mirror:countrycode>ES</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Tue, 09 Sep 2014 23:31:05 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:09 -0000</pubDate>
 
       <guid>http://ubuntu.grn.cat/ubuntu-releases/</guid>
     </item>
-    <item>
-      <title>INTERHOST</title>
-      <link>http://ubuntu.interhost.co.il/</link>
-
-      <description>
-        Hosting Services &amp; Network Solutions
-      </description>
-
-      <mirror:bandwidth>70</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Asia</mirror:continent>
-        <mirror:country>Israel</mirror:country>
-        <mirror:countrycode>IL</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Tue, 09 Sep 2014 23:31:06 -0000</pubDate>
-
-      <guid>http://ubuntu.interhost.co.il/</guid>
-    </item>
     <item>
       <title>lagis Internet Serviceprovider GmbH</title>
       <link>http://ubuntu.lagis.at/releases/</link>
@@ -5803,7 +5623,7 @@
         <mirror:countrycode>AT</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Tue, 09 Sep 2014 23:31:06 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:10 -0000</pubDate>
 
       <guid>http://ubuntu.lagis.at/releases/</guid>
     </item>
@@ -5823,7 +5643,7 @@
         <mirror:countrycode>KE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 01:54:09 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:10 -0000</pubDate>
 
       <guid>http://ubuntu.mirror.ac.ke/ubuntu-release/</guid>
     </item>
@@ -5843,50 +5663,10 @@
         <mirror:countrycode>ZA</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 01:54:09 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:10 -0000</pubDate>
 
       <guid>http://ubuntu.mirror.ac.za/ubuntu-release/</guid>
     </item>
-    <item>
-      <title>Hoobly</title>
-      <link>http://ubuntu.mirrors.hoobly.com/</link>
-
-      <description>
-        Classified Ads
-      </description>
-
-      <mirror:bandwidth>70</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>North America</mirror:continent>
-        <mirror:country>United States</mirror:country>
-        <mirror:countrycode>US</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Wed, 10 Sep 2014 01:54:09 -0000</pubDate>
-
-      <guid>http://ubuntu.mirrors.hoobly.com/</guid>
-    </item>
-    <item>
-      <title>Openharbor</title>
-      <link>http://ubuntu.openharbor.net/</link>
-
-      <description>
-        The Openharbor ubuntu release mirror
-      </description>
-
-      <mirror:bandwidth>70</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>North America</mirror:continent>
-        <mirror:country>United States</mirror:country>
-        <mirror:countrycode>US</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Wed, 10 Sep 2014 01:54:10 -0000</pubDate>
-
-      <guid>http://ubuntu.openharbor.net/</guid>
-    </item>
     <item>
       <title>Qualitynet</title>
       <link>http://ubuntu.qualitynet.net/releases/</link>
@@ -5903,29 +5683,29 @@
         <mirror:countrycode>KW</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 01:54:10 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:10 -0000</pubDate>
 
       <guid>http://ubuntu.qualitynet.net/releases/</guid>
     </item>
     <item>
-      <title>VXRoutes Limited</title>
-      <link>http://ubuntu.vxroutes.com/</link>
+      <title>TAP (St. James R-1 Public Schools)</title>
+      <link>http://ubuntu.stjschools.org/releases/</link>
 
       <description>
-        Mirror Server
+        
       </description>
 
       <mirror:bandwidth>70</mirror:bandwidth>
 
       <mirror:location>
-        <mirror:continent>Asia</mirror:continent>
-        <mirror:country>Hong Kong</mirror:country>
-        <mirror:countrycode>HK</mirror:countrycode>
+        <mirror:continent>North America</mirror:continent>
+        <mirror:country>United States</mirror:country>
+        <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 03:46:25 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:10 -0000</pubDate>
 
-      <guid>http://ubuntu.vxroutes.com/</guid>
+      <guid>http://ubuntu.stjschools.org/releases/</guid>
     </item>
     <item>
       <title>Antik Computer &amp; Communications</title>
@@ -5943,7 +5723,7 @@
         <mirror:countrycode>SK</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 03:46:25 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:11 -0000</pubDate>
 
       <guid>http://ubuntu.antik.sk/ubuntu-releases/</guid>
     </item>
@@ -5963,30 +5743,10 @@
         <mirror:countrycode>JP</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 03:46:25 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:11 -0000</pubDate>
 
       <guid>http://www.ftp.ne.jp/Linux/packages/ubuntu/releases-cd/</guid>
     </item>
-    <item>
-      <title>Yazd University</title>
-      <link>http://mirror.yazd.ac.ir/ubuntu/</link>
-
-      <description>
-        Yazd University
-      </description>
-
-      <mirror:bandwidth>70</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Asia</mirror:continent>
-        <mirror:country>Iran, Islamic Republic of</mirror:country>
-        <mirror:countrycode>IR</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Wed, 10 Sep 2014 03:46:25 -0000</pubDate>
-
-      <guid>http://mirror.yazd.ac.ir/ubuntu/</guid>
-    </item>
     <item>
       <title>TENET</title>
       <link>http://zw.releases.ubuntu.com/</link>
@@ -6003,7 +5763,7 @@
         <mirror:countrycode>ZW</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 05:30:08 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:11 -0000</pubDate>
 
       <guid>http://zw.releases.ubuntu.com/</guid>
     </item>
@@ -6023,30 +5783,10 @@
         <mirror:countrycode>FR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 05:30:09 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:11 -0000</pubDate>
 
       <guid>http://distrib-coffee.ipsl.jussieu.fr/pub/linux/ubuntu-releases/</guid>
     </item>
-    <item>
-      <title>The University of Texas at Austin</title>
-      <link>http://ftp.utexas.edu/ubuntu-iso/CDs/</link>
-
-      <description>
-        
-      </description>
-
-      <mirror:bandwidth>65</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>North America</mirror:continent>
-        <mirror:country>United States</mirror:country>
-        <mirror:countrycode>US</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Wed, 10 Sep 2014 05:30:09 -0000</pubDate>
-
-      <guid>http://ftp.utexas.edu/ubuntu-iso/CDs/</guid>
-    </item>
     <item>
       <title>Tele Greenland A/S</title>
       <link>http://mirror.greennet.gl/releases/</link>
@@ -6063,30 +5803,10 @@
         <mirror:countrycode>GL</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 05:30:09 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:12 -0000</pubDate>
 
       <guid>http://mirror.greennet.gl/releases/</guid>
     </item>
-    <item>
-      <title>DOST-ASTI</title>
-      <link>http://mirror.pregi.net/pub/Linux/ubuntu-iso/</link>
-
-      <description>
-        Mirror provided by PREGINET (www.pregi.net)
-      </description>
-
-      <mirror:bandwidth>65</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Asia</mirror:continent>
-        <mirror:country>Philippines</mirror:country>
-        <mirror:countrycode>PH</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Wed, 10 Sep 2014 05:30:09 -0000</pubDate>
-
-      <guid>http://mirror.pregi.net/pub/Linux/ubuntu-iso/</guid>
-    </item>
     <item>
       <title>University of West Georgia</title>
       <link>http://reflector.westga.edu/repos/Ubuntu/releases/</link>
@@ -6103,50 +5823,10 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 07:50:35 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:12 -0000</pubDate>
 
       <guid>http://reflector.westga.edu/repos/Ubuntu/releases/</guid>
     </item>
-    <item>
-      <title>SchoolNet - Sri Lanka (under MInistry of Education)</title>
-      <link>http://releases.ubuntu.schoolnet.lk/</link>
-
-      <description>
-        SchoolNet is a network (VPN) connecting all Secondary Schools in Sri Lanka. Technical management of SchoolNet is done by University of Moratuwa.
-      </description>
-
-      <mirror:bandwidth>65</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Asia</mirror:continent>
-        <mirror:country>Sri Lanka</mirror:country>
-        <mirror:countrycode>LK</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Wed, 10 Sep 2014 07:50:35 -0000</pubDate>
-
-      <guid>http://releases.ubuntu.schoolnet.lk/</guid>
-    </item>
-    <item>
-      <title>Ubuntu.grantbrooks.org</title>
-      <link>http://ubuntu.grantbrooks.org/releases/</link>
-
-      <description>
-        
-      </description>
-
-      <mirror:bandwidth>65</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>North America</mirror:continent>
-        <mirror:country>United States</mirror:country>
-        <mirror:countrycode>US</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Fri, 12 Sep 2014 09:37:52 -0000</pubDate>
-
-      <guid>http://ubuntu.grantbrooks.org/releases/</guid>
-    </item>
     <item>
       <title>Sarkor-Telecom</title>
       <link>http://ubuntu.snet.uz/releases/</link>
@@ -6163,19 +5843,19 @@
         <mirror:countrycode>UZ</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 07:50:35 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:12 -0000</pubDate>
 
       <guid>http://ubuntu.snet.uz/releases/</guid>
     </item>
     <item>
-      <title>TAP (St. James R-1 Public Schools)</title>
-      <link>http://ubuntu.stjschools.org/releases/</link>
+      <title>Ftp-mirror.internap.com</title>
+      <link>http://ftp-mirror.internap.com/pub/ubuntu-releases/</link>
 
       <description>
         
       </description>
 
-      <mirror:bandwidth>65</mirror:bandwidth>
+      <mirror:bandwidth>60</mirror:bandwidth>
 
       <mirror:location>
         <mirror:continent>North America</mirror:continent>
@@ -6183,29 +5863,9 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Fri, 12 Sep 2014 07:55:21 -0000</pubDate>
-
-      <guid>http://ubuntu.stjschools.org/releases/</guid>
-    </item>
-    <item>
-      <title>Polytechnic of Namibia</title>
-      <link>http://download.polytechnic.edu.na/pub/ubuntu-release/</link>
-
-      <description>
-        
-      </description>
-
-      <mirror:bandwidth>60</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Africa</mirror:continent>
-        <mirror:country>Namibia</mirror:country>
-        <mirror:countrycode>NA</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Wed, 10 Sep 2014 07:50:35 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:12 -0000</pubDate>
 
-      <guid>http://download.polytechnic.edu.na/pub/ubuntu-release/</guid>
+      <guid>http://ftp-mirror.internap.com/pub/ubuntu-releases/</guid>
     </item>
     <item>
       <title>Ftp-stud.fht-esslingen.de</title>
@@ -6223,7 +5883,7 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 07:50:36 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:12 -0000</pubDate>
 
       <guid>http://ftp-stud.fht-esslingen.de/Mirrors/releases.ubuntu.com/</guid>
     </item>
@@ -6243,7 +5903,7 @@
         <mirror:countrycode>RO</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 09:51:42 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:13 -0000</pubDate>
 
       <guid>http://ftp.lug.ro/ubuntu-releases/</guid>
     </item>
@@ -6263,7 +5923,7 @@
         <mirror:countrycode>PL</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 09:51:42 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:13 -0000</pubDate>
 
       <guid>ftp://ftp.man.szczecin.pl/pub/Linux/ubuntu-cd/</guid>
     </item>
@@ -6283,7 +5943,7 @@
         <mirror:countrycode>DE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 09:51:42 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:13 -0000</pubDate>
 
       <guid>http://ftp.tu-chemnitz.de/pub/linux/ubuntu-releases/</guid>
     </item>
@@ -6303,7 +5963,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 09:51:42 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:13 -0000</pubDate>
 
       <guid>http://ftp.ucsb.edu/pub/mirrors/linux/ubuntu/</guid>
     </item>
@@ -6323,7 +5983,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 09:51:42 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:13 -0000</pubDate>
 
       <guid>http://ftp.ussg.iu.edu/linux/ubuntu-releases/</guid>
     </item>
@@ -6343,7 +6003,7 @@
         <mirror:countrycode>ZA</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Tue, 09 Sep 2014 23:31:06 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:13 -0000</pubDate>
 
       <guid>http://ftp.wa.co.za/pub/ubuntu/releases/</guid>
     </item>
@@ -6363,69 +6023,29 @@
         <mirror:countrycode>NL</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 11:43:06 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:13 -0000</pubDate>
 
       <guid>ftp://ftpserv.tudelft.nl/pub/Linux/releases.ubuntu.com/</guid>
     </item>
     <item>
-      <title>ArLUG (Arad Linux Users Group)</title>
-      <link>http://mirror.arlug.ro/pub/ubuntu/ubuntu-releases/</link>
-
-      <description>
-        
-      </description>
-
-      <mirror:bandwidth>60</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Europe</mirror:continent>
-        <mirror:country>Romania</mirror:country>
-        <mirror:countrycode>RO</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Wed, 10 Sep 2014 11:43:06 -0000</pubDate>
-
-      <guid>http://mirror.arlug.ro/pub/ubuntu/ubuntu-releases/</guid>
-    </item>
-    <item>
-      <title>Calvin College</title>
-      <link>http://mirror.calvin.edu/ubuntu-releases/</link>
-
-      <description>
-        
-      </description>
-
-      <mirror:bandwidth>60</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>North America</mirror:continent>
-        <mirror:country>United States</mirror:country>
-        <mirror:countrycode>US</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Wed, 10 Sep 2014 11:43:06 -0000</pubDate>
-
-      <guid>http://mirror.calvin.edu/ubuntu-releases/</guid>
-    </item>
-    <item>
-      <title>University of Calgary</title>
-      <link>http://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/releases/</link>
+      <title>CityNet Host</title>
+      <link>http://mirror.citynethost.com/ubuntu-releases/</link>
 
       <description>
-        
+        Cairo/Egypt
       </description>
 
       <mirror:bandwidth>60</mirror:bandwidth>
 
       <mirror:location>
-        <mirror:continent>North America</mirror:continent>
-        <mirror:country>Canada</mirror:country>
-        <mirror:countrycode>CA</mirror:countrycode>
+        <mirror:continent>Africa</mirror:continent>
+        <mirror:country>Egypt</mirror:country>
+        <mirror:countrycode>EG</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 11:43:07 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:13 -0000</pubDate>
 
-      <guid>http://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/releases/</guid>
+      <guid>http://mirror.citynethost.com/ubuntu-releases/</guid>
     </item>
     <item>
       <title>Mirror.cs.umn.edu</title>
@@ -6443,7 +6063,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 11:43:07 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:14 -0000</pubDate>
 
       <guid>http://mirror.cs.umn.edu/ubuntu-releases/</guid>
     </item>
@@ -6463,7 +6083,7 @@
         <mirror:countrycode>AU</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 14:04:03 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:14 -0000</pubDate>
 
       <guid>http://mirror.waia.asn.au/ubuntu-releases/</guid>
     </item>
@@ -6483,7 +6103,7 @@
         <mirror:countrycode>US</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 14:04:04 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:14 -0000</pubDate>
 
       <guid>http://osmirrors.cerias.purdue.edu/pub/ubuntu-releases/</guid>
     </item>
@@ -6503,7 +6123,7 @@
         <mirror:countrycode>CZ</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 15:57:07 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:14 -0000</pubDate>
 
       <guid>http://releases.ubuntu.cz/</guid>
     </item>
@@ -6523,30 +6143,10 @@
         <mirror:countrycode>GE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 17:36:23 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:15 -0000</pubDate>
 
       <guid>http://ubuntu.grena.ge/releases/</guid>
     </item>
-    <item>
-      <title>Mendoza CONICET</title>
-      <link>http://ubuntu.mirror.mendoza-conicet.gob.ar/</link>
-
-      <description>
-        Centro Científico Tecnológico - Mendoza - Argentina
-      </description>
-
-      <mirror:bandwidth>60</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>South America</mirror:continent>
-        <mirror:country>Argentina</mirror:country>
-        <mirror:countrycode>AR</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Wed, 10 Sep 2014 19:37:51 -0000</pubDate>
-
-      <guid>http://ubuntu.mirror.mendoza-conicet.gob.ar/</guid>
-    </item>
     <item>
       <title>Ubuntu.mirrors.skynet.be</title>
       <link>http://ubuntu.mirrors.skynet.be/pub/ubuntu.com/releases/</link>
@@ -6563,7 +6163,7 @@
         <mirror:countrycode>BE</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 19:37:51 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:15 -0000</pubDate>
 
       <guid>http://ubuntu.mirrors.skynet.be/pub/ubuntu.com/releases/</guid>
     </item>
@@ -6583,30 +6183,10 @@
         <mirror:countrycode>MY</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 19:37:51 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:15 -0000</pubDate>
 
       <guid>http://ubuntu.tuxuri.com/releases/</guid>
     </item>
-    <item>
-      <title>xenvps.us</title>
-      <link>http://ubuntu.xenvps.us/releases/</link>
-
-      <description>
-        
-      </description>
-
-      <mirror:bandwidth>60</mirror:bandwidth>
-
-      <mirror:location>
-        <mirror:continent>Europe</mirror:continent>
-        <mirror:country>Bulgaria</mirror:country>
-        <mirror:countrycode>BG</mirror:countrycode>
-      </mirror:location>
-
-      <pubDate>Wed, 10 Sep 2014 19:37:51 -0000</pubDate>
-
-      <guid>http://ubuntu.xenvps.us/releases/</guid>
-    </item>
     <item>
       <title>Ucr.ac.cr</title>
       <link>http://mirrors.ucr.ac.cr/ubuntu-cd/</link>
@@ -6623,7 +6203,7 @@
         <mirror:countrycode>CR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 19:37:51 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:15 -0000</pubDate>
 
       <guid>http://mirrors.ucr.ac.cr/ubuntu-cd/</guid>
     </item>
@@ -6643,7 +6223,7 @@
         <mirror:countrycode>PT</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 21:34:52 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:15 -0000</pubDate>
 
       <guid>http://releases.ubuntumirror.dei.uc.pt/</guid>
     </item>
@@ -6663,7 +6243,7 @@
         <mirror:countrycode>AR</mirror:countrycode>
       </mirror:location>
 
-      <pubDate>Wed, 10 Sep 2014 21:34:53 -0000</pubDate>
+      <pubDate>Fri, 24 Apr 2015 19:44:16 -0000</pubDate>
 
       <guid>http://releases.ubuntu.unc.edu.ar/</guid>
     </item>
diff --git a/redirects.txt b/redirects.txt
old mode 100644
new mode 100755
index 72162f14766..505ed93a62d
--- a/redirects.txt
+++ b/redirects.txt
@@ -3,16 +3,27 @@
 # please note that redirects should not have a preceding slash. Also note
 # that comments do not strictly need a #hdevices/androidash but include it for clarity.
 # The web server needs to be reloaded when changes are made to this file
+#
+# FOR MARKETING
+#
+qct  https://pages.canonical.com/QCTCloudHardware.html  # created for Jane - 10 March 2015
+qct/  https://pages.canonical.com/QCTCloudHardware.html  # created for Jane - 10 March 2015
+#
+# INTERNAL
+#
 .well-known/host-meta  http://www.ubuntu.com  #
 10.04  http://www.ubuntu.com  #
 10.04/Google  http://www.ubuntu.com  #
 2012/11/dellworld  http://insights.ubuntu.com/event/dellworld/  #
 2012/11/hpdiscover  http://insights.ubuntu.com/event/ubuntu-at-hp-discover-2012-2/  #
 2013/02/dellfrs  http://insights.ubuntu.com/event/dellfrs/  #
+2013/01/press-pack-ubuntu-phone  https://insights.ubuntu.com/2013/06/27/ubuntu-phone-press-ki/  #
+2013/02/press-pack-ubuntu-tablet  http://insights.ubuntu.com/2013/02/01/ubuntu-tablet-press-pack/  #
 2014/02/press-pack-mwc-2014  http://insights.ubuntu.com/2014/02/01/mwc-2014-online-press-pack/  #
 2014/03/vmware-openstack-webinar  http://insights.ubuntu.com/2014/03/18/customer-stories-from-openstackvmware-projects/  #
 9.10  http://www.ubuntu.com  #
 about-canonical  http://www.canonical.com/about-canonical  #
+about/about-ubuntu/derivatives  /about/about-ubuntu/flavours  #
 aboutus  /about  #
 aboutus/contactus  /contact-us  #
 aboutus/faq  /  #
@@ -22,11 +33,13 @@ aboutus/privacypolicy  http://www.ubuntu.com/privacy-policy  #
 aboutus/privacypolicy/thirdparties  /privacy-policy/third-parties  #
 aboutus/trademarkpolicy  /trademark-policy  #
 android  /devices/android  #
-arm  /partners/featured-partners/arm  #
+arm  http://partners.ubuntu.com/arm  #
 assesment-terms  /assessment-terms  #
 bigdata  http://www.ubuntu.com/business/server/overview#built-for-big-data  #
 blog  http://www.ubuntu.com/community  #
 blog/feed  http://www.canonical.com/rss.xml  #
+bootstack  /cloud/managed-cloud  #
+cloud/bootstack  /cloud/managed-cloud  #
 business  /management  #
 business/  /management  #
 business/advantage  /management/ubuntu-advantage  #
@@ -127,33 +140,49 @@ category/product/ubuntu-light  /  #
 category/product/ubuntu-server-edition  /  #
 cloud/azure  /cloud#azure  #
 cloud/build-a-cloud  /cloud/ubuntu-openstack  #
+cloud/bootstack/contact-us  /cloud/managed-cloud/contact-us  #
+cloud/bootstack/thank-you  /cloud/managed-cloud/thank-you  #
+cloud/cloud-labs  /cloud  #
 cloud/cloud-tools  /cloud/tools  #
 cloud/cloud-tools/juju  /cloud/tools/juju  #
-cloud/cloud-tools/jumpstart  /cloud/tools/jumpstart  #
+cloud/cloud-tools/jumpstart  /cloud/training  #
+cloud/cloud-tools/jumpstart-training  /cloud/training  #
 cloud/cloud-tools/maas  /cloud/tools/maas  #
-cloud/cloud-tools/openstack  /cloud/tools/openstack  #
-cloud/cloud-tools/reference-architecture  /cloud/tools/openstack/reference-architecture  #
-cloud/consultancy  http://www.ubuntu.com/cloud  #
-cloud/cool-stuff  /cloud/labs  #
+cloud/cloud-tools/openstack  /cloud/tools/ubuntu-openstack  #
+cloud/cloud-tools/reference-architecture  /cloud/tools/ubuntu-openstack/reference-architecture  #
+cloud/consultancy  /cloud  #
+cloud/cool-stuff  /cloud  #
 cloud/deployment  /cloud/orchestration/deployment  #
-cloud/ecosystem/ubuntu-oil  cloud/ecosystem/ubuntu-openstack-interoperability-lab  #
-cloud/ecosystem/ubuntu-public-cloud-programme  /cloud/ecosystem/ubuntu-certified-public-cloud  #
+cloud/ecosystem  /cloud/partners  #
+cloud/ecosystem/ubuntu-oil  cloud/partners/ubuntu-openstack-interoperability-lab  #
+cloud/ecosystem/ubuntu-public-cloud-programme  /cloud/partners/ubuntu-certified-public-cloud  #
+cloud/ecosystem/ubuntu-openstack-interoperability-lab  http://partners.ubuntu.com/partner-programmes/openstack  #
+cloud/ecosystem/ubuntu-certified-public-cloud  http://partners.ubuntu.com/partner-programmes/public-cloud  #
 cloud/insights  /cloud  #
 cloud/insights/beginners-guide  /cloud  #
-cloud/jumpstart  /cloud/solutions/jumpstart  #
-cloud/jumpstart/contact-us  /cloud/solutions/jumpstart/contact-us  #
+cloud/jumpstart  /cloud/training  #
+cloud/jumpstart-training  /cloud/training  #
+cloud/jumpstart-training/order  /cloud/training/order  #
+cloud/jumpstart-training/thank-you  /cloud/training/thank-you  #
+cloud/jumpstart/contact-us  /cloud/training/contact-us  #
+cloud/jumpstart-training/contact-us  /cloud/training/contact-us  #
+cloud/labs  /cloud  #
 cloud/maas  /cloud/tools/maas  #
+cloud/management  /cloud/plans-and-pricing  #
+cloud/openstack  /cloud/ubuntu-openstack  #
+cloud/openstack/reference-architecture  /cloud/ubuntu-openstack/reference-architecture  #
 cloud/orchestration  /cloud/tools  #
+cloud/orchestration/  /cloud/tools  #
 cloud/orchestration/deployment  /cloud/orchestration/  #
 cloud/orchestration/juju  /cloud/tools/juju  #
 cloud/orchestration/maas  /cloud/tools/maas  #
-cloud/partner-ecosystem  /cloud/ecosystem  #
+cloud/partner-ecosystem  /cloud/partners  #
 cloud/private  /business/cloud/overview  #
 cloud/private-cloud  /cloud/build-a-cloud  #
 cloud/private-cloud/build-your-own  /cloud/build-a-cloud  #
 cloud/private-cloud/hybrid-cloud  /cloud/build-a-cloud  #
-cloud/private-cloud/jumpstart  /cloud/tools/jumpstart  #
-cloud/private-cloud/openstack  /cloud/tools/openstack  #
+cloud/private-cloud/jumpstart  /cloud/training  #
+cloud/private-cloud/openstack  /cloud/ubuntu-openstack  #
 cloud/private-cloud/reference-architecture  /cloud/ubuntu-openstack/reference-architecture  #
 cloud/private-steps  /cloud/private  #
 cloud/private/deploy  /business/cloud/overview  #
@@ -167,36 +196,42 @@ cloud/public-cloud/infrastructure  /cloud/build-a-cloud  #
 cloud/public-cloud/strategy  /cloud/build-a-cloud  #
 cloud/public-steps  http://www.ubuntu.com/cloud  #
 cloud/public/deploy  /business/cloud/overview  #
-cloud/registerlondon  http://www.ubuntu.com/cloud  #
-cloud/registernyc  http://www.ubuntu.com/cloud  #
-cloud/service-providers  /cloud/ecosystem  #
-cloud/service-providers  /cloud/ecosystem  #
-cloud/services  /cloud/management  #
+cloud/registerlondon  /cloud  #
+cloud/registernyc  /cloud  #
+cloud/service-providers  /cloud/partners  #
+cloud/services  /cloud/prices-and-plans  #
 cloud/services  /management/ubuntu-advantage  #
-cloud/solutions  /cloud/management  #
-cloud/solutions/  /cloud/management  #
-cloud/solutions/jumpstart  /cloud/private-cloud/jumpstart  #
+cloud/solutions  /cloud/prices-and-plans  #
+cloud/solutions/  /cloud/prices-and-plans  #
+cloud/solutions/jumpstart  /cloud/training  #
 cloud/support  /cloud  #
 cloud/technical-resources  /cloud/tools  #
 cloud/technical-resources  /cloud/tools  #
-cloud/tools/cluster  cloud/tools/jumpstart  #
-cloud/tools/jumpstart  /cloud/tools/jumpstart-training  #
-cloud/tools/jumpstart/contact-us  /cloud/tools/jumpstart-training/contact-us  #
-cloud/tools/jumpstart/thank-you  /cloud/tools/jumpstart-training/thank-you  #
+cloud/tools/bootstack  /cloud/managed-cloud  #
+cloud/tools/bootstack/contact-us  /cloud/managed-cloud/contact-us  #
+cloud/tools/cluster  /cloud/training  #
+cloud/tools/jumpstart  /cloud/training  #
+cloud/tools/jumpstart-training  /cloud/training  #
+cloud/tools/jumpstart-training/contact-us  /cloud/training/contact-us  #
+cloud/tools/jumpstart-training/order  /cloud/training/order  #
+cloud/tools/jumpstart-training/order-thank-you  /cloud/training/order-thank-you  #
+cloud/tools/jumpstart-training/thank-you  /cloud/training/thank-you  #
+cloud/tools/jumpstart/contact-us  /cloud/tools/training/contact-us  #
+cloud/tools/jumpstart/thank-you  /cloud/tools/training/thank-you  #
 cloud/tools/openstack  /cloud/ubuntu-openstack  #
 cloud/tools/openstack/reference-architechure  /cloud/ubuntu-openstack/reference-architechure  #
-cloud/tools/openstack/reference-architecture  /cloud/ubuntu-openstack/reference-architecture  #
+cloud/tools/your-cloud  /cloud/tools/managed-cloud  #
 cloud/training  /support/training  #
 cloud/training/  /cloud  #
 cloud/use-a-cloud  /cloud/public-cloud  #
 cloud/why-ubuntu  /business/cloud  #
-cloudbox  http://www.ubuntu.com/cloud  #
-cloudbox/consultancy  http://www.ubuntu.com/cloud  #
-cloudbox/management  http://www.ubuntu.com/cloud  #
-cloudbox/private  http://www.ubuntu.com/cloud  #
-cloudbox/support  http://www.ubuntu.com/cloud  #
-cloudbox/training  http://www.ubuntu.com/cloud  #
-cluster  cloud/tools/jumpstart  #
+cloudbox  /cloud  #
+cloudbox/consultancy  /cloud  #
+cloudbox/management  /cloud  #
+cloudbox/private  /cloud  #
+cloudbox/support  /cloud  #
+cloudbox/training  /cloud  #
+cluster  /cloud/training  #
 community  http://community.ubuntu.com  #
 community/  http://community.ubuntu.com  #
 community/conduct  /about/about-ubuntu/conduct  #
@@ -267,28 +302,39 @@ desktop/get-ubuntu/download-zh  /download/zh-CN  #
 desktop/get-ubuntu/upgrade  /download/ubuntu/upgrade  #
 desktop/get-ubuntu/windows-installer  /download/ubuntu/windows-installer  #
 desktop/services  /desktop/management  #
-desktop/ubuntu-kylin-chinese  /desktop/ubuntu-kylin-zh-CN  #
+desktop/ubuntu-kylin-chinese  /desktop/ubuntu-kylin  #
+desktop/ubuntu-kylin-zh-CN  /desktop/ubuntu-kylin  #
 desktop/ubuntukylin  /desktop/ubuntu-kylin  #
-desktop/ubuntukylin-chinese  /desktop/ubuntu-kylin-chinese  #
-desktopedition  http://www.ubuntu.com/desktop  #
-developers  http://www.ubuntu.com/community/get-involved/developers  #
+desktop/ubuntukylin-chinese  /desktop/ubuntu-kylin  #
+desktopedition  /desktop  #
+desktop/business  /desktop/enterprise  #
+desktop/developers/thin-client  /desktop  #
+desktop/features/games-apps  /desktop/features  #
+desktop/features/office-applications  /desktop/features  #
+desktop/features/photos-and-videos  /desktop/features  #
+desktop/features/social-and-email  /desktop/features  #
+desktop/features/web-browsing  /desktop/features  #
+desktop/management  /management/ubuntu-advantage  #
+desktop/take-the-tour  /tour  #
+desktop/ubuntu-kylin-zh-CN  /desktop/ubuntu-kylin  #
+developers  /community/get-involved/developers  #
 devices  /phone  #
-devices/android  /phone/ubuntu-for-android  #
-devices/android/commercial-info  /phone/ubuntu-for-android/commercial-info  #
-devices/android/contact-us  /phone/ubuntu-for-android/contact-us  #
-devices/android/features-and-specs  /phone/ubuntu-for-android/features  #
-devices/android/thank-you  /phone/ubuntu-for-android/thank-you  #
-devices/backed-by-canonical  http://ubuntu.com/phone/backed-by-canonical  #
+devices/android  /phone  #
+devices/android/commercial-info  /phone  #
+devices/android/contact-us  /phone  #
+devices/android/features-and-specs  /phone  #
+devices/android/thank-you  /phone  #
+devices/backed-by-canonical  /phone  #
 devices/eyewear  /devices  #
 devices/phone  /phone  #
-devices/phone/app-ecosystem  /phone/app-ecosystem  #
-devices/phone/contact-us  /phone/contact-us  #
+devices/phone/app-ecosystem  /phone/developers  #
+devices/phone/contact-us  /phone  #
 devices/phone/design  /phone/features  #
-devices/phone/operators-and-oems  /phone/operators-and-oems  #
+devices/phone/operators-and-oems  /phone/partners  #
 devices/phone/thank-you  /phone/thank-you  #
 devices/tablet  /tablet  #
 devices/tablet/app-ecosystem  /tablet/app-ecosystem  #
-devices/tablet/contact-us  /tablet/contact-us  #
+devices/tablet/contact-us  /tablet  #
 devices/tablet/partner  /tablet/operators-and-oems  #
 devices/tablet/thank-you  /tablet/thank-you  #
 devices/tv  /tv  #
@@ -308,7 +354,8 @@ devices/tv/thank-you  /tv/thank-you  #
 download  /desktop/get-ubuntu/download  #
 download/arm  /download/server/arm  #
 download/cloud/cloud-archive-instructions  /download/cloud  #
-download/CN  /download/ubuntu-kylin  #
+download/cn  /download/ubuntu-kylin  #
+download/ubuntu-kylin-zh-CN  /download/ubuntu-kylin
 download/desktop/alternative-download  /download/desktop/alternative-downloads  #
 download/desktop/alternative-downloads  /download/alternative-downloads  #
 download/desktop/install-desktop-latest  /download/desktop/install-ubuntu-desktop  #
@@ -328,7 +375,8 @@ download/help/create-a-usb-stick-on-ubuntu  /download/desktop/create-a-usb-stick
 download/help/create-a-usb-stick-on-windows  /download/desktop/create-a-usb-stick-on-windows  #
 download/help/install-desktop-latest  /download/desktop/install-desktop-latest  #
 download/help/install-desktop-long-term-support  /download/desktop/install-desktop-long-term-support  #
-download/help/install-ubuntu-cloud  /download/cloud/install-ubuntu-cloud  #
+download/help/install-ubuntu-cloud  /download/cloud/install-ubuntu-openstack  #
+download/cloud/install-ubuntu-cloud  /download/cloud/install-ubuntu-openstack  #
 download/help/install-ubuntu-server  /download/server/install-ubuntu-server  #
 download/help/install-ubuntu-with-windows  /download/desktop/install-ubuntu-with-windows  #
 download/help/try-ubuntu-before-you-install  /download/desktop/try-ubuntu-before-you-install  #
@@ -338,6 +386,7 @@ download/releasenotes/606  /getubuntu/releasenotes/606  #
 download/releasenotes/610  /getubuntu/releasenotes/610  #
 download/releasenotes/610  http://www.ubuntu.com/getubuntu/releasenotes  #
 download/releasenotes/804  http://www.ubuntu.com/getubuntu/releasenotes  #
+download/server  /download/server/download  #
 download/server/arm  /download/arm  #
 download/server/cds  http://shop.canonical.com/index.php?cPath=17  #
 download/server/download  /download/server  #
@@ -348,8 +397,7 @@ download/ubuntu/download  /download/desktop  #
 download/ubuntu/download-zh  /download/desktop/zh-CN  #
 download/ubuntu/upgrade  /download/desktop/upgrade  #
 download/ubuntu/windows-installer  /download/desktop/windows-installer  #
-download/zh-CN  /download/ubuntu-kylin-zh-CN  #
-download/zh-CN  /download/ubuntu-kylin-zh-CN  #
+download/zh-CN  /download/ubuntu-kylin  #
 downloads  /download  #
 ec2  /cloud/public  #
 EditingInstructions  http://www.ubuntu.com  #
@@ -368,13 +416,13 @@ FRS  http://pages.ubuntu.com/FRS.html  #
 frs  https://pages.canonical.com/FRS.html  #
 GetUbuntu  /desktop/get-ubuntu/download  #
 GetUbuntu  http://www.ubuntu.com/desktop/get-ubuntu/download  #
-getubuntu%20  http://www.ubuntu.com/desktop/get-ubuntu/download  #
-getubuntu%20  http://www.ubuntu.com/desktop/get-ubuntu/download  #
 getubuntu/countdown		http://www.ubuntu.com		#
 getubuntu/countdown  http://www.ubuntu.com  #
 getubuntu/download  /desktop/get-ubuntu/download  #
 getubuntu/download  http://www.ubuntu.com/desktop/get-ubuntu/download  #
 getubuntu/download  http://www.ubuntu.com/desktop/get-ubuntu/download  #
+getubuntu/download_static  http://www.ubuntu.com/netbook/get-ubuntu/download  #
+getubuntu/download_static  http://www.ubuntu.com/netbook/get-ubuntu/download  #
 getubuntu/download-netbook  /netbook/get-ubuntu/download  #
 getubuntu/download-netbook  http://www.ubuntu.com/netbook/get-ubuntu/download  #
 getubuntu/download-netbook  http://www.ubuntu.com/netbook/get-ubuntu/download  #
@@ -386,8 +434,6 @@ getubuntu/download.  http://www.ubuntu.com/netbook/get-ubuntu/download  #
 getubuntu/download.  http://www.ubuntu.com/netbook/get-ubuntu/download  #
 getubuntu/download/display1.js  http://www.ubuntu.com/netbook/get-ubuntu/download  #
 getubuntu/download/display1.js  http://www.ubuntu.com/netbook/get-ubuntu/download  #
-getubuntu/download_static  http://www.ubuntu.com/netbook/get-ubuntu/download  #
-getubuntu/download_static  http://www.ubuntu.com/netbook/get-ubuntu/download  #
 getubuntu/downloading  http://www.ubuntu.com/netbook/get-ubuntu/download  #
 getubuntu/downloading  http://www.ubuntu.com/netbook/get-ubuntu/download  #
 getubuntu/downloadmirrors  /download/ubuntu/alternative-download  #
@@ -439,15 +485,17 @@ getubuntu/upgrading  /desktop/get-ubuntu/upgrade  #
 getubuntu/upgrading  http://www.ubuntu.com/desktop/get-ubuntu/upgrade  #
 getubuntu/upgrading  http://www.ubuntu.com/desktop/get-ubuntu/upgrade  #
 getubuntu/upgrading-8.04  /desktop/get-ubuntu/upgrade  #
+getubuntu%20  http://www.ubuntu.com/desktop/get-ubuntu/download  #
+getubuntu%20  http://www.ubuntu.com/desktop/get-ubuntu/download  #
 google-analytics.com/ga.js  http://www.ubuntu.com  #
 hardware-summit  /uhs2010  #
 hardware-summit  http://www.ubuntu.com/uhs2010  #
 how-can-it-be-free  /desktop/why-is-it-free  #
-hp  /partners/hp  #
-hp  http://www.ubuntu.com/partners/hp  #
-I-cloud  /cloud?utm_source=brochure&utm_medium=paper&utm_content=cloudhome&utm_campaign=cloud  #
-I-cloud-jumpstart  /cloud/jumpstart?utm_source=brochure&utm_medium=paper&utm_content=jumpstart&utm_campaign=cloud  #
-I-cloud-services  /cloud/solutions?utm_source=brochure&utm_medium=paper&utm_content=cloudservices&utm_campaign=cloud  #
+hp  http://partners.ubuntu.com/hp  #
+partners/hp/  http://partners.ubuntu.com/hp  #
+i-cloud  /cloud?utm_source=brochure&utm_medium=paper&utm_content=cloudhome&utm_campaign=cloud  #
+i-cloud-jumpstart  /cloud/training  #
+i-cloud-services  /cloud/solutions?utm_source=brochure&utm_medium=paper&utm_content=cloudservices&utm_campaign=cloud  #
 ibm  /partners/ibm  #
 ibm  http://www.ubuntu.com/partners/ibm  #
 icsw2010  http://www.ubuntu.com/partners/ibm  #
@@ -455,13 +503,13 @@ intellectual-property-policy  /legal/terms-and-policies/intellectual-property-po
 landscape  http://www.ubuntu.com/desktop/services  #
 legal/online-accounts  /legal/terms-and-policies/online-account-terms  #
 login.jpeg  http://www.ubuntulinux.org/  #
-lotus  http://www.ubuntu.com/partners/ibm  #
-m-rss%20rss%20.html  http://www.ubuntu.com  #
-management/cloud-management  /cloud/management  #
+lotus  /partners/ibm  #
+m-rss%20rss%20.html  /  #
+management/cloud-management  /cloud/prices-and-plans  #
 management/features  /management/landscape-features  #
 management/how-to-get-landscape  /management/ubuntu-advantage  #
 management/how-to-get-landscape/contact-us  /management/contact-us  #
-management/ubuntu-advantage  /cloud/management  #
+management/ubuntu-advantage  /cloud/prices-and-plans  #
 marketplace/jointhanks  /partners  #
 merchandise  http://shop.canonical.com/  #
 netbook  /ubuntu  #
@@ -497,12 +545,14 @@ news/usn  http://www.ubuntu.com/usn/  #
 nicolaslevy  http://www.ubuntu.com/  #
 node  /products/whatisubuntu/serveredition/techspecs  #
 occs  http://www.ubuntu.com/partners/ibm  #
+ods  http://ubunt.eu/ods2014paris  #
 partner/occs  http://www.ubuntu.com/partners/ibm  #
 partners/affiliate  http://www.ubuntu.com/partners  #
 partners/casestudies  http://www.ubuntu.com/project/case-studies  #
 partners/certified-software  /partners/ubuntu-certified/software  #
 partners/certified-software/  /partners/ubuntu-certified/software  #
 partners/certified/northernmicro  http://www.ubuntu.com/partners  #
+partners/dell/dellxps  http://partners.ubuntu.com/dell  #
 partners/faq  /partners  #
 partners/find  /partners  #
 partners/find-a-partner/oem  /partners/find-a-partner/hardware  #
@@ -536,9 +586,37 @@ partners/training/certificationcourses/user  http://www.ubuntu.com/support/train
 partners/training/contact  http://www.ubuntu.com/support/training  #
 partners/training/course_locator  http://www.ubuntu.com/support/training  #
 partners/trainingpartner  http://www.ubuntu.com/support/training  #
+partners  http://partners.ubuntu.com  #
+partners/find-a-partner  http://partners.ubuntu.com/find-a-partner  #
+partners/find-a-partner/  http://partners.ubuntu.com/find-a-partner  #
+partners/ubuntu-certified  /certification  #
+partners/ubuntu-certified/software  /certification  #
+partners/partner-programmes  http://partners.ubuntu.com/programmes  #
+partners/partner-services  http://partners.ubuntu.com  #
+partners/backed-by-canonical  http://partners.ubuntu.com/partnering-with-us  #
+partners/asus  http://partners.ubuntu.com/asus  #
+partners/dell  http://partners.ubuntu.com/dell  #
+partners/hp  http://partners.ubuntu.com/hp  #
+partners/hp/  http://partners.ubuntu.com/hp  #
+partners/hp/moonshot  http://partners.ubuntu.com/hp  #
+partners/ibm  http://partners.ubuntu.com/ibm  #
+partners/contact-us  http://partners.ubuntu.com/contact-us  #
+partners/find-a-partner/hardware  http://partners.ubuntu.com/programmes/hardware  #
+partners/find-a-partner/isv  http://partners.ubuntu.com/programmes/software  #
+partners/find-a-partner/reseller  http://partners.ubuntu.com/programmes/reseller  #
 phone/backed-by-canonical  /partners/backed-by-canonical  #
+phone/contact-us  /phone  #
+phone/thank-you  /phone  #
+phone/operators-and-oems  /phone/partners  #
+phone/scopes  /phone/features  #
+phone/app-ecosystem  /phone/developers  #
 phone/design  /phone/features  #
+phone/ubuntu-for-android/contact-us  /phone  #
+phone/ubuntu-for-android/thank-you  /phone  #
+phone/ubuntu-for-android  /phone  #
+phone/ubuntu-for-android/features  /phone  #
 phone/install  https://wiki.ubuntu.com/Touch/Install  #
+phone/carrier-advisory-group  /phone/partners/#carrier-advisory-group  #
 planetubuntu  http://planet.ubuntu.com/  #
 privacy-policy  /legal/terms-and-policies/privacy-policy  #
 products  http://www.ubuntu.com/  #
@@ -579,8 +657,8 @@ products/whatisubuntu/derivatives  http://www.ubuntu.com/project/derivatives  #
 products/whatisubuntu/desktop/features  http://www.ubuntu.com/desktop/features  #
 products/WhatIsUbuntu/desktopedition  /desktop  #
 products/whatisubuntu/desktopedition  http://www.ubuntu.com/desktop  #
-products/WhatIsUbuntu/edubuntu  /about/derivatives  #
-products/whatisubuntu/gobuntu  http://www.ubuntu.com/desktop  #
+products/WhatIsUbuntu/edubuntu  /about/about-ubuntu/flavours  #
+products/whatisubuntu/gobuntu  /desktop  #
 products/WhatIsUbuntu/kubuntu  http://www.kubuntu.org/  #
 products/whatIsubuntu/releases  /  #
 products/whatisubuntu/screenshots-710  http://www.ubuntu.com/desktop/features  #
@@ -641,7 +719,7 @@ project/about-ubuntu  /about/about-ubuntu  #
 project/about-ubuntu/components  /about/about-ubuntu/components  #
 project/about-ubuntu/conduct  /about/about-ubuntu/conduct  #
 project/about-ubuntu/conduct  /about/about-ubuntu/conduct  #
-project/about-ubuntu/derivatives  /about/about-ubuntu/derivatives  #
+project/about-ubuntu/derivatives  /about/about-ubuntu/flavours  #
 project/about-ubuntu/diversity  /about/about-ubuntu/diversity  #
 project/about-ubuntu/governance  /about/about-ubuntu/governance  #
 project/about-ubuntu/governance  /about/about-ubuntu/governance  #
@@ -655,9 +733,7 @@ project/about-ubuntu/our-philosophy  /about/about-ubuntu/our-philosophy  #
 project/about-ubuntu/ubuntu-and-debian  /about/about-ubuntu/ubuntu-and-debian  #
 project/canonical-and-ubuntu  /about/canonical-and-ubuntu  #
 project/case-studies  http://www.canonical.com/about-canonical/resources/case-studies  #
-project/derivatives  /about/about-ubuntu/derivatives  #
-project/derivatives  /about/derivatives  #
-project/derivatives  /about/derivatives  #
+project/derivatives  /about/about-ubuntu/flavours  #
 project/open-source  /about/about-ubuntu/our-philosophy  #
 project/ubuntu-font  /about/ubuntu-font  #
 project/ubuntufont  /about/ubuntu-font  #
@@ -696,6 +772,8 @@ server/technical-resources  /server  #
 servervirtualization  http://www.ubuntu.com/server/features/virtualisation  #
 service  http://www.ubuntu.com/support  #
 sitemap  http://www.ubuntu.com  #
+snappy  http://developer.ubuntu.com/snappy/  #
+snappy/  http://developer.ubuntu.com/snappy/  #
 support/assurance  http://www.canonical.com/enterprise-services/ubuntu-advantage/assurance  #
 support/commercial/marketplace  ../../support  #
 support/commercial/marketplace  /support  #
@@ -776,12 +854,14 @@ support/webtocase/sun/thankyou  http://www.ubuntu.com/support  #
 syndicated/kubuntu-download  http://www.ubuntu.com  #
 syndicated/kubuntu-download-demo  http://www.ubuntu.com  #
 tablet/backed-by-canonical  /partners/backed-by-canonical  #
+tablet/contact-us  /tablet  #
+tablet/thank-you  /tablet  #
 taxonomy/term  /  #
+taxonomy/term/1/0/feed  http://www.ubuntu.com  #
 taxonomy/term/1%202  http://www.ubuntu.com  #
 taxonomy/term/1%202/0  http://www.ubuntu.com  #
 taxonomy/term/1%202/0/feed  http://www.ubuntu.com  #
 taxonomy/term/1+2/0/feed  http://www.ubuntu.com  #
-taxonomy/term/1/0/feed  http://www.ubuntu.com  #
 taxonomy/term/2  http://www.ubuntu.com  #
 taxonomy/term/2/0  http://www.ubuntu.com  #
 taxonomy/term/2/0  http://www.ubuntu.com  #
@@ -789,6 +869,7 @@ taxonomy/term/2/0/feed  http://www.ubuntu.com  #
 taxonomy/term/2/0/feed  http://www.ubuntu.com  #
 taxonomy/term/2/0/feed  http://www.ubuntulinux.org/  #
 taxonomy/term/2/0/feed%23  http://www.ubuntu.com  #
+desktop/tenders  https://insights.ubuntu.com/2015/04/17/tendering-with-ubuntu/  #
 testing  /info/testing  #
 testing/710rc  http://www.ubuntu.com  #
 testing/804rc  http://www.ubuntu.com  #
@@ -880,6 +961,7 @@ training/exams  http://www.ubuntu.com/support/training  #
 training/trainingpartner/locate  /support/training  #
 tv/backed-by-canonical  http://ubuntu.com/phone/backed-by-canonical  #
 ua-assurance-terms  /legal/ubuntu-advantage/assurance  #
+ua-dell-tc  /legal/ua-dell-tc  #
 ua-servicedescription  /legal/ubuntu-advantage/service-description  #
 ubuntu  /desktop  #
 ubuntu/components  /about/about-ubuntu/components  #
@@ -916,22 +998,17 @@ webinar/desktopmigration  https://events.webdialogs.com/register.php?id=616666a8
 welcome  /  #
 Welcome  http://www.ubuntu.com  #
 wiki  http://wiki.ubuntu.com/  #
-wiki/DanishTeam  http://www.ubuntu.com/community  #
-wiki/FrontPage  http://www.ubuntu.com/  #
-wiki/HardwareSupport  http://www.ubuntu.com/  #
-wiki/LoCoTeamList  http://www.ubuntu.com/community  #
-Wiki/RecentChanges  http://www.ubuntu.com/community  #
-wiki/RootSudo  http://www.ubuntu.com/  #
-wiki/SetupNdiswrapperHowto  http://www.ubuntu.com/  #
-yourcloud  /cloud/tools/bootstack  #
-cloud/tools/your-cloud  /cloud/tools/bootstack  #
-cloud/ubuntu-openstack  /cloud/openstack  #
-cloud/ubuntu-openstack/reference-architecture  /cloud/openstack/reference-architecture  #
-cloud/tools/bootstack  /cloud/bootstack  #
-cloud/tools/bootstack/contact-us  /cloud/bootstack/contact-us  #
-cloud/tools/jumpstart-training  /cloud/jumpstart-training  #
-cloud/tools/jumpstart-training/order  /cloud/jumpstart-training/order  #
-cloud/tools/jumpstart-training/contact-us  /cloud/jumpstart-training/contact-us  #
-cloud/tools/jumpstart-training/order-thank-you  /cloud/jumpstart-training/order-thank-you  #
-cloud/tools/jumpstart-training/thank-you  /cloud/jumpstart-training/thank-you  #
-cloud/cloud-labs  /cloud/labs  #
+wiki/DanishTeam  /community  #
+wiki/FrontPage  /  #
+wiki/HardwareSupport  /  #
+wiki/LoCoTeamList  /community  #
+Wiki/RecentChanges  /community  #
+wiki/RootSudo  /  #
+wiki/SetupNdiswrapperHowto  /  #
+yourcloud  /cloud/tools/managed-cloud  #
+download/cloud/install-ubuntu-cloud  /download/cloud/install-ubuntu-openstack  #
+autopilot  /download/cloud/install-ubuntu-openstack  #
+cloud/install  /download/cloud/install-ubuntu-openstack  #
+tour  http://tour.ubuntu.com  #
+tour/en  http://tour.ubuntu.com/en  #
+tour/zh-CN  http://tour.ubuntu.com/zh-CN  #
diff --git a/static/css/_scratch.scss b/static/css/_scratch.scss
deleted file mode 100755
index 85dedf95ded..00000000000
--- a/static/css/_scratch.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * This stylesheet is used to override the core styles until the monthly merge.
- *
- * Please comment your changes to help documentation.
-
-  	CONTENTS:
-	-----------------------------------------------------------------
-
-*/
-
-// additional helper class for shouty text
-.caps {
-	text-transform: uppercase;
-}
diff --git a/static/css/_core-constants.scss b/static/css/core-constants.scss
similarity index 100%
rename from static/css/_core-constants.scss
rename to static/css/core-constants.scss
diff --git a/static/css/_core-mixins.scss b/static/css/core-mixins.scss
similarity index 100%
rename from static/css/_core-mixins.scss
rename to static/css/core-mixins.scss
diff --git a/static/css/ie/ie6.scss b/static/css/ie/ie6.scss
old mode 100644
new mode 100755
index e41c876a84e..c90b1dea30a
--- a/static/css/ie/ie6.scss
+++ b/static/css/ie/ie6.scss
@@ -1,5 +1,3 @@
-@import "../core-constants";
-
 html.lt-ie7 {
 	.row-box { overflow: hidden; }
 	font-size: 16px;
diff --git a/static/css/ie/ie7.scss b/static/css/ie/ie7.scss
old mode 100644
new mode 100755
index bd8d9fc7711..55178f12925
--- a/static/css/ie/ie7.scss
+++ b/static/css/ie/ie7.scss
@@ -1,5 +1,3 @@
-@import "../core-constants";
-
 html.lt-ie8 {
 	* { zoom: 1; }
 	
diff --git a/static/css/scratch.scss b/static/css/scratch.scss
new file mode 100755
index 00000000000..e8a9c92098e
--- /dev/null
+++ b/static/css/scratch.scss
@@ -0,0 +1,81 @@
+/*
+ * This stylesheet is used to override the core styles until the monthly merge.
+ *
+ * Please comment your changes to help documentation.
+
+  	CONTENTS:
+	-----------------------------------------------------------------
+
+*/
+
+// additional helper class for shouty text
+.caps {
+	text-transform: uppercase;
+}
+
+@media only screen and (max-width : 768px) {
+	// helper class for small
+	.small-align-center {
+		text-align: center;
+	}
+}
+
+/* Chinese Social links */
+
+.list--social__item {
+	height: 37px;
+	margin-right: 20px;
+	padding: 0;
+	text-indent: -999em;
+	width: 37px;
+	float: left;
+	display: inline-block;
+	
+	&:after { 
+		content: " " !important; 
+	}
+	
+	a {
+		display: block;
+		height: 37px;
+		width: 37px;
+		margin: 0;
+		overflow: hidden;
+	}
+
+	&.active a {
+		background-image: 
+			url('../img/icons/icon-wechat.svg'),
+			url('../img/homepage/kylin/qr-code-wechat.png');
+		background-repeat: no-repeat;
+		background-position: left top, right top;
+		background-size: 37px 37px, auto;
+		width: 140px;
+		height: 116px;
+	}
+} // &__item
+
+.list--social__item--wechat a {
+    background: url('../img/icons/icon-wechat.svg') no-repeat;
+}
+
+.list--social__item--weibo a {
+    background: url('../img/icons/icon-weibo.svg') no-repeat;
+}
+
+main section .strip-inner-wrapper {
+
+}
+
+main .list--social {
+	display: inline;
+}
+
+.china-mobile {
+	float: left;
+	margin-right: 40px;
+}
+
+.homepage footer .list--social {
+	display: none;
+}
\ No newline at end of file
diff --git a/static/css/styles.scss b/static/css/styles.scss
index d830ef7bb69..184faf096a8 100755
--- a/static/css/styles.scss
+++ b/static/css/styles.scss
@@ -133,6 +133,10 @@ core scss files are in /sites/core/static/css
 -------------------------------------------------------------- */
 @import "section/tablet";
 
+/*	@section things
+-------------------------------------------------------------- */
+@import "section/things";
+
 /*	@section tv
 -------------------------------------------------------------- */
 @import "section/tv";
diff --git a/static/js/global.js b/static/js/global.js
index bb404975b2d..f6c4d7269b3 100755
--- a/static/js/global.js
+++ b/static/js/global.js
@@ -7,7 +7,8 @@ var ai = [{ url: "http://www.ubuntu.com", title:"Ubuntu" },
 { url: "http://discourse.ubuntu.com", title:"Discourse" },
 { url: "http://www.ubuntu.com/certification", title:"Hardware" },
 { url: "https://insights.ubuntu.com", title:"Insights" },
-{ url: "https://juju.ubuntu.com", title:"Juju" },
+{ url: "https://jujucharms.com", title:"Juju" },
+{ url: "http://partners.ubuntu.com", title:"Partners" },
 { url: "http://shop.ubuntu.com", title:"Shop" }];
 
 var more = [{ url: "http://apps.ubuntu.com", title:"Apps" },
diff --git a/static/js/scratch.js b/static/js/scratch.js
index dc214cc23d2..0689c10dfe1 100755
--- a/static/js/scratch.js
+++ b/static/js/scratch.js
@@ -1,460 +1,527 @@
-YUI().use('node', 'cookie',"event-resize", function(Y) {
-
-	core.resourceHubBoxes = function() {
-		Y.all(".resource").on('click',function(e) {
-		    e.preventDefault();
-    		e.stopPropagation();
-			if(e.currentTarget.one('a') !== null) {
-				window.location = e.currentTarget.one('a').get("href");
-			}
-		});
-	}
-
-	core.setupFeatureDisplay = function() {
-		if(Y.one('.list-features-content') != null) {
-			Y.all('.list-features-content li').setStyle('display','none');
-			Y.one('#list-feature-saas').setStyle('display','block');
-			Y.all('.nav-list-features li').each(function (node) {
-				node.delegate('click', function(e){
-					e.preventDefault();
-					var clicked = this.get('text');
-					Y.all('.nav-list-features li a').removeClass('active');
-					this.addClass('active');
-					var toShow = '';
-					switch(clicked) {
-						case 'SAAS':
-							toShow = '#list-feature-saas';
-						break;
-							case 'Service orchestration':
-							toShow = '#list-feature-orchestration';
-						break;
-							case 'PAAS':
-							toShow = '#list-feature-paas';
-						break;
-							case 'Guest OS':
-							toShow = '#list-feature-guest';
-						break;
-							case 'Public cloud':
-							toShow = '#list-feature-public';
-						break;
-							case 'Private cloud':
-							toShow = '#list-feature-private';
-						break;
-							case 'Virtualisation':
-							toShow = '#list-feature-virtualisation';
-						break;
-					}
-					Y.all('.list-features-content li').setStyle('display','none');
-					Y.one(toShow).setStyle('display','block');
-				}, 'a');
-			});
-		}
-	}
-
-
-	core.setupAnimations = function(){
-		var yOffset = 150;
-		if(Y.one('body').hasClass('phone-features') || Y.one('body').hasClass('phone-scopes')){
-			var searchScreen = false;
-			var edgeMagic = Y.all('.edge-magic');
-			if(Y.one('.search-screen')){
-				var searchScreen = {ypos: Y.one('.search-screen').getXY()[1] - yOffset, run: false};
-			}
-			Y.on('scroll', function(e) {
-				 edgeMagic.each(function (node) {
-					if(window.scrollY > node.getXY()[1] - yOffset && window.scrollY < node.getXY()[1] && !node.run){
-						node.run = true;
-						node.one('.slider-animation').addClass('run');
-						if(node.one('.slider-animation').getAttribute('class') == 'slider-animation full-swipe run'){
-							setTimeout(function(){ node.one('.launcher').addClass('return') }, 2000);
-						}
-					}
-				});
-			});
-			if(searchScreen) {
-				if(window.scrollY > searchScreen.ypos && window.scrollY < searchScreen.ypos + yOffset && !searchScreen.run){
-					searchScreen.run = true;
-					core.runAnimation('search-screen');
-				}else{
-					Y.on('scroll', function(e) {
-						 if(window.scrollY > searchScreen.ypos && window.scrollY < searchScreen.ypos + yOffset && !searchScreen.run){
-						 	searchScreen.run = true;
-						 	core.runAnimation('search-screen');
-						 }
-					});
-				}
-			}
-
-			Y.all('.replay').on('click', function(e){
-				core.rerunAnimation(e.target.get('parentNode').one('.slider-animation').getAttribute('class').replace('slider-animation ','').replace(' run',''));
-			});
-			if(Y.one('.content-controls .gallery-screen')){
-				Y.one('.content-controls .gallery-screen').setStyle('display','block');
-				var infoIndex = 0;
-				setInterval(function(){
-					Y.all('.infographic .main-image').addClass('hide');
-					Y.one('.infographic .info-pic-'+infoIndex).removeClass('hide');
-					if(++infoIndex > 4){ infoIndex = 0; }
-				}, 4000);
-			}
-		}
-
-		if(Y.one('body').hasClass('tablet-design')){
-			var edgeMagic = Y.all('.slider-animation');
-			var videoPanel = Y.all('.the-video');
-			Y.on('scroll', function(e) {
-				 edgeMagic.each(function (node) {
-					if(window.scrollY > node.getXY()[1] - yOffset && window.scrollY < node.getXY()[1] && !node.run){
-						node.run = true;
-						node.addClass('run');
-					}
-				});
-			});
-
-			Y.all('.screen').on('click', function(e){
-				core.rerunAnimation(e.target.get('parentNode').get('parentNode').get('parentNode').one('.slider-animation').getAttribute('class').replace('slider-animation ','').replace(' run',''));
-			});
-
-			Y.all('.replay').on('click', function(e){
-				core.rerunAnimation(e.target.get('parentNode').one('.slider-animation').getAttribute('class').replace('slider-animation ','').replace(' run',''));
-			});
-			if(Y.one('.show-video')){
-				Y.one('.show-video').on('click',function(e) {
-					e.preventDefault();
-					videoPanel.addClass('show');
-					Y.one('.row-hero').setStyle('height','590px');
-					Y.one('.the-video div').set('innerHTML','<iframe width="984" height="554" src="http://www.youtube.com/embed/h384z7Ph0gU?showinfo=0&vq=hd1080&rel=0&modestbranding=0&autoplay=1" frameborder="0" allowfullscreen></iframe>');
-				});
-			}
-			if(Y.one('.close-video')){
-				Y.one('.close-video').on('click',function(e) {
-					e.preventDefault();
-					videoPanel.removeClass('show');
-					Y.one('.row-hero').setStyle('height','460px');
-					Y.one('.the-video div').set('innerHTML','');
-				});
-			}
-		}
-	}
-
-	core.runAnimation = function($anim) {
-		switch($anim) {
-			case 'search-screen':
-				Y.one('.search-screen').addClass('run');
-				setTimeout(function(){ Y.one('.search-screen').removeClass('run'); }, 2000);
-			break;
-			case 'go-back':
-				Y.one('.go-back').addClass('run');
-			break;
-		}
-	};
-
-	core.updateSlider = function( $index ) {
-	if($index >= 4){ $index = 0; }
-	if($index <= -1){ $index = 3; }
-	YUI().use('node', function(Y) {
-		Y.one('.slide-container').setStyle('left','-'+(700 * $index)+'px');
-		Y.all('.slider-dots li').removeClass('active');
-		Y.all('.slider-dots li.pip-'+$index).addClass('active');
-		Y.all('.slider-animation').removeClass('run');
-		Y.one('.full-swipe .launcher').removeClass('return');
-		switch($index+''){
-			case '0':
-				setTimeout(function(){ Y.one('.edge-magic').addClass('run'); }, 1200);
-			break;
-			case '1':
-				setTimeout(function(){ Y.one('.full-swipe').addClass('run');}, 1200);
-				setTimeout(function(){ Y.one('.full-swipe .launcher').addClass('return') }, 2000);
-			break;
-			case '2':
-				setTimeout(function(){ Y.one('.go-back').addClass('run'); }, 1200);
-			break;
-			case '3':
-				setTimeout(function(){ Y.one('.content-controls').addClass('run'); }, 1200);
-			break;
-		}
-	});
-	return $index;
-	}
-
-	core.rerunAnimation = function($type){
-		Y.one('.'+$type).removeClass('run');
-		if($type == 'full-swipe'){
-			Y.one('.full-swipe .launcher').removeClass('return');
-			setTimeout(function(){ Y.one('.full-swipe').addClass('run'); }, 400);
-			setTimeout(function(){ Y.one('.full-swipe .launcher').addClass('return') }, 1400);
-		}else if($type == 'notification-slider' || $type == 'search-screen'){
-		  	Y.one('.'+$type).removeClass('run');
-      		setTimeout(function(){ Y.one('.'+$type).addClass('run'); }, 1000);
-      	}else if($type == 'slider-animation') {
-
-		}else{
-			Y.one('.'+$type).removeClass('run');
-			setTimeout(function(){ Y.one('.'+$type).addClass('run'); }, 400);
-		}
-	}
-
-	core.flipVideo = function(){
-		if(Y.one('body').hasClass('phone-home')) {
-			if(Y.one('.show-video')) {
-				Y.one('.show-video').on('click',function(e) {
-					e.preventDefault();
-					Y.one('#panel').addClass('flipped');
-					setTimeout(function(){ Y.one('.the-video').set('innerHTML','<iframe width="569" height="320" src="http://www.youtube.com/embed/cpWHJDLsqTU?showinfo=0&hd=1&rel=0&modestbranding=0&autoplay=1" frameborder="0" allowfullscreen></iframe>');Y.one('#panel .back').setStyle('z-index', '50');}, 1000);
-				});
-			}
-			if(Y.one('.close-video')) {
-				Y.one('.close-video').on('click',function(e) {
-					e.preventDefault();
-					Y.one('#panel .back').setStyle('z-index', '0');
-					Y.one('.the-video').set('innerHTML','');
-					Y.one('#panel').removeClass('flipped');
-				});
-			}
-		}
-	}
-
-	core.externalLinks = function() {
-		Y.all('a.external-link').each(function() {
-			this.on('click',function(e) {
-				e.preventDefault();
-				window.open(this.getAttribute('href'), '_blank');
-			});
-		})
-	}
-
-	core.chineseDownload = function() {
-		if(Y.one('body').hasClass('download-desktop-zh-CN')){
-			var ltsform = Y.one('form.lts');
-			var latestform = Y.one('form.latest');
-			Y.one('form.lts button').on('click',function(e){
-				e.preventDefault();
-				this.set('text','开始...');
-				ltsform.submit();
-			});
-
-			Y.one('form.latest button').on('click',function(e){
-				e.preventDefault();
-				this.set('text','开始...');
-				latestform.submit();
-			});
-
-			Y.one('.lts .input-bits').on('change', function() {
-				var bits = Y.one('form.lts .text-bits');
-				var form_cta = ltsform.one('.link-cta-ubuntu');
-				var val = this.get('value');
-				var iso = val == '32' ? 'http://china-images.ubuntu.com/releases/12.04/ubuntu-12.04-desktop-i386.iso' : 'http://china-images.ubuntu.com/releases/12.04/ubuntu-12.04-desktop-amd64.iso';
-				ltsform.setAttribute('action', iso);
-				bits.set('text',val);
-			});
-			Y.one('.latest .input-bits').on('change', function() {
-				var bits = Y.one('form.latest .text-bits');
-				var form_cta = latestform.one('.link-cta-ubuntu');
-				var val = this.get('value');
-				var iso = val == '32' ? 'http://cdimage.ubuntu.com/ubuntukylin/releases/13.10/release/ubuntukylin-13.10-desktop-i386.iso' : 'http://cdimage.ubuntu.com/ubuntukylin/releases/13.10/release/ubuntukylin-13.10-desktop-amd64.iso';
-				latestform.setAttribute('action', iso);
-				bits.set('text',val);
-			});
-		}
-	}
-
-/*
-core.cookiePolicy = function() {
-
-	YUI().use('cookie', function (Y) {
-		if(Y.Cookie.get("_cookies_accepted") != 'true'){
-			open();
-		}
-	});
-
-	function open() {
-		YUI().use('node', function(Y) {
-			Y.one('body').prepend('<div class="cookie-policy"><div class="wrapper"><a href="?cp=close" class="link-cta">Close</a><p>We use cookies to improve your experience of ubuntu.com. By continuing to explore without changing your settings, you are agreeing to accept them. To learn how to change these settings, please see our <a href="/privacy-policy#cookies">privacy policy</a>.</p></div></div>');
-			Y.one('.cookie-policy .link-cta').on('click',function(e){
-				e.preventDefault();
-				close();
-			});
-		});
-	}
-	function close() {
-		YUI().use('node', function(Y) {
-			animate();
-			setCookie();
-		});
-	}
-	function animate() {
-		YUI().use('anim', function(Y) {
-			var myAnim = new Y.Anim({
-			    node: '.cookie-policy',
-			    to: { marginTop: -115 }
-			});
-			myAnim.run();
-			myAnim.on('end', function() {
-		        var node = this.get('node');
-		        node.get('parentNode').removeChild(node);
-		    });
-		});
-	}
-	function setCookie() {
-		YUI().use('cookie', function (Y) {
-			Y.Cookie.set("_cookies_accepted", "true");
-		});
-	}
-}
-*/
-
-	core.cookiePolicy = function() {
-		if(Y.Cookie.get("_cookies_accepted") != 'true'){
-			open();
-		}
-
-		function open() {
-			YUI().use('node', function(Y) {
-				Y.one('body').prepend('<div class="cookie-policy"><div class="wrapper"><a href="?cp=close" class="link-cta">Close</a><p>We use cookies to improve your experience. By your continued use of this site you accept such use. To change your settings please <a href="/legal/terms-and-policies/privacy-policy#cookies">see our policy</a>.</p></div></div>');
-				Y.one('footer.global .legal').addClass('has-cookie');
-				Y.one('.cookie-policy .link-cta').on('click',function(e){
-					e.preventDefault();
-					close();
-				});
-			});
-		}
-		function close() {
-			YUI().use('node', function(Y) {
-				Y.one('.cookie-policy').setStyle('display','none');
-				setCookie();
-			});
-		}
-		function setCookie() {
-			YUI().use('cookie', function (Y) {
-				Y.Cookie.set("_cookies_accepted", "true", { expires: new Date("January 12, 2025") });
-			});
-		}
-	}
-
-	core.supportsTransitions = function() {
-		var b = document.body || document.documentElement;
-		var s = b.style;
-		var p = 'transition';
-		if(typeof s[p] == 'string') {return true; }
-		// Tests for vendor specific prop
-		v = ['Moz', 'webkit', 'Webkit', 'Khtml', 'O', 'ms'],
-		p = p.charAt(0).toUpperCase() + p.substr(1);
-		for(var i=0; i<v.length; i++) {
-			if(typeof s[v[i] + p] == 'string') { return true; }
-		}
-		return false;
-	}
-
-	core.setHTMLClasses = function(){
-		if(Y.one('body').hasClass('homepage')){
-			if (!core.supportsTransitions()) {
-				document.getElementsByTagName("html")[0].className += " no-transitions";
-			}
-			document.getElementsByTagName("html")[0].className += " run";
-
-		}
-	}
-
-	core.removeNoJS = function(){
-		Y.all('html').removeClass('no-js').addClass('yes-js');
-	}
-
-	core.footerMobileNav = function() {
-		Y.all('.footer-a li h2').on('click', function(e) {
-			e.target.toggleClass('active open');
-		});
-		Y.all('.footer-b li h2').on('click', function(e) {
-			e.target.toggleClass('active open');
-		});
-	};
-	
-	core.resizeListener = function() {
-		Y.on('windowresize', function(e) {
-			core.redrawGlobal();
-		});
-		core.globalInit();
-	};
-
-	core.globalInit= function() {
-		if (document.documentElement.clientWidth < 768) {
-			core.globalPrepend = 'div.legal';
-			core.setupGlobalNav();
-			Y.one('.nav-global-wrapper').insert('<h2>Ubuntu websites</h2>','before');
-		} else if (document.documentElement.clientWidth >= 768) {
-			core.globalPrepend = 'body';
-			core.setupGlobalNav();
-			Y.all('#additional-info h2').setStyle('cursor', 'default');
-			Y.one('footer.global').addClass('no-global');
-		}
-	};
-
-	core.redrawGlobal = function() {
-		var globalNav = Y.one("#nav-global");
-		if (document.documentElement.clientWidth < 768 && core.globalPrepend != 'div.legal') {
-			core.globalPrepend = 'div.legal';
-			if (globalNav) {
-				globalNav.remove();
-				core.setupGlobalNav();
-				Y.one('.nav-global-wrapper').insert('<h2>Ubuntu websites</h2>','before');
-				Y.one('#nav-global h2').setStyle('cursor', 'pointer').append('<span></span>').on('click',function(e) {
-					this.toggleClass('active');
-					this.next('div').toggleClass('active');
-				});
-			}
-		} else if (document.documentElement.clientWidth >= 768 && core.globalPrepend != 'body') {
-			Y.one('footer.global').addClass('no-global');
-			core.globalPrepend = 'body';
-			if (globalNav) {
-				globalNav.remove();
-				core.setupGlobalNav();
-			}
-		}
-	};
-
-	core.setupGlobalNavAccordion = function() {
-		if(Y.one('#nav-global h2') !== null) {
-			Y.one('#nav-global h2').setStyle('cursor', 'pointer').append('<span></span>').on('click',function(e) {
-				this.toggleClass('active');
-				this.next('div').toggleClass('active');
-			});
-		}
-	};
-
-	core.navOnboarding = function() {
-		var key = 'ubuntu';
-		var nav_secondary = Y.one('.nav-secondary');
-		if(nav_secondary && !nav_secondary.test(':empty')) {
-			if(Y.one('html').hasClass('localstorage')) {
-				if(localStorage.getItem(key) === null) {
-					nav_secondary.addClass('open');
-				}else{
-					ls = JSON.parse(localStorage.getItem( key ));
-					if(ls.navigation !== 'onboard') {
-						nav_secondary.addClass('open');
-					}
-				}
-			}
-		}
-	}
-	core.setLocalStorage = function($value) {
-		var key = 'ubuntu';
-		var value = $value;
-		var ubuntu = {};
-		var nav_secondary = Y.one('.nav-secondary');
-		ubuntu.navigation = value;
-		localStorage.setItem(key,JSON.stringify(ubuntu));
-	}
-
-	core.removeNoJS();
-	core.resourceHubBoxes();
-	core.setupFeatureDisplay();
-	core.setupAnimations();
-	core.flipVideo();
-	core.externalLinks();
-	core.cookiePolicy();
-	core.setHTMLClasses();
-	core.resizeListener();
-	core.footerMobileNav();
-	core.setupGlobalNavAccordion();
-	core.navOnboarding();
+YUI().use('node','gallery-carousel','gallery-carousel-anim','substitute', 'gallery-effects','cookie','event-resize','jsonp', 'io', 'dump', 'json-parse', function(Y) {
+
+    var lp_lookup_callback = {
+        timeout: 3000,
+        on: {
+            success : function (id, response) {
+                var messages = [];
+                try {
+                    messages = Y.JSON.parse(response.responseText);
+                } catch (e) {
+                    Y.log("JSON Parse failed!");
+                    return;
+                }
+                Y.one('#lp_error').setHTML(messages.message);
+            },
+            failure : function (id, response) {
+                Y.log("Async call failed!");
+            }
+        }
+    };
+
+    core.setupFeatureDisplay = function() {
+        if(Y.one('.list-features-content') != null) {
+            Y.all('.list-features-content li').setStyle('display','none');
+            Y.one('#list-feature-saas').setStyle('display','block');
+            Y.all('.nav-list-features li').each(function (node) {
+                node.delegate('click', function(e){
+                    e.preventDefault();
+                    var clicked = this.get('text');
+                    Y.all('.nav-list-features li a').removeClass('active');
+                    this.addClass('active');
+                    var toShow = '';
+                    switch(clicked) {
+                        case 'SAAS':
+                            toShow = '#list-feature-saas';
+                        break;
+                            case 'Service orchestration':
+                            toShow = '#list-feature-orchestration';
+                        break;
+                            case 'PAAS':
+                            toShow = '#list-feature-paas';
+                        break;
+                            case 'Guest OS':
+                            toShow = '#list-feature-guest';
+                        break;
+                            case 'Public cloud':
+                            toShow = '#list-feature-public';
+                        break;
+                            case 'Private cloud':
+                            toShow = '#list-feature-private';
+                        break;
+                            case 'Virtualisation':
+                            toShow = '#list-feature-virtualisation';
+                        break;
+                    }
+                    Y.all('.list-features-content li').setStyle('display','none');
+                    Y.one(toShow).setStyle('display','block');
+                }, 'a');
+            });
+        }
+    }
+
+
+    core.setupAnimations = function(){
+        if(Y.one('body').hasClass('cloud-managed-cloud')) {
+            var videoPanel = Y.all('.row--video');
+            if(Y.one('.show-video')){
+                Y.one('.show-video').on('click',function(e) {
+                    e.preventDefault();
+                    videoPanel.addClass('show');                        
+                        Y.one('.the-video div').set('innerHTML','<div class="video-container"><iframe width="984" height="554" src="http://www.youtube.com/embed/hCSTwyG7bbg?showinfo=0&vq=hd1080&rel=0&modestbranding=0&autoplay=1" frameborder="0" allowfullscreen></iframe></div>');
+                });
+            }
+        }
+
+        if(Y.one('body').hasClass('phone-home')) {
+            var yOffset = 250;
+        } else {
+            var yOffset = 350;
+        }
+        if(Y.one('body').hasClass('phone-developers') || Y.one('body').hasClass('phone-home') || Y.one('body').hasClass('phone-partners')){
+            var edgeMagic = Y.all('.edge-magic');
+            Y.on('scroll', function(e) {
+                 edgeMagic.each(function (node) {
+                    if(window.scrollY > node.getXY()[1] - yOffset && window.scrollY < node.getXY()[1] && !node.run){
+                        node.run = true;
+                        node.one('.slider-animation').addClass('run');
+                        if(node.one('.slider-animation').getAttribute('class') == 'slider-animation full-swipe run'){
+                            setTimeout(function(){ node.one('.launcher').addClass('return') }, 2000);
+                        }
+                    }
+                });
+            });
+
+            Y.all('.replay').on('click', function(e){
+                e.preventDefault();
+                core.rerunAnimation(e.target.get('parentNode').one('.slider-animation').getAttribute('class').replace('slider-animation ','').replace(' run',''));
+            });
+            if(Y.one('.content-controls .gallery-screen')){
+                Y.one('.content-controls .gallery-screen').setStyle('display','block');
+                var infoIndex = 0;
+                setInterval(function(){
+                    Y.all('.infographic .main-image').addClass('hide');
+                    Y.one('.infographic .info-pic-'+infoIndex).removeClass('hide');
+                    if(++infoIndex > 4){ infoIndex = 0; }
+                }, 4000);
+            }
+        }
+        
+        // scope animations
+        if(Y.one('body').hasClass('phone-features')){
+            var videoPanel = Y.all('.row--video');
+            if(Y.one('.show-video')){
+                Y.one('.show-video').on('click',function(e) {
+                    e.preventDefault();
+                    videoPanel.addClass('show');                        
+                        Y.one('.the-video div').set('innerHTML','<div class="video-container"><iframe width="984" height="554" src="http://www.youtube.com/embed/-dpfHYpfEXY?showinfo=0&vq=hd1080&rel=0&modestbranding=0&autoplay=1" frameborder="0" allowfullscreen></iframe></div>');
+                });
+            }
+                        
+            Y.one('.row--scopes__nearby .row--scopes__content').append('<a href="#" class="trigger">Explore what&rsquo;s near you&nbsp;&rsaquo;</a><a href="#" class="return">Back to NearBy&nbsp;&rsaquo;</a>');
+            
+            Y.one('.row--scopes__news .row--scopes__content').append('<a href="#" class="trigger">Keep up to date with news&nbsp;&rsaquo;</a><a href="#" class="return">Back to all news&nbsp;&rsaquo;</a>');
+            
+            Y.one('.row--scopes__music .row--scopes__content').append('<a href="#" class="trigger">Browse music online&nbsp;&rsaquo;</a><a href="#" class="return">Back to all music&nbsp;&rsaquo;</a>');
+
+            Y.all('a.trigger').each(function() {
+                this.on('click',function(e) {
+                    e.preventDefault();
+                    Y.all('.row--scopes').removeClass('branded');
+                    Y.one(this).get('parentNode').get('parentNode').get('parentNode').get('parentNode').addClass('branded').removeClass('vanilla');
+                });
+            })
+ 
+            Y.all('a.return').each(function() {
+                this.on('click',function(e) {
+                    e.preventDefault();
+                    Y.one(this).get('parentNode').get('parentNode').get('parentNode').get('parentNode').addClass('vanilla').removeClass('branded');                        
+                });
+            })
+
+            var yOffset = 300;
+            var edgeMagic = Y.all('.row--scopes');
+            Y.on('scroll', function(e) {
+                 edgeMagic.each(function (node) {
+                    if(window.scrollY > node.getXY()[1] + yOffset && window.scrollY < node.getXY()[1] && !node.run){
+                        node.run = true;
+                        node.removeClass('branded');
+                    }
+                });
+            });
+        } // end if(Y.one('body').hasClass('phone-features'))
+
+        if(Y.one('body').hasClass('tablet-design') || Y.one('body').hasClass('phone-home')) {
+            if(Y.one('body').hasClass('tablet-design')) {
+                var edgeMagic = Y.all('.slider-animation');
+            }
+            var videoPanel = Y.all('.the-video');
+            Y.on('scroll', function(e) {
+                edgeMagic.each(function (node) {
+                    if(window.scrollY > node.getXY()[1] - yOffset && window.scrollY < node.getXY()[1] && !node.run){
+                        node.run = true;
+                        node.addClass('run');
+                    }
+                });
+            });
+
+            Y.all('.screen').on('click', function(e){
+                core.rerunAnimation(e.target.get('parentNode').get('parentNode').get('parentNode').one('.slider-animation').getAttribute('class').replace('slider-animation ','').replace(' run',''));
+            });
+
+            Y.all('.replay').on('click', function(e){
+                e.preventDefault();
+                core.rerunAnimation(e.target.get('parentNode').one('.slider-animation').getAttribute('class').replace('slider-animation ','').replace(' run',''));
+            });
+            if(Y.one('.show-video')){
+                Y.one('.show-video').on('click',function(e) {
+                    e.preventDefault();
+                    videoPanel.addClass('show');
+                    if(Y.one('body').hasClass('tablet-design')){
+                        Y.one('.row-hero').setStyle('height','590px');
+                        Y.one('.the-video div').set('innerHTML','<iframe width="984" height="554" src="http://www.youtube.com/embed/-dpfHYpfEXY?showinfo=0&vq=hd1080&rel=0&modestbranding=0&autoplay=1" frameborder="0" allowfullscreen></iframe>');
+                    } else {
+                        Y.one('.row-hero').setStyle('height','588px').append('<div id="topbar"></div>'), 2000;
+                        
+                        Y.one('.row-hero .row-content').removeClass('show-me').addClass('hide-me');
+                        Y.one('.the-video div').set('innerHTML','<iframe width="984" height="554" src="http://www.youtube.com/embed/-dpfHYpfEXY?showinfo=0&vq=hd1080&rel=0&modestbranding=0&autoplay=1" frameborder="0" allowfullscreen></iframe>');
+                    }
+                });
+            }
+            if(Y.one('.close-video')){
+                Y.one('.close-video').on('click',function(e) {
+                    e.preventDefault();
+                    videoPanel.removeClass('show');
+                    if(Y.one('body').hasClass('tablet-design')){
+                        Y.one('.row-hero').setStyle('height','460px');
+                    } else {
+                        Y.one('.row-hero').setStyle('height','678px');
+                        Y.one('#topbar').remove()
+                        Y.one('.row-hero .row-content').addClass('show-me');
+                    };
+                    Y.one('.the-video div').set('innerHTML','');
+                });
+            }
+        }
+    }
+
+    core.scopesSlideshow = function() {
+    
+        if(Y.one('.row-slideshow')){
+            var carousel = new Y.Carousel({
+                boundingBox: "#carousel-container",
+                contentBox: "#carousel-container > ul", 
+                numVisible: 1, 
+                autoPlayInterval: 3500,
+                height: 480,
+                width: 363
+            });
+            
+            carousel.plug(Y.CarouselAnimPlugin,{animation:{speed: 0.8,effect: Y.Easing.easeOutStrong }});
+            carousel.render(); 
+            carousel.startAutoPlay();
+        }
+    };
+
+    core.runAnimation = function($anim) {
+        switch($anim) {
+            case 'search-screen':
+                Y.one('.search-screen').addClass('run');
+                setTimeout(function(){ Y.one('.search-screen').removeClass('run'); }, 2000);
+            break;
+            case 'go-back':
+                Y.one('.go-back').addClass('run');
+            break;
+        }
+    };
+    
+    core.updateSlider = function( $index ) {
+        if($index >= 4){ $index = 0; }
+        if($index <= -1){ $index = 3; }
+        YUI().use('node', function(Y) {
+            Y.one('.slide-container').setStyle('left','-'+(700 * $index)+'px');
+            Y.all('.slider-dots li').removeClass('active');
+            Y.all('.slider-dots li.pip-'+$index).addClass('active');
+            Y.all('.slider-animation').removeClass('run');
+            Y.one('.full-swipe .launcher').removeClass('return');
+            switch($index+''){
+                case '0':
+                    setTimeout(function(){ Y.one('.edge-magic').addClass('run'); }, 1200);
+                break;
+                case '1':
+                    setTimeout(function(){ Y.one('.full-swipe').addClass('run');}, 1200);
+                    setTimeout(function(){ Y.one('.full-swipe .launcher').addClass('return') }, 2000);
+                break;
+                case '2':
+                    setTimeout(function(){ Y.one('.go-back').addClass('run'); }, 1200);
+                break;
+                case '3':
+                    setTimeout(function(){ Y.one('.content-controls').addClass('run'); }, 1200);
+                break;
+            }
+        });
+        return $index;
+    }
+
+    core.rerunAnimation = function($type){
+        Y.one('.'+$type).removeClass('run');
+        if($type == 'full-swipe'){
+            Y.one('.full-swipe .launcher').removeClass('return');
+            setTimeout(function(){ Y.one('.full-swipe').addClass('run'); }, 400);
+            setTimeout(function(){ Y.one('.full-swipe .launcher').addClass('return') }, 1400);
+        }else if($type == 'notification-slider' || $type == 'search-screen'){
+            Y.one('.'+$type).removeClass('run');
+            setTimeout(function(){ Y.one('.'+$type).addClass('run'); }, 1000);
+        }else if($type == 'slider-animation') {
+
+        }else{
+            Y.one('.'+$type).removeClass('run');
+            setTimeout(function(){ Y.one('.'+$type).addClass('run'); }, 400);
+        }
+    }
+
+    core.flipVideo = function(){
+        if(Y.one('body').hasClass('phone-home')) {
+            if(Y.one('.show-video')) {
+                Y.one('.show-video').on('click',function(e) {
+                    e.preventDefault();
+                    Y.one('#panel').addClass('flipped');
+                    setTimeout(function(){ Y.one('.the-video').set('innerHTML','<iframe width="569" height="320" src="http://www.youtube.com/embed/cpWHJDLsqTU?showinfo=0&hd=1&rel=0&modestbranding=0&autoplay=1" frameborder="0" allowfullscreen></iframe>');Y.one('#panel .back').setStyle('z-index', '50');}, 1000);
+                });
+            }
+            if(Y.one('.close-video')) {
+                Y.one('.close-video').on('click',function(e) {
+                    e.preventDefault();
+                    Y.one('#panel .back').setStyle('z-index', '0');
+                    Y.one('.the-video').set('innerHTML','');
+                    Y.one('#panel').removeClass('flipped');
+                });
+            }
+        }
+    }
+
+    core.externalLinks = function() {
+        Y.all('a.external-link').each(function() {
+            this.on('click',function(e) {
+                e.preventDefault();
+                window.open(this.getAttribute('href'), '_blank');
+            });
+        })
+    }
+
+    core.chineseDownload = function() {
+        if(Y.one('body').hasClass('download-desktop-zh-CN')){
+            var ltsform = Y.one('form.lts');
+            var latestform = Y.one('form.latest');
+            Y.one('form.lts button').on('click',function(e){
+                e.preventDefault();
+                this.set('text','开始...');
+                ltsform.submit();
+            });
+
+            Y.one('form.latest button').on('click',function(e){
+                e.preventDefault();
+                this.set('text','开始...');
+                latestform.submit();
+            });
+
+            Y.one('.lts .input-bits').on('change', function() {
+                var bits = Y.one('form.lts .text-bits');
+                var form_cta = ltsform.one('.link-cta-ubuntu');
+                var val = this.get('value');
+                var iso = val == '32' ? 'http://china-images.ubuntu.com/releases/12.04/ubuntu-12.04-desktop-i386.iso' : 'http://china-images.ubuntu.com/releases/12.04/ubuntu-12.04-desktop-amd64.iso';
+                ltsform.setAttribute('action', iso);
+                bits.set('text',val);
+            });
+            Y.one('.latest .input-bits').on('change', function() {
+                var bits = Y.one('form.latest .text-bits');
+                var form_cta = latestform.one('.link-cta-ubuntu');
+                var val = this.get('value');
+                var iso = val == '32' ? 'http://cdimage.ubuntu.com/ubuntukylin/releases/13.10/release/ubuntukylin-13.10-desktop-i386.iso' : 'http://cdimage.ubuntu.com/ubuntukylin/releases/13.10/release/ubuntukylin-13.10-desktop-amd64.iso';
+                latestform.setAttribute('action', iso);
+                bits.set('text',val);
+            });
+        }
+    }
+
+    core.cookiePolicy = function() {
+        if(Y.Cookie.get("_cookies_accepted") != 'true'){
+            open();
+        }
+
+        function open() {
+            YUI().use('node', function(Y) {
+                Y.one('body').prepend('<div class="cookie-policy"><div class="wrapper"><a href="?cp=close" class="link-cta">Close</a><p>We use cookies to improve your experience. By your continued use of this site you accept such use. To change your settings please <a href="http://www.ubuntu.com/legal/terms-and-policies/privacy-policy#cookies">see our policy</a>.</p></div></div>');
+                Y.one('footer.global .legal').addClass('has-cookie');
+                Y.one('.cookie-policy .link-cta').on('click',function(e){
+                    e.preventDefault();
+                    close();
+                });
+            });
+        }
+        function close() {
+            YUI().use('node', function(Y) {
+                Y.one('.cookie-policy').setStyle('display','none');
+                setCookie();
+            });
+        }
+        function setCookie() {
+            YUI().use('cookie', function (Y) {
+                Y.Cookie.set("_cookies_accepted", "true", { expires: new Date("January 12, 2025") });
+            });
+        }
+    }
+
+    core.supportsTransitions = function() {
+        var b = document.body || document.documentElement;
+        var s = b.style;
+        var p = 'transition';
+        if(typeof s[p] == 'string') {return true; }
+        // Tests for vendor specific prop
+        v = ['Moz', 'webkit', 'Webkit', 'Khtml', 'O', 'ms'],
+        p = p.charAt(0).toUpperCase() + p.substr(1);
+        for(var i=0; i<v.length; i++) {
+            if(typeof s[v[i] + p] == 'string') { return true; }
+        }
+        return false;
+    }
+
+    core.setHTMLClasses = function(){
+        if(Y.one('body').hasClass('homepage')){
+            if (!core.supportsTransitions()) {
+                document.getElementsByTagName("html")[0].className += " no-transitions";
+            }
+            document.getElementsByTagName("html")[0].className += " run";
+
+        }
+    }
+
+    core.removeNoJS = function(){
+        Y.all('html').removeClass('no-js').addClass('yes-js');
+    }
+
+    core.footerMobileNav = function() {
+        Y.all('.footer-a li h2').on('click', function(e) {
+            e.target.toggleClass('active open');
+        });
+        Y.all('.footer-b li h2').on('click', function(e) {
+            e.target.toggleClass('active open');
+        });
+    };
+    
+    core.resizeListener = function() {
+        Y.on('windowresize', function(e) {
+            core.redrawGlobal();
+        });
+        core.globalInit();
+    };
+
+    core.globalInit= function() {
+        if (document.documentElement.clientWidth < 768) {
+            core.globalPrepend = 'div.legal';
+            core.setupGlobalNav();
+            Y.one('.nav-global-wrapper').insert('<h2>Ubuntu websites</h2>','before');
+        } else if (document.documentElement.clientWidth >= 768) {
+            core.globalPrepend = 'body';
+            core.setupGlobalNav();
+            Y.all('#additional-info h2').setStyle('cursor', 'default');
+            Y.one('footer.global').addClass('no-global');
+        }
+    };
+
+    core.redrawGlobal = function() {
+        var globalNav = Y.one("#nav-global");
+        if (document.documentElement.clientWidth < 768 && core.globalPrepend != 'div.legal') {
+            core.globalPrepend = 'div.legal';
+            if (globalNav) {
+                globalNav.remove();
+                core.setupGlobalNav();
+                Y.one('.nav-global-wrapper').insert('<h2>Ubuntu websites</h2>','before');
+                Y.one('#nav-global h2').setStyle('cursor', 'pointer').append('<span></span>').on('click',function(e) {
+                    this.toggleClass('active');
+                    this.next('div').toggleClass('active');
+                });
+            }
+        } else if (document.documentElement.clientWidth >= 768 && core.globalPrepend != 'body') {
+            Y.one('footer.global').addClass('no-global');
+            core.globalPrepend = 'body';
+            if (globalNav) {
+                globalNav.remove();
+                core.setupGlobalNav();
+            }
+        }
+    };
+
+    core.setupGlobalNavAccordion = function() {
+        if(Y.one('#nav-global h2') !== null) {
+            Y.one('#nav-global h2').setStyle('cursor', 'pointer').append('<span></span>').on('click',function(e) {
+                this.toggleClass('active');
+                this.next('div').toggleClass('active');
+            });
+        }
+    };
+
+    core.navOnboarding = function() {
+        var key = 'ubuntu';
+        var nav_secondary = Y.one('.nav-secondary');
+        if(nav_secondary && !nav_secondary.test(':empty')) {
+            if(Y.one('html').hasClass('localstorage')) {
+                if(localStorage.getItem(key) === null) {
+                    nav_secondary.addClass('open');
+                }else{
+                    ls = JSON.parse(localStorage.getItem( key ));
+                    if(ls.navigation !== 'onboard') {
+                        nav_secondary.addClass('open');
+                    }
+                }
+            }
+        }
+    }
+    core.setLocalStorage = function($value) {
+        var key = 'ubuntu';
+        var value = $value;
+        var ubuntu = {};
+        var nav_secondary = Y.one('.nav-secondary');
+        ubuntu.navigation = value;
+        localStorage.setItem(key,JSON.stringify(ubuntu));
+    }
+
+    core.renderJSON = function (response, id) {
+        if (id == undefined) {
+            id = '#dynamic-logos';
+        }
+        var JSON = response;
+        var numberPartners = JSON.length;
+        var numberToDisplay = numberPartners < 10 ? numberPartners : 10;
+
+        for (var i = 0; i < numberToDisplay; i++) {
+            Y.one(id).append(Y.Node.create('<li><img onload="this.style.opacity=\'1\';" src="'+JSON[i].logo+'" alt="'+JSON[i].name+'"></li>'));
+        }
+    };
+
+    core.loadPartners = function (params, elementID, feedName) {
+        if (typeof feedName === 'undefined') { 
+            feedName = 'partners';
+        }
+
+        var partnersAPI = "http://partners.ubuntu.com/" + feedName + ".json";
+        var url = partnersAPI + params + "&callback={callback}";
+        var callback = function(response) {
+            return core.renderJSON(response, elementID);
+        }
+        Y.jsonp(url, callback);
+    };
+
+    core.removeNoJS();
+    core.setupFeatureDisplay();
+    core.setupAnimations();
+    core.flipVideo();
+    core.externalLinks();
+    core.cookiePolicy();
+    core.setHTMLClasses();
+    core.resizeListener();
+    core.footerMobileNav();
+    core.setupGlobalNavAccordion();
+    core.navOnboarding();
+    core.scopesSlideshow();
 });
diff --git a/templates/2013/01/press-pack-ubuntu-phone/index.html b/templates/2013/01/press-pack-ubuntu-phone/index.html
deleted file mode 100755
index ddc86825141..00000000000
--- a/templates/2013/01/press-pack-ubuntu-phone/index.html
+++ /dev/null
@@ -1,112 +0,0 @@
-{% extends "_base/one-column.html" %}
-
-{% block title %}Ubuntu phone press pack{% endblock %}
-
-{% block content %}
-<div class="row row-hero">
-	<div class="four-col">
-		<h1>Ubuntu on phone press pack</h1>
-		<p>Ubuntu is a popular desktop OS that now offers a touch-based phone interface, using gestures from all four edges of the screen to deliver a more immersive experience. It uniquely enables convergence of the mobile and PC worlds, boasting a stunning interface and a rich developer ecosystem.</p>
-	</div>
-	<div class="eight-col text-center last-col">
-		<img src="{{ STATIC_URL }}img/devices/image-phone.jpg" width="579" height="308" alt="Ubuntu on phone" style="margin-top: 10px;" />
-	</div>
-</div>
-
-<div class="row combined-list">
-	<h2>About Ubuntu on phone</h2>
-	<div class="combined-list">
-		<div class="six-col">
-			<ul class="list-ubuntu">
-				<li>Leading open PC platform announces mobile version for network operators, OEMs and silicon vendors</li>
-				<li>A single OS for phone, PC and TV</li>
-				<li class="last-item">Fast, beautiful interface for entry level smartphones</li>
-	    	</ul>
-		</div>
-		<div class="six-col last-col">
-			<ul class="list-ubuntu">
-				<li>Ubuntu raises the bar for mobile UI design, for richer and more immersive apps</li>
-				<li class="last-item">Unique PC experience on superphones when docked with a monitor, keyboard and mouse</li>
-			</ul>
-		</div>
-	</div>
-</div>
-
-<div class="row">
-	<div class="twelve-col">
-		<h2>Downloadable assets</h2>
-		<p>You can find more information about Ubuntu and the phone interface here:</p>
-	</div>
-	<div class="combined-list">
-		<div class="four-col">
-			<ul class="list">
-				<li><a href="{{ STATIC_URL }}files/section/devices/Ubuntu-phone-FAQ.pdf">Download FAQ&nbsp;&rsaquo;</a></li>
-				<li><a href="{{ STATIC_URL }}files/section/devices/Ubuntu-fast_facts.pdf">Download fast facts&nbsp;&rsaquo;</a></li>
-				<li class="last-item"><a href="http://design.ubuntu.com/downloads?metadata=element-logo+brand-ubuntu">Download Ubuntu logos&nbsp;&rsaquo;</a></li>
-			</ul>
-		</div>
-		<div class="four-col">
-			<ul class="list">
-				<li><a href="{{ STATIC_URL }}files/section/devices/Ubuntu-phone-press_release.pdf">Download press release&nbsp;&rsaquo;</a></li>
-				<li class="last-item"><a href="{{ STATIC_URL }}files/section/devices/Ubuntu-phone-press_brochure.pdf">Download press brochure&nbsp;&rsaquo;</a></li>
-			</ul>
-		</div>
-		<div class="four-col last-col">
-			<ul class="list">
-				<li><a href="{{ STATIC_URL }}files/section/devices/Ubuntu-phone-spokespeople.pdf">Download spokespeople bios&nbsp;&rsaquo;</a></li>
-				<li class="last-item"><a href="{{ STATIC_URL }}files/section/devices/Ubuntu-phone-product_image.zip">Download product image&nbsp;&rsaquo;</a></li>
-			</ul>
-		</div>
-	</div>
-</div>
-
-<div class="row">
-	<div class="twelve-col">
-		<h2>Videos</h2>
-		<p>Learn all about the Ubuntu mobile strategy and Ubuntu for smartphones.</p>
-	</div>
-	<div class="six-col">
-		<h3>Industry proposition <small>(21 mins) - <a href="http://v.youku.com/v_show/id_XNTA2NDczNDE2">优酷视频&nbsp;&rsaquo;</a></small></h3>
-		<p><object width="100%" height="259"><param name="movie" value="http://www.youtube.com/v/cpWHJDLsqTU?hl=en_GB&amp;version=3&amp;rel=0"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/cpWHJDLsqTU?hl=en_GB&amp;version=3&amp;rel=0&showinfo=0" type="application/x-shockwave-flash" width="100%" height="259" allowscriptaccess="always" allowfullscreen="true"></embed></object></p>
-	</div>
-	<div class="six-col last-col">
-		<h3>Trailer <small>(1 min) - <a href="http://v.youku.com/v_show/id_XNDk5MjQ3MTcy">优酷视频&nbsp;&rsaquo;</a></small></h3>
-		<p><object width="100%" height="259"><param name="movie" value="http://www.youtube.com/v/LoXpLUr5WB4?hl=en_GB&amp;version=3&amp;rel=0"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/LoXpLUr5WB4?hl=en_GB&amp;version=3&amp;rel=0&showinfo=0" type="application/x-shockwave-flash" width="100%" height="259" allowscriptaccess="always" allowfullscreen="true"></embed></object></p>
-	</div>
-	<div class="six-col">
-		<h3>Ubuntu on phones <small>(8 mins)</small></h3>
-		<p><object width="100%" height="259"><param name="movie" value="http://www.youtube.com/v/-RVKxywFsQY?hl=en_GB&amp;version=3&amp;rel=0"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/-RVKxywFsQY?hl=en_GB&amp;version=3&amp;rel=0&showinfo=0" type="application/x-shockwave-flash" width="100%" height="259" allowscriptaccess="always" allowfullscreen="true"></embed></object></p>
-	</div>
-	<div class="six-col last-col">
-		<h3>Slideshow <small>(1.33 min)</small></h3>
-		<p><object width="100%" height="259"><param name="movie" value="http://www.youtube.com/v/yCa-6mZ6dT0?hl=en_GB&amp;version=3&amp;rel=0"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/yCa-6mZ6dT0?hl=en_GB&amp;version=3&amp;rel=0&showinfo=0" type="application/x-shockwave-flash" width="100%" height="259" allowscriptaccess="always" allowfullscreen="true"></embed></object></p>
-	</div>
-</div>
-
-<div class="row combined-list">
-	<h2>Main features</h2>
-	<div class="six-col">
-		<ul class="list-ubuntu">
-			<li>Edge magic: thumb gestures from all four edges of the screen that enable users to find content and switch between apps faster than they can on other phones.</li>
-    		<li>Focus on content, not the controls: immerses the user in their content. Controls only appear when they want them.</li>
-    		<li class="last-item">Integrated search: search for anything that&rsquo;s saved on the phone, any content from online providers like Amazon and even menu functions within applications.</li>
-    	</ul>
-	</div>
-	<div class="six-col last-col">
-		<ul class="list-ubuntu">
-			<li>HTML5 apps, web apps and native apps are equal citizens &ndash; they all get their own icons and access to system services, so the user need never know the difference.</li>
-    		<li class="last-item">Personalised welcome screen:  a visualisation of an individual’s social interactions (infographics on calls, SMS, Twitter) &ndash; ever changing, totally personal.</li>
-		</ul>
-	</div>
-</div>
-
-<div class="row row-image-centered no-border">
-	<div class="eight-col">
-	<h2>About Canonical</h2>
-		<p>Canonical is the commercial sponsor of the Ubuntu project and the leading provider of support services for Ubuntu deployments in the enterprise.</p>
-		<p>Ubuntu is a free, open-source platform for client, server and cloud computing. Since its launch in 2004, it has become a natural choice for users of all kinds, from Fortune 500 companies to hardware makers, content providers, software developers and individual technologists.</p>
-		<p>With developers, support staff and engineering centres all over the world, Canonical is uniquely positioned to help its partners and enterprise customers make the most of Ubuntu. It also operates Ubuntu One, a cross-platform personal cloud service  for consumers. Canonical is a privately held company.</p>
-	</div>
-	<span><img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-canonical.svg" width="167" height="167" alt="Canonical logo" /></span>
-</div>
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/2013/02/press-pack-ubuntu-tablet/faq.html b/templates/2013/02/press-pack-ubuntu-tablet/faq.html
deleted file mode 100755
index c9ba310b08d..00000000000
--- a/templates/2013/02/press-pack-ubuntu-tablet/faq.html
+++ /dev/null
@@ -1,185 +0,0 @@
-{% extends "_base/one-column.html" %}
-
-{% block title %}Ubuntu tablet press pack{% endblock %}
-What is the target market
-{% block content %}
-<div class="row row-hero">
-	<div class="eight-col">
-		<h1>Media FAQ for press pack: tablet</h1>
-		<p><a href="#question1">What is Canonical announcing?</a></p>
-		<p><a href="#question2">What makes it so different from anything available on the market today?</a></p>
-		<p><a href="#question3">What is the target market for Ubuntu tablets?</a></p>
-		<p><a href="#question4">Is it simply a &lsquo;blown-up&rsquo; version of the phone OS?</a></p>
-		<p><a href="#question5">Is there a version of Ubuntu for every device now?</a></p>
-		<p><a href="#question6">Which markets will Ubuntu be available in and when?</a></p>
-		<p><a href="#question7">How will Ubuntu for tablets come to market?</a></p>
-		<p><a href="#question8">Is it ready to build a device now?</a></p>
-		<p><a href="#question9">Which partners will you be working with to bring the tablet to market?</a></p>
-		<p><a href="#question10">How much will it cost?</a></p>
-		<p><a href="#question11">I&rsquo;m a developer, can I download the code on my device?</a></p>
-		<p><a href="#question12">Can I download Ubuntu onto tablets alongside my existing OS?</a></p>
-		<p><a href="#question13">Will it have any apps?</a></p>
-		<p><a href="#question14">Will Ubuntu tablets run Android apps?</a></p>
-		<p><a href="#question15">What do developers need to do to start building apps?</a></p>
-		<p><a href="#question16">Is there a software development kit (SDK)?</a></p>
-		<p><a href="#question17">How can you expect to compete with Android, iPad and Microsoft?</a></p>
-		<p><a href="#question18">What are the minimum hardware requirements for Ubuntu on tablets?</a></p>
-	</div>
-</div>
-
-<div class="row">
-	<p class="link-top"><a href="#">Back to top</a></p>
-	<div class="eight-col">
-		<h3 id="question1">What is Canonical announcing?</h3>
-		<p>Canonical is presenting a distinctive tablet interface for its popular operating system, Ubuntu. The tablet is the next step in Canonical&rsquo;s mission to create one seamless experience for personal computing on phones, tablets, PCs and TVs. Ubuntu is distinctive in being the only operating system that runs across all those devices with a unified family of interfaces.</p>
-	</div>
-</div>
-
-<div class="row">
-	<p class="link-top"><a href="#">Back to top</a></p>
-	<div class="eight-col">
-		<h3 id="question2">What makes it so different from anything available on the market today?</h3>
-		<p>Ubuntu brings a beautiful user experience to the tablet form factor, including the ability for tablet users to truly multi task &ndash; by using two apps on the same screen, at the same time. A secure multi-user sign on makes it a device suitable for sharing at home or in the workplace and Ubuntu also offers voice and character intelligent search, through the HUD, making it faster and easier to complete activities.</p>
-		<p>Like Ubuntu on phones, it can run on hardware at the low end of the cost spectrum, while at the high end, it can deliver a genuine hybrid tablet/PC experience on devices that can be connected to a keyboard and mouse.</p>
-	</div>
-</div>
-
-<div class="row">
-	<p class="link-top"><a href="#">Back to top</a></p>
-	<div class="eight-col">
-		<h3 id="question3">What is the target market for Ubuntu on tablets?</h3>
-		<p>There are two markets for the Ubuntu tablet: consumers, where the style and usability of Ubuntu sets it apart from existing offerings, and the enterprise, where Ubuntu&rsquo;s reputation for security and manageability are well established. Being pure Ubuntu means that our tablets can be managed with exactly the same tools as Ubuntu desktops and servers, and inherit the same security updates and rigorous engineering.</p>
-		<p>Ubuntu runs well even on entry level tablets, providing great performance and feature rich functionality on low bill of material devices. At the high end Ubuntu offers full tablet/PC convergence when connected to a keyboard and mouse. And built-in thin client functionality means the Ubuntu tablet has access to Windows apps and desktops over standard protocols from Microsoft, Citrix, VMWare and Wyse.</p>
-		<p>Mobile device OEMs can now deliver a high-gloss touch experience on devices spanning the entire cost range, from entry-level consumer hardware up to new tablet/PC convergence products for the enterprise.</p>
-	</div>
-</div>
-
-<div class="row">
-	<p class="link-top"><a href="#">Back to top</a></p>
-	<div class="eight-col">
-		<h3 id="question4">Is it simply a &lsquo;blown-up&rsquo; version of the phone OS?</h3>
-		<p>The Ubuntu tablet experience is distinctive and unique, a bridge between the phone and PC experience. It offers true multi-tasking thanks to the invention of the side stage which places both a phone and a tablet app on the same screen at the same time.</p>
-		<p>The OS is exactly the same in all cases &ndash; Ubuntu running on tablets is the same Ubuntu which runs on the PC, phone and TV. What varies is the interface: Ubuntu presents the right experience for each device, dynamically. The phone, tablet, PC and TV interfaces are a family based on common design elements, with each member optimised for that form factor.</p>
-		<p>For example, on the phone, Ubuntu has been adapted for use in one hand. On the tablet, we designed for use with two hands. Ubuntu apps present different interfaces so one app can run on any Ubuntu device, phone, tablet, PC or TV, making use of the features available.</p>
-	</div>
-</div>
-
-<div class="row">
-	<p class="link-top"><a href="#">Back to top</a></p>
-	<div class="eight-col">
-		<h3 id="question5">Is there a version of Ubuntu for every device now?</h3>
-		<p>Ubuntu for the PC has been in the market for nine years, and a server version has been available for almost seven years. Adaptations of Ubuntu for the smartphone, TV and the tablet are all in development and expected to be available in 2013. All form factors will be merged into a single platform for our 14.04 LTS release in early 2014.</p>
-	</div>
-</div>
-
-<div class="row">
-	<p class="link-top"><a href="#">Back to top</a></p>
-	<div class="eight-col">
-		<h3 id="question6">Which markets will Ubuntu be available in and when?</h3>
-		<p>Canonical is a now engaging with hardware manufacturers and and aim to have the first Ubuntu tablets available for retail by the end of 2013.</p>
-	</div>
-</div>
-
-<div class="row">
-	<p class="link-top"><a href="#">Back to top</a></p>
-	<div class="eight-col">
-		<h3 id="question7">How will Ubuntu for tablets come to market?</h3>
-		<p>End users will buy Ubuntu tablets through normal retail channels, led by our partners. Developers will also be able to install Ubuntu on a variety of common tablets, such as the Nexus 7 and Nexus 10.</p>
-	</div>
-</div>
-
-<div class="row">
-	<p class="link-top"><a href="#">Back to top</a></p>
-	<div class="eight-col">
-		<h3 id="question8">Is it ready to build a device now?</h3>
-		<p>No, however the program is on track and we have passed the key milestone of finalizing the design and engaging with both commercial partners and the open source community. We intend to announce our preferred chipset partner in the next few weeks, accelerating our engagements with hardware manufacturers.</p>
-	</div>
-</div>
-
-<div class="row">
-	<p class="link-top"><a href="#">Back to top</a></p>
-	<div class="eight-col">
-		<h3 id="question9">Which partners will you be working with to bring the tablet to market?</h3>
-		<p>Our existing PC partners have all expressed a desire to expand our relationship into mobile and touch categories, and phone OEMs that are working with us on Ubuntu phones will find it very easy to engage us on tablets too. Given the role of content on tablets, media companies looking for a more direct connection to their audience are also interested in Ubuntu.</p>
-	</div>
-</div>
-
-<div class="row">
-	<p class="link-top"><a href="#">Back to top</a></p>
-	<div class="eight-col">
-		<h3 id="question10">How much will it cost?</h3>
-		<p>We expect it to be priced competitively. Ubuntu is an affordable alternative for our partners and consumers.</p>
-	</div>
-</div>
-
-<div class="row">
-	<p class="link-top"><a href="#">Back to top</a></p>
-	<div class="eight-col">
-		<h3 id="question11">I&rsquo;m a developer, can I download the code on my device?</h3>
-		<p>Our developer information site (<a href="http://www.ubuntu.com/gomobile">www.ubuntu.com/gomobile</a>) has relevant information for developers to start building apps for Ubuntu now.</p>
-		<p>The system code for phones and tablets will be published on Feb 21st under the normal Ubuntu process, and it will be possible to the run Ubuntu on a Nexus 7 or a Nexus 10 device if you already own that hardware. This Touch Developer Preview of Ubuntu will replace Android on those devices, so developers that are interested will need to be skilled at installing and replacing operating systems. It is not a final version of the OS, it a specific build for hardware partners and application developers.</p>
-	</div>
-</div>
-
-<div class="row">
-	<p class="link-top"><a href="#">Back to top</a></p>
-	<div class="eight-col">
-		<h3 id="question12">Can I download Ubuntu onto tablets alongside my existing OS?</h3>
-		<p>Ubuntu is a new OS, not an app. There is no consumer-facing installer of the kind created for Ubuntu on the PC. The only way to get an Ubuntu tablet is to buy a tablet built and supplied with Ubuntu by an OEM partner of Canonical.</p>
-	</div>
-</div>
-
-<div class="row">
-	<p class="link-top"><a href="#">Back to top</a></p>
-	<div class="eight-col">
-		<h3 id="question13">Will it have any apps?</h3>
-		<p>The Developer Preview contains a  number of core applications such as a camera, web browser, Gallery for photo management. The applications will be a combination of both native applications and web applications.</p>
-		<p>Like Ubuntu on the PC and the phone, Ubuntu supports a variety of development frameworks: developers can repurpose existing web applications quickly, so that they get their own icons and access to system services like notifications and search, just like native apps. Mobile developers who have already created HTML5 apps for Android and iOS will be able to quickly adapt those apps, thanks to Ubuntu&rsquo;s full support for HTML5. </p>
-		<p>To exploit the full power of the hardware, developers can create native apps using the Ubuntu SDK, for which an alpha release is available and which many developers are now using to create the first wave of native apps.</p>
-	</div>
-</div>
-
-<div class="row">
-	<p class="link-top"><a href="#">Back to top</a></p>
-	<div class="eight-col">
-		<h3 id="question14">Will Ubuntu tablets run Android apps?</h3>
-		<p>No, but we are making it extremely easy to republish Android apps for Ubuntu. Although both Android and Ubuntu are built on the Linux kernel, they are different operating systems. Android apps run in a Java virtual machine, whereas Ubuntu apps can be native or based on HTML5.</p>
-		<p>HTML5 apps written for Android devices using tools like PhoneGap will run unmodified on Ubuntu. Android apps that use Java will be easy to modify for Ubuntu&rsquo;s distinctive UI, and publish in the Ubuntu app store, with Dalvik bundled in the app.</p>
-	</div>
-</div>
-
-<div class="row">
-	<p class="link-top"><a href="#">Back to top</a></p>
-	<div class="eight-col">
-		<h3 id="question15">What do developers need to do to start building apps?</h3>
-		<p>Web applications can make use of the Ubuntu Web Apps API to become installable on Ubuntu devices. HTML5 apps written for iOS or Android be adapted with minimal work, because Ubuntu offers full support for HTML5. Developers who want to create native apps that use the full power of the Ubuntu device should go to <a href="http://developer.ubuntu.com">developer.ubuntu.com</a> and download the Ubuntu SDK.</p>
-	</div>
-</div>
-
-<div class="row">
-	<p class="link-top"><a href="#">Back to top</a></p>
-	<div class="eight-col">
-		<h3 id="question16">Is there a software development kit (SDK)?</h3>
-		<p>A preview release of the SDK, including sample applications, is available from <a href="http://developer.ubuntu.com">developer.ubuntu.com</a>. Based on the same core tools as the native Blackberry SDK, it makes the development of native Ubuntu apps quick and easy. Developers can make a single app available for all Ubuntu form factors: phone, tablet, PC and TV, and publish in the Ubuntu Software Centre with a single upload.</p>
-	</div>
-</div>
-
-<div class="row">
-	<p class="link-top"><a href="#">Back to top</a></p>
-	<div class="eight-col">
-		<h3 id="question17">How can you expect to compete with Android, iPad and Microsoft?</h3>
-		<p>Ubuntu offers a gorgeous user interface that scales beautifully across phone, tablet, PC and TV. That&rsquo;s a unique proposition for both corporate and consumer users, who are embracing new kinds of device in a sweeping trend.</p>
-		<p>The Ubuntu approach to service and content integration enables OEMs and carriers to participate in post-sale revenue streams without fragmenting the platform or user experience.</p>
-		<p>Ubuntu is an established ecosystem with very widespread enterprise familiarity, a trusted brand in sensitive environments and the platform of choice for developers from cloud to mobile. At the higher end Ubuntu offers true desktop convergence, perfect for companies focused on security, efficiency and manageability.</p>
-	</div>
-</div>
-
-<div class="row no-border">
-	<p class="link-top"><a href="#">Back to top</a></p>
-	<div class="eight-col">
-		<h3 id="question18">What are the minimum hardware requirements for Ubuntu on tablets?</h3>
-		<p>Ubuntu runs well on today&rsquo;s low-end tablets &ndash; a dual core Cortex A9 processor or similar, 1GB RAM, 8GB of storage and a multi-touch display are all that is needed.</p>
-	</div>
-</div>
-
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/2013/02/press-pack-ubuntu-tablet/index.html b/templates/2013/02/press-pack-ubuntu-tablet/index.html
deleted file mode 100755
index f2f85692dbf..00000000000
--- a/templates/2013/02/press-pack-ubuntu-tablet/index.html
+++ /dev/null
@@ -1,93 +0,0 @@
-{% extends "_base/one-column.html" %}
-
-{% block title %}Ubuntu tablet press pack{% endblock %}
-
-{% block content %}
-<div class="row row-hero">
-	<div class="four-col">
-		<h1>Ubuntu tablet press pack</h1>
-		<p>Ubuntu is a popular desktop OS that now offers a touch-based tablet interface, using gestures from all four edges of the screen to deliver a more immersive experience. It uniquely enables convergence of the mobile and PC worlds, boasting a stunning interface and a rich developer ecosystem.</p>
-	</div>
-	<div class="eight-col text-center last-col">
-		<img src="{{ STATIC_URL }}img/devices/tablet-hero.jpg" width="584" height="340" alt="Ubuntu on phone" style="margin-top: 10px;" />
-	</div>
-</div>
-
-<div class="row equal-height">
-	<h2>About Ubuntu tablet</h2>
-	<div class="four-col box-grey"><p>The Ubuntu family of interfaces now scales across all screens, so a phone can provide tablet, PC and TV experiences when docked</p></div>
-	<div class="four-col box-grey"><p>An Ubuntu tablet is a secure thin client that can be managed with the same tools as any Ubuntu server or desktop</p></div>
-	<div class="four-col last-col box-grey"><p>A single OS for phone, tablet, PC and TV</p></div>
-</div>
-
-<div class="row">
-	<div class="twelve-col">
-		<h2>Press and media assets</h2>
-		<p>You can find more information about Ubuntu and the tablet interface here:</p>
-	</div>
-
-	<div class="four-col box-grey">
-		<h4>Download press release</h4>
-		<ul class="list">
-			<li><a href="{{ STATIC_URL }}files/section/devices/Ubuntu-tablet-press-release-en.pdf">English press release&nbsp;&rsaquo;</a></li>
-			<li><a href="{{ STATIC_URL }}files/section/devices/Ubuntu-tablet-press-release-cn.pdf">Chinese press release&nbsp;&rsaquo;</a></li>
-			<li class="last-item"><a href="{{ STATIC_URL }}files/section/devices/Ubuntu-tablet-press-release-es.pdf">Spanish press release&nbsp;&rsaquo;</a></li>
-		</ul>
-	</div>
-	<div class="combined-list">
-		<ul class="list four-col">
-			<li><a href="{{ STATIC_URL }}files/section/devices/Ubuntu-tablet-spokespeople.pdf">Download spokespeople bios&nbsp;&rsaquo;</a></li>
-			<li><a href="{{ STATIC_URL }}files/section/devices/Ubuntu-tablet-brochure.pdf">Download press brochure&nbsp;&rsaquo;</a></li>
-			<li class="last-item"><a href="http://design.ubuntu.com/downloads?metadata=element-logo+brand-ubuntu">Download Ubuntu logos&nbsp;&rsaquo;</a></li>
-		</ul>
-		<ul class="list four-col last-col">
-			<li><a href="{{ STATIC_URL }}files/section/devices/Ubuntu-fast_facts.pdf">Download fast facts&nbsp;&rsaquo;</a></li>
-			<li><a href="{{ STATIC_URL }}files/section/devices/Ubuntu-tablet-product_image.zip">Download product image&nbsp;&rsaquo;</a></li>
-			<li class="last-item"><a href="/2013/02/press-pack-ubuntu-tablet/faq">Media FAQ&nbsp;&rsaquo;</a></li>
-		</ul>
-	</div>
-</div>
-
-<div class="row">
-	<div class="twelve-col">
-		<h2>Videos</h2>
-		<p>Learn all about the Ubuntu mobile strategy and Ubuntu on tablets.</p>
-	</div>
-	<div class="six-col">
-		<h3>Full video <small>(6 mins) - <a href="http://v.youku.com/v_show/id_XNTE3Njc4MTM2">优酷视频&nbsp;&rsaquo;</a></small></h3>
-		<p class="video-container"><iframe width="460" height="259" src="http://www.youtube.com/embed/h384z7Ph0gU?rel=0&vq=hd1080&showinfo=0" frameborder="0" allowfullscreen></iframe></p>
-	</div>
-	<div class="six-col last-col">
-		<h3>Trailer <small>(1 min)</small></h3>
-		<p class="video-container"><iframe width="460" height="259" src="http://www.youtube.com/embed/5_4fXQcxFRs?rel=0&vq=hd1080&showinfo=0" frameborder="0" allowfullscreen></iframe></p>
-	</div>
-</div>
-
-<div class="row">
-	<h2>Main features</h2>
-	<div class="combined-list">
-		<div class="six-col">
-			<ul class="list-ubuntu">
-				<li><strong>Real multitasking:</strong> Ubuntu&rsquo;s side stage allows a phone app on the screen at the same time as a tablet app to enable efficient multitasking and improve the usability of phone apps on tablets.</li>
-	    		<li><strong>Secure multi-user:</strong> Multiple accounts on one tablet with full encryption for personal data, combined with the trusted Ubuntu security model makes it ideal for work and family use.</li>
-	    		<li class="last-item"><strong>Voice controlled HUD productivity:</strong> The Heads-Up Display  makes it fast and easy to do complex things on touch devices and transforms touch interfaces for rich applications, bringing all the power of the PC to your tablet.</li>
-	    	</ul>
-		</div>
-		<div class="six-col last-col">
-			<ul class="list-ubuntu">
-				<li><strong>Edge magic for cleaner apps:</strong> All four screen edges are used for navigation between apps, settings and controls, which means less clutter, more content, and sleeker hardware. No physical or soft buttons are required.</li>
-	    		<li class="last-item"><strong>Content focus:</strong>  Media is neatly presented on the customisable home screen, which can search hundreds of sources.</li>
-			</ul>
-		</div>
-	</div>
-</div>
-
-<div class="row row-image-centered no-border">
-	<div class="eight-col">
-	<h2>About Canonical</h2>
-		<p>Canonical is the company behind Ubuntu and the leading provider of services for Ubuntu deployments in the enterprise. With global teams of developers, support staff and engineering centres, Canonical is uniquely positioned to help partners and customers make the most of Ubuntu. It also operates Ubuntu One, a cross-platform personal cloud service  for consumers. Canonical is a privately held company.</p>
-		<p>Ubuntu is a free, open-source platform for client, server and cloud computing. It is the most widely used Linux on the top 1000 websites by traffic, the reference platform for OpenStack deployments, the most popular guest OS on public clouds, and ships on PCs from Dell, Lenovo, HP and other brands. Since its launch in 2004, it has become the preferred choice for open desktop and scale-out computing, from Fortune 500 companies to hardware makers, content providers, software developers and consumers.</p>
-	</div>
-	<span><img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-canonical.svg" width="167" height="167" alt="Canonical logo" /></span>
-</div>
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/2013/07/edge-founders.html b/templates/2013/07/edge-founders.html
index b5e76f849d0..c1612a4b821 100755
--- a/templates/2013/07/edge-founders.html
+++ b/templates/2013/07/edge-founders.html
@@ -1,4 +1,4 @@
-{% extends "_base/one-column.html" %}
+{% extends "templates/one-column.html" %}
 
 {% block title %}Ubuntu Edge founders{% endblock %}
 
diff --git a/templates/2013/07/press-pack-ubuntu-edge/index.html b/templates/2013/07/press-pack-ubuntu-edge/index.html
index e3ee7fc0d60..68f43a56edd 100755
--- a/templates/2013/07/press-pack-ubuntu-edge/index.html
+++ b/templates/2013/07/press-pack-ubuntu-edge/index.html
@@ -1,4 +1,4 @@
-{% extends "_base/one-column.html" %}
+{% extends "templates/one-column.html" %}
 
 {% block title %}Ubuntu Edge press pack{% endblock %}
 
diff --git a/templates/2013/_includes/_contextual_footer.html b/templates/2013/shared/_contextual_footer.html
similarity index 100%
rename from templates/2013/_includes/_contextual_footer.html
rename to templates/2013/shared/_contextual_footer.html
diff --git a/templates/_includes/_community.html b/templates/_includes/_community.html
deleted file mode 100755
index dd825caade0..00000000000
--- a/templates/_includes/_community.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<div class="row row-community row-image-centered{% if level_1 == 'desktop' and not level_2 %} no-border{% endif %}">
-
-	<div class="nine-col">
-{% if level_1 == 'desktop' and not level_2 %}
-		<div class="six-col">
-			<h2 id="a-thriving-community">A thriving community</h2>
-			<!-- <h3>Exchange expertise and ideas with thousands of other IT professionals</h3> -->
-			<p>Want to talk to other Ubuntu users straightaway? Share ideas and get advice and help from our large, active community of IT professionals. As a community, we set high standards for friendliness and tolerance, we welcome your questions and contributions!</p>
-		</div>
-		<div class="three-col last-col box where-to-find-us smaller">
-			<h3>Where to find us</h3>
-			<ul class="list">
-				<li class="ask-ubuntu"><a href="http://askubuntu.com">Ask Ubuntu</a></li>
-				<li class="mailing-lists"><a href="https://lists.ubuntu.com/">Mailing lists</a></li>
-				<li class="ubuntu-blog"><a href="http://planet.ubuntu.com/">Ubuntu blog</a></li>
-				<li class="ask-ubuntu"><a href="http://ubuntuforums.org">Ubuntu Forums</a></li>
-			</ul>
-		</div><!-- /.three-col -->
-{% else %}
-		<h2 id="a-thriving-community">A thriving community</h2>
-		<p>Exchange expertise and ideas with thousands of other IT professionals</p>
-		<p>Want to talk to other Ubuntu users straightaway? Share ideas and get advice and help from our large, active community of IT professionals. As a community, we set high standards for friendliness and tolerance, we welcome your questions and contributions!</p>
-		<p><a href="http://community.ubuntu.com/">Join the community&nbsp;&rsaquo;</a></p>
-{% endif %}
-	</div><!-- /.nine-col --><span><img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-community-orange.svg" alt="" width="136" height="136" /></span>
-
-</div><!-- /.row -->
diff --git a/templates/_includes/_ubuntu_advantage_whats_inlcuded.html b/templates/_includes/_ubuntu_advantage_whats_inlcuded.html
deleted file mode 100755
index 05e9744a69e..00000000000
--- a/templates/_includes/_ubuntu_advantage_whats_inlcuded.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<div class="row row-grey row-ubuntu-advantage-promo">
-	<div class="six-col">
-	<h2>Ubuntu Advantage: what&rsquo;s included?</h2>
-		<h3>Systems management: Landscape</h3>
-		<p>With the Landscape systems management tool, you can automate updates and manage physical, virtual and cloud-based systems from a single interface. It&rsquo;s easy to set up, easy to use and requires no special hardware. It features:</p>
-		<div class="combined-list">
-			<ul class="three-col list-canonical">
-				<li class="three-col smaller">Management at scale</li>
-				<li class="three-col smaller">Role-based access</li>
-				<li class="three-col smaller last-item">Compliance reports</li>
-			</ul>
-			<ul class="three-col last-col list-canonical">
-				<li class="three-col smaller">Deploy or rollback security updates</li>
-				<li class="three-col smaller last-item">Informative monitoring</li>
-			</ul>
-		</div>
-	<p class="clear {% if level_2 != 'hyperscale' %}no-margin-bottom{% endif %}"><a href="/management">Learn more about Landscape&nbsp;&rsaquo;</a></p>
-	{% if level_2 == 'hyperscale' %}<p class="clear no-margin-bottom"><a href="http://www.youtube.com/watch?v=WnjVvPl7ZPo">See Landscape in action&nbsp;&rsaquo;</a></p>{% endif %}
-	</div><!-- /.six-col -->
-	<div class="six-col last-col no-margin-bottom pull-right">
-		<img src="{{ STATIC_URL }}img/server/management/image-landscape.jpg" alt="" width="482" height="540" class="priority-0 touch-border" />
-	</div>
-</div><!-- /.row -->
-
-<div class="row row-grey">
-	<div class="twelve-col vertical-divider equal-height smaller">
-		<div class="four-col">
-			<h3>24/7 support</h3>
-			<p>Canonical's Global Support &amp; Services team provides around-the-clock coverage for Ubuntu deployments all over the world. Telephone support gives you access to engineers with first-hand experience of your issues, while the online portal lets you track the progress of cases in real time.</p>
-		</div><!-- /.four-col -->
-		<div class="four-col">
-			<h3>Technical library</h3>
-			<p>Exclusive to Ubuntu Advantage subscribers, the Canonical Knowledge Base is an online library of articles on technical issues including security, migration and networking.</p>
-		</div><!-- /.four-col -->
-		<div class="four-col last-col no-margin-bottom">
-			<h3>Flexible deployment</h3>
-			<p>You can use Landscape hosted as a service or, install Landscape Dedicated Server on your hardware and enjoy the same functionality of Landscape's SaaS edition, but within the control of your own security perimeter.</p>
-		</div><!-- /.four-col -->
-	</div><!-- /.twelve-col -->
-	<p><a href="/management/ubuntu-advantage">Learn more about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
-</div><!-- /.row -->
diff --git a/templates/about/_nav_tertiary.html b/templates/about/_nav_tertiary.html
index 8a74fed19a7..bf116279dd8 100755
--- a/templates/about/_nav_tertiary.html
+++ b/templates/about/_nav_tertiary.html
@@ -6,6 +6,6 @@
 			<li{% if level_3 == 'conduct' %} class="active"{% endif %}><a href="/about/about-ubuntu/conduct">Code of Conduct</a></li>
 			<li{% if level_3 == 'diversity' %} class="active"{% endif %}><a href="/about/about-ubuntu/diversity">Diversity</a></li>
 			<li{% if level_3 == 'ubuntu-and-debian' %} class="active"{% endif %}><a href="/about/about-ubuntu/ubuntu-and-debian">Ubuntu and Debian</a></li>
-			<li{% if level_3 == 'derivatives' %} class="active"{% endif %}><a href="/about/about-ubuntu/derivatives">Derivatives</a></li>
+			<li{% if level_3 == 'flavours' %} class="active"{% endif %}><a href="/about/about-ubuntu/flavours">Flavours</a></li>
 {% endif %}
 		</ul>
\ No newline at end of file
diff --git a/templates/about/about-ubuntu/conduct.html b/templates/about/about-ubuntu/conduct.html
index 8307413c9d8..9ecdd3ff1cb 100755
--- a/templates/about/about-ubuntu/conduct.html
+++ b/templates/about/about-ubuntu/conduct.html
@@ -3,7 +3,7 @@
 {% block title %}Ubuntu Code of Conduct v2.0{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="About" subsection_title="About Ubuntu" page_title="Code of Conduct" tertiary="true" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="About" subsection_title="About Ubuntu" page_title="Code of Conduct" tertiary="true" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/about/about-ubuntu/diversity.html b/templates/about/about-ubuntu/diversity.html
index e9a6ab12a74..c6ab965440a 100755
--- a/templates/about/about-ubuntu/diversity.html
+++ b/templates/about/about-ubuntu/diversity.html
@@ -3,7 +3,7 @@
 {% block title %}Diversity | About Ubuntu{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="About" subsection_title="About Ubuntu" page_title="Diversity" tertiary="true" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="About" subsection_title="About Ubuntu" page_title="Diversity" tertiary="true" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/about/about-ubuntu/derivatives.html b/templates/about/about-ubuntu/flavours.html
old mode 100755
new mode 100644
similarity index 56%
rename from templates/about/about-ubuntu/derivatives.html
rename to templates/about/about-ubuntu/flavours.html
index dff1302ad16..42311a3f629
--- a/templates/about/about-ubuntu/derivatives.html
+++ b/templates/about/about-ubuntu/flavours.html
@@ -1,22 +1,20 @@
 {% extends "about/base_about.html" %}
 
-{% block title %}Derivatives | About Ubuntu{% endblock %}
+{% block title %}Flavours | About Ubuntu{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="About" subsection_title="About Ubuntu" page_title="Derivatives" tertiary="true" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="About" subsection_title="About Ubuntu" page_title="Derivatives" tertiary="true" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
 <div class="row row-hero no-border">
-	<h1>Derivatives</h1>
+	<h1>Flavours</h1>
 
 	<div class="eight-col">
-		<h3>Ubuntu is a popular operating system and a popular starting point for people who want to create their own operating systems.</h3>
-		<p>Derivatives of Ubuntu include local-language and hardware-specific versions.</p>
-		<p>Download Ubuntu flavor derivatives using the links below.</p>
+		<p class="intro">Ubuntu is a popular operating system and a popular starting point for people who want to create their own operating systems.</p>
 
 		<h3>Recognised Ubuntu flavours</h3>
-		<p>These are derivatives that use Ubuntu as their foundation and contribute significantly towards the project.</p>
+		<p>These are flavours that use Ubuntu as their foundation and contribute significantly towards the project.</p>
 
 		<ul>
 			<li><a href="http://www.edubuntu.org/">Edubuntu</a> &mdash; Ubuntu for education</li>
@@ -27,10 +25,11 @@ <h3>Recognised Ubuntu flavours</h3>
 			<li><a href="http://www.mythbuntu.org/">Mythbuntu</a> &mdash; Designed for creating a home theatre PC with MythTV</li>
 			<li><a href="http://ubuntustudio.org/">Ubuntu Studio</a> &mdash; Designed for multimedia editing and creation</li>
 			<li><a href="http://www.xubuntu.org/">Xubuntu</a> &mdash; Ubuntu with the XFCE desktop environment</li>
+			<li><a href="https://ubuntu-mate.org/">Ubuntu MATE</a> &mdash; Ubuntu with the MATE desktop environment</li>
 		</ul>
 
-		<h3>Localised derivatives</h3>
-		<p>Due to space considerations, only a few languages are included on the Ubuntu CDs. Support for other languages can be found on DVD, and from sources around the Internet. The following derivatives have full language support for the relevant language directly on the CD.</p>
+		<h3>Localizations</h3>
+		<p>Due to space considerations, only a few languages are included on the standard Ubuntu images. Support for other languages can be found on DVD, and from sources around the Internet. The following derivatives have full language support for the relevant language directly on the standard image.</p>
 
 		<ul>
 			<li>German</li>
@@ -41,8 +40,8 @@ <h3>Localised derivatives</h3>
 			<li>Simplified Chinese</li>
 		</ul>
 
-		<h3>Other derivatives</h3>
-		<p>A complete list of known derivatives is maintained on the Ubuntu Wiki <a href="https://wiki.ubuntu.com/DerivativeTeam/Derivatives">Derivatives Team page.</a></p>
+		<h3>Other editions</h3>
+		<p>A complete list of known flavours is maintained on the <a href="https://wiki.ubuntu.com/DerivativeTeam/Derivatives">Ubuntu Wiki Derivatives Team page.</a></p>
 	</div>
 </div><!-- / .row -->
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/about/about-ubuntu/governance.html b/templates/about/about-ubuntu/governance.html
index 1ccab324d35..738fd01c86c 100755
--- a/templates/about/about-ubuntu/governance.html
+++ b/templates/about/about-ubuntu/governance.html
@@ -3,7 +3,7 @@
 {% block title %}Governance | About Ubuntu{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="About" subsection_title="About Ubuntu" page_title="Governance" tertiary="true" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="About" subsection_title="About Ubuntu" page_title="Governance" tertiary="true" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/about/about-ubuntu/index.html b/templates/about/about-ubuntu/index.html
index 87626377868..27734c51144 100755
--- a/templates/about/about-ubuntu/index.html
+++ b/templates/about/about-ubuntu/index.html
@@ -3,7 +3,7 @@
 {% block title %}About Ubuntu{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="About" page_title="About Ubuntu"  tertiary="true" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="About" page_title="About Ubuntu"  tertiary="true" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
@@ -12,24 +12,24 @@ <h1>The Ubuntu story</h1>
 
 	<div class="eight-col">
 		<h3>ubuntu |oǒ'boǒntoō|</h3>
-		<p>Ubuntu is an ancient African word meaning 'humanity to others'. It also means 'I am what I am because of who we all are'. The Ubuntu operating system brings the spirit of Ubuntu to the world of computers.</p>
+		<p>Ubuntu is an ancient African word meaning &lsquo;humanity to others&rsquo;. It also means &lsquo;I am what I am because of who we all are&rsquo;. The Ubuntu operating system brings the spirit of Ubuntu to the world of computers.</p>
 
 		<h3>Where did it all begin?</h3>
-		<p>Linux was already established as an enterprise server platform in 2004, but free software was not a part of everyday life for most computer users. That's why Mark Shuttleworth gathered a small team of developers from one of the most established Linux projects – Debian – and set out to create an easy-to-use Linux desktop: Ubuntu.</p>
+		<p>Linux was already established as an enterprise server platform in 2004, but free software was not a part of everyday life for most computer users. That&rsquo;s why Mark Shuttleworth gathered a small team of developers from one of the most established Linux projects &mdash; Debian &mdash; and set out to create an easy-to-use Linux desktop: Ubuntu.</p>
 		<p>The vision for Ubuntu is part social and part economic: free software, available to everybody on the same terms, and funded through a portfolio of services provided by Canonical.</p>
- 
-		<h3>Ubuntu releases</h3> 
+
+		<h3>Ubuntu releases</h3>
 			<p>The Ubuntu team broke new ground in committing to a programme of scheduled releases on a predictable six-month basis. It was decided that every fourth release, issued on a two-year basis, would receive long-term support (LTS). LTS releases are typically used for large-scale deployments.</p>
-		<p>Ubuntu is different from the commercial Linux offerings that preceded it because it doesn't divide its efforts between a high-quality commercial version and a free 'community' version. The commercial and community teams collaborate to produce a single, high-quality release, which receives ongoing maintenance for a defined period. Both the release and ongoing updates are freely available to all users.</p>
+		<p>Ubuntu is different from the commercial Linux offerings that preceded it because it doesn&rsquo;t divide its efforts between a high-quality commercial version and a free &lsquo;community&rsquo; version. The commercial and community teams collaborate to produce a single, high-quality release, which receives ongoing maintenance for a defined period. Both the release and ongoing updates are freely available to all users.</p>
 
-		<h3>Governance</h3> 
-		<p>The first official Ubuntu release -- Version 4.10, codenamed the 'Warty Warthog' &mdash; was launched in October 2004, and sparked dramatic global interest as thousands of free software enthusiasts and experts joined the Ubuntu community.</p>  
+		<h3>Governance</h3>
+		<p>The first official Ubuntu release &mdash; Version 4.10, codenamed the &lsquo;Warty Warthog&rsquo; &mdash; was launched in October 2004, and sparked dramatic global interest as thousands of free software enthusiasts and experts joined the Ubuntu community.</p>
 		<p><a href="/about/about-ubuntu/governance">The governance</a> of Ubuntu is somewhat independent of Canonical, with volunteer leaders from around the world taking responsibility for many critical elements of the project. It remains a key tenet of the Ubuntu Project that Ubuntu is a shared work between Canonical, other companies, and the thousands of volunteers who bring their expertise to bear on making it a world-class platform for anyone to use.</p>
 
-		<h3>Ubuntu today</h3> 
-		<p>Ubuntu today has <a href="https://wiki.ubuntu.com/UbuntuFlavors">eight flavours</a> and <a href="https://wiki.ubuntu.com/DerivativeTeam/Derivatives">dozens of localised and specialised derivatives</a>. There are also special editions for servers, OpenStack clouds, and mobile devices. All editions share common infrastructure and software, making Ubuntu a unique single platform that scales from consumer electronics to the desktop and up into the cloud for enterprise computing.</p> 
-		<p>The Ubuntu OS and the innovative Ubuntu for Android convergence solution make it an exciting time for Ubuntu on mobile devices. In the cloud, Ubuntu is the reference operating system for the OpenStack project, it&rsquo;s a hugely popular guest OS on Amazon's EC2 and Rackspace's Cloud, and it&rsquo;s pre-installed on computers from Dell, HP, Asus, Lenovo and other global vendors. And thanks to that shared infrastructure, developers can work on the desktop, and smoothly deliver code to cloud servers running the stripped-down Ubuntu Server Edition.</p>
-		<p>After many years Ubuntu still is and always will be free to use, share and develop. We hope it will bring a touch of light to your computing &mdash; and we hope that you'll join us in helping to build the next version.</p>
+		<h3>Ubuntu today</h3>
+		<p>Ubuntu today has <a href="https://wiki.ubuntu.com/UbuntuFlavors">nine flavours</a> and <a href="https://wiki.ubuntu.com/DerivativeTeam/Derivatives">dozens of localised and specialised derivatives</a>. There are also special editions for servers, OpenStack clouds, and mobile devices. All editions share common infrastructure and software, making Ubuntu a unique single platform that scales from consumer electronics to the desktop and up into the cloud for enterprise computing.</p>
+		<p>The Ubuntu OS and the innovative Ubuntu for Android convergence solution make it an exciting time for Ubuntu on mobile devices. In the cloud, Ubuntu is the reference operating system for the OpenStack project, it&rsquo;s a hugely popular guest OS on Amazon&rsquo;s EC2 and Rackspace&rsquo;s Cloud, and it&rsquo;s pre-installed on computers from Dell, HP, Asus, Lenovo and other global vendors. And thanks to that shared infrastructure, developers can work on the desktop, and smoothly deliver code to cloud servers running the stripped-down Ubuntu Server Edition.</p>
+		<p>After many years Ubuntu still is and always will be free to use, share and develop. We hope it will bring a touch of light to your computing &mdash; and we hope that you&rsquo;ll join us in helping to build the next version.</p>
 	</div><!-- / .seven-col -->
 </div><!-- / .row -->
 {% endblock content %}
diff --git a/templates/about/about-ubuntu/licensing.html b/templates/about/about-ubuntu/licensing.html
index 6f36cedcb6a..310e383202b 100755
--- a/templates/about/about-ubuntu/licensing.html
+++ b/templates/about/about-ubuntu/licensing.html
@@ -3,7 +3,7 @@
 {% block title %}Licensing | About Ubuntu{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="About" subsection_title="About Ubuntu" page_title="Licensing" tertiary="true" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="About" subsection_title="About Ubuntu" page_title="Licensing" tertiary="true" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/about/about-ubuntu/our-philosophy.html b/templates/about/about-ubuntu/our-philosophy.html
index f5c929b9a70..3283f89c57e 100755
--- a/templates/about/about-ubuntu/our-philosophy.html
+++ b/templates/about/about-ubuntu/our-philosophy.html
@@ -3,7 +3,7 @@
 {% block title %}Our Philosophy | About Ubuntu{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="About" subsection_title="About Ubuntu" page_title="Our philosophy" tertiary="true" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="About" subsection_title="About Ubuntu" page_title="Our philosophy" tertiary="true" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/about/about-ubuntu/ubuntu-and-debian.html b/templates/about/about-ubuntu/ubuntu-and-debian.html
index c375485392b..c877c720abe 100755
--- a/templates/about/about-ubuntu/ubuntu-and-debian.html
+++ b/templates/about/about-ubuntu/ubuntu-and-debian.html
@@ -3,7 +3,7 @@
 {% block title %}Ubuntu and Debian | About Ubuntu{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="About" subsection_title="About Ubuntu" page_title="Ubuntu and Debian" tertiary="true" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="About" subsection_title="About Ubuntu" page_title="Ubuntu and Debian" tertiary="true" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/about/base_about.html b/templates/about/base_about.html
index 614baf51868..e23f568bbef 100755
--- a/templates/about/base_about.html
+++ b/templates/about/base_about.html
@@ -1,6 +1,6 @@
-{% extends "_base/base.html" %}
+{% extends "templates/base.html" %}
 
 {% block outer_content %}
     {% block content %}{% endblock %}
-		{% include "_base/_contextual_footer.html" %}
+		{% include "templates/_contextual_footer.html" %}
 {% endblock %}
diff --git a/templates/about/canonical-and-ubuntu.html b/templates/about/canonical-and-ubuntu.html
index 7b66fb5b6de..aa36c42d16d 100755
--- a/templates/about/canonical-and-ubuntu.html
+++ b/templates/about/canonical-and-ubuntu.html
@@ -3,7 +3,7 @@
 {% block title %}Canonical and Ubuntu{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="About" page_title="Canonical and Ubuntu" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="About" page_title="Canonical and Ubuntu" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/about/contact-us/form/index.html b/templates/about/contact-us/form/index.html
index 0b9718fc5d8..fb29e8b4be9 100755
--- a/templates/about/contact-us/form/index.html
+++ b/templates/about/contact-us/form/index.html
@@ -5,7 +5,7 @@
 {% block meta_keywords %}Ubuntu, Ubuntu operating system, OS, Linux, Windows alternative, Mac alternative, thin client, Business desktop{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="About" subsection_title="Contact us" page_title="Form" tertiary="true" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="About" subsection_title="Contact us" page_title="Form" tertiary="true" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/about/contact-us/index.html b/templates/about/contact-us/index.html
index ebca7c22272..10fd7f5e456 100755
--- a/templates/about/contact-us/index.html
+++ b/templates/about/contact-us/index.html
@@ -3,7 +3,7 @@
 {% block title %}Contact us{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="About" page_title="Contact us" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="About" page_title="Contact us" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/about/index.html b/templates/about/index.html
index dce2d599697..ea2de2c5e80 100755
--- a/templates/about/index.html
+++ b/templates/about/index.html
@@ -3,7 +3,7 @@
 {% block title %}About the Ubuntu project{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="About" page_title="The Ubuntu Project" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="About" page_title="The Ubuntu Project" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
@@ -34,24 +34,15 @@ <h3><a href="/about/canonical-and-ubuntu">Ubuntu and Canonical&nbsp;&rsaquo;</a>
 
 <div class="row no-border">
 	<h2>Why use Ubuntu?</h2>
-	<ul class="no-bullets">
-		<li class="two-col">
-			<p>Ubuntu is far more than an operating system. With thousands of applications to choose from, it&rsquo;s completely free and easy to use.</p>
-		</li>
-		<li class="two-col">
-			<p>Ubuntu is made for sharing.  Use it, modify it, improve it, share it. Anywhere, any time and with any number of people all over the world. No licence required.</p>
-		</li>
-		<li class="two-col">
-			<p>Ubuntu operating systems are regularly updated and come in a new, improved, easy-to-install release every six months, so you&rsquo;re always up to date.</p>
-		</li>
-		<li class="two-col">
-			<p>Ubuntu comes with all the support you need and powers the most popular computers &ndash; on servers, desktops, notebooks and netbooks.</p>
-		</li>
-		<li class="two-col">
-			<p>Ubuntu comes with a ready-made community dedicated to building and promoting free systems and software. Join us.</p>
-		</li>
+	<ul class="list-ubuntu eight-col">
+		<li>Ubuntu is far more than an operating system. With thousands of applications to choose from, it&#39;s completely free and easy to use.</li>
+		<li>Ubuntu is made for sharing. Use it, modify it, improve it, share it. Anywhere, any time and with any number of people all over the world. No licence required.</li>
+		<li>Ubuntu operating systems are regularly updated. Come in a new, improved, easy-to-install release every six months, so you&#39;re always up to date.</li>
+		<li>Ubuntu comes with all the support you need and powers the most popular computers &mdash; on servers, desktops, notebooks and netbooks.</li>
+		<li>Ubuntu comes with a ready-made community dedicated to building and promoting free systems and software. Join us.</li>
 	</ul>
-	<div class="two-col last-col">
+
+	<div class="prepend-one two-col last-col">
 		<h3>Take a look:</h3>
 			<ul class="list">
 				<li><a href="/desktop">Ubuntu</a></li>
diff --git a/templates/support/_includes/_contextual_footer.html b/templates/about/shared/_contextual_footer.html
similarity index 59%
rename from templates/support/_includes/_contextual_footer.html
rename to templates/about/shared/_contextual_footer.html
index fd593516557..3c619d9653b 100755
--- a/templates/support/_includes/_contextual_footer.html
+++ b/templates/about/shared/_contextual_footer.html
@@ -1,4 +1,4 @@
 		<div class="feature-four three-col last-col">
 			<h3>Further reading</h3>
-			{% include "_base/_further_reading_links.html" %}
+			{% include "templates/_further_reading_links.html" %}
 		</div>
diff --git a/templates/base_index.html b/templates/base_index.html
index 0ce068dab18..e939ca2d110 100755
--- a/templates/base_index.html
+++ b/templates/base_index.html
@@ -1,4 +1,4 @@
-{% extends "_base/base.html" %}
+{% extends "templates/base.html" %}
 
 {% block title %}The leading OS for PC, tablet, phone and cloud{% endblock %}
 {% block extra_body_class %}homepage {% block takeover_body_class %}{% endblock takeover_body_class %}{% endblock extra_body_class %}
@@ -8,7 +8,7 @@
 		{% block takeover_content %}
 		{% endblock takeover_content %}
     	{% block footer_content %}
-    		{% include "takeovers/_footer_homepage.html" %}
+    		{# include "takeovers/_footer_homepage.html" #}
      	{% endblock footer_content %}
    {% endblock content %}
 {% endblock outer_content %}
\ No newline at end of file
diff --git a/templates/desktop/_includes/_contextual_footer.html b/templates/desktop/_includes/_contextual_footer.html
deleted file mode 100755
index 690b84ab58a..00000000000
--- a/templates/desktop/_includes/_contextual_footer.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{% if level_2 == 'ubuntu-kylin-zh-CN' %}
-	<div class="feature-two four-col">
-		<h3>下载</h3>
-		<p>下载和安装Ubuntu，你只需要一张空白的DVD或USB记忆棒。</p>
-		<a class="link-cta-ubuntu" href="/download/desktop{% if level_2 == 'ubuntu-kylin' %}/zh-CN{% endif %}">Download now</a>
-	</div>
-	<div class="feature-three four-col">
-		<h3>商用Ubuntu</h3>
-		<p>希望在您的企业使用Ubuntu桌面</p>
-		<p><a href="/desktop/contact-us">Get in touch&nbsp;&rsaquo;</a></p>
-	</div>
-	<div class="feature-four four-col last-col">
-		<h3>更多</h3>
-		<ul class="smaller no-bullets">
-			<li><a href="http://blog.canonical.com/2013/09/05/canonical-dell-launching-ubuntu-in-china-in-1000-stores/">Dell launching Ubuntu in stores in China&nbsp;&rsaquo;</a></li>
-			<li><a href="http://insights.ubuntu.com/news/hp-releases-ubuntu-loaded-machines-in-1500-stores-in-china/">HP releases Ubuntu loaded laptops in China&nbsp;&rsaquo;</a></li>
-			<li><a href="http://insights.ubuntu.com/news/bodega-aurrera-stores-shipping-hp-pcs-with-ubuntu-preinstalled/">Bodega Aurrera stores shipping HP PCs with Ubuntu preinstalled&nbsp;&rsaquo;</a></li>
-		</ul>
-	</div>
-{% else %}
-	<div class="feature-two four-col">
-		<h3>Download</h3>
-		<p>To download and install Ubuntu, all you need is a blank DVD or USB stick.</p>
-		<a class="link-cta-ubuntu" href="/download/desktop{% if level_2 == 'ubuntu-kylin' %}/zh-CN{% endif %}">Download now</a>
-	</div>
-	<div class="feature-three four-col">
-		<h3>Ubuntu for business</h3>
-		<p>Interested in Ubuntu desktop for your enterprise?</p>
-		<p><a href="/desktop/contact-us">Get in touch&nbsp;&rsaquo;</a></p>
-	</div>
-	<div class="feature-four four-col last-col">
-		<h3>Further reading</h3>
-		<ul class="smaller no-bullets">
-			<li><a href="http://blog.canonical.com/2013/09/05/canonical-dell-launching-ubuntu-in-china-in-1000-stores/">Dell launching Ubuntu in stores in China&nbsp;&rsaquo;</a></li>
-			<li><a href="http://insights.ubuntu.com/news/hp-releases-ubuntu-loaded-machines-in-1500-stores-in-china/">HP releases Ubuntu loaded laptops in China&nbsp;&rsaquo;</a></li>
-			<li><a href="http://insights.ubuntu.com/news/bodega-aurrera-stores-shipping-hp-pcs-with-ubuntu-preinstalled/">Bodega Aurrera stores shipping HP PCs with Ubuntu preinstalled&nbsp;&rsaquo;</a></li>
-		</ul>
-	</div>
-	{% endif %}
\ No newline at end of file
diff --git a/templates/desktop/_nav_secondary.html b/templates/desktop/_nav_secondary.html
index 355b68c5363..e7a477bcfe7 100755
--- a/templates/desktop/_nav_secondary.html
+++ b/templates/desktop/_nav_secondary.html
@@ -1,9 +1,9 @@
 	<ul{% if list_class %} class="{{ list_class }}"{% endif %} class="second-level-nav">
 		<li class="first{% if level_1 == 'desktop' and not level_2 %} active{% endif %}"><a href="/desktop">Overview</a></li>
 		<li{% if level_2 == 'features' %} class="active"{% endif %}><a href="/desktop/features">Features</a></li>
-		<li{% if level_2 == 'business' %} class="active"{% endif %}><a href="/desktop/business">For business</a></li>
+		<li{% if level_2 == 'enterprise' %} class="active"{% endif %}><a href="/desktop/enterprise">For enterprise</a></li>
+		<li{% if level_2 == 'education' %} class="active"{% endif %}><a href="/desktop/education">For education	</a></li>
+		<li{% if level_2 == 'government' %} class="active"{% endif %}><a href="/desktop/government">For government</a></li>
 		<li{% if level_2 == 'developers' %} class="active"{% endif %}><a href="/desktop/developers">For developers</a></li>
-		<li{% if level_2 == 'take-the-tour' %} class="active"{% endif %}><a href="/desktop/take-the-tour">Take the tour</a></li>
-		<li{% if level_2 == 'ubuntu-kylin' %} class="last-item"{% endif %}{% if level_2 == 'management' %} class="active"{% endif %}><a href="/desktop/management">Desktop management</a></li>
-		<li{% if level_2 == 'ubuntu-kylin' or level_2 == "ubuntu-kylin-zh-CN" %} class="active"{% endif %}><a href="/desktop/{% if level_2 == "ubuntu-kylin-zh-CN" %}ubuntu-kylin-zh-CN{% else %}ubuntu-kylin{% endif %}">Ubuntu Kylin</a></li>
+		<li{% if level_2 == 'ubuntu-kylin' %} class="active"{% endif %}><a href="/desktop/ubuntukylin">For China</a></li>
 	</ul>
\ No newline at end of file
diff --git a/templates/desktop/base_desktop.html b/templates/desktop/base_desktop.html
index 614baf51868..e23f568bbef 100755
--- a/templates/desktop/base_desktop.html
+++ b/templates/desktop/base_desktop.html
@@ -1,6 +1,6 @@
-{% extends "_base/base.html" %}
+{% extends "templates/base.html" %}
 
 {% block outer_content %}
     {% block content %}{% endblock %}
-		{% include "_base/_contextual_footer.html" %}
+		{% include "templates/_contextual_footer.html" %}
 {% endblock %}
diff --git a/templates/desktop/business/index.html b/templates/desktop/business/index.html
deleted file mode 100755
index 202f109e1ff..00000000000
--- a/templates/desktop/business/index.html
+++ /dev/null
@@ -1,118 +0,0 @@
-{% extends "desktop/base_desktop.html" %}
-
-{% block title %}Business as usual | Desktop{% endblock %}
-{% block meta_description %}Fast, easy and quick to deploy, switching to Ubuntu has never been easier{% endblock %}
-{% block meta_keywords %}Ubuntu, Ubuntu operating system, OS, Linux, Windows alternative, Mac alternative, thin client, Business desktop{% endblock %}
-{% block extra_body_class %}desktop-for-business{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Desktop" page_title="Business"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero">
-	<div class="seven-col">
-		<h1>Business as usual</h1>
-		<p class="intro">Robust, beautiful and future-proof: There has never been a better time to use Ubuntu</p>
-		<p>Why spend money on licenses, when Ubuntu offers a lightweight, secure and intuitive operating system for free? With Ubuntu, it’s business as usual. Its ease of use means users can get up and running immediately. It comes with a full office suite which supports Windows file formats. Or you can continue using Microsoft Office hosted on Windows or Citrix servers. With support for Windows XP having ended in April 2014, now is the perfect time to explore Ubuntu.</p>
-		<p><a href="/download/desktop/" class="link-cta-ubuntu">Get Ubuntu now</a></p>
-	</div><!-- /.six-col -->
-	<div class="four-col last-col">
-		<blockquote class="quote quote-right-bottom">
-			<p>&ldquo;We were really surprised by how easily everyone adjusted to the new operating system.&rdquo;</p>
-			<p><cite>Martin Andel, Systems Administrator, Skalica City Hall</cite></p>
-		</blockquote>
-	</div><!-- /.six-col -->
-</div><!-- /.row -->
-
-<div class="row row-support-systems-management">
-	<div class="six-col">
-		<h2>Easy to manage, enterprise-wide</h2>
-		<p>With Landscape, the commercial Ubuntu systems management tool from Canonical, IT administrators can easily manage thousands of end-user devices across your enterprise.</p>
-		<p>Our long-term support (LTS) releases offer stability and continuity, with regular updates for five years.</p>
-		<p><a href="/management">Learn more about systems management and support&nbsp;&rsaquo;</a></p>
-	</div>
-	<div class="six-col last-col pull-right no-margin-bottom">
-		<img src="{{ STATIC_URL }}img/desktop/business/image-landscape.jpg" alt="Landscape webpage with load data" width="482" height="494" class="touch-border" />
-	</div>
-</div>
-
-{% include "_includes/_enterprise_blog.html" %}
-
-<div class="row equal-height vertical-divider">
-	<div class="six-col">
-		<h2>Secure to its core</h2>
-		<p>Your users and data are safe, because the operating system is hardened against bugs and malware. The default settings prioritise security, and Ubuntu comes with a firewall and file and disk encryption tools.</p>
-		<p>Our security team works with vendors and the community to promptly fix potential vulnerabilities, and proactively develops and integrates new features to improve security.</p>
-	</div>
-	<div class="six-col last-col">
-		<h2>No hidden costs, no lock-in</h2>
-		<p>Looking to escape the cycle of endless Windows upgrades? Now, there's a real alternative. No licence fees and no licence tracking overhead. With Ubuntu, you can scale your desktop infrastructure while keeping your cost down. You only pay for the level of support you need.</p>
-		<p><a href="/download/desktop">Download now for free&nbsp;&rsaquo;</a></p>
-	</div>
-</div>
-
-<div class="row">
-	<h2>Widely supported</h2>
-	<p class="eight-col">Ubuntu is supported on X86 and ARM hardware, and nearly 70% of the PCs shipped by the major PC companies are now certified to work with Ubuntu.</p>
-	<div class="box-padded-feature twelve-col">
-		<h3 id="works-with-your-hardware-and-software">Works with all your hardware and software</h3>
-		<div>
-			<div class="six-col">
-				<ul class="inline-icons clearfix">
-					<li><img src="{{ STATIC_URL }}img/third-party-logos/logo-lenovo-108x45.png" width="108" height="45" alt="Lenovo" /></li>
-					<li><img src="{{ STATIC_URL }}img/third-party-logos/logo-dell-45x45.png" width="45" height="45" alt="Dell" /></li>
-					<li><img src="{{ STATIC_URL }}img/third-party-logos/logo-toshiba-109x45.png" width="109" height="45" alt="Toshiba" /></li>
-					<li><img src="{{ STATIC_URL }}img/third-party-logos/logo-hp-41x45.png" width="41" height="45" alt="HP" /></li>
-				</ul>
-				<p><a href="http://ubuntu.com/certification">View all certified hardware&nbsp;&rsaquo;</a></p>
-			</div><!-- /.six-col -->
-			<div class="six-col last-col">
-				<ul class="inline-icons clearfix">
-					<li><img src="{{ STATIC_URL }}img/third-party-logos/logo-centrify-94x45.png" width="94" height="45" alt="Centrify" /></li>
-					<li><img src="{{ STATIC_URL }}img/third-party-logos/logo-likewise-100x45.png" width="100" height="45" alt="Likewise" /></li>
-					<li><img src="{{ STATIC_URL }}img/third-party-logos/logo-libreoffice-106x45.png" width="106" height="45" alt="LibreOffice" /></li>
-					<li><img src="{{ STATIC_URL }}img/third-party-logos/logo-arkeia-60x45.png" width="60" height="45" alt="Arkeia" /></li>
-				</ul>
-				<p><a href="/partners/certified-software">View all certified software&nbsp;&rsaquo;</a></p>
-			</div><!-- /.six-col -->
-		</div><!-- /.vertical-divider -->
-	</div><!-- /.box-padded-feature -->
-</div>
-
-<div class="row row-thin-client">
-	<div class="six-col">
-		<h2>The perfect thin client</h2>
-		<p>Repurposing PCs as Ubuntu-based thin clients increases security and lowers complexity. All without incurring hardware expenses. Using our stateless login modes, no user data is left on the device after the user logs out.</p>
-		<p>With Ubuntu Advantage, which includes a subscription to the Landscape Hosted service,  you can centrally manage repurposed PCs without having to deploy management servers on premises.</p>
-		<p class="no-margin-bottom"><a href="/desktop/management">Find out more about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
-	</div>
-	<div class="six-col last-col pull-right no-margin-bottom">
-		<img src="{{ STATIC_URL }}img/desktop/business/image-thinclient.jpg" alt="Remote login screen on Ubuntu" width="482" height="395" class="touch-border" />
-	</div>
-</div><!-- /.row -->
-
-<div class="row equal-height">
-	<div class="seven-col">
-		<h2>The natural replacement for Windows XP</h2>
-		<p>With Windows XP reaching end of life and Windows 7 support ending soon, there’s never been a better time to switch to Ubuntu.</p>
-		<ul class="list-canonical">
-			<li>Free from licensing costs</li>
-			<li>Ranked the most secure OS of 11 tested by CESG, the UK national security agency</li> 
-			<li>Includes popular web browsers and Microsoft-compatible productivity software</li> 
-			<li>Support for multiple displays, HiDPI screens and touch devices</li>
-			<li>Fast access to a wide range of apps  in the Ubuntu Software Centre</li>
-			<li>Powerful desktop search with extensible scopes to make finding files faster</li>
-		</ul>
-		<p><a class="external" href="https://insights.ubuntu.com/2014/07/31/bukwang-pharmaceuticals-cut-it-costs-and-created-business-value-with-ubuntu/">Learn how Bukwang Pharmaceuticals benefited by switching from Windows to Ubuntu.</a></p>
-	</div>
-	<div class="five-col last-col align-center align-vertically">
-		<img class="priority-0" src="{{ STATIC_URL }}img/desktop/business/image-upgrade-banner.png" alt="Upgrade graph" />
-	</div>
-</div><!-- /.row -->
-
-<div class="row row-community row-image-centered no-border last-row">
-{% include "_includes/_ubuntu_advantage_community.html" %}
-</div><!-- /.row -->
-{% endblock content %}
-{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/desktop/contact-us.html b/templates/desktop/contact-us.html
index d6550106fd6..4fcb9461340 100755
--- a/templates/desktop/contact-us.html
+++ b/templates/desktop/contact-us.html
@@ -5,7 +5,7 @@
 {% block meta_keywords %}Ubuntu, Ubuntu operating system, OS, Linux, Windows alternative, Mac alternative, thin client, Business desktop{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Desktop" page_title="Contact us" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Desktop" page_title="Contact us" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/desktop/developers.html b/templates/desktop/developers.html
new file mode 100755
index 00000000000..1b627ecd2a9
--- /dev/null
+++ b/templates/desktop/developers.html
@@ -0,0 +1,125 @@
+{% extends "desktop/base_desktop.html" %}
+
+{% block title %}Desktop for developers{% endblock %}
+{% block extra_body_class %}desktop-for-developers{% endblock %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Desktop" page_title="For developers"  %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row row-hero">
+	<div class="six-col">
+		<h1>Ubuntu Desktop for&nbsp;developers</h1>
+		<p>Whether you&rsquo;re a mobile app developer, an engineering manager, a music or video editor or a financial analyst with large-scale models to run &mdash; in fact, anyone in need of a powerful machine for your work &mdash; Ubuntu is the ideal platform.</p>
+		<p><a href="/download/desktop/" class="link-cta-ubuntu">Get Ubuntu now</a></p>
+		{% include "desktop/shared/_share-this.html" with tweet="Check out #Ubuntu, the developers’ favourite desktop OS" %}
+	</div>
+</div>
+
+<div class="row combined-list">
+	<h2>Why use Ubuntu for development?</h2>
+    <div class="combined-list">
+		<ul class="list-ubuntu six-col">
+			<li>The fastest route from development to deployment on desktop, mobile, server or cloud</li>
+			<li>The desktop of choice for developers at some of the world&rsquo;s leading technology companies</li>
+			<li class="last-item">The broadest and best development tools and libraries</li>
+		</ul>
+		<ul class="list-ubuntu six-col last-col">
+			<li>Lightweight to either run natively or in a VM, on a PC or a Mac</li>
+			<li class="last-item">Ideal for any resource-intensive environment, from data mining to large-scale financial modelling</li>
+		</ul>
+	</div>
+</div>
+
+<div class="row row-good-company">
+	<div class="six-col">
+			<img src="{{ STATIC_URL }}img/desktop/developers/graph.png" alt="18.7% use Ubuntu over 4% for Debian" />
+		<p class="smaller">* This graph excludes non-Linux OSs</p>
+	</div>
+	<div class="six-col last-col">
+		<h3>With Ubuntu, you&rsquo;re in good company</h3>
+		<p>Ubuntu is used by thousands of development teams around the world because of its versatility, reliability, constantly updated features, and extensive developer libraries.</p>
+		<p>If you&rsquo;re managing developers, Ubuntu is the best way to increase your team&rsquo;s productivity and guarantee a smooth transition from development all the way to production. Ubuntu is the world&rsquo;s most popular open source OS for both development and deployment, from the data centre to the cloud.</p>
+		<p><a href="/cloud">Learn more about Ubuntu&rsquo;s cloud offering&nbsp;&rsaquo;</a></p>
+	</div>
+</div>
+
+<div class="row row-grey">
+	<h2>What&rsquo;s new in 15.04?</h2>
+	<p class="eight-col">Alongside support for the very latest hardware, Ubuntu 15.04 includes new versions of many core apps and developer technologies.</p>
+	<div class="combined-list">
+		<ul class="list-ubuntu six-col">
+			<li>Linux 3.19 kernel</li>
+			<li>Firefox 37, Thunderbird 31.6, Chromium 41 and LibreOffice 4.4 updates</li>
+			<li class="last-item">Moved to systemd</li>
+		</ul>
+		<ul class="list-ubuntu six-col last-col">
+			<li>Locally Integrated Menus (LIM) are enabled by default</li>
+			<li><a class="external" href="https://wiki.ubuntu.com/ubuntu-make">Ubuntu Make</a> released, was the Ubuntu Developer Tools Centre</li>
+			<li class="last-item">Unity 7.3.2, Gtk 3.14.12, Compiz 0.9.12.1 and qt 5.4.1updates</li>
+		</ul>
+	</div>
+	<p class="twelve-col"><a class="external" href="https://wiki.ubuntu.com/VividVervet/ReleaseNotes">Read the full release notes</a></p>
+</div>
+
+<div class="row row-developer-tools">
+	<div class="six-col">
+		<h3>All the tools developers need</h3>
+		<p>Whether your team uses Python, Ruby, Node.js or Java, no operating system is easier to set up than Ubuntu. Everything your developers need is just a click or an apt-get away.</p>
+		<p>Want to try your hand at developing for Ubuntu? Join our worldwide app developer community.</p>
+		<p><a href="http://developer.ubuntu.com">Learn more about developing for Ubuntu&nbsp;&rsaquo;</a></p>
+	</div>
+	<div class="six-col last-col no-margin-bottom pull-right">
+		<img class="touch-border" src="{{ STATIC_URL }}img/business/desktop-software-centre.png" alt="" />
+	</div>
+</div>
+
+<div class="row row-for-developers">
+	<div class="twelve-col">
+		<div class="seven-col">
+			<h3>By developers, for developers</h3>
+			<p>Ubuntu is the result of contributions by thousands of developers, motivated by the desire to create their own perfect developer environment. That&rsquo;s why it&rsquo;s used by some of the world&rsquo;s most exciting technology companies and it&rsquo;s why Valve decided to port its hugely popular Steam virtual games store to Ubuntu. Ubuntu runs on architectures from x86 to ARM and on cloud platforms from OpenStack to Azure and EC2. This versatility makes it the ideal choice for companies with a diverse hardware infrastructure.</p>
+			<p><a class="external" href="http://ubuntu.com/certification/desktop">See all Ubuntu certified PCs</a></p>
+		</div>
+		<div class="five-col last-col">
+			<img src="{{ STATIC_URL }}img/desktop/developers/developer-laptop.png" alt="Developer laptop" />
+		</div>
+	</div>
+	<div class="ten-col prepend-one">
+		<blockquote class="pull-quote">
+			<p><span>&ldquo;</span>Ubuntu has been the perfect OS given its popularity with developers developers and its cloud capabilities. That&rsquo;s why it&rsquo;s preloaded on the 4th generation of our XPS 13 laptop and our new Precision M3800 Mobile Workstation.<span>&rdquo;</span></p>
+			<p><cite>Barton George, Director of developer programs at Dell services</cite></p>
+		</blockquote>
+	</div>
+</div>
+
+<div class="row row-easy-deployment">
+	<div class="six-col no-margin-bottom">
+		<div>
+			<h3>Deployment made easy</h3>
+			<p>When it comes to speed and simplicity of deployment, nothing touches Ubuntu.</p>
+			<p>Taking a service developed on the desktop and running it on a server or in the cloud just works.  Ubuntu also has developed Juju, a service orchestration tool, that simplifies the often-cumbersome handover between development and ops teams &mdash; and it speeds the process up dramatically.</p>
+			<p><a href="/cloud/tools/juju">More about Juju&nbsp;&rsaquo;</a></p>
+		</div>
+	</div>
+	<div class="six-col last-col">
+		<img src="{{ STATIC_URL }}img/desktop/desktop-deployment-diagram.png" width="442" height="394" alt="" />
+	</div>
+</div>
+
+<div class="row no-border row-landscape">
+	<div class="five-col no-margin-bottom">
+		<div>
+			<h3>Support tailored to developers&rsquo; needs</h3>
+			<p>With Ubuntu Advantage and Landscape, you can standardise your developer workstations. It helps you manage updates, security patches, and reporting, while minimising downtime. Give your developers the freedom they want while retaining the control you need.</p>
+			<p><a href="/management/">Learn more about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
+		</div>
+	</div>
+	<div class="pull-right right">
+		<img src="{{ STATIC_URL }}img/desktop/enterprise/landscape-screenshot.png" class="touch-border priority-0" alt="Landscape screenshot" />
+	</div>
+</div>
+
+{% endblock content %}
+{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
diff --git a/templates/desktop/developers/index.html b/templates/desktop/developers/index.html
deleted file mode 100755
index 6ccd42116e9..00000000000
--- a/templates/desktop/developers/index.html
+++ /dev/null
@@ -1,128 +0,0 @@
-{% extends "desktop/base_desktop.html" %}
-
-{% block title %}Desktop for developers{% endblock %}
-{% block extra_body_class %}desktop-for-developers{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Desktop" page_title="For developers"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero">
-	<h1>Ubuntu Desktop for developers</h1>
-	<div class="six-col">
-		<p>Whether you&rsquo;re a mobile app developer, an engineering manager, a music or video editor or a financial analyst with large-scale models to run &dash; in fact, anyone in need of a powerful machine for your work &dash; Ubuntu is the ideal platform.</p>
-		<p><a href="/download/desktop/" class="link-cta-ubuntu">Get Ubuntu now</a></p>
-	</div>
-	<div class="six-col last-col text-center">
-		<img src="{{ STATIC_URL }}img/desktop/desktop-developer.png" width="390" height="115" alt="" class="for-tablet" />
-	</div>
-</div>
-
-<div class="row combined-list">
-	<h2>Why use Ubuntu for development?</h2>
-	<div class="six-col">
-		<ul class="list-canonical smaller">
-			<li>The fastest route from development to deployment on desktop, mobile, server or cloud</li>
-			<li>The desktop of choice for developers at some of the world&rsquo;s leading technology companies</li>
-			<li>Development environments can easily be set-up for any open-source technology</li>
-			<li>Support for multi-touch input via trackpads and touchscreens</li>
-			<li>Intuitive interface with support for high pixel density monitors</li>
-			<li class="last-item">The broadest and best development tools and libraries, all accessed easily from within the OS</li>
-		</ul>
-	</div>
-	<div class="six-col last-col">
-		<ul class="list-canonical smaller">
-			<li>Lightweight enough to install natively or in a VM, on a PC or a Mac, yet efficient enough to enable you to get the most out of your hardware</li>
-			<li>Ideal for any resource-intensive environment, from data mining to large-scale financial modelling</li>
-			<li>Certified to run on a wide range of hardware from the biggest brands in the industry</li>
-			<li>Enterprise systems management and support available direct from Canonical</li>
-			<li class="last-item">Five years of security and maintenance updates guaranteed with Ubuntu 14.04 LTS</li>
-		</ul>
-	</div><!-- /.six-col -->
-</div><!-- /.row -->
-
-<div class="row row-good-company">
-	<div class="six-col">
-			<div class="developmentplatformsurvey-image-load" data-width="442" data-src="{{ STATIC_URL }}img/graphs/image-developmentplatformsurvey{width}.png" data-alt="18.7% use Ubuntu over 4% for Debian"></div>
-			<script>
-			    new Imager('.developmentplatformsurvey-image-load', {
-			        availableWidths: {
-			            300: '-small',
-			            328: '-medium',
-			            442: '-large'
-			        }
-			    });
-			</script>
-			<noscript>
-				<img src="{{ STATIC_URL }}img/graphs/image-developmentplatformsurvey-large.png" width="442" height="473" alt="18.7% use Ubuntu over 4% for Debian" />
-			</noscript>
-		<p class="smaller">* This graph excludes non-Linux OSs</p>
-	</div><!-- /.six-col -->
-	<div class="six-col last-col">
-		<h3>With Ubuntu, you&rsquo;re in good company</h3>
-		<p>Ubuntu is used by thousands of development teams around the world because of its versatility, reliability, constantly updated features, and extensive developer libraries.</p>
-		<p>If you&rsquo;re managing developers, Ubuntu is the best way to increase your team&rsquo;s productivity and guarantee a smooth transition from development all the way to production. Ubuntu is the world&rsquo;s most popular open source OS for both development and deployment. It is the base OS for OpenStack, and is compatible with many other cloud technologies such as AWS EC2. In addition, Ubuntu will run as a guest OS on all leading public clouds.</p>
-		<p>Need a micro-cloud on local machines? Ubuntu Server includes all the components of OpenStack &dash; and it&rsquo;s free to set up, use, and maintain. In short, Ubuntu is the perfect platform for both your traditional and agile development needs.</p>
-		<p>Interested in cloud deployment? <a href="/cloud">Learn more about Ubuntu&rsquo;s cloud offering&nbsp;&rsaquo;</a></p>
-	</div><!-- /.six-col -->
-</div><!-- /.row -->
-
-<div class="row row-grey row-developer-tools equal-height">
-	<div class="six-col">
-		<h3>All the tools developers need</h3>
-		<p>Whether your team uses Python, Ruby, Node.js or Java, no desktop operating system is easier to set up than Ubuntu. Need Eclipse? Just type it into the Ubuntu Software Centre and click to install. The breadth and quality of Ubuntu&rsquo;s repositories are unrivalled. In fact, everything your developers need is just a click or an apt-get away.</p>
-		<p>Want to try your hand at developing for Ubuntu? Join our worldwide app developer community.</p>
-		<p><a href="http://developer.ubuntu.com">Learn more about developing for Ubuntu&nbsp;&rsaquo;</a></p>
-	</div><!-- /.six-col -->
-	<div class="six-col last-col no-margin-bottom pull-right">
-		<img class="pull-bottom-right" src="{{ STATIC_URL }}img/business/desktop-software-centre.png" width="473" height="323" alt="" />
-	</div>
-</div><!-- /.row -->
-
-<div class="row row-for-developers">
-	<div class="six-col">
-		<blockquote class="pull-quote">
-			<p><span>&ldquo;</span>When choosing an OS to pre-install on the Dell XPS-13, our new developer-oriented laptop, Ubuntu was a natural choice. Ubuntu's overwhelming popularity among developers and its cloud capabilities made it a no&dash;brainer.&nbsp;<span>&rdquo;</span></p>
-			<p><cite>Barton George, Director, Web Vertical, Dell</cite></p>
-		</blockquote>
-	</div><!-- /.six-col -->
-	<div class="six-col last-col">
-		<h3>By developers, for developers</h3>
-		<p>Ubuntu is the result of contributions by thousands of developers, motivated by the desire to create their own perfect developer environment. That’s why it&rsquo;s used by some of the world&rsquo;s most exciting technology companies, such as Instagram and Twitpic. And it&rsquo;s why Valve has decided to port its hugely popular Steam virtual games store to Ubuntu. Ubuntu runs on architectures from x86 to ARM and on cloud platforms from OpenStack to Azure and EC2. This versatility makes it the ideal choice for companies with a diverse hardware infrastructure, a &ldquo;bring your own device&rdquo; (BYOD) environment or plans to move operations to the cloud.</p>
-		<p><a href="http://ubuntu.com/certification/desktop">See the full list of desktops and laptops certified to <br />run Ubuntu&nbsp;&rsaquo;</a></p>
-	</div><!-- /.six-col -->
-</div><!-- /.row -->
-
-<div class="row row-easy-deployment">
-	<div class="six-col">
-		<h3>Deployment made easy</h3>
-		<p>When it comes to speed and simplicity of deployment, nothing touches Ubuntu.</p>
-		<p>Juju, Ubuntu’s service orchestration tool, simplifies the often-cumbersome handover between development and ops teams – and it speeds the process up dramatically. Juju Charms automate the deployment of common cloud services and enterprise applications, so your deployments can grow and shrink on demand. With hundreds of pre-existing Charms to adapt and the facility for developers to write their own, nothing gets new code into production as quickly and reliably as Juju.</p>
-		<p><a href="/cloud/tools/juju">More about Juju&nbsp;&rsaquo;</a></p>
-	</div><!-- /.six-col -->
-	<div class="six-col last-col">
-		<img src="{{ STATIC_URL }}img/desktop/desktop-deployment-diagram.png" width="442" height="394" alt="" />
-	</div><!-- /.six-col -->
-</div><!-- /.row -->
-
-<div class="row">
-	<div class="six-col">
-		<img src="{{ STATIC_URL }}img/business/image-landscape.jpg" width="462" height="324" alt="" class="pull-bottom-left" />
-	</div><!-- /.six-col -->
-	<div class="six-col last-col">
-		<h3>Systems management</h3>
-		<p>With Landscape, the systems management tool from Canonical, you can manage updates, security patches, and reporting, while minimising downtime. You can give your developers the freedom they want while you retain control over your assets.</p>
-		<p><a href="/management/">Learn more about Landscape&nbsp;&rsaquo;</a></p>
-	</div><!-- /.six-col -->
-</div><!-- /.row -->
-
-<div class="row row-tailored-support">
-	<h3>Support tailored to developers&rsquo; needs</h3>
-	<div class="nine-col">
-		<p>Need to standardise your developer workstations? Canonical can provide support at any level, from advice and best practice to planning and implementing changes. If you need help on niche issues, we can fix them as they arise &dash; or you can turn to Ubuntu&rsquo;s worldwide developer community for help and advice.</p>
-		<p><a href="/desktop/management">Learn more about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
-	</div><!-- /.nine-col -->
-</div><!-- /.row -->
-{% endblock content %}
-{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
diff --git a/templates/desktop/developers/thin-client.html b/templates/desktop/developers/thin-client.html
deleted file mode 100755
index 3262c2520bc..00000000000
--- a/templates/desktop/developers/thin-client.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "desktop/base_desktop.html" %}
-
-{% block title %}Desktop for developers{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Desktop" subsection_title="For developers" page_title="Thin client"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-border">
-		<h1>Thin client</h1>
-</div>
-{% endblock content %}
-{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
diff --git a/templates/desktop/education.html b/templates/desktop/education.html
new file mode 100644
index 00000000000..97fdeec9598
--- /dev/null
+++ b/templates/desktop/education.html
@@ -0,0 +1,124 @@
+{% extends "desktop/base_desktop.html" %}
+
+{% block title %}For education{% endblock %}
+{% block extra_body_class %}desktop-education{% endblock %}
+
+{% block second_level_nav_items %}
+    {% include "templates/_nav_breadcrumb.html" with section_title="Desktop" page_title="For enterprise"  %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+
+<div class="row row-hero no-border">
+    <div class="six-col">
+        <h1>Ubuntu for education</h1>
+        <p class="intro">With a wide range of educational software and certified hardware, Ubuntu provides secure, cost-effective, accessible computing to schools, colleges and universities.</p>
+        {% include "desktop/shared/_share-this.html" with tweet="Learn how #Ubuntu desktop OS helps students and teachers around the world" %}
+    </div>
+</div>
+
+<div class="row no-border">
+    <h2>Education essentials</h2>
+    <div class="combined-list">
+        <ul class="six-col list-ubuntu">
+            <li>Open source &mdash; free from licensing restrictions</li>
+            <li>Microsoft-compatible office productivity suite</li>
+            <li>Fully translated into 40+ languages</li>
+            <li class="last-item">Virus free and highly secure</li>
+        </ul>
+        <ul class="six-col last-col list-ubuntu">
+            <li>On-site consulting services and training available</li>
+            <li>User-friendly interface</li>
+            <li>Runs well on old and new hardware</li>
+            <li class="last-item">A wide range of education-specific apps for students and educators alike</li>
+        </ul>
+    </div>
+</div>
+
+<div class="row row-case-studies">
+    <h2>A global success in education</h2>
+    <div class="vertical-divider">
+        <div class="four-col">
+            <h3>Penn Manor school district, USA</h3>
+            <p>Penn Manor saved $345,000 on 1,725 Ubuntu PCs at a fraction of what proprietary software costs.</p>
+            <p><a href="https://insights.ubuntu.com/2014/03/25/an-ubuntu-pc-for-everyone-in-penn-manor-school-district-pennsylvania-usa/" class="external">Learn about saving with Ubuntu</a></p>
+        </div>
+        <div class="four-col">
+            <h3>El Centro de Gesti&oacute;n Avanzado, Spain</h3>
+            <blockquote class="pull-quote">
+                <p><span>&ldquo;</span>Students throughout Andalusia now have access to a stable and easy-to-use technology environment.<span>&rdquo;</span></p>
+            </blockquote>
+            <p><a href="https://insights.ubuntu.com/2010/03/13/andalusia-deploys-220000-ubuntu-desktops-in-schools-throughout-the-region/" class="external">Learn about switching to Ubuntu</a></p>
+        </div>
+        <div class="four-col last-col">
+            <h3>Universit&eacute; de Nantes, France</h3>
+            <p class="headline">Reduced the total cost of ownership across 40,000 Windows-dominated desktops.</p>
+            <p><a href="https://insights.ubuntu.com/2014/09/02/meeting-evolving-it-needs-at-the-university-of-nantes-france/" class="external">Learn how Ubuntu cuts costs</a></p>
+        </div>
+    </div>
+</div>
+
+<div class="row row-apps">
+    <div class="twelve-col">
+        <h2>Countless open source tools and apps available</h2>
+    </div>
+    <div class="one-col">
+        <img src="{{ STATIC_URL }}img/desktop/education/gcompris-icon.png" alt="Gcompris icon" />
+    </div>
+    <div class="three-col">
+        <h3>Gcompris</h3>
+        <p>Software suite of learning and skill building activities for school children.</p>
+    </div>
+    <div class="one-col">
+        <img src="{{ STATIC_URL }}img/desktop/education/marble-icon.png" alt="Marble icon" />
+    </div>
+    <div class="three-col">
+        <h3>Marble</h3>
+        <p>Extensive virtual world atlas for exploring the earth and other planets.</p>
+    </div>
+    <div class="one-col">
+        <img src="{{ STATIC_URL }}img/desktop/education/italc-icon.png" alt="iTalc icon" />
+    </div>
+    <div class="three-col last-col">
+        <h3>iTalc</h3>
+        <p>IT tool which allows teachers to manage individual computers within school’s network.</p>
+    </div>
+
+    <div class="one-col">
+        <img src="{{ STATIC_URL }}img/desktop/education/scribus-icon.png" alt="Scribus icon" />
+    </div>
+    <div class="three-col">
+        <h3>Scribus</h3>
+        <p>Desktop publishing application for professional typesetting and interactive presentations.</p>
+    </div>
+    <div class="one-col">
+        <img src="{{ STATIC_URL }}img/desktop/education/lightspeed-icon.png" alt="Lightspeed icon" />
+    </div>
+    <div class="three-col">
+        <h3>Lightspeed</h3>
+        <p>Physics simulator for exploring the special theory of relativity.</p>
+    </div>
+    <div class="one-col">
+        <img src="{{ STATIC_URL }}img/desktop/education/schooltool-icon.png" alt="Schooltool icon" />
+    </div>
+    <div class="three-col last-col">
+        <h3>SchoolTool</h3>
+        <p>Web based student information system designed for schools in developing countries.</p>
+    </div>
+</div>
+
+<div class="row no-border row-landscape">
+    <div class="five-col">
+        <div>
+            <h2>Support and management tools for&nbsp;your school</h2>
+            <p>Ubuntu Advantage is the professional support package from the experts at Canonical. Get 24x7 support with access to engineers with first-hand experience of your issues. It also includes Landscape, the Ubuntu systems management tool, for monitoring, managing, patching and compliance reporting on all your Ubuntu desktops.</p>
+            <p><a href="/management">Learn about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
+        </div>
+    </div>
+    <div class="pull-right right">
+        <img src="{{ STATIC_URL }}img/desktop/enterprise/landscape-screenshot.png" class="touch-border landscape-screenshot priority-0" alt="Landscape screenshot" />
+    </div>
+</div>
+
+{% endblock content %}
+{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
diff --git a/templates/desktop/enterprise.html b/templates/desktop/enterprise.html
new file mode 100644
index 00000000000..c88c8d33cbb
--- /dev/null
+++ b/templates/desktop/enterprise.html
@@ -0,0 +1,81 @@
+{% extends "desktop/base_desktop.html" %}
+
+{% block title %}For enterprise{% endblock %}
+{% block extra_body_class %}desktop-enterprise{% endblock %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Desktop" page_title="For enterprise"  %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row row-hero">
+	<div class="six-col">
+		<h1>Ubuntu for enterprise</h1>
+		<p class="intro">On the desktop, Ubuntu has been widely adopted by small and large enterprises because of its ease of use, speed, apps, security model, management tools and low cost of ownership.</p>
+		{% include "desktop/shared/_share-this.html" with tweet="See how #Ubuntu desktop OS might benefit your business" %}
+	</div>
+</div>
+
+<div class="row row-grey">
+	<h2>Enterprise essentials built-in</h2>
+    <div class="combined-list">
+		<ul class="six-col list-ubuntu">
+			<li>Microsoft-compatible office productivity suite</li>
+			<li>Fully translated into 40+ languages</li>
+			<li class="last-item">Open source &mdash; free from licensing restrictions</li>
+		</ul>
+		<ul class="six-col list-ubuntu last-col">
+			<li>Virus free and highly secure</li>
+			<li class="last-item">On-site consulting services and training available</li>
+		</ul>
+	</div>
+</div>
+
+<div class="row row-case-studies no-border-bottom">
+	<div class="twelve-col">
+		<h2>Ubuntu in action</h2>
+	</div>
+	<div class="twelve-col vertical-divider">
+		<div class="six-col">
+			<h3>Carbonado Intermedia and Auteuristic</h3>
+			<blockquote class="pull-quote">
+				<p><span>&ldquo;</span>We simply wouldn’t be able to deliver our work as fast and cost-effectively as this with any other platform&hellip; Ubuntu gives us wings!<span>&rdquo;</span></p>
+			</blockquote>
+			<p><a href="https://insights.ubuntu.com/2015/02/10/ubuntu-delivers-a-bulletproof-workstation-platform-for-media-productio/" class="external">Learn how Ubuntu workstations deliver</a></p>
+		</div>
+		<div class="six-col last-col">
+			<h3>Bukwang Pharmaceuticals</h3>
+			<p class="headline">Faced with an expensive new contract from Microsoft, Bukwang Pharma switched 400 PCs to Ubuntu and saved $300,00 on annual licensing alone.</p>
+			<p><a href="https://insights.ubuntu.com/2014/07/31/bukwang-pharmaceuticals-cut-it-costs-and-created-business-value-with-ubuntu/" class="external">Learn how switching to Ubuntu saves money</a></p>
+		</div>
+	</div>
+</div>
+
+<div class="row row-landscape">
+	<div class="five-col no-margin-bottom">
+		<div>
+			<h2>Enterprise-wide support and management tools</h2>
+			<p>Ubuntu Advantage is the professional support package from the experts at Canonical. Get 24x7 support with access to engineers with first-hand experience of your issues. It also includes Landscape, the Ubuntu systems management tool, for monitoring, managing, patching and compliance reporting on all your Ubuntu desktops.</p>
+			<p><a href="/management">Learn about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
+		</div>
+	</div>
+	<div class="pull-right right priority-0">
+		<img src="{{ STATIC_URL }}img/desktop/enterprise/landscape-screenshot.png" class="touch-border landscape-screenshot" alt="Landscape screenshot" />
+	</div>
+</div>
+
+<div class="row no-border">
+	<div class="seven-col touch-border priority-0">
+		<img src="{{ STATIC_URL }}img/desktop/enterprise/laptop.png" class="left pull-left" alt="Laptop photo" />
+	</div>
+	<div class="five-col last-col">
+		<div>
+			<h2>Buy it pre-installed</h2>
+			<p>Ubuntu runs on the world&rsquo;s best hardware, including HP, Dell, Asus and Lenovo. And with nearly 70% of PCs shipped by the major PC companies already certified to work with Ubuntu, it is easy to find hardware that will work for your business.</p>
+			<p><a href="/certification/">Learn more about Ubuntu certified hardware&nbsp;&rsaquo;</a></p>
+		</div>
+	</div>
+</div>
+
+{% endblock content %}
+{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
diff --git a/templates/desktop/features.html b/templates/desktop/features.html
new file mode 100755
index 00000000000..974c7a083f8
--- /dev/null
+++ b/templates/desktop/features.html
@@ -0,0 +1,290 @@
+{% extends "desktop/base_desktop.html" %}
+{% block extra_body_class %}desktop-features{% endblock %}
+{% block head_extra %}
+<style type="text/css">
+@-webkit-keyframes flash-sign {
+  22%, 28%, 98%, 100% {
+    filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
+    opacity: 0;
+  }
+
+  27%, 99% {
+    filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
+    opacity: 1;
+  }
+}
+
+@keyframes flash-sign {
+  22%, 28%, 98%, 100% {
+    filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
+    opacity: 0;
+  }
+
+  27%, 99% {
+    filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
+    opacity: 1;
+  }
+}
+</style>
+{% endblock %}
+{% block title %}Desktop features{% endblock %}
+{% block meta_description %}Learn about all the great features and default applications in the Ubuntu desktop operating system.{% endblock meta_description %}
+
+{% block meta_keywords %}Ubuntu, desktop, features, web browsing, office applications, social and email, music and mobile, photos and videos, games and apps, smart scopes{% endblock meta_keywords %}
+
+
+{% block second_level_nav_items %}
+    {% include "templates/_nav_breadcrumb.html" with section_title="Desktop" page_title="Features" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+
+<div class="row row-hero row-features">
+    <div class="six-col">
+        <h1>Features</h1>
+        <p class="intro">Enjoy the simplicity of Ubuntu&rsquo;s intuitive interface. Fast, secure and with thousands of apps to choose from &mdash; for everything you want to do, Ubuntu has what you need.</p>
+        <p><a href="/download/desktop" class="link-cta-ubuntu">Download Ubuntu</a></p>
+        <p><a href="/tour" class="">Take the tour&nbsp;&rsaquo;</a></p>
+        {% include "desktop/shared/_share-this.html" with tweet="Looking at all the great features of #Ubuntu desktop OS" %}
+    </div>
+</div>
+
+<div class="row row-office-software no-border">
+    <div class="four-col append-one">
+        <div>
+            <h2>Office software</h2>
+            <p>Create professional documents, spreadsheets and presentations on Ubuntu with LibreOffice, the open source office suite that&rsquo;s compatible with Microsoft Office.   That means you can open and edit files like Word documents, Excel spreadsheets and PowerPoint presentations and share them with other users quickly and easily. You can also use Google docs directly from your desktop.</p>
+        </div>
+    </div>
+    <div class="seven-col last-col">
+        <img src="{{ STATIC_URL }}img/desktop/features/office-apps.png" height="414" width="556" alt="Office Apps" />
+    </div>
+</div>
+
+<div class="row row-web-browsing strip-dark">
+    <div class="six-col prepend-one align-center">
+        <img src="{{ STATIC_URL }}img/desktop/features/webbrowser.png" class="" width="430" alt="" />
+    </div>
+    <div class="five-col last-col">
+        <div>
+            <h2>Web browsing</h2>
+            <p>Renowned for speed and security, Ubuntu and Firefox make browsing the web a pleasure again.  Ubuntu also includes Chrome, Opera and other browsers that can be installed from the Ubuntu Software Centre.</p>
+        </div>
+    </div>
+</div>
+
+<div class="row row-smarter-searching">
+    <div class="eight-col">
+        <div>
+            <h2>Smarter searching</h2>
+            <p>Smart filters to make it faster and easier to find the content you need, whether it&rsquo;s stored on your computer or on the web. Type any query into the Dash home and the Smart Scopes server will determine which categories of content are the most relevant to your search, returning only the best results. And it learns from your past searches making it increasingly accurate over time.</p>
+        </div>
+    </div>
+    <img src="{{ STATIC_URL }}img/desktop/features/search-laptop.png" class="touch-border" alt="Unity search" />
+</div>
+
+<div class="row row-smarter-searching no-border">
+    <div class="five-col append-one">
+        <div>
+            <h2>Email</h2>
+            <p>Ubuntu comes with Thunderbird, Mozilla&rsquo;s popular email application, so you&rsquo;ll have fast desktop access to your email. No matter which email services you use; Microsoft Exchange, Gmail, Hotmail, pop or imap, email just works.</p>
+        </div>
+    </div>
+    <div class="six-col last-col">
+        <img src="{{ STATIC_URL }}img/desktop/features/email.png" class="" alt="" height="398" width="520" />
+    </div>
+</div>
+
+<div class="row row-gaming">
+    <div class="prepend-six six-col last-col">
+        <h2>Gaming</h2>
+        <p>From Sudoku to shoot-em-ups, we&rsquo;ve got loads of games that&rsquo;ll keep you busy for hours.  There are thousands of games available for Ubuntu, including titles from the Unity and Steam platforms.  Pick from critically acclaimed titles such as Dota 2, Civilisation V, Kerbal Space Programme, Football Manager 2015 and Borderlands&nbsp;2.</p>
+    </div>
+    <img class="borderlands" src="{{ STATIC_URL }}img/desktop/features/borderlands.jpg" alt="" />
+    <img class="borderlands-flash" src="{{ STATIC_URL }}img/desktop/features/borderlands-flash.jpg" alt="" />
+</div>
+
+<div class="row row-compatible no-border">
+    <div class="two-col">
+        <img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-desktop-orange.svg" class="picto-desktop" alt="Desktop pictogram" />
+    </div>
+    <div class="six-col">
+        <div>
+            <h2>Compatible with all your accessories</h2>
+            <p>Printers, wi-fi routers, keyboards, mice, speakers&hellip; you&nbsp;name&nbsp;it. If you need to plug it into your PC, Ubuntu will support it. The same goes for internal components like graphics cards.</p>
+        </div>
+    </div>
+    <div class="four-col last-col">
+        <img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-mobile-midaubergine.svg" class="priority-0 picto-mobile" alt="Mobile pictogram" />
+        <img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-camera-warmgrey.svg" class="priority-0 picto-camera" alt="Camera pictogram" />
+    </div>
+</div>
+
+<div class="row row-photos strip-dark no-border">
+    <div class="five-col">
+        <div>
+            <h2>Photos</h2>
+            <p>Ubuntu is full of free apps to help you enjoy, manage, edit and share your photos &mdash; whatever you use to take them. With fantastic support for cameras and phones, you won&rsquo;t need any extra drivers to get up and running.</p>
+        </div>
+    </div>
+    <span class="photo-credit smaller"></span>
+</div>
+
+<div class="row row-organise vertical-divider">
+    <div class="seven-col">
+        <div class="six-col">
+            <div class="twelve-col">
+                <img src="{{ STATIC_URL }}img/desktop/features/stockwell-img.png" alt="Stockwell screenshot" height="323" width="449" />
+            </div>
+            <h2>Organise your photos</h2>
+            <p>With Shotwell, you can quickly and easily import, organise, edit and view your pictures. And you can share your favourite snaps on all popular photo sites and social networks.</p>
+        </div>
+    </div>
+    <div class="five-col last-col">
+        <div class="four-col last-col prepend-one">
+            <h2>Edit and illustrate</h2>
+            <p>Edit your photos or create professional illustrations and designs with tools like Gimp and Inkscape, available in the Ubuntu Software Centre.</p>
+            <ul class="inline">
+                <li>
+                    <img src="{{ STATIC_URL }}img/desktop/features/inkscape-icon.png" alt="Inkscape icon" />
+                </li>
+                <li>
+                    <img src="{{ STATIC_URL }}img/desktop/features/gimp-icon.png" alt="Gimp icon" />
+                </li>
+                <li>
+                    <img src="{{ STATIC_URL }}img/desktop/features/lightworks-icon.png" alt="Lightworks icon" />
+                </li>
+                <li>
+                    <img src="{{ STATIC_URL }}img/desktop/features/blender-icon.png" alt="Blender icon" />
+                </li>
+            </ul>
+        </div>
+    </div>
+</div>
+
+<div class="row row-videos">
+    <div class="four-col append-one">
+        <div>
+            <h2>Videos</h2>
+            <p>Watch all your favourite content on Ubuntu with apps for playing, managing and sharing your videos. Edit your movies with PiTiVi and then watch them in Movie Player &mdash; or add VLC and OpenShot from the Ubuntu Software Centre, for compatibility with even more file formats.</p>
+        </div>
+    </div>
+    <div class="seven-col last-col">
+        <img src="{{ STATIC_URL }}img/desktop/features/video-screen.png" alt="Video" height="393" width="526" />
+    </div>
+</div>
+
+<div class="row row-social">
+    <div class="seven-col">
+        <img src="{{ STATIC_URL }}img/desktop/features/social.png" alt="Skype" />
+    </div>
+    <div class="five-col last-col">
+        <div>
+            <h2>Social</h2>
+            <p>Keep up to date with your friends and colleagues quickly and easily.  Ubuntu comes with Thunderbird, Mozilla&rsquo;s popular email application, so you&rsquo;ll have fast desktop access to your email. Services like Skype work seamlessly and with the Dash message lens, you can see all your microblogging feeds in one place. So you&rsquo;ll be able to follow the latest news and gossip like never before. </p>
+        </div>
+    </div>
+</div>
+
+<div class="row row-apps no-border">
+    <div class="twelve-col">
+        <h2>A whole world of apps</h2>
+        <div class="eight-col">
+            <p>Ubuntu offers thousands of apps available for download from the <a href="https://apps.ubuntu.com/cat/" class="external">software centre</a>. Most are available for free and can be installed with just a few clicks.</p>
+        </div>
+    </div>
+
+        <div class="one-col">
+            <img src="{{ STATIC_URL }}img/desktop/features/skype-icon.png" alt="Skype icon" />
+        </div>
+        <div class="three-col">
+            <h3>Skype</h3>
+            <p>The video chat service, offering screen sharing, conferencing and more.</p>
+        </div>
+
+        <div class="one-col">
+            <img src="{{ STATIC_URL }}img/desktop/features/chrome-icon.png" alt="Chrome icon" />
+        </div>
+        <div class="three-col">
+            <h3>Chrome</h3>
+            <p>Google’s fast, simple and secure web browser, built for the modern web.</p>
+        </div>
+
+        <div class="one-col">
+            <img src="{{ STATIC_URL }}img/desktop/features/thunderbird-icon.png" alt="Thunderbird icon" />
+        </div>
+        <div class="three-col last-col">
+            <h3>Thunderbird</h3>
+            <p>Terrific email application, from Mozilla, that's easy to set up and customise.</p>
+        </div>
+
+        <div class="one-col">
+            <img src="{{ STATIC_URL }}img/desktop/features/dropbox-icon.png" alt="Dropbox icon" />
+        </div>
+        <div class="three-col">
+            <h3>Dropbox</h3>
+            <p>The world&rsquo;s favourite cloud backup and file sharing service.</p>
+        </div>
+        <div class="one-col">
+            <img src="{{ STATIC_URL }}img/desktop/features/libreoffice-icon.png" alt="LibreOffice icon" />
+        </div>
+        <div class="three-col">
+            <h3>LibreOffice</h3>
+            <p>The free office productivity suite that&rsquo;s compatible with Microsoft Office.</p>
+        </div>
+        <div class="one-col">
+            <img src="{{ STATIC_URL }}img/desktop/features/twitter-icon.png" alt="Twitter icon" />
+        </div>
+        <div class="three-col last-col">
+            <h3>Twitter</h3>
+            <p>The social media powerhouse that&rsquo;s become an essential for online life.</p>
+        </div>
+
+        <div class="one-col">
+            <img src="{{ STATIC_URL }}img/desktop/features/vlc-icon.png" alt="VLC icon" />
+        </div>
+        <div class="three-col">
+            <h3>VLC player</h3>
+            <p>No other video player is compatible with as many different file formats.</p>
+        </div>
+        <div class="one-col">
+            <img src="{{ STATIC_URL }}img/desktop/features/gimp-icon.png" alt="Gimp icon" />
+        </div>
+        <div class="three-col">
+            <h3>Gimp</h3>
+            <p>The world&rsquo;s number one free app for image creation and photo retouching.</p>
+        </div>
+        <div class="one-col">
+            <img src="{{ STATIC_URL }}img/desktop/features/firefox-icon.png" alt="Firefox icon" />
+        </div>
+        <div class="three-col last-col">
+            <h3>Firefox</h3>
+            <p>The speedy, independent, open source browser from Mozilla.</p>
+        </div>
+
+    <div class="twelve-col">
+        <p><a href="https://apps.ubuntu.com/cat/" class="external">Visit the Ubuntu apps directory</a></p>
+    </div>
+</div>
+{% endblock content %}
+{% block footer_extra %}
+<script type="text/javascript">
+YUI().use('node', function (Y) {
+    var photoRow = Y.one('.row-photos'), 
+        caption = Y.one('.row-photos .photo-credit'),
+        credits = {
+                    "photo-1": "Photo by community member Tomáš Kijas",
+                    "photo-2": "Photo by community member Life Nomadic",
+                    "photo-3": "Photo by community member Martin Wagner"
+                };
+    if (photoRow) {
+        var n = Math.floor((Math.random() * 3) + 1);
+        if (!credits["photo-" + n]) {
+            n = 1;
+        }
+        photoRow.addClass('photo-' + n);
+        caption.set('text', credits["photo-" + n]);
+    }
+});
+</script>
+{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/desktop/features/_features_header.html b/templates/desktop/features/_features_header.html
deleted file mode 100755
index 84b153791c6..00000000000
--- a/templates/desktop/features/_features_header.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="row row-hero row-hero-features no-border">
-	<div class="five-col">
-		<h1>{{ page_title }}</h1>
-	</div>
-	<div class="seven-col last-col priority-0">
-		<p class="right"><a class="link-cta-ubuntu" href="/download">Get Ubuntu now</a></p>
-	</div>
-</div>
\ No newline at end of file
diff --git a/templates/desktop/features/games-apps.html b/templates/desktop/features/games-apps.html
deleted file mode 100755
index 800b87bb1a5..00000000000
--- a/templates/desktop/features/games-apps.html
+++ /dev/null
@@ -1,72 +0,0 @@
-{% extends "desktop/base_desktop.html" %}
-
-{% block title %}Games and apps | Features{% endblock %}
-
-{% block body_classes %}audience-consumer{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Desktop" subsection_title="Features" page_title="Find more apps"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-{% include "desktop/features/_features_header.html" with page_title="Games and apps" %}
-
-<div class="row intro">
-	<div class="five-col">
-		<p>Ubuntu Software Centre also gives you instant access to thousands of great applications &mdash; some free and some available commercially. You can also search for apps directly from the Dash. If you see something you like, you can get more information and then install it in just a couple of clicks.</p>
-		{% include "_includes/_share_this.html" %}
-	</div>
-	<div class="seven-col last-col no-margin pull-right">
-		<img class="touch-border" src="{{ STATIC_URL }}img/desktop/features/image-software-centre.jpg" alt="image-software-centre" width="549" height="300" />
-	</div>
-</div><!-- /.row -->
-
-<div class="row row-funsies equal-height vertical-divider no-border">
-	<div class="four-col education-resources">
-		<p><img src="{{ STATIC_URL }}img/desktop/features/image-educational-resources.png" alt="" width="204" height="49"/></p>
-		<h3>Educational resources</h3>
-		<p>The Ubuntu Software Centre comes with a range of apps that make learning fun and engaging.</p>
-	</div><!-- /.four-col -->
-	<div class="four-col ratings-and-reviews">
-		<p><img src="{{ STATIC_URL }}img/desktop/features/image-ratings-and-reviews.png" alt="stars" width="204" height="48" /></p>
-		<h3>Ratings and reviews</h3>
-		<p>Each application comes with ratings and reviews to make it easier for you to decide which apps you want to install.</p>
-	</div><!-- /.four-col -->
-	<div class="four-col last-col fun-and-games">
-		<p><img src="{{ STATIC_URL }}img/desktop/features/image-fun-and-games.png" alt="image-fun-and-games" width="204" height="48" /></p>
-		<h3>Fun and games</h3>
-		<p>From Sudoku to shoot-em-ups, we&rsquo;ve got loads of games that&rsquo;ll keep you busy for hours.</p>
-	</div><!-- /.four-col -->
-</div><!-- /.row -->
-
-<div class="row row-humble-indie-bundle no-border">
-	<div class="seven-col">
-		<h2>Humble Indie Bundle</h2>
-		<p>You can also pick up some incredible games directly from the Ubuntu Software Centre, as Ubuntu has teamed up with the regular Humble Indie Bundle charity sales. Pick from critically acclaimed titles such as Braid and Bastion, Limbo and FEZ.</p>
-		<div class="fez"><span id="preload-fez"></span></div>
-	</div>
-</div><!-- /.row -->
-
-<div class="row">
-	<div class="five-col no-margin-bottom">
-		<p class="five-col"><img src="{{ STATIC_URL }}img/logos/logo-steam.svg" width="365" height="91" alt="" /></p>
-		<h2>Steam on Ubuntu</h2>
-		<p>As the PC gaming resurgence continues at pace, Ubuntu has quickly become a great platform for cutting-edge games. Canonical and Valve have worked together to bring the world&rsquo;s biggest open gaming platform to Ubuntu, with more and more Linux-compatible games, so download Steam today and start playing thousands of titles.</p>
-	</div>
-	<div class="seven-col last-col no-margin pull-right">
-		<img class="priority-0 touch-border" src="{{ STATIC_URL }}img/desktop/features/image-steam.jpg" alt="Steam screenshot" width="545" height="400"  />
-	</div>
-</div><!-- /.row -->
-
-<div class="row row-developer">
-		<div class="seven-col">
-			<img class="" src="{{ STATIC_URL }}img/desktop/features/games-apps/image-createcoolapps.svg" alt="" width="443" height="135" />
-		</div>
-		<div class="five-col last-col">
-			<h3>Create cool apps!</h3>
-			<p>Develop and publish your apps on Ubuntu, the world's third-most popular desktop <abbr title="Operating System">OS</abbr>.</p>
-			<p><a href="http://developer.ubuntu.com">Get started today&nbsp;&rsaquo;</a></p>
-		</div>
-</div><!-- /.row -->
-{% include "desktop/features/nav/_explore_ubuntu.html" %}
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/desktop/features/index.html b/templates/desktop/features/index.html
deleted file mode 100755
index 2f78d580d88..00000000000
--- a/templates/desktop/features/index.html
+++ /dev/null
@@ -1,49 +0,0 @@
-{% extends "desktop/base_desktop.html" %}
-{% block extra_body_class %}desktop-features-home{% endblock %}
-{% block title %}Desktop features{% endblock %}
-{% block meta_description %}Learn about all the great features and default applications in the Ubuntu desktop operating system.{% endblock meta_description %}
-
-{% block meta_keywords %}Ubuntu, desktop, features, web browsing, office applications, social and email, music and mobile, photos and videos, games and apps, smart scopes{% endblock meta_keywords %}
-
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Desktop" page_title="Features" tertiary="true"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-border">
-	<div class="four-col">
-		<h1>Reach out and touch it</h1>
-		<p>Enjoy the simplicity of Ubuntu's intuitive interface. Fast, secure and with thousands of apps to choose from, the sleek Ubuntu desktop experience is now optimised for multitouch devices, including laptop trackpads and touchscreens, as well as the familiar keyboard and mouse.</p>
-		<p><a href="/download/desktop/" class="link-cta-ubuntu">Get Ubuntu now</a></p>
-	</div>
-	<div class="eight-col last-col text-center">
-		<img src="{{ STATIC_URL }}img/desktop/features/image-features.jpg" alt="Facebook loaded Firefox running on Ubuntu" width="654" height="330" />
-	</div>
-	<div class="clearfix">{% include "_includes/_share_this.html" %}</div>
-</div><!-- /.row -->
-
-<div class="row row-what-is-new">
-	<div class="six-col no-margin-bottom">
-		<img src="{{ STATIC_URL }}img/desktop/features/image-scopes.jpg" alt="" class="touch-border pull-left priority-0" width="464" height="474" />
-	</div>
-	<div class="six-col last-col">
-		<h2>Smarter searching</h2>
-		<p>Ubuntu 14.04 LTS includes a wealth of smart filters to make it faster and easier to find the content you need, whether it&rsquo;s stored on your computer or on the web.</p>
-		<p>Type any query into the Dash home and the Smart Scopes server will determine which categories of content are the most relevant to your search, returning only the best results. The server constantly improves its results by learning which categories and results are most useful to you over time.</p>
-	</div>
-</div><!-- /.row -->
-
-<div class="row no-border">
-	<h2>First look: Unity 8</h2>
-	<div class="seven-col">
-		<p>If you&rsquo;re interested in the future of computing and you want to see how Ubuntu will look further down the line, you can download a preview version of Unity 8, Ubuntu&rsquo;s next-generation user interface. Designed to support a single user experience across the smartphone, the tablet and the PC, it uses the current version of Mir, the cross-platform display server being developed by the Ubuntu community. Do note, however, that Mir only works with open-source graphics drivers at present.</p>
-		<p>To download the preview of Unity 8, search for unity8-desktop-session-mir in the Ubuntu Software Centre.</p>
-	</div>
-	<div class="five-col last-col">
-		<img src="{{ STATIC_URL }}img/desktop/features/image-unity8.svg" alt="" width="299" height="213" />
-	</div>
-</div><!-- /.row -->
-{% include "desktop/features/nav/_explore_ubuntu.html" %}
-{% endblock content %}
-{% block footer_extra %}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/desktop/features/nav/_explore_ubuntu.html b/templates/desktop/features/nav/_explore_ubuntu.html
deleted file mode 100755
index ef293954bf4..00000000000
--- a/templates/desktop/features/nav/_explore_ubuntu.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<div class="row no-border row-explore-ubuntu">
-	<nav class="box box-grey box-explore-ubuntu clearfix priority-0">
-		<h2>Explore Ubuntu's features and apps</h2>
-		<ul class="no-bullets smaller">
-			<li{% if level_3 == 'web-browsing' %} class="current"{% endif %}>
-				<a href="/desktop/features/web-browsing">
-					<img src="{{ STATIC_URL }}img/ubuntu/features/icon-web-browsing-64x64.png" width="64" height="64" alt="" />
-					<p>Web browsing</p>
-				</a>
-			</li>
-			<li{% if level_3 == 'office-applications' %} class="current"{% endif %}>
-				<a href="/desktop/features/office-applications">
-					<img src="{{ STATIC_URL }}img/ubuntu/features/icon-office-applications-64x64.png" width="64" height="64" alt="" />
-					<p>Office applications</p>
-				</a>
-			</li>
-			<li{% if level_3 == 'social-and-email' %} class="current"{% endif %}>
-				<a href="/desktop/features/social-and-email">
-					<img src="{{ STATIC_URL }}img/ubuntu/features/icon-social-and-email-64x64.png" width="64" height="64" alt="" />
-					<p>Social and email</p>
-				</a>
-			</li>
-			<li{% if level_3 == 'photos-and-videos' %} class="current"{% endif %}>
-				<a href="/desktop/features/photos-and-videos">
-					<img src="{{ STATIC_URL }}img/ubuntu/features/icon-photos-and-videos-64x64.png" width="64" height="64" alt="" />
-					<p>Photos and videos</p>
-				</a>
-			</li>
-			<li{% if level_3 == 'games-apps' %} class="current"{% endif %}>
-				<a href="/desktop/features/games-apps">
-					<img src="{{ STATIC_URL }}img/ubuntu/features/icon-find-more-apps-64x64.png" width="64" height="64" alt="" />
-					<p>Games and apps</p>
-				</a>
-			</li>
-		</ul>
-	</nav>
-</div>
diff --git a/templates/desktop/features/office-applications.html b/templates/desktop/features/office-applications.html
deleted file mode 100755
index b4940d82188..00000000000
--- a/templates/desktop/features/office-applications.html
+++ /dev/null
@@ -1,84 +0,0 @@
-{% extends "desktop/base_desktop.html" %}
-
-{% block title %}Office applications | Features{% endblock %}
-
-{% block body_classes %}audience-consumer{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Desktop" subsection_title="Features" page_title="Office applications"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-{% include "desktop/features/_features_header.html" with page_title="Office apps" %}
-
-<div class="row intro">
-	<div class="four-col">
-		<p>Create professional documents, spreadsheets and presentations with Ubuntu. LibreOffice is easy to use, packed with the features you need, and it&rsquo;s completely free.</p>
-		<ul class="no-bullets inline inline-icons">
-			<li><img src="{{ STATIC_URL }}img/icons/icon-libreoffice-writer-reflex-40x88.png" width="40" height="88" title="Writer" alt="Writer icon" /></li>
-			<li><img src="{{ STATIC_URL }}img/icons/icon-libreoffice-cal-reflex-40x88.png" width="40" height="88" title="Calc" alt="Calc icon" /></li>
-			<li><img src="{{ STATIC_URL }}img/icons/icon-libreoffice-impress-reflex-40x88.png" width="40" height="88" title="Impress" alt="Impress icon" /></li>
-		</ul>
-		{% include "_includes/_share_this.html" %}
-	</div>
-	<div class="eight-col last-col no-margin pull-right">
-		<img class="touch-border" width="636" height="327" alt="LibreOffice on Ubuntu" src="{{ STATIC_URL }}img/desktop/features/office-applications/image-officeapps.jpg">
-	</div>
-</div>
-
-<div class="row equal-height">
-	<div class="four-col box">
-		<h3>Open your Office documents</h3>
-		<p>Ubuntu is compatible with Microsoft Office. That means you can open and edit files like Word documents, Excel spreadsheets and PowerPoint presentations, and share them with other users quickly and easily.</p>
-		<ul class="inline-icons no-margin">
-			<li class="row-text"><p>Works with:</p></li>
-			<li><img src="{{ STATIC_URL }}img/icons/icon-word2010-28x28.gif" width="30" height="28" alt="Word icon" title="Word" /></li>
-			<li><img src="{{ STATIC_URL }}img/icons/icon-excel2010-28x28.gif" width="30" height="28" alt="Excel icon" title="Excel" /></li>
-			<li class="last-item"><img src="{{ STATIC_URL }}img/icons/icon-powerpoint2010-28x28.gif" width="30" height="28" alt="PowerPoint icon" title="PowerPoint" /></li>
-		</ul>
-	</div><!-- /.four-col -->
-	<div class="eight-col last-col box">
-			<h3>Get things done</h3>
-			<p class="four-col">We understand how important your computer is for day-to-day tasks. Whether it's finding information online, sending emails to colleagues and friends, or creating and sharing documents, Ubuntu has everything you need to get things done. Fast.</p>
-			<img class="four-col last-col pull-bottom-right" src="{{ STATIC_URL }}img/desktop/features/screenshot-features-office-gtd.png" width="287" height="283" alt="" />
-	</div>
-</div><!-- /.row -->
-
-<div class="row no-border">
-	<div class="box-padded-feature twelve-col">
-		<h3>Also available in the Ubuntu Software Centre:</h3>
-		<div>
-			<ul class="equal-height vertical-divider ">
-				<li class="four-col">
-					<div class="one-col">
-						<img src="{{ STATIC_URL }}img/icons/icon-writer-doc.png" width="39" height="48" alt="Google Docs icon" />
-					</div>
-					<div class="three-col last-col">
-						<h4>Google Docs</h4>
-						<p>Use Google Docs direct from your desktop.</p>
-					</div>
-				</li>
-				<li class="four-col">
-					<div class="one-col">
-						<img src="{{ STATIC_URL }}img/icons/icon-apps-reader-48.png" width="48" height="48" alt="Adobe Reader icon" />
-					</div>
-					<div class="three-col last-col">
-						<h4>Adobe Reader</h4>
-						<p>Adobe Reader allows you to view, navigate and print PDF files.</p>
-					</div>
-				</li>
-				<li class="four-col last-col">
-					<div class="one-col">
-						<img src="{{ STATIC_URL }}img/icons/icon-homebank-48.png" width="48" height="48" alt="HomeBank icon" />
-					</div>
-					<div class="three-col last-col">
-						<h4>HomeBank</h4>
-						<p>HomeBank helps you manage your accounts quickly and easily.</p>
-					</div>
-				</li>
-			</ul>
-		</div><!-- / -->
-	</div><!-- /.box-padded-feature -->
-</div><!-- /.row -->
-{% include "desktop/features/nav/_explore_ubuntu.html" %}
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/desktop/features/photos-and-videos.html b/templates/desktop/features/photos-and-videos.html
deleted file mode 100755
index 99d6b8d9fa0..00000000000
--- a/templates/desktop/features/photos-and-videos.html
+++ /dev/null
@@ -1,114 +0,0 @@
-{% extends "desktop/base_desktop.html" %}
-
-{% block title %}Photos and videos | Features{% endblock %}
-
-{% block body_classes %}audience-consumer{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Desktop" subsection_title="Features" page_title="Photos and videos"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-{% include "desktop/features/_features_header.html" with page_title="Photos and videos" %}
-
-<div class="row intro">
-	<div class="four-col">
-		<p>Ubuntu is full of free apps to help you enjoy, manage, edit and share your photos and videos &mdash; whatever you use to take them. With fantastic support for cameras and phones, you won&rsquo;t need any extra drivers to get up and running.</p>
-			<ul class="no-bullets inline-icons no-margin-bottom">
-				<li><img src="{{ STATIC_URL }}img/icons/icon-vlc-48.png" width="42" height="96" title="VLC" alt="VLC icon" /></li>
-				<li class="last-item"><img src="{{ STATIC_URL }}img/icons/icon-totem-video-48.png" width="44" height="96" title="Totem video" alt="Totem video icon" /></li>
-			</ul>
-		{% include "_includes/_share_this.html" %}
-	</div>
-	<div class="eight-col last-col no-margin pull-right">
-		<img class="left" src="{{ STATIC_URL }}img/desktop/features/photos-and-videos/image-photosandvideos.jpg" width="636" height="327" alt="VLC media player on Ubuntu" />
-	</div>
-</div><!-- /.intro -->
-
-<div class="row row-organise">
-	<div class="eight-col box">
-		<div class="four-col">
-			<h3>Organise your photos</h3>
-			<p>With Shotwell, you can quickly and easily import, organise, edit and view your pictures. And you can share your favourite snaps on all popular photo sites and social networks.</p>
-		</div><!-- /.four-col -->
-			<img class="four-col last-col pull-bottom-right" src="{{ STATIC_URL }}img/desktop/features/screenshots-photos-organise.png" alt="Shotwell on Ubuntu" width="287px" height="257px" />
-	</div><!-- /.eight-col -->
-	<div class="four-col box last-col no-margin-bottom">
-		<h3>Photo and illustration tools</h3>
-		<p>Edit your photos or create professional illustrations and designs with tools like GIMP and Inkscape, available in the Ubuntu Software Centre.</p>
-		<ul class="no-bullets inline-icons no-margin-bottom">
-			<li><img src="{{ STATIC_URL }}img/icons/icon-gimp-48.png" width="48" height="48" title="GIMP" alt="GIMP icon" /></li>
-			<li class="last-item"><img src="{{ STATIC_URL }}img/icons/icon-inkscape-48.png" width="48" height="48" title="Inkscape" alt="Inkscape icon" /></li>
-		</ul>
-	</div><!-- /.four-col -->
-</div><!-- /.row -->
-
-	<div class="row equal-height">
-		<div class="eight-col box">
-			<div class="four-col">
-				<h3>Watch videos</h3>
-				<p class="four-col">Watch all your favourite content online from YouTube, BBC iPlayer and MSN Player. Or download and watch movies with VLC, available in the Ubuntu Software Centre.</p>
-			</div>
-			<img class="four-col last-col pull-bottom-right" src="{{ STATIC_URL }}img/desktop/features/screenshot-photos-watch.png" width="288" height="253" alt="YouTube" />
-		</div><!-- /.eight-col -->
-		<div class="four-col box last-col">
-			<h3>Edit your movies</h3>
-			<p>Edit your movies with PiTiVi and then watch them in Movie Player &mdash; or add VLC and OpenShot from the Ubuntu Software Centre, for compatibility with even more file formats.</p>
-			<ul class="no-bullets inline-icons no-margin-bottom">
-				<li><img src="{{ STATIC_URL }}img/icons/icon-pitivi-48.png" width="48" height="48" title="PiTiVi" alt="PiTiVi icon" /></li>
-				<li><img src="{{ STATIC_URL }}img/icons/icon-movieplayer-48.png" width="48" height="48" title="Movie Player" alt="Movie Player icon" /></li>
-				<li class="last-item"><img src="{{ STATIC_URL }}img/icons/icon-blender-48.png" width="48" height="48" title="Blender" alt="Blender icon" /></li>
-			</ul>
-		</div><!-- /.four-col -->
-	</div><!-- /.row -->
-
-	<div class="row">
-		<div class="twelve-col compatible-device">
-			<div class="six-col text-center">
-				<img src="{{ STATIC_URL }}img/ubuntu/features/photos-device-compatible-904x301.gif" alt="" />
-			</div>
-			<div class="six-col last-col">
-				<h3>Device-compatible</h3>
-				<p>Wouldn&rsquo;t it be great if your computer recognised your camera or phone straight away? <br />With Ubuntu, you don&rsquo;t need to worry about installation CDs or downloading extra drivers. It integrates brilliantly with a wide range of devices.</p>
-			</div>
-		</div>
-	</div><!-- /.row -->
-
-	<div class="row no-border">
-	<div class="box-padded-feature twelve-col">
-		<h3>Also available in the Ubuntu Software Centre:</h3>
-		<div class="equal-height">
-			<ul class="vertical-divider">
-				<li class="four-col">
-					<div class="one-col">
-						<img src="{{ STATIC_URL }}img/icons/icon-gimp-48.png" width="48" height="48" alt="GIMP icon" />
-					</div>
-					<div class="three-col last-col">
-						<h4>GIMP</h4>
-						<p>GIMP is an advanced picture editor that offers a large collection of professional-level tools and filters.</p>
-					</div>
-				</li>
-				<li class="four-col">
-					<div class="one-col">
-						<img src="{{ STATIC_URL }}img/icons/icon-inkscape-48.png" width="48" height="48" alt="Inkscape icon" />
-					</div>
-					<div class="three-col last-col">
-						<h4>Inkscape</h4>
-						<p>Inkscape allows you to create and edit scalable vector graphics (SVG).</p>
-					</div>
-				</li>
-				<li class="four-col last-col">
-					<div class="one-col">
-						<img src="{{ STATIC_URL }}img/icons/icon-cheese-48.png" width="48" height="48" alt="Cheese icon" />
-					</div>
-					<div class="three-col last-col">
-						<h4>Cheese</h4>
-						<p>Cheese is a webcam application that supports image and video capture.</p>
-					</div>
-				</li>
-			</ul>
-		</div>
-	</div>
-</div><!-- /.row -->
-{% include "desktop/features/nav/_explore_ubuntu.html" %}
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/desktop/features/social-and-email.html b/templates/desktop/features/social-and-email.html
deleted file mode 100755
index d2aae5b09e9..00000000000
--- a/templates/desktop/features/social-and-email.html
+++ /dev/null
@@ -1,93 +0,0 @@
-{% extends "desktop/base_desktop.html" %}
-
-{% block title %}Social and email | Features{% endblock %}
-
-{% block body_classes %}audience-consumer{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Desktop" subsection_title="Features" page_title="Social and email"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-{% include "desktop/features/_features_header.html" with page_title="Social and email" %}
-
-<div class="row intro">
-	<div class="four-col">
-		<p>Ubuntu is packed with apps for quick and easy communication. Empathy helps you integrate your chat accounts. And with Thunderbird, you can access your emails, address book and calendar.</p>
-		<ul class="no-bullets inline inline-icons">
-			<li>
-				<img src="{{ STATIC_URL }}img/desktop/features/social-and-email/icon-thunderbird-reflex-44x88.png" width="47" height="88" title="Thunderbird" alt="Thunderbird icon" />
-			</li>
-			<li>
-				<img src="{{ STATIC_URL }}img/icons/icon-empathy-reflex-48x88.png" width="44" height="88" title="Empathy" alt="Empathy icon" />
-			</li>
-		</ul>
-		{% include "_includes/_share_this.html" %}
-	</div>
-	<div class="eight-col last-col no-margin pull-right">
-		<img class="touch-border" src="{{ STATIC_URL }}img/desktop/features/social-and-email/image-socialandemail.jpg" width="636" height="327" alt="Evolution on Ubuntu" />
-	</div>
-</div><!-- /.row .intro -->
-
-<div class="row equal-height">
-	<div class="four-col box">
-		<h3>Dash message lens</h3>
-		<p>Keep up to date with your friends and colleagues quickly and easily. With the Dash message lens, you can see all your microblogging feeds in one place. So you’ll be able to follow the latest news and gossip like never before.</p>
-		<ul class="no-bullets inline-icons no-margin-bottom">
-			<li>
-				<img src="{{ STATIC_URL }}img/icons/icon-twitter-32.png" width="32" height="32" alt="Twitter icon" title="Twitter" />
-			</li>
-			<li>
-				<img src="{{ STATIC_URL }}img/icons/icon-flickr-32.png" width="87" height="32" alt="Flickr icon" title="Flickr" />
-			</li>
-			<li>
-				<img src="{{ STATIC_URL }}img/icons/icon-digg-32.png" width="43" height="32" alt="Digg icon" title="Digg" />
-			</li>
-		</ul>
-	</div><!-- /.four-col -->
-	<div class="eight-col last-col box">
-		<h3>Skype</h3>
-		<p class="three-col no-margin-bottom">Stay in touch with your friends, family and colleagues wherever you are. Ubuntu works brilliantly with Skype so you can have face-to-face chats with your contacts, any time, anywhere and, of course, completely free!</p>
-		<img class="four-col last-col pull-bottom-right" src="{{ STATIC_URL }}img/desktop/features/social-and-email/image-skype.jpg" width="363" height="308" alt="Skype video call on Ubuntu" />
-	</div><!-- /.eight-col -->
-</div><!-- /.row -->
-
-<div class="row no-border">
-	<div class="box-padded-feature twelve-col">
-		<h3>Also available in the Ubuntu Software Centre:</h3>
-		<div>
-			<ul class="inline vertical-divider">
-				<li class="four-col">
-					<div class="one-col">
-						<img src="{{ STATIC_URL }}img/icons/icon-evolution-48.png" width="48" height="48" alt="Evolution Mail icon" />
-					</div>
-					<div class="three-col last-col">
-						<h4>Evolution Mail</h4>
-						<p>Manage your email, contacts and calendar with Evolution Mail.</p>
-					</div>
-				</li>
-				<li class="four-col">
-					<div class="one-col">
-						<img src="{{ STATIC_URL }}img/icons/icon-ekiga-48.png" width="48" height="48" alt="Ekiga icon" />
-					</div>
-					<div class="three-col last-col">
-						<h4>Ekiga</h4>
-						<p>Ekiga is an intuitive videoconferencing and VoIP application.</p>
-					</div>
-				</li>
-				<li class="four-col last-col">
-					<div class="one-col">
-						<img src="{{ STATIC_URL }}img/icons/icon-pidgin-48.png" width="48" height="48" alt="Pidgin icon" />
-					</div>
-					<div class="three-col last-col">
-						<h4>Pidgin</h4>
-						<p>Pidgin is an easy-to-use and free chat client used by millions.</p>
-					</div>
-				</li>
-
-			</ul>
-		</div>
-	</div>
-</div><!-- /.row -->
-{% include "desktop/features/nav/_explore_ubuntu.html" %}
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/desktop/features/web-browsing.html b/templates/desktop/features/web-browsing.html
deleted file mode 100755
index 44f96375f00..00000000000
--- a/templates/desktop/features/web-browsing.html
+++ /dev/null
@@ -1,78 +0,0 @@
-{% extends "desktop/base_desktop.html" %}
-
-{% block title %}Web browsing | Features{% endblock %}
-
-{% block body_classes %}audience-consumer{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Desktop" subsection_title="Features" page_title="Web browsing"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-{% include "desktop/features/_features_header.html" with page_title="Web browsing" %}
-
-<div class="row intro">
-	<div class="four-col">
-		<p>With the Firefox web browser already installed, Ubuntu has everything you need to surf securely and at speed. And if Firefox isn’t your favourite, you can always select the  Chromium browser from the Ubuntu Software Centre &ndash; and install it in just a few clicks.</p>
-		<ul class="no-bullets inline inline-icons no-margin-bottom">
-			<li><img src="{{ STATIC_URL }}img/third-party-logos/icon-firefox.jpg" width="48" height="100" title="Firefox" alt="Firefox icon" /></li>
-			<li><img src="{{ STATIC_URL }}img/third-party-logos/logo-chrome-reflex-48x88.png" width="48" height="100" title="Chrome" alt="Chrome icon" /></li>
-			<li><img src="{{ STATIC_URL }}img/third-party-logos/logo-baidu-reflex-48x88.png" width="45" height="100" title="Baidu" alt="Baidu icon" /></li>
-		</ul>
-		{% include "_includes/_share_this.html" %}
-	</div><!-- /.four-col -->
-	<div class="eight-col last-col no-margin pull-right">
-		<img class="touch-border" src="{{ STATIC_URL }}img/desktop/features/web-browsing/image-webbrowsing.jpg" width="630" height="360" alt="Firefox on Ubuntu" />
-	</div>
-</div><!-- /.row -->
-
-<div class="row equal-height">
-	<div class="four-col box">
-		<h3>Speedy surfing</h3>
-		<p>Bored of waiting to get online? Leave the days of slow surfing behind you. Renowned for their speed and security, Ubuntu and Firefox make browsing the web a pleasure again.</p>
-	</div><!-- /.four-col -->
-	<div class="eight-col last-col box">
-		<h3>Built-in security</h3>
-		<p class="four-col">With automatic security updates, anti-phishing technology and defence against viruses and malware, Ubuntu and Firefox help you keep your private information private.</p>
-		<img class="four-col last-col pull-bottom-right" src="{{ STATIC_URL }}img/desktop/features/screenshot-web-secure.png" width="288" height="218" alt="Lloyds TSB in Firebox on Ubuntu" />
-	</div><!-- /.eight-col -->
-</div><!-- /.row -->
-
-<div class="row no-border">
-	<div class="box-padded-feature twelve-col">
-		<h3>Also available in the Ubuntu Software Centre:</h3>
-		<div>
-			<ul class="vertical-divider">
-				<li class="four-col">
-					<div class="one-col">
-						<img src="{{ STATIC_URL }}img/icons/icon-flash-48.png" width="48" height="48" alt="Adobe Flash icon" />
-					</div>
-					<div class="three-col last-col">
-						<h4>Adobe Flash Player</h4>
-						<p>Adobe Flash is a multimedia platform used to add animation, video, and interactivity to web pages.</p>
-					</div>
-				</li>
-				<li class="four-col">
-					<div class="one-col">
-						<img src="{{ STATIC_URL }}img/icons/icon-chromium-48.png" width="48" height="48" alt="Chromium icon" />
-					</div>
-					<div class="three-col last-col">
-						<h4>Chromium</h4>
-						<p>Fast, free and entirely open source &dash; just like Firefox &dash; Chromium is available to install in the Ubuntu Software Centre. </p>
-				    </div>
-				</li>
-				<li class="four-col last-col">
-					<div class="one-col">
-						<img src="{{ STATIC_URL }}img/icons/icon-liferea-48.png" width="48" height="48" alt="Liferea icon" />
-					</div>
-					<div class="three-col last-col">
-						<h4>Liferea</h4>
-						<p>Liferea is a simple and free aggregator for online news feeds.</p>
-					</div>
-				</li>
-			</ul>
-		</div>
-	</div><!-- /.box -->
-</div><!-- /.row -->
-{% include "desktop/features/nav/_explore_ubuntu.html" %}
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/desktop/government.html b/templates/desktop/government.html
new file mode 100644
index 00000000000..73af251cc0a
--- /dev/null
+++ b/templates/desktop/government.html
@@ -0,0 +1,84 @@
+{% extends "desktop/base_desktop.html" %}
+
+{% block title %}For government{% endblock %}
+{% block extra_body_class %}desktop-government{% endblock %}
+
+{% block second_level_nav_items %}
+    {% include "templates/_nav_breadcrumb.html" with section_title="Desktop" page_title="For government"  %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+
+<div class="row row-hero no-border">
+    <h1>Ubuntu for government</h1>
+    <div class="six-col">
+        <p class="intro">Ubuntu provides central and local government departments with secure, open source, cost-effective, accessible computing on an extensive range of certified hardware.</p>
+        {% include "desktop/shared/_share-this.html" with tweet="Learn how #Ubuntu desktop OS helps governments around the world" %}
+    </div>
+</div>
+
+<div class="row">
+    <h2>Government essentials</h2>
+    <div class="combined-list">
+        <ul class="list-ubuntu six-col">
+            <li>Virus free and <a href="https://www.gov.uk/government/collections/end-user-devices-security-guidance" class="external">highly secure</a></li>
+            <li>Free and <a href="https://www.gov.uk/service-manual/making-software/open-source.html" class="external">open source</a> &mdash; free from licensing restrictions</li>
+            <li class="last-item">Microsoft-compatible office productivity suite</li>
+        </ul>
+        <ul class="list-ubuntu six-col last-col">
+            <li>Open data formats built into many apps</li>
+            <li>Fully translated into 40+ languages</li>
+            <li class="last-item">On-site consulting services and training available</li>
+        </ul>
+    </div>
+</div>
+
+<div class="row row-security no-border">
+    <div class="six-col append-two">
+        <h2>Recognised security</h2>
+        <p>UK National security  government agency (CESG) recently rated Ubuntu as the most secure operating system of the 11&nbsp;they tested. </p>
+        <a href="https://insights.ubuntu.com/2014/01/10/ubuntu-scores-highest-in-uk-gov-security-assessment/" class="external">Learn more about the CESG test</a> 
+    </div>
+</div>
+
+<div class="row row-case-studies">
+    <h2>Used by governments across the globe</h2>
+    <div class="vertical-divider">
+        <div class="four-col">
+            <h3>La Gendarmerie Nationale, France</h3>
+            <blockquote class="pull-quote">
+                <p><span>&ldquo;</span>We realised that Windows would cost us &euro;2 million more than Ubuntu every year.<span>&rdquo;</span></p>
+            </blockquote>
+            <p><a href="https://insights.ubuntu.com/2010/11/10/la-gendarmerie-nationale-upgrades-85000-pcs-to-ubuntu-desktop-edition/" class="external">Learn about switching to Ubuntu</a></p>
+        </div>
+        <div class="four-col">
+            <h3>City of Munich,<br/> Germany</h3>
+            <blockquote class="pull-quote">
+                <p><span>&ldquo;</span>Ubuntu was the platform that could satisfy our requirements best.<span>&rdquo;</span></p>
+            </blockquote>
+            <p><a href="https://insights.ubuntu.com/2014/07/07/ubuntu-and-open-source-help-the-city-of-munich-save-millions/" class="external">Learn about saving with Ubuntu</a></p>
+        </div>
+        <div class="four-col last-col">
+            <h3>Uttar Pradesh Government, India</h3>
+            <p class="headline">Uttar Pradesh boosted IT literacy by putting 1.5 million laptops running Ubuntu in schools.</p>
+            <p><a href="https://insights.ubuntu.com/2013/12/04/ubuntu-helps-millions-of-indian-students-to-learn/" class="external">Learn about Ubuntu in schools</a></p>
+        </div>
+    </div>
+</div>
+
+<div class="row no-border equal-height row-landscape">
+    <div class="five-col">
+        <div>
+            <h2>Government-wide support and management tools</h2>
+            <p>Ubuntu Advantage is the professional support package from the experts at Canonical. Get 24x7 support with access to engineers with first-hand experience of your issues. It also includes Landscape, the Ubuntu systems management tool, for monitoring, managing, patching and compliance reporting on all your Ubuntu desktops.</p>
+            <p><a href="/management">Learn about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
+        </div>
+    </div>
+    <div class="pull-right right">
+        <img src="{{ STATIC_URL }}img/desktop/enterprise/landscape-screenshot.png" class="touch-border landscape-screenshot priority-0" alt="Landscape screenshot" />
+    </div>
+</div>
+
+
+{% endblock content %}
+{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
diff --git a/templates/desktop/index.html b/templates/desktop/index.html
index 14b610d23e2..6afe86bc058 100755
--- a/templates/desktop/index.html
+++ b/templates/desktop/index.html
@@ -7,128 +7,134 @@
 {% block extra_body_class %}desktop-home{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Desktop" page_title="Overview"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Desktop" page_title="Overview"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
+
 <div class="row row-hero no-border">
 	<div class="six-col">
-		<h1>Meet Ubuntu</h1>
-		<p class="intro">Fast, free and incredibly easy to use, the Ubuntu operating system powers millions of desktop PCs, laptops and servers around the world.</p>
-		<p><a href="/download/desktop/" class="link-cta-ubuntu">Get Ubuntu now</a></p>
-		<img src="{{ STATIC_URL }}img/desktop/image-laptop.jpg" alt="Ubuntu laptop" class="for-mobile" />
-		{% include "_includes/_share_this.html" %}
-	</div><!-- / .five-col -->
-</div><!-- / .row -->
-
-<div class="row tabbed-menu-hover equal-height">
-	<a href="/desktop/features"><div class="box four-col for-you">
-		<h3>For you&nbsp;&rsaquo;</h3>
-		<p>Enjoy the simplicity of Ubuntu&rsquo;s stylish, intuitive interface. Fast, secure and with thousands of apps to choose from, Ubuntu gives you a clean and streamlined experience that makes it easy to do whatever you want.</p>
-		<img src="{{ STATIC_URL }}img/desktop/image-foryou.jpg" class="" alt="">
-	</div></a>
-	<a href="/desktop/business"><div class="box four-col for-business">
-		<h3>For business&nbsp;&rsaquo;</h3>
-		<p>Perfect for business use, Ubuntu is secure, intuitive, and lightweight. Maintain access to legacy applications without paying for licenses you don&rsquo;t need. And with remote management, your IT staff can do much more with less.</p>
-		<img src="{{ STATIC_URL }}img/desktop/image-forbusiness.jpg" class="" alt="">
-	</div></a>
-	<a href="/desktop/developers"><div class="box four-col last-col for-developers">
-		<h3>For developers&nbsp;&rsaquo;</h3>
-		<p>Ubuntu 14.04 LTS provides the largest selection of tools, the biggest community and the fastest cloud deployment. This LTS release will be supported for five years and commercial services are available from Canonical.</p>
-		<img src="{{ STATIC_URL }}img/desktop/image-fordevelopers.jpg" class="" alt="">
-	</div></a>
-</div><!-- /.row .tabbed-menu -->
-
-<div class="row row-reach-out">
-	<div class="eight-col no-margin-bottom">
-		<img class="touch-border" src="{{ STATIC_URL }}img/desktop/image-reachoutandtouchit.jpg" alt="" width="600" height="363" />
-	</div>
-	<div class="four-col last-col no-margin-bottom">
-		<h2>Reach out and touch it</h2>
-		<p>Ubuntu 14.04 LTS is the latest release of Ubuntu. Designed to work beautifully on the latest laptops, desktops and touch screen devices, it looks incredible on high resolution screens &mdash; and with touch screen enhancements and interface refinements including individual menu bars in each application window, it’s now even easier to use.</p>
+		<h1>Ubuntu for desktops</h1>
+		<p class="intro">Learn how the Ubuntu desktop operating system powers millions of PCs and laptops around the world.</p>
+		<p>
+			<a href="/download/desktop" class="link-cta-ubuntu">Download Ubuntu</a>
+		</p>
+		<p>
+			<a href="/desktop/features">Take a look&nbsp;&rsaquo;</a>
+		</p>
+		{% include "desktop/shared/_share-this.html" with tweet="#Ubuntu desktop OS - fast, easy to use and incredibly secure" %}
 	</div>
-</div><!-- / .row -->
+</div>
 
-<div class="row row-beautiful">
-	<div class="five-col no-margin-bottom">
-		<h2>Beautiful</h2>
-		<p>To use Ubuntu is to fall in love with it. The desktop environment is intuitive but powerful, so you can work quickly and accomplish all you can imagine. With full support for devices with touchscreens and trackpads as well as traditional keyboards and mice, you&rsquo;ll be captivated by its elegance.</p>
+<div class="row row-complete equal">
+	<div class="four-col align-vertically">
+		<h2>Complete</h2>
+		<p>Ubuntu comes with everything you need to run your organisation, school, home or enterprise.  All the essential applications, like an office suite, browsers, email  and media apps come pre-installed and thousands more games and applications are available in the Ubuntu software centre.</p>
+		<p><a href="/desktop/features">Explore features&nbsp;&rsaquo;</a></p>
 	</div>
-	<div class="seven-col last-col no-margin-bottom">
-		<img class="right touch-border" src="{{ STATIC_URL }}img/desktop/image-beautiful.jpg" alt="" width="514" height="284" />
+	<div class="pull-right right priority-0">
+		<img class="touch-border" src="{{ STATIC_URL }}img/desktop/overview/desktopscreen.png" alt="Desktop screenshot" />
 	</div>
-</div><!-- / .row -->
+</div>
 
-<div class="row vertical-divider equal-height">
-	<div class="four-col">
-		<h2>Secure</h2>
-		<p>With the Firefox web browser, you can surf safely and with the  confidence that your files and data will stay protected &mdash; thanks to the built-in firewall and virus protection. And if a potential vulnerability appears, we provide automatic updates which you can install in a single click.
-</p>
+<div class="row">
+	<div class="twelve-col vertical-divider">
+		<div class="four-col">
+			<h2>Open source</h2>
+			<p>Ubuntu has always been free to download, use and share.  We believe in the power of open source software; Ubuntu could not exist without its worldwide community of voluntary developers.</p>
+		</div>
+
+		<div class="four-col">
+			<h2>Secure</h2>
+			<p>With a built-in firewall and virus protection software, Ubuntu is one of the most secure operating systems around.  And the Long Term Support releases give you five years of security patches and updates.</p>
+		</div>
+
+		<div class="four-col last-col">
+			<h2>Accessible</h2>
+			<p>Computing is for everyone regardless of nationality, gender or disability. Ubuntu is fully translated into over 40 languages and includes essential assistive technologies.</p>
+		</div>
 	</div>
+</div>
 
-	<div class="four-col">
-		<h2>Fast</h2>
-		<p>Ubuntu loads quickly on any computer, but it&rsquo;s super-fast on newer machines. With no unnecessary programs or trial software to slow things down, you can boot up and open a browser <br />in seconds.</p>
+<div class="row row-grey row-industry">
+	<h2>Ubuntu in industry</h2>
+	<div>
+		<a href="/desktop/enterprise" class="three-col box">
+			<h3>Ubuntu for enterprise&nbsp;&rsaquo;</h3>
+			<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-businessasusual-midaubergine.svg" alt="Business pictogram" />
+		</a>
+	</div>
+	<div class="three-col box">
+		<a href="/desktop/education">
+			<h3>Ubuntu for education&nbsp;&rsaquo;</h3>
+			<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-education-orange.svg" alt="Education pictogram" />
+		</a>
+	</div>
+	<div class="three-col box">
+		<a href="/desktop/government">
+			<h3>Ubuntu for government&nbsp;&rsaquo;</h3>
+			<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-business-warmgrey.svg" alt="Suit pictogram" />
+		</a>
 	</div>
 
+	<div class="three-col box last-col">
+		<a href="/desktop/developers">
+			<h3>Ubuntu for developers&nbsp;&rsaquo;</h3>
+			<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-developer-midaubergine.svg" alt="Developer pictogram" />
+		</a>
+	</div>
+</div>
+<div class="row no-padding-bottom row-latest-hardware">
+	<div class="eight-col no-margin-bottom">
+        <img class="left" src="{{ STATIC_URL }}img/desktop/overview/whatsnew-screen.png" alt="Whatsnew screenshot">
+	</div>
 	<div class="four-col last-col">
-		<h2>Compatible</h2>
-		<p>Ubuntu works brilliantly with a range of devices. Simply plug in your MP3 player, camera or printer and you&rsquo;ll be up and running straightaway. No installation CDs. No fuss. And Ubuntu is compatible with Windows files too, so you can open, edit and share Microsoft Office documents stress-free.</p>
+		<h2>Looks great on the latest hardware</h2>
+		<p>Ubuntu is designed to work beautifully on the latest laptops, desktops and touch screen devices, it looks incredible on high resolution screens &mdash; and with touch screen enhancements and interface refinements including individual menu bars in each application window, it&rsquo;s now even easier to use.</p>
 	</div>
-</div><!-- / .row -->
+</div>
 
-<div class="row accessible">
+<div class="row">
+	<h2>Available on a huge range of hardware</h2>
 	<div class="six-col">
-		<h2>Accessible</h2>
-		<p>We believe that computing is for everyone regardless of nationality, gender or disability. Fully translated into over 40 languages, Ubuntu also includes essential assistive technologies, which are, of course, completely free.</p>
+		<p>Canonical works with the world&rsquo;s leading computer manufacturers to certify that Ubuntu works on a huge range of devices. It means that Ubuntu is now available at thousands of retailers across China, India, South East Asia and Latin America.</p>
+		<p>And Ubuntu isn&rsquo;t just for the desktop, it is used in data centres around the world powering every kind of server imaginable and is by far, the most popular operating system in the cloud.</p>
+		<p><a href="http://partners.ubuntu.com/programmes/retail" class="external">Find out where you can buy an Ubuntu PC</a></p>
 	</div>
-	<div class="six-col last-col pull-right">
-		<img src="{{ STATIC_URL }}img/desktop/desktop-accessible.jpg" alt="" width="507" height="310" class="for-tablet" />
+	<div class="six-col last-col">
+		<img class="touch-border" src="{{ STATIC_URL }}img/desktop/overview/laptop.png" alt="Photo of laptop running Ubuntu" />
 	</div>
-</div><!-- / .row -->
+</div>
 
-<div class="row row-grey loaded">
-	<div class="four-col prepend-eight last-col">
-		<h2>Complete</h2>
-		<p>Ubuntu comes with a set of pre-installed software, including a complete office productivity suite and more than 3,000 downloadable apps including Steam, the world&rsquo;s most popular gaming platform.</p>
+<div class="row row-tour row-grey no-padding-bottom">
+	<div class="six-col touch-border no-margin-bottom">
+		<img class="left" src="{{ STATIC_URL }}img/desktop/overview/takethetour.png" alt="Ubuntu web tour screenshot" />
+	</div>
+	<div class="prepend-one five-col last-col">
+		<h2>Take the tour</h2>
+		<p>Enjoy the simplicity of Ubuntu&rsquo;s stylish, intuitive interface. Take Ubuntu for a test drive in your browser and download when you&rsquo;re ready.</p>
+		<p><a href="/tour/">Try the online tour&nbsp;&rsaquo;</a></p>
 	</div>
 </div>
 
-<div class="row row-ubuntu-for-china">
-	<div class="six-col text-center">
-		<img src="{{ STATIC_URL }}img/desktop/image-kylin.svg" alt="Ubuntu Kylin" width="300" height="300" />
+<div class="row vertical-divider">
+	<div class="six-col">
+		<h2>Support and management</h2>
+		<p>Ubuntu Advantage is the professional support package from the experts at Canonical. Get 24x7 support with access to engineers with first-hand experience of your issues. It includes Landscape, the Ubuntu systems management tool, for monitoring, managing, patching, and compliance reporting on all your Ubuntu desktops.</p>
+		<p><a href="/management">More about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
 	</div>
 	<div class="six-col last-col">
-		<h2>Ubuntu for China</h2>
-		<p>Ubuntu Kylin is an official flavour of Ubuntu that has been  fully customised for Chinese users. It has a translated and localised user interface and comes with many common Chinese applications installed by default.</p>
-		<p><a href="/desktop/ubuntu-kylin">Find out more about Ubuntu Kylin&nbsp;&rsaquo;</a></p>
-	</div><!-- / .eight-col -->
-</div><!-- / .row -->
-
-<div class="row row-grey row-free vertical-divider">
-	<h2 class="twelve-col">Why is it free?</h2>
-	<div class="open-source six-col">
-		<h3>It&rsquo;s open source</h3>
-		<p class="first">Our global community is made up of thousands of people who want to help build the best open-source operating system in the world. They volunteer their time and skills to make sure that Ubuntu keeps getting better and better.</p>
-	</div><!-- /.six-col -->
-
-	<div class="backed-by-canonical six-col last-col">
-		<h3>Backed by Canonical</h3>
-		<p class="first">Canonical is the number-one Ubuntu services provider. Companies can choose to receive expert training, support or consultancy for a fee that goes towards the continued development of Ubuntu.</p>
-		<p class=""><a href="/about/canonical-and-ubuntu">More about Canonical and Ubuntu&nbsp;&rsaquo;</a></p>
-	</div><!-- /.six-col -->
-</div><!-- /.row -->
-<div class="row take-the-tour">
-	<div class="five-col no-margin-bottom">
-		<h2>Online tour</h2>
-		<p>Enjoy the simplicity of Ubuntu&rsquo;s stylish, intuitive interface. Take Ubuntu for a test drive in your browser and download when you&rsquo;re ready.</p>
-		<p><a href="/desktop/take-the-tour">Try the online tour&nbsp;&rsaquo;</a></p>
+		<h2>Backed by Canonical</h2>
+		<div class="four-col">
+			<p>Canonical is a global software company and the number-one Ubuntu services provider. Companies can choose to receive expert training, support or consultancy for a fee that goes towards the continued development of Ubuntu.</p>
+			<p><a href="http://www.canonical.com" class="external">Learn more about Canonical</a></p>
+		</div>
+		<div class="two-col last-col priority-0">
+			<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-canonical.svg" alt="Canonical pictogram" />
+		</div>
 	</div>
-	<div class="seven-col last-col no-margin-bottom">
-		<img class="right touch-border" src="{{ STATIC_URL }}img/desktop/image-onlinetour.jpg" width="507" height="244" alt="" />
-	</div>
-</div><!-- / .row -->
+</div>
 
-{% include "_includes/_community.html" %}
+{% include "shared/_community.html" %}
 
-{% endblock content %}
\ No newline at end of file
+{% endblock content %}
diff --git a/templates/desktop/management.html b/templates/desktop/management.html
deleted file mode 100755
index cf628b941a9..00000000000
--- a/templates/desktop/management.html
+++ /dev/null
@@ -1,152 +0,0 @@
-{% extends "desktop/base_desktop.html" %}
-
-{% block title %}Desktop management{% endblock %}
-{% block extra_body_class %}desktop-desktop-management{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Desktop" page_title="Desktop management"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero">
-	<h1>Desktop management</h1>
-		<div class="twelve-col">
-			<div class="six-col">
-				<p class="intro">Get peace of mind with Ubuntu Advantage: cost-effective systems management and professional support from Canonical, the Ubuntu experts.</p>
-			</div>
-			<div class="six-col last-col">
-				<img src="{{ STATIC_URL }}img/desktop/management/image-desktopmanagement.svg" alt="" width="389" height="113" />
-			</div>
-		</div><!-- /.twelve-col -->
-		<div class="twelve-col">
-			<div class="six-col no-margin-bottom">
-				<p>The Ubuntu Advantage service offers fast problem resolution and access to the Ubuntu experts whenever you need them. From basic office tasks to complex development work, Ubuntu Advantage from Canonical gives your organisation all the support you need to deploy and manage Ubuntu.</p>
-			</div>
-			<div class="six-col no-margin-bottom last-col">
-				<p>Landscape is the systems management tool available with Ubuntu Advantage. It allows you to manage thousands of Ubuntu machines as easily as one, making the administration of Ubuntu desktops, servers and cloud instances more cost-effective.</p>
-			</div>
-			<p><a href="/management">Find out more about Landscape&nbsp;&rsaquo;</a></p>
-		</div><!-- /.twelve-col -->
-</div><!-- /.row -->
-
-<div class="row equal-height">
-	<h2 class="twelve-col">Ubuntu Advantage</h2>
-	<ul class="no-bullets vertical-divider twelve-col">
-		<li class="three-col">
-			<h3>Choose the right level of cover to meet your needs</h3>
-		</li>
-<!--		<li class="three-col">
-			<h4>Stateless</h4>
-			<p>For lightweight business use that only requires stateless applications like web browser and remote access client (Citrix, VMware View).</p>
-		</li> -->
-		<li class="three-col">
-			<h4>Standard</h4>
-			<p>For general business use such as email, messaging and web browsing.</p>
-		</li>
-		<li class="three-col last-col">
-			<h4>Advanced</h4>
-			<p>For more intensive desktop usage, such as work conducted by developers.</p>
-		</li>
-	</ul>
-
-<table class="audience-enterprise">
-	<thead>
-		<tr>
-			<th colspan="2" scope="col">Desktop features</th>
-			<!-- <th scope="col" style="width: 126px;">Stateless</th> -->
-			<th scope="col" style="width: 126px;">Standard</th>
-			<th scope="col" style="width: 127px;">Advanced</th>
-		</tr>
-	</thead>
-	<tfoot>
-		<tr>
-			<th scope="row" rowspan="1" colspan="2">Price per desktop</th>
-			<!-- <td><abbr title="United States dollar">$</abbr> 20</td>-->
-			<td>$ 105</td>
-			<td>$ 165</td>
-		</tr>
-	</tfoot>
-	<tbody>
-		<tr>
-			<th scope="row" rowspan="2">Landscape systems management</th>
-			<th scope="row">Landscape Hosted Edition</th>
-			<!-- <td><img src="{{ STATIC_URL }}img/patterns/purpletick.gif" alt="Yes"></td> -->
-			<td><img src="{{ STATIC_URL }}img/patterns/purpletick.gif" alt="Yes"></td>
-			<td><img src="{{ STATIC_URL }}img/patterns/purpletick.gif" alt="Yes"></td>
-		</tr>
-		<tr>
-			<th scope="row">Landscape Dedicated Server</th>
-			<!-- <td>Optional</td>-->
-			<td>Optional</td>
-			<td>Optional</td>
-		</tr>
-	</tbody>
-	<tbody>
-		<tr>
-			<th scope="row" rowspan="1">Legal assurance</th>
-			<th scope="row"><a href="/ua-assurance-terms">Ubuntu Assurance programme</a></th>
-			<!-- <td><img src="{{ STATIC_URL }}img/patterns/purpletick.gif" alt="Yes"></td> -->
-			<td><img src="{{ STATIC_URL }}img/patterns/purpletick.gif" alt="Yes"></td>
-			<td><img src="{{ STATIC_URL }}img/patterns/purpletick.gif" alt="Yes"></td>
-		</tr>
-	</tbody>
-	<tbody>
-		<tr>
-			<th scope="row" rowspan="6">Knowledge and support</th>
-			<th scope="row">Knowledge Base</th>
-			<!-- <td><img src="{{ STATIC_URL }}img/patterns/purpletick.gif" alt="Yes"></td>-->
-			<td><img src="{{ STATIC_URL }}img/patterns/purpletick.gif" alt="Yes"></td>
-			<td><img src="{{ STATIC_URL }}img/patterns/purpletick.gif" alt="Yes"></td>
-		</tr>
-		<tr>
-			<th scope="row">Basic installation and applications</th>
-			<!-- <td><img src="{{ STATIC_URL }}img/patterns/purpletick.gif" alt="Yes"></td>-->
-			<td><img src="{{ STATIC_URL }}img/patterns/purpletick.gif" alt="Yes"></td>
-			<td><img src="{{ STATIC_URL }}img/patterns/purpletick.gif" alt="Yes"></td>
-		</tr>
-		<tr>
-			<th scope="row">Installation, applications and systems administration support</th>
-			<!-- <td>
-				<p><img src="{{ STATIC_URL }}img/patterns/purpletick.gif" alt="Yes"></p>
-				<ul class="smaller no-bullets">
-					<li>(*) support limited to stateless applications</li>
-					<li>(**) minimum 500 devices</li>
-					<li>(***) 12.04 LTS only</li>
-				</ul>
-			</td>-->
-			<td><img src="{{ STATIC_URL }}img/patterns/purpletick.gif" alt="Yes"></td>
-			<td><img src="{{ STATIC_URL }}img/patterns/purpletick.gif" alt="Yes"></td>
-		</tr>
-		<tr>
-			<th scope="row">Desktop virtualisation</th>
-			<!-- <td>&nbsp;</td>-->
-			<td>&nbsp;</td>
-			<td><img src="{{ STATIC_URL }}img/patterns/purpletick.gif" alt="Yes"></td>
-		</tr>
-		<tr>
-			<th scope="row">Developer tools</th>
-			<!-- <td>&nbsp;</td>-->
-			<td>&nbsp;</td>
-			<td><img src="{{ STATIC_URL }}img/patterns/purpletick.gif" alt="Yes"></td>
-		</tr>
-		<tr>
-			<th scope="row">Premium Service Engineer</th>
-			<!-- <td>Optional</td>-->
-			<td>Optional</td>
-			<td>Optional</td>
-		</tr>
-	</tbody>
-</table>
-<p><a href="/management/contact-us">Contact us about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
-</div><!-- /.row -->
-
-{% include "_includes/_ubuntu_advantage_whats_inlcuded.html" %}
-
-<div class="row row-community row-image-centered no-border no-margin-bottom">
-{% include "_includes/_ubuntu_advantage_community.html" %}
-</div><!-- /.row -->
-
-{% include "_includes/_live_chat.html" %}
-
-{% endblock content %}
-{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
diff --git a/templates/desktop/shared/_buy.html b/templates/desktop/shared/_buy.html
new file mode 100644
index 00000000000..26545d332b7
--- /dev/null
+++ b/templates/desktop/shared/_buy.html
@@ -0,0 +1,4 @@
+<img src="{{ STATIC_URL }}img/desktop/footer/footer-laptop.png" alt="Laptop" />
+<h3>Buy it pre-installed</h3>
+<p>Ubuntu runs on the world&rsquo;s best hardware, including Dell, HP, Lenovo and an huge range of devices.</p>
+<p><a href="http://partners.ubuntu.com/partner-programmes/retail" class="external">Learn more about Ubuntu in&nbsp;retail</a></p>
diff --git a/templates/desktop/shared/_contextual_footer.html b/templates/desktop/shared/_contextual_footer.html
new file mode 100755
index 00000000000..327316f6e49
--- /dev/null
+++ b/templates/desktop/shared/_contextual_footer.html
@@ -0,0 +1,106 @@
+{% if level_2  %}
+	{% if level_2 == 'features' %}
+	<div class="four-col feature-two">
+		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-download-warmgrey.svg" alt="Download pictogram" />
+		<h3>Get started with Ubuntu today</h3>
+		<p>Download Ubuntu for desktop and start using it today, whether you want to replace your current operating system or run Ubuntu alongside it.</p>
+		<p><a href="/download">Get Ubuntu&nbsp;&rsaquo;</a></p>
+	</div>
+	<div class="four-col feature-three">
+		{% include "desktop/shared/_buy.html" %}
+	</div>
+	<div class="four-col feature-four last-col">
+		{% include "desktop/shared/_further_reading.html" with articles="4" %}
+	</div>
+	{% endif %}
+
+	{% if level_2 == 'enterprise' %}
+	<div class="four-col feature-two">
+		{% include "desktop/shared/_talk.html" %}
+	</div>
+	<div class="four-col feature-three open-source">
+		{% include "desktop/shared/_open_source.html" %}
+	</div>
+	<div class="four-col feature-four last-col">
+		{% include "desktop/shared/_further_reading.html" with articles="3" %}
+	</div>
+	{% endif %}
+
+	{% if level_2 == 'education' %}
+	<div class="four-col feature-two">
+		{% include "desktop/shared/_talk.html" %}
+	</div>
+	<div class="four-col feature-three open-source">
+		{% include "desktop/shared/_open_source.html" %}
+	</div>
+	<div class="four-col feature-four last-col">
+		{% include "desktop/shared/_further_reading.html" with articles="3" %}
+	</div>
+	{% endif %}
+
+	{% if level_2 == 'government' %}
+	<div class="four-col feature-two">
+		{% include "desktop/shared/_talk.html" %}
+	</div>
+	<div class="four-col feature-three open-source">
+		{% include "desktop/shared/_open_source.html" %}
+	</div>
+	<div class="four-col last-col feature-four">
+		{% include "desktop/shared/_further_reading.html" with articles="3" %}
+	</div>
+	{% endif %}
+
+	{% if level_2 == 'developers' %}
+	<div class="four-col feature-two">
+		{% include "desktop/shared/_download.html" %}
+	</div>
+	<div class="four-col feature-three">
+		{% include "desktop/shared/_buy.html" %}
+	</div>
+	<div class="four-col last-col feature-four">
+		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-community-orange.svg" alt="Pictogram pictogram" />
+		<h3>Join our community </h3>
+		<p>Share ideas, write code, and  get advice and help from our large, active community of IT professionals.</p>
+		<ul class="no-bullets two-col">
+			<li><a href="http://askubuntu.com/" class="external">Ask Ubuntu</a></li>
+			<li><a href="http://community.ubuntu.com/contribute/support/mailinglists/" class="external">
+			Mailing lists</a></li>
+		</ul>
+		<ul class="no-bullets two-col last-col">
+			<li><a href="" class="external">Ubuntu blog</a></li>
+			<li><a href="http://ubuntuforums.org/" class="external">Ubuntu Forums</a></li>
+		</ul>
+	</div>
+	{% endif %}
+
+	{% if level_2 == 'ubuntu-kylin' %}
+	<div class="four-col feature-two">
+		<h3>Download</h3>
+		<p>To download and install Ubuntu, all you need is a blank DVD or USB stick.</p>
+		<p><a href="http://www.ubuntu.com/download/desktop">Download now&nbsp;&rsaquo;</a></p>
+	</div>
+	<div class="four-col feature-three">
+		<h3>Find out more</h3>
+		<p>For more information, help and downloads visit the official site.</p>
+		<p><a href="http://www.ubuntukylin.com">Visit UbuntuKylin.com&nbsp;&rsaquo;</a></p>
+	</div>
+	<div class="four-col last-col feature-four">
+		{% include "desktop/shared/_further_reading.html" with articles="3" %}
+	</div>
+	{% endif %}
+{% else %}
+<!-- Overview -->
+	<div class="four-col feature-two">
+		{% include "desktop/shared/_download.html" %}
+	</div>
+	<div class="four-col feature-three">
+		{% include "desktop/shared/_buy.html" %}
+	</div>
+	<div class="four-col last-col feature-four">
+		<img src="{{ STATIC_URL }}img/desktop/footer/footer-china.png" alt="Kylin" />
+		<h3>Specially for China</h3>
+		<p>Ubuntu Kylin was created for China. Includes all features, plus essential Chinese applications. Designed to put Chinese users first.</p>
+		<p><a href="/desktop/ubuntu-kylin">Read more about Ubuntu Kylin&nbsp;&rsaquo;</a></p>
+	</div>
+
+{% endif %}
diff --git a/templates/desktop/shared/_download.html b/templates/desktop/shared/_download.html
new file mode 100644
index 00000000000..393a80f15b3
--- /dev/null
+++ b/templates/desktop/shared/_download.html
@@ -0,0 +1,4 @@
+<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-download-warmgrey.svg" alt="Download pictogram" />
+<h3>Download and install</h3>
+<p>Download Ubuntu desktop and replace your current operating system.  It&rsquo;s easy to install on Windows or Mac OS, or, run Ubuntu alongside it.</p>
+<p><a href="/download/desktop">Download now&nbsp;&rsaquo;</a></p>
diff --git a/templates/desktop/shared/_further_reading.html b/templates/desktop/shared/_further_reading.html
new file mode 100644
index 00000000000..c9c9c25f16d
--- /dev/null
+++ b/templates/desktop/shared/_further_reading.html
@@ -0,0 +1,35 @@
+{% block head_extra %}
+<script src="https://www.google.com/jsapi"></script>
+<script>google.load("feeds", "1")</script>
+{% endblock %}
+	<div id="insights-footer-feed">
+		<h3>{% if title %}{{ title }}{% else %}Further reading{% endif %}</h3>
+	</div>
+	<script>
+		var feedcontainer=document.getElementById("insights-footer-feed");
+		var feedurl=document.location.protocol+"//insights.ubuntu.com/topic/desktop/feed/";
+		var feedlimit={% if articles %}{{ articles }}{% else %}3{% endif %};
+		var rssoutput="<ul class='no-bullets smaller'>";
+			function rssfeedsetup(){
+				var feedpointer=new google.feeds.Feed(feedurl); //Google Feed API method
+						feedpointer.setNumEntries(feedlimit); //Google Feed API method
+						feedpointer.load(displayfeed2); //Google Feed API method
+			}
+
+			function displayfeed2(result){
+				if (!result.error){
+					var thefeeds2=result.feed.entries;
+					for (var i=0; i<thefeeds2.length; i++){
+						rssoutput+="<li><a href='" + thefeeds2[i].link + "' class='external'>" + thefeeds2[i].title + "</a></li>";
+					}
+					rssoutput+="</ul>";
+					feedcontainer.innerHTML=feedcontainer.innerHTML + rssoutput;
+				} else {
+					console.error('RSS feed error');
+				}
+			}
+				
+			window.onload=function(){
+				rssfeedsetup();
+			}
+	</script>
\ No newline at end of file
diff --git a/templates/desktop/shared/_open_source.html b/templates/desktop/shared/_open_source.html
new file mode 100644
index 00000000000..591f38f7e9d
--- /dev/null
+++ b/templates/desktop/shared/_open_source.html
@@ -0,0 +1,6 @@
+<h3>Open source tender?</h3>
+<div>
+	<p>Is your organisation inviting request for tenders with Ubuntu?</p>
+	<p><a href="/desktop/tenders/contact-us">Get in touch&nbsp;&rsaquo;</a></p>
+	<p><a href="http://insights.ubuntu.com/2015/04/17/tendering-with-ubuntu/" class="external">Learn how we can help</a></p>
+</div>
diff --git a/templates/desktop/shared/_share-this.html b/templates/desktop/shared/_share-this.html
new file mode 100644
index 00000000000..7c999853a2b
--- /dev/null
+++ b/templates/desktop/shared/_share-this.html
@@ -0,0 +1,14 @@
+<div class="share-this">
+    <iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.ubuntu.com%2Fubuntu&amp;send=false&amp;layout=button_count&amp;show_faces=false&amp;action=like&amp;colorscheme=light&amp;font&amp;height=20" style="border:none; overflow:hidden; height:21px; padding-right:23px;"></iframe>
+    <a href="http://twitter.com/share" class="twitter-share-button" data-text="{% if tweet %}{{ tweet }}{% endif %}" data-count="horizontal">Tweet</a><script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>
+    <div class="g-plusone" data-size="medium"></div>
+    <script type="text/javascript">
+      window.___gcfg = {lang: 'en-GB'};
+
+      (function() {
+        var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
+        po.src = '//apis.google.com/js/plusone.js';
+        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
+      })();
+    </script>
+</div>
\ No newline at end of file
diff --git a/templates/desktop/shared/_talk.html b/templates/desktop/shared/_talk.html
new file mode 100644
index 00000000000..d8c322078c0
--- /dev/null
+++ b/templates/desktop/shared/_talk.html
@@ -0,0 +1,3 @@
+<h3>Talk to us today</h3>
+<p>Ready to discuss how Ubuntu could benefit your organisation?</p>
+<p><a href="/desktop/contact-us">Get in touch&nbsp;&rsaquo;</a></p>
\ No newline at end of file
diff --git a/templates/desktop/take-the-tour-gallery.html b/templates/desktop/take-the-tour-gallery.html
index 5b795751141..4dd8220da7d 100755
--- a/templates/desktop/take-the-tour-gallery.html
+++ b/templates/desktop/take-the-tour-gallery.html
@@ -4,7 +4,7 @@
 {% block body_classes %}audience-consumer{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Desktop" page_title="Take the tour"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Desktop" page_title="Take the tour"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
@@ -13,50 +13,50 @@
 		<div class="seven-col">
 	 		<h1>Ubuntu online tour</h1>
 	 		<p>This is the static version of the Ubuntu tour. To get the full version of the tour you'll need a modern browser with JavaScript enabled.</p>
-	 		{% include "_includes/_share_this.html" %}
+	 		{% include "shared/_share_this.html" %}
     </div><!-- /.four-col -->
   </div><!-- /.twelve-col -->
 
 	<ul class="no-bullets twelve-col">
 		<li class="six-col">
-			<p><a rel="lightbox" href="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-browsefiles.jpg"><img src="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-browsefilessmall.jpg" alt="Browse files" width="442" height="276" /></a></p>
 			<h2>Browse files</h2>
 			<p>It&rsquo;s quick and easy to access your folders and files from Ubuntu&rsquo;s home folder.</p>
+			<p><a rel="lightbox" href="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-browsefiles.jpg"><img src="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-browsefilessmall.jpg" alt="Browse files" width="442" height="276" /></a></p>
 		</li>
 		<li class="six-col last-col">
-			<p><a href="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-checkemail.jpg"><img src="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-checkemailsmall.jpg" alt="Check email" width="442" height="276" /></a>
 			<h2>Check email</h2>
 			<p>Read, write and send emails with Thunderbird. It&rsquo;s easy and fast.</p>
+			<p><a href="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-checkemail.jpg"><img src="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-checkemailsmall.jpg" alt="Check email" width="442" height="276" /></a></p>
 		</li>
 		<li class="six-col">
-			<p><a href="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-surftheweb.jpg"><img src="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-surfthewebsmall.jpg" alt="Surf the web" width="442" height="276" /></a></p>
 			<h2>Surf the web</h2>
-			<p>Browsing the web is fast and secure with Ubuntu and Firefox.</p>
+			<p>Browsing the web is fast and secure with Ubuntu and&nbsp;Firefox.&nbsp;&nbsp;&nbsp;</p>
+			<p><a href="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-surftheweb.jpg"><img src="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-surfthewebsmall.jpg" alt="Surf the web" width="442" height="276" /></a></p>
 		</li>
 		<li class="six-col last-col">
-			<p><a href="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-createdocuments.jpg"><img src="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-createdocumentssmall.jpg" alt="Create documents" width="442" height="276" /></a></p>
 			<h2>Create documents</h2>
 			<p>LibreOffice Writer makes it easy to draft professional documents.</p>
+			<p><a href="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-createdocuments.jpg"><img src="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-createdocumentssmall.jpg" alt="Create documents" width="442" height="276" /></a></p>
 		</li>
 		<li class="six-col">
-			<p><a href="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-createpresentations.jpg"><img src="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-createpresentationssmall.jpg" alt="Create presentations" width="442" height="276" /></a></p>
 			<h2>Create presentations</h2>
 			<p>Make a good impression with the intuitive LibreOffice Impress presentation tool.</p>
+			<p><a href="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-createpresentations.jpg"><img src="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-createpresentationssmall.jpg" alt="Create presentations" width="442" height="276" /></a></p>
 		</li>
 		<li class="six-col last-col">
-			<p><a href="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-createspreadsheets.jpg"><img src="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-createspreadsheetssmall.jpg" alt="Create spreadsheets" width="442" height="276" /></a></p>
 			<h2>Create spreadsheets</h2>
 			<p>LibreOffice Calc has everything you need to create clear and accurate spreadsheets.</p>
+			<p><a href="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-createspreadsheets.jpg"><img src="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-createspreadsheetssmall.jpg" alt="Create spreadsheets" width="442" height="276" /></a></p>
 		</li>
 		<li class="six-col">
-			<p><a href="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-findapps.jpg"><img src="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-findappssmall.jpg" alt="Find apps" width="442" height="276" /></a></p>
 			<h2>Find apps</h2>
 			<p>Search and download apps fast from the Ubuntu Software Centre.</p>
+			<p><a href="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-findapps.jpg"><img src="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-findappssmall.jpg" alt="Find apps" width="442" height="276" /></a></p>
 		</li>
 		<li class="six-col last-col">
-			<p><a href="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-viewphotos.jpg"><img src="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-viewphotossmall.jpg" alt="View photos" width="442" height="276" /></a></p>
 			<h2>View photos</h2>
 			<p>You can upload, organise, edit and share your photos with Shotwell.</p>
+			<p><a href="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-viewphotos.jpg"><img src="{{ STATIC_URL }}img/desktop/take-the-tour-gallery/image-viewphotossmall.jpg" alt="View photos" width="442" height="276" /></a></p>
 		</li>
 	</ul>
 </div><!-- /.row -->
diff --git a/templates/desktop/take-the-tour.html b/templates/desktop/take-the-tour.html
index c3ce2079410..209f3414068 100755
--- a/templates/desktop/take-the-tour.html
+++ b/templates/desktop/take-the-tour.html
@@ -4,16 +4,16 @@
 {% block body_classes %}audience-consumer{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Desktop" page_title="Take the tour"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Desktop" page_title="Take the tour"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
 <div class="row row-hero no-border">
 	<div class="five-col">
 	 	<h1>Take the tour</h1>
-		<p>Experience the simplicity of Ubuntu&rsquo;s stylish and intuitive interface with our online interactive tour. Explore how to browse email, surf the web, view photos, create documents and find apps.</p>
-		<p><a class="link-cta-ubuntu" href="/tour/en">Start tour</a></p>
-		{% include "_includes/_share_this.html" %}
+		<p>Experience the simplicity of Ubuntu&rsquo;s stylish and intuitive interface with our online interactive tour of Ubuntu 14.04 LTS. Explore how to browse email, surf the web, view photos, create documents and find apps.</p>
+		<p><a class="link-cta-ubuntu" href="/tour">Start tour</a></p>
+		{% include "shared/_share_this.html" %}
   </div><!-- /.five-col -->
 </div><!-- /.row -->
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/desktop/tenders/contact-us.html b/templates/desktop/tenders/contact-us.html
new file mode 100644
index 00000000000..007785eecc5
--- /dev/null
+++ b/templates/desktop/tenders/contact-us.html
@@ -0,0 +1,153 @@
+{% extends "desktop/base_desktop.html" %}
+
+{% block title %}Contact us{% endblock %}
+{% block meta_description %}Fast, easy and quick to deploy, switching to Ubuntu has never been easier{% endblock %}
+{% block meta_keywords %}Ubuntu, Ubuntu operating system, OS, Linux, Windows alternative, Mac alternative, thin client, Business desktop{% endblock %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Desktop" subsection_title="Tenders" page_title="Contact us" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row row-hero no-border">
+	<h1>Contact us about your tender</h1>
+	<div class="eight-col">
+
+	<p>If you are a public or private entity looking to integrate a high performance OS like Ubuntu, with no virus and lower total cost of operations you should contact Canonical experts. We have worked with a number of entities across the globe and can share best practice, case studies and answer any technical and commercial questions you may have.</p>
+
+	<p>We can help accelerate your project deployment and contribute so that it is executed in the smoothest manner possible. Fill in your details and a member of our team will be in touch.</p>
+
+	<p>All fields are required.</p>
+
+
+<script type="text/javascript"> function mktoGetForm() {return document.getElementById('mktForm_1965'); }</script>
+<form class="lpeRegForm formNotEmpty" method="post" enctype="application/x-www-form-urlencoded" action="https://pages.canonical.com/index.php/leadCapture/save" id="mktForm_1965" name="mktForm_1965">
+	<fieldset class="fieldset-1">
+		<h3>Contact information</h3>
+		<script type="text/javascript">
+			function fieldValidate(field) {
+			  /* call Mkto.setError(field, message) and return false to mark a field value invalid */
+			  /* return 'skip' to bypass the built-in validations */
+			  return true;
+			}
+			function getRequiredFieldMessage(domElement, label) {
+			  return "This field is required";
+			}
+			function getTelephoneInvalidMessage(domElement, label) {
+			  return "Please enter a valid telephone number";
+			}
+			function getEmailInvalidMessage(domElement, label) {
+			  return "Please enter a valid email address";
+			}
+		</script>
+
+
+	<ul class='mktLblLeft'>
+		<li class='mktFormReq mktField' >
+		  <label for="FirstName">First name</label>
+		  <span class='mktInput'>
+		    <input class='mktFormText mktFormString mktFReq' name="FirstName" id="FirstName" type='text' value=""  maxlength='255' tabIndex='1' />
+		    <span class='mktFormMsg'></span>
+		  </span>
+		</li>
+
+		<li class='mktFormReq mktField'>
+		  <label for="LastName">Last name</label>
+		  <span class='mktInput'>
+		    <input class='mktFormText mktFormString mktFReq' name="LastName" id="LastName" type='text' value=""  maxlength='255' tabIndex='2' /><span class='mktFormMsg'></span>
+		  </span>
+		</li>
+
+		<li class='mktFormReq mktField' >
+		  <label for="Company">Company</label>
+		  <span class='mktInput'>
+		    <input class='mktFormText mktFormString mktFReq' name="Company" id="Company" type='text' value=""  maxlength='255' tabIndex='5' />
+		    <span class='mktFormMsg'></span>
+      </span>
+		</li>
+
+    <li class='mktFormReq mktField'>
+      <label for="Title">Job title</label>
+      <span class='mktInput'>
+        <input class='mktFormText mktFormString mktFReq' name="Title" id="Title" type='text' value=""  maxlength='255' tabIndex='5' /
+        ><span class='mktFormMsg'></span>
+      </span>
+    </li>
+ 
+    <li class='mktFormReq mktField'>
+      <label for="Email">Email address</label>
+      <span class='mktInput'>
+        <input class='mktFormText mktFormEmail mktFReq' name="Email" id="Email" type='text' value=""  maxlength='255' tabIndex='3' />
+        <span class='mktFormMsg'></span>
+      </span>
+    </li>
+
+		<li class='mktFormReq mktField'>
+		  <label for="Phone">Phone number</label>
+		  <span class='mktInput'>
+		    <input class='mktFormText mktFormPhone mktFReq' name="Phone" id="Phone" type='text' value=""  maxlength='255' tabIndex='4' />
+		    <span class='mktFormMsg'></span>
+		  </span>
+		</li>
+
+		<li class='mktFormReq mktField' >
+		  <label for="Comments_from_Contact__c">Additional questions and comments</label>
+		  <span class='mktInput'>
+		    <textarea class='mktFormTextarea mktFormTextarea mktFReq' name="Comments_from_Contact__c" id="Comments_from_Contact__c" cols='20' rows='4'  tabIndex='13'></textarea>
+		    <span class='mktFormMsg'></span>
+		  </span>
+		</li>
+
+		<li class='mktField mktLblRight'><span class='mktInput mktLblRight'><input class='mktFormCheckbox' name="NewsletterOpt-In" id="NewsletterOpt-In" type='checkbox' value="1"   tabIndex='14' /><label>I would like to receive occasional news from Canonical by email. </label>&nbsp;<span class='mktFormMsg'></span></span></li>
+		<li>
+		  <p>All information provided will be handled in accordance with the <a href="http://www.ubuntu.com/legal">Canonical privacy policy</a>.</p>
+		</li>
+		<li id='mktFrmButtons'>
+		  <input id='mktFrmSubmit' type='submit' value='Submit' name='submitButton' onclick='formSubmit(document.getElementById("mktForm_1965")); return false;' />&nbsp;<input style='display: none;' id='mktFrmReset' type='reset' value='Clear' name='resetButton' onclick='formReset(document.getElementById("mktForm_1965")); return false;' />
+		</li>
+	</ul>
+  <span style="display:none;"><input type="text" name="_marketo_comments" value="" /></span>
+  <input type="hidden" name="lpId" value="1409" />
+  <input type="hidden" name="subId" value="30" />
+  <input type="hidden" name="munchkinId" value="066-EOV-335" />
+  <input type="hidden" name="kw" value="" />
+  <input type="hidden" name="cr" value="" />
+  <input type="hidden" name="searchstr" value="" />
+  <input type="hidden" name="lpurl" value="https://pages.canonical.com/desktop_tenders_contact-us.html?cr={creative}&kw={keyword}" />
+  <input type="hidden" name="formid" value="1965" />
+  <input type="hidden" name="returnURL" value="http://www.ubuntu.com/desktop/tenders/thank-you" />
+  <input type="hidden" name="retURL" value="http://www.ubuntu.com/desktop/tenders/thank-you" />
+  <input type="hidden" name="returnLPId" value="-1" />
+  <input type="hidden" name="_mkt_disp" value="return" />
+	<input type="hidden" name="_mkt_trk" value="%MC0%" />
+  </form>
+<script type="text/javascript" src="http://www.ubuntu.com/misc/jquery.js"></script>
+<script type="text/javascript" src="https://pages.canonical.com/js/mktFormSupport.js"></script>
+<script type="text/javascript" src="https://pages.canonical.com/js/public/stateCountry.js"></script>
+<script type="text/javascript">
+// Prevent Marketo prefill from turning these dropdowns into free text fields if value is not ISO standard
+if ((typeof mktoPreFillFields != 'undefined') &&
+    (mktoPreFillFields) &&
+    mktoPreFillFields['State'] &&
+    mktoPreFillFields['Country']) {
+    if (mktoPreFillFields.Country.length != 2) {
+        mktoPreFillFields.Country = "";
+        mktoPreFillFields.State = "";
+    }
+}
+</script>
+<script type="text/javascript">
+	function formSubmit(elt) {
+		return Mkto.formSubmit(elt);
+	}
+	function formReset(elt) {
+		return Mkto.formReset(elt);
+	}
+	$(document).ready(function(){var e=$("#tick_ces-in");var t=$("#tick_mwc-in");var n=$("#Question1");$("#tick_ces-in, #tick_mwc-in").change(function(){if(e.is(":checked")&&t.is(":checked")){n.val("CES,MWC")}else if(e.is(":checked")){n.val("CES")}else if(t.is(":checked")){n.val("MWC")}else{n.val("Neither")}})})
+</script>
+
+<!-- / MARKETO GENERATED FORM -->
+	</div><!-- /.seven-col -->
+</div><!-- /.row -->
+{% endblock content %}
+{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/desktop/tenders/thank-you.html b/templates/desktop/tenders/thank-you.html
new file mode 100644
index 00000000000..df484fe5a2b
--- /dev/null
+++ b/templates/desktop/tenders/thank-you.html
@@ -0,0 +1,11 @@
+{% extends "desktop/base_desktop.html" %}
+
+{% block title %}Thank you{% endblock %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Desktop" subsection_title="Tenders" page_title="Thank you" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+{% include "shared/_thank_you.html" with thanks_context="enquiring about tendering with Ubuntu" %}
+{% endblock content %}
\ No newline at end of file
diff --git a/templates/desktop/thank-you.html b/templates/desktop/thank-you.html
index b116d3827d0..29cb5fec0a8 100755
--- a/templates/desktop/thank-you.html
+++ b/templates/desktop/thank-you.html
@@ -3,9 +3,9 @@
 {% block title %}Thank you{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Desktop" page_title="Thank you" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Desktop" page_title="Thank you" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
-{% include "_includes/_thank_you.html" with thanks_context="your interest in Ubuntu" %}
+{% include "shared/_thank_you.html" with thanks_context="your interest in Ubuntu" %}
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/desktop/ubuntu-kylin-zh-CN.html b/templates/desktop/ubuntu-kylin-zh-CN.html
deleted file mode 100755
index 52ce5c238bd..00000000000
--- a/templates/desktop/ubuntu-kylin-zh-CN.html
+++ /dev/null
@@ -1,111 +0,0 @@
-{% extends "desktop/base_desktop.html" %}
-
-{% block title %}Ubuntu 桌面版{% endblock %}
-{% block meta_description %}Ubuntu Kylin是Ubuntu的中文衍生版本。{% endblock %}
-{% block meta_keywords %}Ubuntu, Ubuntu Kylin, OS, China, Chinese, translated, China Software and Integrated Chip Promotions Centre, CSIP, National University of Defense Technology, NUDT, 13.10, download{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Desktop" subsection_title="Ubuntu Kylin" page_title="Ubuntu Kylin Chinese" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero">
-	<a class="lang-switch" href="/desktop/ubuntu-kylin">English version&nbsp;&rsaquo;</a>
-	<div class="six-col no-margin-bottom">
-		<h1 lang="zh">中国人自己的Ubuntu</h1>
-		<p lang="zh">Ubuntu Kylin是专门为中国市场打造的免费桌面操作系统。它包括Ubuntu用户期待的各种功能，并配有必须的中文软件及程序。与竞争对手不同，Ubuntu Kylin的用户界面专门为中国用户设计，并且最新支持触摸屏以及HiDPI高清显示屏，在各种不同硬件上完美运行。 </p>
-		<p lang="zh">作为2013年开始的Ubuntu项目的一部分，最新版的Ubuntu Kylin将提供五年的支持服务, 确保您的电脑在未来几年能安全顺畅地使用。 </p>
-		<p><a lang="zh" href="/download/desktop/zh-CN" class="link-cta-ubuntu">下载Ubuntu Kylin</a></p>
-		{% include "_includes/_share_this.html" %}
-	</div><!-- / .five-col -->
-</div><!-- / .row -->
-
-<div class="row row-sogou">
-	<div class="six-col no-margin-bottom">
-		<h2>搜狗输入法</h2>
-		<p>Ubuntu Kylin为中文输入精心打造，允许字词语句自动补全。更重要的是，通过与具有内置互联网搜索提示功能的搜狗输入法合作，不论是浏览网页或创建新文件，都能使你的Ubuntu Kylin电脑使用起来更方便更快捷。</p>
-	</div>
-	<div class="six-col last-col no-margin-bottom">
-		<img src="{{ STATIC_URL }}img/desktop/ubuntu-kylin/image-sogouinputmethod.jpg" alt="" width="482" height="248" />
-	</div>
-</div><!-- / .row -->
-
-<div class="row row-grey">
-	<div class="six-col no-margin-bottom">
-		<img  class="touch-border pull-left-40" src="{{ STATIC_URL }}img/desktop/ubuntu-kylin/image-youkerassistant.jpg" alt="" width="469" height="308" />
-	</div>
-	<div class="six-col last-col">
-		<h2>优客助手</h2>
-		<p>优客是一个协助Windows用户在最短的时间内以最便捷的方式切换到Ubuntu操作系统的简单有效的工具。这个内建的工具有助于日常的系统管理工作，比如硬件检测和界面个性化处理等。有了优客助手，您就再也不必担心Ubuntu如何使用的问题了。</p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row">
-	<div class="six-col">
-		<h2>智能搜索Smart Scopes</h2>
-		<p>中国用户在Ubuntu Kylin Dash中可以发现专用的本地化智能搜索，它将使在线内容的搜索变得更快捷更有针对性。图片搜索将会给您提供搜狗在线搜索的结果；视频搜索将会把流行的优酷视频带到您的眼前；音乐搜索的结果则来自百度 --- 这一切都将和本机内容的搜索结果同时呈现。智能搜索使内容搜索更聪明。</p>
-	</div>
-	<div class="six-col  no-margin-bottom last-col">
-		<img class="touch-border pull-right-40 right" src="{{ STATIC_URL }}img/desktop/ubuntu-kylin/image-smartscopes.jpg" alt="" width="482" height="302"/>
-	</div>
-</div><!-- / .row -->
-
-<div class="row">
-	<div class="six-col no-margin-bottom">
-		<img  class="touch-border pull-left-40" src="{{ STATIC_URL }}img/desktop/image-chinese-lunar-calendar.png" alt="" width="469" height="260" />
-	</div>
-	<div class="six-col last-col">
-		<h2>中国传统农历</h2>
-		<p>除了公历以外，Ubuntu Kylin也提供传统农历模式，让中国用户能在有效管理他们的日常计划的同时确知国家法定节假日。</p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row row-grey">
-	<div class="six-col">
-		<h2>金山WPS办公软件</h2>
-		<p>Ubuntu Kylin也配有中国最受欢迎的办公套件。我们和金山的密切合作让您能充分利用金山WPS办公软件进行文字、表格和幻灯片的处理。</p>
-	</div>
-	<div class="six-col no-margin-bottom last-col">
-		<img class="touch-border pull-right-40 right" src="{{ STATIC_URL }}img/desktop/image-kingsoft-wps-office.png" alt="" width="488" height="260" />
-	</div>
-</div><!-- / .row -->
-
-<div class="row row-image-centered">
-	<span><img src="{{ STATIC_URL }}img/desktop/ubuntu-kylin/image-lotusinstantmessaging.svg" alt="" width="288" height="211" /></span>
-	<div class="seven-col">
-		<h2>莲花即时通信</h2>
-		<p>莲花即时通信是由国科大全新开发。考虑了企业应用场景。您不仅可以用它和亲朋好友聊天，也可以在办公环境下与同事联络。 </p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row row-grey">
-	<div class="six-col no-margin-bottom">
-		<h2>金山快盘云存储</h2>
-		<p>最新版的Ubuntu Kylin不止是一款中文操作系统它还给您提供100GB的个人云存储空间，让您能通过网络或是任何金山快盘兼容设备读取重要文件和内容。</p>
-	</div>
-	<div class="six-col no-margin-bottom last-col">
-		<img class="touch-border pull-right-40 right" src="{{ STATIC_URL }}img/desktop/ubuntu-kylin/image-kuaipancloudstorage.jpg" alt="" width="487" height="283" />
-	</div>
-</div><!-- / .row -->
-
-<div class="row row-image-centered">
-	<div class="seven-col">
-		<h2>Unity 8预览</h2>
-		<p>Ubuntu Kylin 14.04也提供了下一代Ubuntu用户界面Unity 8的 预览选项。如需下载预览，请在Ubuntu软件中心搜索 unity8-desktop-session-mir。. </p>
-		<p>由于Unity 8使用的是由Ubuntu社区正在开发的新图形平台Mir，它目前只支持开源的图形驱动程序。</p>
-	</div>
-	<span>
-		<img src="{{ STATIC_URL }}img/desktop/features/image-unity8.svg" alt="" width="299" height="213" />
-	</span>
-</div><!-- / .row -->
-
-<div class="row row-ubuntu-kylin-more row-image-centered no-border">
-	<span><img src="{{ STATIC_URL }}img/desktop/ubuntu-kylin/image-kylin.svg" alt="" width="300" height="300" /></span>
-	<div class="seven-col last-col">
-		<h2>了解更多详情</h2>
-		<p>欲知关于Ubuntu Kylin的更多详情，请加入我们的社区或浏览我们的官方网站</p>
-		<p><a href="http://www.ubuntukylin.com">点击进入官网&nbsp;&rsaquo;</a></p>
-	</div>
-</div>
-
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/desktop/ubuntu-kylin.html b/templates/desktop/ubuntu-kylin.html
index 42827fc9ab3..c3134b4f805 100755
--- a/templates/desktop/ubuntu-kylin.html
+++ b/templates/desktop/ubuntu-kylin.html
@@ -5,118 +5,135 @@
 {% block meta_keywords %}Ubuntu, Ubuntu Kylin, OS, China, Chinese, translated, China Software and Integrated Chip Promotions Centre, CSIP, National University of Defence Technology, NUDT, 13.10, download {% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Desktop" page_title="Ubuntu Kylin" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Desktop" page_title="Ubuntu Kylin" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
 <div class="row row-hero">
-	<a class="lang-switch" href="/desktop/ubuntu-kylin-chinese" lang="zh">中国版&nbsp;&rsaquo;</a>
+	<h1>Ubuntu Kylin for&nbsp;China</h1>
 	<div class="six-col no-margin-bottom">
-		<h1>China&rsquo;s own Ubuntu</h1>
-		<p>Ubuntu Kylin is a free PC operating system created for China. It includes all the features you&rsquo;ve come to expect from Ubuntu, alongside essential Chinese software and apps. Unlike its rivals, its interface has been designed specifically to put Chinese users first &mdash; and with new support for touch screens and HiDPI monitors, it runs beautifully on all kinds of hardware.</p>
-		<p>Part of the Ubuntu project since early 2013, the latest version of Ubuntu Kylin promises five years’ worth of support, keeping your computer running safely and smoothly for years to come.</p>
-		<p><a href="/download/CN" class="link-cta-ubuntu">Download Ubuntu Kylin</a></p>
-		<p><img src="{{ STATIC_URL }}img/desktop/ubuntu-kylin/image-ubuntukylin.jpg" alt="" class="for-mobile" /></p>
-		{% include "_includes/_share_this.html" %}
-	</div><!-- / .five-col -->
-</div><!-- / .row -->
+		<p>Ubuntu Kylin is an official flavour of Ubuntu.  It is a free PC operating system created for China and complies with the Chinese Government procurement regulations.  It includes all the features you&rsquo;ve come to expect from Ubuntu, alongside essential Chinese software and apps. The interface has been designed specifically to put Chinese users first &mdash; and with new support for touch screens and HiDPI monitors, it runs beautifully on all kinds of hardware.</p>
+		<p><a href="http://cn.ubuntu.com" class="link-cta-ubuntu">Ubuntu 中国网站现已面世</a></p>
+		<p><a href="/download/ubuntu-kylin">Download Ubuntu Kylin&nbsp;&rsaquo;</a></p>
+		{% include "desktop/shared/_share-this.html" with tweet="#Ubuntu Kylin desktop OS specially created for China" %}
+	</div>
+</div>
 
 <div class="row row-partnership">
-	<ul class="no-bulletes inline-icons clearfix">
-		<li><img src="{{ STATIC_URL }}img/desktop/logo-canonical-288.png" alt="Canonical" width="288" height="40" /></li>
-		<li><img src="{{ STATIC_URL }}img/desktop/logo-csip-180.png" alt="CSIP" width="180" height="71" /></li>
-		<li><img src="{{ STATIC_URL }}img/desktop/logo-nudt-288.png" alt="NUDT" width="288" height="72" /></li>
-	</ul>
-	<h2>A global partnership</h2>
-	<p class="six-col">To create Ubuntu Kylin, Canonical partnered with China Software and Integrated Chip Promotions Centre (CSIP) and the National University of Defence Technology (NUDT) to produce a fully localised and customised version of Ubuntu.</p>
-	<p class="six-col last-col">The team is working together with the open-source community to adapt the core features of Ubuntu to better suit Chinese users. Along with localised versions of the Ubuntu Software Centre, Ubuntu Kylin also features some of the most commonly used Chinese applications.</p>
-</div><!-- / .row -->
+    <h2 class="six-col">A global partnership</h2>
+	<div class="six-col">
+		<p>To create Ubuntu Kylin, Canonical partnered with China Software and Integrated Chip Promotions Centre (CSIP) and the National University of Defense Technology (NUDT) to produce a fully localised and customised version of Ubuntu.</p>
+		<p>The team is working together with the open-source community to adapt the core features of Ubuntu to better suit Chinese users. Along with localised versions of the Ubuntu Software Centre, Ubuntu Kylin also features some of the most commonly used Chinese applications.</p>
+	</div>
+	<div class="six-col text-center last-col">
+    	<ul class="no-bullets clearfix align-center">
+    		<li><img src="{{ STATIC_URL }}img/desktop/logo-canonical-288.png" alt="Canonical" width="288" height="40" /></li>
+    		<li><img src="{{ STATIC_URL }}img/desktop/logo-csip-180.png" alt="CSIP" width="180" height="71" /></li>
+    		<li><img src="{{ STATIC_URL }}img/desktop/logo-nudt-288.png" alt="NUDT" width="288" height="72" /></li>
+    	</ul>
+	</div>
+</div>
+
+<div class="row row-grey">
+	<h2>What&rsquo;s new in 15.04?</h2>
+	<p class="eight-col">Alongside support for the very latest hardware, Ubuntu 15.04 includes new versions of many core apps and developer technologies.</p>
+	<div class="combined-list">
+		<ul class="list-ubuntu six-col">
+			<li>Linux 3.19 kernel</li>
+			<li>Ubuntu Kylin software centre updated to 1.3</li>
+			<li class="last-item">Firefox 37, Thunderbird 31.6, Chromium 41 and LibreOffice 4.4 updates</li>
+		</ul>
+		<ul class="list-ubuntu six-col last-col">
+			<li>Sogou Pinyin 1.2, youker-assistant 2.0.0 updates</li>
+			<li>Moved to systemd</li>
+			<li class="last-item">Locally Integrated Menus (LIM) are enabled by default</li>
+		</ul>
+	</div>
+	<div class="eight-col">
+		<p><a href="https://wiki.ubuntu.com/VividVervet/Beta1/UbuntuKylin#Changes_since_14.10" class="external">Read the full release notes</a></p>
+	</div>
+</div>
+
+<div class="row no-border no-padding-bottom equal-height">
+	<div class="six-col align-vertically append-two">
+		<div>
+			<h2>China&rsquo;s own Ubuntu</h2>
+			<p>Ubuntu Kylin has been fully customised to the needs of Chinese users, with all the key apps and services you need get things done.</p>
+		</div>
+	</div>
+	<div class="four-col last-col">
+		<img src="{{ STATIC_URL }}img/desktop/ubuntu-kylin/image-kylin.svg" alt="" width="300" height="300" />
+	</div>
+</div>
 
 <div class="row row-sogou">
-	<h2>Sogou Input Method</h2>
+	<h3>Sogou Input Method</h3>
 	<div class="six-col">
-		<p>Ubuntu Kylin has been designed specifically for Chinese keyboards, allowing many of your words and sentences to be completed automatically. Importantly, it works with Sogou Input Method, the typing system with internet search built-in &mdash; making your Ubuntu Kylin PC even faster and easier to use, whether you’re creating documents or browsing the web.</p>
+		<p>Ubuntu Kylin has been designed specifically for Chinese keyboards, allowing many of your words and sentences to be completed automatically. It works with Sogou Input Method, the typing system with web search built-in, making your PC even faster and easier to use. The latest version features an expanded vocabulary and a wider range of skins, with thousands now available to choose from.</p>
 	</div>
 	<div class="six-col last-col pull-right">
 		<img src="{{ STATIC_URL }}img/desktop/ubuntu-kylin/image-sogouinputmethod.jpg" alt="" width="482" height="248" class="touch-bottom" />
 	</div>
-</div><!-- / .row -->
+</div>
 
 <div class="row row-grey row-youker">
 	<div class="six-col">
 		<img  class="touch-border pull-left-40" src="{{ STATIC_URL }}img/desktop/ubuntu-kylin/image-youkerassistant.jpg" alt="" width="469" height="308" />
 	</div>
 	<div class="six-col last-col">
-		<h2>Youker Assistant</h2>
+		<h3>Youker Assistant</h3>
 		<p>Youker is a simple yet powerful tool built to help Windows users migrate to Ubuntu as quickly and as smoothly as possible. This integrated tool aids with routine system maintenance tasks such as detecting hardware and handling interface customisation. You don&rsquo;t need to worry about learning the Ubuntu way with Youker as your assistant.</p>
 	</div>
-</div><!-- / .row -->
+</div>
 
 <div class="row">
-	<h2>Smart Scopes</h2>
+	<h3>Smart Scopes</h3>
 	<div class="six-col">
-		<p>Chinese users get special, localised smart scopes in the Ubuntu Kylin Dash, which make searching for online content easy and relevant. A search for images will include online results from Sogou, videos will bring up popular Youku clips, and music results come via Baidu &mdash; all alongside results from your local collections. It&rsquo;s the smarter way to find content.</p>
+		<p>Chinese users get special, localised smart scopes in the Ubuntu Kylin Dash, which make searching for online content easy and relevant. A search for images will include online results from Sogou, videos will bring up popular Youku clips, and music results come via Baidu -- all alongside results from your local collections. It&rsquo;s the smarter way to find content.</p>
 	</div>
 	<div class="six-col  no-margin-bottom last-col">
 		<img class="touch-border pull-right-40 right" src="{{ STATIC_URL }}img/desktop/ubuntu-kylin/image-smartscopes.jpg" alt="" width="482" height="302"/>
 	</div>
-</div><!-- / .row -->
-
-<div class="row">
-	<div class="six-col">
-		<img  class="touch-border pull-left-40" src="{{ STATIC_URL }}img/desktop/image-chinese-lunar-calendar.png" alt="" width="469" height="260" />
-	</div>
-	<div class="six-col last-col">
-		<h2>Chinese lunar calendar</h2>
-		<p>As well as the western Gregorian layout, Ubuntu Kylin&rsquo;s in-built calendar includes the traditional Chinese lunar layout, so Chinese users can keep up with their day-to-day plans while also respecting national holidays.</p>
-	</div>
-</div><!-- / .row -->
+</div>
 
 <div class="row row-grey">
 	<div class="six-col">
-		<h2>Kingsoft WPS Office</h2>
+		<h3>Kingsoft WPS Office</h3>
 		<p>The most popular office suite in China is available on Ubuntu Kylin. We&rsquo;ve worked closely with Kingsoft, so you can make full use of its WPS Office package for word processing, spreadsheets and presentations.</p>
 	</div>
 	<div class="six-col no-margin-bottom last-col">
 		<img class="touch-border pull-right-40 right" src="{{ STATIC_URL }}img/desktop/image-kingsoft-wps-office.png" alt="" width="488" height="260" />
 	</div>
-</div><!-- / .row -->
+</div>
 
-<div class="row row-image-centered">
-	<span><img src="{{ STATIC_URL }}img/desktop/ubuntu-kylin/image-lotusinstantmessaging.svg" alt="" width="288" height="211" /></span>
-	<div class="seven-col">
-		<h2>Lotus instant messaging</h2>
-		<p>Lotus instant messenger was written from the ground up by NUDT.  Not only can you keep up with friends and family, but colleagues as well, as it was designed for the enterprise environment. </p>
+<div class="row">
+	<div class="six-col">
+		<img class="touch-border pull-left-40" src="{{ STATIC_URL }}img/desktop/image-chinese-lunar-calendar.png" alt="" width="469" height="260" />
 	</div>
-</div><!-- / .row -->
+	<div class="six-col last-col">
+		<h3>Chinese lunar calendar</h3>
+		<p>As well as the western Gregorian layout, Ubuntu Kylin&rsquo;s in-built calendar includes the traditional Chinese lunar layout, so Chinese users can keep up with their day-to-day plans while also respecting national holidays.</p>
+	</div>
+</div>
 
 <div class="row row-grey">
 	<div class="six-col">
-		<h2>Kingsoft Kuaipan cloud storage</h2>
-		<p>As well as a great Chinese operating system, the latest version of Ubuntu Kylin gives you 100 GB of personal cloud storage, so you can access all your important files and content over the web or on any Kuaipan-compatible device.</p>
+		<h3>Kingsoft Kuaipan cloud storage</h3>
+		<p>As well as a great Chinese operating system, the latest version of Ubuntu Kylin gives you enough personal cloud storage for up to 2 million photos and 10 millions documents, so you can access all your important files and content over the web or on any Kuaipan-compatible device.</p>
 	</div>
 	<div class="six-col no-margin-bottom last-col no-margin-bottom">
 		<img class="touch-border pull-right-40 right" src="{{ STATIC_URL }}img/desktop/ubuntu-kylin/image-kuaipancloudstorage.jpg" alt="" width="487" height="283" />
 	</div>
-</div><!-- / .row -->
+</div>
 
-<div class="row row-image-centered">
-	<div class="seven-col">
-		<h2>Unity 8 preview</h2>
-		<p>Ubuntu Kylin 14.04 LTS offers an optional preview of Unity 8, the next generation Ubuntu user interface. To download the preview, search for unity8-desktop-session-mir in the Ubuntu Software Centre.</p>
-		<p>Please note that it uses the current version of Mir, the new graphics platform being developed by the Ubuntu community. Mir only works with open-source graphics drivers at present.</p>
+<div class="row row-image-centered no-border">
+	<div class="five-col">
+		<img src="{{ STATIC_URL }}img/desktop/ubuntu-kylin/image-unity8.svg" alt="" width="299" height="213" />
 	</div>
-	<span>
-		<img src="{{ STATIC_URL }}img/desktop/features/image-unity8.svg" alt="" width="299" height="213" />
-	</span>
-</div><!-- / .row -->
-
-<div class="row row-ubuntu-kylin-more row-image-centered no-border">
-	<span><img src="{{ STATIC_URL }}img/desktop/ubuntu-kylin/image-kylin.svg" alt="" width="300" height="300" /></span>
 	<div class="seven-col last-col">
-		<h2>Find out more</h2>
-		<p>If you&rsquo;re keen to learn more about Ubuntu Kylin, join the community or get more  information, visit the official site.</p>
-		<p><a href="http://www.ubuntukylin.com">Visit UbuntuKylin.com&nbsp;&rsaquo;</a></p>
+		<h3>Unity 8 preview</h3>
+		<p>Ubuntu Kylin 14.04 offers an optional preview of Unity 8, the next generation Ubuntu user interface. To download the preview, search for unity8-desktop-session-mir in the Ubuntu Software Centre.</p>
+		<p>Please note that it uses the current version of Mir, the new graphics platform being developed by the Ubuntu community. Mir only works with open-source graphics drivers at present.</p>
 	</div>
 </div>
 
diff --git a/templates/download/_base_download.html b/templates/download/_base_download.html
index 0469b4f8eb0..4fa9e925e38 100755
--- a/templates/download/_base_download.html
+++ b/templates/download/_base_download.html
@@ -1,9 +1,9 @@
-{% extends "_base/base.html" %}
+{% extends "templates/base.html" %}
 {% block second_level_nav_items %}
 {% include "download/_nav_secondary.html" %}
 {% endblock second_level_nav_items %}
 
 {% block outer_content %}
     {% block content %}{% endblock %}
-		{% include "_base/_contextual_footer.html" %}
+		{% include "templates/_contextual_footer.html" %}
 {% endblock %}
diff --git a/templates/download/_nav_tertiary.html b/templates/download/_nav_tertiary.html
index ed4c0c66a3a..f860a2b508d 100755
--- a/templates/download/_nav_tertiary.html
+++ b/templates/download/_nav_tertiary.html
@@ -25,7 +25,7 @@
 		<li class="active"><a href="/download/desktop/install-desktop-latest">Install Ubuntu 13.10</a></li>
 {% endif %}
 {% if level_3 == 'install-desktop-long-term-support' %}
-		<li class="active"><a href="/download/desktop/install-desktop-long-term-support">Install Ubuntu 14.04.1 LTS</a></li>
+		<li class="active"><a href="/download/desktop/install-desktop-long-term-support">Install Ubuntu 14.04.2 LTS</a></li>
 {% endif %}
 {% if level_3 == 'install-ubuntu-desktop' %}
 		<li class="active"><a href="/download/desktop/install-ubuntu-desktop">Installing Ubuntu Desktop</a></li>
@@ -36,8 +36,8 @@
 {% if level_3 == 'install-ubuntu-server' %}
 		<li class="active"><a href="/download/server/install-ubuntu-server">Installing Ubuntu Server</a></li>
 {% endif %}
-{% if level_3 == 'install-ubuntu-cloud' %}
-		<li class="active"><a href="/download/cloud/install-ubuntu-cloud">Installing Ubuntu OpenStack</a></li>
+{% if level_3 == 'install-ubuntu-openstack' %}
+		<li class="active"><a href="/download/cloud/install-ubuntu-openstack">Installing Ubuntu OpenStack</a></li>
 {% endif %}
 {% if level_3 == 'cloud-archive-instructions' %}
 		<li class="active"><a href="/download/cloud/cloud-archive-instructions">Cloud archive instructions</a></li>
diff --git a/templates/download/alternative-downloads.html b/templates/download/alternative-downloads.html
index 9d91e539c96..daff16498ab 100755
--- a/templates/download/alternative-downloads.html
+++ b/templates/download/alternative-downloads.html
@@ -5,7 +5,7 @@
 {% block meta_description %}Want to download via-bitTorrent links, get DVD images with more language packs, use the text-based alternate installer or find previous versions of Ubuntu?{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="Alternative downloads"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="Alternative downloads"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
@@ -23,8 +23,9 @@ <h2>Network installer</h2>
     <div class="eight-col">
         <p>The network installer lets you install Ubuntu over the network. This is useful, for example, if you have an old machine with a non-bootable CD-ROM or a computer that can&rsquo;t run the graphical interface-based installer, either because they don&rsquo;t meet the minimum requirements for the live CD/DVD or because they require extra configuration before  the graphical desktop can be used, or if you want to install Ubuntu on a large number of computers at once.</p>
         <ul>
-            <li><a href="http://cdimage.ubuntu.com/netboot/14.04/">Download the network installer for 14.04 LTS&nbsp;&rsaquo;</a></li>
-            <li><a href="http://cdimage.ubuntu.com/netboot/12.04/">Download network installer for 12.04 LTS&nbsp;&rsaquo;</a></li>
+            <li><a class="external" href="http://cdimage.ubuntu.com/netboot/15.04/">Download the network installer for 15.04</a></li>
+            <li><a class="external" href="http://cdimage.ubuntu.com/netboot/14.04/">Download the network installer for 14.04 LTS</a></li>
+            <li><a class="external" href="http://cdimage.ubuntu.com/netboot/12.04/">Download network installer for 12.04 LTS</a></li>
         </ul>
     </div><!-- /.eight-col -->
 </div><!-- /.row -->
@@ -34,9 +35,27 @@ <h2>Network installer</h2>
         <h2>BitTorrent</h2>
         <p>BitTorrent is a peer-to-peer download network that sometimes enables higher download speeds and more reliable downloads of large files. You will need to install a BitTorrent client on your computer in order to enable this download method.</p>
     </div>
+     <div class="four-col">
+        <h3 class="external"><span>Ubuntu 15.04</span></h3>
+        <ul class="no-bullets list">
+            <li><a href="http://releases.ubuntu.com/15.04/ubuntu-15.04-desktop-amd64.iso.torrent">Ubuntu 15.04 Desktop (64-bit)&nbsp;&rsaquo;</a></li>
+            <li><a href="http://releases.ubuntu.com/15.04/ubuntu-15.04-desktop-i386.iso.torrent">Ubuntu 15.04 Desktop (32-bit)&nbsp;&rsaquo;</a></li>
+            <li><a href="http://releases.ubuntu.com/15.04/ubuntu-15.04-server-amd64.iso.torrent">Ubuntu 15.04 Server (64-bit)&nbsp;&rsaquo;</a></li>
+            <li><a href="http://releases.ubuntu.com/15.04/ubuntu-15.04-server-i386.iso.torrent">Ubuntu 15.04 Server (32-bit)&nbsp;&rsaquo;</a></li>
+        </ul>
+    </div><!-- /.four-col -->
     <div class="four-col">
-        <h3>Ubuntu 12.04.5 LTS torrents</h3>
-        <ul>
+        <h3 class="external"><span>Ubuntu 14.04.2 LTS</span></h3>
+        <ul class="no-bullets list">
+            <li><a href="http://releases.ubuntu.com/14.04.2/ubuntu-14.04.2-desktop-amd64.iso.torrent">Ubuntu 14.04.2 LTS Desktop (64-bit)&nbsp;&rsaquo;</a></li>
+            <li><a href="http://releases.ubuntu.com/14.04.2/ubuntu-14.04.2-desktop-i386.iso.torrent">Ubuntu 14.04.2 LTS Desktop (32-bit)&nbsp;&rsaquo;</a></li>
+            <li><a href="http://releases.ubuntu.com/14.04.2/ubuntu-14.04.2-server-amd64.iso.torrent">Ubuntu 14.04.2 LTS Server (64-bit)&nbsp;&rsaquo;</a></li>
+            <li><a href="http://releases.ubuntu.com/14.04.2/ubuntu-14.04.2-server-i386.iso.torrent">Ubuntu 14.04.2 LTS Server (32-bit)&nbsp;&rsaquo;</a></li>
+        </ul>
+    </div><!-- /.four-col -->
+    <div class="four-col last-col">
+        <h3 class="external"><span>Ubuntu 12.04.5 LTS</span></h3>
+        <ul class="no-bullets list">
             <li><a href="http://releases.ubuntu.com/12.04/ubuntu-12.04.5-alternate-amd64.iso.torrent">Ubuntu 12.04.5 alternate (64-bit)&nbsp;&rsaquo;</a></li>
             <li><a href="http://releases.ubuntu.com/12.04/ubuntu-12.04.5-alternate-i386.iso.torrent">Ubuntu 12.04.5 alternate (32-bit)&nbsp;&rsaquo;</a></li>
             <li><a href="http://releases.ubuntu.com/12.04/ubuntu-12.04.5-desktop-amd64.iso.torrent">Ubuntu 12.04.5 Desktop (64-bit)&nbsp;&rsaquo;</a></li>
@@ -45,15 +64,6 @@ <h3>Ubuntu 12.04.5 LTS torrents</h3>
             <li><a href="http://releases.ubuntu.com/12.04/ubuntu-12.04.5-server-i386.iso.torrent">Ubuntu 12.04.5 Server (32-bit)&nbsp;&rsaquo;</a></li>
         </ul>
     </div><!-- /.four-col -->
-    <div class="four-col last-col">
-        <h3>Ubuntu 14.04.1 LTS torrents</h3>
-        <ul>
-            <li><a href="http://releases.ubuntu.com/14.04.1/ubuntu-14.04.1-desktop-amd64.iso.torrent">Ubuntu 14.04.1 LTS Desktop (64-bit)&nbsp;&rsaquo;</a></li>
-            <li><a href="http://releases.ubuntu.com/14.04.1/ubuntu-14.04.1-desktop-i386.iso.torrent">Ubuntu 14.04.1 LTS Desktop (32-bit)&nbsp;&rsaquo;</a></li>
-            <li><a href="http://releases.ubuntu.com/14.04.1/ubuntu-14.04.1-server-amd64.iso.torrent">Ubuntu 14.04.1 LTS Server (64-bit)&nbsp;&rsaquo;</a></li>
-            <li><a href="http://releases.ubuntu.com/14.04.1/ubuntu-14.04.1-server-i386.iso.torrent">Ubuntu 14.04.1 LTS Server (32-bit)&nbsp;&rsaquo;</a></li>
-        </ul>
-    </div><!-- /.four-col -->
 </div><!-- /.row -->
 
 <div class="row">
@@ -61,19 +71,22 @@ <h3>Ubuntu 14.04.1 LTS torrents</h3>
         <h2>Other images</h2>
         <p>For other versions of the Ubuntu installer please select your nearest mirror; however, we recommend you use  the <a href="/download">standard installer</a> as all other packages are available in the Software Centre.</p>
     </div>
-    <h3>Select the nearest mirror</h3>
-    <ul class="eight-col no-bullets">
-        <li class="four-col"><a href="http://ftp.funet.fi/pub/Linux/INSTALL/Ubuntu/dvd-releases/releases">Finland&nbsp;&rsaquo;</a></li>
-        <li class="four-col last-col"><a href="ftp://ftp.free.fr/mirrors/ftp.ubuntu.com/dvd/current">France&nbsp;&rsaquo;</a></li>
-        <li class="four-col"><a href="http://de.releases.ubuntu.com/">Germany</a></li>
-        <li class="four-col last-col"><a href="http://ftp.ntua.gr/pub/linux/ubuntu-releases-dvd">Greece&nbsp;&rsaquo;</a></li>
-        <li class="four-col"><a href="http://ftp.heanet.ie/pub/ubuntu-cdimage/releases">Ireland&nbsp;&rsaquo;</a></li>
-        <li class="four-col last-col"><a href="http://nl.archive.ubuntu.com/ubuntu-cdimages">Netherlands (1)&nbsp;&rsaquo;</a></li>
-        <li class="four-col"><a href="http://nginyang.uvt.nl">Netherlands (2)&nbsp;&rsaquo;</a></li>
-        <li class="four-col last-col"><a href="http://mirror.yandex.ru/ubuntu-cdimage/releases">Russian Federation&nbsp;&rsaquo;</a></li>
-        <li class="four-col"><a href="http://ftp.acc.umu.se/mirror/cdimage.ubuntu.com/releases">Sweden&nbsp;&rsaquo;</a></li>
-        <li class="four-col last-col"><a href="http://www.mirrorservice.org/sites/cdimage.ubuntu.com/cdimage/releases">United Kingdom&nbsp;&rsaquo;</a></li>
-        <li class="four-col"><a href="http://mirror.anl.gov/pub/ubuntu-iso/DVDs/ubuntu">United States&nbsp;&rsaquo;</a></li>
+    <h3 class="external"><span>Select the nearest mirror</span></h3>
+    <ul class="twelve-col no-bullets list">
+      <li class="four-col"><a href="http://mirror.eftel.com/ubuntu-dvd ">Australia &rsaquo;</a></li>
+      <li class="four-col"><a href="http://ftp.funet.fi/pub/Linux/INSTALL/Ubuntu/dvd-releases/releases">Finland &rsaquo;</a></li>
+      <li class="four-col last-col"><a href="ftp://ftp.free.fr/mirrors/ftp.ubuntu.com/releases/">France &rsaquo;</a></li>
+      <li class="four-col"><a href="http://de.releases.ubuntu.com/">Germany &rsaquo;</a></li>
+      <li class="four-col"><a href="http://ftp.ntua.gr/pub/linux/ubuntu-releases-dvd">Greece &rsaquo;</a></li>
+      <li class="four-col last-col"><a href="http://ftp.heanet.ie/pub/ubuntu-cdimage/releases">Ireland &rsaquo;</a></li>
+      <li class="four-col"><a href="http://nl.archive.ubuntu.com/ubuntu-cdimages">Netherlands (1) &rsaquo;</a></li>
+      <li class="four-col"><a href="http://nginyang.uvt.nl/">Netherlands (2) &rsaquo;</a></li>
+      <li class="four-col last-col"><a href="http://mirror.yandex.ru/ubuntu-cdimage/releases">Russian Federation &rsaquo;</a></li>
+      <li class="four-col"><a href="http://es.archive.ubuntu.com/cdimage/releases">Spain</a></li>
+      <li class="four-col"><a href="http://ftp.acc.umu.se/mirror/cdimage.ubuntu.com/releases">Sweden &rsaquo;</a></li>
+      <li class="four-col last-col"><a href="http://tw.archive.ubuntu.com/ubuntu-dvd-releases/releases">Taiwan</a></li>
+      <li class="four-col last-item"><a href="http://www.mirrorservice.org/sites/cdimage.ubuntu.com/cdimage/releases">United Kingdom &rsaquo;</a></li>
+      <li class="four-col"><a href="http://mirror.anl.gov/pub/ubuntu-iso/DVDs/ubuntu">United States &rsaquo;</a></li>
     </ul>
 </div><!-- /.row -->
 
@@ -81,7 +94,7 @@ <h3>Select the nearest mirror</h3>
     <div class="eight-col">
 		<h2>Past releases and other flavours</h2>
 		<p>Looking for an older release of Ubuntu? Whether you need an obsolete release or a previous LTS point release with its original stack, you can find them in past releases.</p>
-		<p><a href="http://releases.ubuntu.com/">Past releases&nbsp;&rsaquo;</a></p>
+		<p><a class="external" href="http://releases.ubuntu.com/">Past releases</a></p>
     </div><!-- /.eight-col -->
 </div><!-- /.row -->
 
diff --git a/templates/download/desktop/_chinese-download.html b/templates/download/desktop/_chinese-download.html
deleted file mode 100755
index 0019b26525e..00000000000
--- a/templates/download/desktop/_chinese-download.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="row no-border chinese-download last-row">
-	<div class="box clearfix">
-		<div class="three-col no-margin-bottom text-center">
-			<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-ubuntukylin.svg" alt="Chinese Ubuntu logo" height="112" width="112">
-		</div>
-		<div class="nine-col last-col no-margin-bottom">
-			<h2><a href="/download/ubuntu-kylin">Ubuntu Kylin&nbsp;&rsaquo;</a></h2>
-			<p>Created specifically for the needs of Chinese users, Ubuntu Kylin 14.04.1 LTS includes many unique features and five years support from Canonical.</p>
-		</div>
-	</div><!-- /.box -->
-</div><!-- /.row -->
diff --git a/templates/download/desktop/burn-a-dvd-on-mac-osx.html b/templates/download/desktop/burn-a-dvd-on-mac-osx.html
index 121eb98d5b8..39dfdddf3a7 100755
--- a/templates/download/desktop/burn-a-dvd-on-mac-osx.html
+++ b/templates/download/desktop/burn-a-dvd-on-mac-osx.html
@@ -5,7 +5,7 @@
 {% block extra_body_class %}download-help{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="How to burn a DVD on OS X"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="How to burn a DVD on OS X"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/download/desktop/burn-a-dvd-on-ubuntu.html b/templates/download/desktop/burn-a-dvd-on-ubuntu.html
index 5d56e85a036..e1b6fa905f6 100755
--- a/templates/download/desktop/burn-a-dvd-on-ubuntu.html
+++ b/templates/download/desktop/burn-a-dvd-on-ubuntu.html
@@ -5,7 +5,7 @@
 {% block extra_body_class %}download-help{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="How to burn a DVD on Ubuntu"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="How to burn a DVD on Ubuntu"  %}
 {% endblock second_level_nav_items %}
 
 
diff --git a/templates/download/desktop/burn-a-dvd-on-windows.html b/templates/download/desktop/burn-a-dvd-on-windows.html
index 7a7d375178c..8c4977e0153 100755
--- a/templates/download/desktop/burn-a-dvd-on-windows.html
+++ b/templates/download/desktop/burn-a-dvd-on-windows.html
@@ -5,7 +5,7 @@
 {% block extra_body_class %}download-help{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="How to burn a DVD on Windows"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="How to burn a DVD on Windows"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/download/desktop/contribute.html b/templates/download/desktop/contribute.html
index 8dad6d95a1f..c8551e4897a 100755
--- a/templates/download/desktop/contribute.html
+++ b/templates/download/desktop/contribute.html
@@ -4,7 +4,7 @@
 {% block extra_body_class %}contribute-to-ubuntu{% endblock %}
 
 {% block second_level_nav_items %}
-    {% include "_base/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="Contribute"  %}
+    {% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="Contribute"  %}
 {% endblock second_level_nav_items %}
 
 {% block outer_content %}
diff --git a/templates/download/desktop/create-a-usb-stick-on-mac-osx.html b/templates/download/desktop/create-a-usb-stick-on-mac-osx.html
index f6768a37057..ad5438bd86c 100755
--- a/templates/download/desktop/create-a-usb-stick-on-mac-osx.html
+++ b/templates/download/desktop/create-a-usb-stick-on-mac-osx.html
@@ -5,7 +5,7 @@
 {% block extra_body_class %}download-help{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="How to create a bootable USB stick on OS X"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="How to create a bootable USB stick on OS X"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/download/desktop/create-a-usb-stick-on-ubuntu.html b/templates/download/desktop/create-a-usb-stick-on-ubuntu.html
index c836079c029..627a97d95ed 100755
--- a/templates/download/desktop/create-a-usb-stick-on-ubuntu.html
+++ b/templates/download/desktop/create-a-usb-stick-on-ubuntu.html
@@ -5,7 +5,7 @@
 {% block extra_body_class %}download-help{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="How to create a bootable USB stick on Ubuntu"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="How to create a bootable USB stick on Ubuntu"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/download/desktop/create-a-usb-stick-on-windows.html b/templates/download/desktop/create-a-usb-stick-on-windows.html
index e66116e5c1d..8d5db1b85d5 100755
--- a/templates/download/desktop/create-a-usb-stick-on-windows.html
+++ b/templates/download/desktop/create-a-usb-stick-on-windows.html
@@ -5,7 +5,7 @@
 {% block extra_body_class %}download-help{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="How to create a bootable USB stick on Windows"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="How to create a bootable USB stick on Windows"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/download/desktop/index.html b/templates/download/desktop/index.html
index 75934b707b6..922b6bb5a36 100755
--- a/templates/download/desktop/index.html
+++ b/templates/download/desktop/index.html
@@ -5,56 +5,86 @@
 {% block extra_body_class %}download-desktop-home{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Download" page_title="Desktop"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Download" page_title="Desktop"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
-{% with ubuntu_release="14.04.1" openstack_version="Icehouse" %}
+{% with lts_release="14.04.2" ubuntu_release="15.04" lts_release_name="TrustyTahr" ubuntu_release_name="VividVervet" openstack_version="juno" %}
 <div class="row row-hero row-background no-border">
 	<div class="eight-col append-four">
 		<h1>Download Ubuntu Desktop</h1>
 	</div><!-- /.eight-col -->
-	<div class="twelve-col">
+
+	<div class="twelve-col no-margin-bottom">
 		<div class="box box-highlight clearfix vertical-divider">
 			<div class="eight-col no-margin-bottom">
-				<h2>Ubuntu {{ubuntu_release}} LTS</h2>
-				<p>The latest version of the Ubuntu operating system for desktop PCs and laptops, Ubuntu {{ubuntu_release}} LTS comes with five years of security and maintenance updates, guaranteed.</p>
-				<p><a href="https://wiki.ubuntu.com/TrustyTahr/ReleaseNotes" class="external">Ubuntu {{ubuntu_release}} LTS release notes</a></p>
+                <h2>Ubuntu {{lts_release}} LTS</h2>
+				<p>The Long Term Support (LTS) version of the Ubuntu operating system for desktop PCs and laptops, Ubuntu {{lts_release}} LTS comes with five years of security and maintenance updates, guaranteed.</p>
+				<p><strong>Recommended for most users.</strong></p>
+				<p><a href="https://wiki.ubuntu.com/{{lts_release_name}}/ReleaseNotes" class="external">Ubuntu {{lts_release}} LTS release notes</a></p>
 			</div>
 			<div class="four-col last-col no-margin-bottom download-button">
 				<form class="form-download gap-from-top" action="/download/desktop/contribute/" method="get">
 					<fieldset>
-						<input type="hidden" name="version" value="{{ubuntu_release}}" />
+						<input type="hidden" name="version" value="{{lts_release}}" />
 						<label for="input-bits-lts">Choose your flavour</label>
 						<select id="input-bits-lts" name="architecture">
-							<option value="amd64" selected="selected">64-bit</option>
-							<option value="i386">32-bit (for machines with less than 2GB RAM)</option>
-							<option value="amd64+mac">64-bit Mac (AMD64)</option>
+							<option value="amd64" selected="selected">64-bit &mdash; recommended</option>
+							<option value="i386">32-bit &mdash; for machines with less than 2GB RAM</option>
 						</select>
 					</fieldset>
 					<div>
 						<button type="submit">Download</button>
 					</div>
+                    <p><a href="/download/alternative-downloads">Alternative downloads and torrents&nbsp;&rsaquo;</a></p>
 				</form>
 			</div><!-- /.four-col -->
 		</div><!-- /.box -->
-	</div>
+	</div><!-- /.twelve-col -->
 </div><!-- /.row -->
 
-<div class="row row-grey row-easy-ways">
+<div class="row row-grey">
+	<div class="twelve-col no-margin-bottom">
+		<div class="box box-highlight clearfix vertical-divider">
+			<div class="eight-col no-margin-bottom">
+                <h2>Ubuntu {{ubuntu_release}}</h2>
+				<p>The latest version of the Ubuntu operating system for desktop PCs and laptops, Ubuntu {{ubuntu_release}} comes with nine months of security and maintenance updates.</p>
+				<p><a href="https://wiki.ubuntu.com/{{ubuntu_release_name}}/ReleaseNotes" class="external">Ubuntu {{ubuntu_release}} release notes</a></p>
+			</div>
+			<div class="four-col last-col no-margin-bottom download-button">
+				<form class="form-download gap-from-top" action="/download/desktop/contribute/" method="get">
+					<fieldset>
+						<input type="hidden" name="version" value="{{ubuntu_release}}" />
+						<label for="input-bits">Choose your flavour</label>
+						<select id="input-bits" name="architecture">
+							<option value="amd64" selected="selected">64-bit &mdash; recommended</option>
+							<option value="i386">32-bit &mdash; for machines with less than 2GB RAM</option>
+						</select>
+					</fieldset>
+					<div>
+						<button type="submit">Download</button>
+					</div>
+                    <p><a href="/download/alternative-downloads">Alternative downloads and torrents&nbsp;&rsaquo;</a></p>
+				</form>
+			</div><!-- /.four-col -->
+		</div><!-- /.box -->
+	</div>
+</div>
+
+<div class="row row-easy-ways">
 	<div class="twelve-col">
-		<h2>Easy ways to switch to Ubuntu {{ubuntu_release}} LTS</h2>
+		<h2>Easy ways to switch to Ubuntu<!-- {{ubuntu_release}} LTS --></h2>
 	</div>
 	<div class="equal-height">
-		<div class="four-col box box-highlight">
-			<h3 class="header--ubuntu">From Ubuntu</h3>
+		<div class="four-col box">
+			<h3 class="header--ubuntu">From an older version</h3>
 			<p>If you&rsquo;re already running Ubuntu, you can upgrade in a few clicks from <a href="/download/desktop/upgrade">Software Updater</a>.</p>
 			<ul class="no-bullets">
 				<li><a href="/download/desktop/burn-a-dvd-on-ubuntu">How to burn a DVD on Ubuntu&nbsp;&rsaquo;</a></li>
 				<li><a href="/download/desktop/create-a-usb-stick-on-ubuntu">How to create a bootable USB stick on Ubuntu&nbsp;&rsaquo;</a></li>
 			</ul>
 		</div>
-		<div class="four-col box box-highlight">
+		<div class="four-col box">
 			<h3 class="header--windows">From Windows</h3>
 			<p>If you&rsquo;re using Windows 8 or any computer with a 64-bit processor, we recommend the 64-bit download.</p>
 			<ul class="no-bullets">
@@ -62,7 +92,7 @@ <h3 class="header--windows">From Windows</h3>
 				<li><a href="/download/desktop/create-a-usb-stick-on-windows">How to create a bootable USB stick on Windows&nbsp;&rsaquo;</a></li>
 			</ul>
 		</div>
-		<div class="four-col last-col box box-highlight">
+		<div class="four-col last-col box">
 			<h3 class="header--mac">From Mac OS X</h3>
 			<p>Most Macs with Intel processors will work with either 64-bit or Mac images. If the 64-bit image doesn't work, try the Mac image.</p>
 			<ul class="no-bullets">
diff --git a/templates/download/desktop/install-ubuntu-desktop.html b/templates/download/desktop/install-ubuntu-desktop.html
index 30ebfbb4c8b..f3ec36cec38 100755
--- a/templates/download/desktop/install-ubuntu-desktop.html
+++ b/templates/download/desktop/install-ubuntu-desktop.html
@@ -1,16 +1,16 @@
 {% extends "download/_base_download.html" %}
 
-{% block title %}Install Ubuntu 14.04.1 LTS{% endblock %}
+{% block title %}Install Ubuntu 14.04.2 LTS{% endblock %}
 
 {% block extra_body_class %}download-help{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="Install Ubuntu 14.04.1 LTS"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="Install Ubuntu 14.04.2 LTS"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
 <div class="row row-hero no-padding-bottom">
-	<h1>Install Ubuntu 14.04.1 LTS</h1>
+	<h1>Install Ubuntu 14.04.2 LTS</h1>
 </div><!-- /.row row-hero -->
 <div class="row no-border">
 	<div id="download-help" class="eight-col box box-grey no-border">
diff --git a/templates/download/desktop/thank-you.html b/templates/download/desktop/thank-you.html
index 6ba88fb2a0d..0114dec9ced 100755
--- a/templates/download/desktop/thank-you.html
+++ b/templates/download/desktop/thank-you.html
@@ -10,7 +10,7 @@
 {% block extra_body_class %}download-thankyou{% endblock %}
 
 {% block second_level_nav_items %}
-{% include "_base/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="Thank you"  %}
+{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="Thank you"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
@@ -21,7 +21,6 @@
         {% else %}
     <noscript>
         <meta http-equiv="refresh" content="3;url=http://releases.ubuntu.com/{{ request.GET.version }}/ubuntu-{{ request.GET.version }}-desktop-{{ request.GET.architecture.split|join:"+" }}.iso">
-        }
     </noscript>
         {% endif %}
     {% endif %}
diff --git a/templates/download/desktop/try-ubuntu-before-you-install.html b/templates/download/desktop/try-ubuntu-before-you-install.html
index d8357520abd..ed1cd89fdc8 100755
--- a/templates/download/desktop/try-ubuntu-before-you-install.html
+++ b/templates/download/desktop/try-ubuntu-before-you-install.html
@@ -5,7 +5,7 @@
 {% block extra_body_class %}download-help{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="Try Ubuntu before you install it"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="Try Ubuntu before you install it"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/download/desktop/upgrade.html b/templates/download/desktop/upgrade.html
index 24dc348db24..bc5c7d26107 100755
--- a/templates/download/desktop/upgrade.html
+++ b/templates/download/desktop/upgrade.html
@@ -1,22 +1,22 @@
 {% extends "download/_base_download.html" %}
 
-{% block title %}Upgrade Ubuntu{% endblock %}
+{% block title %}Instructions on how to upgrade your Ubuntu desktop.{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="Upgrade" tertiary="true" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="Upgrade" tertiary="true" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
 <div class="row row-hero">
-	<h1>Upgrade from Ubuntu 13.10 to 14.04 LTS</h1>
+	<h1>Upgrade from a previous version of Ubuntu</h1>
 	<div class="box no-border warning">
-		<p>We recommend you backup your existing Ubuntu installation before updating.</p>
+		<p>We recommend that you back up your existing Ubuntu installation before you update your computer.</p>
 	</div>
 	<div class="box box-grey no-border no-margin-bottom row-image-centered">
 		<span><img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-upgrade-warmgrey.svg" alt="" width="124" height="124"></span>
 		<div class="nine-col last-col">
-			<p>If you have a version of Ubuntu other than Ubuntu 13.10, please <a href="https://help.ubuntu.com/community/UpgradeNotes">read the upgrade notes</a> for more information on how to upgrade.</p>
-			<p>Before you start the upgrade, we recommend that you <a href="https://wiki.ubuntu.com/TrustyTahr/ReleaseNotes">read the release notes</a> for Ubuntu 14.04 LTS, which which include workarounds for any problems you might encounter.</p>
+			<p>If you are upgrading from a version released prior to Ubuntu 13.10, <a href="https://help.ubuntu.com/community/UpgradeNotes">please read the upgrade notes for more information</a>.</p>
+			<p>For more recent versions, please read the release notes. You can find release notes for Ubuntu <a href="https://wiki.ubuntu.com/TrustyTahr/ReleaseNotes#Upgrading_from_Ubuntu_12.04_LTS_or_Ubuntu_13.10">14.04 LTS here</a> and for <a href="https://wiki.ubuntu.com/VividVervet/ReleaseNotes#Upgrading_from_Ubuntu_14.10">Ubuntu 15.04 here</a>.</p>
 		</div><!-- /.ten-col -->
 	</div><!-- /.box -->
 </div>
@@ -39,7 +39,7 @@ <h2>Launch the Software Updater</h2>
 				<span>2</span>
 				<div class="five-col">
 					<h2>Check for updates</h2>
-					<p>Click the <strong>Check</strong> button to check for new updates. If there are any updates to install, use the <strong>Install Updates</strong> button to install them, press <strong>Check</strong> again after that first update is complete &mdash; then press the <strong>Upgrade</strong> button.</p>
+					<p>Select the tab called "<strong>Updates</strong>". Then set the "<strong>Notify me of a new Ubuntu version</strong>" dropdown menu to "<strong>For any new version</strong>". Press <strong>Alt+F2</strong> and type in "<strong>update-manager</strong>" (without the quotes) into the command box. The Update Manager should open up and tell you: New distribution release '15.04' is available. Click <strong>Upgrade</strong> and follow the on-screen instructions.</p>
 				</div>
 				<div class="six-col right">
 					<img class="" src="{{ STATIC_URL }}img/download/desktop/upgrade/image-upgrade-2.jpg" width="444" height="300" alt="" />
diff --git a/templates/download/index.html b/templates/download/index.html
index 8b990a6bf7b..a87258c6ede 100755
--- a/templates/download/index.html
+++ b/templates/download/index.html
@@ -3,55 +3,80 @@
 {% block title %}Get Ubuntu | Download{% endblock %}
 {% block extra_body_class %}download-home{% endblock %}
 
+{% block meta_keywords %}Ubuntu, Ubuntu operating system, OS, platform, Linux, distribution, OpenStack, Ubuntu OpenStack, Ubuntu Cloud, server, tablet, smartphone, phone, Windows alternative, Mac alternative, free software, open source, thin client, download Ubuntu, long term support, LTS, 14.04, Trusty Tahr, Icehouse, Juno, Kilo, Vivid Vervet, 15.04{% endblock meta_keywords %}
+
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Download" page_title="Overview"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Download" page_title="Overview"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
 <div class="row row-hero">
-	<div class="seven-col">
+	<div class="eight-col">
 		<h1>Get Ubuntu</h1>
 		<p>Ubuntu is completely free to download, use and share.</p>
 	</div><!-- / .seven-col -->
 </div><!-- / .row -->
 
 <div class="row row-list-download no-border">
-	<div class="box box-highlight clearfix">
-		<div class="two-col text-center">
-			<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-download-orange.svg" alt="" width="113" height="113" />
-		</div>
-		<div class="ten-col last-col no-margin-bottom">
-			<h2><a href="/download/desktop">Ubuntu Desktop&nbsp;&rsaquo;</a></h2>
-			<p>Download Ubuntu desktop and replace your current operating system whether it&rsquo;s Windows or Mac OS, or, run Ubuntu alongside it.</p>
-		</div>
-	</div>
-	<div class="twelve-col">
-		<p class="ubuntu-upgrade">Do you want to upgrade? <a href="/download/desktop/upgrade">Follow our simple guide&nbsp;&rsaquo;</a></p>
-	</div>
+    <div class="twelve-col no-margin-bottom ">
+        <div class="box box-highlight clearfix">
+    		<div class="two-col text-center">
+    			<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-download-orange.svg" alt="" width="113" height="113" />
+    		</div>
+    		<div class="ten-col last-col">
+    			<h2><a href="/download/desktop">Ubuntu Desktop&nbsp;&rsaquo;</a></h2>
+    			<p>Download Ubuntu desktop and replace your current operating system whether it&rsquo;s Windows or Mac OS, or, run Ubuntu alongside it.</p>
+    		</div>
+        	<div class="twelve-col">
+        		<p class="ubuntu-upgrade">Do you want to upgrade? <a href="/download/desktop/upgrade">Follow our simple guide&nbsp;&rsaquo;</a></p>
+        	</div>
+    	</div>
+	</div><!-- /.twelve-col -->
+</div><!-- /.row -->
 
+<div class="row row-list-download no-border">
 	<div class="twelve-col equal-height">
 		<div class="six-col box no-margin-bottom">
-			<div class="two-col text-center">
-				<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-server-darkaubergine.svg" alt="" width="113" height="113" class="media--image__vcentered" />
-			</div>
-			<div class="four-col last-col">
+			<div class="four-col">
 				<h2><a href="/download/server">Ubuntu Server&nbsp;&rsaquo;</a></h2>
 				<p>Whether you want to configure a simple file server or build a fifty thousand-node cloud, you can rely on Ubuntu Server and its five years of guaranteed free upgrades.</p>
 			</div>
+			<div class="two-col last-col text-center">
+				<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-server-darkaubergine.svg" alt="" width="113" height="113" class="media--image__vcentered" />
+			</div>
 		</div><!-- /.four-col -->
 		<div class="six-col last-col box no-margin-bottom">
-			<div class="two-col text-center">
-				<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-cloud-darkaubergine.svg" alt="" width="113" height="113" class="media--image__vcentered" />
-			</div>
-			<div class="four-col last-col">
+			<div class="four-col">
 				<h2><a href="/download/cloud">Ubuntu Cloud&nbsp;&rsaquo;</a></h2>
 				<p>Ubuntu OpenStack enables you to provision your servers and build an OpenStack cloud on Ubuntu, all from one Ubuntu Server download.</p>
 			</div>
+			<div class="two-col last-col text-center">
+				<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-cloud-darkaubergine.svg" alt="" width="113" height="113" class="media--image__vcentered" />
+			</div>
 		</div><!-- /.four-col -->
 	</div><!-- /.twelve-col -->
-</div><!-- /.row -->
 
-{% include "download/desktop/_chinese-download.html" %}
+	<div class="twelve-col equal-height no-margin-bottom">
+    	<div class="six-col box">
+    		<div class="four-col no-margin-bottom">
+    			<h2><a href="/download/ubuntu-kylin">Ubuntu Kylin&nbsp;&rsaquo;</a></h2>
+    			<p>Created specifically for the needs of Chinese users, Ubuntu Kylin 14.04.2 LTS includes many unique features and five years support from Canonical.</p>
+    		</div>
+    		<div class="two-col last-col no-margin-bottom text-center">
+    			<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-ubuntukylin.svg" alt="Ubuntu Kylin logo" height="112" width="112" class="media--image__vcentered" />
+    		</div>
+	    </div><!-- /.box -->
+    	<div class="six-col last-col box equal-height">
+    		<div class="four-col no-margin-bottom">
+    			<h2><a href="/download/alternative-downloads">Alternative downloads&nbsp;&rsaquo;</a></h2>
+    			<p>Ubuntu is available via BitTorrent links and regional mirrors. You can also use the network installer.</p>
+    		</div>
+    		<div class="two-col last-col no-margin-bottom text-center">
+    			<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-download-warmgrey.svg" alt="Chinese Ubuntu logo" height="112" width="112" class="media--image__vcentered" />
+    		</div>
+	    </div><!-- /.box -->
+	</div><!-- /.twelve-col -->
+</div><!-- /.row -->
 
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/download/server/_other-ways.html b/templates/download/server/_other-ways.html
index 96cb2a0975c..e02350bd444 100755
--- a/templates/download/server/_other-ways.html
+++ b/templates/download/server/_other-ways.html
@@ -1,23 +1,27 @@
 <div class="row no-border">
-	<div class="twelve-col">
+	{% if level_2 != 'cloud' %}<div class="twelve-col">
 		<h2>Get the version you need</h2>
-	</div>
+	</div>{% endif %}
 	<div class="twelve-col">
 		<div class="equal-height vertical-divider">
-			<div class="four-col">
+			<div class="four-col">{% if level_2 == 'cloud' %}
+				<h3 class="header--upgrade">Latest version of Ubuntu OpenStack</h3>
+				<p>If you prefer a manual setup of the latest Ubuntu OpenStack version, you can follow the instructions in our OpenStack operations guide. </p>
+				<p><a class="external" href="https://help.ubuntu.com/lts/clouddocs/en/Intro.html">View instructions here</a></p>
+			{% else %}
 				<h3 class="header--dvd">Buy DVDs from the Ubuntu shop</h3>
 				<p>Ubuntu Server 14.04 LTS is now available for purchase on DVD in the Ubuntu shop, along with the desktop version.</p>
-				<p><a href="http://shop.canonical.com/index.php?cPath=17" class="external">Go to the Ubuntu shop</a></p>
-			</div><!-- /.desktop -->
+				<p><a href="http://shop.canonical.com/index.php?cPath=17" class="external">Go to the Ubuntu shop</a></p>{% endif %}
+			</div>
 			<div class="four-col">
 				<h3 class="header--openstack">Use any version of OpenStack</h3>
-				<p>If you&rsquo;re staying on 12.04 but you need OpenStack Icehouse, run the following command:</p>
-				<pre><code>sudo add-apt-repository cloud-archive:icehouse</code></pre>
+				<p>If you&rsquo;re staying on 12.04 or 14.04 but you need OpenStack Juno, run the following command:</p>
+				<pre><code>sudo add-apt-repository cloud-archive:juno</code></pre>
 			</div><!-- /.four-col -->
 			<div class="four-col last-col">
 				<h3 class="header--download">Download a previous release</h3>
 				<p>Looking for a previous LTS point release with its original stack? Older versions of Ubuntu remain available.</p>
-				<p><a href="http://releases.ubuntu.com" class="external">Previous releases</a></p>
+				<p><a class="external" href="http://releases.ubuntu.com">Previous releases</a></p>
 			</div>
 		</div>
 	</div>
diff --git a/templates/download/server/arm.html b/templates/download/server/arm.html
index 33555e182f3..ad43ac8c270 100755
--- a/templates/download/server/arm.html
+++ b/templates/download/server/arm.html
@@ -3,50 +3,77 @@
 {% block title %}Ubuntu for ARM | Download{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Download" subsection_title="Server" page_title="ARM"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Server" page_title="ARM"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
 <div class="row row-hero row-background no-border">
-	<h1>Ubuntu Server for ARM</h1>
-	<div class="twelve-col">
-		<div class="box box-highlight clearfix">
+    <div class="eight-col">
+	    <h1>Ubuntu Server for ARM</h1>
+        <p>With Ubuntu 14.04 LTS, we are happy to announce support for 64-bit ARMv8 systems as well as all released x86 and ARM based HP Moonshot cartridges, including our MAAS and Juju cloud tools.</p>
+    </div>
+	<div class="twelve-col box box-highlight">
+		<div class="twelve-col no-margin-bottom vertical-divider">
+			<div class="six-col">
+				<h4>HP Moonshot</h4>
+				<ul class="no-bullets">
+					<li><a href="http://ports.ubuntu.com/ubuntu-ports/dists/trusty-updates/main/installer-armhf/current/images/keystone/netboot/" onclick="_gaq.push(['_trackEvent', 'External Link', 'HP Moonshot m800 ARMv7', 'From Download ARM']);" class="external">m800 ARMv7 netboot image (14.04 LTS)</a></li>
+					<li><a href="http://ports.ubuntu.com/ubuntu-ports/dists/trusty-updates/main/installer-arm64/current/images/generic/netboot/xgene/" onclick="_gaq.push(['_trackEvent', 'External Link', 'HP Moonshot m400 ARMv8', 'From Download ARM']);" class="external">m400 ARMv8 netboot image (14.04 LTS)</a></li>
+				</ul>
+				<p><a class="external" href="http://h20564.www2.hp.com/hpsc/doc/public/display?docId=c03933547">HP ProLiant Moonshot user guide</a></p>
+				<p>HP Moonshot cartridges come factory installed</p>
+			</div>
+			<div class="six-col last-col">
+				<h4>Applied Micro X-Gene ARMv8</h4>
+				<ul class="no-bullets">
+					<li><a href="http://ports.ubuntu.com/ubuntu-ports/dists/trusty/main/installer-arm64/current/images/generic/netboot/xgene/" onclick="_gaq.push(['_trackEvent', 'External Link', 'Applied Micro X-Gene ARMv8 14.04 download', 'From Download ARM']);" class="external">14.04 LTS</a></li>
+					<li><a href="http://ports.ubuntu.com/ubuntu-ports/dists/vivid/main/installer-arm64/current/images/generic/netboot/xgene/" onclick="_gaq.push(['_trackEvent', 'External Link', 'Applied Micro X-Gene ARMv8 14.10 download', 'From Download ARM']);" class="external">15.04</a></li>
+				</ul>
+				<p><a class="external" href="https://wiki.ubuntu.com/ARM/Server/Install/Mustang">Installation instructions for the Mustang platform</a></p>
+			</div>
+		</div>
+	</div>
+    <div class="twelve-col box box-highlight">
+   		<div class="twelve-col no-margin-bottom vertical-divider">
 			<div class="six-col">
 				<h4>Cavium Thunder ARMv8 Developer Platform</h4>
-				<p class="note">Registration required</p>
 				<ul class="no-bullets">
-					<li><a href="http://www.cavium.com/thundersdk_access_application.html" onclick="_gaq.push(['_trackEvent', 'External Link', 'ARM Cavium Thunder ARMv8 download', 'From Download ARM']);">14.04 LTS&nbsp;&rsaquo;</a></li>
+					<li><a href="http://www.cavium.com/processor_Project-Thunder_Ubuntu-Server.html" onclick="_gaq.push(['_trackEvent', 'External Link', 'ARM Cavium ThunderX product details', 'From Download ARM']);" class="external">Cavium ThunderX product details</a></li>
+					<li>Coming Soon &mdash; 14.04 LTS</li>
 				</ul>
 			</div>
 			<div class="six-col last-col">
 				<h4>Marvell Armada XP</h4>
 				<ul class="no-bullets">
-					<li><a href="http://ports.ubuntu.com/ubuntu-ports/dists/precise-updates/main/installer-armhf/current/images/armadaxp/netboot" onclick="_gaq.push(['_trackEvent', 'External Link', 'ARM Marvell Armada XP download', 'From Download ARM']);">12.04 LTS&nbsp;&rsaquo;</a></li>
+					<li><a href="http://ports.ubuntu.com/ubuntu-ports/dists/precise-updates/main/installer-armhf/current/images/armadaxp/netboot" onclick="_gaq.push(['_trackEvent', 'External Link', 'ARM Marvell Armada XP download', 'From Download ARM']);" class="external">12.04 LTS</a></li>
 				</ul>
 			</div>
-		</div>
-	</div><!-- /.box -->
-</div>
-
+   		</div><!-- /.twelve-col -->
+    </div><!-- /.box -->
+</div><!-- /.row -->
 <div class="row row-grey">
-	<div class="box box-highlight clearfix">
-		<div class="eight-col no-margin-bottom">
-			<h3>Coming soon in 14.04 LTS</h3>
-			<p>We are happy to announce support for 64-bit ARMv8 systems as well as all released x86 and ARM based HP Moonshot cartridges, including our MAAS and Juju cloud tools.</p>
-			<p>Ubuntu Server 14.04 LTS for ARM server will be available soon.</p>
+		<div class="six-col no-margin-bottom">
+			<h3>For Developers</h3>
+			<p>Ubuntu Server is available for developer platforms powered by certified ARM SoCs as an over-the-network installer. Network boot infrastructure is required.</p>
+			<!-- <p><a href="/server">Learn more about Ubuntu Server&nbsp;&rsaquo;</a></p> -->
 		</div>
-	</div>
+    	<div class="six-col last-col no-margin-bottom">
+		    <img src="{{ STATIC_URL }}img/server/image-server.svg" alt="" />
+    	</div>
 </div>
 
 <div class="row no-border">
-	<div class="eight-col">
-		<h3>Ready to deploy now</h3>
-		<p>Built for hyperscale-class hardware including machines from the <a href="/partners/hp/moonshot">HP Moonshot</a> project, Ubuntu Server 14.04 LTS for ARM is a mature and fully-supported server operating system, including a LAMP stack, Ceph storage, Hadoop-based analytics and the Icehouse release of OpenStack, alongside tools for provisioning and scale-out deployment.</p>
-		<p>Ubuntu Server for ARM is available for selected SoCs as an over-the-network installer. Network boot infrastructure is required.</p>
-	</div><!-- /.twelve-col -->
-	<div class="four-col last-col text-center">
+	<div class="four-col text-center">
 		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-server-warmgrey.svg" alt="" width="200" height="200" />
 	</div>
+	<div class="eight-col last-col">
+		<h3>Ready to deploy now</h3>
+		<p>Built for hyperscale-class hardware including machines from the HP Moonshot product line, Ubuntu Server for ARM is a mature and fully-supported server operating system, including a LAMP stack, Ceph storage, Hadoop-based analytics, the  Juno  release of OpenStack, and hundreds of additional workloads alongside tools for provisioning and scale-out deployment.</p>
+		<ul class="list-ubuntu">
+			<li><a href="http://partners.ubuntu.com/hp" class="external">Find out more about HP Moonshot</a></li>
+			<li><a href="http://h17007.www1.hp.com/us/en/enterprise/servers/supportmatrix/ubuntu.aspx#.VIdLr121Cgo" class="external">HP server Ubuntu certification matrix</a></li>
+		</ul>
+	</div><!-- /.twelve-col -->
 </div><!-- /.row -->
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
diff --git a/templates/download/server/index.html b/templates/download/server/index.html
index c31ed4a5fa1..7fb005aadae 100755
--- a/templates/download/server/index.html
+++ b/templates/download/server/index.html
@@ -5,54 +5,79 @@
 {% block extra_body_class %}download-server-home{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Download" page_title="Server" tertiary="true"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Download" page_title="Server" tertiary="true"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
-{% with ubuntu_release="14.04.1" openstack_version="Icehouse" %}
+{% with lts_release="14.04.2" latest_release="15.04" lts_release_name="TrustyTahr" latest_release_name="VividVervet" openstack_version="Juno" %}
 <div class="row row-hero row-background no-border">
 	<div class="eight-col append-four">
 		<h1>Download Ubuntu Server</h1>
 	</div>
-	<div class="twelve-col">
+	<div class="twelve-col no-margin-bottom">
 		<div class="box box-highlight clearfix vertical-divider">
 			<div class="eight-col no-margin-bottom">
-				<h2>Ubuntu Server {{ubuntu_release}} LTS</h2>
-				<p>The latest version of Ubuntu Server, including the {{openstack_version}} release of OpenStack and support guaranteed until April 2019.</p>
-				<p><a href="https://wiki.ubuntu.com/TrustyTahr/ReleaseNotes" class="external">Ubuntu Server {{ubuntu_release}} LTS release notes</a></p>
+				<h2>Ubuntu Server {{lts_release}} LTS</h2>
+				<p>The Long Term Support version of Ubuntu Server, including the Icehouse release of OpenStack and support guaranteed until April 2019 &mdash; 64 bit only.</p>
+				<p><strong>Recommended for most users.</strong></p>
+				<p><a href="https://wiki.ubuntu.com/{{lts_release_name}}/ReleaseNotes" class="external">Ubuntu Server {{lts_release}} LTS release notes</a></p>
 			</div>
 			<div class="four-col last-col">
-				<p class="gap-from-top">64-bit only</p>
-				<form class="form-download" action="/download/server/thank-you/" method="get">
+				<form class="form-download gap-from-top" action="/download/server/thank-you/" method="get">
 					<fieldset>
-						<input name="version" value="{{ubuntu_release}}" type="hidden">
+						<input name="version" value="{{lts_release}}" type="hidden">
 						<input name="architecture" value="amd64" type="hidden">
 					</fieldset>
 					<div>
 						<button type="submit">Download</button>
 					</div>
 				</form>
+                <p><a href="/download/alternative-downloads">Alternative downloads and torrents&nbsp;&rsaquo;</a></p>
 			</div><!-- /.four-col -->
 		</div><!-- /.box -->
 	</div>
 </div><!-- /.row -->
 
 <div class="row row-grey">
+	<div class="twelve-col no-margin-bottom">
+		<div class="box box-highlight clearfix vertical-divider">
+			<div class="eight-col no-margin-bottom">
+				<h2>Ubuntu Server {{latest_release}}</h2>
+				<p>The latest version of Ubuntu Server, including the Kilo release of OpenStack and support for nine months &ndash; 64 bit only.</p>
+				<p><a href="https://wiki.ubuntu.com/{{latest_release_name}}/ReleaseNotes" class="external">Ubuntu Server {{latest_release}} release notes</a></p>
+			</div>
+			<div class="four-col last-col">
+				<form class="form-download gap-from-top" action="/download/server/thank-you/" method="get">
+					<fieldset>
+						<input name="version" value="{{latest_release}}" type="hidden">
+						<input name="architecture" value="amd64" type="hidden">
+					</fieldset>
+					<div>
+						<button type="submit">Download</button>
+					</div>
+				</form>
+                <p><a href="/download/alternative-downloads">Alternative downloads and torrents&nbsp;&rsaquo;</a></p>
+			</div><!-- /.four-col -->
+		</div><!-- /.box -->
+	</div><!-- /.twelve-col -->
+</div><!-- /.row -->
+
+<div class="row">
 	<div class="twelve-col">
 		<h2>How you can use Ubuntu Server</h2>
 	</div>
 	<div class="equal-height">
-		<div class="four-col box box-highlight">
+		<div class="four-col box">
 			<h3>Ubuntu Server for cloud</h3>
 			<p>Whether you&rsquo;re building your own cloud or you want to use a public cloud, with Ubuntu you have all the tools you need to provision, deploy and manage your cloud environment. </p>
-			<p><a href="/download/cloud">Download Ubuntu Server for cloud&nbsp;&rsaquo;</a></p>
+			<p><a href="/download/cloud">Get Ubuntu Server for cloud&nbsp;&rsaquo;</a></p>
 		</div>
-		<div class="four-col box box-highlight">
+		<div class="four-col box">
 			<h3>Ubuntu Server for ARM</h3>
 			<p>Optimised for hyperscale deployments and certified on a number of ARM chipsets, Ubuntu Server for ARM includes the 64-bit ARMv8 platforms.</p>
-			<p><a href="/download/server/arm">Download Ubuntu Server for ARM&nbsp;&rsaquo;</a></p>
+			<p><a href="/download/server/arm">Get Ubuntu Server for ARM&nbsp;&rsaquo;</a></p>
 		</div>
-		<div class="four-col last-col box box-highlight">
+		<div class="four-col last-col box">
 			<h3>Ubuntu for POWER8</h3>
 			<p>Ubuntu is now available on the IBM POWER8 platform, bringing the entire Ubuntu and OpenStack ecosystem to IBM POWER8</p>
 			<p><a href="/download/server/power8">Get Ubuntu {{ubuntu_release}} for  POWER8&nbsp;&rsaquo;</a></p>
diff --git a/templates/download/server/install-ubuntu-server.html b/templates/download/server/install-ubuntu-server.html
index f66edb66cd8..b4949b45f32 100755
--- a/templates/download/server/install-ubuntu-server.html
+++ b/templates/download/server/install-ubuntu-server.html
@@ -5,14 +5,14 @@
 {% block extra_body_class %}download-help{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Download" subsection_title="Server" page_title="Installing Ubuntu Server"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Server" page_title="Installing Ubuntu Server"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
 <div class="row row-hero no-border">
-	<h1>Installing Ubuntu Server</h1>
+	<h1>Installing Ubuntu Server for general use</h1>
 	<div id="download-help" class="eight-col box box-grey no-border">
-	<p>The basic steps to install Ubuntu Server Edition from CD or USB stick are the same for installing any operating system. Unlike the desktop version, Ubuntu Server does not include a graphical installation program. Instead the Server Edition uses a console menu-based process.</p>
+	<p>The basic steps to install Ubuntu Server from CD or USB stick are the same for installing any operating system. Unlike the desktop version, Ubuntu Server does not include a graphical installation program. Instead, it uses a console menu-based process.</p>
 	<div class="box box-highlight no-margin-bottom">
 		<ol class="no-bullets">
 			<li>
@@ -48,7 +48,7 @@ <h1>Installing Ubuntu Server</h1>
 			<li>
 				<span>6</span>
 				<div>
-					<p>You can then choose from several options to configure the hard drive layout. There are many ways disk layout can be configured. For detailed information please <a href="https://help.ubuntu.com/12.04/serverguide/C/installing-from-cd.html">read the installing from CD documentation</a>.</p>
+					<p>You can then choose from several options to configure the hard drive layout. There are many ways disk layout can be configured. For detailed information please <a href="https://help.ubuntu.com/lts/serverguide/installing-from-cd.html">read the installing from CD documentation</a>.</p>
 				</div>
 			</li>
 			<li>
@@ -66,8 +66,8 @@ <h3>Mass provisioning of Ubuntu Server</h3>
 		<p>Ubuntu Server also includes a network-based provisioning system that uses Ubuntu&rsquo;s Metal as a Service (MAAS) tool. Based on the industry-standard PXE network-boot protocol, MAAS enables the rapid, automated provisioning of many systems simultaneously.</p>
 		<p>Canonical&rsquo;s Landscape further integrates MAAS technology with enterprise-class support for systems management and compliance requirements.</p>
 		<ul class="list-ubuntu">
-			<li><a href="https://wiki.ubuntu.com/ServerTeam/MAAS" class="external">Learn how to configure your network for bare metal deployment via MAAS</a></li>
-			<li><a href="/management">Learn more about enterprise provisioning with Landscape&nbsp;&rsaquo;</a></li>
+			<li><a href="http://maas.ubuntu.com/" class="external">Learn how to configure your network for bare metal deployment via MAAS</a></li>
+			<li><a href="http://www.ubuntu.com/management/landscape-features#deployment">Learn more about enterprise provisioning with Landscape&nbsp;&rsaquo;</a></li>
 		</ul>
 </div><!-- /.sidebar -->
 </div><!-- /.row -->
diff --git a/templates/download/server/power8.html b/templates/download/server/power8.html
index fcdad291c43..fb28b553903 100755
--- a/templates/download/server/power8.html
+++ b/templates/download/server/power8.html
@@ -8,25 +8,26 @@
 
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Download" subsection_title="Server" page_title="POWER8"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Server" page_title="POWER8"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
 <div class="row row-hero row-background no-border">
 	<h1>Ubuntu for IBM POWER8</h1>
-	<div class="twelve-col">
+	<div class="twelve-col no-margin-bottom">
 		<div class="box box-highlight clearfix">
 			<div class="six-col">
 				<h4>Ubuntu Server</h4>
-				<p>Includes Ubuntu Server for cloud</p>
 				<ul class="no-bullets">
-					<li><a href="http://cdimage.ubuntu.com/releases/14.04.1/release/" onclick="_gaq.push(['_trackEvent', 'External Link', 'POWER8 server download', 'From Download POWER8']);">14.04.1&nbsp;&rsaquo;</a></li>
+					<li><a href="http://cdimage.ubuntu.com/releases/14.04.2/release/" onclick="_gaq.push(['_trackEvent', 'Download', 'POWER8 server', '14.04.2']);">14.04.2 LTS&nbsp;&rsaquo;</a></li>
+					<li><a href="http://cdimage.ubuntu.com/releases/15.04/release/" onclick="_gaq.push(['_trackEvent', 'Download', 'POWER8 server', '15.04']);">15.04&nbsp;&rsaquo;</a></li>
 				</ul>
 			</div>
 			<div class="six-col last-col">
 				<h4>Netboot image</h4>
 				<ul class="no-bullets">
-					<li><a href="http://ports.ubuntu.com/ubuntu-ports/dists/trusty/main/installer-ppc64el/" onclick="_gaq.push(['_trackEvent', 'External Link', 'POWER8 netboot download', 'From Download POWER8']);">14.04&nbsp;&rsaquo;</a></li>
+					<li><a href="http://ports.ubuntu.com/ubuntu-ports/dists/trusty-updates/main/installer-ppc64el/current/images/netboot/" onclick="_gaq.push(['_trackEvent', 'Download', 'POWER8 netboot', '14.04.2']);">14.04.2 LTS&nbsp;&rsaquo;</a></li>
+					<li><a href="http://ports.ubuntu.com/ubuntu-ports/dists/vivid/main/installer-ppc64el/current/images/netboot/" onclick="_gaq.push(['_trackEvent', 'Download', 'POWER8 netboot', '15.04']);">15.04&nbsp;&rsaquo;</a></li>
 				</ul>
 			</div>
 		</div>
@@ -36,8 +37,16 @@ <h4>Netboot image</h4>
 <div class="row row-grey">
 	<div class="box box-highlight clearfix">
 		<div class="eight-col no-margin-bottom">
-			<h3>Ubuntu 14.04.1 for IBM POWER8</h3>
-			<p>Ubuntu 14.04.1 brings with it, for the first time, support for IBM POWER8 including our MAAS provisioning, Juju cloud orchestration, Landscape systems management and Ubuntu OpenStack.</p>
+			<h3>Ubuntu 14.04.2 LTS for IBM POWER8</h3>
+			<p>Ubuntu 14.04 brings with it, for the first time, support for IBM POWER8 including our MAAS provisioning, Juju cloud orchestration, Landscape systems management and Ubuntu OpenStack.  Ubuntu 14.04.2 adds CAPI and PowerNV support.</p>
+		</div>
+	</div>
+</div>
+<div class="row">
+	<div class="box clearfix">
+		<div class="eight-col no-margin-bottom">
+			<h3>Ubuntu for 15.04 for IBM POWER8</h3>
+			<p>Ubuntu 15.04 continues to enable rapid innovation for POWER8 including Docker and Hardware Transactional Memory support along with many performance and availability enhancements. In addition, the OpenPOWER Foundation demonstrated over a dozen solutions running on Ubuntu at their inaugural OpenPOWER Summit in March 2015.</p>
 		</div>
 	</div>
 </div>
diff --git a/templates/download/server/thank-you.html b/templates/download/server/thank-you.html
index 8e66d071abc..b18f9a0e8f1 100755
--- a/templates/download/server/thank-you.html
+++ b/templates/download/server/thank-you.html
@@ -6,7 +6,7 @@
 {% block extra_body_class %}download-thankyou{% endblock %}
 
 {% block second_level_nav_items %}
-    {% include "_base/_nav_breadcrumb.html" with section_title="Download" subsection_title="Server" page_title="Thank you"  %}
+    {% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Server" page_title="Thank you"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
@@ -32,9 +32,9 @@ <h3>Ubuntu Advantage</h3>
                 <div class="text-center four-col">
                     <img alt="ubuntu one" src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-startfirst-warmgrey.svg" width="113" height="113" />
                 </div>
-                <h3>Jumpstart Training</h3>
-                <p>Two full days of technical training, covering Ubuntu, MAAS, Juju, Landscape, and OpenStack.</p>
-                <p><a href="/cloud/jumpstart-training">Learn more about  Jumpstart Training&nbsp;&rsaquo;</a></p>
+                <h3>OpenStack Training</h3>
+                <p>In a classroom or at your company, learn the ins and outs of OpenStack.</p>
+                <p><a href="/cloud/training">Learn more about OpenStack Training&nbsp;&rsaquo;</a></p>
             </div><!-- /.four-col -->
             <div class="four-col ask last-col box box-highlight">
                 <div class="text-center four-col">
diff --git a/templates/download/_includes/_ask_ubuntu.html b/templates/download/shared/_ask_ubuntu.html
similarity index 100%
rename from templates/download/_includes/_ask_ubuntu.html
rename to templates/download/shared/_ask_ubuntu.html
diff --git a/templates/download/_includes/_contextual_footer.html b/templates/download/shared/_contextual_footer.html
similarity index 62%
rename from templates/download/_includes/_contextual_footer.html
rename to templates/download/shared/_contextual_footer.html
index 9762b1fdba3..d175cf17d2e 100755
--- a/templates/download/_includes/_contextual_footer.html
+++ b/templates/download/shared/_contextual_footer.html
@@ -24,7 +24,7 @@ <h3>Installation guides</h3>
 		<ul class="no-bullets">
 			<li><a href="/download/desktop/install-ubuntu-desktop">Install Ubuntu Desktop&nbsp;&rsaquo;</a></li>
 			<li><a href="/download/server/install-ubuntu-server">Installation instructions for Ubuntu Server&nbsp;&rsaquo;</a></li>
-			<li><a href="/download/cloud/install-ubuntu-cloud">Installation instructions for Ubuntu OpenStack&nbsp;&rsaquo;</a></li>
+			<li><a href="/download/cloud/install-ubuntu-openstack">Installation instructions for Ubuntu OpenStack&nbsp;&rsaquo;</a></li>
 		</ul>
 	</div>
 {% else %}
@@ -44,21 +44,23 @@ <h3>Try before you install</h3>
 		</ul>
 	</div>
 {% else %}
-{% if level_2 == 'cloud' or level_2 == 'server' and level_3 == 'thank-you' %}
+{% if level_2 == 'cloud' and level_3 != 'install-ubuntu-openstack' %}
 	<div class="feature-two four-col">
 		<h3>Installation guides</h3>
 		<p>If you need some help installing Ubuntu, please check out our step-by-step guides.</p>
 		<ul class="no-bullets">
 			<li><a href="/download/server/install-ubuntu-server">Installation instructions for Ubuntu Server&nbsp;&rsaquo;</a></li>
-			<li><a href="/download/cloud/install-ubuntu-cloud">Installation instructions for Ubuntu OpenStack&nbsp;&rsaquo;</a></li>
-			<li><a href="https://help.ubuntu.com/community/UbuntuHashes" class="external">View Ubuntu&rsquo;s md5 hashes</a></li>
-			<li><a href="https://insights.ubuntu.com/2014/05/21/ubuntu-cloud-documentation-14-04lts/" class="external">Ubuntu Cloud Documentation</a></li>
+			<li><a href="/download/cloud/install-ubuntu-openstack">Using Ubuntu OpenStack &dash; The Canonical Distribution&nbsp;&rsaquo;</a></li>
+			<li><a class="external" href="https://help.ubuntu.com/lts/clouddocs/en/Intro.html ">Manually installing OpenStack using MAAS and Juju</a></li>
 		</ul>
 	</div>
 	<div class="feature-three four-col">
 		<h3>Detailed documentation</h3>
-		<p><a class="external" href="https://wiki.ubuntu.com/DocumentationTeam/SystemDocumentation/UbuntuServerGuide">Ubuntu Server Guide</a></p>
-		<p><a class="external" href="https://help.ubuntu.com/14.04/index.html">Ubuntu 14.04 LTS documentation</a></p>
+		<ul class="no-bullets">
+		    <li><a class="external" href="https://help.ubuntu.com/lts/serverguide/index.html">Ubuntu Server Guide</a></li>
+            <li><a class="external" href="https://help.ubuntu.com/14.04/index.html">Ubuntu 14.04 LTS documentation</a></li>
+            <li><a class="external" href="https://help.ubuntu.com/15.04/index.html">Ubuntu 15.04 documentation</a></li>
+		</ul>
 	</div><!-- /.feature-two -->
 {% else %}
 {% if level_2 == 'desktop' and level_3 == 'thank-you' %}
@@ -72,22 +74,25 @@ <h3>Installation guides</h3>
 	</div>
 	<div class="feature-three four-col">
 		<h3>Detailed documentation</h3>
-		<p><a class="external" href="https://wiki.ubuntu.com/DocumentationTeam/SystemDocumentation/UbuntuDesktopGuide">Ubuntu Desktop Guide</a></p>
 		<p><a class="external" href="https://help.ubuntu.com/14.04/index.html">Ubuntu 14.04 LTS documentation</a></p>
+		<p><a class="external" href="https://help.ubuntu.com/15.04/index.html">Ubuntu 15.04 documentation</a></p>
 	</div><!-- /.feature-two -->
 {% else %}
-{% if level_2 == 'cloud' and level_3 == 'install-ubuntu-cloud' or level_3 == 'cloud-archive-instructions' %}
+{% if level_2 == 'cloud' and level_3 == 'install-ubuntu-openstack' or level_3 == 'cloud-archive-instructions' %}
 	<div class="feature-two four-col">
 		<h3>Installation guides</h3>
-		<p>If you need some help installing Ubuntu, please check out our step-by-step guides.</p>
+		<p>If you need some help installing Ubuntu Server, please check out our step-by-step guide.</p>
 		<ul class="no-bullets">
-			<li><a href="/download/server/install-ubuntu-server">Installation instructions for Ubuntu Server&nbsp;&rsaquo;</a></li>
+			<li><a href="/download/server/install-ubuntu-server">Installing Ubuntu Server&nbsp;&rsaquo;</a></li>
 		</ul>
 	</div>
 	<div class="feature-three four-col">
 		<h3>Detailed documentation</h3>
-		<p><a class="external" href="https://wiki.ubuntu.com/DocumentationTeam/SystemDocumentation/UbuntuServerGuide">Ubuntu Server Guide</a></p>
-		<p><a class="external" href="https://help.ubuntu.com/14.04/index.html">Ubuntu 14.04 LTS documentation</a></p>
+		<ul class="no-bullets">
+		  <li><a class="external" href="https://wiki.ubuntu.com/DocumentationTeam/SystemDocumentation/UbuntuServerGuide">Ubuntu Server Guide</a></li>
+      <li><a class="external" href="https://help.ubuntu.com/14.04/index.html">Ubuntu 14.04 LTS documentation</a></li>
+      <li><a class="external" href="https://help.ubuntu.com/15.04/index.html">Ubuntu 15.04 documentation</a></li>
+		</ul>
 	</div><!-- /.feature-two -->
 {% else %}
 {% if level_2 == 'cloud' %}
@@ -129,7 +134,7 @@ <h3>Download Ubuntu Server for cloud</h3>
 	</div>
 	<div class="feature-three four-col">
 		<h3>Detailed documentation</h3>
-		<p><a class="external" href="https://wiki.ubuntu.com/DocumentationTeam/SystemDocumentation/UbuntuServerGuide">Ubuntu Server Guide</a></p>
+		<p><a class="external" href="https://help.ubuntu.com/lts/serverguide/index.htm">Ubuntu Server Guide</a></p>
 		<p><a class="external" href="https://help.ubuntu.com/14.04/index.html">Ubuntu 14.04 LTS documentation</a></p>
 	</div><!-- /.feature-two -->
 {% else %}
@@ -137,13 +142,13 @@ <h3>Detailed documentation</h3>
 	<div class="feature-two four-col">
 		<h3>Installation guides</h3>
 		<p>If you need some help installing Ubuntu, please check out our step-by-step guides.</p>
-		<p><a href="/download/cloud/install-ubuntu-cloud">Installation instructions for Ubuntu OpenStack&nbsp;&rsaquo;</a></p>
+		<p><a href="/download/server/install-ubuntu-server">Installation instructions for Ubuntu Server&nbsp;&rsaquo;</a></p>
 		<p><a href="https://help.ubuntu.com/community/UbuntuHashes" class="external">View Ubuntu&rsquo;s md5 hashes</a></p>
 	</div>
 	<div class="feature-three four-col">
-		<h3>Detailed documentation</h3>
-		<p><a class="external" href="https://wiki.ubuntu.com/DocumentationTeam/SystemDocumentation/UbuntuServerGuide">Ubuntu Server Guide</a></p>
-		<p><a class="external" href="https://help.ubuntu.com/14.04/index.html">Ubuntu 14.04 LTS documentation</a></p>
+		<h3 class="external"><span>Detailed documentation</span></h3>
+		<p><a href="https://help.ubuntu.com/lts/serverguide/index.html ">Ubuntu Server Guide&nbsp;&rsaquo;</a></p>
+		<p><a href="https://help.ubuntu.com/14.04/index.html">Ubuntu 14.04 LTS documentation&nbsp;&rsaquo;</a></p>
 	</div><!-- /.feature-two -->
 {% else %}
 {% if level_2 == 'server' and not level_3 %}
@@ -151,26 +156,39 @@ <h3>Detailed documentation</h3>
 		<h3>Installation guides</h3>
 		<ul class="no-bullets">
 			<li><a href="/download/server/install-ubuntu-server">Installation instructions for Ubuntu Server&nbsp;&rsaquo;</a></li>
-			<li><a href="/download/cloud/install-ubuntu-cloud">Installation instructions for Ubuntu OpenStack&nbsp;&rsaquo;</a></li>
+			<li><a href="/download/cloud/install-ubuntu-openstack">Installation instructions for Ubuntu OpenStack&nbsp;&rsaquo;</a></li>
 			<li><a href="https://help.ubuntu.com/community/UbuntuHashes" class="external">View Ubuntu&rsquo;s md5 hashes</a></li>
 		</ul>
 	</div>
 	<div class="feature-three four-col">
-		<h3>Detailed documentation</h3>
-		<p><a class="external" href="https://wiki.ubuntu.com/DocumentationTeam/SystemDocumentation/UbuntuServerGuide">Ubuntu Server Guide</a></p>
-		<p><a class="external" href="https://help.ubuntu.com/14.04/index.html">Ubuntu 14.04 LTS documentation</a></p>
+		<h3 class="external"><span>Detailed documentation</span></h3>
+		<p><a href="https://help.ubuntu.com/lts/serverguide/index.html">Ubuntu Server Guide&nbsp;&rsaquo;</a></p>
+		<p><a href="https://help.ubuntu.com/14.04/index.html">Ubuntu 14.04 LTS documentation&nbsp;&rsaquo;</a></p>
 	</div><!-- /.feature-two -->
 {% else %}
 {% if level_2 == 'ubuntu-kylin' %}
-	<div class="feature-two four-col">
-		<h3>The community is here to help</h3>
-		<p>To learn more about Ubuntu Kylin or get help on installing or using it, visit <a href="http://www.ubuntukylin.com">www.ubuntukylin.com</a>.</p>
+	<div class="feature-one four-col">
+        <h3>BitTorrent</h3>
+        <p>If you prefer, you can download Ubuntu Kylin via a torrent.</p>
+        <ul class="no-bullets vertical-divider">
+            <li class="two-col"><h4>Ubuntu Kylin 14.04.2</h4>
+                <ul class="no-bullets">
+                    <li><a class="external" href="http://cdimage.ubuntu.com/ubuntukylin/releases/14.04/release/ubuntukylin-14.04.2-desktop-amd64.iso.torrent">64-bit torrent</a></li>
+                    <li><a class="external" href="http://cdimage.ubuntu.com/ubuntukylin/releases/14.04/release/ubuntukylin-14.04.2-desktop-i386.iso.torrent">32-bit torrent</a></li>
+               </ul>
+            </li>
+            <li class="two-col last-col">
+                <h4>Ubuntu Kylin 15.04</h4>
+                <ul class="no-bullets">
+                    <li><a class="external" href="http://cdimage.ubuntu.com/ubuntukylin/releases/15.04/release/ubuntukylin-15.04-desktop-amd64.iso.torrent ">64-bit torrent</a></li>
+                    <li><a class="external" href="http://cdimage.ubuntu.com/ubuntukylin/releases/15.04/release/ubuntukylin-15.04-desktop-i386.iso.torrent">32-bit torrent</a></li>
+                </ul>
+            </li>
+        </ul>
 	</div>
-{% else %}
-{% if level_2 == 'ubuntu-kylin-zh-CN' %}
-	<div class="feature-two four-col">
-		<h3>社区为您提供帮助</h3>
-		<p>要了解更多关于Ubuntu Kylin的信息，或获取有关安装和使用它的帮助，请访问 <a href="http://www.ubuntukylin.com">www.ubuntukylin.com</a>.</p>
+	<div class="feature-three four-col">
+		<h3>The community is here to help</h3>
+		<p>To learn more about Ubuntu Kylin or get help on installing or using it, visit <a class="external" href="http://www.ubuntukylin.com">www.ubuntukylin.com</a>.</p>
 	</div>
 {% else %}
 {% if level_2 == null %}
@@ -185,26 +203,16 @@ <h3>Installation guides</h3>
 		<p>If you need some help installing Ubuntu, please check out our step-by-step guide.</p>
 		<p><a href="/download/desktop/install-ubuntu-desktop">Read the installation instructions&nbsp;&rsaquo;</a></p>
 	</div><!-- /.feature-two -->
-{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}
+{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}
 {% if level_2 != 'ubuntu-kylin-zh-CN' %}
 	<div class="feature-four four-col">
-		<h3>Helping hands</h3>
+		<h3 class="external"><span>Helping hands</span></h3>
 		<p>If you get stuck, help is always at hand.</p>
 		<ul class="no-bullets">
-			<li><a class="external" href="http://askubuntu.com/">Ask Ubuntu</a></li>
-			<li><a class="external" href="http://ubuntuforums.org/">Ubuntu Forums</a></li>
-			<li><a class="external" href="http://discourse.ubuntu.com">Ubuntu Discourse</a></li>
-		</ul>
-	</div>
-{% endif %}
-{% if level_2 == 'ubuntu-kylin-zh-CN' %}
-	<div class="feature-four four-col">
-		<h3>援助之手</h3>
-		<p>如果您遇到问题, 帮助总是在身边。</p>
-		<ul class="no-bullets">
-			<li><a class="external" href="http://askubuntu.com/">Ask Ubuntu</a></li>
-			<li><a class="external" href="http://ubuntuforums.org/">Ubuntu Forums</a></li>
-			<li><a class="external" href="http://discourse.ubuntu.com">Ubuntu Discourse</a></li>
+			<li><a href="http://askubuntu.com/">Ask Ubuntu&nbsp;&rsaquo;</a></li>
+			<li><a href="http://ubuntuforums.org/">Ubuntu Forums&nbsp;&rsaquo;</a></li>
+			<li><a href="http://discourse.ubuntu.com">Ubuntu Discourse&nbsp;&rsaquo;</a></li>
+			<li><a href="https://help.ubuntu.com/community/InternetRelayChat">Live Support Chat&nbsp;&rsaquo;</a></li>
 		</ul>
 	</div>
 {% endif %}
\ No newline at end of file
diff --git a/templates/download/_includes/_wiki_link.html b/templates/download/shared/_wiki_link.html
similarity index 100%
rename from templates/download/_includes/_wiki_link.html
rename to templates/download/shared/_wiki_link.html
diff --git a/templates/download/_includes/_wiki_link_latest.html b/templates/download/shared/_wiki_link_latest.html
similarity index 100%
rename from templates/download/_includes/_wiki_link_latest.html
rename to templates/download/shared/_wiki_link_latest.html
diff --git a/templates/download/ubuntu-kylin-zh-CN.html b/templates/download/ubuntu-kylin-zh-CN.html
deleted file mode 100755
index 7e2e5ce0e2e..00000000000
--- a/templates/download/ubuntu-kylin-zh-CN.html
+++ /dev/null
@@ -1,49 +0,0 @@
-
-{% extends "download/_base_download.html" %}
-
-{% block title %}下载Ubuntu Kylin | Download{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Download" subsection_title="Ubuntu Kylin" page_title="zh-CN" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-{% with ubuntu_release="14.04.1" openstack_version="Icehouse" %}
-<div class="row row-hero row-background">
-	<a class="lang-switch" href="/download/ubuntu-kylin">English version&nbsp;&rsaquo;</a>
-	<div class="nine-col append-four">
-		<h1 lang="zh">Ubuntu 桌面版 {{ubuntu_release}} 长期支持版</h1>
-	</div>
-	<div class="twelve-col">
-		<div class="box box-highlight clearfix vertical-divider">
-			<div class="eight-col no-margin-bottom">
-				<h2 lang="zh">Ubuntu Kylin {{ubuntu_release}} 长期支持版</h2>
-				<p lang="zh">请点击右边的橙色按钮下载最新的Ubuntu Kylin {{ubuntu_release}} 长期支持版 ISO 镜像文件。把镜像文件烧制到光盘上，或是创建一个可启动U盘，即可安装Ubuntu Kylin。</p>
-			</div>
-
-			<div class="four-col last-col no-margin-bottom">
-
-
-				<div class="four-col last-col no-margin-bottom">
-					<form class="form-download lts" action="http://cdimage.ubuntu.com/ubuntukylin/releases/{{ubuntu_release}}/release/ubuntukylin-{{ubuntu_release}}-desktop-amd64.iso" method="get">
-						<fieldset>
-							<div>
-								<button type="submit" class="link-cta-ubuntu cta-large" onclick="_gaq.push(['_trackEvent', 'Download Link', '{{ubuntu_release}}', 'From English-language Chinese download']);">64位下载键</button>
-							</div>
-						</fieldset>
-					</form>
-					<form class="form-download lts" action="http://cdimage.ubuntu.com/ubuntukylin/releases/{{ubuntu_release}}/release/ubuntukylin-{{ubuntu_release}}-desktop-i386.iso" method="get">
-						<fieldset>
-							<div>
-								<button type="submit" class="link-cta-ubuntu cta-large" onclick="_gaq.push(['_trackEvent', 'Download Link', '{{ubuntu_release}}', 'From English-language Chinese download']);">32位下载键</button>
-							</div>
-						</fieldset>
-					</form>
-					<p class="note">I如果你电脑的内存少于2GB,选择32位下载</p>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-{% endwith %}
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/download/ubuntu-kylin.html b/templates/download/ubuntu-kylin.html
index 4c374f53722..9f2762172dd 100755
--- a/templates/download/ubuntu-kylin.html
+++ b/templates/download/ubuntu-kylin.html
@@ -4,41 +4,70 @@
 {% block title %}Download Ubuntu Kylin | Download{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="zh-CN" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="zh-CN" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
-{% with ubuntu_release="14.04.1" openstack_version="Icehouse" %}
+{% with lts_release="14.04.2" latest_release="15.04" openstack_version="juno" %}
 <div class="row row-hero row-background">
-	<a class="lang-switch" href="/download/ubuntu-kylin-zh-CN" lang="zh">中国版&nbsp;&rsaquo;</a>
 	<div class="eight-col append-four">
 		<h1>Download Ubuntu Kylin</h1>
 	</div>
-	<div class="twelve-col">
+	<div class="twelve-col no-margin-bottom">
 		<div class="box box-highlight clearfix vertical-divider">
 			<div class="eight-col no-margin-bottom">
-				<h2>Ubuntu Kylin {{ubuntu_release}} LTS</h2>
-				<p>Click the orange button to the right and download the latest Ubuntu Kylin {{ubuntu_release}} LTS ISO image file. To install Ubuntu Kylin, burn the image file on a DVD or create a bootable USB disk.</p>
+				<h2>Ubuntu Kylin {{lts_release}} LTS</h2>
+				<p>Download the Long Term Support edition of Ubuntu Kylin {{lts_release}} LTS ISO image file. To install Ubuntu Kylin, burn the image file on a DVD or create a bootable USB disk.</p>
 			</div>
 			<div class="four-col last-col no-margin-bottom">
-				<form class="form-download lts" action="http://cdimage.ubuntu.com/ubuntukylin/releases/{{ubuntu_release}}/release/ubuntukylin-{{ubuntu_release}}-desktop-amd64.iso" method="get">
+				<form class="form-download gap-from-top lts" action="http://cdimage.ubuntu.com/ubuntukylin/releases/{{lts_release}}/release/ubuntukylin-{{lts_release}}-desktop-amd64.iso" method="get">
 					<fieldset>
 						<div>
-							<button type="submit" class="link-cta-ubuntu cta-large" onclick="_gaq.push(['_trackEvent', 'Download Link', '{{ubuntu_release}}', 'From English-language Chinese download']);">Download 64-bit</button>
+							<button type="submit" class="link-cta-ubuntu cta-large" onclick="_gaq.push(['_trackEvent', 'Download Link', '{{lts_release}} 64 bit', 'From English-language Chinese download']);">Download 64-bit</button>
 						</div>
 					</fieldset>
 				</form>
-				<form class="form-download lts" action="http://cdimage.ubuntu.com/ubuntukylin/releases/{{ubuntu_release}}/release/ubuntukylin-{{ubuntu_release}}-desktop-i386.iso" method="get">
+				<form class="form-download lts" action="http://cdimage.ubuntu.com/ubuntukylin/releases/{{lts_release}}/release/ubuntukylin-{{lts_release}}-desktop-i386.iso" method="get">
 					<fieldset>
 						<div>
-							<button type="submit" class="link-cta-ubuntu cta-large" onclick="_gaq.push(['_trackEvent', 'Download Link', '{{ubuntu_release}}', 'From English-language Chinese download']);">Download 32-bit</button>
+							<button type="submit" class="link-cta-ubuntu cta-large" onclick="_gaq.push(['_trackEvent', 'Download Link', '{{lts_release}} 32 bit', 'From English-language Chinese download']);">Download 32-bit</button>
 						</div>
 					</fieldset>
 				</form>
 				<p class="note">If you have an older PC with less than 2GB of memory, choose the 32-bit download.</p>
 			</div>
+		</div><!-- /.box -->
+		<p class="intro"><a class="external" href="http://www.ubuntu-china.cn" onclick="_gaq.push(['_trackEvent', 'External Link', 'Download Kylin hero', 'From Ubuntu download kylin']);">Ubuntu 中国网站现已面世</a></p>
+	</div>
+</div><!-- /.row -->
+
+<div class="row no-border row-grey">
+	<div class="twelve-col no-margin-bottom">
+		<div class="box box-highlight clearfix vertical-divider">
+			<div class="eight-col no-margin-bottom">
+				<h2>Ubuntu Kylin {{latest_release}}</h2>
+				<p>Download the latest version of Ubuntu Kylin {{latest_release}} ISO image file. To install Ubuntu Kylin, burn the image file on a DVD or create a bootable USB disk.</p>
+			</div>
+			<div class="four-col last-col no-margin-bottom">
+				<form class="form-download gap-from-top" action="http://cdimage.ubuntu.com/ubuntukylin/releases/{{latest_release}}/release/ubuntukylin-{{latest_release}}-desktop-amd64.iso" method="get">
+					<fieldset>
+						<div>
+							<button type="submit" class="link-cta-ubuntu cta-large" onclick="_gaq.push(['_trackEvent', 'Download Link', '{{latest_release}} 64 bit', 'From English-language Chinese download']);">Download 64-bit</button>
+						</div>
+					</fieldset>
+				</form>
+				<form class="form-download" action="http://cdimage.ubuntu.com/ubuntukylin/releases/{{latest_release}}/release/ubuntukylin-{{latest_release}}-desktop-i386.iso" method="get">
+					<fieldset>
+						<div>
+							<button type="submit" class="link-cta-ubuntu cta-large" onclick="_gaq.push(['_trackEvent', 'Download Link', '{{latest_release}} 32 bit', 'From English-language Chinese download']);">Download 32-bit</button>
+						</div>
+					</fieldset>
+				</form>
+        <p class="note">If you have an older PC with less than 2GB of memory, choose the 32-bit download.</p>
+			</div>
 		</div>
 	</div>
+
 </div>
 {% endwith %}
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index 4b934c5a587..22ca309e709 100755
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,10 +1,11 @@
 {% extends "base_index.html" %}
 
-{% block takeover_body_class %} wef-takeover{% endblock takeover_body_class %}
+{% block takeover_body_class %} vivid-release-takeover{% endblock takeover_body_class %}
 
 {% block takeover_content %}
 	{% if switcher %}
-		<a href="/" class="lang-switch" lang="zh">中文主页&nbsp;&rsaquo;</a>
+    		  <div class="lang-switch-wrapper strip-inner-wrapper"><a href="/" class="lang-switch" lang="zh">中文主页&nbsp;&rsaquo;</a></div>
 	{% endif %}
-	{% include "takeovers/_wef_takeover.html" %}
-{% endblock takeover_content %}
+	{% include "takeovers/_1504_takeover.html" %}
+	{% include "takeovers/_footer_homepage.html" %}
+{% endblock takeover_content %}
\ No newline at end of file
diff --git a/templates/index_dell.html b/templates/index_dell.html
new file mode 100644
index 00000000000..1b187a35950
--- /dev/null
+++ b/templates/index_dell.html
@@ -0,0 +1,11 @@
+{% extends "base_index.html" %}
+
+{% block takeover_body_class %} dell-xps-takeover{% endblock takeover_body_class %}
+
+{% block takeover_content %}
+	{% if switcher %}
+    		  <div class="lang-switch-wrapper strip-inner-wrapper"><a href="/" class="lang-switch" lang="zh">中文主页&nbsp;&rsaquo;</a></div>
+	{% endif %}
+	{% include "takeovers/_dell_xps_takeover.html" %}
+	{% include "takeovers/_footer_homepage.html" %}
+{% endblock takeover_content %}
diff --git a/templates/index_dell_latam.html b/templates/index_dell_latam.html
new file mode 100644
index 00000000000..94b09d366ce
--- /dev/null
+++ b/templates/index_dell_latam.html
@@ -0,0 +1,11 @@
+{% extends "base_index.html" %}
+
+{% block takeover_body_class %} dell-latam-takeover{% endblock takeover_body_class %}
+
+{% block takeover_content %}
+	{% if switcher %}
+    		  <div class="lang-switch-wrapper strip-inner-wrapper"><a href="/" class="lang-switch" lang="zh">中文主页&nbsp;&rsaquo;</a></div>
+	{% endif %}
+	{% include "takeovers/_dell_latam_takeover.html" %}
+	{% include "takeovers/_footer_homepage.html" %}
+{% endblock takeover_content %}
diff --git a/templates/index_kylin.html b/templates/index_kylin.html
index b04b194036b..3479199ed21 100755
--- a/templates/index_kylin.html
+++ b/templates/index_kylin.html
@@ -1,10 +1,10 @@
 {% extends "base_index.html" %}
 
-{% block takeover_body_class %} homepage-kylin{% endblock takeover_body_class %}
+{% block takeover_body_class %} vivid-release-takeover{% endblock takeover_body_class %}
 
 {% block takeover_content %}
 	<div class="lang-switch-wrapper strip-inner-wrapper"><a href="/global" class="lang-switch" lang="en">Global homepage&nbsp;&rsaquo;</a></div>
-	{% include "takeovers/_kylin.html" %}
+	{% include "takeovers/_vivid_release_kylin.html" %}
 {% endblock takeover_content %}
 
 {% block footer_content %}
diff --git a/templates/index_roadshow.html b/templates/index_roadshow.html
new file mode 100644
index 00000000000..a96f801ed00
--- /dev/null
+++ b/templates/index_roadshow.html
@@ -0,0 +1,11 @@
+{% extends "base_index.html" %}
+
+{% block takeover_body_class %}openstack_roadshow{% endblock takeover_body_class %}
+
+{% block takeover_content %}
+	{% include "takeovers/_roadshow_takeover.html" %}
+{% endblock takeover_content %} 
+
+{% block footer_content %}
+	{% include "takeovers/_footer_homepage.html" %}
+{% endblock footer_content %}
diff --git a/templates/info/release-end-of-life.html b/templates/info/release-end-of-life.html
index d3ca7ac5357..b2da631e6e3 100755
--- a/templates/info/release-end-of-life.html
+++ b/templates/info/release-end-of-life.html
@@ -1,4 +1,4 @@
-{% extends "_base/one-column.html" %}
+{% extends "templates/one-column.html" %}
 
 {% block meta_description %}When an Ubuntu release reaches its "end of life" it receives no further maintenance updates, including critical security upgrades. It is highly recommended that you upgrade to a recent version of Ubuntu at this point.{% endblock %}
 {% block meta_keywords %}end of life, eol, release, release schedule, Ubuntu, Oneiric Ocelot, Natty Narwhal, Maverick Meerkat, Lucid Lynx (Desktop), Karmic Koala, Jaunty Jackalope, Intrepid Ibex, Hardy Heron, Gutsy Gibbon, Feisty Fawn, Edgy Eft, Dapper Drake, Breezy Badger, Hoary Hedgehog, Warty Warthog, Ubuntu 11.10 , Ubuntu 11.04, Ubuntu 10.10, Ubuntu 10.04, Ubuntu 9.10, Ubuntu 9.04, Ubuntu 8.10, Ubuntu 8.04.4 LTS, Ubuntu 8.04.3 LTS, Ubuntu 8.04.2 LTS, Ubuntu 8.04.1 LTS, Ubuntu 8.04 LTS, Ubuntu 8.04, Ubuntu 7.10, Ubuntu 7.04, Ubuntu 6.10, Ubuntu 6.06.2 LTS, Ubuntu 6.06.1 LTS, Ubuntu 6.06 LTS, Ubuntu 6.06, Ubuntu 5.10, Ubuntu 5.04, Ubuntu 4.10{% endblock %}
diff --git a/templates/info/testing.html b/templates/info/testing.html
index 8085ecc186a..a9bf73d8aae 100755
--- a/templates/info/testing.html
+++ b/templates/info/testing.html
@@ -1,4 +1,4 @@
-{% extends "_base/one-column.html" %}
+{% extends "templates/one-column.html" %}
 
 {% block title %}Ubuntu testing{% endblock %}
 
diff --git a/templates/legal/_base_legal.html b/templates/legal/_base_legal.html
index 3b7c29546b6..153f777a9e6 100755
--- a/templates/legal/_base_legal.html
+++ b/templates/legal/_base_legal.html
@@ -1,6 +1,6 @@
-{% extends "_base/base.html" %}
+{% extends "templates/base.html" %}
 
 {% block outer_content %}
     {% block content %}{% endblock %}
-		{% include "_base/_contextual_footer.html" %}
+		{% include "templates/_contextual_footer.html" %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/legal/_nav_tertiary.html b/templates/legal/_nav_tertiary.html
index c96e114752f..cfeeddd98c8 100755
--- a/templates/legal/_nav_tertiary.html
+++ b/templates/legal/_nav_tertiary.html
@@ -6,11 +6,14 @@
 		<li{% if level_3 == 'intellectual-property-policy' %} class="active"{% endif %}><a href="/legal/terms-and-policies/intellectual-property-policy">Intellectual property</a></li>
 		<li{% if level_3 == 'online-account-terms' %} class="active"{% endif %}><a href="/legal/terms-and-policies/online-account-terms">Online account terms</a></li>
 		<li{% if level_3 == 'terms-of-service' %} class="active"{% endif %}><a href="/legal/terms-and-policies/terms-of-service">U1 Terms of Service</a></li>
+		<li{% if level_3 == 'confidentiality-agreement' %} class="active"{% endif %}><a href="/legal/terms-and-policies/confidentiality-agreement">
+		Confidentiality agreement</a></li>
 		{% endif %}
 
 		{% if level_2 == 'ubuntu-advantage' %}
 		<li{% if level_3 == 'service-description' %} class="active"{% endif %}><a href="/legal/ubuntu-advantage/service-description">Service description</a></li>
 		<li{% if level_3 == 'assurance' %} class="active"{% endif %}><a href="/legal/ubuntu-advantage/assurance">Ubuntu Assurance</a></li>
+		<li{% if level_3 == 'ua-terms' %} class="active"{% endif %}><a href="/legal/ubuntu-advantage/ua-terms">UA terms</a></li>
 		{% endif %}
 
 		{% if level_2 == 'contributors' %}
diff --git a/templates/legal/contributors/index.html b/templates/legal/contributors/index.html
index 1c5c456e388..02d665f0a8c 100755
--- a/templates/legal/contributors/index.html
+++ b/templates/legal/contributors/index.html
@@ -3,7 +3,7 @@
 {% block title %}Contributor license agreement{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Legal" page_title="Contributors" tertiary="true" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" page_title="Contributors" tertiary="true" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/legal/contributors/licence-agreement-faq.html b/templates/legal/contributors/licence-agreement-faq.html
index ba788db3fee..35701963471 100755
--- a/templates/legal/contributors/licence-agreement-faq.html
+++ b/templates/legal/contributors/licence-agreement-faq.html
@@ -5,7 +5,7 @@
 {% block title %}Contributor licence agreement FAQ | Contributors{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Contributors" page_title="Licence agreement FAQ" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Contributors" page_title="Licence agreement FAQ" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/legal/contributors/submit.html b/templates/legal/contributors/submit.html
index 42b56a8a0bc..b5922e8d999 100755
--- a/templates/legal/contributors/submit.html
+++ b/templates/legal/contributors/submit.html
@@ -105,7 +105,7 @@
 {% block title %}Submit contributor agreement | Contributors{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Contributors" page_title="How to submit" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Contributors" page_title="How to submit" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
@@ -114,26 +114,11 @@
 		<h1>Submit contributor agreement</h1>
 		<p>Before you contribute to one of our open source projects, you must complete all the fields in this form, sign it and return it to Canonical. Please make sure you have your Launchpad ID at the ready. If you don&rsquo;t have one, you can create one now at <a href="http://launchpad.net">launchpad.net</a>.</p>
 		<p>All fields are required.</p>
-	</div>
-	<div class="box four-col last-col">
-		<h3>Related content</h3>
-		<ul class="list">
-			<li class="last-item"><a class="external" href="http://www.canonical.com/projects/directory">Open source software projects</a></li>
-		</ul>
-	</div>
-	<div class="box four-col last-col">
-		<h3>Additional information</h3>
-		<ul class="list">
-			<li><a href="{{ STATIC_URL }}files/section/legal/Canonical-HA-CLA-ANY-I_v1.2.pdf">Agreement for individual contributors [PDF]&nbsp;&rsaquo;</a></li>
-			<li class="last-item"><a href="{{ STATIC_URL }}files/section/legal/Canonical-HA-CLA-ANY-E_v1.2.pdf">Agreement for entities [PDF]&nbsp;&rsaquo;</a></li>
-		</ul>
-	</div>
-<div class="eight-col">
 
 <div  id="faform_form_container">
 
-<div class="wFormContainer" style="width: default;" >
-<div class="wForm wFormdefaultWidth"><form method="post" action="https://www.tfaforms.com/responses/processor" id="id2661064" class="labelsAbove hintsTooltip"><div style='display:none;'><input type='hidden'  name='csrfmiddlewaretoken' value='c011ac6471cd39153410b2f332745f42' /></div>
+<div class="wFormContainer">
+<div class="wForm wFormdefaultWidth"><form method="post" action="https://www.tfaforms.com/responses/processor" id="id2661064" class="labelsAbove hintsTooltip">{% csrf_token %}<div style='display:none;'><!--<input type='hidden'  name='csrfmiddlewaretoken' value='c011ac6471cd39153410b2f332745f42' />--></div>
 <fieldset class="fieldset-1">
 <div id="tfa_Agreementtype1-D" class="oneField">
 	<h3>Agreement type</h3>
@@ -194,7 +179,7 @@ <h3 class="western">6. Miscellaneous</h3>
 <p style="margin-bottom: 0cm;">the assignment, that third party must agree in writing to abide by all the rights and obligations in the Agreement.</p>
 <p>6.4 The failure of either party to require performance by the other party of any provision of this Agreement in one situation shall not affect the right of a party to require such performance at any time in the future. A waiver of performance under a provision in one situation shall not be considered a waiver of the performance of the provision in the future or a waiver of the provision in its entirety.</p>
 <p>6.5 If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and which is enforceable. The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law.</p>
-<p>To <a href="{{ STATIC_URL }}files/Canonical-HA-CLA-ANY-I.pdf" target="_blank">download as a PDF</a></p>
+<p>To <a href="{{ STATIC_URL }}files/section/legal/Canonical-HA-CLA-ANY-I_v1.2.pdf" target="_blank">download as a PDF</a></p>
 </div>
 </fieldset>
 <fieldset id="tfa_CanonicalEntityC" class="wfSection offstate-a offstate-d">
@@ -241,7 +226,7 @@ <h3 class="western">6. Miscellaneous</h3>
 <p>6.3 If You or We assign the rights or obligations received through this Agreement to a third party, as a condition of the assignment, that third party must agree in writing to abide by all the rights and obligations in the Agreement.</p>
 <p>6.4 The failure of either party to require performance by the other party of any provision of this Agreement in one situation shall not affect the right of a party to require such performance at any time in the future. A waiver of performance under a provision in one situation shall not be considered a waiver of the performance of the provision in the future or a waiver of the provision in its entirety.</p>
 <p>6.5 If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and which is enforceable. The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law.</p>
-<p>To <a href="{{ STATIC_URL }}files/Canonical-HA-CLA-ANY-E.pdf" target="_blank">download as a PDF</a></p>
+<p>To <a href="{{ STATIC_URL }}files/section/legal/Canonical-HA-CLA-ANY-E_v1.2.pdf" target="_blank">download as a PDF</a></p>
 </div>
 </fieldset>
 <fieldset id="tfa_Yourcontactdetai1" class="wfSection fieldset-2">
@@ -269,10 +254,10 @@ <h3>Your contact details</h3>
 				</div>
 			</li>
 			<li class="inline">
-				<label class="preField" for="tfa_Phone">Launchpad ID</label>
+				<label class="preField" for="tfa_LPid">Launchpad ID (<a id="lp_help" href="//login.launchpad.net">Don't know your Launchpad ID?</a>)</label>
 				<input id="tfa_Openid" name="tfa_Openid" value="" class="" type="hidden">
 				<input id="tfa_LPid" name="tfa_LPid" value="" class="" type="text">
-				<span class="input-help"><a href="//login.launchpad.net">Don't know your Launchpad ID?</a></span>
+				<span class="input-help"><span id="lp_error" class="errMsg"></span></span>
 			</li>
 			<li class="inline">
 				<div id="tfa_Address-D" class="oneField">
@@ -591,28 +576,59 @@ <h3>Project contact</h3>
 					<input type="text" id="tfa_PleaseaddtheCano" name="tfa_PleaseaddtheCano" value="" size="40" class="required">
 				</div>
 			</li>
-			<li>
-				<div class="htmlsection" id="html-tmp-0767356147928"><p>By clicking 'I agree' below you are confirming that you&nbsp;accept the terms detailed above.</p></div>
-			</li>
-			<li>
-				<div class="actions">
-					<input type="submit" class="primaryAction" id="submit-" name="tfa_submitAction" value="I agree"><input type="hidden" value="237277" name="tfa_dbFormId" id="tfa_dbFormId"><input type="hidden" value="" name="tfa_dbResponseId" id="tfa_dbResponseId"><input type="hidden" value="d00afcc394fd0912b8a3895b593d43ef" name="tfa_dbControl" id="tfa_dbControl"><input type="hidden" value="7" name="tfa_dbVersionId" id="tfa_dbVersionId">
-				</div>
-			</li>
 		</ul>
 	</fieldset>
+
+	<fieldset class="captcha">
+		<h3>Verification</h3>
+		<p class="instructions">Please enter the characters you see in this picture:</p>
+		<div class="oneField">
+            <ul class="no-bullets">
+    			<li><img src="https://www.tfaforms.com/forms/captcha" width="200" height="60" alt="Visual CAPTCHA"></li>
+                <li>
+                    <label class="preField off-left">Characters</label> 
+                    <input type="text" name="tfa_captcha_text" id="tfa_captcha_text">
+                </li>
+                <li>
+                    <p>This helps prevent automated form submissions. If you are not sure what the characters are, make your best guess. You will have another try in the next screen. <a href="https://www.tfaforms.com/forms/captcha/1">Can't see the image? Listen to an audible version in English.</a></p>
+                </li>
+    			<li>
+    				<div class="htmlsection" id="html-tmp-0767356147928"><p>By clicking 'I agree' you are confirming that you accept the terms detailed&nbsp;above.</p></div>
+    			</li>
+                <li class="actions">
+                    <input type="submit" class="primaryAction" id="submit-" name="tfa_submitAction" value="I agree">
+                    <input type="hidden" value="237277" name="tfa_dbFormId" id="tfa_dbFormId">
+                    <input type="hidden" value="" name="tfa_dbResponseId" id="tfa_dbResponseId">
+                    <input type="hidden" value="d00afcc394fd0912b8a3895b593d43ef" name="tfa_dbControl" id="tfa_dbControl">
+                    <input type="hidden" value="7" name="tfa_dbVersionId" id="tfa_dbVersionId">
+                </li>
+            </ul>
+		</div>
+	</fieldset>
 </form>
 </div>
 
-      <p class="supportInfo" >
-                              <a href="https://www.tfaforms.com/forms/help/237277" target="new" style="font-size: 0.7em;">
-                    Need assistance with this form?               </a>
 
-                      </p>
+      <!-- <p class="supportInfo" ><a href="https://www.tfaforms.com/forms/help/237277">Need assistance with this form?</a></p> -->
 
 </div>
 </div>
+
 </div>
+	<div class="box four-col last-col">
+		<h3>Related content</h3>
+		<ul class="list">
+			<li class="last-item"><a class="external" href="http://www.canonical.com/projects/directory">Open source software projects</a></li>
+		</ul>
+	</div>
+	<div class="box four-col last-col">
+		<h3>Additional information</h3>
+		<ul class="list">
+			<li><a href="{{ STATIC_URL }}files/section/legal/Canonical-HA-CLA-ANY-I_v1.2.pdf">Agreement for individual contributors [PDF]&nbsp;&rsaquo;</a></li>
+			<li class="last-item"><a href="{{ STATIC_URL }}files/section/legal/Canonical-HA-CLA-ANY-E_v1.2.pdf">Agreement for entities [PDF]&nbsp;&rsaquo;</a></li>
+		</ul>
+	</div>
+
 </div>
 <script type="text/javascript">
 /* Copyright 2007 Veer West LLC - http://www.formassembly.com
@@ -703,5 +719,11 @@ <h3>Project contact</h3>
 	_addEvent(window,'load',populateForms);
 }();
 
+var launchpad_id_lookup = function() {
+	Y.one('#tfa_LPid').on('blur', function (e) {
+	    Y.io("/lookup_launchpad_id/" + Y.one('#tfa_LPid').get('value'), lp_lookup_callback);
+	});
+}();
+
 </script>
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/legal/contributors/thank-you.html b/templates/legal/contributors/thank-you.html
index 12dff73c003..3b7bcbbbde0 100755
--- a/templates/legal/contributors/thank-you.html
+++ b/templates/legal/contributors/thank-you.html
@@ -3,7 +3,7 @@
 {% block title %}Thank you for submitting your contributor license agreement | Ubuntu and Canonical legal{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Contributors" page_title="How to submit" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Contributors" page_title="How to submit" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/legal/index.html b/templates/legal/index.html
index ea4314819aa..41c8b7d23cc 100755
--- a/templates/legal/index.html
+++ b/templates/legal/index.html
@@ -7,7 +7,7 @@
 {% block extra_body_class %}legal{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Legal" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/legal/_includes/_contextual_footer.html b/templates/legal/shared/_contextual_footer.html
similarity index 52%
rename from templates/legal/_includes/_contextual_footer.html
rename to templates/legal/shared/_contextual_footer.html
index 30b3f4604de..6831d4ccfcc 100755
--- a/templates/legal/_includes/_contextual_footer.html
+++ b/templates/legal/shared/_contextual_footer.html
@@ -1,4 +1,4 @@
 	<div class="feature-one">
 		<h3>Further reading</h3>
-		{% include "_base/_further_reading_links.html" %}
+		{% include "templates/_further_reading_links.html" %}
 	</div>
\ No newline at end of file
diff --git a/templates/legal/terms-and-policies/confidentiality-agreement.html b/templates/legal/terms-and-policies/confidentiality-agreement.html
new file mode 100644
index 00000000000..4b419d6807f
--- /dev/null
+++ b/templates/legal/terms-and-policies/confidentiality-agreement.html
@@ -0,0 +1,520 @@
+{% extends "legal/_base_legal.html" %}
+
+{% block title %}Confidentiality agreement{% endblock %}
+{% block head_extra %}
+<script type="text/javascript" src="https://www.tfaforms.com/wForms/3.7/js/wforms.js"></script>
+<script type="text/javascript" src="https://www.tfaforms.com/wForms/3.7/js/localization-en_GB.js"></script>
+
+<link href="//www.tfaforms.com/css/form.css" rel="stylesheet" type="text/css" />
+<script type="text/javascript">
+    wFORMS.behaviors.prefill.skip = false;
+</script>
+<style type="text/css" media="screen">
+.supportInfo {
+	display: none;
+}
+
+.offstate-b {
+	display: none;
+}
+
+div.error, div.ok {
+    margin:20px 50px;
+    text-align:center;
+    padding: 0;
+}
+
+div.error p, div.ok p {
+    margin: 10px;
+}
+
+.wForm textarea {
+    width: 100%;
+}
+
+div.error {
+    background: #FCC;
+    color: #200;
+    border: 1px solid #D77;
+}
+
+div.ok {
+    background: #DFD;
+    color: #020;
+    border: 1px solid #0A0;
+}
+
+form label.reqMark {
+	color: #333;
+}
+
+</style>
+<script type="text/javascript">
+	/* make jslint happy */
+	/*global base2, document, wFORMS, $, $$ */
+
+
+	// Use this in a FormAssembly code block to add a string to a field's class (that's how standard validations work)
+	// this allows form developer to add validations not permitted by FormAssembly's UI.
+
+	function custom_validation(id, class_info)
+	{
+		base2.DOM.Element.addEventListener(document,'DOMContentLoaded',
+		function()
+		{
+			try {document.getElementById(id).className += " " + class_info;}
+			catch(err)
+			{
+				throw new Error("Custom validation could not be applied to field " + id);
+			}
+		},
+		false);
+	}
+
+	// validate-length validates string does not exceed given number of chars
+
+	wFORMS.behaviors.validation.rules.isUnderLimit   = { selector: ".validate-length", check: 'isUnderLimit' };
+	wFORMS.behaviors.validation.messages.isUnderLimit = "This text is too long.";
+
+	wFORMS.behaviors.validation.instance.prototype.isUnderLimit = function(element, value) {
+		var pattern = new RegExp(/validate-length (\d*)/i);
+		var matches = element.className.match(pattern);
+
+		if(matches && matches[1]) {
+			return (value.length <= matches[1]);
+		}
+		return true;
+	};
+
+
+	// validate-awsaccountnumber validates string as Amazon AWS Account Number
+
+	// we just check for exactly 12 digits, and each digit may be optionally followed by a dash
+	// so dashes are essentially ignored
+
+	wFORMS.behaviors.validation.rules.isAWSAccountNumber = { selector: ".validate-awsaccountnumber", check: 'validateAWSAccountNumber' };
+	wFORMS.behaviors.validation.messages.isAWSAccountNumber = "Not a valid Amazon AWS Account number (expected format '1234-5678-0987')";
+
+	wFORMS.behaviors.validation.instance.prototype.validateAWSAccountNumber = function(element, value) {
+		var regexp = /^(\d-?){12,12}$/;
+		return this.isEmpty(value) || regexp.test(value);
+	};
+</script>
+{% endblock %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Terms and policies" page_title="Canonical&rsquo;s privacy policy" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row row-hero row no-border">
+	<div class="eight-col">
+		<h1>Confidentiality agreement</h1>
+		<p>You can enter into a <a href="{{ STATIC_URL }}files/section/legal/canonical-nda.pdf" target="_blank">confidentiality agreement</a> with Canonical here, you must complete all the fields in this form.</p>
+		<div id="faform_form_container">
+			<div class="wFormContainer" style="width: default;">
+			    <div class="">
+			        <div class="wForm" id="tfa_0-WRPR" dir="ltr">
+			            <div class="codesection" id="code-tfa_0"></div>
+			            <form method="post" action="https://www.tfaforms.com/responses/processor" class="hintsTooltip labelsAbove" id="tfa_0">
+			                <div style="display:none;">
+			                    <input type="hidden" name="csrfmiddlewaretoken" value="d7952e7df2133d5703f3001be27d982e">
+			                </div>
+			                <fieldset id="tfa_22" class="section">
+			                    <h3>Organisation Details</h3>
+		                        <label id="tfa_9-L" for="tfa_9" class="label preField">Individual or Organisation name <span>*</span></label>
+	                            <input type="text" id="tfa_9" name="tfa_9" value=""  placeholder="" class="calc-OrgName required">
+			                </fieldset>
+			                <fieldset id="tfa_Yourcontactdetai1" class="section">
+			                    <h3>Your details</h3>
+			                    <ul class="no-bullets">
+			                    	<li class="inline">
+			                    		<div id="tfa_17-D" class="oneField">
+					                        <label id="tfa_17-L" for="tfa_17" class="label preField reqMark">Your Job Title <span>*</span></label>
+				                            <input type="text" id="tfa_17" name="tfa_17" value=""  placeholder="" class="required">
+					                    </div>
+			                    	</li>
+			                    	<li class="inline">
+			                    		<div id="tfa_11-D" class="oneFieldhintsBelow">
+					                        <label id="tfa_11-L" for="tfa_11" class="label preField reqMark">First name <span>*</span></label>
+
+					                        <div class="inputWrapper">
+					                            <input type="text" id="tfa_11" name="tfa_11" value=""  placeholder="" class="required">
+					                        </div>
+					                    </div>
+			                    	</li>
+			                    	<li class="inline">
+			                    		<div id="tfa_13-D" class="oneField">
+					                        <label id="tfa_13-L" for="tfa_13" class="label preField reqMark">Last name <span>*</span></label>
+
+					                        <div class="inputWrapper">
+					                            <input type="text" id="tfa_13" name="tfa_13" value=""  placeholder="" class="required">
+					                        </div>
+					                    </div>
+			                    	</li>
+			                    	<li class="inline">
+			                    		<div id="tfa_15-D" class="oneField">
+					                        <label id="tfa_15-L" for="tfa_15" class="label preField reqMark">Email <span>*</span></label>
+
+					                        <div class="inputWrapper">
+					                            <input type="text" id="tfa_15" name="tfa_15" value=""  placeholder="" class="validate-email required">
+					                        </div>
+					                    </div>
+			                    	</li>
+			                    	<li class="inline">
+				                    	<div id="tfa_Country-D" class="oneField">
+					                        <label id="tfa_Country-L" for="tfa_Country" class="label preField reqMark">Country <span>*</span></label>
+
+					                        <div class="inputWrapper">
+					                            <select id="tfa_Country" name="tfa_Country" class="required">
+					                                <option value="">Please select...</option>
+					                                <option value="tfa_Afghanistan" id="tfa_Afghanistan" class="">Afghanistan</option>
+					                                <option value="tfa_Albania" id="tfa_Albania" class="">Albania</option>
+					                                <option value="tfa_Algeria" id="tfa_Algeria" class="">Algeria</option>
+					                                <option value="tfa_AmericanSamoa" id="tfa_AmericanSamoa" class="">American Samoa</option>
+					                                <option value="tfa_Andorra" id="tfa_Andorra" class="">Andorra</option>
+					                                <option value="tfa_Angola" id="tfa_Angola" class="">Angola</option>
+					                                <option value="tfa_Anguilla" id="tfa_Anguilla" class="">Anguilla</option>
+					                                <option value="tfa_Antarctica" id="tfa_Antarctica" class="">Antarctica</option>
+					                                <option value="tfa_AntiguaandBarbud" id="tfa_AntiguaandBarbud" class="">Antigua and Barbuda</option>
+					                                <option value="tfa_Argentina" id="tfa_Argentina" class="">Argentina</option>
+					                                <option value="tfa_Armenia" id="tfa_Armenia" class="">Armenia</option>
+					                                <option value="tfa_Aruba" id="tfa_Aruba" class="">Aruba</option>
+					                                <option value="tfa_Australia" id="tfa_Australia" class="">Australia</option>
+					                                <option value="tfa_Austria" id="tfa_Austria" class="">Austria</option>
+					                                <option value="tfa_Azerbaijan" id="tfa_Azerbaijan" class="">Azerbaijan</option>
+					                                <option value="tfa_Bahamas" id="tfa_Bahamas" class="">Bahamas</option>
+					                                <option value="tfa_Bahrain" id="tfa_Bahrain" class="">Bahrain</option>
+					                                <option value="tfa_Bangladesh" id="tfa_Bangladesh" class="">Bangladesh</option>
+					                                <option value="tfa_Barbados" id="tfa_Barbados" class="">Barbados</option>
+					                                <option value="tfa_Belarus" id="tfa_Belarus" class="">Belarus</option>
+					                                <option value="tfa_Belgium" id="tfa_Belgium" class="">Belgium</option>
+					                                <option value="tfa_Belize" id="tfa_Belize" class="">Belize</option>
+					                                <option value="tfa_Benin" id="tfa_Benin" class="">Benin</option>
+					                                <option value="tfa_Bermuda" id="tfa_Bermuda" class="">Bermuda</option>
+					                                <option value="tfa_Bhutan" id="tfa_Bhutan" class="">Bhutan</option>
+					                                <option value="tfa_Bolivia" id="tfa_Bolivia" class="">Bolivia</option>
+					                                <option value="tfa_BosniaandHerzego" id="tfa_BosniaandHerzego" class="">Bosnia and Herzegovina</option>
+					                                <option value="tfa_Botswana" id="tfa_Botswana" class="">Botswana</option>
+					                                <option value="tfa_BouvetIsland" id="tfa_BouvetIsland" class="">Bouvet Island</option>
+					                                <option value="tfa_Brazil" id="tfa_Brazil" class="">Brazil</option>
+					                                <option value="tfa_BritishIndianOce" id="tfa_BritishIndianOce" class="">British Indian Ocean Territory</option>
+					                                <option value="tfa_Brunei" id="tfa_Brunei" class="">Brunei</option>
+					                                <option value="tfa_Bulgaria" id="tfa_Bulgaria" class="">Bulgaria</option>
+					                                <option value="tfa_BurkinaFaso" id="tfa_BurkinaFaso" class="">Burkina Faso</option>
+					                                <option value="tfa_Burundi" id="tfa_Burundi" class="">Burundi</option>
+					                                <option value="tfa_Cambodia" id="tfa_Cambodia" class="">Cambodia</option>
+					                                <option value="tfa_Cameroon" id="tfa_Cameroon" class="">Cameroon</option>
+					                                <option value="tfa_Canada" id="tfa_Canada" class="">Canada</option>
+					                                <option value="tfa_CapeVerde" id="tfa_CapeVerde" class="">Cape Verde</option>
+					                                <option value="tfa_CaymanIslands" id="tfa_CaymanIslands" class="">Cayman Islands</option>
+					                                <option value="tfa_CentralAfricanRe" id="tfa_CentralAfricanRe" class="">Central African Republic</option>
+					                                <option value="tfa_Chad" id="tfa_Chad" class="">Chad</option>
+					                                <option value="tfa_Chile" id="tfa_Chile" class="">Chile</option>
+					                                <option value="tfa_China" id="tfa_China" class="">China</option>
+					                                <option value="tfa_ChristmasIsland" id="tfa_ChristmasIsland" class="">Christmas Island</option>
+					                                <option value="tfa_CocosKeelingIsla" id="tfa_CocosKeelingIsla" class="">Cocos ( Keeling ) Islands</option>
+					                                <option value="tfa_Colombia" id="tfa_Colombia" class="">Colombia</option>
+					                                <option value="tfa_Comoros" id="tfa_Comoros" class="">Comoros</option>
+					                                <option value="tfa_Congo" id="tfa_Congo" class="">Congo</option>
+					                                <option value="tfa_CookIslands" id="tfa_CookIslands" class="">Cook Islands</option>
+					                                <option value="tfa_CostaRica" id="tfa_CostaRica" class="">Costa Rica</option>
+					                                <option value="tfa_CtedIvoire" id="tfa_CtedIvoire" class="">Côte d ' Ivoire</option>
+					                                <option value="tfa_CroatiaHrvatska" id="tfa_CroatiaHrvatska" class="">Croatia ( Hrvatska )</option>
+					                                <option value="tfa_Cuba" id="tfa_Cuba" class="">Cuba</option>
+					                                <option value="tfa_Cyprus" id="tfa_Cyprus" class="">Cyprus</option>
+					                                <option value="tfa_CzechRepublic" id="tfa_CzechRepublic" class="">Czech Republic</option>
+					                                <option value="tfa_CongoDRC" id="tfa_CongoDRC" class="">Congo ( DRC )</option>
+					                                <option value="tfa_Denmark" id="tfa_Denmark" class="">Denmark</option>
+					                                <option value="tfa_Djibouti" id="tfa_Djibouti" class="">Djibouti</option>
+					                                <option value="tfa_Dominica" id="tfa_Dominica" class="">Dominica</option>
+					                                <option value="tfa_DominicanRepubli" id="tfa_DominicanRepubli" class="">Dominican Republic</option>
+					                                <option value="tfa_EastTimor" id="tfa_EastTimor" class="">East Timor</option>
+					                                <option value="tfa_Ecuador" id="tfa_Ecuador" class="">Ecuador</option>
+					                                <option value="tfa_Egypt" id="tfa_Egypt" class="">Egypt</option>
+					                                <option value="tfa_ElSalvador" id="tfa_ElSalvador" class="">El Salvador</option>
+					                                <option value="tfa_EquatorialGuinea" id="tfa_EquatorialGuinea" class="">Equatorial Guinea</option>
+					                                <option value="tfa_Eritrea" id="tfa_Eritrea" class="">Eritrea</option>
+					                                <option value="tfa_Estonia" id="tfa_Estonia" class="">Estonia</option>
+					                                <option value="tfa_Ethiopia" id="tfa_Ethiopia" class="">Ethiopia</option>
+					                                <option value="tfa_FalklandIslandsI" id="tfa_FalklandIslandsI" class="">Falkland Islands ( Islas Malvinas )</option>
+					                                <option value="tfa_FaroeIslands" id="tfa_FaroeIslands" class="">Faroe Islands</option>
+					                                <option value="tfa_FijiIslands" id="tfa_FijiIslands" class="">Fiji Islands</option>
+					                                <option value="tfa_Finland" id="tfa_Finland" class="">Finland</option>
+					                                <option value="tfa_France" id="tfa_France" class="">France</option>
+					                                <option value="tfa_FrenchGuiana" id="tfa_FrenchGuiana" class="">French Guiana</option>
+					                                <option value="tfa_FrenchPolynesia" id="tfa_FrenchPolynesia" class="">French Polynesia</option>
+					                                <option value="tfa_FrenchSouthernan" id="tfa_FrenchSouthernan" class="">French Southern and Antarctic Lands</option>
+					                                <option value="tfa_Gabon" id="tfa_Gabon" class="">Gabon</option>
+					                                <option value="tfa_Gambia" id="tfa_Gambia" class="">Gambia</option>
+					                                <option value="tfa_Georgia" id="tfa_Georgia" class="">Georgia</option>
+					                                <option value="tfa_Germany" id="tfa_Germany" class="">Germany</option>
+					                                <option value="tfa_Ghana" id="tfa_Ghana" class="">Ghana</option>
+					                                <option value="tfa_Gibraltar" id="tfa_Gibraltar" class="">Gibraltar</option>
+					                                <option value="tfa_Greece" id="tfa_Greece" class="">Greece</option>
+					                                <option value="tfa_Greenland" id="tfa_Greenland" class="">Greenland</option>
+					                                <option value="tfa_Grenada" id="tfa_Grenada" class="">Grenada</option>
+					                                <option value="tfa_Guadeloupe" id="tfa_Guadeloupe" class="">Guadeloupe</option>
+					                                <option value="tfa_Guam" id="tfa_Guam" class="">Guam</option>
+					                                <option value="tfa_Guatemala" id="tfa_Guatemala" class="">Guatemala</option>
+					                                <option value="tfa_Guinea" id="tfa_Guinea" class="">Guinea</option>
+					                                <option value="tfa_GuineaBissau" id="tfa_GuineaBissau" class="">Guinea-Bissau</option>
+					                                <option value="tfa_Guyana" id="tfa_Guyana" class="">Guyana</option>
+					                                <option value="tfa_Haiti" id="tfa_Haiti" class="">Haiti</option>
+					                                <option value="tfa_HeardIslandandMc" id="tfa_HeardIslandandMc" class="">Heard Island and McDonald Islands</option>
+					                                <option value="tfa_Honduras" id="tfa_Honduras" class="">Honduras</option>
+					                                <option value="tfa_HongKongSAR" id="tfa_HongKongSAR" class="">Hong Kong SAR</option>
+					                                <option value="tfa_Hungary" id="tfa_Hungary" class="">Hungary</option>
+					                                <option value="tfa_Iceland" id="tfa_Iceland" class="">Iceland</option>
+					                                <option value="tfa_India" id="tfa_India" class="">India</option>
+					                                <option value="tfa_Indonesia" id="tfa_Indonesia" class="">Indonesia</option>
+					                                <option value="tfa_Iran" id="tfa_Iran" class="">Iran</option>
+					                                <option value="tfa_Iraq" id="tfa_Iraq" class="">Iraq</option>
+					                                <option value="tfa_Ireland" id="tfa_Ireland" class="">Ireland</option>
+					                                <option value="tfa_Israel" id="tfa_Israel" class="">Israel</option>
+					                                <option value="tfa_Italy" id="tfa_Italy" class="">Italy</option>
+					                                <option value="tfa_Jamaica" id="tfa_Jamaica" class="">Jamaica</option>
+					                                <option value="tfa_Japan" id="tfa_Japan" class="">Japan</option>
+					                                <option value="tfa_Jordan" id="tfa_Jordan" class="">Jordan</option>
+					                                <option value="tfa_Kazakhstan" id="tfa_Kazakhstan" class="">Kazakhstan</option>
+					                                <option value="tfa_Kenya" id="tfa_Kenya" class="">Kenya</option>
+					                                <option value="tfa_Kiribati" id="tfa_Kiribati" class="">Kiribati</option>
+					                                <option value="tfa_Korea" id="tfa_Korea" class="">Korea</option>
+					                                <option value="tfa_Kuwait" id="tfa_Kuwait" class="">Kuwait</option>
+					                                <option value="tfa_Kyrgyzstan" id="tfa_Kyrgyzstan" class="">Kyrgyzstan</option>
+					                                <option value="tfa_Laos" id="tfa_Laos" class="">Laos</option>
+					                                <option value="tfa_Latvia" id="tfa_Latvia" class="">Latvia</option>
+					                                <option value="tfa_Lebanon" id="tfa_Lebanon" class="">Lebanon</option>
+					                                <option value="tfa_Lesotho" id="tfa_Lesotho" class="">Lesotho</option>
+					                                <option value="tfa_Liberia" id="tfa_Liberia" class="">Liberia</option>
+					                                <option value="tfa_Libya" id="tfa_Libya" class="">Libya</option>
+					                                <option value="tfa_Liechtenstein" id="tfa_Liechtenstein" class="">Liechtenstein</option>
+					                                <option value="tfa_Lithuania" id="tfa_Lithuania" class="">Lithuania</option>
+					                                <option value="tfa_Luxembourg" id="tfa_Luxembourg" class="">Luxembourg</option>
+					                                <option value="tfa_MacaoSAR" id="tfa_MacaoSAR" class="">Macao SAR</option>
+					                                <option value="tfa_MacedoniaFormerY" id="tfa_MacedoniaFormerY" class="">Macedonia, Former Yugoslav Republic of</option>
+					                                <option value="tfa_Madagascar" id="tfa_Madagascar" class="">Madagascar</option>
+					                                <option value="tfa_Malawi" id="tfa_Malawi" class="">Malawi</option>
+					                                <option value="tfa_Malaysia" id="tfa_Malaysia" class="">Malaysia</option>
+					                                <option value="tfa_Maldives" id="tfa_Maldives" class="">Maldives</option>
+					                                <option value="tfa_Mali" id="tfa_Mali" class="">Mali</option>
+					                                <option value="tfa_Malta" id="tfa_Malta" class="">Malta</option>
+					                                <option value="tfa_MarshallIslands" id="tfa_MarshallIslands" class="">Marshall Islands</option>
+					                                <option value="tfa_Martinique" id="tfa_Martinique" class="">Martinique</option>
+					                                <option value="tfa_Mauritania" id="tfa_Mauritania" class="">Mauritania</option>
+					                                <option value="tfa_Mauritius" id="tfa_Mauritius" class="">Mauritius</option>
+					                                <option value="tfa_Mayotte" id="tfa_Mayotte" class="">Mayotte</option>
+					                                <option value="tfa_Mexico" id="tfa_Mexico" class="">Mexico</option>
+					                                <option value="tfa_Micronesia" id="tfa_Micronesia" class="">Micronesia</option>
+					                                <option value="tfa_Moldova" id="tfa_Moldova" class="">Moldova</option>
+					                                <option value="tfa_Monaco" id="tfa_Monaco" class="">Monaco</option>
+					                                <option value="tfa_Mongolia" id="tfa_Mongolia" class="">Mongolia</option>
+					                                <option value="tfa_Montserrat" id="tfa_Montserrat" class="">Montserrat</option>
+					                                <option value="tfa_Morocco" id="tfa_Morocco" class="">Morocco</option>
+					                                <option value="tfa_Mozambique" id="tfa_Mozambique" class="">Mozambique</option>
+					                                <option value="tfa_Myanmar" id="tfa_Myanmar" class="">Myanmar</option>
+					                                <option value="tfa_Namibia" id="tfa_Namibia" class="">Namibia</option>
+					                                <option value="tfa_Nauru" id="tfa_Nauru" class="">Nauru</option>
+					                                <option value="tfa_Nepal" id="tfa_Nepal" class="">Nepal</option>
+					                                <option value="tfa_Netherlands" id="tfa_Netherlands" class="">Netherlands</option>
+					                                <option value="tfa_NetherlandsAntil" id="tfa_NetherlandsAntil" class="">Netherlands Antilles</option>
+					                                <option value="tfa_NewCaledonia" id="tfa_NewCaledonia" class="">New Caledonia</option>
+					                                <option value="tfa_NewZealand" id="tfa_NewZealand" class="">New Zealand</option>
+					                                <option value="tfa_Nicaragua" id="tfa_Nicaragua" class="">Nicaragua</option>
+					                                <option value="tfa_Niger" id="tfa_Niger" class="">Niger</option>
+					                                <option value="tfa_Nigeria" id="tfa_Nigeria" class="">Nigeria</option>
+					                                <option value="tfa_Niue" id="tfa_Niue" class="">Niue</option>
+					                                <option value="tfa_NorfolkIsland" id="tfa_NorfolkIsland" class="">Norfolk Island</option>
+					                                <option value="tfa_NorthKorea" id="tfa_NorthKorea" class="">North Korea</option>
+					                                <option value="tfa_NorthernMarianaI" id="tfa_NorthernMarianaI" class="">Northern Mariana Islands</option>
+					                                <option value="tfa_Norway" id="tfa_Norway" class="">Norway</option>
+					                                <option value="tfa_Oman" id="tfa_Oman" class="">Oman</option>
+					                                <option value="tfa_Pakistan" id="tfa_Pakistan" class="">Pakistan</option>
+					                                <option value="tfa_Palau" id="tfa_Palau" class="">Palau</option>
+					                                <option value="tfa_Panama" id="tfa_Panama" class="">Panama</option>
+					                                <option value="tfa_PapuaNewGuinea" id="tfa_PapuaNewGuinea" class="">Papua New Guinea</option>
+					                                <option value="tfa_Paraguay" id="tfa_Paraguay" class="">Paraguay</option>
+					                                <option value="tfa_Peru" id="tfa_Peru" class="">Peru</option>
+					                                <option value="tfa_Philippines" id="tfa_Philippines" class="">Philippines</option>
+					                                <option value="tfa_PitcairnIslands" id="tfa_PitcairnIslands" class="">Pitcairn Islands</option>
+					                                <option value="tfa_Poland" id="tfa_Poland" class="">Poland</option>
+					                                <option value="tfa_Portugal" id="tfa_Portugal" class="">Portugal</option>
+					                                <option value="tfa_PuertoRico" id="tfa_PuertoRico" class="">Puerto Rico</option>
+					                                <option value="tfa_Qatar" id="tfa_Qatar" class="">Qatar</option>
+					                                <option value="tfa_Reunion" id="tfa_Reunion" class="">Reunion</option>
+					                                <option value="tfa_Romania" id="tfa_Romania" class="">Romania</option>
+					                                <option value="tfa_Russia" id="tfa_Russia" class="">Russia</option>
+					                                <option value="tfa_Rwanda" id="tfa_Rwanda" class="">Rwanda</option>
+					                                <option value="tfa_Samoa" id="tfa_Samoa" class="">Samoa</option>
+					                                <option value="tfa_SanMarino" id="tfa_SanMarino" class="">San Marino</option>
+					                                <option value="tfa_SoTomandPrncipe" id="tfa_SoTomandPrncipe" class="">São Tomé and Prìncipe</option>
+					                                <option value="tfa_SaudiArabia" id="tfa_SaudiArabia" class="">Saudi Arabia</option>
+					                                <option value="tfa_Senegal" id="tfa_Senegal" class="">Senegal</option>
+					                                <option value="tfa_SerbiaandMontene" id="tfa_SerbiaandMontene" class="">Serbia and Montenegro</option>
+					                                <option value="tfa_Seychelles" id="tfa_Seychelles" class="">Seychelles</option>
+					                                <option value="tfa_SierraLeone" id="tfa_SierraLeone" class="">Sierra Leone</option>
+					                                <option value="tfa_Singapore" id="tfa_Singapore" class="">Singapore</option>
+					                                <option value="tfa_Slovakia" id="tfa_Slovakia" class="">Slovakia</option>
+					                                <option value="tfa_Slovenia" id="tfa_Slovenia" class="">Slovenia</option>
+					                                <option value="tfa_SolomonIslands" id="tfa_SolomonIslands" class="">Solomon Islands</option>
+					                                <option value="tfa_Somalia" id="tfa_Somalia" class="">Somalia</option>
+					                                <option value="tfa_SouthAfrica" id="tfa_SouthAfrica" class="">South Africa</option>
+					                                <option value="tfa_SouthGeorgiaandt" id="tfa_SouthGeorgiaandt" class="">South Georgia and the South Sandwich Islands</option>
+					                                <option value="tfa_Spain" id="tfa_Spain" class="">Spain</option>
+					                                <option value="tfa_SriLanka" id="tfa_SriLanka" class="">Sri Lanka</option>
+					                                <option value="tfa_StHelena" id="tfa_StHelena" class="">St. Helena</option>
+					                                <option value="tfa_StKittsandNevis" id="tfa_StKittsandNevis" class="">St. Kitts and Nevis</option>
+					                                <option value="tfa_StLucia" id="tfa_StLucia" class="">St. Lucia</option>
+					                                <option value="tfa_StPierreandMique" id="tfa_StPierreandMique" class="">St. Pierre and Miquelon</option>
+					                                <option value="tfa_StVincentandtheG" id="tfa_StVincentandtheG" class="">St. Vincent and the Grenadines</option>
+					                                <option value="tfa_Sudan" id="tfa_Sudan" class="">Sudan</option>
+					                                <option value="tfa_Suriname" id="tfa_Suriname" class="">Suriname</option>
+					                                <option value="tfa_SvalbardandJanMa" id="tfa_SvalbardandJanMa" class="">Svalbard and Jan Mayen</option>
+					                                <option value="tfa_Swaziland" id="tfa_Swaziland" class="">Swaziland</option>
+					                                <option value="tfa_Sweden" id="tfa_Sweden" class="">Sweden</option>
+					                                <option value="tfa_Switzerland" id="tfa_Switzerland" class="">Switzerland</option>
+					                                <option value="tfa_Syria" id="tfa_Syria" class="">Syria</option>
+					                                <option value="tfa_Taiwan" id="tfa_Taiwan" class="">Taiwan</option>
+					                                <option value="tfa_Tajikistan" id="tfa_Tajikistan" class="">Tajikistan</option>
+					                                <option value="tfa_Tanzania" id="tfa_Tanzania" class="">Tanzania</option>
+					                                <option value="tfa_Thailand" id="tfa_Thailand" class="">Thailand</option>
+					                                <option value="tfa_Togo" id="tfa_Togo" class="">Togo</option>
+					                                <option value="tfa_Tokelau" id="tfa_Tokelau" class="">Tokelau</option>
+					                                <option value="tfa_Tonga" id="tfa_Tonga" class="">Tonga</option>
+					                                <option value="tfa_TrinidadandTobag" id="tfa_TrinidadandTobag" class="">Trinidad and Tobago</option>
+					                                <option value="tfa_Tunisia" id="tfa_Tunisia" class="">Tunisia</option>
+					                                <option value="tfa_Turkey" id="tfa_Turkey" class="">Turkey</option>
+					                                <option value="tfa_Turkmenistan" id="tfa_Turkmenistan" class="">Turkmenistan</option>
+					                                <option value="tfa_TurksandCaicosIs" id="tfa_TurksandCaicosIs" class="">Turks and Caicos Islands</option>
+					                                <option value="tfa_Tuvalu" id="tfa_Tuvalu" class="">Tuvalu</option>
+					                                <option value="tfa_Uganda" id="tfa_Uganda" class="">Uganda</option>
+					                                <option value="tfa_Ukraine" id="tfa_Ukraine" class="">Ukraine</option>
+					                                <option value="tfa_UnitedArabEmirat" id="tfa_UnitedArabEmirat" class="">United Arab Emirates</option>
+					                                <option value="tfa_UnitedKingdom" id="tfa_UnitedKingdom" class="">United Kingdom</option>
+					                                <option value="tfa_UnitedStates" id="tfa_UnitedStates" data-conditionals="#tfa_USState" class="switch-b">United States</option>
+					                                <option value="tfa_UnitedStatesMino" id="tfa_UnitedStatesMino" class="">United States Minor Outlying Islands</option>
+					                                <option value="tfa_Uruguay" id="tfa_Uruguay" class="">Uruguay</option>
+					                                <option value="tfa_Uzbekistan" id="tfa_Uzbekistan" class="">Uzbekistan</option>
+					                                <option value="tfa_Vanuatu" id="tfa_Vanuatu" class="">Vanuatu</option>
+					                                <option value="tfa_VaticanCity" id="tfa_VaticanCity" class="">Vatican City</option>
+					                                <option value="tfa_Venezuela" id="tfa_Venezuela" class="">Venezuela</option>
+					                                <option value="tfa_VietNam" id="tfa_VietNam" class="">Viet Nam</option>
+					                                <option value="tfa_VirginIslandsBri" id="tfa_VirginIslandsBri" class="">Virgin Islands ( British )</option>
+					                                <option value="tfa_VirginIslands" id="tfa_VirginIslands" class="">Virgin Islands</option>
+					                                <option value="tfa_WallisandFutuna" id="tfa_WallisandFutuna" class="">Wallis and Futuna</option>
+					                                <option value="tfa_Yemen" id="tfa_Yemen" class="">Yemen</option>
+					                                <option value="tfa_Zambia" id="tfa_Zambia" class="">Zambia</option>
+					                                <option value="tfa_Zimbabwe" id="tfa_Zimbabwe" class="">Zimbabwe</option>
+					                            </select>
+					                        </div>
+					                    </div>
+			                        </li>
+			                    	<li class="inline">
+					                    <div id="tfa_USState-D" class="oneField  offstate-b   offstate">
+					                        <label id="tfa_USState-L" for="tfa_USState" class="label preField reqMark">US State <span>*</span></label>
+
+					                        <div class="inputWrapper">
+					                            <select id="tfa_USState" name="tfa_USState" data-condition="`#tfa_UnitedStates`" class="required" disabled="">
+					                                <option value="">Please select...</option>
+					                                <option value="tfa_Alabama" id="tfa_Alabama" class="">Alabama</option>
+					                                <option value="tfa_Alaska" id="tfa_Alaska" class="">Alaska</option>
+					                                <option value="tfa_Arizona" id="tfa_Arizona" class="">Arizona</option>
+					                                <option value="tfa_Arkansas" id="tfa_Arkansas" class="">Arkansas</option>
+					                                <option value="tfa_California" id="tfa_California" class="">California</option>
+					                                <option value="tfa_Colorado" id="tfa_Colorado" class="">Colorado</option>
+					                                <option value="tfa_Connecticut" id="tfa_Connecticut" class="">Connecticut</option>
+					                                <option value="tfa_Delaware" id="tfa_Delaware" class="">Delaware</option>
+					                                <option value="tfa_Florida" id="tfa_Florida" class="">Florida</option>
+					                                <option value="tfa_Georgia1" id="tfa_Georgia1" class="">Georgia</option>
+					                                <option value="tfa_Hawaii" id="tfa_Hawaii" class="">Hawaii</option>
+					                                <option value="tfa_Idaho" id="tfa_Idaho" class="">Idaho</option>
+					                                <option value="tfa_Illinois" id="tfa_Illinois" class="">Illinois</option>
+					                                <option value="tfa_Indiana" id="tfa_Indiana" class="">Indiana</option>
+					                                <option value="tfa_Iowa" id="tfa_Iowa" class="">Iowa</option>
+					                                <option value="tfa_Kansas" id="tfa_Kansas" class="">Kansas</option>
+					                                <option value="tfa_Kentucky" id="tfa_Kentucky" class="">Kentucky</option>
+					                                <option value="tfa_Louisiana" id="tfa_Louisiana" class="">Louisiana</option>
+					                                <option value="tfa_Maine" id="tfa_Maine" class="">Maine</option>
+					                                <option value="tfa_Maryland" id="tfa_Maryland" class="">Maryland</option>
+					                                <option value="tfa_Massachusetts" id="tfa_Massachusetts" class="">Massachusetts</option>
+					                                <option value="tfa_Michigan" id="tfa_Michigan" class="">Michigan</option>
+					                                <option value="tfa_Minnesota" id="tfa_Minnesota" class="">Minnesota</option>
+					                                <option value="tfa_Mississippi" id="tfa_Mississippi" class="">Mississippi</option>
+					                                <option value="tfa_Missouri" id="tfa_Missouri" class="">Missouri</option>
+					                                <option value="tfa_Montana" id="tfa_Montana" class="">Montana</option>
+					                                <option value="tfa_Nebraska" id="tfa_Nebraska" class="">Nebraska</option>
+					                                <option value="tfa_Nevada" id="tfa_Nevada" class="">Nevada</option>
+					                                <option value="tfa_NewHampshire" id="tfa_NewHampshire" class="">New Hampshire</option>
+					                                <option value="tfa_NewJersey" id="tfa_NewJersey" class="">New Jersey</option>
+					                                <option value="tfa_NewMexico" id="tfa_NewMexico" class="">New Mexico</option>
+					                                <option value="tfa_NewYork" id="tfa_NewYork" class="">New York</option>
+					                                <option value="tfa_NorthCarolina" id="tfa_NorthCarolina" class="">North Carolina</option>
+					                                <option value="tfa_NorthDakota" id="tfa_NorthDakota" class="">North Dakota</option>
+					                                <option value="tfa_Ohio" id="tfa_Ohio" class="">Ohio</option>
+					                                <option value="tfa_Oklahoma" id="tfa_Oklahoma" class="">Oklahoma</option>
+					                                <option value="tfa_Oregon" id="tfa_Oregon" class="">Oregon</option>
+					                                <option value="tfa_Pennsylvania" id="tfa_Pennsylvania" class="">Pennsylvania</option>
+					                                <option value="tfa_RhodeIsland" id="tfa_RhodeIsland" class="">Rhode Island</option>
+					                                <option value="tfa_SouthCarolina" id="tfa_SouthCarolina" class="">South Carolina</option>
+					                                <option value="tfa_SouthDakota" id="tfa_SouthDakota" class="">South Dakota</option>
+					                                <option value="tfa_Tennessee" id="tfa_Tennessee" class="">Tennessee</option>
+					                                <option value="tfa_Texas" id="tfa_Texas" class="">Texas</option>
+					                                <option value="tfa_Utah" id="tfa_Utah" class="">Utah</option>
+					                                <option value="tfa_Vermont" id="tfa_Vermont" class="">Vermont</option>
+					                                <option value="tfa_Virginia" id="tfa_Virginia" class="">Virginia</option>
+					                                <option value="tfa_Washington" id="tfa_Washington" class="">Washington</option>
+					                                <option value="tfa_WestVirginia" id="tfa_WestVirginia" class="">West Virginia</option>
+					                                <option value="tfa_Wisconsin" id="tfa_Wisconsin" class="">Wisconsin</option>
+					                                <option value="tfa_Wyoming" id="tfa_Wyoming" class="">Wyoming</option>
+					                            </select>
+					                        </div>
+					                    </div>
+					                </li>
+					                <li class="inline">
+					                    <div id="tfa_Address-D" class="oneField">
+					                        <label id="tfa_Address-L" for="tfa_Address" class="label preField reqMark">Address <span>*</span></label>
+
+					                        <div class="inputWrapper">
+					                            <textarea cols="40" rows="4" id="tfa_Address" name="tfa_Address" class="required"></textarea>
+					                        </div>
+					                    </div>
+					                </li>
+					                <li class="inline">
+						                <div id="tfa_7-D" class="oneField hintsBelow">
+						                    <label id="tfa_7-L" for="tfa_7" class="label preField reqMark">Canonical contact <span>*</span></label>
+
+						                    <div class="inputWrapper">
+						                        <input type="text" id="tfa_7" name="tfa_7" value="" style="width: 370.7999999523163px" placeholder="" class="calc-CanContact required">
+						                        <span class="field-hint-inactive" id="tfa_7-H">
+						                            <span id="tfa_7-HH" class="hint">Please add the Canonical account manager or contact</span>
+						                        </span>
+						                    </div>
+						                </div>
+						            </li>
+						            <li class="inline">
+						            	<div class="htmlSection" id="tfa_5">
+						                    <p>By clicking "I agree" below, I confirm that I have read and understood the terms and warrant that I have authority to enter into the <a href="{{ STATIC_URL }}files/section/legal/canonical-nda.pdf" target="_blank">confidentiality agreement</a>
+						                    </p>
+						                </div>
+						            </li>
+						            <li class="inline">
+						            	<div class="actions" id="tfa_0-A">
+						                    <input type="submit" class="primaryAction" value="I agree">
+						                </div>
+						                <div style="clear:both"></div>
+						                <input type="hidden" value="353675" name="tfa_dbFormId" id="tfa_dbFormId">
+						                <input type="hidden" value="" name="tfa_dbResponseId" id="tfa_dbResponseId">
+						                <input type="hidden" value="37a451ff42865d207e20e66dc2f54a88" name="tfa_dbControl" id="tfa_dbControl">
+						                <input type="hidden" value="2" name="tfa_dbVersionId" id="tfa_dbVersionId">
+						                <input type="hidden" value="tfa_USState" name="tfa_switchedoff" id="tfa_switchedoff">
+						            </li>
+			                    </ul>
+			            	</fieldset>
+			            </form>
+			        </div>
+			    </div>
+			</div>
+		</div>
+	</div>
+</div><!-- / .row -->
+{% endblock content %}
\ No newline at end of file
diff --git a/templates/legal/terms-and-policies/contact-us.html b/templates/legal/terms-and-policies/contact-us.html
index af55f6a4c92..f5d6122bd3c 100755
--- a/templates/legal/terms-and-policies/contact-us.html
+++ b/templates/legal/terms-and-policies/contact-us.html
@@ -3,7 +3,7 @@
 {% block title %}Contact us | Intellectual property policy | Terms and policies{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Terms and policies" page_title="Intellectual property policy" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Terms and policies" page_title="Intellectual property policy" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/legal/terms-and-policies/index.html b/templates/legal/terms-and-policies/index.html
index 23e149b4b7f..aa8f488992b 100755
--- a/templates/legal/terms-and-policies/index.html
+++ b/templates/legal/terms-and-policies/index.html
@@ -3,7 +3,7 @@
 {% block title %}Terms and policies{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Legal" page_title="Terms and policies" tertiary="true" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" page_title="Terms and policies" tertiary="true" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
@@ -41,11 +41,17 @@ <h3>Online accounts</h3>
 		<p>Ubuntu online accounts are provided by Canonical. This legal notice applies to your use of Ubuntu online accounts and incorporates the terms of our legal notice and our privacy policy.</p>
 		<p><a href="/legal/terms-and-policies/online-account-terms">View online accounts terms&nbsp;&rsaquo;</a></p>
 	</div>
-	
+
 	<div class="six-col box">
 		<h3>U1 and Software Centre</h3>
 		<p>Ubuntu One and the Ubuntu software centre are provided by Canonical. This legal notice applies to your use of Ubuntu One and the Ubuntu software centre.</p>
 		<p><a href="/legal/terms-and-policies/terms-of-service">View U1 account and software centre terms&nbsp;&rsaquo;</a></p>
 	</div>
+
+	<div class="six-col box last-col">
+		<h3>Confidentiality agreement standard form</h3>
+		<p>You can enter into a confidentiality agreement with Canonical. Please use this form where directed to by Canonical.</p>
+		<p><a href="/legal/terms-and-policies/confidentiality-agreement">View confidentiality agreement&nbsp;&rsaquo;</a></p>
+	</div>
 </div><!-- /.row -->
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/legal/terms-and-policies/intellectual-property-policy.html b/templates/legal/terms-and-policies/intellectual-property-policy.html
index 38eaa34e6e7..ae77746b19c 100755
--- a/templates/legal/terms-and-policies/intellectual-property-policy.html
+++ b/templates/legal/terms-and-policies/intellectual-property-policy.html
@@ -3,7 +3,7 @@
 {% block title %}Intellectual property rights policy | Terms and policies{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Terms and policies" page_title="Intellectual property policy" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Terms and policies" page_title="Intellectual property policy" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/legal/terms-and-policies/online-account-terms.html b/templates/legal/terms-and-policies/online-account-terms.html
index 0aa949a184a..22f974fd31d 100755
--- a/templates/legal/terms-and-policies/online-account-terms.html
+++ b/templates/legal/terms-and-policies/online-account-terms.html
@@ -4,7 +4,7 @@
 {% block head_extra %}{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Terms and policies" page_title="Canonical&rsquo;s privacy policy" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Terms and policies" page_title="Canonical&rsquo;s privacy policy" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/legal/terms-and-policies/privacy-policy/index.html b/templates/legal/terms-and-policies/privacy-policy/index.html
index f939a0927cb..d9a0c209dc5 100755
--- a/templates/legal/terms-and-policies/privacy-policy/index.html
+++ b/templates/legal/terms-and-policies/privacy-policy/index.html
@@ -3,7 +3,7 @@
 {% block title %}Privacy policy | Terms and policies{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Terms and policies" page_title="Canonical&rsquo;s privacy policy" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Terms and policies" page_title="Canonical&rsquo;s privacy policy" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/legal/terms-and-policies/privacy-policy/third-parties.html b/templates/legal/terms-and-policies/privacy-policy/third-parties.html
index c586a947f0b..5d699200a65 100755
--- a/templates/legal/terms-and-policies/privacy-policy/third-parties.html
+++ b/templates/legal/terms-and-policies/privacy-policy/third-parties.html
@@ -3,7 +3,7 @@
 {% block title %}Third parties | Privacy policy | Terms and policies{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Terms and policies" page_title="Canonical&rsquo;s privacy policy" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Terms and policies" page_title="Canonical&rsquo;s privacy policy" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/legal/terms-and-policies/terms-of-service.html b/templates/legal/terms-and-policies/terms-of-service.html
index 3053eec2625..b9d15586db0 100644
--- a/templates/legal/terms-and-policies/terms-of-service.html
+++ b/templates/legal/terms-and-policies/terms-of-service.html
@@ -3,7 +3,7 @@
 {% block title %}U1 and Software Centre - Terms of Service{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Terms and policies" page_title="U1 and Software Centre - Terms of Service" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Terms and policies" page_title="U1 and Software Centre - Terms of Service" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/legal/terms-and-policies/terms.html b/templates/legal/terms-and-policies/terms.html
index 7dfa6775207..6796db075aa 100755
--- a/templates/legal/terms-and-policies/terms.html
+++ b/templates/legal/terms-and-policies/terms.html
@@ -3,7 +3,7 @@
 {% block title %}Terms and conditions | Ubuntu and Canonical Legal{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Terms and policies" page_title="Terms and conditions" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Terms and policies" page_title="Terms and conditions" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/legal/terms-and-policies/thank-you.html b/templates/legal/terms-and-policies/thank-you.html
index 4b53fb0fbce..8eb9092f81f 100755
--- a/templates/legal/terms-and-policies/thank-you.html
+++ b/templates/legal/terms-and-policies/thank-you.html
@@ -3,7 +3,7 @@
 {% block title %}Thank you | Intellectual property policy | Terms and policies{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Terms and policies" page_title="Intellectual property policy" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Terms and policies" page_title="Intellectual property policy" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/ua-dell-tc/_nav_secondary.html b/templates/legal/ua-dell-tc/_nav_secondary.html
similarity index 100%
rename from templates/ua-dell-tc/_nav_secondary.html
rename to templates/legal/ua-dell-tc/_nav_secondary.html
diff --git a/templates/ua-dell-tc/index.html b/templates/legal/ua-dell-tc/index.html
similarity index 99%
rename from templates/ua-dell-tc/index.html
rename to templates/legal/ua-dell-tc/index.html
index cb7c601a0db..5c41b2b8962 100755
--- a/templates/ua-dell-tc/index.html
+++ b/templates/legal/ua-dell-tc/index.html
@@ -1,9 +1,10 @@
-{% extends "_base/one-column.html" %}
+{% extends "templates/one-column.html" %}
 
 {% block title %}Dell Ubuntu Advantage Reseller end user terms{% endblock %}
 
 {% block content %}
 <div class="row row-hero no-border">
+	<div class="eight-col">
 		<h1>Dell Ubuntu Advantage Reseller end user terms</h1>
 		<h2>Agreement terms</h2>
 		<p>This Ubuntu Advantage Services Agreement (the "Agreement") is a binding legal agreement between Canonical Group Limited, a company registered in England (company number 6870835) whose registered office is at Blue Fin Building, 5th floor 110, Southwark St, London SE1 0SU ("Canonical"), and the entity identified in the Order (the "Customer"). As used in this Agreement, each of Canonical and Customer is a "Party" and together they are the "Parties."</p>
diff --git a/templates/legal/ua-miracle-tc-ja.html b/templates/legal/ua-miracle-tc-ja.html
new file mode 100644
index 00000000000..c10b2d179fa
--- /dev/null
+++ b/templates/legal/ua-miracle-tc-ja.html
@@ -0,0 +1,135 @@
+{% extends "templates/one-column.html" %}
+
+{% block title %}Miracle Linux - UA 略式サービス契約{% endblock %}
+
+{% block content %}
+<div class="row no-border" lang="ja">
+	<div class="eight-col">
+		<h1>Miracle Linux - UA 略式サービス契約</h1>
+		<p>本略式サービス契約 (以下「本契約」といいます) は、英国で設立され、英国の5th Floor, Blue Fin Building, 110 Southwark Street, London SE1 0SUに所在する会社である Canonical Group Limited (登録番号 6870835、以下「Canonical」といいます) と、注文書記載のお客様(以下「お客様」といいます) との間で締結される契約であり、本契約は、お客様が本契約の条件が組み込まれた注文書に署名した日付または他の方法によって登録手続に際して本契約の条件に同意した日付 (以下「発効日」といいます) をもって有効となります。</p>
+		<ol class="unstyled">
+			<li>
+				<h2>1． 解釈</h2>
+				<p>本契約において使用される以下の用語は、次の意味を有するものとします。</p>
+				<p><strong>関係会社</strong>: 直接的または間接的に、当事者を支配する法人、当事者に支配される法人、または当事者と共通の支配下にある法人。ここにいう「支配」とは、当該法人の取締役その他の経営権を有する者を専任する議決権のある発行済み株式または証券の 50% 超を有していることを意味します。</p>
+				<p><strong>秘密情報</strong>: 本契約の条件、および開示当事者が秘密として特定した情報または情報の性質や開示の状況に基づき受領当事者によって合理的に秘密であると判断されるべき情報。</p>
+				<p><strong>料金</strong>: お客様が本サービスの対価として支払われる注文書記載の金額。</p>
+				<p><strong>知的財産権</strong>: 登録の有無または登録の可否にかかわらず、既得および将来発生する著作権、著作隣接権、意匠権、データベースに関する権利、特許、発明に係る権利、商標とトレード ドレス (および商標とトレード ドレスに生じるグッドウィル)、ドメイン名、上記のいずれかの権利の出願および当該権利を出願する権利、著作者人格権、グッドウィル (およびパッシングオフと不正競争に対する請求権)、ノウハウ・秘密情報に関する権利、コンピューター ソフトウェアおよび半導体回路配置に関する権利、その他の知的財産権もしくは工業所有権または同等の保護をうけるもの並びにかかる権利のあらゆる更新および延長された権利をいい、世界で既知であるか、将来存在するか否かを問いません。</p>
+				<p><strong>オープン ソース ソフトウェア</strong>: ソフトウェアのソース コードの無償頒布および変更を許可することや、すべての頒布者にかかるソース コード (当該頒布者によるかかるソース コードへの貢献または変更を含みます) を要求に応じて無償での提供を義務付けることを定めた様々な既知のライセンス条項のいずれかに基づいて頒布されるソフトウェア。</p>
+				<p><strong>注文書</strong>: お客様が本サービスを Canonical から直接購入する場合: 本サービスについてのお客様の注文書。注文書は本契約と一体となり、お客様の名前、連絡先情報、本サービス、料金、およびサービス期間が特定されたものとします。お客様が本サービスを Canonical の再販業者を通じて購入する場合: お客様による本サービスの購入とその料金の支払いに係る合意書。</p>
+				<p><strong>登録手続</strong>: お客様が、Canonical の再販業者を通じて購入した本サービスの提供を受けるために、Canonical に登録する際の手続。</p>
+				<p><strong>本サービス</strong>: 注文書に規定され、発効日時点で <a href="http://www.canonical.com/ua-servicedescription">www.canonical.com/ua-servicedescription</a> に記載のCanonical が提供するサービス。</p>
+				<p><strong>サービス期間</strong>: Canonical によってお客様による本サービスを利用が可能となった最初の時点から、注文書に規定の期間の経過後に終了するまでの期間。</p>
+				<p><strong>Ubuntu</strong>: Canonical が自身の公表内容およびサポート スケジュールに従ってサポートする、「Ubuntu」と呼ばれるオペレーティング システムのバージョンであって、修正を行っていない Canonical の標準バージョンまたは Canonical が修正したバージョンのいずれか。</p>
+			</li>
+			<li>
+				<h2>2． 本サービス</h2>
+				<ol class="numbered">
+					<li><span class="number">2.1</span> Canonical は、(i) Canonical がお客様から料金に関する発注書を受け取った場合、(ii) お客様が Canonical に料金を支払った場合、または (iii) Canonical の再販業者がお客様に関する本サービスを発注した場合には、その 5 日以内にお客様が本サービスを利用できるようにします。Canonical は、お客様による料金の支払いを含め、本契約に従って、サービス期間中に相応の資格を有する従業員および請負業者によって、合理的なスキルと注意をもって本サービスを提供します。</li>
+					<li><span class="number">2.2</span> Canonical は、(i) 注文書に明示されたもの以外のサービスまたは機能を提供する義務を負わず、 また、(ii)お客様が合理的な依存関係を満たすことができないことによって提供が制限される範囲については本サービスを提供する義務を負いません。</li>
+				</ol>
+			</li>
+			<li>
+				<h2>3． 知的財産権</h2>
+				<ol class="numbered">
+					<li><span class="number">3.1</span> 各当事者は、自らの知的財産権および自ら作成または取得する知的財産権の権利者となります。Canonical が本契約に基づいて作成または提供するものは「職務著作物（work made for here）」と見なされず、本契約に基づいて知的財産権が移転することはありません。</p>ライセンスに基づいて使用許諾されるものであり、本契約に基づいて使用許諾されるものではありません。Canonical は、本サービスの提供に際して、ソフトウェアを作成し、またはお客様に提供する場合、本契約に基づいて別途使用許諾される場合を除き、かかるソフトウェアをオープン ソース ソフトウェア ライセンスに基づいて提供します。</li>
+					<li><span class="number">3.3</span> 本契約の期間中および期間後、お客様は <a href="http://www.canonical.com/intellectual-property-policy">http://www.canonical.com/intellectual-property-policy</a> に掲載されている Canonical の知的財産権ポリシーを遵守するものとします。</li>
+					<li><span class="number">3.4</span> Canonical の「Landscape Dedicated Server」製品 (以下「LDS 製品」といいます) を含む本サービスに関して、Canonical は、本契約をより、すべてのオープン ソース ソフトウェア ライセンスに従って、(i) 本契約および注文書に規定された数量または使用に関する制限に従って LDS 製品を使用すること、および (ii) バックアップとインストールのためにLDS 製品の合理的な数の複製を作成することについての、全世界を許諾地域とする、非独占的、譲渡不可、かつ取消可能 (本契約の違反または終了の場合) なライセンスを、本契約の期間中、お客様に許諾します。お客様は、本契約で明示的に許可されている場合を除き、LDS 製品を使用、複製、変更、逆アセンブル、逆コンパイル、リバース エンジニアリング、もしくは頒布すること、お客様に代わって行動する第三者を除く第三者に LDS 製品へのアクセスを許可すること、または Canonical の事前の書面による同意なしに LDS 製品をある機器から別の機器に移動することはできません。</li>
+					<li><span class="number">3.5</span> Microsoft Windows システムを Ubuntu 上でゲストとして実行するための Canonical の準仮想化ドライバー (以下「VirtIO ドライバー」といいます) を含む本サービスに関して、Canonical は、本契約により、(i) お客様が本サービスを購入したコンピューター システムに関してのみVirtIO ドライバーを本契約に従い使用すること、および (ii) バックアップとインストールのために VirtIO ドライバーの合理的な数の複製を作成することについて、全世界を許諾地域とする、非独占的、譲渡不可、かつ取消可能 (本契約の違反または終了の場合) なライセンスを、該当する本サービスの期間中、お客様に許諾します。お客様は、本契約で明示的に許可されている場合を除き、VirtIO ドライバーを使用、複製、変更、逆アセンブル、逆コンパイル、リバース エンジニアリング、もしくは頒布すること、お客様に代わって行動する第三者を除く第三者に VirtIO ドライバーへのアクセスを許可すること、および (iii) VirtIO ドライバーをお客様のクラウド コンピューティング サービスの第三者ユーザーに頒布することはできません。上記(iii) に基づいて許諾される頒布に関するライセンスに関し、お客様は、上記 (i) および (ii) に基づいて許諾されるライセンスを、お客様のクラウド コンピューティング サービスの第三者ユーザーにサブライセンスすることができます。かかるサブライセンスは、本契約に基づくCanonical の権利の保護と同程度以上にCanonicalの権利を保護する条件でなければならず、本第 3.5 項に基づくライセンスが消滅した場合には消滅します。</li>
+				</ol>
+			</li>
+			<li>
+				<h2>4． お客様の責任</h2>
+				<ol class="numbered">
+					<li><span class="number">4.1</span> お客様は、(i) お客様が本サービスを購入したお客様のシステムに関連する場合以外に本サービスを使用せず、また (ii) 本サービスを再販しないものとします。</li>
+					<li><span class="number">4.2</span> お客様のデータおよびソフトウェアのバックアップについてはお客様自身の責任となります。Canonical は、データまたはソフトウェアの損失、破損、または損害に一切責任を負いません。</li>
+					<li><span class="number">4.3</span> お客様は、Canonical に本サービスの一部として第三者のソフトウェアまたは素材をインストールまたは使用するよう依頼した場合、Canonical が本サービスを実施できるように、かかるソフトウェアについて十分な権利またはライセンスを保有および維持しなければなりません。</li>
+					<li><span class="number">4.4</span> Canonical が本サービスの一部としてオンライン リソースへのアクセスを提供する場合、お客様は、(i) Canonical の合理的な指示に従い、(ii) 本サービスに悪影響を及ぼさないものとします。</li>
+				</ol>
+			</li>
+			<li>
+				<h2>5． 秘密保持</h2>
+				<ol class="numbered">
+					<li><span class="number">5.1</span> 本契約の期間中および期間後、各当事者は、本契約に基づく義務に従うために必要な場合を除き、各自の役員、従業員、契約者、および代理人に他方当事者のあらゆる秘密情報の秘密を保持させ、かかる情報の複製、使用、第三者への開示を行わないものとします。ただし、各当事者は他方当事者の秘密情報を関係会社に開示することができます。</li>
+					<li><span class="number">5.2</span> 秘密情報について、法の適用により開示する必要がある場合、他方当事者による開示より前に受領者が合法的に所持していた場合、その後第三者から合法的に取得したか、秘密保持の既知の義務に違反することなく受領者が独自に開発した場合、受領者の行為又は違反によらず一般的に入手可能または入手可能になった場合、または専門的な助言を受けるために秘密扱いで開示する場合には、秘密保持義務は適用されません。</li>
+					<li><span class="number">5.3</span> 各当事者は、本契約の期間中および期間後に、法の適用により秘密情報を開示する必要がある場合、他方当事者にその旨を書面により直ちに通知するものとします。</li>
+					<li><span class="number">5.4</span> 各当事者は、損害賠償が本契約の秘密保持義務の遵守違反に対する十分な救済手段にならないこと、および他方当事者がかかる義務の遵守違反またはその恐れについて差し止め命令、特定履行、衡平法上の救済などの救済手段を行う権利を有することに同意します。</li>
+				</ol>
+			</li>
+			<li>
+				<h2>6． 料金および支払い</h2>
+				<ol class="numbered">
+					<li><span class="number">6.1</span> お客様は、本サービスを Canonical から直接購入する場合、お客様は発注時において料金を支払うものとします。本サービスを Canonical の再販業者を通じて購入する場合は、再販業者の手続に従って料金を支払うものとし、本第 6 条の条件は適用されません。</li>
+					<li><span class="number">6.2</span> 料金は適用されるすべての税金を除く金額であり、お客様は料金に加えて、請求日における税率により、かかる税金を支払うものとします。お客様が Canonical に支払う必要がある金額は、いかなる控除または源泉徴収もなく支払われるものとします。お客様は、適用法により料金から源泉徴収または控除を行うよう求められている場合、Canonical が控除や源泉徴収が不要であった場合と同じになるように、必要な追加金額を支払うものとします。</li>
+					<li><span class="number">6.3</span> 本契約の期間中、Canonical は本契約の遵守についてお客様に確認を求めることができ、お客様が本契約を遵守していないことにつきCanonical が合理的な疑いを持った場合には、お客様による本サービスの使用状況について監査を行い、本契約の遵守を確認することができます。監査によりお客様が本契約を遵守していないことが確認された場合、お客様は直ちに本契約を遵守するようにしなければなりません。監査またはお客様への確認により追加で支払われるべき料金が発覚した場合、お客様は、かかる料金および金利 (未払額に適用される利率による) を Canonical による請求日から 30 日以内に支払うものとします。追加で支払われるべき料金が、監査対象の期間に請求された元の金額の5% を上回った場合には、お客様は監査の費用を Canonical に弁済するものとします。</li>
+					<li><span class="number">6.4</span> Canonical は、未払い額に対する金利に加え、関連する回収費用および訴訟費用を請求することができます。かかる金利は、支払い期日から支払い日までにおけるイングランド銀行の基準金利を 2% 上回る年率、または適用法で認められる最高利率のいずれか低い方で発生します。金利は、判決の前後にかかわらず毎日発生するものとします。</li>
+				</ol>
+			</li>
+			<li>
+				<h2>7． 保証に関する免責</h2>
+				<ol class="numbered">
+					<li><span class="number">7.1</span> いずれの当事者も、口頭によるか書面によるかにかかわらず、明示、黙示、または法律により生じるものであるとを問わず、本契約の主題に関して、またはその他本契約に関連して、慣習、取引の過程、または商慣習について一切の表明または保証を行いません。各当事者は、権原、十分な品質、商品性、満足度、特定目的への適合性、および権利侵害の不存在に関するあらゆる黙示の保証について明確に否認します。</li>
+				</ol>
+			</li>
+			<li>
+				<h2>8． 責任の制限</h2>
+				<ol class="numbered">
+					<li><span class="number">8.1</span> 第 8.3 項を条件として、各当事者の本契約に基づく責任の総額は、いずれの契約年においても、契約、不法行為 (過失を含みます)、またはその他原因を問わず、当該契約年に支払う義務が生じる料金の合計を超えません。「契約年」とは、発効日または発効日の応当日から始まる 12 か月の期間を意味します。</li>
+					<li><span class="number">8.2</span> 第 8.3 項を条件として、いずれの当事者も、本契約に起因または関連する間接的、特別、付随的、懲罰的、もしくは結果的な損失もしくは損害、またはデータの損失もしくは損害、見舞金、逸失利益、契約機会の損失、その他の経済的利益の損失 (いずれの場合も直接と間接とを問いません) について、当該当事者がかかる損失または損害の可能性について事前に知らされていた場合でも、予測可能であるかどうかによらず、一切責任を負いません。これらの制限は、救済の限定の本質的な目的が達成されない場合でも、適用されます。</li>
+					<li><span class="number">8.3</span> 本契約のいずれの規定も、(i) 死亡または人身傷害、(ii) 詐欺、(iii) 本契約に基づく秘密保持義務違反、および (iv) 適用法により排除または制限できないその他の事項についての、各当事者の責任を排除または制限するものではありません。</li>
+					<li><span class="number">8.4</span> 本第 8 条に規定されている責任の制限はリスクを両当事者間で合理的に配分するものであり、両当事者はかかる配分がない場合は本契約を締結していません。</li>
+				</ol>
+			</li>
+			<li>
+				<h2>9． 期間および終了</h2>
+				<ol class="numbered">
+					<li><span class="number">9.1</span> 本契約は、発効日に有効になり、本第 9 条に基づいて早期に終了する場合を除き、サービス期間の終了時まで継続します。</li>
+					<li><span class="number">9.2</span> お客様が Canonical の再販業者から本サービスを購入する場合を除き、発効日から 30 日以内に Canonical がお客様から料金に関する発注書または料金の支払いを受け取っていない場合、本契約は自動的に終了します。</li>
+					<li><span class="number">9.3</span> いずれの当事者も、他方当事者が以下の状況である場合、書面により通知することで本契約を直ちに終了することができます。</li>
+					<li><span class="number">9.4</span> 本契約についての重大な違反があり、かつ、かかる違反の是正手段があるにもかかわらず、違反の通知を受け取ってから 14 日以内に違反を是正されない場合</li>
+					<li><span class="number">9.5</span> 強制と任意とを問わず清算に入った場合 (合併による支払能力の継承または再建を目的とする場合を除きます)、支払い不能になった場合、営業を停止したか、停止する恐れがある場合、または同様の状況になった場合</li>
+					<li><span class="number">9.6</span> Canonical は、お客様に 90 日前までに通知することにより、自ら本契約を終了することができます。</li>
+					<li><span class="number">9.7</span> 本契約が満了した場合または原因の如何を問わず本契約が終了した場合には、別途合意のない限り、Canonical の本サービスを提供する義務および本契約に基づいて許諾されたすべてのライセンスは、終了します。Canonical が第 9.4 項に基づく一方的解約以外の事由によって本契約が終了する場合、お客様は、本契約の全期間において契約が終了しなかった場合に支払う必要のあった料金を含め、本契約に適用されるすべての未払料金を直ちに支払うものとします。Canonical が第 9.4 項に従って本契約を解約した場合、Canonical は、サービス期間の残存部分に対して前払いされた料金を案分計算によりお客様に返金します。</li>
+				</ol>
+			</li>
+			<li>
+				<h2>10． エスカレーション</h2>
+				<ol class="numbered">
+					<li><span class="number">10.1</span> 本契約に関係して見解の相違がある場合、両当事者はかかる相違について交渉して解決する合理的な努力を講じるものとします。見解の相違を 14 日以内に解決できない場合、両当事者の代表者が会談し、かかる相違を解決するよう努力するものとします。見解の相違が、さらに 14 日以内に解決できない場合、いずれの当事者もかかる相違を両当事者の経営幹部間の会合に付託できるものとします。第 10.2 項を条件として、いずれの当事者も、本第 10 条の紛争解決手続きに従わない限り、紛争を裁判所に付託しないものとします。</li>
+					<li>10.2 本第 10 条のいずれの規定も、各当事者が差し止め命令またはその他の暫定的救済を任意の国の裁判所に申請することを妨げるものではありません。</li>
+				</ol>
+			</li>
+			<li>
+				<h2>11． 一般条項</h2>
+				<ol class="numbered">
+					<li><span class="number">11.1</span> いずれの当事者も、当該当事者の合理的な支配の及ばない状況に直接的または間接的に起因する本契約の違反について一切責任を負いません。ただし、資金不足は当該当事者の合理的な支配の及ばない状況とは見なされません。</li>
+					<li><span class="number">11.2</span> いずれの当事者も、他方当事者の事前の書面による同意なしに、本契約に基づく権利および義務を譲渡、委託、信託、もしくはその他取引すること (またはしようとすること) はできません。ただし、関係会社を相手方とする善意の再編、合併、整理、すべての資産もしくは実質的にすべての資産の売却、または本サービスに関連する事業の売却の場合を除きます。</li>
+					<li><span class="number">11.3</span> 本契約において、第三者の受益者は存在しません。両当事者は、本契約の当事者ではない第三者が本契約の規定を実施できることを意図していません。</li>
+					<li><span class="number">11.4</span> 本契約の修正または変更は、両当事者の正式な権限を有する代表者が署名した書面による場合を除き、両当事者を拘束しないものとします。</li>
+					<li><span class="number">11.5</span> 当事者が本契約に基づく権利または救済措置を行使しない場合やかかる行使が遅滞した場合であっても、その権利または救済措置が放棄されたものと解釈してはならず、その権利または救済措置の放棄とはならないものとします。また、権利または救済措置が一回または部分的に行使された場合であっても、当該当事者が、その権利または救済措置をそれ以後に行使することを妨げるものではありません。</li>
+					<li><span class="number">11.6</span> 本契約の期間中およびその期間後 6 か月間、お客様は、(i) Canonical またはその関係会社の社員であるか、直近 6 か月間に Canonical またはその関係会社の社員であった個人 (Canonical がかかる個人の雇用または契約を終了した場合を除きます)、および (ii) 本契約の期間中の一定期間内に Canonical の顧客にサービスを提供するよう Canonical が任命した個人を、従業員または独立契約当事者として雇い又は雇われるよう勧誘してはならないものとします。</li>
+					<li><span class="number">11.7</span> 本契約は、本契約の主題に関して両当事者間で合意した完全なる条件を示すものであり、本契約の対象に関連する両当事者間の事前のあらゆる契約または協定 (習慣または慣習、および取引の過程を通じて発生する条件を含みます) に優先されます。お客様による本サービスの受領、提案、発注、または同様の文書に記載される、またはそれらと共に提示される契約条件は、本契約の一部を形成しません。</li>
+					<li><span class="number">11.8</span> 本契約の各規定は他のあらゆる規定とは独立に解釈するものとし、本契約のいずれかの規定が管轄裁判所によって違法、無効、または執行不能と判断された場合でも、本契約のその他の規定は影響を受けず、引き続き完全に効力を有します。</li>
+					<li><span class="number">11.9</span> 本契約のいずれの規定も、本契約に従って両当事者が講じたいかなる措置も、両当事者間の何らかの提携関係または合弁事業を形成すると解釈したり、いずれかの当事者が他方当事者の代理人であると解釈したりしてはなりません。いずれの当事者も、他方当事者を拘束したり、他方当事者の名前において契約を行ったり、他方当事者に対して法的責任を構成したりする権利を有しません。</li>
+					<li><span class="number">11.10</span> 本契約に基づいてやり取りする必要がある通知は、書面により、本契約に規定されている受領側当事者の住所に配送するものとします。住所が規定されていない場合は、受領側当事者の登録事務所の住所宛てに配送するものとします。当事者は、他方当事者に通知することで、その住所を更新することができます。有効な配送方法は、(i) 対面での手渡し、(ii) 配達証明付郵便(もしくは同等の方法)、または (iii) 国際的に認められた宅配便、です。</li>
+					<li><span class="number">11.11</span> Canonical は、情報提供を目的として、本契約の複製を別の言語で提供する場合があります。本契約の英語版のみが法的拘束力を有します。紛争が発生した場合、英語以外の言語版は考慮されないものとします。</li>
+					<li><span class="number">11.12</span> お客様は、本契約に基づいて Canonical が提供する素材に、米国および欧州地域の輸出に関する法律および規制が適用される場合があることを認めるものとします。お客様は、素材の使用に、かかる輸出管理に関する法律および規制が適用されることに同意し、当該法律および規制を遵守するものとします。お客様は、かかる素材を、当該法律および規制に違反して直接的または間接的に輸出したり、当該法律で禁止されている目的で使用したりしないものとします。</li>
+				</ol>
+			</li>
+			<li>
+				<h2>12． 準拠法</h2>
+				<ol class="numbered">
+					<li><span class="number">12.1</span> 本契約および本契約から生じる契約外の義務は、日本法に準拠し、同法に従って解釈するものとします。両当事者は、問題となっている行為の管轄区域で得られなければ合理的な効力がないと考えられる、差し止め命令による即時の救済 (秘密保持義務の違反または差し迫った違反に関連する救済など) を求める場合を除き、日本の東京地方裁判所の専属管轄権に従うものとします。国際物品売買契約に関する国際連合条約の規定は、本契約には適用されません。</li>
+				</ol>
+			</li>
+		</ol>
+	</div>
+	<div class="box four-col last-col">
+		<h3>英訳</h3>
+		<ul class="list">
+			<li class="last-item"><a href="ua-miracle-tc">Miracle Linux - UA Short Form Services Agreement&nbsp;›</a></li>
+		</ul>
+	</div>
+</div>
+
+{% endblock content %}
\ No newline at end of file
diff --git a/templates/legal/ua-miracle-tc.html b/templates/legal/ua-miracle-tc.html
new file mode 100644
index 00000000000..95a83607bf5
--- /dev/null
+++ b/templates/legal/ua-miracle-tc.html
@@ -0,0 +1,135 @@
+{% extends "templates/one-column.html" %}
+
+{% block title %}Miracle Linux - UA Short Form Services Agreement{% endblock %}
+
+{% block content %}
+<div class="row no-border">
+	<div class="eight-col">
+		<h1>Miracle Linux - UA Short Form Services Agreement</h1>
+		<p>This short form services agreement (the &ldquo;Agreement&rdquo;) takes effect as of the date Customer signs an Order incorporating its terms or otherwise accepts its terms as part of a Registration Process (the &ldquo;Effective Date&rdquo;) between, Canonical Group Limited, a company registered in England (company number 6870835) whose registered office is at 5th Floor, Blue Fin Building, 110 Southwark Street, London SE1 0SU, United Kingdom (&ldquo;Canonical&rdquo;), and the customer identified in the Order (&ldquo;Customer&rdquo;).</p>
+		<ol class="unstyled">
+			<li><h2>1. Interpretation</h2>
+				<p>When used in this Agreement, the following terms mean:</p>
+				<p><strong>Affiliate</strong>: a corporate entity that directly or indirectly controls, is controlled by, or is under common control with a party, where &ldquo;control&rdquo; means ownership of more than 50% of the outstanding shares or securities representing the right to vote for the election of directors or other managing authority of such corporate entity.</p>
+				<p><strong>Confidential Information</strong>: the terms of this Agreement, and any information identified by the disclosing party as confidential or which the receiving party reasonably ought to know is confidential in light of the nature of the information or the circumstances of its disclosure.</p>
+				<p><strong>Fee(s)</strong>: the amounts payable by Customer for the Services, as set out in the Order.</p>
+				<p><strong>Intellectual Property Rights</strong>: all vested and future rights of copyright and related rights, design rights, database rights, patents, rights to inventions, trade marks and get-up (and goodwill attaching to those trade marks and that get up), domain names, applications for and the right to apply for any of the above, moral rights, goodwill (and the right to sue for passing off and unfair competition), rights in know-how, rights in confidential information, rights in computer software and semiconductor topographies, and any other intellectual or industrial property rights or equivalent forms of protection, whether or not registered or capable of registration, and all renewals and extensions of such rights, whether now known or in future subsisting in any part of the world.</p>
+				<p><strong>Open Source Software</strong>: any software which is distributed under any of the many known variations of licence terms which allow the free distribution and modification of the software&rsquo;s source code or which require all distributors to make such source code freely available upon request, including any contributions or modifications thereto made by such distributor.</p>
+				<p><strong>Order</strong>: If Customer is buying Services directly from Canonical: Customer's order for Services which incorporates this Agreement and identifies Customer's name, contact information, Services, Fees, and Services Term.  If Customer is buying Services through Canonical's reseller: Customer's agreement to purchase the Services and pay applicable Fees.</p>
+				<p><strong>Registration Process</strong>: The process under which a Customer registers with Canonical to receive Services purchased through Canonical's reseller.</p>
+				<p><strong>Services</strong>: the services to be performed by Canonical as identified in the Order and described at <a href="http://www.canonical.com/ua-servicedescription">www.canonical.com/ua-servicedescription</a> as of the Effective Date.</p>
+				<p><strong>Services Term</strong>: the period for time beginning when Canonical first makes the Services available to Customer and ending after the period of time specified in the Order.</p>
+				<p><strong>Ubuntu</strong>: a version of the operating system known as &ldquo;Ubuntu&rdquo;, which is supported by Canonical pursuant to Canonical's public announcements and support schedule and is either Canonical's standard version with no modifications or a version modified by Canonical.</p>
+			</li>
+			<li>
+				<h2>2. Services</h2>
+				<ol class="numbered">
+					<li><span class="number">2.1</span> Canonical will make the Services available to Customer within 5 days of any of the following events: (i) Canonical receives a purchase order from Customer for the Fees, (ii) Customer pays the Fees to Canonical, or (iii) Canonical's reseller orders the Services with respect to Customer.  Subject to this Agreement, including Customer's payment of the Fees, Canonical will provide the Services during the Services Term using reasonable skill and care and through suitably qualified employees and contractors.</li>
+					<li><span class="number">2.2</span> Canonical is not obligated to perform (i) any service or function except as expressly identified in the Order (ii) any Services to the extent its performance is limited by Customer's failure to meet any reasonable dependency.</li>
+				</ol>
+			</li>
+			<li>
+				<h2>3. Intellectual Property Rights</h2>
+				<ol class="numbered">
+					<li><span class="number">3.1</span> Each party will retain ownership of its Intellectual Property Rights and any Intellectual Property Rights it creates or obtains. Nothing Canonical creates or provides under this Agreement will be considered a &ldquo;work made for hire&rdquo;, and no Intellectual Property Rights will transfer under this Agreement.</li>
+					<li><span class="number">3.2</span> Ubuntu is licensed under applicable Open Source Software licences and not this Agreement.  If Canonical creates or provides any software to Customer in the course of providing the Services, Canonical will provide such software under an Open Source Software licence, unless otherwise licensed under this Agreement.</li>
+					<li><span class="number">3.3</span> During and after the term of this Agreement, Customer will comply with Canonical's Intellectual Property Rights policy at <a href="http://www.canonical.com/intellectual-property-policy">http://www.canonical.com/intellectual-property-policy</a>.</li>
+					<li><span class="number">3.4</span> With respect to Services which include Canonical's &ldquo;Landscape Dedicated Server&rdquo; product (the &ldquo;LDS Product&rdquo;), Canonical hereby grants to Customer, subject to all Open Source Software licences, a world-wide, non-exclusive, non-transferable, revocable (in the event of breach or termination of this Agreement) licence, during the term of this Agreement, to (i) use the LDS Product in accordance with this Agreement and subject to any quantity or usage limitations set forth in the Order and (ii) to make a reasonable number of copies of the LDS Product for backup and installation purposes. Customer may not: use, copy, modify, disassemble, decompile, reverse engineer, or distribute the LDS Product except as expressly permitted in this Agreement; permit access to the LDS Product to any third party other than those acting on Customer's behalf; or move the LDS Product from one machine to another without the prior written consent of Canonical.</li>
+					<li><span class="number">3.5</span> With respect to Services which include Canonical's paravirtualized drivers for Microsoft Windows systems to run as guests on Ubuntu (the &ldquo;VirtIO Drivers&rdquo;), Canonical hereby grants to Customer, a world-wide, non-exclusive, non-transferable, revocable (in the event of breach or termination of this Agreement) licence, during the term of the applicable Services, to (i) use the VirtIO Drivers in accordance with this Agreement solely in connection with those computer systems for which Customer has purchased the Services, (ii) to make a reasonable number of copies of the VirtIO Drivers for backup and installation purposes.  Customer may not: use, copy, modify, disassemble, decompile, reverse engineer, or distribute the VirtIO Drivers except as expressly permitted in this Agreement or permit access to the VirtIO Drivers to any third party other than those acting on Customer's behalf, and (iii) to distribute the VirtIO Drivers to third party users of Customer's cloud computing services.  In connection with the distribution licence granted under (iii) of the preceding sentence, Customer may sublicense the licence granted under (i) and (ii) of the preceding sentence to third party users Customer's cloud computing services.   Such sublicence must be on terms that are no less protective of Canonical's rights than those of this Agreement, and must be revoked upon the revocation of the licence under this Clause 3.5.</li>
+				</ol>
+			</li>
+			<li>
+				<h2>4. Customer responsibilities</h2>
+				<ol class="numbered">
+					<li><span class="number">4.1</span> Customer will not (i) use the Services other than in connection with the Customer systems for which Customer has purchased the Services or (ii) resell the Services.</li>
+					<li><span class="number">4.2</span> Customer is responsible for the back-up of its data and software.  Canonical will not be liable for any loss, corruption, or damage to data or software.</li>
+					<li><span class="number">4.3</span> If Customer engages Canonical to install or use any third party software or materials as part of the Services, Customer will have and maintain sufficient rights or licences to such software to allow Canonical to perform the Services.</li>
+					<li><span class="number">4.4</span> Where Canonical provides access to online resources as part of the Services, Customer (i) will comply with Canonical's reasonable instructions and (ii) will not cause any adverse impact to the Services.</li>
+				</ol>
+			</li>
+			<li>
+				<h2>5. Confidentiality</h2>
+				<ol class="numbered">
+					<li><span class="number">5.1</span> During and after the term of this Agreement, each party will and will cause its officers, employees, contractors and agents to keep secret and confidential all Confidential Information of the other and will not copy, use or disclose any such information to any third party, other than as may be necessary to comply with its obligations under this Agreement; provided that a party may disclose the other party's Confidential Information to Affiliates.</li>
+					<li><span class="number">5.2</span> The obligation of confidence will not apply where the Confidential Information: is required to be disclosed by operation of law; was lawfully in the possession of the recipient prior to disclosure by the other party; is subsequently lawfully acquired from a third party or independently developed by the recipient without breach of any known obligation of confidence; is or becomes generally available to the public through no act or default of the recipient; or is disclosed on a confidential basis for the purposes of obtaining professional advice.</li>
+					<li><span class="number">5.3</span> Each party will give the other prompt written notice of any disclosure of the party's Confidential Information as required by operation of law during and after the term of this Agreement.</li>
+					<li><span class="number">5.4</span> Each party agrees that damages would not be an adequate remedy for any failure to comply with the confidentiality obligations in this Agreement and that the other party will be entitled to the remedies of injunction, specific performance and/or other equitable relief for any threatened or actual failure to comply with those obligations.</li>
+				</ol>
+			</li>
+			<li>
+				<h2>6. Fees and payment</h2>
+				<ol class="numbered">
+					<li><span class="number">6.1</span> If Customer is purchasing the Services directly from Canonical, Customer will pay the Fees at the time of Customer's Order.  If Customer is purchasing the Services through Canonical's reseller, Customer shall pay the Fees in accordance with the reseller's process and the terms of this Clause 6 will not otherwise apply.</li>
+					<li><span class="number">6.2</span> The Fees are exclusive of all applicable taxes, which Customer will pay in addition to the Fees at the rate prevailing on the date of the invoice.  Any sums payable by Customer to Canonical will be paid clear of any deductions or withholdings.  In the event that Customer is required by applicable law to withhold or deduct any amounts from the Fees, Customer will pay any additional amounts necessary to ensure that Canonical is in the same position as it would have been in had no deductions or withholdings been required.</li>
+					<li><span class="number">6.3</span> During the term of this Agreement, Canonical may request Customer's confirmation of its compliance with this Agreement or, if Canonical reasonably suspects that Customer is not in compliance with this Agreement, audit Customer's use of the Services to confirm compliance.  If any audit reveals that Customer was not in compliance with the Agreement, Customer will immediately come into compliance.  If Customer's confirmation or an audit reveals that additional Fees are due, Customer will pay such Fees and interest (at the rate applicable to past due amounts), within 30 days of the date of Canonical&rsquo;s invoice.  If the additional Fees exceed the Fees originally invoiced for the period covered by the audit by 5%, Customer will reimburse Canonical for the costs of the audit.</li>
+					<li><span class="number">6.4</span> Canonical may charge interest on any past due payment amounts, plus any related collection and legal costs.  Such interest will accrue at the annual rate of 2% above the base rate of the Bank of England in force from the due date until the date of payment, or the highest rate allowable by applicable law (if lower).  Interest will accrue on a daily basis, whether before or after judgement.</li>
+				</ol>
+			</li>
+			<li>
+				<h2>7. Warranty disclaimer</h2>
+				<ol class="numbered">
+					<li><span class="number">7.1</span> Neither party makes any representations or warranties of any kind, whether oral or written, whether express, implied, or arising by statute, custom, course of dealing or trade usage, with respect to the subject matter hereof or otherwise in connection with this Agreement.  Each party specifically disclaims any and all implied warranties or conditions of title, satisfactory quality, merchantability, satisfactoriness, fitness for a particular purpose and non-infringement.</li>
+				</ol>
+			</li>
+			<li>
+				<h2>8. Liability limitations</h2>
+				<ol class="numbered">
+					<li><span class="number">8.1</span> Subject to Clause 8.3, each party&rsquo;s aggregate liability under this Agreement, in any Contract Year, whether based on contract, tort (including negligence) or otherwise, will not exceed the amount of Fees becoming payable in that particular Contract Year.  &ldquo;Contract Year&rdquo; means any period of 12 months commencing on the Effective Date or any anniversary of the Effective Date.</li>
+					<li><span class="number">8.2</span> Subject to Clause 8.3, neither party will be liable for any indirect, special, incidental, punitive, or consequential loss or damage or for any loss of or damage to data, ex gratia payments, loss of profit, loss of contract or loss of other economic advantage (in each case whether direct or indirect) arising out of or in connection with this Agreement, even if that party has previously been advised of the possibility of the same and whether foreseeable or not. These limitations will apply notwithstanding any failure of essential purpose of any limited remedy.</li>
+					<li><span class="number">8.3</span> Nothing in this Agreement excludes or limits the liability of either party for: (i) death or personal injury; (ii) fraud; (iii) breach of the confidentiality provisions of this Agreement, and (iv) anything else that cannot be excluded of limited by applicable law.</li>
+					<li><span class="number">8.4</span> The limitations of liability set forth in this Clause 8 are a reasonable allocation of risk between the parties, and the parties would not have entered into this Agreement, absent such allocation.</li>
+				</ol>
+			</li>
+			<li>
+				<h2>9. Term and termination</h2>
+				<ol class="numbered">
+					<li><span class="number">9.1</span> This Agreement will come into force on the Effective Date and will continue until the end of the Services Term unless terminated earlier under this Clause 9.</li>
+					<li><span class="number">9.2</span> Unless Customer is purchasing the Services from Canonical's reseller, if Canonical has not received a purchase order for the Fees or payment of the Fees within 30 days of the Effective Date, this Agreement will automatically terminate.</li>
+					<li><span class="number">9.3</span> Either party may terminate this Agreement immediately by written notice if the other party:</li>
+					<li><span class="number">9.4</span> commits a material breach of this Agreement and, if such breach is capable of remedy, fails to remedy the breach within 14 days of receiving notice of the breach;</li>
+					<li><span class="number">9.5</span> enters into liquidation whether compulsorily or voluntarily (otherwise than for the purposes of a solvent amalgamation or reconstruction); becomes insolvent; ceases or threatens to cease to carry on business; or any similar event.</li>
+					<li><span class="number">9.6</span> Canonical may terminate this Agreement for convenience upon giving 90 days prior notice to Customer.</li>
+					<li><span class="number">9.7</span> On expiration or termination this Agreement for any reason, Canonical's obligation to provide the Services will immediately terminate and any licences granted under this Agreement will terminate, unless otherwise agreed. On termination other than by Canonical for convenience in accordance with Clause 9.4, Customer will immediately pay all outstanding Fees applicable to this Agreement including Fees that would otherwise have been payable with respect to the full Agreement term.   On termination of this Agreement by Canonical for convenience in accordance with Clause 9.4, Canonical will provide Customer with a pro rata refund of any prepaid Fees for the remaining unexpired portion of the Services term.</li>
+				</ol>
+			</li>
+			<li>
+				<h2>10. Escalation</h2>
+				<ol class="numbered">
+					<li><span class="number">10.1</span> If there is a disagreement in relation to this Agreement, the parties will use their reasonable endeavours to negotiate and settle the disagreement.  If it is not possible to settle the disagreement within 14 days, representatives of both parties will meet to try to resolve the disagreement.  If the disagreement is not resolved within a further 14 days, the disagreement may be referred by either party to a meeting between the senior managers of the parties.  Subject to Clause 10.2, neither party will refer any dispute to the courts unless and until the dispute resolution procedures of this Clause 10 have been followed.</li>
+					<li><span class="number">10.2</span> Nothing in this Clause 10 will prevent either party applying to the courts of any country for injunctive or other interim relief.</li>
+				</ol>
+			</li>
+			<li>
+				<h2>11. General</h2>
+				<ol class="numbered">
+					<li><span class="number">11.1</span> Neither party will be liable for any breach of this Agreement directly or indirectly caused by circumstances beyond the reasonable control of that party, provided that a lack of funds will not be regarded as a circumstance beyond that party&rsquo;s reasonable control.</li>
+					<li><span class="number">11.2</span> Neither party may assign, transfer, charge, create a trust over or otherwise deal in its rights and/or obligations under this Agreement (or purport to do so) without the other party&rsquo;s prior written consent except to an Affiliate pursuant to a bona fide re-structure, merger, consolidation, sale of all or substantially all of its assets, or a sale of the business to which the Services relate.</li>
+					<li><span class="number">11.3</span> There are no intended third party beneficiaries to this Agreement.  The parties do not intend that any provision of this Agreement will be enforceable by any person who is not a party to this Agreement.</li>
+					<li><span class="number">11.4</span> No amendment or modification of this Agreement will be binding upon the parties unless made in writing and signed by the authorized representatives of both parties.</li>
+					<li><span class="number">11.5</span> A failure or delay by a party to exercise any right or remedy under this Agreement will not be construed or operate as a waiver of that right or remedy.  Nor single or partial exercise of any right or remedy will preclude the further exercise of that right or remedy by that party.</li>
+					<li><span class="number">11.6</span> During the term of this Agreement and for 6 months thereafter, Customer will not  solicit to be hired or hire, as an employee or independent contractor, any individual (i) who is then the personnel of Canonical or any of its Affiliates or was the personnel of Canonical or any of its Affiliates during the previous 6 months (unless Canonical terminated that individual's employment or contract) and (ii) who during any part of the term of this Agreement was assigned by Canonical to provide services to Canonical's customers.</li>
+					<li><span class="number">11.7</span> This Agreement represents the entire terms agreed between the parties in relation to its subject matter and supersedes all previous contracts or arrangements (including any usage or custom and any terms arising through any course of dealing) of any kind between the parties relating to its subject matter.  No terms or conditions included in or delivered with any Customer acceptance of Services, proposal, purchase order or similar document will form part of this Agreement.</li>
+					<li><span class="number">11.8</span> Each of the provisions of this Agreement will be construed as independent of every other such provision, so that if any provision of this Agreement will be determined by any court of competent authority to be illegal, invalid and/or unenforceable this will not affect any other provision of this Agreement, which will remain in full force and effect.</li>
+					<li><span class="number">11.9</span> Nothing in this Agreement and no action taken by the parties pursuant to this Agreement will be construed as creating a partnership or joint venture of any kind between the parties or as constituting either party as the agent of the other party.  No party will have the authority to bind the other party or to contract in the name of or create a liability against the other party.</li>
+					<li><span class="number">11.10</span> Any notice required to be given or sent under this Agreement will be in writing and delivered to the recipient at the address set out in this Agreement or, if no address is set out, to the recipient's registered office address.  A party may update its address by providing notice to the other party.  Valid delivery methods are (i) in-person delivery, (ii) first class registered post (or equivalent), or (iii) internationally recognized overnight courier service.</li>
+					<li><span class="number">11.11</span> Canonical may provide copies of this Agreement in different languages for information purposes.  Only the English language version of this Agreement will be binding.  In the event of any dispute, any version in any language other than English will be disregarded.</li>
+					<li><span class="number">11.12</span> Customer acknowledges that export laws and regulations of the United States and European territories may apply to materials delivered by Canonical under this Agreement.  Customer agrees that such export control laws and regulations govern its use of materials and will comply with all such laws and regulations.  Customer will not export, directly or indirectly, such materials in violation of these laws or regulations, or use them for any purpose prohibited by these laws.</li>
+				</ol>
+			</li>
+			<li>
+				<h2>12. Governing law</h2>
+				<ol class="numbered">
+					<li><span class="number">12.1</span> This Agreement and any non-contractual obligations arising from this Agreement will be governed by and construed in accordance with the laws of Japan.  The parties submit to the exclusive jurisdiction of the Tokyo District Court in Japan, except when a party seeks immediate injunctive relief (for example, in connection with a breach or impending breach of confidentiality obligations) that would not be reasonably effective unless obtained in the jurisdiction of the conduct at issue.  The provisions of the United Nations Convention on Contracts for the International Sale of Goods will not apply to this Agreement.</li>
+				</ol>
+			</li>
+		</ol>
+	</div>
+	<div class="box four-col last-col">
+		<h3>Japanese translation</h3>
+		<ul class="list">
+			<li class="last-item"><a href="ua-miracle-tc-ja">Miracle Linux - UA 略式サービス契約&nbsp;›</a></li>
+		</ul>
+	</div>
+</div>
+
+{% endblock content %}
diff --git a/templates/legal/ubuntu-advantage/assurance.html b/templates/legal/ubuntu-advantage/assurance.html
index 57183667c60..4e2e67a6158 100755
--- a/templates/legal/ubuntu-advantage/assurance.html
+++ b/templates/legal/ubuntu-advantage/assurance.html
@@ -3,7 +3,7 @@
 {% block title %}Ubuntu Assurance | Ubuntu Advantage{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Ubuntu Advantage" page_title="Ubuntu Assurance" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Ubuntu Advantage" page_title="Ubuntu Assurance" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/legal/ubuntu-advantage/base_ubuntu_advantage.html b/templates/legal/ubuntu-advantage/base_ubuntu_advantage.html
index 614baf51868..e23f568bbef 100755
--- a/templates/legal/ubuntu-advantage/base_ubuntu_advantage.html
+++ b/templates/legal/ubuntu-advantage/base_ubuntu_advantage.html
@@ -1,6 +1,6 @@
-{% extends "_base/base.html" %}
+{% extends "templates/base.html" %}
 
 {% block outer_content %}
     {% block content %}{% endblock %}
-		{% include "_base/_contextual_footer.html" %}
+		{% include "templates/_contextual_footer.html" %}
 {% endblock %}
diff --git a/templates/legal/ubuntu-advantage/index.html b/templates/legal/ubuntu-advantage/index.html
index 39bc9965d25..59920c35441 100755
--- a/templates/legal/ubuntu-advantage/index.html
+++ b/templates/legal/ubuntu-advantage/index.html
@@ -3,7 +3,7 @@
 {% block title %}Ubuntu Advantage{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Legal" page_title="Ubuntu Advantage" tertiary="true" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" page_title="Ubuntu Advantage" tertiary="true" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
@@ -19,17 +19,25 @@ <h1>Ubuntu Advantage</h1>
 	</div>
 </div>
 
-<div class="row equal-height no-border">
-	<div class="six-col box">
-		<h3>Ubuntu Advantage service description</h3>
-		<p>This describes the services we provide to our Ubuntu Advantage customers. It mentions several Canonical products, but please note that we can only provide services for the products listed in your customer agreement.</p>
-		<p><a href="/legal/ubuntu-advantage/service-description">View the Ubuntu Advantage service description&nbsp;&rsaquo;</a></p>
+<div class="row no-border">
+	<div class="equal-height">
+		<div class="six-col box">
+			<h3>Ubuntu Advantage service description</h3>
+			<p>This describes the services we provide to our Ubuntu Advantage customers. It mentions several Canonical products, but please note that we can only provide services for the products listed in your customer agreement.</p>
+			<p><a href="/legal/ubuntu-advantage/service-description">View the Ubuntu Advantage service description&nbsp;&rsaquo;</a></p>
+		</div>
+
+		<div class="six-col box last-col">
+			<h3>Ubuntu Assurance</h3>
+			<p>The Ubuntu Advantage Assurance Programme provides indemnification from Canonical against claims of intellectual property infringement support customers might face as a result of using Ubuntu. This agreement is part of all Canonical support contracts. </p>
+			<p><a href="/legal/ubuntu-advantage/assurance">View Ubuntu Advantage Assurance&nbsp;&rsaquo;</a></p>
+		</div>
 	</div>
 
-	<div class="six-col box last-col">
-		<h3>Ubuntu Assurance</h3>
-		<p>The Ubuntu Advantage Assurance Programme provides indemnification from Canonical against claims of intellectual property infringement support customers might face as a result of using Ubuntu. This agreement is part of all Canonical support contracts. </p>
-		<p><a href="/legal/ubuntu-advantage/assurance">View Ubuntu Advantage Assurance&nbsp;&rsaquo;</a></p>
+	<div class="six-col box">
+		<h3>Ubuntu Advantage terms</h3>
+		<p>This agreement sets out Canonical's standard service terms for Ubuntu Advantage customers.</p>
+		<p><a href="/legal/ubuntu-advantage/ua-terms">View the Ubuntu Advantage service terms&nbsp;&rsaquo;</a></p>
 	</div>
 </div>
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/legal/ubuntu-advantage/service-description.html b/templates/legal/ubuntu-advantage/service-description.html
index a61ecf44a23..66620608cfb 100755
--- a/templates/legal/ubuntu-advantage/service-description.html
+++ b/templates/legal/ubuntu-advantage/service-description.html
@@ -3,7 +3,7 @@
 {% block title %}Ubuntu Advantage service description{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Ubuntu Advantage" page_title="Service description" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Ubuntu Advantage" page_title="Service description" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
@@ -15,8 +15,10 @@ <h2 id="service-description-overview">1. Overview</h2>
 		<p>This service description defines the Services Canonical will provide to the customer under the customer's agreement with Canonical.  This service description defines the following products, but only those products listed in Customer's agreement with Canonical will be provided: Ubuntu Advantage Standard Desktop, Ubuntu Advantage Advanced Desktop, Ubuntu Advantage Essential Server, Ubuntu Advantage Standard Server, Ubuntu Advantage Advanced Server, Ubuntu Advantage Virtual Guest Standard, Ubuntu Advantage Virtual Guest Advanced, Ubuntu Advantage Cloud Guest, Ubuntu Advantage Cloud Guest 24x7, OpenStack Cloud Availability Zone, OpenStack Cloud Availability Zone - Advanced 24x7 Guest Support Upgrade, Landscape, Landscape Dedicated Server, Landscape Agent, Ubuntu Advantage Ceph Storage Standard, Ubuntu Advantage Ceph Storage Advanced,  Ubuntu Advantage Technical Account Manager, Ubuntu Advantage Dedicated Services Engineer, Ubuntu Advantage Training, Ubuntu OpenStack Jumpstart Training, and OpenStack Continuous Integration Implementation.</p>
 
 		<h2 id="service-description-service-initiation">2. Service initiation</h2>
-		<p>2.1: Upon commencement of the services, Canonical will provide a single set of login credentials to the customer to access Canonical's systems management service, support web portal to submit support cases, and on-line knowledge base.</p>
-		<p>2.2: Canonical service personnel will interface with the customer's technical contacts with respect to the technical support elements of the services. The customer may appoint up to the number of contacts corresponding to the highest services product Customer has purchased, in accordance with the table below:</p>
+		<ol class="numbered">
+			<li><span class="number">2.1</span> Upon commencement of the services, Canonical will provide a single set of login credentials to the customer to access Canonical's systems management service, support web portal to submit support cases, and on-line knowledge base.</li>
+			<li><span class="number">2.2</span> Canonical service personnel will interface with the customer's technical contacts with respect to the technical support elements of the services. The customer may appoint up to the number of contacts corresponding to the highest services product Customer has purchased, in accordance with the table below:</li>
+		</ol>
 	</div>
 
 	<div class="box four-col last-col">
@@ -53,47 +55,58 @@ <h3>Additional information</h3>
 		</tbody>
 	</table>
 	<div class="eight-col">
-		<h3>2.3</h3>
-		<p>Customer may change the specific technical contacts at any time by written request.</p>
+		<ol class="numbered">
+			<li><span class="number">2.3</span>Customer may change the specific technical contacts at any time by written request.</li>
+		</ol>
 
 		<h2 id="service-description-management-and-monitoring">3. Landscape</h2>
-		<p>3.1: Landscape is a service to manage and monitor Ubuntu systems.  Canonical will include its Landscape for each physical system covered by an Ubuntu Advantage subscription, as well as for each virtual system covered by the Ubuntu Advantage Virtual Guest service or Ubuntu Advantage Cloud Guest service. The customer may register the customer's systems with Canonical's Landscape service and use the service to manage and monitor those systems.</p>
+		<ol class="numbered">
+			<li><span class="number">3.1</span> Landscape is a service to manage and monitor Ubuntu systems.  Canonical will include its Landscape for each physical system covered by an Ubuntu Advantage subscription, as well as for each virtual system covered by the Ubuntu Advantage Virtual Guest service or Ubuntu Advantage Cloud Guest service. The customer may register the customer's systems with Canonical's Landscape service and use the service to manage and monitor those systems.</li>
+		</ol>
 
 		<h2>4. Knowledge base access</h2>
-		<p>4.1: Canonical will make its knowledge base of support issues and resolutions available to the customer during the term of service.</p>
+		<ol class="numbered">
+			<li><span class="number">4.1</span> Canonical will make its knowledge base of support issues and resolutions available to the customer during the term of service.</li>
+		</ol>
 
 		<h2 id="service-description-support">5. Support</h2>
 		<p>Canonical will provide the following support for the specific customer systems for which the customer purchases the services:</p>
 
-		<p>5.1: Canonical will provide installation, configuration, maintenance and management support for any standard version of Ubuntu which is within its life-cycle on the customer's systems.</p>
+		<ol class="numbered">
+			<li><span class="number">5.1</span> Canonical will provide installation, configuration, maintenance and management support for any standard version of Ubuntu which is within its life-cycle on the customer's systems.</li>
 
-		<p>5.2: Canonical will provide a reasonable level of assistance to the customer to install Ubuntu on the customer's systems built from an officially supported computer architecture. Canonical is not able to guarantee that Ubuntu can be installed on all customer hardware. Canonical is able to provide a higher level of effort with hardware issues that take place on machines that have been specified by Canonical as “certified” systems.</p>
+			<li><span class="number">5.2</span> Canonical will provide a reasonable level of assistance to the customer to install Ubuntu on the customer's systems built from an officially supported computer architecture. Canonical is not able to guarantee that Ubuntu can be installed on all customer hardware. Canonical is able to provide a higher level of effort with hardware issues that take place on machines that have been specified by Canonical as “certified” systems.</li>
 
-		<p>5.3: Canonical will support the installation, applications and system administration of Ubuntu as described in the appendices to this service description.</p>
+			<li><span class="number">5.3</span> Canonical will support the installation, applications and system administration of Ubuntu as described in the appendices to this service description.</li>
 
-		<p>5.4: The Ubuntu distribution is a collection of many elements of open source software. Canonical may not be able to resolve all issues, even on packages that are supported. For any supported application, Canonical will attempt to provide a work-around or a full resolution. Canonical does not guarantee a resolution or resolution time.</p>
+			<li><span class="number">5.4</span> The Ubuntu distribution is a collection of many elements of open source software. Canonical may not be able to resolve all issues, even on packages that are supported. For any supported application, Canonical will attempt to provide a work-around or a full resolution. Canonical does not guarantee a resolution or resolution time.</li>
+		</ol>
 
 		<h2 id="service-description-support-requests">6. Submitting support requests</h2>
 
-		<p>6.1: The customer may submit support requests (“cases”) through Canonical's support web portal or by contacting the support team by telephone.</p>
+		<ol class="numbered">
+			<li><span class="number">6.1</span> The customer may submit support requests (“cases”) through Canonical's support web portal or by contacting the support team by telephone.</li>
 
-		<p>6.2: Canonical will keep a record of each case within the support web portal to enable the customer to see all current cases, enter new cases, review historical cases and edit or respond to current cases. The customer may configure the support web portal to send email notifications to the customer when a case is updated.</p>
+			<li><span class="number">6.2</span> Canonical will keep a record of each case within the support web portal to enable the customer to see all current cases, enter new cases, review historical cases and edit or respond to current cases. The customer may configure the support web portal to send email notifications to the customer when a case is updated.</li>
 
-		<p>6.3: All cases are assigned a ticket number and responded to automatically. All correspondence and telephone calls are logged with a time-stamp for quality assurance.</p>
+			<li><span class="number">6.3</span> All cases are assigned a ticket number and responded to automatically. All correspondence and telephone calls are logged with a time-stamp for quality assurance.</li>
 
-		<p>6.4: Severity Level 1 and Level 2 issues must be reported by telephone. When reporting a case the customer must specify how the issue is affecting their use of Ubuntu. The customer must provide all information requested by Canonical to resolve the case.</p>
+			<li><span class="number">6.4</span> Severity Level 1 and Level 2 issues must be reported by telephone. When reporting a case the customer must specify how the issue is affecting their use of Ubuntu. The customer must provide all information requested by Canonical to resolve the case.</li>
 
-		<p>6.5: There is no limit to the number of cases customer may submit for the customer's systems for which the services are purchased. A single support case consists of a discrete problem, issue or request although it may consist of a number of interactions with Canonical's support engineers.</p>
+			<li><span class="number">6.5</span> There is no limit to the number of cases customer may submit for the customer's systems for which the services are purchased. A single support case consists of a discrete problem, issue or request although it may consist of a number of interactions with Canonical's support engineers.</li>
+		</ol>
 
 		<h2 id="service-description-support-severity">7. Support severity levels</h2>
 
-		<p>7.1: Upon receipt of a case report, a Canonical support engineer will commence efforts to verify the case and set the severity level. Canonical will work with the customer to assess the urgency of a case and to assign the appropriate severity level.</p>
+		<ol class="numbered">
+			<li><span class="number">7.1</span> Upon receipt of a case report, a Canonical support engineer will commence efforts to verify the case and set the severity level. Canonical will work with the customer to assess the urgency of a case and to assign the appropriate severity level.</li>
 
-		<p>7.2: Canonical support engineer will respond as soon as practicable to the customer after setting the severity level and within the response time for the applicable severity level listed below.</p>
+			<li><span class="number">7.2</span> Canonical support engineer will respond as soon as practicable to the customer after setting the severity level and within the response time for the applicable severity level listed below.</li>
 
-		<p>7.3: Canonical's support engineer will work on diagnosing and resolving the case during the effort period for the applicable severity level listed below.</p>
+			<li><span class="number">7.3</span> Canonical's support engineer will work on diagnosing and resolving the case during the effort period for the applicable severity level listed below.</li>
 
-		<p>7.4: The tables below show the methods for reporting cases, the level of response from Canonical to the case report and the effort period that will be used to resolve the case.</p>
+			<li><span class="number">7.4</span> The tables below show the methods for reporting cases, the level of response from Canonical to the case report and the effort period that will be used to resolve the case.</li>
+		</ol>
 	</div>
 
 	<table class="twelve-col">
@@ -187,7 +200,9 @@ <h2 id="service-description-support-severity">7. Support severity levels</h2>
 	<div class="eight-col">
 		<h2 id="service-description-support-response">8. Support response definitions</h2>
 
-		<p>8.1: When setting the severity level, Canonical's support team will use the definitions, and carry out operational procedures as stated in the table below.</p>
+		<ol class="numbered">
+			<li><span class="number">8.1</span> When setting the severity level, Canonical's support team will use the definitions, and carry out operational procedures as stated in the table below.</li>
+		</ol>
 	</div>
 
 	<table class="twelve-col">
@@ -224,7 +239,9 @@ <h2 id="service-description-support-response">8. Support response definitions</h
 	<div class="eight-col">
 		<h2 id="service-description-support-coverage">9. Support coverage hours, languages</h2>
 
-		<p>9.1: Canonical will provide support during the following coverage hours:</p>
+		<ol class="numbered">
+			<li><span class="number">9.1</span> Canonical will provide support during the following coverage hours:</li>
+		</ol>
 	</div>
 	<table class="twelve-col">
 		<caption>Hours of coverage table</caption>
@@ -280,7 +297,9 @@ <h2 id="service-description-support-coverage">9. Support coverage hours, languag
 		</tbody>
 	</table>
 	<div class="eight-col">
-		<p>9.2: The customer must select the time-zone for their coverage from those detailed below. Hours of coverage will be adjusted in accordance with locale-specific daylight saving alterations. Coverage hours exclude public holidays in the customer's location.</p>
+		<ol class="numbered">
+			<li><span class="number">9.2</span> The customer must select the time-zone for their coverage from those detailed below. Hours of coverage will be adjusted in accordance with locale-specific daylight saving alterations. Coverage hours exclude public holidays in the customer's location.</li>
+		</ol>
 	</div>
 	<table class="twelve-col">
 		<caption>Local business hours table</caption>
@@ -311,11 +330,15 @@ <h2 id="service-description-support-coverage">9. Support coverage hours, languag
 		</tbody>
 	</table>
 	<div class="eight-col">
-		<p>9.3: Customer support will be provided in one of the following languages: English, French or Chinese Mandarin.</p>
+		<ol class="numbered">
+			<li><span class="number">9.3</span> Customer support will be provided in one of the following languages: English, French or Chinese Mandarin.</li>
+		</ol>
 
 		<h2 id="service-description-escalation">10. Escalation</h2>
 
-		<p>10.1: In the event that the customer receives unsatisfactory service or wishes to escalate a case for urgent action, the customer can escalate as follows:</p>
+		<ol class="numbered">
+			<li><span class="number">10.1</span> In the event that the customer receives unsatisfactory service or wishes to escalate a case for urgent action, the customer can escalate as follows:</li>
+		</ol>
 	</div>
 	<table class="twelve-col">
 		<caption>Escalation contact table</caption>
@@ -343,26 +366,34 @@ <h2 id="service-description-escalation">10. Escalation</h2>
 	<div class="eight-col">
 		<h2 id="service-description-assurance">11. Assurance</h2>
 
-		<p>11.1: The customer is entitled to participate in the Ubuntu Assurance Programme subject to its terms and conditions. Canonical may update the Assurance Programme and its terms on one or more occasions. The current Ubuntu Assurance Programme and its terms are available at our <a href="/legal/ubuntu-advantage/assurance">Ubuntu Assurance page</a>.</p>
+		<ol class="numbered">
+			<li><span class="number">11.1</span> The customer is entitled to participate in the Ubuntu Assurance Programme subject to its terms and conditions. Canonical may update the Assurance Programme and its terms on one or more occasions. The current Ubuntu Assurance Programme and its terms are available at our <a href="/legal/ubuntu-advantage/assurance">Ubuntu Assurance page</a>.</li>
+		</ol>
 
 		<h2 id="service-description-virtual-guest">12. Virtual Guest</h2>
 
-		<p>12.1: Virtual Guest Standard consists of the Standard Server services for the number of virtual guests purchased for virtual machines deployed with hypervisors not covered by other Ubuntu Advantage services.</p>
+		<ol class="numbered">
+			<li><span class="number">12.1</span> Virtual Guest Standard consists of the Standard Server services for the number of virtual guests purchased for virtual machines deployed with hypervisors not covered by other Ubuntu Advantage services.</li>
 
-		<p>12.2: Virtual Guest Advanced consists of the Advanced Server services for the number of virtual guests purchased for virtual machines deployed with hypervisors not covered by other Ubuntu Advantage services.</p>
+			<li><span class="number">12.2</span> Virtual Guest Advanced consists of the Advanced Server services for the number of virtual guests purchased for virtual machines deployed with hypervisors not covered by other Ubuntu Advantage services.</li>
+		</ol>
 
 		<h2 id="service-description-cloud-guest">13. Cloud Guest</h2>
 
-		<p>13.1: Cloud Guest consists of the Standard Server services for all Ubuntu instances in the customer&#39;s public cloud account.</p>
+		<ol class="numbered">
+			<li><span class="number">13.1</span> Cloud Guest consists of the Standard Server services for all Ubuntu instances in the customer&#39;s public cloud account.</li>
 
-		<p>13.2: Cloud Guest 24&#215;7 consists of the Advanced Server services for all Ubuntu instances in the customer&#39;s public cloud account.</p>
+			<li><span class="number">13.2</span> Cloud Guest 24&#215;7 consists of the Advanced Server services for all Ubuntu instances in the customer&#39;s public cloud account.</li>
+		</ol>
 
 
 		<h2 id="service-description-cloud-availability">14. OpenStack Cloud Availability Zone</h2>
 
-		<p>14.1: If the customer purchases the Cloud Availability Zone service, Canonical will provide:</p>
+		<ol class="numbered">
+			<li><span class="number">14.1</span> If the customer purchases the Cloud Availability Zone service, Canonical will provide:</li>
 
-		<p>14.1.1: For up to the number of cloud infrastructure nodes specified in the table below, plus any single node add-ons:</p>
+			<li><span class="number">14.1.1</span> For up to the number of cloud infrastructure nodes specified in the table below, plus any single node add-ons:</li>
+		</ol>
 
 		<ul>
 			<li>24×7 support for the Ubuntu Server components required to host an OpenStack cloud at the response and effort levels specified for the Ubuntu Advantage Server Advanced offering</li>
@@ -399,17 +430,21 @@ <h2 id="service-description-cloud-availability">14. OpenStack Cloud Availability
 		</tbody>
 	</table>
 	<div class="eight-col">
-		<p>14.1.2: For an unlimited number of guests hosted on the infrastructure supported by the Cloud Availability Zone services: Ubuntu Advantage Server Standard (but not including Landscape management).</p>
+		<ol class="numbered">
+			<li><span class="number">14.1.2</span> For an unlimited number of guests hosted on the infrastructure supported by the Cloud Availability Zone services: Ubuntu Advantage Server Standard (but not including Landscape management).</li>
 
-		<p>14.2: If the customer purchases the Cloud Availability Zone - Advanced 24×7 Guest Support Upgrade, Canonical will provide the Ubuntu Advantage Server Advanced service (but not including Landscape management) for an unlimited number of guests hosted on the infrastructure supported by the Cloud Availability Zone services.</p>
+			<li><span class="number">14.2</span> If the customer purchases the Cloud Availability Zone - Advanced 24×7 Guest Support Upgrade, Canonical will provide the Ubuntu Advantage Server Advanced service (but not including Landscape management) for an unlimited number of guests hosted on the infrastructure supported by the Cloud Availability Zone services.</li>
+		</ol>
 
 		<h2 id="service-description-ceph-storage">15. Ceph Storage</h2>
 
-		<p>15.1: If the customer purchases the Ceph Storage Standard or the Ceph Storage Advanced service, Canonical will provide support for a filesystem instance storing up to the specified capacity of data. Capacity refers to actual used capacity rather than to available, unallocated storage space.</p>
+		<ol class="numbered">
+			<li><span class="number">15.1</span> If the customer purchases the Ceph Storage Standard or the Ceph Storage Advanced service, Canonical will provide support for a filesystem instance storing up to the specified capacity of data. Capacity refers to actual used capacity rather than to available, unallocated storage space.</li>
 
-		<p>15.2: The service includes support for all the servers that the customer dedicated to host the distributed filesystem at the chosen redundancy level. The service does not support running any additional workloads on such storage dedicated servers.</p>
+			<li><span class="number">15.2</span> The service includes support for all the servers that the customer dedicated to host the distributed filesystem at the chosen redundancy level. The service does not support running any additional workloads on such storage dedicated servers.</li>
 
-		<p>15.3: Support hours for Ceph Storage Standard and Ceph Storage Advanced match those of the Ubuntu Advantage Standard Server and Ubuntu Advantage Advanced Server respectively.</p>
+			<li><span class="number">15.3</span> Support hours for Ceph Storage Standard and Ceph Storage Advanced match those of the Ubuntu Advantage Standard Server and Ubuntu Advantage Advanced Server respectively.</li>
+		</ol>
 
 		<h2 id="service-description-additional-services">16. Additional services</h2>
 
@@ -417,16 +452,17 @@ <h3 id="service-description-technical-account-manager">16.1 Technical Account Ma
 
 		<p>If the customer purchases the Technical Account Manager (“TAM”) service, Canonical will provide enhanced support by providing a named contact who personally collaborates with the customer's IT staff.</p>
 
-		<p>16.1.1: The TAM will provide installation, configuration, maintenance and management support for Ubuntu on the customer's systems covered by the applicable Ubuntu Advantage services.</p>
+		<ol class="numbered">
+			<li><span class="number">16.1.1</span> The TAM will provide installation, configuration, maintenance and management support for Ubuntu on the customer's systems covered by the applicable Ubuntu Advantage services.</li>
 
-		<p>16.1.2: The TAM will provide the services described below for up to 10 hours per week during the term of service. The customer may contact the TAM during applicable business hours.</p>
+			<li><span class="number">16.1.2</span> The TAM will provide the services described below for up to 10 hours per week during the term of service. The customer may contact the TAM during applicable business hours.</li>
 
-		<p>16.1.3: The TAM will take part in regular review calls of the customer's operational issues on a mutually agreed bi-weekly schedule.</p>
+			<li><span class="number">16.1.3</span> The TAM will take part in regular review calls of the customer's operational issues on a mutually agreed bi-weekly schedule.</li>
 
-		<p>16.1.4: The TAM will visit the customer annually for on-site technical reviews.</p>
+			<li><span class="number">16.1.4</span> The TAM will visit the customer annually for on-site technical reviews.</li>
 
-
-		<p>16.1.5: The TAM will organise multi-vendor issue coordination through TSANet or Canonical's direct partnerships where applicable. As soon as the root cause is identified, the vendor for that sub-system will take over responsibility and work to resolve the case through their normal support process.</p>
+			<li><span class="number">16.1.5</span> The TAM will organise multi-vendor issue coordination through TSANet or Canonical's direct partnerships where applicable. As soon as the root cause is identified, the vendor for that sub-system will take over responsibility and work to resolve the case through their normal support process.</li>
+		</ol>
 
 	</div>
 	<table class="twelve-col">
@@ -463,52 +499,65 @@ <h3 id="service-description-technical-account-manager">16.1 Technical Account Ma
 		</tbody>
 	</table>
 	<div class="eight-col">
-		<p>16.1.6: Canonical will undertake a quarterly service review meeting with the customer to assess service performance and determine areas of improvement.</p>
+		<ol class="numbered">
+			<li><span class="number">16.1.6</span> Canonical will undertake a quarterly service review meeting with the customer to assess service performance and determine areas of improvement.</li>
+		</ol>
 
 		<h3 id="service-description-dedicated-services-engineer">16.2 Dedicated Services Engineer</h3>
 
 		<p>If the customer purchases the Dedicated Services Engineer (“DSE”) service, Canonical will provide enhanced support and on-site expertise by embedding a full time employee in the customer's IT staff.</p>
 
-		<p>16.2.1: Canonical will assign a Dedicated Services Engineer on-site at the customer's place of business.</p>
+		<ol class="numbered">
+			<li><span class="number">16.2.1</span> Canonical will assign a Dedicated Services Engineer on-site at the customer's place of business.</li>
 
-		<p>16.2.2: The DSE will be available to the customer full time during local business hours.</p>
+			<li><span class="number">16.2.2</span> The DSE will be available to the customer full time during local business hours.</li>
 
-		<p>16.2.3: The DSE will act as the primary point of contact for all support issues, as well as providing Ubuntu Server and OpenStack expertise to the customer.</p>
+			<li><span class="number">16.2.3</span> The DSE will act as the primary point of contact for all support issues, as well as providing Ubuntu Server and OpenStack expertise to the customer.</li>
 
-		<p>16.2.4: The DSE will coordinate Ubuntu Advantage support at all the customer's sites. The DSE will manage support escalations and issue prioritization in accordance with Canonical's standard support response definitions.</p>
+			<li><span class="number">16.2.4</span> The DSE will coordinate Ubuntu Advantage support at all the customer's sites. The DSE will manage support escalations and issue prioritization in accordance with Canonical's standard support response definitions.</li>
+		</ol>
 
 		<h3 id="service-description-ubuntu-advantage-training">16.3 Ubuntu Advantage Training</h3>
 
-		<p>16.3.1: If the customer purchases the Ubuntu Advantage - Training service, Canonical will provide 5 days of training on the specified subject matter at a mutually agreed site and time.  The training will be limited to the curriculum specified in applicable documentation.</p>
+		<ol class="numbered">
+			<li><span class="number">16.3.1</span> If the customer purchases the Ubuntu Advantage - Training service, Canonical will provide 5 days of training on the specified subject matter at a mutually agreed site and time.  The training will be limited to the curriculum specified in applicable documentation.</li>
+		</ol>
 
 		<h3 id="service-description-ubuntu-openstack-jumpstart-training">16.4 Not Used</h3>
 
 		<h3 id="service-description-openstack-continuous-itegration-implementation">16.5 OpenStack Continuous Integration Implementation</h3>
 
-		<p>16.5.1: If the customer purchases the OpenStack Continuous Integration Implementation service, Canonical will provide a dedicated, private, hosted build and test environment infrastructure for customer developed OpenStack patches.</p>
+		<ol class="numbered">
+			<li><span class="number">16.5.1</span> If the customer purchases the OpenStack Continuous Integration Implementation service, Canonical will provide a dedicated, private, hosted build and test environment infrastructure for customer developed OpenStack patches.</li>
+
 
-		<p>16.5.2: The test environment consists of a set of services running in Canonical&#39;s production cloud: a continuous integration testing suite, including a code revision system, a versioned code repository, and a trunk gating system.</p>
+			<li><span class="number">16.5.2</span> The test environment consists of a set of services running in Canonical&#39;s production cloud: a continuous integration testing suite, including a code revision system, a versioned code repository, and a trunk gating system.</li>
 
-		<p>16.5.3: Canonical will provide documentation on the test environment&#39;s operation in the form of a user guide. Correct operation of the environment requires strict adherence to the documentation guidelines. Patches submitted to the environment must comply with Canonical-provided technical guidelines.</p>
+			<li><span class="number">16.5.3</span> Canonical will provide documentation on the test environment&#39;s operation in the form of a user guide. Correct operation of the environment requires strict adherence to the documentation guidelines. Patches submitted to the environment must comply with Canonical-provided technical guidelines.</li>
 
-		<p>16.5.4: Canonical will assign a named project manager to coordinate the continuous integration process. The project manager will provide up to 1 week of patch analysis assistance and a workshop (to be delivered remotely at a mutually agreeable time) encompassing use of the continuous integration service and associated technologies.</p>
+			<li><span class="number">16.5.4</span> Canonical will assign a named project manager to coordinate the continuous integration process. The project manager will provide up to 1 week of patch analysis assistance and a workshop (to be delivered remotely at a mutually agreeable time) encompassing use of the continuous integration service and associated technologies.</li>
 
-		<p>16.5.5: Canonical will use commercially reasonable efforts to maintain the continuous availability of the test environment infrastructure.</p>
+			<li><span class="number">16.5.5</span> Canonical will use commercially reasonable efforts to maintain the continuous availability of the test environment infrastructure.</li>
 
-		<p>16.5.6: Canonical will complete the testing of any properly submitted patch within 24 hours.  The response times and efforts levels for support requests match those of the Ubuntu Advantage Server Advanced offering.</p>
+			<li><span class="number">16.5.6</span> Canonical will complete the testing of any properly submitted patch within 24 hours.  The response times and efforts levels for support requests match those of the Ubuntu Advantage Server Advanced offering.</li>
+		</ol>
 
 
 		<h3 id="service-description-landscape-dedicated-server">16.6 Landscape Dedicated Server</h3>
 
-		<p>16.6.1: Landscape Dedicated Server subscriptions provide the customer with the Landscape Dedicated Server software for the customer's installation and use on the customer network. Canonical will provide support for the Landscape Dedicated Server software at the response levels, severity definitions, and service hours matching those of Ubuntu Advantage Server Advanced.</p>
+		<ol class="numbered">
+			<li><span class="number">16.6.1</span> Landscape Dedicated Server subscriptions provide the customer with the Landscape Dedicated Server software for the customer's installation and use on the customer network. Canonical will provide support for the Landscape Dedicated Server software at the response levels, severity definitions, and service hours matching those of Ubuntu Advantage Server Advanced.</li>
 
-		<p>16.6.2: Ubuntu Advantage services include Canonical's Landscape service for each physical system covered by an Ubuntu Advantage subscription, as well as for each virtual system covered by the Ubuntu Advantage Virtual Guest service. If the customer purchases Landscape Dedicated Server, the customer may register those customer systems with the Landscape Dedicated Server and use the service to manage and monitor those systems.</p>
+			<li><span class="number">16.6.2</span> Ubuntu Advantage services include Canonical's Landscape service for each physical system covered by an Ubuntu Advantage subscription, as well as for each virtual system covered by the Ubuntu Advantage Virtual Guest service. If the customer purchases Landscape Dedicated Server, the customer may register those customer systems with the Landscape Dedicated Server and use the service to manage and monitor those systems.</li>
 
-		<p>16.6.3: The customer will be required to provide their own server hardware in order to run the Landscape Dedicated Server software on the customer's premises. Canonical will provide the customer with recommendations for the hardware specifications and minimum requirements to run the Landscape Dedicated Server.</p>
+			<li><span class="number">16.6.3</span> The customer will be required to provide their own server hardware in order to run the Landscape Dedicated Server software on the customer's premises. Canonical will provide the customer with recommendations for the hardware specifications and minimum requirements to run the Landscape Dedicated Server.</li>
+		</ol>
 
 		<h3 id="service-description-landscape-agent">16.7 Landscape Agent</h3>
 
-		<p>16.7.1: On systems covered by theUbuntu Advantage Server service, the customer may use the Landscape service to manage and monitor virtual machines for which the customer purchases the Landscape Agent service.</p>
+		<ol class="numbered">
+			<li><span class="number">16.7.1</span> On systems covered by theUbuntu Advantage Server service, the customer may use the Landscape service to manage and monitor virtual machines for which the customer purchases the Landscape Agent service.</li>
+		</ol>
 
 	</div><!-- /.eight-col -->
 </div>
@@ -1101,7 +1150,7 @@ <h3>System administration</h3>
 	<div class="eight-col">
 		<h2>Appendix 2 - Cloud Availability Zone support scope details</h2>
 
-		<p>The Cloud Availability Zone services include the scope of support listed below in addition to that of the corresponding Ubuntu Advantage Server support level, defined in <a href="/legal/ubuntu-advantage/service-description/appendix-1">Appendix 1</a>.</p>
+		<p>The Cloud Availability Zone services include the scope of support listed below in addition to that of the corresponding Ubuntu Advantage Server support level, defined in <a href="#appendix-1">Appendix 1</a>.</p>
 
 		<h3>Installation</h3>
 
diff --git a/templates/legal/ubuntu-advantage/ua-terms-ja.html b/templates/legal/ubuntu-advantage/ua-terms-ja.html
new file mode 100644
index 00000000000..8dbe6375d63
--- /dev/null
+++ b/templates/legal/ubuntu-advantage/ua-terms-ja.html
@@ -0,0 +1,127 @@
+{% extends "legal/_base_legal.html" %}
+
+{% block title %}UA 略式サービス契約{% endblock %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Ubuntu Advantage" page_title="Service description" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row no-border">
+	<div class="eight-col">
+		<h1>UA 略式サービス契約</h1>
+		<p>本略式サービス契約 (以下「本契約」といいます) は、英国で設立され、英国の5th Floor, Blue Fin Building, 110 Southwark Street, London SE1 0SUに所在する会社である Canonical Group Limited (登録番号 6870835、以下「Canonical」といいます) と、注文書記載のお客様(以下「お客様」といいます) との間で締結される契約であり、本契約は、お客様が本契約の条件が組み込まれた注文書に署名した日付または他の方法によって登録手続に際して本契約の条件に同意した日付 (以下「発効日」といいます) をもって有効となります。</p>
+
+		<h2>1. 解釈</h2>
+		<p>本契約において使用される以下の用語は、次の意味を有するものとします。</p>
+		<p><strong>関係会社</strong>: 直接的または間接的に、当事者を支配する法人、当事者に支配される法人、または当事者と共通の支配下にある法人。ここにいう「支配」とは、当該法人の取締役その他の経営権を有する者を専任する議決権のある発行済み株式または証券の 50% 超を有していることを意味します。</p>
+		<p><strong>秘密情報</strong>: 本契約の条件、および開示当事者が秘密として特定した情報または情報の性質や開示の状況に基づき受領当事者によって合理的に秘密であると判断されるべき情報。</p>
+		<p><strong>料金</strong>: お客様が本サービスの対価として支払われる注文書記載の金額。</p>
+		<p><strong>知的財産権</strong>: 登録の有無または登録の可否にかかわらず、既得および将来発生する著作権、著作隣接権、意匠権、データベースに関する権利、特許、発明に係る権利、商標とトレード ドレス (および商標とトレード ドレスに生じるグッドウィル)、ドメイン名、上記のいずれかの権利の出願および当該権利を出願する権利、著作者人格権、グッドウィル (およびパッシングオフと不正競争に対する請求権)、ノウハウ・秘密情報に関する権利、コンピューター ソフトウェアおよび半導体回路配置に関する権利、その他の知的財産権もしくは工業所有権または同等の保護をうけるもの並びにかかる権利のあらゆる更新および延長された権利をいい、世界で既知であるか、将来存在するか否かを問いません。</p>
+		<p><strong>オープン ソース ソフトウェア</strong>: ソフトウェアのソース コードの無償頒布および変更を許可することや、すべての頒布者にかかるソース コード (当該頒布者によるかかるソース コードへの貢献または変更を含みます) を要求に応じて無償での提供を義務付けることを定めた様々な既知のライセンス条項のいずれかに基づいて頒布されるソフトウェア。</p>
+		<p><strong>注文書</strong>: お客様が本サービスを Canonical から直接購入する場合: 本サービスについてのお客様の注文書。注文書は本契約と一体となり、お客様の名前、連絡先情報、本サービス、料金、およびサービス期間が特定されたものとします。お客様が本サービスを Canonical の再販業者を通じて購入する場合: お客様による本サービスの購入とその料金の支払いに係る合意書。</p>
+		<p><strong>登録手続</strong>: お客様が、Canonical の再販業者を通じて購入した本サービスの提供を受けるために、Canonical に登録する際の手続。</p>
+		<p><strong>本サービス</strong>: 注文書に規定され、発効日時点で <a href="http://www.canonical.com/ua-servicedescription">www.canonical.com/ua-servicedescription</a> に記載のCanonical が提供するサービス。</p>
+		<p><strong>サービス期間</strong>: Canonical によってお客様による本サービスを利用が可能となった最初の時点から、注文書に規定の期間の経過後に終了するまでの期間。</p>
+		<p><strong>Ubuntu</strong>: Canonical が自身の公表内容およびサポート スケジュールに従ってサポートする、「Ubuntu」と呼ばれるオペレーティング システムのバージョンであって、修正を行っていない Canonical の標準バージョンまたは Canonical が修正したバージョンのいずれか。</p>
+
+		<h2>2. 本サービス</h2>
+		<div class="numbered-paragraphs">
+			<p><span class="number">2.1:</span> Canonical は、(i) Canonical がお客様から料金に関する発注書を受け取った場合、(ii) お客様が Canonical に料金を支払った場合、または (iii) Canonical の再販業者がお客様に関する本サービスを発注した場合には、その 5 日以内にお客様が本サービスを利用できるようにします。Canonical は、お客様による料金の支払いを含め、本契約に従って、サービス期間中に相応の資格を有する従業員および請負業者によって、合理的なスキルと注意をもって本サービスを提供します。</p>
+			<p><span class="number">2.2:</span> Canonical は、(i) 注文書に明示されたもの以外のサービスまたは機能を提供する義務を負わず、 また、(ii)お客様が合理的な依存関係を満たすことができないことによって提供が制限される範囲については本サービスを提供する義務を負いません。</p>
+		</div>
+
+		<h2>3. 知的財産権</h2>
+		<div class="numbered-paragraphs">
+			<p><span class="number">3.1:</span> 各当事者は、自らの知的財産権および自ら作成または取得する知的財産権の権利者となります。Canonical が本契約に基づいて作成または提供するものは「職務著作物（work made for here）」と見なされず、本契約に基づいて知的財産権が移転することはありません。</p>
+			<p><span class="number">3.2:</span> Ubuntu は、該当するオープン ソース ソフトウェア ライセンスに基づいて使用許諾されるものであり、本契約に基づいて使用許諾されるものではありません。Canonical は、本サービスの提供に際して、ソフトウェアを作成し、またはお客様に提供する場合、本契約に基づいて別途使用許諾される場合を除き、かかるソフトウェアをオープン ソース ソフトウェア ライセンスに基づいて提供します。</p>
+			<p><span class="number">3.3:</span> 本契約の期間中および期間後、お客様は <a href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy">http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy</a> に掲載されている Canonical の知的財産権ポリシーを遵守するものとします。</p>
+			<p><span class="number">3.4:</span> Canonical の「Landscape Dedicated Server」製品 (以下「LDS 製品」といいます) を含む本サービスに関して、Canonical は、本契約をより、すべてのオープン ソース ソフトウェア ライセンスに従って、(i) 本契約および注文書に規定された数量または使用に関する制限に従って LDS 製品を使用すること、および (ii) バックアップとインストールのためにLDS 製品の合理的な数の複製を作成することについての、全世界を許諾地域とする、非独占的、譲渡不可、かつ取消可能 (本契約の違反または終了の場合) なライセンスを、本契約の期間中、お客様に許諾します。お客様は、本契約で明示的に許可されている場合を除き、LDS 製品を使用、複製、変更、逆アセンブル、逆コンパイル、リバース エンジニアリング、もしくは頒布すること、お客様に代わって行動する第三者を除く第三者に LDS 製品へのアクセスを許可すること、または Canonical の事前の書面による同意なしに LDS 製品をある機器から別の機器に移動することはできません。</p>
+			<p><span class="number">3.5:</span> Microsoft Windows システムを Ubuntu 上でゲストとして実行するための Canonical の準仮想化ドライバー (以下「VirtIO ドライバー」といいます) を含む本サービスに関して、Canonical は、本契約により、(i) お客様が本サービスを購入したコンピューター システムに関してのみVirtIO ドライバーを本契約に従い使用すること、および (ii) バックアップとインストールのために VirtIO ドライバーの合理的な数の複製を作成することについて、全世界を許諾地域とする、非独占的、譲渡不可、かつ取消可能 (本契約の違反または終了の場合) なライセンスを、該当する本サービスの期間中、お客様に許諾します。お客様は、本契約で明示的に許可されている場合を除き、VirtIO ドライバーを使用、複製、変更、逆アセンブル、逆コンパイル、リバース エンジニアリング、もしくは頒布すること、お客様に代わって行動する第三者を除く第三者に VirtIO ドライバーへのアクセスを許可すること、および (iii) VirtIO ドライバーをお客様のクラウド コンピューティング サービスの第三者ユーザーに頒布することはできません。上記(iii) に基づいて許諾される頒布に関するライセンスに関し、お客様は、上記 (i) および (ii) に基づいて許諾されるライセンスを、お客様のクラウド コンピューティング サービスの第三者ユーザーにサブライセンスすることができます。かかるサブライセンスは、本契約に基づくCanonical の権利の保護と同程度以上にCanonicalの権利を保護する条件でなければならず、本第 3.5 項に基づくライセンスが消滅した場合には消滅します。</p>
+		</div>
+
+		<h2>4. お客様の責任</h2>
+		<div class="numbered-paragraphs">		
+			<p><span class="number">4.1:</span> お客様は、(i) お客様が本サービスを購入したお客様のシステムに関連する場合以外に本サービスを使用せず、また (ii) 本サービスを再販しないものとします。</p>
+			<p><span class="number">4.2:</span> お客様のデータおよびソフトウェアのバックアップについてはお客様自身の責任となります。Canonical は、データまたはソフトウェアの損失、破損、または損害に一切責任を負いません。</p>
+			<p><span class="number">4.3:</span> お客様は、Canonical に本サービスの一部として第三者のソフトウェアまたは素材をインストールまたは使用するよう依頼した場合、Canonical が本サービスを実施できるように、かかるソフトウェアについて十分な権利またはライセンスを保有および維持しなければなりません。</p>
+			<p><span class="number">4.4:</span> Canonical が本サービスの一部としてオンライン リソースへのアクセスを提供する場合、お客様は、(i) Canonical の合理的な指示に従い、(ii) 本サービスに悪影響を及ぼさないものとします。</p>
+		</div>
+
+		<h2>5. 秘密保持</h2>
+		<div class="numbered-paragraphs">
+			<p><span class="number">5.1:</span> 本契約の期間中および期間後、各当事者は、本契約に基づく義務に従うために必要な場合を除き、各自の役員、従業員、契約者、および代理人に他方当事者のあらゆる秘密情報の秘密を保持させ、かかる情報の複製、使用、第三者への開示を行わないものとします。ただし、各当事者は他方当事者の秘密情報を関係会社に開示することができます。</p>
+			<p><span class="number">5.2:</span> 秘密情報について、法の適用により開示する必要がある場合、他方当事者による開示より前に受領者が合法的に所持していた場合、その後第三者から合法的に取得したか、秘密保持の既知の義務に違反することなく受領者が独自に開発した場合、受領者の行為又は違反によらず一般的に入手可能または入手可能になった場合、または専門的な助言を受けるために秘密扱いで開示する場合には、秘密保持義務は適用されません。</p>
+			<p><span class="number">5.3:</span> 各当事者は、本契約の期間中および期間後に、法の適用により秘密情報を開示する必要がある場合、他方当事者にその旨を書面により直ちに通知するものとします。</p>
+			<p><span class="number">5.4:</span> 各当事者は、損害賠償が本契約の秘密保持義務の遵守違反に対する十分な救済手段にならないこと、および他方当事者がかかる義務の遵守違反またはその恐れについて差し止め命令、特定履行、衡平法上の救済などの救済手段を行う権利を有することに同意します。</p>
+		</div>
+
+		<h2>6. 料金および支払い</h2>
+		<div class="numbered-paragraphs">
+			<p><span class="number">6.1:</span> お客様は、本サービスを Canonical から直接購入する場合、お客様は発注時において料金を支払うものとします。本サービスを Canonical の再販業者を通じて購入する場合は、再販業者の手続に従って料金を支払うものとし、本第 6 条の条件は適用されません。</p>
+			<p><span class="number">6.2:</span> 料金は適用されるすべての税金を除く金額であり、お客様は料金に加えて、請求日における税率により、かかる税金を支払うものとします。お客様が Canonical に支払う必要がある金額は、いかなる控除または源泉徴収もなく支払われるものとします。お客様は、適用法により料金から源泉徴収または控除を行うよう求められている場合、Canonical が控除や源泉徴収が不要であった場合と同じになるように、必要な追加金額を支払うものとします。</p>
+			<p><span class="number">6.3:</span> 本契約の期間中、Canonical は本契約の遵守についてお客様に確認を求めることができ、お客様が本契約を遵守していないことにつきCanonical が合理的な疑いを持った場合には、お客様による本サービスの使用状況について監査を行い、本契約の遵守を確認することができます。監査によりお客様が本契約を遵守していないことが確認された場合、お客様は直ちに本契約を遵守するようにしなければなりません。監査またはお客様への確認により追加で支払われるべき料金が発覚した場合、お客様は、かかる料金および金利 (未払額に適用される利率による) を Canonical による請求日から 30 日以内に支払うものとします。追加で支払われるべき料金が、監査対象の期間に請求された元の金額の5% を上回った場合には、お客様は監査の費用を Canonical に弁済するものとします。</p>
+			<p><span class="number">6.4:</span> Canonical は、未払い額に対する金利に加え、関連する回収費用および訴訟費用を請求することができます。かかる金利は、支払い期日から支払い日までにおけるイングランド銀行の基準金利を 2% 上回る年率、または適用法で認められる最高利率のいずれか低い方で発生します。金利は、判決の前後にかかわらず毎日発生するものとします。</p>
+		</div>
+
+		<h2>7. 保証に関する免責</h2>
+		<div class="numbered-paragraphs">
+			<p><span class="number">7.1:</span> いずれの当事者も、口頭によるか書面によるかにかかわらず、明示、黙示、または法律により生じるものであるとを問わず、本契約の主題に関して、またはその他本契約に関連して、慣習、取引の過程、または商慣習について一切の表明または保証を行いません。各当事者は、権原、十分な品質、商品性、満足度、特定目的への適合性、および権利侵害の不存在に関するあらゆる黙示の保証について明確に否認します。</p>
+		</div>
+
+		<h2>8. 責任の制限</h2>
+		<div class="numbered-paragraphs">
+			<p><span class="number">8.1:</span> 第 8.3 項を条件として、各当事者の本契約に基づく責任の総額は、いずれの契約年においても、契約、不法行為 (過失を含みます)、またはその他原因を問わず、当該契約年に支払う義務が生じる料金の合計を超えません。「契約年」とは、発効日または発効日の応当日から始まる 12 か月の期間を意味します。</p>
+			<p><span class="number">8.2:</span> 第 8.3 項を条件として、いずれの当事者も、本契約に起因または関連する間接的、特別、付随的、懲罰的、もしくは結果的な損失もしくは損害、またはデータの損失もしくは損害、見舞金、逸失利益、契約機会の損失、その他の経済的利益の損失 (いずれの場合も直接と間接とを問いません) について、当該当事者がかかる損失または損害の可能性について事前に知らされていた場合でも、予測可能であるかどうかによらず、一切責任を負いません。これらの制限は、救済の限定の本質的な目的が達成されない場合でも、適用されます。</p>
+			<p><span class="number">8.3:</span> 本契約のいずれの規定も、(i) 死亡または人身傷害、(ii) 詐欺、(iii) 本契約に基づく秘密保持義務違反、および (iv) 適用法により排除または制限できないその他の事項についての、各当事者の責任を排除または制限するものではありません。</p>
+			<p><span class="number">8.4:</span> 本第 8 条に規定されている責任の制限はリスクを両当事者間で合理的に配分するものであり、両当事者はかかる配分がない場合は本契約を締結していません。</p>
+		</div>
+
+		<h2>9. 期間および終了</h2>
+		<div class="numbered-paragraphs">
+			<p><span class="number">9.1:</span> 本契約は、発効日に有効になり、本第 9 条に基づいて早期に終了する場合を除き、サービス期間の終了時まで継続します。</p>
+			<p><span class="number">9.2:</span> お客様が Canonical の再販業者から本サービスを購入する場合を除き、発効日から 30 日以内に Canonical がお客様から料金に関する発注書または料金の支払いを受け取っていない場合、本契約は自動的に終了します。</p>
+			<p><span class="number">9.3:</span> いずれの当事者も、他方当事者が以下の状況である場合、書面により通知することで本契約を直ちに終了することができます。</p>
+			<ul class="list-ubuntu">
+				<li>9.4. 本契約についての重大な違反があり、かつ、かかる違反の是正手段があるにもかかわらず、違反の通知を受け取ってから 14 日以内に違反を是正されない場合</li>
+				<li>9.5. 強制と任意とを問わず清算に入った場合 (合併による支払能力の継承または再建を目的とする場合を除きます)、支払い不能になった場合、営業を停止したか、停止する恐れがある場合、または同様の状況になった場合</li>
+			</ul>
+			<p><span class="number">9.6:</span> Canonical は、お客様に 90 日前までに通知することにより、自ら本契約を終了することができます。</p>
+			<p><span class="number">9.7:</span> 本契約が満了した場合または原因の如何を問わず本契約が終了した場合には、別途合意のない限り、Canonical の本サービスを提供する義務および本契約に基づいて許諾されたすべてのライセンスは、終了します。Canonical が第 9.4 項に基づく一方的解約以外の事由によって本契約が終了する場合、お客様は、本契約の全期間において契約が終了しなかった場合に支払う必要のあった料金を含め、本契約に適用されるすべての未払料金を直ちに支払うものとします。Canonical が第 9.4 項に従って本契約を解約した場合、Canonical は、サービス期間の残存部分に対して前払いされた料金を案分計算によりお客様に返金します。</p>
+		</div>
+		<h2>10. エスカレーション</h2>
+		<div class="numbered-paragraphs">
+			<p><span class="number">10.1:</span> 本契約に関係して見解の相違がある場合、両当事者はかかる相違について交渉して解決する合理的な努力を講じるものとします。見解の相違を 14 日以内に解決できない場合、両当事者の代表者が会談し、かかる相違を解決するよう努力するものとします。見解の相違が、さらに 14 日以内に解決できない場合、いずれの当事者もかかる相違を両当事者の経営幹部間の会合に付託できるものとします。第 10.2 項を条件として、いずれの当事者も、本第 10 条の紛争解決手続きに従わない限り、紛争を裁判所に付託しないものとします。</p>
+			<p><span class="number">10.2:</span> 本第 10 条のいずれの規定も、各当事者が差し止め命令またはその他の暫定的救済を任意の国の裁判所に申請することを妨げるものではありません。</p>
+		</div>
+
+		<h2>11. 一般条項</h2>
+		<div class="numbered-paragraphs">
+			<p><span class="number">11.1:</span> いずれの当事者も、当該当事者の合理的な支配の及ばない状況に直接的または間接的に起因する本契約の違反について一切責任を負いません。ただし、資金不足は当該当事者の合理的な支配の及ばない状況とは見なされません。</p>
+			<p><span class="number">11.2:</span> いずれの当事者も、他方当事者の事前の書面による同意なしに、本契約に基づく権利および義務を譲渡、委託、信託、もしくはその他取引すること (またはしようとすること) はできません。ただし、関係会社を相手方とする善意の再編、合併、整理、すべての資産もしくは実質的にすべての資産の売却、または本サービスに関連する事業の売却の場合を除きます。</p>
+			<p><span class="number">11.3:</span> 本契約において、第三者の受益者は存在しません。両当事者は、本契約の当事者ではない第三者が、適宜修正される 1999 年契約 (第三者の権利) 法 (英国) に基づいて本契約の規定を実施できることを意図していません。</p>
+			<p><span class="number">11.4:</span> 本契約の修正または変更は、両当事者の正式な権限を有する代表者が署名した書面による場合を除き、両当事者を拘束しないものとします。</p>
+			<p><span class="number">11.5:</span> 当事者が本契約に基づく権利または救済措置を行使しない場合やかかる行使が遅滞した場合であっても、その権利または救済措置が放棄されたものと解釈してはならず、その権利または救済措置の放棄とはならないものとします。また、権利または救済措置が一回または部分的に行使された場合であっても、当該当事者が、その権利または救済措置をそれ以後に行使することを妨げるものではありません。</p>
+			<p><span class="number">11.6:</span> 本契約の期間中およびその期間後 6 か月間、お客様は、(i) Canonical またはその関係会社の社員であるか、直近 6 か月間に Canonical またはその関係会社の社員であった個人 (Canonical がかかる個人の雇用または契約を終了した場合を除きます)、および (ii) 本契約の期間中の一定期間内に Canonical の顧客にサービスを提供するよう Canonical が任命した個人を、従業員または独立契約当事者として雇い又は雇われるよう勧誘してはならないものとします。</p>
+			<p><span class="number">11.7:</span> 本契約は、本契約の主題に関して両当事者間で合意した完全なる条件を示すものであり、本契約の対象に関連する両当事者間の事前のあらゆる契約または協定 (習慣または慣習、および取引の過程を通じて発生する条件を含みます) に優先されます。お客様による本サービスの受領、提案、発注、または同様の文書に記載される、またはそれらと共に提示される契約条件は、本契約の一部を形成しません。</p>
+			<p><span class="number">11.8:</span> 本契約の各規定は他のあらゆる規定とは独立に解釈するものとし、本契約のいずれかの規定が管轄裁判所によって違法、無効、または執行不能と判断された場合でも、本契約のその他の規定は影響を受けず、引き続き完全に効力を有します。</p>
+			<p><span class="number">11.9:</span> 本契約のいずれの規定も、本契約に従って両当事者が講じたいかなる措置も、両当事者間の何らかの提携関係または合弁事業を形成すると解釈したり、いずれかの当事者が他方当事者の代理人であると解釈したりしてはなりません。いずれの当事者も、他方当事者を拘束したり、他方当事者の名前において契約を行ったり、他方当事者に対して法的責任を構成したりする権利を有しません。</p>
+			<p><span class="number">11.10:</span> 本契約に基づいてやり取りする必要がある通知は、書面により、本契約に規定されている受領側当事者の住所に配送するものとします。住所が規定されていない場合は、受領側当事者の登録事務所の住所宛てに配送するものとします。当事者は、他方当事者に通知することで、その住所を更新することができます。有効な配送方法は、(i) 対面での手渡し、(ii) 第一種書留郵便 (もしくは同等の方法)、または (iii) 国際的に認められた宅配便、です。</p>
+			<p><span class="number">11.11:</span> Canonical は、情報提供を目的として、本契約の複製を別の言語で提供する場合があります。本契約の英語版のみが法的拘束力を有します。紛争が発生した場合、英語以外の言語版は考慮されないものとします。</p>
+			<p><span class="number">11.12:</span> お客様は、本契約に基づいて Canonical が提供する素材に、米国および欧州地域の輸出に関する法律および規制が適用される場合があることを認めるものとします。お客様は、素材の使用に、かかる輸出管理に関する法律および規制が適用されることに同意し、当該法律および規制を遵守するものとします。お客様は、かかる素材を、当該法律および規制に違反して直接的または間接的に輸出したり、当該法律で禁止されている目的で使用したりしないものとします。</p>
+		</div>
+
+		<h2>12. 準拠法</h2>
+		<div class="numbered-paragraphs">
+			<p><span class="number">12.1:</span> 本契約および本契約から生じる契約外の義務は、英国法に準拠し、同法に従って解釈するものとします。両当事者は、問題となっている行為の管轄区域で得られなければ合理的な効力がないと考えられる、差し止め命令による即時の救済 (秘密保持義務の違反または差し迫った違反に関連する救済など) を求める場合を除き、英国の裁判所の専属管轄権に従うものとします。国際物品売買契約に関する国際連合条約の規定は、本契約には適用されません。</p>
+		</div>
+	</div>
+	<div class="box four-col last-col">
+		<h3>英訳</h3>
+		<ul class="list">
+			<li class="last-item"><a href="/legal/ubuntu-advantage/ua-terms">UA Short Form Services Agreement&nbsp;›</a></li>
+		</ul>
+	</div>
+</div>
+
+{% endblock content %}
\ No newline at end of file
diff --git a/templates/legal/ubuntu-advantage/ua-terms.html b/templates/legal/ubuntu-advantage/ua-terms.html
new file mode 100644
index 00000000000..41c817ff0f5
--- /dev/null
+++ b/templates/legal/ubuntu-advantage/ua-terms.html
@@ -0,0 +1,142 @@
+{% extends "legal/_base_legal.html" %}
+
+{% block title %}Short Form Services Agreement{% endblock %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Ubuntu Advantage" page_title="Service description" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row no-border">
+	<div class="eight-col">
+		<h1>UA Short Form Services Agreement</h1>
+		<p>This short form services agreement (the “Agreement”) takes effect as of the date Customer signs an Order incorporating its terms or otherwise accepts its terms as part of a Registration Process (the “Effective Date”) between, Canonical Group Limited, a company registered in England (company number 6870835) whose registered office is at 5th Floor, Blue Fin Building, 110 Southwark Street, London SE1 0SU, United Kingdom (“Canonical”), and the customer identified in the Order (“Customer”).</p>
+
+		<ol class="unstyled">
+			<li>
+				<h2>1. Interpretation</h2>
+				<p>When used in this Agreement, the following terms mean:</p>
+				<p><strong>Affiliate</strong>: a corporate entity that directly or indirectly controls, is controlled by, or is under common control with a party, where “control” means ownership of more than 50% of the outstanding shares or securities representing the right to vote for the election of directors or other managing authority of such corporate entity.</p>
+				<p><strong>Confidential Information</strong>: the terms of this Agreement, and any information identified by the disclosing party as confidential or which the receiving party reasonably ought to know is confidential in light of the nature of the information or the circumstances of its disclosure.</p>
+				<p><strong>Fee(s)</strong>: the amounts payable by Customer for the Services, as set out in the Order.</p>
+				<p><strong>Intellectual Property Rights</strong>: all vested and future rights of copyright and related rights, design rights, database rights, patents, rights to inventions, trade marks and get-up (and goodwill attaching to those trade marks and that get up), domain names, applications for and the right to apply for any of the above, moral rights, goodwill (and the right to sue for passing off and unfair competition), rights in know-how, rights in confidential information, rights in computer software and semiconductor topographies, and any other intellectual or industrial property rights or equivalent forms of protection, whether or not registered or capable of registration, and all renewals and extensions of such rights, whether now known or in future subsisting in any part of the world.</p>
+				<p><strong>Open Source Software</strong>: any software which is distributed under any of the many known variations of licence terms which allow the free distribution and modification of the software’s source code or which require all distributors to make such source code freely available upon request, including any contributions or modifications thereto made by such distributor.</p>
+				<p><strong>Order</strong>: If Customer is buying Services directly from Canonical: Customer's order for Services which incorporates this Agreement and identifies Customer's name, contact information, Services, Fees, and Services Term.  If Customer is buying Services through Canonical's reseller: Customer's agreement to purchase the Services and pay applicable Fees.</p>
+				<p><strong>Registration Process</strong>: The process under which a Customer registers with Canonical to receive Services purchased through Canonical's reseller.</p>
+				<p><strong>Services</strong>: the services to be performed by Canonical as identified in the Order and described at <a href="http://www.canonical.com/ua-servicedescription">www.canonical.com/ua-servicedescription</a> as of the Effective Date.</p>
+				<p><strong>Services Term</strong>: the period for time beginning when Canonical first makes the Services available to Customer and ending after the period of time specified in the Order.</p>
+				<p><strong>Ubuntu</strong>: a version of the operating system known as “Ubuntu”, which is supported by Canonical pursuant to Canonical's public announcements and support schedule and is either Canonical's standard version with no modifications or a version modified by Canonical.</p>
+			</li>
+			<li>
+				<h2>2. Services</h2>
+				<ol class="numbered">
+					<li><span class="number">2.1</span> Canonical will make the Services available to Customer within 5 days of any of the following events: (i) Canonical receives a purchase order from Customer for the Fees, (ii) Customer pays the Fees to Canonical, or (iii) Canonical's reseller orders the Services with respect to Customer.  Subject to this Agreement, including Customer's payment of the Fees, Canonical will provide the Services during the Services Term using reasonable skill and care and through suitably qualified employees and contractors.</li>
+					<li><span class="number">2.2</span> Canonical is not obligated to perform (i) any service or function except as expressly identified in the Order (ii) any Services to the extent its performance is limited by Customer's failure to meet any reasonable dependency.</li>
+				</ol>
+			</li>
+			<li>
+				<h2>3. Intellectual Property Rights</h2>
+				<ol class="numbered">
+					<li><span class="number">3.1</span> Each party will retain ownership of its Intellectual Property Rights and any Intellectual Property Rights it creates or obtains. Nothing Canonical creates or provides under this Agreement will be considered a “work made for hire”, and no Intellectual Property Rights will transfer under this Agreement.</li>
+					<li><span class="number">3.2</span> Ubuntu is licensed under applicable Open Source Software licences and not this Agreement.  If Canonical creates or provides any software to Customer in the course of providing the Services, Canonical will provide such software under an Open Source Software licence, unless otherwise licensed under this Agreement.</li>
+					<li><span class="number">3.3</span> During and after the term of this Agreement, Customer will comply with Canonical's Intellectual Property Rights policy at <a href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy">http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy</a>.</li>
+					<li><span class="number">3.4</span> With respect to Services which include Canonical's “Landscape Dedicated Server” product (the “LDS Product”), Canonical hereby grants to Customer, subject to all Open Source Software licences, a world-wide, non-exclusive, non-transferable, revocable (in the event of breach or termination of this Agreement) licence, during the term of this Agreement, to (i) use the LDS Product in accordance with this Agreement and subject to any quantity or usage limitations set forth in the Order and (ii) to make a reasonable number of copies of the LDS Product for backup and installation purposes. Customer may not: use, copy, modify, disassemble, decompile, reverse engineer, or distribute the LDS Product except as expressly permitted in this Agreement; permit access to the LDS Product to any third party other than those acting on Customer's behalf; or move the LDS Product from one machine to another without the prior written consent of Canonical.</li>
+					<li><span class="number">3.5</span> With respect to Services which include Canonical's paravirtualized drivers for Microsoft Windows systems to run as guests on Ubuntu (the “VirtIO Drivers”), Canonical hereby grants to Customer, a world-wide, non-exclusive, non-transferable, revocable (in the event of breach or termination of this Agreement) licence, during the term of the applicable Services, to (i) use the VirtIO Drivers in accordance with this Agreement solely in connection with those computer systems for which Customer has purchased the Services, (ii) to make a reasonable number of copies of the VirtIO Drivers for backup and installation purposes.  Customer may not: use, copy, modify, disassemble, decompile, reverse engineer, or distribute the VirtIO Drivers except as expressly permitted in this Agreement or permit access to the VirtIO Drivers to any third party other than those acting on Customer's behalf, and (iii) to distribute the VirtIO Drivers to third party users of Customer's cloud computing services.  In connection with the distribution licence granted under (iii) of the preceding sentence, Customer may sublicense the licence granted under (i) and (ii) of the preceding sentence to third party users Customer's cloud computing services.   Such sublicence must be on terms that are no less protective of Canonical's rights than those of this Agreement, and must be revoked upon the revocation of the licence under this Clause 3.5.</li>
+				</ol>
+			</li>
+			<li>
+				<h2>4. Customer responsibilities</h2>
+				<ol class="numbered">
+					<p><span class="number">4.1</span> Customer will not (i) use the Services other than in connection with the Customer systems for which Customer has purchased the Services or (ii) resell the Services.</p>
+					<p><span class="number">4.2</span> Customer is responsible for the back-up of its data and software.  Canonical will not be liable for any loss, corruption, or damage to data or software.</p>
+					<p><span class="number">4.3</span> If Customer engages Canonical to install or use any third party software or materials as part of the Services, Customer will have and maintain sufficient rights or licences to such software to allow Canonical to perform the Services.</p>
+				</ol>
+			</li>
+			<li>
+				<h2>5. Confidentiality</h2>
+				<ol class="numbered">
+					<li><span class="number">5.1</span> During and after the term of this Agreement, each party will and will cause its officers, employees, contractors and agents to keep secret and confidential all Confidential Information of the other and will not copy, use or disclose any such information to any third party, other than as may be necessary to comply with its obligations under this Agreement; provided that a party may disclose the other party's Confidential Information to Affiliates.</li>
+					<li><span class="number">5.2</span> The obligation of confidence will not apply where the Confidential Information: is required to be disclosed by operation of law; was lawfully in the possession of the recipient prior to disclosure by the other party; is subsequently lawfully acquired from a third party or independently developed by the recipient without breach of any known obligation of confidence; is or becomes generally available to the public through no act or default of the recipient; or is disclosed on a confidential basis for the purposes of obtaining professional advice.</li>
+					<li><span class="number">5.3</span> Each party will give the other prompt written notice of any disclosure of the party's Confidential Information as required by operation of law during and after the term of this Agreement.</li>
+					<li><span class="number">5.4</span> Each party agrees that damages would not be an adequate remedy for any failure to comply with the confidentiality obligations in this Agreement and that the other party will be entitled to the remedies of injunction, specific performance and/or other equitable relief for any threatened or actual failure to comply with those obligations.</li>
+				</ol>
+			</li>
+			<li>
+				<h2>6. Fees and payment</h2>
+				<ol class="numbered">
+					<li><span class="number">6.1</span> If Customer is purchasing the Services directly from Canonical, Customer will pay the Fees at the time of Customer's Order.  If Customer is purchasing the Services through Canonical's reseller, Customer shall pay the Fees in accordance with the reseller's process and the terms of this Clause 6 will not otherwise apply.</li>
+					<li><span class="number">6.2</span> The Fees are exclusive of all applicable taxes, which Customer will pay in addition to the Fees at the rate prevailing on the date of the invoice.  Any sums payable by Customer to Canonical will be paid clear of any deductions or withholdings.  In the event that Customer is required by applicable law to withhold or deduct any amounts from the Fees, Customer will pay any additional amounts necessary to ensure that Canonical is in the same position as it would have been in had no deductions or withholdings been required.</li>
+					<li><span class="number">6.3</span> During the term of this Agreement, Canonical may request Customer's confirmation of its compliance with this Agreement or, if Canonical reasonably suspects that Customer is not in compliance with this Agreement, audit Customer's use of the Services to confirm compliance.  If any audit reveals that Customer was not in compliance with the Agreement, Customer will immediately come into compliance.  If Customer's confirmation or an audit reveals that additional Fees are due, Customer will pay such Fees and interest (at the rate applicable to past due amounts), within 30 days of the date of Canonical’s invoice.  If the additional Fees exceed the Fees originally invoiced for the period covered by the audit by 5%, Customer will reimburse Canonical for the costs of the audit.</li>
+					<li><span class="number">6.4</span> Canonical may charge interest on any past due payment amounts, plus any related collection and legal costs.  Such interest will accrue at the annual rate of 2% above the base rate of the Bank of England in force from the due date until the date of payment, or the highest rate allowable by applicable law (if lower).  Interest will accrue on a daily basis, whether before or after judgement.</li>
+				</ol>
+			</li>
+			<li>
+				<h2>7. Warranty disclaimer</h2>
+				<ol class="numbered">
+					<li><span class="number">7.1</span> Neither party makes any representations or warranties of any kind, whether oral or written, whether express, implied, or arising by statute, custom, course of dealing or trade usage, with respect to the subject matter hereof or otherwise in connection with this Agreement.  Each party specifically disclaims any and all implied warranties or conditions of title, satisfactory quality, merchantability, satisfactoriness, fitness for a particular purpose and non-infringement.</li>
+				</ol>
+			</li>
+			<li>
+				<h2>8. Liability limitations</h2>
+				<ol class="numbered-paragraphs">
+					<li><span class="number">8.1</span> Subject to Clause 8.3, each party’s aggregate liability under this Agreement, in any Contract Year, whether based on contract, tort (including negligence) or otherwise, will not exceed the amount of Fees becoming payable in that particular Contract Year.  “Contract Year” means any period of 12 months commencing on the Effective Date or any anniversary of the Effective Date.</li>
+					<li><span class="number">8.2</span> Subject to Clause 8.3, neither party will be liable for any indirect, special, incidental, punitive, or consequential loss or damage or for any loss of or damage to data, ex gratia payments, loss of profit, loss of contract or loss of other economic advantage (in each case whether direct or indirect) arising out of or in connection with this Agreement, even if that party has previously been advised of the possibility of the same and whether foreseeable or not. These limitations will apply notwithstanding any failure of essential purpose of any limited remedy.</li>
+					<li><span class="number">8.3</span> Nothing in this Agreement excludes or limits the liability of either party for: (i) death or personal injury; (ii) fraud; (iii) breach of the confidentiality provisions of this Agreement, and (iv) anything else that cannot be excluded of limited by applicable law.</li>
+					<li><span class="number">8.4</span> The limitations of liability set forth in this Clause 8 are a reasonable allocation of risk between the parties, and the parties would not have entered into this Agreement, absent such allocation.</li>
+				</ol>
+			</li>
+			<li>
+				<h2>9. Term and termination</h2>
+				<ol class="numbered-paragraphs">
+					<li><span class="number">9.1</span> This Agreement will come into force on the Effective Date and will continue until the end of the Services Term unless terminated earlier under this Clause 9.</li>
+					<li><span class="number">9.2</span> Unless Customer is purchasing the Services from Canonical's reseller, if Canonical has not received a purchase order for the Fees or payment of the Fees within 30 days of the Effective Date, this Agreement will automatically terminate.</li>
+					<li><span class="number">9.3</span> Either party may terminate this Agreement immediately by written notice if the other party:</li>
+					<ul class="list-ubuntu">
+						<li>9.4. commits a material breach of this Agreement and, if such breach is capable of remedy, fails to remedy the breach within 14 days of receiving notice of the breach;</li>
+						<li>9.5. enters into liquidation whether compulsorily or voluntarily (otherwise than for the purposes of a solvent amalgamation or reconstruction); becomes insolvent; ceases or threatens to cease to carry on business; or any similar event.</li>
+					</ul>
+					<li><span class="number">9.6</span> Canonical may terminate this Agreement for convenience upon giving 90 days prior notice to Customer.</li>
+					<li><span class="number">9.7</span> On expiration or termination this Agreement for any reason, Canonical's obligation to provide the Services will immediately terminate and any licences granted under this Agreement will terminate, unless otherwise agreed. On termination other than by Canonical for convenience in accordance with Clause 9.4, Customer will immediately pay all outstanding Fees applicable to this Agreement including Fees that would otherwise have been payable with respect to the full Agreement term.   On termination of this Agreement by Canonical for convenience in accordance with Clause 9.4, Canonical will provide Customer with a pro rata refund of any prepaid Fees for the remaining unexpired portion of the Services term.</li>
+				</ol>
+			</li>
+			<li>
+				<h2>10. Escalation</h2>
+				<ol class="numbered">
+					<li><span class="number">10.1</span> If there is a disagreement in relation to this Agreement, the parties will use their reasonable endeavours to negotiate and settle the disagreement.  If it is not possible to settle the disagreement within 14 days, representatives of both parties will meet to try to resolve the disagreement.  If the disagreement is not resolved within a further 14 days, the disagreement may be referred by either party to a meeting between the senior managers of the parties.  Subject to Clause 10.2, neither party will refer any dispute to the courts unless and until the dispute resolution procedures of this Clause 10 have been followed.</li>
+					<li><span class="number">10.2</span> Nothing in this Clause 10 will prevent either party applying to the courts of any country for injunctive or other interim relief.</li>
+				</ol>
+			</li>
+			<li>
+				<h2>11. General</h2>
+				<ol class="numbered-paragraphs">
+					<li><span class="number">11.1</span> Neither party will be liable for any breach of this Agreement directly or indirectly caused by circumstances beyond the reasonable control of that party, provided that a lack of funds will not be regarded as a circumstance beyond that party’s reasonable control.</li>
+					<li><span class="number">11.2</span> Neither party may assign, transfer, charge, create a trust over or otherwise deal in its rights and/or obligations under this Agreement (or purport to do so) without the other party’s prior written consent except to an Affiliate pursuant to a bona fide re-structure, merger, consolidation, sale of all or substantially all of its assets, or a sale of the business to which the Services relate.</li>
+					<li><span class="number">11.3</span> There are no intended third party beneficiaries to this Agreement.  The parties do not intend that any provision of this Agreement will be enforceable by virtue of the Contracts (Rights of Third Parties) Act 1999 (England), as amended from time to time, by any person who is not a party to this Agreement.</li>
+					<li><span class="number">11.4</span> No amendment or modification of this Agreement will be binding upon the parties unless made in writing and signed by the authorized representatives of both parties.</li>
+					<li><span class="number">11.5</span> A failure or delay by a party to exercise any right or remedy under this Agreement will not be construed or operate as a waiver of that right or remedy.  Nor single or partial exercise of any right or remedy will preclude the further exercise of that right or remedy by that party.</li>
+					<li><span class="number">11.6</span> During the term of this Agreement and for 6 months thereafter, Customer will not  solicit to be hired or hire, as an employee or independent contractor, any individual (i) who is then the personnel of Canonical or any of its Affiliates or was the personnel of Canonical or any of its Affiliates during the previous 6 months (unless Canonical terminated that individual's employment or contract) and (ii) who during any part of the term of this Agreement was assigned by Canonical to provide services to Canonical's customers.</li>
+					<li><span class="number">11.7</span> This Agreement represents the entire terms agreed between the parties in relation to its subject matter and supersedes all previous contracts or arrangements (including any usage or custom and any terms arising through any course of dealing) of any kind between the parties relating to its subject matter.  No terms or conditions included in or delivered with any Customer acceptance of Services, proposal, purchase order or similar document will form part of this Agreement.</li>
+					<li><span class="number">11.8</span> Each of the provisions of this Agreement will be construed as independent of every other such provision, so that if any provision of this Agreement will be determined by any court of competent authority to be illegal, invalid and/or unenforceable this will not affect any other provision of this Agreement, which will remain in full force and effect.</li>
+					<li><span class="number">11.9</span> Nothing in this Agreement and no action taken by the parties pursuant to this Agreement will be construed as creating a partnership or joint venture of any kind between the parties or as constituting either party as the agent of the other party.  No party will have the authority to bind the other party or to contract in the name of or create a liability against the other party.</li>
+					<li><span class="number">11.10</span> Any notice required to be given or sent under this Agreement will be in writing and delivered to the recipient at the address set out in this Agreement or, if no address is set out, to the recipient's registered office address.  A party may update its address by providing notice to the other party.  Valid delivery methods are (i) in-person delivery, (ii) first class registered post (or equivalent), or (iii) internationally recognized overnight courier service.</li>
+					<li><span class="number">11.11</span> Canonical may provide copies of this Agreement in different languages for information purposes.  Only the English language version of this Agreement will be binding.  In the event of any dispute, any version in any language other than English will be disregarded.</li>
+					<li><span class="number">11.12</span> Customer acknowledges that export laws and regulations of the United States and European territories may apply to materials delivered by Canonical under this Agreement.  Customer agrees that such export control laws and regulations govern its use of materials and will comply with all such laws and regulations.  Customer will not export, directly or indirectly, such materials in violation of these laws or regulations, or use them for any purpose prohibited by these laws.</li>
+				</ol>
+			</li>
+			<li>
+				<h2>12. Governing law</h2>
+				<ol class="numbered-paragraphs">
+					<li><span class="number">12.1</span> This Agreement and any non-contractual obligations arising from this Agreement will be governed by and construed in accordance with the laws of England.  The parties submit to the exclusive jurisdiction of the courts of England, except when a party seeks immediate injunctive relief (for example, in connection with a breach or impending breach of confidentiality obligations) that would not be reasonably effective unless obtained in the jurisdiction of the conduct at issue.  The provisions of the United Nations Convention on Contracts for the International Sale of Goods will not apply to this Agreement.</li>
+				</ol>
+			</li>
+		</ol>
+	</div>
+	<div class="box four-col last-col">
+		<h3>Japanese translation</h3>
+		<ul class="list">
+			<li class="last-item"><a href="/legal/ubuntu-advantage/ua-terms-ja">UA 略式サービス契約&nbsp;›</a></li>
+		</ul>
+	</div>
+</div>
+
+{% endblock content %}
\ No newline at end of file
diff --git a/templates/list_endpoints.py b/templates/list_endpoints.py
new file mode 100644
index 00000000000..7e58da0aef9
--- /dev/null
+++ b/templates/list_endpoints.py
@@ -0,0 +1,13 @@
+with open('endpoints.txt') as endpoints:
+    lines = endpoints.read()
+
+endpoints = [l[2:-5] for l in lines.split()]
+
+no_indecies = map(
+    lambda e: e[:-len("/index")] if e.endswith("/index") else e,
+    endpoints
+)
+
+prefixed = ["http://www.ubuntu.com/" + str(e) for e in no_indecies]
+
+print "\n".join(prefixed)
diff --git a/templates/management/base_management.html b/templates/management/base_management.html
index 41db24ed9f6..a5d495766dd 100755
--- a/templates/management/base_management.html
+++ b/templates/management/base_management.html
@@ -1,9 +1,9 @@
-{% extends "_base/base.html" %}
+{% extends "templates/base.html" %}
 {% block second_level_nav_items %}
 {% include "management/_nav_secondary.html" %}
 {% endblock second_level_nav_items %}
 
 {% block outer_content %}
     {% block content %}{% endblock %}
-		{% include "_base/_contextual_footer.html" %}
+		{% include "templates/_contextual_footer.html" %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/management/compliance.html b/templates/management/compliance.html
index e2e7e0ee7e2..ed74768a873 100755
--- a/templates/management/compliance.html
+++ b/templates/management/compliance.html
@@ -5,7 +5,7 @@
 {% block meta_keywords %}Landscape, systems management, Ubuntu, Canonical, compliance, compliant, regulations, regulatory, enterprise, software, patch, patching, report, reporting, log, logging, security, audit, RBAC, role-based access control, hardware, machine, desktop, server, cloud, complexity, automation{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Management" page_title="Compliance"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Management" page_title="Compliance"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
@@ -21,8 +21,8 @@ <h1>Compliance</h1>
 </div><!-- .row row-hero -->
 
 <div class="row">
-	<div class="six-col">
-		<img class="flush-left" src="{{ STATIC_URL }}img/management/compliance/image-patchcompliance.jpg" height="462" width="376" alt="" />
+	<div class="six-col no-margin-bottom">
+		<img class="flush-left touch-border" src="{{ STATIC_URL }}img/management/compliance/image-patch-compliance.jpg"  alt="" />
 	</div><!-- /.six-col -->
 	<div class="six-col last-col">
 		<h3>Patch compliance</h3>
@@ -38,14 +38,14 @@ <h3>Role-based access control (RBAC)</h3>
 		<p>The latest version of Landscape introduces extensive access-control extensions, enabling you to implement the access policies you need. Roles such as &lsquo;Auditor&rsquo; (with read access to everything but write access to nothing) or &lsquo;Security Analyst&rsquo; (with authentication to execute scripts but not modify them or create new ones) can be defined, right up to the restriction-free &rsquo;Full Administrator&rsquo; level. Fine-grained control over these credentials is provided, with a default configuration included to ensure that these features can be used without customisation. Meanwhile, CIOs will appreciate the ability to define independent security administrator roles when needed.</p>
 		<p><a href="/management/working-with-landscape">Watch the compliance and reporting video on the Working with Landscape page&nbsp;&rsaquo;</a></p>
 	</div>
-	<div class="six-col last-col">
-		<img class="flush-right" src="{{ STATIC_URL }}img/management/compliance/image-rolebasedaccesscontrol.jpg" height="582" width="482" alt="" />
+	<div class="six-col last-col no-margin-bottom">
+		<img class="flush-right touch-border" src="{{ STATIC_URL }}img/management/compliance/image-rbac.jpg" alt="" />
 	</div>
 </div><!-- .row -->
 
 <div class="row">
-	<div class="six-col">
-		<img class="flush-left" src="{{ STATIC_URL }}img/management/compliance/image-auditlogging.jpg" height="351" width="462" alt="" />
+	<div class="six-col no-margin-bottom">
+		<img class="flush-left touch-border" src="{{ STATIC_URL }}img/management/compliance/image-audit-logging.jpg" height="351" width="462" alt="" />
 	</div><!-- /.six-col -->
 	<div class="six-col last-col">
 		<h3>Audit logging</h3>
@@ -54,17 +54,19 @@ <h3>Audit logging</h3>
 </div><!-- .row -->
 
 <div class="row no-border">
-	<div class="six-col">
-		<h3>Compliance reporting</h3>
-		<p>Landscape can accelerate the process of producing and collating compliance information, thanks to its built-in reporting capabilities. All report data is published to the web console by default, but it can also be exported in CSV format or accessed via the API.</p>
-		<p>Landscape produces standardised compliance reports, showing which machines are up-to-date with security patches. Machines are clearly shown as compliant or non-compliant. For non-compliant machines, further detail is also available, including the total number of days for which they have been non-compliant (or out of contact with the Landscape server). The speed with which they are brought into compliance is also tracked, to accelerate the audit process.</p>
+	<div class="twelve-col">
+		<div class="nine-col">
+			<h3>Compliance reporting</h3>
+			<p>Landscape can accelerate the process of producing and collating compliance information, thanks to its built-in reporting capabilities. All report data is published to the web console by default, but it can also be exported in CSV format or accessed via the API.</p>
+			<p>Landscape produces standardised compliance reports, showing which machines are up-to-date with security patches. Machines are clearly shown as compliant or non-compliant. For non-compliant machines, further detail is also available, including the total number of days for which they have been non-compliant (or out of contact with the Landscape server). The speed with which they are brought into compliance is also tracked, to accelerate the audit process.</p>
+		</div>
 	</div>
-	<div class="six-col last-col">
-		<img src="{{ STATIC_URL }}img/business/screenshot-compliance-450x271.png" height="271" width="450" alt="" />
+	<div class="twelve-col">
+		<p><img src="{{ STATIC_URL }}img/management/compliance/image-compliance-reporting.png" alt="" /></p>
 	</div>
 </div><!-- .row -->
 
-{% include "_includes/_live_chat.html" %}
+{% include "shared/_live_chat.html" %}
 
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
diff --git a/templates/management/contact-us.html b/templates/management/contact-us.html
index a756e2cc4d2..2452c976988 100755
--- a/templates/management/contact-us.html
+++ b/templates/management/contact-us.html
@@ -3,7 +3,7 @@
 {% block title %}Contact Canonical | Management{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Management" page_title="Contact us" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Management" page_title="Contact us" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
@@ -94,21 +94,22 @@ <h3>Contact information</h3>
 				<label for="LastName">Last name: <span>*</span></label>
 				<span class='mktInput'><input class='mktFormText mktFormString mktFReq' name="LastName" id="LastName" type='text' value=""  maxlength='255' tabIndex='2' required /><span class='mktFormMsg'></span></span>
 			</li>
+			<li  class='mktFormReq mktField' ><label>Company Name: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormString mktFReq' name="Company" id="Company" type='text' value=""  maxlength='255' tabIndex='3' /><span class='mktFormMsg'></span></span></li>
 			<li class='mktFormReq mktField'>
 				<label for="Email">Work email: <span>*</span></label>
-				<span class='mktInput'><input class='mktFormText mktFormEmail mktFReq' name="Email" id="Email" type='email' value=""  maxlength='255' tabIndex='3' required /><span class='mktFormMsg'></span></span>
+				<span class='mktInput'><input class='mktFormText mktFormEmail mktFReq' name="Email" id="Email" type='email' value=""  maxlength='255' tabIndex='4' required /><span class='mktFormMsg'></span></span>
 			</li>
 			<li class='mktFormReq mktField'>
 				<label for="Phone">Phone number: <span>*</span></label>
-				<span class='mktInput'><input class='mktFormText mktFormPhone mktFReq' name="Phone" id="Phone" type='tel' value=""  maxlength='255' tabIndex='4' required /><span class='mktFormMsg'></span></span>
+				<span class='mktInput'><input class='mktFormText mktFormPhone mktFReq' name="Phone" id="Phone" type='tel' value=""  maxlength='255' tabIndex='5' required /><span class='mktFormMsg'></span></span>
 			</li>
 			<li class='mktFormReq mktField'>
 				<label for="Country">Country: <span>*</span></label>
-				<span class='mktInput'><select class='mktFormSelect mktFReq' name="Country" id="Country" size='1'   tabIndex='5' required><option value='Please select:' selected='selected'>Please select:</option><option value='AF'>Afghanistan</option><option value='AX'>Åland Islands</option><option value='AL'>Albania</option><option value='DZ'>Algeria</option><option value='AS'>American Samoa</option><option value='AD'>Andorra</option><option value='AO'>Angola</option><option value='AI'>Anguilla</option><option value='AQ'>Antarctica</option><option value='AG'>Antigua and Barbuda</option><option value='AR'>Argentina</option><option value='AM'>Armenia</option><option value='AW'>Aruba</option><option value='AU'>Australia</option><option value='AT'>Austria</option><option value='AZ'>Azerbaijan</option><option value='BS'>Bahamas</option><option value='BH'>Bahrain</option><option value='BD'>Bangladesh</option><option value='BB'>Barbados</option><option value='BY'>Belarus</option><option value='BE'>Belgium</option><option value='BZ'>Belize</option><option value='BJ'>Benin</option><option value='BM'>Bermuda</option><option value='BT'>Bhutan</option><option value='BO'>Bolivia</option><option value='BA'>Bosnia and Herzegovina</option><option value='BW'>Botswana</option><option value='BV'>Bouvet Island</option><option value='BR'>Brazil</option><option value='IO'>British Indian Ocean Territory</option><option value='BN'>Brunei Darussalam</option><option value='BG'>Bulgaria</option><option value='BF'>Burkina Faso</option><option value='BI'>Burundi</option><option value='KH'>Cambodia</option><option value='CM'>Cameroon</option><option value='CA'>Canada</option><option value='CV'>Cape Verde</option><option value='KY'>Cayman Islands</option><option value='CF'>Central African Republic</option><option value='TD'>Chad</option><option value='CL'>Chile</option><option value='CN'>China</option><option value='CX'>Christmas Island</option><option value='CC'>Cocos (Keeling) Islands</option><option value='CO'>Colombia</option><option value='KM'>Comoros</option><option value='CG'>Congo</option><option value='CD'>Congo (The Democratic Republic of the)</option><option value='CK'>Cook Islands</option><option value='CR'>Costa Rica</option><option value='CI'>Côte D&amp;#039;Ivoire</option><option value='HR'>Croatia</option><option value='CU'>Cuba</option><option value='CY'>Cyprus</option><option value='CZ'>Czech Republic</option><option value='DK'>Denmark</option><option value='DJ'>Djibouti</option><option value='DM'>Dominica</option><option value='DO'>Dominican Republic</option><option value='EC'>Ecuador</option><option value='EG'>Egypt</option><option value='SV'>El Salvador</option><option value='GQ'>Equatorial Guinea</option><option value='ER'>Eritrea</option><option value='EE'>Estonia</option><option value='ET'>Ethiopia</option><option value='FK'>Falkland Islands (Malvinas)</option><option value='FO'>Faroe Islands</option><option value='FJ'>Fiji</option><option value='FI'>Finland</option><option value='FR'>France</option><option value='GF'>French Guiana</option><option value='PF'>French Polynesia</option><option value='TF'>French Southern Territories</option><option value='GA'>Gabon</option><option value='GM'>Gambia</option><option value='GE'>Georgia</option><option value='DE'>Germany</option><option value='GH'>Ghana</option><option value='GI'>Gibraltar</option><option value='GR'>Greece</option><option value='GL'>Greenland</option><option value='GD'>Grenada</option><option value='GP'>Guadeloupe</option><option value='GU'>Guam</option><option value='GT'>Guatemala</option><option value='GG'>Guernsey</option><option value='GN'>Guinea</option><option value='GW'>Guinea-Bissau</option><option value='GY'>Guyana</option><option value='HT'>Haiti</option><option value='HM'>Heard Island and McDonald Islands</option><option value='HN'>Honduras</option><option value='HK'>Hong Kong</option><option value='HU'>Hungary</option><option value='IS'>Iceland</option><option value='IN'>India</option><option value='ID'>Indonesia</option><option value='IR'>Iran (Islamic Republic of)</option><option value='IQ'>Iraq</option><option value='IE'>Ireland</option><option value='IM'>Isle of Man</option><option value='IL'>Israel</option><option value='IT'>Italy</option><option value='JM'>Jamaica</option><option value='JP'>Japan</option><option value='JE'>Jersey</option><option value='JO'>Jordan</option><option value='KZ'>Kazakhstan</option><option value='KE'>Kenya</option><option value='KI'>Kiribati</option><option value='KP'>Korea (Democratic People&amp;#039;s Republic of)</option><option value='KR'>Korea (Republic of)</option><option value='KW'>Kuwait</option><option value='KG'>Kyrgyzstan</option><option value='LA'>Lao People&amp;#039;s Democratic Republic</option><option value='LV'>Latvia</option><option value='LB'>Lebanon</option><option value='LS'>Lesotho</option><option value='LR'>Liberia</option><option value='LY'>Libyan Arab Jamahiriya</option><option value='LI'>Liechtenstein</option><option value='LT'>Lithuania</option><option value='LU'>Luxembourg</option><option value='MO'>Macao</option><option value='MK'>Macedonia (The Former Yugoslav Republic of)</option><option value='MG'>Madagascar</option><option value='MW'>Malawi</option><option value='MY'>Malaysia</option><option value='MV'>Maldives</option><option value='ML'>Mali</option><option value='MT'>Malta</option><option value='MH'>Marshall Islands</option><option value='MQ'>Martinique</option><option value='MR'>Mauritania</option><option value='MU'>Mauritius</option><option value='YT'>Mayotte</option><option value='MX'>Mexico</option><option value='FM'>Micronesia (Federated States of)</option><option value='MD'>Moldova (Republic of)</option><option value='MC'>Monaco</option><option value='MN'>Mongolia</option><option value='ME'>Montenegro</option><option value='MS'>Montserrat</option><option value='MA'>Morocco</option><option value='MZ'>Mozambique</option><option value='MM'>Myanmar</option><option value='NA'>Namibia</option><option value='NR'>Nauru</option><option value='NP'>Nepal</option><option value='NL'>Netherlands</option><option value='AN'>Netherlands Antilles</option><option value='NC'>New Caledonia</option><option value='NZ'>New Zealand</option><option value='NI'>Nicaragua</option><option value='NE'>Niger</option><option value='NG'>Nigeria</option><option value='NU'>Niue</option><option value='NF'>Norfolk Island</option><option value='MP'>Northern Mariana Islands</option><option value='NO'>Norway</option><option value='OM'>Oman</option><option value='PK'>Pakistan</option><option value='PW'>Palau</option><option value='PS'>Palestinian Territory (Occupied)</option><option value='PA'>Panama</option><option value='PG'>Papua New Guinea</option><option value='PY'>Paraguay</option><option value='PE'>Peru</option><option value='PH'>Philippines</option><option value='PN'>Pitcairn</option><option value='PL'>Poland</option><option value='PT'>Portugal</option><option value='PR'>Puerto Rico</option><option value='QA'>Qatar</option><option value='RE'>Réunion</option><option value='RO'>Romania</option><option value='RU'>Russian Federation</option><option value='RW'>Rwanda</option><option value='BL'>Saint Barthélemy</option><option value='SH'>Saint Helena</option><option value='KN'>Saint Kitts and Nevis</option><option value='LC'>Saint Lucia</option><option value='MF'>Saint Martin</option><option value='PM'>Saint Pierre and Miquelon</option><option value='VC'>Saint Vincent and The Grenadines</option><option value='WS'>Samoa</option><option value='SM'>San Marino</option><option value='ST'>Sao Tome and Principe</option><option value='SA'>Saudi Arabia</option><option value='SN'>Senegal</option><option value='RS'>Serbia</option><option value='SC'>Seychelles</option><option value='SL'>Sierra Leone</option><option value='SG'>Singapore</option><option value='SK'>Slovakia</option><option value='SI'>Slovenia</option><option value='SB'>Solomon Islands</option><option value='SO'>Somalia</option><option value='ZA'>South Africa</option><option value='GS'>South Georgia and the South Sandwich Islands</option><option value='ES'>Spain</option><option value='LK'>Sri Lanka</option><option value='SD'>Sudan</option><option value='SR'>Suriname</option><option value='SJ'>Svalbard and Jan Mayen</option><option value='SZ'>Swaziland</option><option value='SE'>Sweden</option><option value='CH'>Switzerland</option><option value='SY'>Syrian Arab Republic</option><option value='TW'>Taiwan</option><option value='TJ'>Tajikistan</option><option value='TZ'>Tanzania</option><option value='TH'>Thailand</option><option value='TL'>Timor-Leste</option><option value='TG'>Togo</option><option value='TK'>Tokelau</option><option value='TO'>Tonga</option><option value='TT'>Trinidad and Tobago</option><option value='TN'>Tunisia</option><option value='TR'>Turkey</option><option value='TM'>Turkmenistan</option><option value='TC'>Turks and Caicos Islands</option><option value='TV'>Tuvalu</option><option value='UG'>Uganda</option><option value='UA'>Ukraine</option><option value='AE'>United Arab Emirates</option><option value='GB'>United Kingdom</option><option value='US'>United States</option><option value='UM'>United States Minor Outlying Islands</option><option value='UY'>Uruguay</option><option value='UZ'>Uzbekistan</option><option value='VU'>Vanuatu</option><option value='VA'>Vatican City State (Holy See)</option><option value='VE'>Venezuela (Bolivarian Republic of)</option><option value='VN'>Viet Nam</option><option value='VG'>Virgin Islands (British)</option><option value='VI'>Virgin Islands (U.S.)</option><option value='WF'>Wallis and Futuna</option><option value='EH'>Western Sahara</option><option value='YE'>Yemen</option><option value='ZM'>Zambia</option><option value='ZW'>Zimbabwe</option><option value=''></option></select><span class='mktFormMsg'></span></span>
+				<span class='mktInput'><select class='mktFormSelect mktFReq' name="Country" id="Country" size='1'   tabIndex='6' required><option value='Please select:' selected='selected'>Please select:</option><option value='AF'>Afghanistan</option><option value='AX'>Åland Islands</option><option value='AL'>Albania</option><option value='DZ'>Algeria</option><option value='AS'>American Samoa</option><option value='AD'>Andorra</option><option value='AO'>Angola</option><option value='AI'>Anguilla</option><option value='AQ'>Antarctica</option><option value='AG'>Antigua and Barbuda</option><option value='AR'>Argentina</option><option value='AM'>Armenia</option><option value='AW'>Aruba</option><option value='AU'>Australia</option><option value='AT'>Austria</option><option value='AZ'>Azerbaijan</option><option value='BS'>Bahamas</option><option value='BH'>Bahrain</option><option value='BD'>Bangladesh</option><option value='BB'>Barbados</option><option value='BY'>Belarus</option><option value='BE'>Belgium</option><option value='BZ'>Belize</option><option value='BJ'>Benin</option><option value='BM'>Bermuda</option><option value='BT'>Bhutan</option><option value='BO'>Bolivia</option><option value='BA'>Bosnia and Herzegovina</option><option value='BW'>Botswana</option><option value='BV'>Bouvet Island</option><option value='BR'>Brazil</option><option value='IO'>British Indian Ocean Territory</option><option value='BN'>Brunei Darussalam</option><option value='BG'>Bulgaria</option><option value='BF'>Burkina Faso</option><option value='BI'>Burundi</option><option value='KH'>Cambodia</option><option value='CM'>Cameroon</option><option value='CA'>Canada</option><option value='CV'>Cape Verde</option><option value='KY'>Cayman Islands</option><option value='CF'>Central African Republic</option><option value='TD'>Chad</option><option value='CL'>Chile</option><option value='CN'>China</option><option value='CX'>Christmas Island</option><option value='CC'>Cocos (Keeling) Islands</option><option value='CO'>Colombia</option><option value='KM'>Comoros</option><option value='CG'>Congo</option><option value='CD'>Congo (The Democratic Republic of the)</option><option value='CK'>Cook Islands</option><option value='CR'>Costa Rica</option><option value='CI'>Côte D&amp;#039;Ivoire</option><option value='HR'>Croatia</option><option value='CU'>Cuba</option><option value='CY'>Cyprus</option><option value='CZ'>Czech Republic</option><option value='DK'>Denmark</option><option value='DJ'>Djibouti</option><option value='DM'>Dominica</option><option value='DO'>Dominican Republic</option><option value='EC'>Ecuador</option><option value='EG'>Egypt</option><option value='SV'>El Salvador</option><option value='GQ'>Equatorial Guinea</option><option value='ER'>Eritrea</option><option value='EE'>Estonia</option><option value='ET'>Ethiopia</option><option value='FK'>Falkland Islands (Malvinas)</option><option value='FO'>Faroe Islands</option><option value='FJ'>Fiji</option><option value='FI'>Finland</option><option value='FR'>France</option><option value='GF'>French Guiana</option><option value='PF'>French Polynesia</option><option value='TF'>French Southern Territories</option><option value='GA'>Gabon</option><option value='GM'>Gambia</option><option value='GE'>Georgia</option><option value='DE'>Germany</option><option value='GH'>Ghana</option><option value='GI'>Gibraltar</option><option value='GR'>Greece</option><option value='GL'>Greenland</option><option value='GD'>Grenada</option><option value='GP'>Guadeloupe</option><option value='GU'>Guam</option><option value='GT'>Guatemala</option><option value='GG'>Guernsey</option><option value='GN'>Guinea</option><option value='GW'>Guinea-Bissau</option><option value='GY'>Guyana</option><option value='HT'>Haiti</option><option value='HM'>Heard Island and McDonald Islands</option><option value='HN'>Honduras</option><option value='HK'>Hong Kong</option><option value='HU'>Hungary</option><option value='IS'>Iceland</option><option value='IN'>India</option><option value='ID'>Indonesia</option><option value='IR'>Iran (Islamic Republic of)</option><option value='IQ'>Iraq</option><option value='IE'>Ireland</option><option value='IM'>Isle of Man</option><option value='IL'>Israel</option><option value='IT'>Italy</option><option value='JM'>Jamaica</option><option value='JP'>Japan</option><option value='JE'>Jersey</option><option value='JO'>Jordan</option><option value='KZ'>Kazakhstan</option><option value='KE'>Kenya</option><option value='KI'>Kiribati</option><option value='KP'>Korea (Democratic People&amp;#039;s Republic of)</option><option value='KR'>Korea (Republic of)</option><option value='KW'>Kuwait</option><option value='KG'>Kyrgyzstan</option><option value='LA'>Lao People&amp;#039;s Democratic Republic</option><option value='LV'>Latvia</option><option value='LB'>Lebanon</option><option value='LS'>Lesotho</option><option value='LR'>Liberia</option><option value='LY'>Libyan Arab Jamahiriya</option><option value='LI'>Liechtenstein</option><option value='LT'>Lithuania</option><option value='LU'>Luxembourg</option><option value='MO'>Macao</option><option value='MK'>Macedonia (The Former Yugoslav Republic of)</option><option value='MG'>Madagascar</option><option value='MW'>Malawi</option><option value='MY'>Malaysia</option><option value='MV'>Maldives</option><option value='ML'>Mali</option><option value='MT'>Malta</option><option value='MH'>Marshall Islands</option><option value='MQ'>Martinique</option><option value='MR'>Mauritania</option><option value='MU'>Mauritius</option><option value='YT'>Mayotte</option><option value='MX'>Mexico</option><option value='FM'>Micronesia (Federated States of)</option><option value='MD'>Moldova (Republic of)</option><option value='MC'>Monaco</option><option value='MN'>Mongolia</option><option value='ME'>Montenegro</option><option value='MS'>Montserrat</option><option value='MA'>Morocco</option><option value='MZ'>Mozambique</option><option value='MM'>Myanmar</option><option value='NA'>Namibia</option><option value='NR'>Nauru</option><option value='NP'>Nepal</option><option value='NL'>Netherlands</option><option value='AN'>Netherlands Antilles</option><option value='NC'>New Caledonia</option><option value='NZ'>New Zealand</option><option value='NI'>Nicaragua</option><option value='NE'>Niger</option><option value='NG'>Nigeria</option><option value='NU'>Niue</option><option value='NF'>Norfolk Island</option><option value='MP'>Northern Mariana Islands</option><option value='NO'>Norway</option><option value='OM'>Oman</option><option value='PK'>Pakistan</option><option value='PW'>Palau</option><option value='PS'>Palestinian Territory (Occupied)</option><option value='PA'>Panama</option><option value='PG'>Papua New Guinea</option><option value='PY'>Paraguay</option><option value='PE'>Peru</option><option value='PH'>Philippines</option><option value='PN'>Pitcairn</option><option value='PL'>Poland</option><option value='PT'>Portugal</option><option value='PR'>Puerto Rico</option><option value='QA'>Qatar</option><option value='RE'>Réunion</option><option value='RO'>Romania</option><option value='RU'>Russian Federation</option><option value='RW'>Rwanda</option><option value='BL'>Saint Barthélemy</option><option value='SH'>Saint Helena</option><option value='KN'>Saint Kitts and Nevis</option><option value='LC'>Saint Lucia</option><option value='MF'>Saint Martin</option><option value='PM'>Saint Pierre and Miquelon</option><option value='VC'>Saint Vincent and The Grenadines</option><option value='WS'>Samoa</option><option value='SM'>San Marino</option><option value='ST'>Sao Tome and Principe</option><option value='SA'>Saudi Arabia</option><option value='SN'>Senegal</option><option value='RS'>Serbia</option><option value='SC'>Seychelles</option><option value='SL'>Sierra Leone</option><option value='SG'>Singapore</option><option value='SK'>Slovakia</option><option value='SI'>Slovenia</option><option value='SB'>Solomon Islands</option><option value='SO'>Somalia</option><option value='ZA'>South Africa</option><option value='GS'>South Georgia and the South Sandwich Islands</option><option value='ES'>Spain</option><option value='LK'>Sri Lanka</option><option value='SD'>Sudan</option><option value='SR'>Suriname</option><option value='SJ'>Svalbard and Jan Mayen</option><option value='SZ'>Swaziland</option><option value='SE'>Sweden</option><option value='CH'>Switzerland</option><option value='SY'>Syrian Arab Republic</option><option value='TW'>Taiwan</option><option value='TJ'>Tajikistan</option><option value='TZ'>Tanzania</option><option value='TH'>Thailand</option><option value='TL'>Timor-Leste</option><option value='TG'>Togo</option><option value='TK'>Tokelau</option><option value='TO'>Tonga</option><option value='TT'>Trinidad and Tobago</option><option value='TN'>Tunisia</option><option value='TR'>Turkey</option><option value='TM'>Turkmenistan</option><option value='TC'>Turks and Caicos Islands</option><option value='TV'>Tuvalu</option><option value='UG'>Uganda</option><option value='UA'>Ukraine</option><option value='AE'>United Arab Emirates</option><option value='GB'>United Kingdom</option><option value='US'>United States</option><option value='UM'>United States Minor Outlying Islands</option><option value='UY'>Uruguay</option><option value='UZ'>Uzbekistan</option><option value='VU'>Vanuatu</option><option value='VA'>Vatican City State (Holy See)</option><option value='VE'>Venezuela (Bolivarian Republic of)</option><option value='VN'>Viet Nam</option><option value='VG'>Virgin Islands (British)</option><option value='VI'>Virgin Islands (U.S.)</option><option value='WF'>Wallis and Futuna</option><option value='EH'>Western Sahara</option><option value='YE'>Yemen</option><option value='ZM'>Zambia</option><option value='ZW'>Zimbabwe</option><option value=''></option></select><span class='mktFormMsg'></span></span>
 			</li>
 			<li class='mktField'>
 				<label for="State">State:</label>
-				<span class='mktInput'><select class='mktFormSelect' name="State" id="State" size='1'   tabIndex='6'>					<option value="SelectProvince" selected="selected">Select Province</option>
+				<span class='mktInput'><select class='mktFormSelect' name="State" id="State" size='1'   tabIndex='7'>					<option value="SelectProvince" selected="selected">Select Province</option>
 					<option value="AB">Alberta</option>
 					<option value="BC">British Columbia</option>
 					<option value="MB">Manitoba</option>
@@ -189,22 +190,22 @@ <h3>Your organisation</h3>
 	<ul class="mktLblLeft">
 		<li class='mktFormReq mktField'>
 			<label for="Job_Role__c">Job role: <span>*</span></label>
-			<span class='mktInput'><select class='mktFormSelect mktFReq' name="Job_Role__c" id="Job_Role__c" size='1'   tabIndex='7' required><option value='Please select' selected='selected'>Please select</option><option value='Business and Project Management'>Business and Project Management</option><option value='Database Development and Administration'>Database Development and Administration</option><option value='Education'>Education</option><option value='Enterprise Systems Analysis &amp; Integration'>Enterprise Systems Analysis &amp; Integration</option><option value='Hardware Operations and Management'>Hardware Operations and Management</option><option value='Home User'>Home User</option><option value='Individual'>Individual</option><option value='Network Design and Administration'>Network Design and Administration</option><option value='Owner/Self Employed'>Owner/Self Employed</option><option value='Press and Communications'>Press and Communications</option><option value='Programming/Software Engineering'>Programming/Software Engineering</option><option value='Smartphone User'>Smartphone User</option><option value='Technical Support'>Technical Support</option><option value='Technical Writing'>Technical Writing</option><option value='Ubuntu Enthusiast'>Ubuntu Enthusiast</option><option value='Web Development and Administration'>Web Development and Administration</option></select><span class='mktFormMsg'></span></span>
+			<span class='mktInput'><select class='mktFormSelect mktFReq' name="Job_Role__c" id="Job_Role__c" size='1'   tabIndex='8' required><option value='Please select' selected='selected'>Please select</option><option value='Business and Project Management'>Business and Project Management</option><option value='Database Development and Administration'>Database Development and Administration</option><option value='Education'>Education</option><option value='Enterprise Systems Analysis &amp; Integration'>Enterprise Systems Analysis &amp; Integration</option><option value='Hardware Operations and Management'>Hardware Operations and Management</option><option value='Home User'>Home User</option><option value='Individual'>Individual</option><option value='Network Design and Administration'>Network Design and Administration</option><option value='Owner/Self Employed'>Owner/Self Employed</option><option value='Press and Communications'>Press and Communications</option><option value='Programming/Software Engineering'>Programming/Software Engineering</option><option value='Smartphone User'>Smartphone User</option><option value='Technical Support'>Technical Support</option><option value='Technical Writing'>Technical Writing</option><option value='Ubuntu Enthusiast'>Ubuntu Enthusiast</option><option value='Web Development and Administration'>Web Development and Administration</option></select><span class='mktFormMsg'></span></span>
 		</li>
 		<li class='mktFormReq mktField'>
 			<label for="Industry">Industry: <span>*</span></label>
-			<span class='mktInput'><select class='mktFormSelect mktFReq' name="Industry" id="Industry" size='1'   tabIndex='8' required><option value='Please select' selected='selected'>Please select</option><option value='Accountancy &amp; Tax'>Accountancy &amp; Tax</option><option value='Aerospace &amp; Aviation'>Aerospace &amp; Aviation</option><option value='Automotive'>Automotive</option><option value='Banking &amp; Finance'>Banking &amp; Finance</option><option value='Business Consultancy'>Business Consultancy</option><option value='Charity &amp; Non-profit'>Charity &amp; Non-profit</option><option value='Construction'>Construction</option><option value='Consumer Products'>Consumer Products</option><option value='Consumer Services'>Consumer Services</option><option value='Defence &amp; Security'>Defence &amp; Security</option><option value='Education &amp; Training'>Education &amp; Training</option><option value='Electronics'>Electronics</option><option value='Engineering'>Engineering</option><option value='Entertainment - media/music/broadcast'>Entertainment - media/music/broadcast</option><option value='Facilities, Property &amp; Real Estate'>Facilities, Property &amp; Real Estate</option><option value='Government'>Government</option><option value='Healthcare &amp; Pharmaceuticals'>Healthcare &amp; Pharmaceuticals</option><option value='HR &amp; Recruitment'>HR &amp; Recruitment</option><option value='Information Technology'>Information Technology</option><option value='Insurance'>Insurance</option><option value='Internet &amp; New Media'>Internet &amp; New Media</option><option value='Legal'>Legal</option><option value='Leisure, Travel &amp; Hospitality'>Leisure, Travel &amp; Hospitality</option><option value='Manufacturer - Computer Hardware'>Manufacturer - Computer Hardware</option><option value='Manufacturer - Device/ Handset'>Manufacturer - Device/ Handset</option><option value='Manufacturer - Other'>Manufacturer - Other</option><option value='Marketing, PR &amp; Advertising'>Marketing, PR &amp; Advertising</option><option value='Media - publishing or news'>Media - publishing or news</option><option value='Mobile operator'>Mobile operator</option><option value='ODM'>ODM</option><option value='Oil &amp; Gas'>Oil &amp; Gas</option><option value='PC manufacturer'>PC manufacturer</option><option value='Phone manufacturer'>Phone manufacturer</option><option value='Public Sector'>Public Sector</option><option value='Retail &amp; e-commerce'>Retail &amp; e-commerce</option><option value='Science &amp; Environment'>Science &amp; Environment</option><option value='SOC vendor'>SOC vendor</option><option value='Software Development'>Software Development</option><option value='Supply Chain &amp; Logistics'>Supply Chain &amp; Logistics</option><option value='Telecommunications'>Telecommunications</option><option value='Transportation &amp; Distribution'>Transportation &amp; Distribution</option><option value='Utilities &amp; Energy'>Utilities &amp; Energy</option><option value='Other'>Other</option><option value='Not applicable (self)'>Not applicable (self)</option></select><span class='mktFormMsg'></span></span>
+			<span class='mktInput'><select class='mktFormSelect mktFReq' name="Industry" id="Industry" size='1'   tabIndex='9' required><option value='Please select' selected='selected'>Please select</option><option value='Accountancy &amp; Tax'>Accountancy &amp; Tax</option><option value='Aerospace &amp; Aviation'>Aerospace &amp; Aviation</option><option value='Automotive'>Automotive</option><option value='Banking &amp; Finance'>Banking &amp; Finance</option><option value='Business Consultancy'>Business Consultancy</option><option value='Charity &amp; Non-profit'>Charity &amp; Non-profit</option><option value='Construction'>Construction</option><option value='Consumer Products'>Consumer Products</option><option value='Consumer Services'>Consumer Services</option><option value='Defence &amp; Security'>Defence &amp; Security</option><option value='Education &amp; Training'>Education &amp; Training</option><option value='Electronics'>Electronics</option><option value='Engineering'>Engineering</option><option value='Entertainment - media/music/broadcast'>Entertainment - media/music/broadcast</option><option value='Facilities, Property &amp; Real Estate'>Facilities, Property &amp; Real Estate</option><option value='Government'>Government</option><option value='Healthcare &amp; Pharmaceuticals'>Healthcare &amp; Pharmaceuticals</option><option value='HR &amp; Recruitment'>HR &amp; Recruitment</option><option value='Information Technology'>Information Technology</option><option value='Insurance'>Insurance</option><option value='Internet &amp; New Media'>Internet &amp; New Media</option><option value='Legal'>Legal</option><option value='Leisure, Travel &amp; Hospitality'>Leisure, Travel &amp; Hospitality</option><option value='Manufacturer - Computer Hardware'>Manufacturer - Computer Hardware</option><option value='Manufacturer - Device/ Handset'>Manufacturer - Device/ Handset</option><option value='Manufacturer - Other'>Manufacturer - Other</option><option value='Marketing, PR &amp; Advertising'>Marketing, PR &amp; Advertising</option><option value='Media - publishing or news'>Media - publishing or news</option><option value='Mobile operator'>Mobile operator</option><option value='ODM'>ODM</option><option value='Oil &amp; Gas'>Oil &amp; Gas</option><option value='PC manufacturer'>PC manufacturer</option><option value='Phone manufacturer'>Phone manufacturer</option><option value='Public Sector'>Public Sector</option><option value='Retail &amp; e-commerce'>Retail &amp; e-commerce</option><option value='Science &amp; Environment'>Science &amp; Environment</option><option value='SOC vendor'>SOC vendor</option><option value='Software Development'>Software Development</option><option value='Supply Chain &amp; Logistics'>Supply Chain &amp; Logistics</option><option value='Telecommunications'>Telecommunications</option><option value='Transportation &amp; Distribution'>Transportation &amp; Distribution</option><option value='Utilities &amp; Energy'>Utilities &amp; Energy</option><option value='Other'>Other</option><option value='Not applicable (self)'>Not applicable (self)</option></select><span class='mktFormMsg'></span></span>
 		</li>
 		<li class='mktFormReq mktField'>
 			<label for="Ubuntu_User__c">How do you use Ubuntu: <span>*</span></label>
-			<span class='mktInput'><select class='mktFormSelect mktFReq' name="Ubuntu_User__c" id="Ubuntu_User__c" size='1'   tabIndex='9 required'><option value='Please select' selected='selected'>Please select</option><option value='Privately only'>Privately only</option><option value='Commercially only'>Commercially only</option><option value='Privately and commercially'>Privately and commercially</option><option value='Not at all'>Not at all</option></select><span class='mktFormMsg'></span></span>
+			<span class='mktInput'><select class='mktFormSelect mktFReq' name="Ubuntu_User__c" id="Ubuntu_User__c" size='1'   tabIndex='10 required'><option value='Please select' selected='selected'>Please select</option><option value='Privately only'>Privately only</option><option value='Commercially only'>Commercially only</option><option value='Privately and commercially'>Privately and commercially</option><option value='Not at all'>Not at all</option></select><span class='mktFormMsg'></span></span>
 		</li>
 		<li class='mktFormReq mktField'>
 			<label for="NumUbuntuDesktops__c">Number of Ubuntu desktops currently deployed/planned: <span>*</span></label>
-			<span class='mktInput'><select class='mktFormSelect mktFReq' name="NumUbuntuDesktops__c" id="NumUbuntuDesktops__c" size='1'   tabIndex='10' required><option value='Please select' selected='selected'>Please select</option><option value='0 to 1'>0 to 1</option><option value='2 to 50'>2 to 50</option><option value='50 to 100'>50 to 100</option><option value='100 to 500'>100 to 500</option><option value='over 500'>over 500</option></select><span class='mktFormMsg'></span></span>
+			<span class='mktInput'><select class='mktFormSelect mktFReq' name="NumUbuntuDesktops__c" id="NumUbuntuDesktops__c" size='1'   tabIndex='11' required><option value='Please select' selected='selected'>Please select</option><option value='0 to 1'>0 to 1</option><option value='2 to 50'>2 to 50</option><option value='50 to 100'>50 to 100</option><option value='100 to 500'>100 to 500</option><option value='over 500'>over 500</option></select><span class='mktFormMsg'></span></span>
 		</li>
 		<li  class='mktFormReq mktField' >
-			<label>Number of Ubuntu servers currently deployed:</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="NumUbuntuServers__c" id="NumUbuntuServers__c" size='1'   tabIndex='11' required><option value='' selected='selected'>Please select</option><option value='25 or less'>25 or less</option><option value='26 - 100'>26 - 100</option><option value='101 - 250'>101 - 250</option><option value='251 - 500'>251 - 500</option><option value='501 or more'>501 or more</option></select><span class='mktFormMsg'></span></span>
+			<label>Number of Ubuntu servers currently deployed:</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="NumUbuntuServers__c" id="NumUbuntuServers__c" size='1'   tabIndex='12' required><option value='' selected='selected'>Please select</option><option value='25 or less'>25 or less</option><option value='26 - 100'>26 - 100</option><option value='101 - 250'>101 - 250</option><option value='251 - 500'>251 - 500</option><option value='501 or more'>501 or more</option></select><span class='mktFormMsg'></span></span>
 		</li>
 	</ul>
 	</fieldset>
@@ -214,11 +215,11 @@ <h3>Your comments</h3>
 	<ul class="mktLblLeft">
 		<li class='mktFormReq mktField'>
 			<label for="Comments_from_lead__c">What would you like to talk to us about? <span>*</span></label>
-			<span class='mktInput'><textarea class='mktFormTextarea mktFormTextarea mktFReq' name="Comments_from_lead__c" id="Comments_from_lead__c" cols='20' rows='4'  tabIndex='12' required></textarea><span class='mktFormMsg'></span></span>
+			<span class='mktInput'><textarea class='mktFormTextarea mktFormTextarea mktFReq' name="Comments_from_lead__c" id="Comments_from_lead__c" cols='20' rows='4'  tabIndex='13' required></textarea><span class='mktFormMsg'></span></span>
 		</li>
 		<li class="mktField mktLblRight">
 			<span class="mktInput mktLblRight">
-				<input class="mktFormCheckbox" name="NewsletterOpt-In" id="NewsletterOpt-In" type="checkbox" value="1" tabindex="13">
+				<input class="mktFormCheckbox" name="NewsletterOpt-In" id="NewsletterOpt-In" type="checkbox" value="1" tabindex="14">
 				<label for="NewsletterOpt-In">I would like to receive occasional news from Canonical by email.</label>
 				<span class="mktFormMsg"></span>
 			</span>
@@ -280,7 +281,7 @@ <h3>Your comments</h3>
 	</div><!-- /.seven-col -->
 </div><!-- /.row -->
 
-{% include "_includes/_live_chat.html" %}
+{% include "shared/_live_chat.html" %}
 
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/management/ema-whitepaper.html b/templates/management/ema-whitepaper.html
index 6cd27c35b38..1187042b6a5 100755
--- a/templates/management/ema-whitepaper.html
+++ b/templates/management/ema-whitepaper.html
@@ -3,7 +3,7 @@
 {% block title %}Enterprise Class Ubuntu Management with Canonical Landscape{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Management" page_title="EMA whitepaper"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Management" page_title="EMA whitepaper"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/management/index.html b/templates/management/index.html
index b9b816f6405..3acec288782 100755
--- a/templates/management/index.html
+++ b/templates/management/index.html
@@ -9,75 +9,56 @@
 {% block extra_body_class %}management-home{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Management" page_title="Overview"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Management" page_title="Overview"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
 
 <div class="row row-hero">
-	<h1>Systems management and support</h1>
-	<div class="eight-col no-margin-bottom">
-		<p>Ubuntu Advantage is the professional support package from Canonical, with Landscape, a systems management tool, built for running large-scale Ubuntu deployments on desktop, server or cloud.</p>
-		<p class="clearfix"><a class="link-cta-ubuntu" href="https://landscape.canonical.com/trial-registration">Try Landscape for free for 30 days</a></p>
+    <h1>Ubuntu Advantage</h1>
+	<p class="intro">Systems management and support</p>
+	<div class="seven-col no-margin-bottom">
+		<p>Ubuntu Advantage is the commercial support package from Canonical. It includes Landscape, the Ubuntu systems management tool, for running desktop, server and public cloud deployments, or building and managing private OpenStack clouds.</p>
 		<p><a href="/management/contact-us">Contact us about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
 	</div><!-- /.six-col -->
-	<div class="four-col last-col">
+	<div class="five-col last-col align-center">
 		<img alt="" width="288" height="155" src="{{ STATIC_URL }}img/management/image-management.svg" class="priority-0" />
 	</div><!-- /.six-col -->
 </div><!-- /.row-hero -->
 
-<div class="row row-whats-included">
-	<div class="eight-col">
-		<h2>Ubuntu Advantage: what&rsquo;s included?</h2>
-		<h3>Systems management: Landscape</h3>
-		<p>With the Landscape systems management tool, you can automate updates and manage physical, virtual and cloud-based systems from a single interface. It's easy to set up, easy to use and requires no special hardware. It features:</p>
-		<div class="combined-list clearfix eight-col">
-				<ul class="list-canonical four-col">
-					<li>Management at scale</li>
-					<li>Deploy or rollback security updates</li>
-					<li class="last-item">Compliance reports</li>
-				</ul>
-				<ul class="list-canonical four-col last-col">
-					<li>Role-based access</li>
-					<li class="last-item">Informative monitoring</li>
-				</ul>
-		</div><!-- /.combined-list -->
-		<p><a href="/management/landscape-features">Learn more about Landscape&nbsp;&rsaquo;</a></p>
-	</div><!-- /.eight-col -->
-	<div class="four-col last-col no-margin-bottom">
-		<img src="{{ STATIC_URL }}img/management/image-landscape.jpg" alt="" width="328" height="477" class="priority-0" />
-	</div><!-- /.four-col -->
-</div><!-- /.row -->
 
-<div class="row">
-	<div class="vertical-divider">
-	<div class="four-col support">
-		<h3>24/7 support</h3>
-		<p>Canonical&rsquo;s Global Support &amp; Services team provides around-the-clock coverage for Ubuntu deployments all over the world. Telephone support gives you access to engineers with first-hand experience of your issues, while the online portal lets you track the progress of cases in real time.</p>
+<div class="row row-grey vertical-divider">
+	<div class="six-col">
+	<div class="one-col align-center no-margin-bottom">
+		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-server-orange.svg" width="50" height="50" alt="" class="priority-0"/>
 	</div>
-	<div class="four-col technical-library">
-		<h3>Technical library</h3>
-		<p>Exclusive to Ubuntu Advantage subscribers, the Canonical Knowledge Base is an online library of articles on technical issues including security, migration and networking.</p>
-	</div>
-	<div class="four-col last-col legal-assurance no-margin-bottom">
-		<h3>Customer login</h3>
-		<p>Already a customer? Access the support portal or Canonical’s hosted Landscape service.</p>
-		<ul class="no-bullets no-margin-bottom">
-			<li><a href="https://login.ubuntu.com/+saml/init/salesforce/500/o ">Support portal login&nbsp;&rsaquo;</a></li>
-			<li><a href="https://landscape.canonical.com/">Landscape login&nbsp;&rsaquo;</a></li>
-		</ul>
+	<div class="five-col last-col no-margin-bottom">
+		<h3>Manage desktops and servers</h3>
+		<h4 class="note caps">Free for 30 days</h4>
 	</div>
+		<p>Try the hosted version of Landscape on your desktop, server and public cloud deployments – free for 30 days.</p>
+		<p><a href="https://landscape.canonical.com/trial-registration">Try Landscape for free for 30 days&nbsp;&rsaquo;</a></p>
+	</div><!-- /.six-col -->
+	
+	<div class="six-col last-col">
+	<div class="one-col align-center no-margin-bottom">
+		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-cloud-orange.svg" width="50" height="50" alt="" class="priority-0"/>
 	</div>
-	<div class="twelve-col">
-		<p><a href="/management/ubuntu-advantage">Learn more about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
+	<div class="five-col last-col no-margin-bottom">
+		<h3>Create an OpenStack cloud</h3>
+		<h4 class="note caps">Free for up to 10 machines</h4>
 	</div>
-</div>
+		<p>Try the server version of Landscape to build and manage an OpenStack cloud with up to 10 machines – free for as long as you need it.</p>
+		<p><a href="http://www.ubuntu.com/download/cloud/install-ubuntu-openstack">Try Landscape for free for 10 machines&nbsp;&rsaquo;</a></p>
+	</div><!-- /.six-col -->
+</div><!-- /.row-hero -->
 
+{% include "shared/_ubuntu_advantage_whats_inlcuded.html" %}
 
 <div class="row">
 	<div class="six-col">
 		<h2>Watch it in action</h2>
-		<p>With Landscape you can manage your machines from anywhere and with a fully scriptable API, you can integrate it with your current Linux management tools, extending their capabilities and giving you the power to do more with fewer resources.</p>
+		<p>With Landscape you can manage your machines from anywhere via a browser, and with a fully scriptable API, you can integrate it with your current Linux management tools, extending their capabilities and giving you the power to do more with fewer resources.</p>
 		<p><a href="/management/working-with-landscape">Learn more about working with Landscape&nbsp;&rsaquo;</a></p>
 	</div>
 	<div class="six-col last-col">
@@ -125,6 +106,7 @@ <h3>Benefits for system administrators</h3>
 			<li>Integration with common client-side Linux sysadmin tooling, so you can see the same information about individual machines as you see in the terminal.</li>
 			<li>A complete API lets you use established technologies (e.g. Bash, Python) to borrow or build on Landscape&rsquo;s functionality.</li>
 			<li>Custom scripts need only be written to allow for the business logic unique to your organisation; common tasks (e.g. repository management) are already covered, so there&rsquo;s no need to re-invent the wheel.</li>
+			<li>Manage machines remotely from any web browser.</li>
 			<li>You can manage machines remotely from anywhere you can access a web browser.</li>
 			<li>Receive alerts when updates become available for specific machines, or manage auto-update policies, instructing devices to update during set maintenance windows.</li>
 			<li class="last-item"><p>RBAC features for delegating certain activities on specific machines to others &mdash; reducing your workload without sacrificing control.</li>
@@ -146,7 +128,7 @@ <h3>Benefits for IT managers</h3>
 	</div>
 </div><!-- /.row-->
 
-{% include "_includes/_live_chat.html" %}
+{% include "shared/_live_chat.html" %}
 
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/management/landscape-features.html b/templates/management/landscape-features.html
index af45748e6e2..8b17171bb0b 100755
--- a/templates/management/landscape-features.html
+++ b/templates/management/landscape-features.html
@@ -3,7 +3,7 @@
 {% block title %}Landscape features | Management{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Management" page_title="Landscape features"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Management" page_title="Landscape features"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
@@ -21,6 +21,7 @@ <h1>Landscape features</h1>
 			<li><a class="slideless" href="#deployment">Deployment</a></li>
 			<li><a class="slideless" href="#monitoring">Monitoring</a></li>
 			<li><a class="slideless" href="#inventory">Inventory management</a></li>
+			<li><a class="slideless" href="#installer">OpenStack</a></li>
 		</ul>
 	</div>
 
@@ -52,8 +53,8 @@ <h3>Making software management simple</h3>
 	</div><!-- /#management -->
 
 		<div class="twelve-col">
-			<a href="{{ STATIC_URL }}img/management/landscape-features/image-landscape-1.jpg">
-				<img width="824" alt="Landscape rollback screen" src="{{ STATIC_URL }}img/management/landscape-features/image-landscape-1.jpg" class="default">
+			<a href="{{ STATIC_URL }}img/management/landscape-features/image-software-management.jpg">
+				<img alt="Landscape rollback screen" src="{{ STATIC_URL }}img/management/landscape-features/image-software-management.jpg" class="default">
 			</a>
 		</div><!-- /.pattern-gallery -->
 		<div class="eight-col">
@@ -88,8 +89,8 @@ <h3>Deployment &ndash; on the metal or in the cloud</h3>
 		</div><!-- /#deployment -->
 		<div class="row main-content  no-border">
 			<div class="twelve-col">
-				<a href="{{ STATIC_URL }}img/management/landscape-features/image-landscape-2.jpg">
-					<img width="824" alt="Landscape provisioning screen" src="{{ STATIC_URL }}img/management/landscape-features/image-landscape-2.jpg" class="screenshot">
+				<a href="{{ STATIC_URL }}img/management/landscape-features/image-deployment.jpg">
+					<img alt="Landscape provisioning screen" src="{{ STATIC_URL }}img/management/landscape-features/image-deployment.jpg" class="screenshot">
 				</a>
 			</div>
 			<div class="eight-col">
@@ -123,8 +124,8 @@ <h3>Monitoring</h3>
 		</div><!-- /#monitoring -->
 		<div class="row main-content no-border">
 			<div class="twelve-col">
-				<a href="{{ STATIC_URL }}img/management/landscape-features/image-landscape-3.jpg">
-					<img width="824" alt="Landscape monitoring screen" src="{{ STATIC_URL }}img/management/landscape-features/image-landscape-3.jpg" class="screenshot">
+				<a href="{{ STATIC_URL }}img/management/landscape-features/image-monitoring.jpg">
+					<img alt="Landscape monitoring screen" src="{{ STATIC_URL }}img/management/landscape-features/image-monitoring.jpg" class="screenshot">
 				</a>
 			</div>
 			<div class="eight-col">
@@ -156,8 +157,8 @@ <h3>Inventory management</h3>
 		<div class="row main-content no-border">
 			<div class="pattern-gallery">
 				<div class="twelve-col">
-					<a href="{{ STATIC_URL }}img/management/landscape-features/image-landscape-4.jpg">
-						<img width="824" alt="Landscape hardware inventory screen" src="{{ STATIC_URL }}img/management/landscape-features/image-landscape-4.jpg" class="default">
+					<a href="{{ STATIC_URL }}img/management/landscape-features/image-inventory-management.jpg">
+						<img alt="Landscape hardware inventory screen" src="{{ STATIC_URL }}img/management/landscape-features/image-inventory-management.jpg" class="default">
 					</a>
 				</div>
       </div><!-- /.pattern-gallery -->
@@ -170,8 +171,52 @@ <h3>Inventory management</h3>
 			</div><!-- /.content-text -->
 		</div><!-- /.row main-content -->
 	</div><!-- /.tabbed-content .inventory -->
+	
+	<div id="installer" class="tabbed-content installer hide">
+		<a class="accordion-button slideless" href="#inventory" data-hash="installer">OpenStack</a>
+			<h3>OpenStack</h3>
+			<p class="intro">Build and manage your cloud in minutes</p>
+			<div class="combined-list">
+				<div class="six-col">
+					<ul class="list-canonical">
+						<li class="six-col">Get an OpenStack up and running in a matter of minutes</li>
+						<li class="six-col last-col">Keeps an inventory of your resources to recommend the best configuration options</li>
+						<li class="six-col">A growing list of options for hypervisor, networking, storage, and other components</li>
+						<li class="six-col last-col">See the status of all cloud resources at once, with alerts for any disruptions</li>
+					</ul>
+				</div><!-- /.six-col -->
+				<div class="six-col last-col">
+					<ul class="list-canonical">
+						<li class="six-col">Scale out with ease, as your cloud workloads grow</li>
+						<li class="six-col last-col">Uses all of Canonical&rsquo;s proven cloud building and management tools</li>
+						<li class="six-col">Manage your cloud from the same system as all other Ubuntu machines</li>
+						<li class="six-col last-col">Free for up to 10 machines</li>
+					</ul>			
+				</div><!-- /.six-col -->
+			</div><!-- /.combined-list -->
+			<div class="twelve-col">
+				<a href="{{ STATIC_URL }}img/management/landscape-features/image-openstack-installer.jpg">
+					<img alt="Landscape hardware OpenStack installer screen" src="{{ STATIC_URL }}img/management/landscape-features/image-openstack-installer.jpg" class="default">
+				</a>
+			</div>
+			<div class="twelve-col">
+				<h3>Build your cloud in your browser</h3>
+				<p>Through a simple, straightforward wizard, Landscape guides you through the process of building a fully operational Ubuntu OpenStack cloud from the bare metal. The wizard ensures that all selected components are certified to work together. The result is a cloud built on a reference architecture designed for both maintainability and potential for expansion.</p>
+				<p>You can experiment with different technology combinations with very little effort, re-designing your cloud as many times as necessary, with no time investment at all.</p>
+				
+				<h3>A cloud that scales and evolves</h3>
+				<p>Because Juju is used to provision the cloud, your architecture can evolve seamlessly as newer versions of Landscape are released, providing your existing installation with additional functionality. Your cloud can scale-out with a single command today and, in the future, rolling-update functionality with zero downtime will be introduced.</p>
+				
+				<p>The reference architecture embodied in the installer&rsquo;s logic can deploy clouds of all sizes, from as few as five nodes to hundreds. This changes the economics of building your first production cloud: you no longer need to contract an expert who will cost more than the hardware itself.</p>
+				
+				<h3>Built-in monitoring for your cloud</h3>
+				<p>Landscape includes OpenStack-aware monitoring that helps you track the health of your cloud in production and the continued availability of your computing, storage and network resources. It also helps with capacity planning by making real-time predictions based on current utilisation trends, enabling you to decide when to add extra compute nodes or storage.</p>
+				<p><a href="/download/cloud/install-ubuntu-openstack">Try the The Canonical Distribution of Ubuntu OpenStack now, free for the first ten machines&nbsp;&rsaquo;</a></p>
+			</div>
+	</div><!-- /.tabbed-content .installer -->
+	
 </div>
-{% include "_includes/_live_chat.html" %}
+{% include "shared/_live_chat.html" %}
 
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/management/return-on-investment.html b/templates/management/return-on-investment.html
index a85fc6a95d5..e514368b3dd 100755
--- a/templates/management/return-on-investment.html
+++ b/templates/management/return-on-investment.html
@@ -4,7 +4,7 @@
 {% block extra_body_class %}return-on-investment{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Management" page_title="Return on investment"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Management" page_title="Return on investment"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
@@ -81,7 +81,7 @@ <h3>Already using Puppet or Nagios?</h3>
 	</div><!-- /.six-col -->
 </div><!-- /.row -->
 
-{% include "_includes/_live_chat.html" %}
+{% include "shared/_live_chat.html" %}
 
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/management/_includes/_contextual_footer.html b/templates/management/shared/_contextual_footer.html
similarity index 93%
rename from templates/management/_includes/_contextual_footer.html
rename to templates/management/shared/_contextual_footer.html
index ba263adafad..f2ffd8b8f63 100755
--- a/templates/management/_includes/_contextual_footer.html
+++ b/templates/management/shared/_contextual_footer.html
@@ -10,5 +10,5 @@ <h3>Contact us today</h3>
 	</div>
 	<div class="feature-four four-col last-col">
 		<h3>Further reading</h3>
-		{% include "_base/_further_reading_links.html" %}
+		{% include "templates/_further_reading_links.html" %}
 	</div>
diff --git a/templates/management/_includes/_landscape_trial.html b/templates/management/shared/_landscape_trial.html
similarity index 100%
rename from templates/management/_includes/_landscape_trial.html
rename to templates/management/shared/_landscape_trial.html
diff --git a/templates/management/thank-you.html b/templates/management/thank-you.html
index 6f26decaffc..36b326425a8 100755
--- a/templates/management/thank-you.html
+++ b/templates/management/thank-you.html
@@ -3,12 +3,12 @@
 {% block title %}Thank you | Management{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Management" subsection_title="Contact us" page_title="Thank you"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Management" subsection_title="Contact us" page_title="Thank you"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
-{% include "_includes/_thank_you.html" with thanks_context="contacting us about Ubuntu Advantage" %}
-{% include "_includes/_live_chat.html" %}
+{% include "shared/_thank_you.html" with thanks_context="contacting us about Ubuntu Advantage" %}
+{% include "shared/_live_chat.html" %}
 {% endblock content %}
 {% block footer_extra %}
 <!-- Google Code for Services Canonical - contact us Conversion Page -->
diff --git a/templates/management/ubuntu-advantage.html b/templates/management/ubuntu-advantage.html
index 826b7100294..9421a863626 100755
--- a/templates/management/ubuntu-advantage.html
+++ b/templates/management/ubuntu-advantage.html
@@ -7,12 +7,12 @@
 {% block meta_description %}You can access Landscape as a hosted service over the internet or as an application running on a dedicated server behind your firewall. Both options are part of the Ubuntu Advantage service package, however you can try Landscape for free for 30 days, without committing to a subscription. {% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Management" page_title="Ubuntu Advantage" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Management" page_title="Ubuntu Advantage" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
 <div class="row row-hero">
-<h1>Ubuntu Advantage</h1>
+	<h1>Ubuntu Advantage</h1>
 	<div class="eight-col">
 		<p>Ubuntu Advantage is the professional support package from the experts at Canonical, helping organisations around the world to manage their Ubuntu deployments. It includes access to Landscape, the systems management tool <br/>for using Ubuntu at scale, as well as 24/7 telephone support and the option of a dedicated Canonical support engineer on your premises. Ubuntu Advantage subscription tiers are based on the size of your deployment and the support you need.</p>
 
@@ -24,120 +24,296 @@ <h1>Ubuntu Advantage</h1>
 
 </div><!-- .row row-hero -->
 
-<div class="row row-quote">
-	<blockquote class="pull-quote" cite="http://www.guardian.co.uk/technology/blog/2009/oct/27/ubuntu-koala-windows7-review">
-		<p><span>&ldquo;</span>We worked very closely with Canonical. Their support has been invaluable in the development, deployment and support phases of the project.&nbsp;&nbsp;<span>&rdquo;</span></p>
-		<p><cite>Antonio Jos&eacute; S&aacute;enz Alban&eacute;s, Chief Technology Officer, Isotrol</cite></p>
-	</blockquote>
+{% include "shared/_ubuntu_advantage_whats_inlcuded.html" %}
 
-</div>
-
-<div class="row row-grey row-desktop-management row-management">
-	<div class="four-col product-intro">
-		<div class="four-col text-center">
-			<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-desktop-orange.svg" width="90" height="90" alt="" />
+<div class="row row-grey row-cloud-management row-management">
+	<div class="twelve-col">
+		<div class="seven-col product-intro">
+			<h2>Cloud management</h2>
+			<p>Ubuntu Advantage offers support and management tools to keep your business productive in the cloud.</p>
+			<p><a href="/cloud/management">Learn more&nbsp;&rsaquo;</a></p>
 		</div>
-		<h2>Desktop management</h2>
-		<p>From basic office tasks to complex development work, Ubuntu Advantage gives your organisation all the support you need to deploy and manage Ubuntu.</p>
-		<p><a href="/desktop/management">Learn more&nbsp;&rsaquo;</a></p>
+		<div class="prepend-two two-col text-center priority-0">
+			<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-cloud-darkaubergine.svg" alt="" />
+		</div>
+	</div>
+	<table class="audience-enterprise">
+		<thead>
+			<tr>
+				<th scope="col" class="row-title">&nbsp;</th>
+				<th scope="col">Small</th>
+				<th scope="col">Medium</th>
+				<th scope="col">Large</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<th>Physcial nodes</th>
+				<td>Up to 100 nodes.</td>
+				<td>From 100 to 500 nodes.</td>
+				<td>More than 500 nodes.</td>
+			</tr>
+			<tr>
+				<th>Infrastructure 24/7 support</th>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+			</tr>
+			<tr>
+				<th>Landscape Dedicated Server</th>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+			</tr>
+			<tr>
+				<th>Unlimited supported Ubuntu guests*</th>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+			</tr>
+			<tr>
+				<th>Ceph storage included</th>
+				<td>64TB</td>
+				<td>64TB</td>
+				<td>64TB</td>
+			</tr>
+			<tr>
+				<th>Price per year per availability zone</th>
+				<td>USD $75,000</td>
+				<td>USD $180,000</td>
+				<td>USD $350,000</td>
+			</tr>
+		</tbody>
+	</table>
+	<p>*Support for guests is limited to office hours, but can be upgraded to 24/7</p>
+
+	<h3>Service-level agreement for all cloud plans</h3>
+	<div class="six-col">
+		<table class="audience-enterprise">
+			<thead>
+				<tr>
+					<th colspan="2" scope="col">Response times</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<td>Severity 1</td>
+					<td>1 hour</td>
+				</tr>
+				<tr>
+					<td>Severity 2</td>
+					<td>4 hours</td>
+				</tr>
+				<tr>
+					<td>Severity 3</td>
+					<td>4 hours</td>
+				</tr>
+				<tr>
+					<td>Severity 4</td>
+					<td>1 business day</td>
+				</tr>
+			</tbody>
+		</table>
 	</div>
-	<div class="eight-col equal-height last-col box">
-		<ul class="no-bullets vertical-divider three-divided no-margin-bottom">
-			<!--<li class="col">
-				<h3>Stateless</h3>
-				<p>For lightweight business use that only requires stateless applications like web browser and remote access client (Citrix, VMware View).</p>
-				<div class="price">
-					<p><span>$20</span> per desktop</p>
-				</div>
-			</li>-->
-			<li class="four-col">
-				<h3>Standard</h3>
-				<p>For general business use such as email, messaging and web browsing.</p>
-				<div class="price">
-					<p><span>$105</span> desktop per year</p>
-				</div>
-			</li>
-			<li class="four-col last-col">
-				<h3>Advanced</h3>
-				<p>For more intensive desktop usage, such as work conducted by developers.</p>
-				<div class="price">
-					<p><span>$165</span> desktop per year</p>
-				</div>
-			</li>
-		</ul>
+	<div class="six-col last-col">
+		<table class="audience-enterprise">
+			<thead>
+				<tr>
+					<th colspan="2" scope="col">Cloud SLA</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr>
+					<td>Hours of support</td>
+					<td>24/07</td>
+				</tr>
+				<tr>
+					<td>Number of cases</td>
+					<td>Unlimited</td>
+				</tr>
+				<tr>
+					<td>Support channels</td>
+					<td>Phone and online</td>
+				</tr>
+			</tbody>
+		</table>
 	</div>
 </div><!-- .row -->
 
 <div class="row row-grey row-server-management row-management">
-	<div class="four-col product-intro">
-		<div class="four-col text-center">
-			<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-server-warmgrey.svg" width="90" height="90" alt="" />
+	<div class="twelve-col">
+		<div class="seven-col product-intro">
+			<h2>Server management</h2>
+			<p>Whether it&rsquo;s for basic server workloads or high-availability clustering, Ubuntu Advantage has you covered.</p>
+			<p><a href="/server/management">Learn more&nbsp;&rsaquo;</a></p>
+		</div>
+		<div class="prepend-two two-col text-center priority-0">
+			<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-server-warmgrey.svg" alt="" />
 		</div>
-		<h2>Server management</h2>
-		<p>Whether it&rsquo;s for basic server workloads or high-availability clustering, Ubuntu Advantage has you covered.</p>
-		<p><a href="/server/management">Learn more&nbsp;&rsaquo;</a></p>
-	</div>
-	<div class="eight-col equal-height last-col box">
-		<ul class="no-bullets vertical-divider three-divided no-margin-bottom">
-			<li class="col">
-				<h3>Essential</h3>
-				<p>Ideal for common workloads such as file and print, email, network, web and application serving.</p>
-				<div class="price">
-					<p><span>$320</span> server per year</p>
-				</div>
-			</li>
-			<li class="col">
-				<h3>Standard</h3>
-				<p>Suitable for server virtualisation and integration into existing infrastructures such as Windows networks.</p>
-				<div class="price">
-					<p><span>$700</span> server per year</p>
-				</div>
-			</li>
-			<li class="col last-col">
-				<h3>Advanced</h3>
-				<p>Tailored for more advanced configurations such as high-availability failover and clustering.</p>
-				<div class="price">
-					<p><span>$1,200</span> server per year</p>
-				</div>
-			</li>
-		</ul>
 	</div>
+	<table class="audience-enterprise">
+		<thead>
+			<tr>
+				<th scope="col" class="row-title">Features</th>
+				<th scope="col">Essential</th>
+				<th scope="col">Standard</th>
+				<th scope="col">Advanced</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td></td>
+				<td>Ideal for common workloads such as file and print, email, network, web and application serving.</td>
+				<td>Suitable for server virtualisation and integration into existing infrastructures such as Windows networks.</td>
+				<td>Tailored for more advanced configurations such as high-availability failover and clustering.</td>
+			</tr>
+			<tr>
+				<th>Landscape Hosted Edition</th>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+			</tr>
+			<tr>
+				<th>Landscape Dedicated Server</th>
+				<td>Optional</td>
+				<td>Optional</td>
+				<td>Optional</td>
+			</tr>
+			<tr>
+				<th>Ubuntu Legal Assurance programme</th>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+			</tr>
+			<tr>
+				<th>Knowledge Base</th>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+			</tr>
+			<tr>
+				<th>Basic installation and applications</th>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+			</tr>
+			<tr>
+				<th>Windows integration</th>
+				<td>&nbsp;</td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+			</tr>
+			<tr>
+				<th>Virtualisation</th>
+				<td>&nbsp;</td>
+				<td>&nbsp;</td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+			</tr>
+			<tr>
+				<th>Clustering and high availability failover</th>
+				<td>&nbsp;</td>
+				<td>&nbsp;</td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+			</tr>
+			<tr>
+				<th>Ceph support</th>
+				<td>&nbsp;</td>
+				<td>Optional</td>
+				<td>Optional</td>
+			</tr>
+			<tr>
+				<th>Technical Account Manager</th>
+				<td>Optional</td>
+				<td>Optional</td>
+				<td>Optional</td>
+			</tr>
+			<tr>
+				<th>Price per server per year</th>
+				<td>USD $320</td>
+				<td>USD $700</td>
+				<td>USD $1,200</td>
+			</tr>
+		</tbody>
+	</table>
 </div><!-- .row -->
 
-<div class="row row-grey row-cloud-management row-management">
-	<div class="four-col product-intro">
-		<div class="four-col text-center">
-			<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-cloud-darkaubergine.svg" width="90" height="90" alt="" />
+<div class="row row-grey row-desktop-management row-management">
+	<div class="twelve-col">
+		<div class="seven-col product-intro">
+			<h2>Desktop management</h2>
+			<p>From basic office tasks to complex development work, Ubuntu Advantage gives your organisation all the support you need to deploy and manage Ubuntu.</p>
+			<p><a href="/desktop/management">Learn more&nbsp;&rsaquo;</a></p>
+		</div>
+		<div class="prepend-two two-col text-center priority-0">
+			<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-desktop-orange.svg"  alt="" />
 		</div>
-		<h2>Cloud management</h2>
-		<p>Ubuntu Advantage offers support and management tools to keep your business productive in the cloud.</p>
-		<p><a href="/cloud/management">Learn more&nbsp;&rsaquo;</a></p>
-	</div>
-	<div class="eight-col equal-height last-col box">
-		<ul class="no-bullets vertical-divider three-divided no-margin-bottom">
-			<li class="col">
-				<h3>Small</h3>
-				<p>For clouds running up to 100 nodes.</p>
-				<div class="price">
-					<p><span>&dollar;75,000</span> per year per availability zone</p>
-				</div>
-			</li>
-			<li class="col">
-				<h3>Medium</h3>
-				<p>For clouds running between 100 and 500 nodes.</p>
-				<div class="price">
-					<p><span>&dollar;180,000</span> per year per availability zone</p>
-				</div>
-			</li>
-			<li class="col last-col">
-				<h3>Large</h3>
-				<p>For clouds running more than 500 nodes.</p>
-				<div class="price">
-					<p><span>&dollar;350,000</span> per year per availability zone</p>
-				</div>
-			</li>
-		</ul>
 	</div>
+	<table class="audience-enterprise">
+		<thead>
+			<tr>
+				<th scope="col" class="row-title">Features</th>
+				<th scope="col">Standard</th>
+				<th scope="col">Advanced</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td></td>
+				<td>For general business use such as email, messaging and web browsing.</td>
+				<td>For more intensive desktop usage, such as work conducted by developers.</td>
+			</tr>
+			<tr>
+				<th>Landscape Hosted Edition</th>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+			</tr>
+			<tr>
+				<th>Landscape Dedicated Server</th>
+				<td>Optional</td>
+				<td>Optional</td>
+			</tr>
+			<tr>
+				<th>Ubuntu Legal Assurance programme</th>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+			</tr>
+			<tr>
+				<th>Knowledge Base</th>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+			</tr>
+			<tr>
+				<th>Basic installation and applications</th>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+			</tr>
+			<tr>
+				<th>Installation, applications and systems administration support</th>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+			</tr>
+			<tr>
+				<th>Desktop virtualisation</th>
+				<td></td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+			</tr>
+			<tr>
+				<th>Developer tools</th>
+				<td></td>
+				<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes" /></td>
+			</tr>
+			<tr>
+				<th>Premium Service Engineer</th>
+				<td>Optional</td>
+				<td>Optional</td>
+			</tr>
+			<tr>
+				<th>Price per desktop per year</th>
+				<td>USD $105</td>
+				<td>USD $165</td>
+			</tr>
+		</tbody>
+	</table>
 </div><!-- .row -->
 
 <div class="row no-border">
@@ -153,7 +329,7 @@ <h2>Dedicated server available</h2>
 	<p class="twelve-col"><a href="/management/working-with-landscape">Find out more about working with Landscape&nbsp;&rsaquo;</a></p>
 </div><!-- /.row -->
 
-{% include "_includes/_live_chat.html" %}
+{% include "shared/_live_chat.html" %}
 
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/management/working-with-landscape.html b/templates/management/working-with-landscape.html
index 54aaa6fe68a..2100b416b0f 100755
--- a/templates/management/working-with-landscape.html
+++ b/templates/management/working-with-landscape.html
@@ -4,7 +4,7 @@
 {% block extra_body_class %}working-with-landscape{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Management" page_title="Working with landscape"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Management" page_title="Working with landscape"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
@@ -18,18 +18,13 @@ <h1>Working with Landscape</h1>
 
 	<div id="landscape-videos" class="row">
 		<div class="six-col">
-			<div class="video-container">
-				<iframe width="442" height="249" src="http://www.youtube.com/embed/yaFE4g8EcvI?rel=0&amp;showinfo=0" frameborder="0" allowfullscreen></iframe>
-			</div>
 			<h3>Software management in action</h3>
 			<p>In this short demonstration of Landscape in action, we show how quickly updates can be applied to thousands of machines &ndash; and how easy it is to roll back affected systems when an issue arises.</p>
 		</div><!-- /.six-col -->
 		<div class="six-col last-col">
 			<div class="video-container">
-				<iframe width="442" height="249" src="http://www.youtube.com/embed/mSfMn0eWc4A?rel=0&amp;showinfo=0" frameborder="0" allowfullscreen></iframe>
+				<iframe width="442" height="249" src="http://www.youtube.com/embed/yaFE4g8EcvI?rel=0&amp;showinfo=0" frameborder="0" allowfullscreen></iframe>
 			</div>
-			<h3>Bare metal provisioning made easy</h3>
-			<p>Unbox a new consignment of servers, plug them in and attach them to the network &ndash; then let Landscape take over. Here, we show you how quickly Landscape can provision new hardware, from the metal up.</p>
 		</div><!-- /.six-col -->
 	</div><!-- /#landscape-videos -->
 
@@ -98,7 +93,7 @@ <h3>Start using Landscape straight away</h3>
 		</div>
 	</div><!-- /.row -->
 
-{% include "_includes/_live_chat.html" %}
+{% include "shared/_live_chat.html" %}
 
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/partners/_includes/_contextual_footer.html b/templates/partners/_includes/_contextual_footer.html
deleted file mode 100755
index c24710df046..00000000000
--- a/templates/partners/_includes/_contextual_footer.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% if level_2 == 'hp' %}
-		<div class="feature-three four-col">
-			<h3>More information</h3>
-			<ul class="no-bullets">
-				<li><a href="http://www.hp.com/go/ubuntu">More about our relationship with HP&nbsp;&rsaquo;</a></li>
-				<li><a href="http://www.ubuntu.com/sites/default/files/active/pdfs/Brochure-Server-Edition-1004LTS.pdf">More about Ubuntu Server&nbsp;&rsaquo;</a></li>
-			</ul>
-		</div>
-		<div class="feature-four four-col last-col">
-			<h3>Further reading</h3>
-			{% include "_base/_further_reading_links.html" %}
-		</div>
-{% endif %}{% if level_2 != 'hp' %}
-		<div class="feature-four four-col last-col">
-			<h3>Further reading</h3>
-			{% include "_base/_further_reading_links.html" %}
-		</div>
-{% endif %}
\ No newline at end of file
diff --git a/templates/partners/_nav_secondary.html b/templates/partners/_nav_secondary.html
deleted file mode 100755
index 0ac7816a450..00000000000
--- a/templates/partners/_nav_secondary.html
+++ /dev/null
@@ -1,9 +0,0 @@
-	<ul{% if list_class %} class="{{ list_class }}"{% endif %} class="second-level-nav">
-		<li class="first{% if level_1 == 'partners' and not level_2 %} active{% endif %}"><a href="/partners">Overview</a></li>
-		<li class="{% if level_2 == 'find-a-partner' %} active{% endif %}"><a href="/partners/find-a-partner">Find a partner</a></li>
-		<li class="{% if level_2 == 'ubuntu-certified' %} active{% endif %}"><a href="/partners/ubuntu-certified">Ubuntu Certified</a></li>
-		<li class="{% if level_2 == 'partner-programmes' %} active{% endif %}"><a href="/partners/partner-programmes">Partner programmes</a></li>
-		<li class="{% if level_2 == 'partner-services' %} active{% endif %}"><a href="/partners/partner-services">Partner services</a></li>
-		<li class="{% if level_2 == 'backed-by-canonical' %} active{% endif %}"><a href="/partners/backed-by-canonical">Backed by Canonical</a></li>
-		<li class="{% if level_2 == 'contact-us' %} active{% endif %}"><a href="/partners/contact-us">Contact Canonical</a></li>
-	</ul>
\ No newline at end of file
diff --git a/templates/partners/_nav_tertiary.html b/templates/partners/_nav_tertiary.html
deleted file mode 100755
index 3fabbd7c910..00000000000
--- a/templates/partners/_nav_tertiary.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% if level_2 == 'dell' %}
-	<ul class="third-level-nav">
-		<li class="last-item{% if level_3 == 'dellxps' %} active{% endif %}"><a href="/partners/dell/dellxps">Dell XPS</a></li>
-	</ul>
-{% endif %}
-{% if level_2 == 'hp' %}
-	<ul class="third-level-nav">
-		<li class="last-item{% if level_3 == 'moonshot' %} active{% endif %}"><a href="/partners/hp/moonshot">Moonshot</a></li>
-	</ul>
-{% endif %}
-{% if level_2 == 'find-a-partner' %}
-	<ul class="third-level-nav">
-		<li class="{% if level_3 == 'hardware' %} active{% endif %}"><a href="/partners/find-a-partner/hardware">Hardware partners</a></li>
-		<li class="{% if level_3 == 'isv' %} active{% endif %}"><a href="/partners/find-a-partner/isv">ISV partners</a></li>
-		<li class="last-item{% if level_3 == 'reseller' %} active{% endif %}"><a href="/partners/find-a-partner/reseller">Reseller partners</a></li>
-	</ul>
-{% endif %}
-{% if level_2 == 'ubuntu-certified' %}
-	<ul class="third-level-nav">
-		<li class="{% if level_3 == 'software' %} active{% endif %}"><a href="/partners/ubuntu-certified/software">Certified software</a></li>
-		<li><a href="http://www.ubuntu.com/certification/">Certified hardware</a></li>
-		<li><a href="http://www.ubuntu.com/certification/catalog/">Component catalogue</a></li>
-	</ul>
-{% endif %}
diff --git a/templates/partners/arm.html b/templates/partners/arm.html
deleted file mode 100755
index 3ee4e08751d..00000000000
--- a/templates/partners/arm.html
+++ /dev/null
@@ -1,61 +0,0 @@
-{% extends "partners/base_partners.html" %}
-
-{% block title %}ARM and Ubuntu{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Partners" page_title="Arm"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero row-image-centered">
-	<div class="seven-col">
-		<h1>Ubuntu and ARM</h1>
-		<p>ARM and Canonical are working together to deliver ARM processor support for the Ubuntu platform across many different classes of devices.</p>
-		<p>Ubuntu is the best scale-out server platform and the leader in Hyperscale computing for ARM.  Ubuntu is also active in supporting ARM for many other devices.</p>
-	</div><!-- /.six-col -->
-	<span><img src="{{ STATIC_URL }}img/partners/arm/logo-arm.png" alt="ARM logo" class="priority-0" /></span>
-</div><!-- / .row -->
-
-{% include "_includes/_moonshot_promo.html" %}
-
-<div class="row">
-	<h2>ARM architecture</h2>
-	<div>
-		<p>The ARM Instruction Set Architecture (ISA) has rocketed in popularity since the company started licensing its CPU cores in 1990. It has become the de-facto standard for modern digital devices from cell phones to tablets, now shipping in millions of units.</p>
-		<p>ARM is also designing chips for use in servers in enterprise datacentres. In datacentres, multiple ARM-based servers are being deployed in hyperscale computing configurations, supported by the highly-scalable Ubuntu operating system.</p>
-		<p>The popularity of ARM ISA is a result of its high performance coupled with world-beating power efficiency and compelling price-points. </p>
-	</div>
-</div><!-- /.row -->
-<div class="row">
-	<h2>ARM and Canonical working together</h2>
-	<div>
-		<p>Since 2008, ARM and Canonical have worked together to optimise their technologies and enable a range of devices to run efficiently on Ubuntu and ARM architecture. Initial engineering collaboration focused on Cortex A8, A9 and A15-like processors with ARM and Canonical collaborating to ensure ARM architecture support in both Ubuntu and the Linux kernel.</p>
-		<p>This work has led to innovators like Calxeda, Marvell and Texas Instruments to provide specific System on a Chip (SoC) Ubuntu releases.</p>
-		<p>As a founding member of Linaro, Canonical is committed to making this cross industry collaboration successful.</p>
-	</div>
-</div><!-- /.row -->
-<div class="row">
-	<h2>Ubuntu in connected screens</h2>
-	<div>
-		<p>We live in a world of increasingly connected screens. Whether those screens are on smartphones, tablets, or other embedded systems, the processors behind those screens are often ARM-based.</p>
-		<p>Ubuntu is working to support a wide variety of devices based on ARM.</p>
-	</div>
-</div><!-- /.row -->
-
-<div class="row">
-	<h2>Hyperscale solutions</h2>
-	<div>
-		<p>ARM processors are already a key presence in the datacentre, powering devices such as networking routers and storage controllers. With the availability of higher performance, multi-core capable processor cores, the breadth of applications that can be addressed by ARM technologies is growing. Advanced server operating systems are therefore required.</p>
-		<p>ARM and Canonical have worked in close collaboration for a number of years to ensure that datacentres running advanced workloads such as distributed data processing or cloud infrastructure, run best on Ubuntu.</p>
-		<p>In November 2012 Canonical became a founding member of the Linaro Enterprise Group (LEG) which was set up to promote the ecosystem for ARM-based servers. </p>
-	</div>
-</div><!-- /.row -->
-
-<div class="row">
-	<h2>More information</h2>
-	<ul>
-		<li><a href="http://www.google.com/url?q=https%3A%2F%2Fwiki.ubuntu.com%2FARM&amp;sa=D&amp;sntz=1&amp;usg=AFQjCNGI_9PTfhD4fB1twf_rQnH8L9NWig">Ubuntu on ARM community&nbsp;&rsaquo;</a></li>
-		<li><a href="http://www.google.com/url?q=https%3A%2F%2Fwiki.ubuntu.com%2FARMTeam&amp;sa=D&amp;sntz=1&amp;usg=AFQjCNHPWVf_0xoPSqpZq-C-1Y4E6mfBYg">Get involved in the Ubuntu on ARM community&nbsp;&rsaquo;</a></li>
-	</ul>
-</div><!-- /.row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/partners/asus/index.html b/templates/partners/asus/index.html
deleted file mode 100755
index 5cb59d46332..00000000000
--- a/templates/partners/asus/index.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{% extends "partners/base_partners.html" %}
-
-{% block title %}ASUS and Ubuntu{% endblock %}
-
-{% block meta_keywords %}Asus, Ubuntu, Asus X201E, preloaded with Ubuntu, Intel Chief River platform, Intel Celeron Dual-Core 847 Processor , Asus and Canonical, Asus netbooks, Asus notebooks, Asus with Linux, 12.04 LTS, linux computer, linux laptop{% endblock %}
-{% block meta_description %}ASUS computers now come preloaded with Ubuntu. ASUS and Canonical have been working together to bring great performing notebooks, netbooks and All-in-One PCs to consumer and enterprise.{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Partners" page_title="ASUS" tertiary="true" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero row-image-centered">
-	<div class="six-col">
-		<h1>ASUS and Ubuntu</h1>
-		<p>ASUS is a multinational computer manufacturer headquartered in Taipei, Taiwan.  They have been working with Canonical to bring great performing notebooks, netbooks and all in one computers  to consumers and enterprises.</p>
-	</div><!-- /.six-col -->
-	<span><img src="{{ STATIC_URL }}img/third-party-logos/logo-asus-210x43.png" alt="ASUS" /></span>
-</div><!-- / .row -->
-
-<div class="row">
-	<div class="six-col">
-		<h2>ASUS 1015E with Ubuntu 12.04 LTS</h2>
-		<p>The 1015E is a high performing laptop in a compact and light package.  Dual-core processing power, USB 3.0, and Ubuntu&rsquo;s legendary speed ensure it&rsquo;s more than fast enough for email, the web, voice and video calls, or your favourite videos.  Whilst at 2.64lb, and 1&rdquo; thin, it&rsquo;s light and compact enough to fit in your bag, use comfortably at work, at home or anywhere in between.</p>
-		<p><a class="link-cta-ubuntu" href="http://www.amazon.com/ASUS-1015E-DS03-10-1-Inch-Laptop-Black/dp/B00COQK8QY/ref=sr_1_1?ie=UTF8&qid=1380718481&sr=8-1&keywords=1015E+ubuntu" onclick="_gaq.push(['_trackEvent', 'External Link', 'ASUS 1015E', 'From ASUS partner page Buy now link']);">Buy <span class="accessibility-aid">ASUS 1015E </span>now</a></p>
-		<!--<p><a href="/tour/12.04/en/" title="Take the Ubuntu 12.04 LTS Desktop Tour">Take the online tour of the Ubuntu 12.04 LTS desktop&nbsp;&rsaquo;</a></p> -->
-	</div>
-	<div class="six-col last-col">
-		<img src="{{ STATIC_URL }}img/partners/asus-1015e-12.04.jpg" alt="ASUS 1015E" />
-	</div>
-</div><!-- /.row -->
-
-
-
-<div class="row no-border row-image-centered">
-	<div class="six-col">
-		<h2>Certified systems</h2>
-			<p>ASUS and Canonical engineering teams synchronize efforts to ensure that hardware components are compatible with Ubuntu and fully functional.</p>
-			<p>ASUS and Canonical are committed to providing offerings into the market that meet specific needs.  If you are looking for a computer in a specific vertical market &mdash; enterprise, education, health, financial &mdash; you have an increasing number of machines that will be able to fit your needs.</p>
-			<p><a href="http://www.ubuntu.com/certification/desktop/make/Asus/?category=Desktop&amp;category=Laptop&amp;category=Netbook">See all ASUS systems certified by Ubuntu</a></p>
-	</div><!-- /.six-col -->
-	<span>
-		<img src="{{ STATIC_URL }}img/partners/asus/image-certifiedsystems.svg" alt="" />
-	</span><!-- /.six-col -->
-</div><!-- /.row -->
-{% endblock content %}
-{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/partners/backed-by-canonical.html b/templates/partners/backed-by-canonical.html
deleted file mode 100755
index 8a833f5f6a8..00000000000
--- a/templates/partners/backed-by-canonical.html
+++ /dev/null
@@ -1,97 +0,0 @@
-{% extends "partners/base_partners.html" %}
-
-{% block title %}Backed by Canonical | Ubuntu partners{% endblock %}
-
-{% block meta_keywords %}Ubuntu, Unity, Canonical, partner, OEM, ODM, content provider, network operator, silicon vendor, device, phone, smartphone, PC, tablet, TV, cross-platform, ARM, x86, open source, operating system, OS, touch, screen, interface, experience, core, form factor, mobile, carrier{% endblock %}
-{% block meta_description %}OEMs, ODMs, silicon vendors, mobile networks and content providers can partner with Canonical, the company behind Ubuntu, to build their devices. Canonical offers partners a range of enablement services and opportunities to tailor the Ubuntu user experience to their brand. {% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Partners" page_title="Backed by Canonical" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-image-centered">
-	<div class="eight-col">
-		<h1>Backed by Canonical</h1>
-		<p>At Canonical we know Ubuntu inside out; we&rsquo;re the company behind it.</p>
-		<p>Since 2004 we&rsquo;ve marshalled Ubuntu through 20 successful releases.  We have a long history of bringing devices to market - we work with device makers, OEMs, ODMs and mobile network operators every day. And with offices on three continents, we&rsquo;re truly global. </p>
-		<p><a href="/partners/contact-us" class="link-cta-ubuntu">Contact Canonical</a></p>
-	</div>
-	<span>
-		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-canonical.svg" width="200" height="200" alt="Canonical Logo" class="priority-0">
-	</span>
-</div>
-
-<div class="row no-margin">
-	<h2>Get to market faster</h2>
-	<div class="eight-col">
-		<p>You can bring your Ubuntu device to market faster and with less complexity by working with us.  Experts in operating system development and software engineering, we&rsquo;ve worked with brands like Dell, HP, Lenovo and Intel for many years, helping them identify market opportunities, deliver on time and ensured a stunning experience on every device. </p>
-	</div>
-	<div class="twelve-col no-margin-bottom">
-		<img src="{{ STATIC_URL }}img/partners/image-ontheclient.jpg" width="904" height="517" alt="Family of devices">
-	</div>
-</div><!-- / .row -->
-
-<div class="row no-margin row-image-centered row-grey">
-	<span>
-		<img src="{{ STATIC_URL }}img/logos/logo-arm-blue.svg" width="200" alt="ARM">
-	</span>
-	<div class="eight-col">
-		<h2>Experts in Linux on ARM</h2>
-		<p>No other branded Linux distribution can match our presence on the ARM platform.</p>
-		<p>We have been engaged by ARM and their SoC partners since 2008 to enable Ubuntu for the ARM architecture. Canonical was the founding Linux member of Linaro, the consortium set up to promote Linux on ARM and today, we are a world leader in the supply of software for low-energy ARM devices, from smartphones to supercomputers.</p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row no-margin row-image-centered">
-	<div class="eight-col">
-		<h2>Custom engineering, all over the world</h2>
-		<p>Engineering needs differ by market and engagements can be led from the US, Europe or Asia, with local teams accountable for your needs.</p>
-		<p>Our projects cover enablement and certification of components as well as complete systems.  We work with component manufacturers to make sure that drivers are integrated and up-to-date,  that third-party commercial software can be integrated easily, and that Ubuntu can be customised where necessary to meet your needs. </p>
-		<p>You can even omit the Ubuntu UI if you have your own, building your devices with just the industry-standard Ubuntu Core. That way, you&rsquo;ll still enjoy the most popular Linux toolchain, core system libraries, security updates and a huge selection of packages at a very low cost per device.  Whatever the architecture, it&rsquo;s all good on Ubuntu.</p>
-	</div>
-	<span>
-		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-engineering-warmgrey.svg" width="200" height="200" alt="Canonical Logo" class="priority-0">
-	</span>
-</div><!-- / .row -->
-
-<div class="row row-image-centered row-grey">
-	<span>
-		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-upgrade-warmgrey.svg" width="200" height="200" alt="Canonical Logo" class="priority-0">
-	</span>
-	<div class="eight-col">
-		<h2>Keeping your devices secure and up&nbsp;to&nbsp;date</h2>
-		<p>Your long-term competitiveness and security rests on your ability to keep your devices up to date. We have a flawless track record at maintaining a secure and stable OS in the PC sector, which we bring to all our customer engagements.  We take care of all security and critical bug fixes to the base platform and we provide the infrastructure you need for global update management on an ongoing basis.</p>
-		<p>Once in-market, you can add value with solutions to deliver OS updates and app updates.</p>
-		<p>And as your peripheral ecosystem grows, we can work with your manufacturers to ensure that their drivers are incorporated into the Ubuntu platform - and delivered without any adverse effect on the user experience.</p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row no-margin">
-	<div class="five-col">
-	<h2>Nine years and 20 releases &ndash; and all on time</h2>
-		<p>Since its launch in 2004, Ubuntu has kept to a strict six-month release cycle. Every fourth release, including the current one, Ubuntu 14.04, benefits from long-term support (LTS) - which means five years&rsquo; worth of hardware, security and maintenance updates guaranteed, giving business users the confidence to commit to Ubuntu at scale.</p>
-	</div>
-	<div class="seven-col last-col text-center">
-		<div class="releasecycle-image-load" data-width="580" data-src="{{ STATIC_URL }}img/graphs/image-release-cycle{width}.png" data-alt="Ubuntu Desktop release cycle, 5 year long term support"></div>
-		<script>
-		    new Imager('.releasecycle-image-load', {
-		        availableWidths: {
-		            305: '-small',
-		            431: '-medium',
-		            580: '-large'
-		        }
-		    });
-		</script>
-	</div>
-</div><!-- / .row -->
-
-<div class="row no-border">
-	<div class="eight-col">
-		<h2>Content distribution made easy</h2>
-		<p>Global content distribution agreements take time to negotiate and resources to maintain. Canonical has agreements in place with third parties and industry organisations to include codecs for common media formats.</p>
-		<p>We also manage access fees for services that provide channel listings or additional information on the content being viewed.</p>
-		<p>So if you choose to engage with us around an Ubuntu device you can be sure these and other related subscription, royalty and regulatory fees will be covered.</p>
-	</div><!-- /.seven-col -->
-</div><!-- / .row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/partners/base_partners.html b/templates/partners/base_partners.html
deleted file mode 100755
index 614baf51868..00000000000
--- a/templates/partners/base_partners.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{% extends "_base/base.html" %}
-
-{% block outer_content %}
-    {% block content %}{% endblock %}
-		{% include "_base/_contextual_footer.html" %}
-{% endblock %}
diff --git a/templates/partners/contact-us.html b/templates/partners/contact-us.html
deleted file mode 100755
index 7d1f7170b93..00000000000
--- a/templates/partners/contact-us.html
+++ /dev/null
@@ -1,119 +0,0 @@
-{% extends "partners/base_partners.html" %}
-{% block title %}Contact Canonical{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Partners" page_title="Contact us" %}
-{% endblock second_level_nav_items %}
-
-{% block head_extra %}
-	<script type="text/javascript">
-		function fieldValidate(field) {
-		  /* call Mkto.setError(field, message) and return false to mark a field value invalid */
-		  /* return 'skip' to bypass the built-in validations */
-		  return true;
-		}
-		function getRequiredFieldMessage(domElement, label) {
-		  return "This field is required";
-		}
-		function getTelephoneInvalidMessage(domElement, label) {
-		  return "Please enter a valid telephone number";
-		}
-		function getEmailInvalidMessage(domElement, label) {
-		  return "Please enter a valid email address";
-		}
-
-		</script>
-{% endblock %}
-
-{% block content %}
-<div class="row row-hero no-border">
-	<div class="eight-col">
-		<h1>Contact Canonical</h1>
-		<p>Interested in partnering with Canonical? Just fill in the form below and a member of our team will be in touch.</p>
-	</div>
-	<div class="eight-col">
-		<form class="lpeRegForm formNotEmpty" method="post" enctype="application/x-www-form-urlencoded" action="https://app-g.marketo.com/index.php/leadCapture/save" id="mktForm_1015" name="mktForm_1015">
-			<fieldset class="fieldset-1">
-				<h3>About you</h3>
-				<ul class="mktLblLeft">
-					<li class='mktFormReq mktField'><label for="FirstName">First name: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormString mktFReq' name="FirstName" id="FirstName" type='text' value=""  maxlength='255' tabIndex='1' required /><span class='mktFormMsg'></span></span></li>
-					<li class='mktFormReq mktField'><label for="LastName">Last name: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormString mktFReq' name="LastName" id="LastName" type='text' value=""  maxlength='255' tabIndex='2' required /><span class='mktFormMsg'></span></span></li>
-					<li class='mktFormReq mktField'><label for="Email">Email address: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormEmail mktFReq' name="Email" id="Email" type='email' value=""  maxlength='255' tabIndex='3' required /><span class='mktFormMsg'></span></span></li>
-					<li class='mktFormReq mktField'><label for="Phone">Phone number: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormPhone mktFReq' name="Phone" id="Phone" type='tel' value=""  maxlength='255' tabIndex='4' required /><span class='mktFormMsg'></span></span></li>
-				</ul>
-			</fieldset>
-			<fieldset class="fieldset-2">
-				<h3>Your company</h3>
-				<ul class='mktLblLeft'>
-					<li  class='mktFormReq mktField' ><label for="Title">Job title: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormString mktFReq' name="Title" id="Title" type='text' value=""  maxlength='255' tabIndex='5' required /><span class='mktFormMsg'></span></span></li>
-					<li class='mktFormReq mktField' ><label for="Company">Company name: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormString mktFReq' name="Company" id="Company" type='text' value=""  maxlength='255' tabIndex='6' required /><span class='mktFormMsg'></span></span></li>
-					<li  class='mktFormReq mktField' >
-					<label for="Country">Country: <span>*</span></label>
-					<span class="mktInput">
-					<select class='mktFormSelect mktFReq' name="Country" id="Country" size='1'  tabIndex='7' required><option value='' selected='selected'>Select country:</option><option value='AF'>Afghanistan</option><option value='AX'>Åland Islands</option><option value='AL'>Albania</option><option value='DZ'>Algeria</option><option value='AS'>American Samoa</option><option value='AD'>Andorra</option><option value='AO'>Angola</option><option value='AI'>Anguilla</option><option value='AQ'>Antarctica</option><option value='AG'>Antigua and Barbuda</option><option value='AR'>Argentina</option><option value='AM'>Armenia</option><option value='AW'>Aruba</option><option value='AU'>Australia</option><option value='AT'>Austria</option><option value='AZ'>Azerbaijan</option><option value='BS'>Bahamas</option><option value='BH'>Bahrain</option><option value='BD'>Bangladesh</option><option value='BB'>Barbados</option><option value='BY'>Belarus</option><option value='BE'>Belgium</option><option value='BZ'>Belize</option><option value='BJ'>Benin</option><option value='BM'>Bermuda</option><option value='BT'>Bhutan</option><option value='BO'>Bolivia</option><option value='BA'>Bosnia and Herzegovina</option><option value='BW'>Botswana</option><option value='BV'>Bouvet Island</option><option value='BR'>Brazil</option><option value='IO'>British Indian Ocean Territory</option><option value='BN'>Brunei Darussalam</option><option value='BG'>Bulgaria</option><option value='BF'>Burkina Faso</option><option value='BI'>Burundi</option><option value='KH'>Cambodia</option><option value='CM'>Cameroon</option><option value='CA'>Canada</option><option value='CV'>Cape Verde</option><option value='KY'>Cayman Islands</option><option value='CF'>Central African Republic</option><option value='TD'>Chad</option><option value='CL'>Chile</option><option value='CN'>China</option><option value='CX'>Christmas Island</option><option value='CC'>Cocos (Keeling) Islands</option><option value='CO'>Colombia</option><option value='KM'>Comoros</option><option value='CG'>Congo</option><option value='CD'>Congo (The Democratic Republic of the)</option><option value='CK'>Cook Islands</option><option value='CR'>Costa Rica</option><option value='CI'>Côte D&amp;#039;Ivoire</option><option value='HR'>Croatia</option><option value='CU'>Cuba</option><option value='CY'>Cyprus</option><option value='CZ'>Czech Republic</option><option value='DK'>Denmark</option><option value='DJ'>Djibouti</option><option value='DM'>Dominica</option><option value='DO'>Dominican Republic</option><option value='EC'>Ecuador</option><option value='EG'>Egypt</option><option value='SV'>El Salvador</option><option value='GQ'>Equatorial Guinea</option><option value='ER'>Eritrea</option><option value='EE'>Estonia</option><option value='ET'>Ethiopia</option><option value='FK'>Falkland Islands (Malvinas)</option><option value='FO'>Faroe Islands</option><option value='FJ'>Fiji</option><option value='FI'>Finland</option><option value='FR'>France</option><option value='GF'>French Guiana</option><option value='PF'>French Polynesia</option><option value='TF'>French Southern Territories</option><option value='GA'>Gabon</option><option value='GM'>Gambia</option><option value='GE'>Georgia</option><option value='DE'>Germany</option><option value='GH'>Ghana</option><option value='GI'>Gibraltar</option><option value='GR'>Greece</option><option value='GL'>Greenland</option><option value='GD'>Grenada</option><option value='GP'>Guadeloupe</option><option value='GU'>Guam</option><option value='GT'>Guatemala</option><option value='GG'>Guernsey</option><option value='GN'>Guinea</option><option value='GW'>Guinea-Bissau</option><option value='GY'>Guyana</option><option value='HT'>Haiti</option><option value='HM'>Heard Island and McDonald Islands</option><option value='HN'>Honduras</option><option value='HK'>Hong Kong</option><option value='HU'>Hungary</option><option value='IS'>Iceland</option><option value='IN'>India</option><option value='ID'>Indonesia</option><option value='IR'>Iran (Islamic Republic of)</option><option value='IQ'>Iraq</option><option value='IE'>Ireland</option><option value='IM'>Isle of Man</option><option value='IL'>Israel</option><option value='IT'>Italy</option><option value='JM'>Jamaica</option><option value='JP'>Japan</option><option value='JE'>Jersey</option><option value='JO'>Jordan</option><option value='KZ'>Kazakhstan</option><option value='KE'>Kenya</option><option value='KI'>Kiribati</option><option value='KP'>Korea (Democratic People&amp;#039;s Republic of)</option><option value='KR'>Korea (Republic of)</option><option value='KW'>Kuwait</option><option value='KG'>Kyrgyzstan</option><option value='LA'>Lao People&amp;#039;s Democratic Republic</option><option value='LV'>Latvia</option><option value='LB'>Lebanon</option><option value='LS'>Lesotho</option><option value='LR'>Liberia</option><option value='LY'>Libyan Arab Jamahiriya</option><option value='LI'>Liechtenstein</option><option value='LT'>Lithuania</option><option value='LU'>Luxembourg</option><option value='MO'>Macao</option><option value='MK'>Macedonia (The Former Yugoslav Republic of)</option><option value='MG'>Madagascar</option><option value='MW'>Malawi</option><option value='MY'>Malaysia</option><option value='MV'>Maldives</option><option value='ML'>Mali</option><option value='MT'>Malta</option><option value='MH'>Marshall Islands</option><option value='MQ'>Martinique</option><option value='MR'>Mauritania</option><option value='MU'>Mauritius</option><option value='YT'>Mayotte</option><option value='MX'>Mexico</option><option value='FM'>Micronesia (Federated States of)</option><option value='MD'>Moldova (Republic of)</option><option value='MC'>Monaco</option><option value='MN'>Mongolia</option><option value='ME'>Montenegro</option><option value='MS'>Montserrat</option><option value='MA'>Morocco</option><option value='MZ'>Mozambique</option><option value='MM'>Myanmar</option><option value='NA'>Namibia</option><option value='NR'>Nauru</option><option value='NP'>Nepal</option><option value='NL'>Netherlands</option><option value='AN'>Netherlands Antilles</option><option value='NC'>New Caledonia</option><option value='NZ'>New Zealand</option><option value='NI'>Nicaragua</option><option value='NE'>Niger</option><option value='NG'>Nigeria</option><option value='NU'>Niue</option><option value='NF'>Norfolk Island</option><option value='MP'>Northern Mariana Islands</option><option value='NO'>Norway</option><option value='OM'>Oman</option><option value='PK'>Pakistan</option><option value='PW'>Palau</option><option value='PS'>Palestinian Territory (Occupied)</option><option value='PA'>Panama</option><option value='PG'>Papua New Guinea</option><option value='PY'>Paraguay</option><option value='PE'>Peru</option><option value='PH'>Philippines</option><option value='PN'>Pitcairn</option><option value='PL'>Poland</option><option value='PT'>Portugal</option><option value='PR'>Puerto Rico</option><option value='QA'>Qatar</option><option value='RE'>Réunion</option><option value='RO'>Romania</option><option value='RU'>Russian Federation</option><option value='RW'>Rwanda</option><option value='BL'>Saint Barthélemy</option><option value='SH'>Saint Helena</option><option value='KN'>Saint Kitts and Nevis</option><option value='LC'>Saint Lucia</option><option value='MF'>Saint Martin</option><option value='PM'>Saint Pierre and Miquelon</option><option value='VC'>Saint Vincent and The Grenadines</option><option value='WS'>Samoa</option><option value='SM'>San Marino</option><option value='ST'>Sao Tome and Principe</option><option value='SA'>Saudi Arabia</option><option value='SN'>Senegal</option><option value='RS'>Serbia</option><option value='SC'>Seychelles</option><option value='SL'>Sierra Leone</option><option value='SG'>Singapore</option><option value='SK'>Slovakia</option><option value='SI'>Slovenia</option><option value='SB'>Solomon Islands</option><option value='SO'>Somalia</option><option value='ZA'>South Africa</option><option value='GS'>South Georgia and the South Sandwich Islands</option><option value='ES'>Spain</option><option value='LK'>Sri Lanka</option><option value='SD'>Sudan</option><option value='SR'>Suriname</option><option value='SJ'>Svalbard and Jan Mayen</option><option value='SZ'>Swaziland</option><option value='SE'>Sweden</option><option value='CH'>Switzerland</option><option value='SY'>Syrian Arab Republic</option><option value='TW'>Taiwan</option><option value='TJ'>Tajikistan</option><option value='TZ'>Tanzania</option><option value='TH'>Thailand</option><option value='TL'>Timor-Leste</option><option value='TG'>Togo</option><option value='TK'>Tokelau</option><option value='TO'>Tonga</option><option value='TT'>Trinidad and Tobago</option><option value='TN'>Tunisia</option><option value='TR'>Turkey</option><option value='TM'>Turkmenistan</option><option value='TC'>Turks and Caicos Islands</option><option value='TV'>Tuvalu</option><option value='UG'>Uganda</option><option value='UA'>Ukraine</option><option value='AE'>United Arab Emirates</option><option value='GB'>United Kingdom</option><option value='US'>United States</option><option value='UM'>United States Minor Outlying Islands</option><option value='UY'>Uruguay</option><option value='UZ'>Uzbekistan</option><option value='VU'>Vanuatu</option><option value='VA'>Vatican City State (Holy See)</option><option value='VE'>Venezuela (Bolivarian Republic of)</option><option value='VN'>Viet Nam</option><option value='VG'>Virgin Islands (British)</option><option value='VI'>Virgin Islands (U.S.)</option><option value='WF'>Wallis and Futuna</option><option value='EH'>Western Sahara</option><option value='YE'>Yemen</option><option value='ZM'>Zambia</option><option value='ZW'>Zimbabwe</option><option value=''></option></select>
-					<span class='mktFormMsg'></span>
-					</span>
-					</li>
-					<li  class='mktFormReq mktField' >
-					<label for="State">State:</label><span class='mktInput'>
-					<select class='mktFormSelect mktFReq' name="State" id="State" size='1' tabIndex='8'><option value='' selected='selected' required>Select Province</option><option value='AB'>Alberta</option><option value='BC'>British Columbia</option><option value='MB'>Manitoba</option><option value='NB'>New Brunswick</option><option value='NF'>Newfoundland</option><option value='NT'>Northwest Territories</option><option value='NS'>Nova Scotia</option><option value='NU'>Nunavut</option><option value='ON'>Ontario</option><option value='PE'>Prince Edward Island</option><option value='QC'>Quebec</option><option value='SK'>Saskatchewan</option><option value='YT'>Yukon Territory</option><option value='SelectState'>Select State</option><option value='AK'>Alaska</option><option value='AL'>Alabama</option><option value='AR'>Arkansas</option><option value='AZ'>Arizona</option><option value='CA'>California</option><option value='CO'>Colorado</option><option value='CT'>Connecticut</option><option value='DC'>District of Columbia</option><option value='DE'>Delaware</option><option value='FL'>Florida</option><option value='GA'>Georgia</option><option value='HI'>Hawaii</option><option value='IA'>Iowa</option><option value='ID'>Idaho</option><option value='IL'>Illinois</option><option value='IN'>Indiana</option><option value='KS'>Kansas</option><option value='KY'>Kentucky</option><option value='LA'>Louisiana</option><option value='MA'>Massachusetts</option><option value='MD'>Maryland</option><option value='ME'>Maine</option><option value='MI'>Michigan</option><option value='MN'>Minnesota</option><option value='MO'>Missouri</option><option value='MS'>Mississippi</option><option value='MT'>Montana</option><option value='NC'>North Carolina</option><option value='ND'>North Dakota</option><option value='NE'>Nebraska</option><option value='NH'>New Hampshire</option><option value='NJ'>New Jersey</option><option value='NM'>New Mexico</option><option value='NV'>Nevada</option><option value='NY'>New York</option><option value='OH'>Ohio</option><option value='OK'>Oklahoma</option><option value='OR'>Oregon</option><option value='PA'>Pennsylvania</option><option value='PR'>Puerto Rico</option><option value='RI'>Rhode Island</option><option value='SC'>South Carolina</option><option value='SD'>South Dakota</option><option value='TN'>Tennessee</option><option value='TX'>Texas</option><option value='UT'>Utah</option><option value='VA'>Virginia</option><option value='VT'>Vermont</option><option value='WA'>Washington</option><option value='WI'>Wisconsin</option><option value='WV'>West Virginia</option><option value='WY'>Wyoming</option></select>
-					<span class='mktFormMsg'></span>
-					</span>
-					</li>
-				</ul>
-			</fieldset>
-			<fieldset class="fieldset-3">
-				<h3>Partner programme</h3>
-				<ul class='mktLblLeft'>
-					<li class='mktFormReq mktField' ><label for="partner_tier__c">Applying for:</label><span class='mktInput'>
-					<select class='mktFormSelect mktFReq' name="partner_tier__c" id="partner_tier__c" size='1'  tabIndex='9' required>
-					<option value='' selected='selected'>-- Select --</option><option value='OEM'>OEM</option><option value='ODM'>ODM</option><option value='ISV'>Software (ISV)</option><option value='IHV'>Hardware (IHV)</option><option value='SI'>Channel Partner / SI</option><option value='Cloud'>Cloud ecosystem partner</option><option value="UOIL">Ubuntu OpenStack Interoperability partner</option><option value='Other'>Other</option></select><span class='mktFormMsg'></span></span></li>
-					<li class='mktField' ><label for="Opportunity Partnering With Canonical">Please tell us more about the server/cloud, desktop/client, or mobile opportunity that you see in partnering with Canonical:</label><span class='mktInput'><textarea class='mktFormTextarea mktFormTextarea mktFReq' name="Comments_from_lead__c" id="Comments_from_lead__c" cols='30' rows='4' tabIndex='13'></textarea><span class='mktFormMsg'></span></span></li>
-					<li class="mktField mktLblRight"><span class="mktInput mktLblRight"><input id="NewsletterOpt-In" class="mktFormCheckbox" type="checkbox" tabindex="20" value="1" name="NewsletterOpt-In" /><label for="NewsletterOpt-In">I would like to receive the latest news from Canonical. My details will be handled in accordance with the <a href="/legal">privacy policy</a>.</label><span class="mktFormMsg"></span></span></li>
-					<li id="mktFrmButtons"><!--<label>&nbsp;</label>--><input id="mktFrmSubmit" type="submit" value="Submit" name="submitButton" tabindex="17" onclick="formSubmit(document.getElementById(&quot;mktForm_1069&quot;)); return false;">&nbsp;<input style="display: none;" id="mktFrmReset" type="reset" value="Clear" name="resetButton" onclick="formReset(document.getElementById(&quot;mktForm_1069&quot;)); return false;"></li>
-				</ul>
-			</fieldset>
-			<span style="display: none;"><input type="text" name="_marketo_comments" value="" /></span>
-			<input type="hidden" name="lpId" value="461" />
-			<input type="hidden" name="subId" value="30" />
-			<input type="hidden" name="kw" value="" />
-			<input type="hidden" name="cr" value="" />
-			<input type="hidden" name="searchstr" value="" />
-			<input type="hidden" name="lpurl" value="https://pages.canonical.com/CloudContactUsForm_CloudContactUsPage.html?cr={creative}&amp;kw={keyword}" />
-			<input type="hidden" name="formid" value="1015" />
-			<input type="hidden" name="returnURL" value="http://www.ubuntu.com/partners/thank-you" />
-			<input type="hidden" name="retURL" value="http://www.ubuntu.com/partners/thank-you" />
-			<input type="hidden" name="_mkt_disp" value="return" />
-			<input type="hidden" name="_mkt_trk" value="id:066-EOV-335&amp;token:_mch-canonical.com-1309526398517-17880" />
-		</form>
-	</div><!-- /.eight-col -->
-</div><!-- /.row -->
-
-<script type="text/javascript" src="http://www.ubuntu.com/misc/jquery.js"></script>
-<script type="text/javascript" src="https://pages.canonical.com/js/mktFormSupport.js"></script>
-<script type="text/javascript" src="https://pages.canonical.com/js/public/stateCountry.js"></script>
-<script type="text/javascript">
-// Prevent Marketo prefill from turning these dropdowns into free text fields if value is not ISO standard
-if ((typeof mktoPreFillFields != 'undefined') &&
-    (mktoPreFillFields) &&
-    mktoPreFillFields['State'] &&
-    mktoPreFillFields['Country']) {
-    if (mktoPreFillFields.Country.length != 2) {
-        mktoPreFillFields.Country = "";
-        mktoPreFillFields.State = "";
-    }
-}
-</script>
-
-		<script type="text/javascript">
-			function formSubmit(elt) {
-				console.log(elt);
-				return Mkto.formSubmit(elt);
-			}
-			function formReset(elt) {
-				return Mkto.formReset(elt);
-			}
-		</script>
-
-{% endblock content %}
-{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/partners/dell/dellxps.html b/templates/partners/dell/dellxps.html
deleted file mode 100755
index 651e07b3953..00000000000
--- a/templates/partners/dell/dellxps.html
+++ /dev/null
@@ -1,74 +0,0 @@
-{% extends "partners/base_partners.html" %}
-
-{% block title %}Dell XPS 13 Developer Edition - with Ubuntu 12.04 LTS{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Partners" subsection_title="Dell" page_title="Dell XPS"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-border">
-	<h1>Dell XPS 13 Developer Edition, <br/>with Ubuntu 12.04 LTS</h1>
-	<div class="six-col">
-		<p>Based on the extraordinary award-winning machine. Designed with strength in form and beauty in function.</p>
-		<p>Now with with <strong>Full High Definition (FHD) display</strong> for superb graphics and performance.</p>
-		<p>With Ubuntu 12.04 LTS preloaded, the Dell XPS 13 is perfect for developers and anyone who wants high speed, brilliant graphics and smart design.</p>
-	</div><!-- /.six-col -->
-	<div class="six-col last-col">
-		<img src="{{ STATIC_URL }}img/homepage/dell_sputnik.png" alt="Ubuntu running on a Dell Sputnik machine" />
-	</div>
-</div>
-<div class="row">
-	<div class="twelve-col">
-		<h2>Tech specs</h2>
-		<ul class="list-ubuntu combined-list">
-		  	<li class="six-col">Full HD 1080p display</li>
-		    <li class="six-col last-col">256GB Solid State Drive</li>
-		    <li class="six-col">3rd Gen Intel&reg; Core i7 processor</li>
-		    <li class="six-col last-col">Intel HD 4000 Graphics</li>
-		    <li class="six-col">8GB dual channel DDR3L 1600MHz on board <br />system memory</li>
-		    <li class="six-col last-col">Razor-thin 6&ndash;18mm (0.24" &ndash; 0.71") profile and weight of 1.36kg (2.99 lbs.)</li>
-		    <li class="six-col last-item">Stunning 13.3&rdquo; edge&ndash;to&ndash;edge display with durable Gorilla Glass designed for brilliant visuals in a compact body similar to an 11&rdquo; laptop</li>
-		    <li class="six-col last-col">Ports and connectors: USB 3.0 (2) &ndash; one with PowerShare; mini DisplayPort (1);  Headset Jack (1)</li>
-		</ul>
-		<!-- <p class="note clear">Dell XPS 13 Ultrabook (TM) was voted best Ultrabook (TM) by PC World along with 32 additional awards across 15 countries.</p> -->
-	</div><!-- /.twelve-col -->
-</div><!-- / .row -->
-
-<div class="row clearfix no-border">
-	<div id="dell-buy-now">
-	<h2>Buy now from Dell</h2>
-			<ul class="list twelve-col">
-				<li class="three-col"><a href="http://www.dell.at/linuxentwickler" onclick="_gaq.push(['_trackEvent', 'External Link', 'Dell XPS Austria', 'From Dell XPS page']);">Austria&nbsp;&rsaquo;</a></li>
-				<li class="three-col"><a href="http://www.dell.be/developpeurs" onclick="_gaq.push(['_trackEvent', 'External Link', 'Dell XPS Belgium (French)', 'From Dell XPS page']);">Belgium (French)&nbsp;&rsaquo;</a></li>
-				<li class="three-col"><a href="http://www.dell.be/ontwikkelaars/linux" onclick="_gaq.push(['_trackEvent', 'External Link', 'Dell XPS Belgium (Dutch)', 'From Dell XPS page']);">Belgium (Dutch)&nbsp;&rsaquo;</a></li>
-				<li class="three-col last-col"><a href="http://www.dell.com/us/soho/p/xps-13-linux/pd" onclick="_gaq.push(['_trackEvent', 'External Link', 'Dell XPS USA', 'From Dell XPS page']);">USA&nbsp;&rsaquo;</a></li>
-				<li class="three-col"><a href="http://www.dell.dk/udviklere/linux" onclick="_gaq.push(['_trackEvent', 'External Link', 'Dell XPS Denmark', 'From Dell XPS page']);">Denmark&nbsp;&rsaquo;</a></li>
-				<li class="three-col"><a href="http://www.dell.fr/developpeurs" onclick="_gaq.push(['_trackEvent', 'External Link', 'Dell XPS France', 'From Dell XPS page']);">France&nbsp;&rsaquo;</a></li>
-				<li class="three-col"><a href="http://www.dell.de/linuxentwickler" onclick="_gaq.push(['_trackEvent', 'External Link', 'Dell XPS Germany', 'From Dell XPS page']);">Germany&nbsp;&rsaquo;</a></li>
-				<li class="three-col last-col"><a href="http://www.dell.ie/developers" onclick="_gaq.push(['_trackEvent', 'External Link', 'Dell XPS Ireland', 'From Dell XPS page']);">Ireland&nbsp;&rsaquo;</a></li>
-				<li class="three-col"><a href="http://www.dell.it/developers/linux" onclick="_gaq.push(['_trackEvent', 'External Link', 'Dell XPS Italy', 'From Dell XPS page']);">Italy&nbsp;&rsaquo;</a></li>
-				<li class="three-col"><a href="http://www.dell.nl/ontwikkelaars/linux" onclick="_gaq.push(['_trackEvent', 'External Link', 'Dell XPS Netherlands', 'From Dell XPS page']);">The Netherlands&nbsp;&rsaquo;</a></li>
-				<li class="three-col"><a href="http://www.dell.es/developers/" onclick="_gaq.push(['_trackEvent', 'External Link', 'Dell XPS Spain', 'From Dell XPS page']);">Spain&nbsp;&rsaquo;</a></li>
-				<li class="three-col last-col"><a href="http://www.dell.se/utvecklare/linux" onclick="_gaq.push(['_trackEvent', 'External Link', 'Dell XPS Sweden', 'From Dell XPS page']);">Sweden&nbsp;&rsaquo;</a></li>
-				<li class="three-col"><a href="http://www.dell.ch/developpeurs" onclick="_gaq.push(['_trackEvent', 'External Link', 'Dell XPS Switzerland (French)', 'From Dell XPS page']);">Switzerland (French)&nbsp;&rsaquo;</a></li>
-				<li class="three-col"><a href="http://www.dell.ch/linuxentwickler" onclick="_gaq.push(['_trackEvent', 'External Link', 'Dell XPS Switzerland (German)', 'From Dell XPS page']);">Switzerland (German)&nbsp;&rsaquo;</a></li>
-				<li class="three-col"><a href="http://www.dell.co.uk/developers" onclick="_gaq.push(['_trackEvent', 'External Link', 'Dell XPS UK', 'From Dell XPS page']);">United Kingdom&nbsp;&rsaquo;</a></li>
-				<li class="three-col last-col border" ><a href="http://www.dell.com/ca/enterprise/p/xps-13-linux/pd" onclick="_gaq.push(['_trackEvent', 'External Link', 'Dell XPS Canada', 'From Dell XPS page']);">Canada&nbsp;&rsaquo;</a></li>
-			</ul>
-	</div>
-</div><!-- / .row -->
-<div class="row no-border">
-	<div class="six-col">
-		<h2>Available by calling Dell</h2>
-		<p>In the following three countries you get your hands on an XPS 13 developer edition by calling your local Dell office:</p>
-		<ul>
-			<li>Finland <a href="callto:+358207533533">+358 (0)207 533 533</a></li>
-			<li>Luxembourg <a href="callto:3522630471">+352 26 30 47 1</a></li>
-			<li>Poland <a href="callto:48225795999">+48 22 579 59 99</a></li>
-		</ul>
-	</div><!-- /.six-col -->
-</div><!-- / .row -->
-
-{% endblock content %}
-{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/partners/dell/index.html b/templates/partners/dell/index.html
deleted file mode 100755
index ab7b07ddbf3..00000000000
--- a/templates/partners/dell/index.html
+++ /dev/null
@@ -1,93 +0,0 @@
-{% extends "partners/base_partners.html" %}
-
-{% block title %}Dell and Ubuntu{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Partners" page_title="Dell" tertiary="true" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero row-image-centered">
-	<div class="six-col">
-		<h1>Dell and Ubuntu</h1>
-		<p>Canonical and Dell have teamed up to offer an extensive range of desktop, notebook and server configurations, certified and suitable for home use, business use or software development. Dell and Canonical engineers collaborate every day to certify Dell hardware on Ubuntu, to a level that customers can rely on.</p>
-		<p>Dell and Canonical also work together to bring cloud infrastructure solutions to market, based on OpenStack and the Dell &amp; Ubuntu reference architecture.</p>
-		<p><a href="http://www.dell.com/ubuntu">Visit the Dell website&nbsp;&rsaquo;</a></p>
-	</div><!-- /.six-col -->
-	<span><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-dell.svg" alt="Dell" width="200" height="200" /></span>
-</div><!-- / .row -->
-
-<div id="servers" class="row">
-	<div class="five-col">
-		<img src="{{ STATIC_URL }}img/partners/dell/image-dellservers.jpg" alt="dell_t420" width="498" height="194" />
-
-		<blockquote cite="http://www.canonical.com/content/canonical-announces-certification-and-support-latest-dell-poweredge-servers" class="pull-quote">
-			<p><span>&ldquo;</span>Ubuntu is one of the leading enterprise-class Linux distributions and demand for the OS is growing among hyperscale customers<span>&rdquo;</span></p>
-			<p><cite><a href="http://www.canonical.com/content/canonical-announces-certification-and-support-latest-dell-poweredge-servers">Forrest Norrod, VP and GM, Dell Server Solutions.</a></cite></p>
-		</blockquote>
-	</div>
-	<div class="seven-col last-col">
-		<h2>Canonical and Dell team together on PowerEdge 12G servers</h2>
-		<p>The complete range of Dell&rsquo;s PowerEdge 12G servers are now <a href="http://www.ubuntu.com/certification/server/make/Dell/?release=12.04+LTS">certified with Ubuntu 12.04 LTS</a>. These servers complement the Dell PowerEdge 11G and 10G Servers which have already been certified for Ubuntu, giving customers a wide choice of high performance devices for scale-out computing workloads.</p>
-		<p>Together, Dell and Canonical have extended their existing engineering agreement so customers with an Ubuntu Advantage support contract can have complete assurance - full software and hardware support from both companies.</p>
-		<p>Ubuntu Advantage is available from both Dell and Canonical. Customers can now deploy with confidence when purchasing Dell PowerEdge servers and Ubuntu Advantage.</p>
-	</div>
-	<div id="dell-quotes" class="twelve-col vertical-divider equal-height">
-		<div class="four-col">
-			<blockquote cite="http://blog.canonical.com/2013/03/11/dell-poweredge-ubuntu-supported/" class="pull-quote">
-				<p><span>&ldquo;</span>As part of this agreement Canonical will add Dell 11G &amp; 12G PowerEdge models to the Ubuntu Server 12.04 LTS Certification List and Dell will add Ubuntu Server to its Linux OS Support Matrix<span>&rdquo;</span></p>
-				<p><cite>David Duffey, Canonical&rsquo;s Director of Technical Partnerships</cite></p>
-			</blockquote>
-			<p><a href="http://blog.canonical.com/2013/03/11/dell-poweredge-ubuntu-supported/">Read David's blog&nbsp;&rsaquo;</a></p>
-		</div>
-		<div class="four-col">
-			<blockquote cite="http://en.community.dell.com/dell-blogs/enterprise/b/inside-enterprise-it/archive/2013/03/11/dell-and-canonical-support-ubuntu-enterprise-server-on-dell-poweredge-servers.aspx" class="pull-quote">
-				<p><span>&ldquo;</span>With Ubuntu Server, Dell and Canonical, makers of Ubuntu, are in a great position to service hyperscale deployments<span>&rdquo;</span></p>
-				<p><cite>Tui Leauanae, Dell&rsquo;s Linux Portfolio Manager</cite></p>
-			</blockquote>
-			<p><a href="http://en.community.dell.com/dell-blogs/enterprise/b/inside-enterprise-it/archive/2013/03/11/dell-and-canonical-support-ubuntu-enterprise-server-on-dell-poweredge-servers.aspx">Read the Dell Inside Enterprise IT Blog&nbsp;&rsaquo;</a></p>
-		</div>
-		<div class="four-col last-col">
-			<blockquote cite="http://en.community.dell.com/techcenter/b/techcenter/archive/2013/03/11/ubuntu-server-now-supported-on-dell-poweredge-amp-poweredge-c.aspx" class="pull-quote">
-				<p><span>&ldquo;</span>If you are deploying Ubuntu Server on Dell PowerEdge or PowerEdge-C, you can be confident that Dell and Canonical will be able to effectively support your needs going forward.<span>&rdquo;</span></p>
-				<p><cite>Jose De la Rosa, Dell Linux Engineer</cite></p>
-			</blockquote>
-			<p><a href="http://en.community.dell.com/techcenter/b/techcenter/archive/2013/03/11/ubuntu-server-now-supported-on-dell-poweredge-amp-poweredge-c.aspx">Read the Dell TechCenter Blog&nbsp;&rsaquo;</a></p>
-		</div>
-	</div><!-- /.twelve-col -->
-</div><!-- /.row -->
-
-<div class="row row-image-centered">
-	<div class="six-col">
-		<h2>Featured offers</h2>
-		<h3>Dell XPS 13 Developer Edition - with Ubuntu 12.04 LTS</h3>
-		<p>An extraordinary and award-winning machine, this stylish laptop now comes with a Full High Definition (FHD) display for superb graphic performance.</p>
-		<p>With Ubuntu 12.04 LTS preloaded, the Dell XPS 13 is perfect for developers and anyone who wants a powerful processor coupled with brilliant graphics and smart design.</p>
-		<p><a href="/partners/dell/dellxps">More details and ordering information&nbsp;&rsaquo;</a></p>
-		<p><a href="/tour/12.04/en/" title="Take the Ubuntu 12.04 LTS Desktop Tour">Take the online tour of the Ubuntu 12.04 LTS desktop&nbsp;&rsaquo;</a></p>
-	</div>
-	<span><img src="{{ STATIC_URL }}img/homepage/dell_sputnik.png" alt="Dell XPS 13 developer edition" /></span>
-</div><!-- /.row -->
-
-<div class="row">
-	<div class="six-col append-six">
-		<h2>Professional support offerings</h2>
-		<p>All Dell certified solutions are supported by Canonical&rsquo;s <a href="http://www.ubuntu.com/business">Professional Support Group</a>, offering a choice of support options for your particular needs.</p>
-	</div><!-- /.six-col -->
-</div><!-- /.row -->
-
-<div class="row no-border row-image-centered">
-	<div class="six-col">
-		<h2>Certified systems</h2>
-			<p>Working closely with Dell&rsquo;s engineering team to pre-install Ubuntu, Canonical has tested and certified a range of server and desktop systems from Dell.</p>
-			<ul class="no-bullets">
-				<li><a href="http://www.ubuntu.com/certification/desktop/make/Dell/?category=Desktop&amp;category=Laptop&amp;category=Netbook">See all Dell desktop systems certified by Ubuntu&nbsp;&rsaquo;</a></li>
-				<li><a href="http://www.ubuntu.com/certification/server/make/Dell/">See all Dell server systems certified by Ubuntu&nbsp;&rsaquo;</a></li>
-			</ul>
-	</div><!-- /.six-col -->
-	<span>
-		<img src="{{ STATIC_URL }}img/partners/dell/image-certifiedsystems.svg" alt="" />
-	</span><!-- /.six-col -->
-</div><!-- /.row -->
-{% endblock content %}
-{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/partners/find-a-partner/hardware.html b/templates/partners/find-a-partner/hardware.html
deleted file mode 100755
index 869564c21e8..00000000000
--- a/templates/partners/find-a-partner/hardware.html
+++ /dev/null
@@ -1,132 +0,0 @@
-{% extends "partners/base_partners.html" %}
-
-{% block title %}Hardware partners{% endblock %}
-
-{% block meta_description %}The Canonical Technical Partner Program defines a process for collaboration between Canonical and IHV&rsquo;s. It helps IHVs understand how Ubuntu is developed and enhanced, and what is planned for the next release.{% endblock meta_description %}
-
-{% block meta_keywords %}Ubuntu, Technical Partners,IHVs,Technical Partner program,Technical collaboration,technical partnership,Technical certification,Hardware,certification,driver support,driver certification,Canonical certification programs,component certification{% endblock meta_keywords %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Partners" subsection_title="Find a partner" page_title="Hardware partners"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero">
-	<div class="eight-col">
-		<h1>Hardware partners</h1>
-		<p>Partnering with Canonical is a great way to keep your products ahead of the competition. The Technical Partner Programme gives access to the latest Ubuntu information, tools and training to help you get to market quicker and for less.</p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row row-image-centered">
-	<span><img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-server-warmgrey.svg" alt="" width="124" height="124" /></span>
-	<div class="eight-col">
-		<h2>Get ahead with Ubuntu and Canonical</h2>
-
-		<p>As Ubuntu use grows around the world there&rsquo;s an increasing demand for fully compatible devices. The need spans hardware (servers, desktops, laptops and more) and enterprise software, and manufacturers are looking to capitalise.</p>
-
-		<p>To get to market quicker and reduce costs, OEMs and their partners need components that are compatible with the latest Ubuntu releases. For IHVs and ISVs, the big question is how to develop, test and certify such products.</p>
-
-		<p>The answer is to work with Canonical, the company sponsoring the Ubuntu project. OEMs, IHVs, ISVs and peripheral manufacturers can subscribe to the <strong>Canonical Technical Partner Programme</strong>, which provides all the information, tools and training a manufacturer needs to keep its products ahead of the Ubuntu development curve.</p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row row-image-centered">
-	<div class="eight-col">
-		<h2>What is the Technical Partner Programme?</h2>
-		<p>The Technical Partner Programme enables collaboration between Canonical and partners. It helps partners understand how Ubuntu is developed and enhanced, and provides access to the roadmap. Partners can share their plans for developing new hardware, ensuring full support in Ubuntu from launch.</p>
-		<p><a href="{{ STATIC_URL }}files/section/partners/Technical_Partner_Programme_v2.pdf">Learn more&nbsp;&rsaquo;</a></p>
-	</div>
-	<span><img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-partner-warmgrey.svg" alt="" width="124" height="124" class="priority-0" /></span>
-</div><!-- /.row -->
-
-<div class="row row-image-centered">
-	<span><img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-discussion-warmgrey.svg" alt="" width="124" height="124" /></span>
-	<div class="eight-col">
-		<h2>Join the Technical Partner Programme</h2>
-		<p>If you&rsquo;d like to work closely with Canonical during the development of future hardware, it&rsquo;s easy to get started. Give us a few details and one of our programme experts will be in touch to discuss your needs.</p>
-
-		<p><a href="/partners/contact-us">Join the Technical Partner Programme&nbsp;&rsaquo;</a></p>
-	</div>
-</div><!-- /.row -->
-
-<div class="row no-border">
-<h2>Technical partners</h2>
-<div class="twelve-col equal-height">
-	<ul class="no-bullets">
-	{% comment %}
-		<li class="four-col box">
-			<p><a href="http://"><img src="{{ STATIC_URL }}img/logos/partners/THE_LOGO.png" alt="COMPANY NAME" /></a></p>
-			<p><a href="http://">COMPANY NAME</a> description</p>
-		</li>
-	{% endcomment %}
-
-		<li class="four-col box">
-			<p><a href="http://www.amd.com/"><img src="{{ STATIC_URL }}img/logos/partners/logo_amd.png" alt="AMD" /></a></p>
-			<p><a href="http://www.amd.com/">AMD</a> is a semiconductor design innovator driving the next era of digital experiences with its groundbreaking Accelerated Processing Units (APUs). AMD&rsquo;s server products focus on industry-leading cloud computing and virtualisation environments.</p>
-		</li>
-		
-		<li id="amd-seamicro" class="four-col box">
-			<p><a href="http://www.seamicro.com"><img src="{{ STATIC_URL }}img/logos/partners/logo-amd-seamicro.png" alt="AMD-SeaMicro" /></a></p>
-			<p><a href="http://www.seamicro.com">AMD-SeaMicro</a> is transforming the data center with servers that draw 1/4 the power and take 1/2 the space of traditional servers. Our servers with Freedom(tm) fabric are the most energy-efficient server systems, and in 10RU, it provides 512 cores, 160 Gbps of networking I/O, and the capacity for more than 5 PB of storage.</p>
-		</li>
-		
-		<li class="four-col box last-col">
-			<p><a href="http://www.ubuntu.com/partners/arm/"><img src="{{ STATIC_URL }}img/logos/partners/arm-logo.gif" alt="ARM" /></a></p>
-			<p>The <a href="http://www.arm.com/">ARM</a> computing architecture has rocketed in popularity since the company started licensing its design in 1990. It has become a standard for modern digital devices from phones to tablets, shipped in billions of devices. ARM&rsquo;s popularity is a result of high performance coupled with leading power efficiency and low costs.</p>
-		</li>
-
-		<li class="four-col box">
-			<p><a href="http://www.ubuntu.com/partners/asus/"><img src="{{ STATIC_URL }}img/logos/partners/asus_logo02lowres.jpg" alt="Asus" /></a></p>
-			<p><a href="http://www.asus.com">ASUS</a> has been working with Canonical to bring to market a number of Eee PC netbooks. The Eee PC with Ubuntu is fast, virus-free and packed full of applications through the Ubuntu Software Centre. Given Ubuntu&rsquo;s six-monthly release cycle, ASUS users can quickly take advantage of future enhancements and always stay up-to-date.</p>
-		</li>
-
-		<li class="four-col box">
-			<p><a href="http://www.cisco.com/c/en/us/index.html"><img src="{{ STATIC_URL }}img/logos/logo-cisco.png" alt="Cisco" /></a></p>
-			<p><a href="http://www.cisco.com/c/en/us/index.html">Cisco</a>&rsquo;s Unified Data Center architecture can simplify and accelerate the deployment of scalable cloud solutions. Canonical and Cisco work closely together to ensure the compatibility of Cisco&rsquo;s products and technologies with Ubuntu Server and Ubuntu OpenStack distributions.</p>
-		</li>
-
-		<li class="four-col box last-col">
-			<p><a href="http://www.ubuntu.com/partners/dell/"><img src="{{ STATIC_URL }}img/logos/partners/Dell_logolowres.jpg" alt="Dell" /></a></p>
-			<p>Canonical and <a href="http://www.dell.com/ubuntu">Dell</a> continue to work together to deliver the best machines running the best of Ubuntu. Ubuntu is now available on desktops, servers and on the cloud. Whether it&#39;s Ubuntu Enterprise Cloud on Dell servers or Ubuntu on home and business netbooks and PCs, Canonical works closely with Dell&#39;s engineering team to pre-install Ubuntu. ...</p>
-		</li>
-
-		<li class="four-col box">
-			<p><a href="http://www.emc.com"><img src="{{ STATIC_URL }}img/logos/partners/emc.png" alt="EMC" /></a></p>
-			<p><a href="http://www.emc.com">EMC</a> is a global leader in enabling businesses and service providers to transform their operations and deliver information technology as a service (ITaaS). Fundamental to this transformation is cloud computing. Through innovative products and services, EMC accelerates the journey to cloud computing, helping IT departments to store, manage, protect and analyze their most valuable asset &mdash; information &mdash; in a more agile, trusted and cost-efficient way.</p>
-		</li>
-
-		<li class="four-col box">
-			<p><a href="http://www.intel.com/"><img src="{{ STATIC_URL }}img/logos/partners/intel_logo.png" alt="HP" /></a></p>
-			<p><a href="http://www.intel.com/">Intel</a> is a world leader in computing innovation. The company designs and builds the essential technologies that serve as the foundation for the world's computing devices.</p>
-		</li>
-
-		<li class="four-col box last-col">
-			<p><a href="http://www.ubuntu.com/partners/hp/"><img src="{{ STATIC_URL }}img/logos/partners/hplogo2012.jpg" alt="HP" /></a></p>
-			<p>Ubuntu Server is now certified on industry-standard <a href="http://www.hp.com/">HP</a> ProLiant servers. Following a series of rigorous tests in the Canonical labs, this certification gives users the reassurance they need that their mid-range HP servers are fully compatible with Ubuntu Server.</p>
-		</li>
-
-		<li class="four-col box">
-			<p><a href="http://www.emulex.com/"><img src="{{ STATIC_URL }}img/logos/partners/emulex_logo.png" alt="HP" /></a></p>
-			<p><a href="http://www.emulex.com/">Emulex</a>, a leader in network connectivity, monitoring and management, provides hardware and software solutions for global networks that support enterprise, cloud, government and telecommunications. Emulex's I/O connectivity offerings, including its line of ultra high-performance Ethernet and Fibre Channel-based products, have been designed into server and storage solutions from leading OEMs.</p>
-		</li>
-
-		<li class="four-col box">
-			<p><a href="http://www.lenovo.com/us/en/"><img src="{{ STATIC_URL }}img/logos/partners/lenovolowres.jpg" alt="Lenovo" /></a></p>
-			<p>Canonical has been shipping Ubuntu on <a href="http://www.lenovo.com">Lenovo</a>&#39;s Think Center and Idea Center machines for over one year. There are now over 30 Lenovo ThinkPads certified with Ubuntu, including the popular Edge series. The Idea Center range has also been included in the Chinese national &#39;Farmer PC&#39; project. ThinkPads, pre-installed with Ubuntu 10.10, are available with ...</p>
-		</li>
-
-		<li class="four-col box last-col">
-			<p><a href="http://www.lsi.com/Pages/default.aspx"><img src="{{ STATIC_URL }}img/logos/partners/lsi_logo.png" alt="LSI" /></a></p>
-			<p><a href="http://www.lsi.com/Pages/default.aspx">LSI</a> designs semiconductors and software that accelerate storage and networking in datacentres, mobile networks and client computing. Their technology is the intelligence critical to enhanced application performance, and is applied in solutions created in collaboration with their partners.</p>
-		</li>
-
-		<li class="four-col box">
-			<p><a href="http://www.nvidia.com"><img src="{{ STATIC_URL }}img/logos/partners/nvidia_logo.png" alt="NVidia" /></a></p>
-			<p><a href="http://www.nvidia.com">NVIDIA</a> has pioneered the art and science of visual computing. The company's technologies are transforming a world of displays into a world of interactive discovery &mdash; for everyone from gamers to scientists, and consumers to enterprise customers.</p>
-		</li>
-	</ul>
-</div>
-</div><!-- / .row -->
-
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/partners/find-a-partner/index.html b/templates/partners/find-a-partner/index.html
deleted file mode 100755
index 2bec9654f51..00000000000
--- a/templates/partners/find-a-partner/index.html
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends "partners/base_partners.html" %}
-
-{% block title %}Find a partner{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Partners" page_title="Find a partner" tertiary="true"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero row-image-centered">
-	<div class="eight-col">
-		<h1>Find a partner</h1>
-		<p>Our network of partners offer a wide range of services, including help with cloud projects and desktop or server migrations, not to mention the supply, deployment and management of Ubuntu-certified hardware and software.</p>
-	</div><!-- / .five-col -->
-	<span><img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-partner-midaubergine.svg" width="160" height="160" alt="Partner pictogram" /></span>
-</div><!-- / .row -->
-
-<div class="row vertical-divider equal-height no-border">
-	<div class="four-col">
-		<h2>Reseller partners</h2>
-		<p>Our reseller partners provide a great way to implement and manage your Ubuntu systems with confidence. They can help you find a comprehensive solution for your business, and make the most of your Ubuntu environment. </p>
-		<p>Our partners can:</p>
-		<ul class="list list-canonical">
-			<li>Install and configure your Ubuntu servers and desktops</li>
-			<li>Provide services to implement Ubuntu-based business systems</li>
-			<li>Manage your systems, network and all updates and upgrades</li>
-		</ul>
-		<p><a href="/partners/find-a-partner/reseller">View reseller partners&nbsp;&rsaquo;</a></p>
-	</div>
-	<div class="four-col">
-		<h2>ISV partners</h2>
-		<p>Looking for software that runs on Ubuntu? Our ISV partners&rsquo; applications deliver solutions for business and personal use. And they&rsquo;re supported by commercial companies providing the highest level of service.</p>
-		<p>Canonical ISV partners work closely with the development teams who deliver Ubuntu, so they can ensure that installation and operation are of the highest quality.</p>
-		<p><a href="/partners/find-a-partner/isv">View ISV partners&nbsp;&rsaquo;</a></p>
-	</div>
-	<div class="four-col last-col">
-		<h2>Hardware partners</h2>
-		<p>Canonical works with some of the top PC and server manufacturers, from Dell to HP, to pre-install Ubuntu on a wide range of hardware. That means you can be confident that Ubuntu will work brilliantly on your mobile devices, PCs and servers.</p>
-		<p><a href="/partners/find-a-partner/hardware">View hardware partners&nbsp;&rsaquo;</a></p>
-	</div>
-</div><!-- / .row -->
-
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/partners/find-a-partner/isv.html b/templates/partners/find-a-partner/isv.html
deleted file mode 100755
index ee2bd1eb63b..00000000000
--- a/templates/partners/find-a-partner/isv.html
+++ /dev/null
@@ -1,627 +0,0 @@
-{% extends "partners/base_partners.html" %} {% block title %}ISV partners{% endblock %}
-
-{% block second_level_nav_items %} {% include "_base/_nav_breadcrumb.html" with section_title="Partners" subsection_title="Find a partner" page_title="Find a partner" %} {% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero">
-	<h1 class="eight-col">ISV partners</h1>
-  <a href="/partners/contact-us" class="link-cta-ubuntu right">Apply to become a partner</a>
-</div><!-- / .row -->
-
-<div class="row no-border equal-height">
-  <ul class="list-partners no-bullets">
-      <li class="four-col box">
-          <a href="http://www.10gen.com/"><img src="{{ STATIC_URL }}img/logos/partners/10genLogo_1.png" alt="10gen"></a>
-
-          <p><a href="http://www.10gen.com/">10gen</a> develops and supports MongoDB – the open source, high performance, scalable, document-oriented database. 10gen delivers technical support, professional services, and training for commercial-grade deployments of MongoDB</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.2x.com"><img src="{{ STATIC_URL }}img/logos/partners/2X_logo_small_scaled_.jpg" alt="2x Software"></a>
-
-          <p><a href="http://www.2x.com">2x Software</a> offers tailor-made, easy-to-implement and cost-effective server based and virtual computing solutions, including the award-winning 2X VirtualDesktopServer and 2X ApplicationServer, as well as the 2X ThinClientServer and 2X LoadBalancer. With their trademark affordability and simplicity, as well as the unique 2X per-server licensing model, 2X products unlock the full potential of virtualization platforms by improving desktop ...</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.accountz.com"><img src="{{ STATIC_URL }}img/logos/partners/accountz.png" alt="Accountz.com"></a>
-
-          <p><a href="http://www.accountz.com">Accountz.com</a> manufacture award winning personal and business accounting software. The range is multi platform and runs on Mac, Linux and Windows. Business Accountz comes in Basic, Professional and Enterprise versions. Powerful, yet simple, a VAT return can be produced in one-click and the chart of accounts presents business performance in real-time.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.acelet.com"><img src="{{ STATIC_URL }}img/logos/partners/aceletLogo92x25.png" alt="Acelet Corporation"></a>
-
-          <p><a href="http://www.acelet.com">Acelet Corporation</a> Acelet Corporation provides cross-platform applications, such as Acelet Filer and Acelet Scheduler. Acelet Filer is a file manager with similar user interface as Windows XP, so you do not have to change your finger habits. Acelet Scheduler is a task scheduler with both daemon and GUI.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://aws.amazon.com/"><img src="{{ STATIC_URL }}img/logos/partners/AWS.png" alt="Amazon Web Services LLC"></a>
-
-          <p><a href="http://aws.amazon.com/">Amazon Web Services LLC</a> With AWS you can requisition computer power, storage, and other services–gaining access to a suite of elastic IT infrastructure services as your business demands them. You pay only for what you use, with no up-front expenses or long-term commitments, making AWS the most cost-effective way to deliver your application to your customers and clients.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.appfirst.com"><img src="{{ STATIC_URL }}img/logos/partners/AppFirst_LogoScaled.jpg" alt="AppFirst"></a>
-
-          <p><a href="http://www.appfirst.com">AppFirst</a> is a SaaS-based application monitoring tool that provides complete visibility of an application, helping companies proactively identify and address potential performance issues, plan for future growth, and gain understanding of their application&#39;s execution.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.arkeia.com/en/partners/technology-partners/ubuntu"><img src="{{ STATIC_URL }}img/logos/partners/ArkeiaSoftware.png" alt="Arkeia Software"></a>
-
-          <p><a href="http://www.arkeia.com/en/partners/technology-partners/ubuntu">Arkeia Software</a> Arkeia Network Backup, Enterprise Edition for Ubuntu. Arkeia Software provides a fully-licensed, free version of Arkeia Network Backup that is available in the Ubuntu 10.04 LTS software repository. Arkeia Software provides the market&#39;s broadest and deepest support for Linux and open source applications, with more than 100 Linux platforms supported.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.baculasystems.com"><img src="{{ STATIC_URL }}img/logos/partners/Bacula.png" alt="Bacula Systems"></a>
-
-          <p><a href="http://www.baculasystems.com">Bacula Systems</a> provides the highest quality support, training and professional services for the Bacula open-source backup and recovery software platform. Bacula is the leading enterprise backup solution that is 100% open-source, free of license costs and adheres strictly to open standards, eliminating the vendor lock-in of proprietary software for thousands of enterprises.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.beemasterict.com"><img src="{{ STATIC_URL }}img/logos/partners/BEEMLOGO2.png" alt="Beemaster ICT"></a>
-
-          <p><a href="http://www.beemasterict.com">Beemaster ICT</a> delivers solutions for the Virtual Desktop and Application Delivery market. Our BeeBox allows you to publish any application from anywhere, under any operating system to any access device. With BeeBox, you have all benefits of thin client computing, without the need of a Thin client Infrastructure.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.bitdefender.com"><img src="{{ STATIC_URL }}img/logos/partners/Bitdefender.png" alt="BitDefender"></a>
-
-          <p><a href="http://www.bitdefender.com">BitDefender</a> is a leading global provider of security solutions that satisfy the protection requirements of today&#39;s computing environment. The company offers one of the industry&#39;s fastest and most effective lines of security software, setting new standards for threat prevention, timely detection and mitigation.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.bluecherrydvr.com"><img src="{{ STATIC_URL }}img/logos/partners/bluecherry.png" alt="Bluecherry "></a>
-
-          <p><a href="http://www.bluecherrydvr.com">Bluecherry</a> is a commercially maintained Linux based surveillance application which supports our hardware compression video / audio capture cards. Our interface is powerful, feature rich, and user friendly and our software is based around Ubuntu so updates are as easily downloaded from our servers, freeing you from headaches and upgrade nightmares.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.bonitasoft.com"><img src="{{ STATIC_URL }}img/logos/partners/bonitasoft.png" alt="BonitaSoft"></a>
-
-          <p><a href="http://www.bonitasoft.com">BonitaSoft</a> is the leading open source Business Process Management (BPM) company providing Bonita Open Solution, an intuitive and powerful BPM suite: just draw your processes using a BPMN palette, then connect to your existing systems (Oracle, MySQL, LDAP, Google, Twitter, Facebook...) and run your Java BPM application in one click.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.serverdensity.com/landing/?a=site&amp;s=ubuntu-partner"><img src="{{ STATIC_URL }}img/logos/partners/BoxedIce.png" alt="Boxed Ice"></a>
-
-          <p><a href="http://www.serverdensity.com/landing/?a=site&amp;s=ubuntu-partner">Boxed Ice</a> Server Density is a server monitoring tool provided as a service that makes it easy to start monitoring your server performance and applications such as Apache and MySQL. Get e-mail, SMS and iPhone alerts when things go wrong, troubleshoot historical problems and plan future capacity.<br></p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.bricsys.com"><img src="{{ STATIC_URL }}img/logos/partners/bricsys_logo.png" alt="Bricsys"></a>
-
-          <p><a href="http://www.bricsys.com">Bricsys</a> Bricscad is the number one DWG CAD alternative and offers a complete and recognizable feature set to professional users. Bricscad reads and writes the DWG format and offers high compatibility with AutoCAD®. Bricscad has a very recognizable intuitive user interface, requires no extra training and is today available in 13 languages.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.c12g.com"><img src="{{ STATIC_URL }}img/logos/partners/opennebula-c12g-partner-72.jpg" alt="C12G Labs"></a>
-
-          <p><a href="http://www.c12g.com">C12G Labs</a> is the company behind the OpenNebula open-source toolkit for cloud computing. C12G provides enterprise-grade solutions around OpenNebulaPro, which is a stable, certified, and supported distribution of OpenNebula. C12G offers a comprehensive set of services, through which customers and partners can get production level support or build a custom cloud</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.centrify.com"><img src="{{ STATIC_URL }}img/logos/partners/Centrify.png" alt="Centrify"></a>
-
-          <p><a href="http://www.centrify.com">Centrify</a> Centrify DirectControl delivers access control and centralized identity management by seamlessly integrating Linux, UNIX, Mac and web platforms with Microsoft Active Directory. DirectControl turns a non-Microsoft system into an Active Directory client, letting you secure that system using the same authentication and Group Policy services deployed for your Windows systems.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.cfengine.com"><img src="{{ STATIC_URL }}img/logos/partners/CFENGINE.png" alt="Cfengine"></a>
-
-          <p><a href="http://www.cfengine.com">Cfengine</a> is a versatile and lightweight datacenter management solution based on a well-established<br>
-          theory that allows organizations to automate their IT-operations with less risk. Cfengine is one of the most popular solutions in the industry (&gt; 5,000 companies), delivering more reliable IT-services with increased ability to respond to business initiatives.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://CirrusComputing.com/"><img src="{{ STATIC_URL }}img/logos/partners/CirrusComputing-SCALED.png" alt="Cirrus Computing"></a>
-
-          <p><a href="http://CirrusComputing.com/">Cirrus Computing</a> provides a complete “organization in the cloud” packaged from the world&#39;s leading open source, including networks, desktops, and applications. Access is on virtual Ubuntu desktops from any computer anywhere over the Internet, providing the best user interface available in the cloud. Scaling the organization up or down can be done with a mouse-click.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.cloudera.com"><img src="{{ STATIC_URL }}img/logos/partners/Cloudera.png" alt="Cloudera"></a>
-
-          <p><a href="http://www.cloudera.com">Cloudera</a> Cloudera provides software, support, services and training for the open-source Apache Hadoop software package. Originally developed by dominant web companies like Yahoo! and Facebook, Hadoop is now used widely in finance, telecom, media and government verticals. Cloudera builds upon Hadoop to create a unique data management platform to collect, store and process complex data then ...</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://cloudkick.com"><img src="{{ STATIC_URL }}img/logos/partners/cloudkick.png" alt="Cloudkick"></a>
-
-          <p><a href="http://cloudkick.com">Cloudkick</a> is a management tool and portability layer for cloud based infrastructure. Cloudkick provides a common set of tools, such as performance trending and fault-detection, that work across numerous cloud providers (e.g. Amazon EC2). Additionally, with Hybrid Cloudkick, companies can now manage their existing non-cloud infrastructure as if it was cloud based.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.cohesiveft.com"><img src="{{ STATIC_URL }}img/logos/partners/Logo_CohesiveFT-Logo_2009-3-6.jpg" alt="Cohesive Flexible Technologies"></a>
-
-          <p><a href="http://www.cohesiveft.com">Cohesive Flexible Technologies</a> provides onboarding solutions for virtual and cloud computing infrastructures. Their Elastic Server® platform is a web-based factory for creating, deploying and managing custom multi-sourced servers comprised of horizontal, open source and third-party software components. Additionally the VPN-Cubed® packaged service gives customers control of networking in the clouds, across clouds and between their private data cente.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.colosa.com"><img src="{{ STATIC_URL }}img/logos/partners/Colosa.png" alt="Colosa Inc"></a>
-
-          <p><a href="http://www.colosa.com">Colosa Inc</a> For workers in organizations that must process and manage a heavy workload of requests as part of their job, ProcessMaker workflow automation software offers help. With limited IT resources, both technology and business users can improve communication and resolution of requests across departments, including human resources, finance, and operations.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.commandprompt.com"><img src="{{ STATIC_URL }}img/logos/partners/cmdprompt.png" alt="Command Prompt Inc. "></a>
-
-          <p><a href="http://www.commandprompt.com">Command Prompt Inc.</a> Based in Oregon, The PostgreSQL Company, Command Prompt, Inc. is the oldest and largest dedicated PostgreSQL support provider in North America. Since 1997, they have been developing, supporting, deploying and advocating the use of the “World&#39;s Most Advanced Open Source Database”. The preferred deployment platform for PostgreSQL is Ubuntu.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.convirture.com"><img src="{{ STATIC_URL }}img/logos/partners/Convirture_Logo_scaled.jpg" alt="Convirture Corporation"></a>
-
-          <p><a href="http://www.convirture.com">Convirture Corporation</a> ConVirt 2.0 provides enterprise-grade management of open source virtualization platforms, enabling you to build out your virtualized data center and private cloud in the most flexible and cost effective way. ConVirt manages both Xen and KVM, shipped with commercial or community Linux distributions , from a single console and with consistent feature set across virtualization ...</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.northscale.com"><img src="{{ STATIC_URL }}img/logos/partners/couchbase_logo_final_SCALED___.png" alt="Couchbase"></a>
-
-          <p><a href="http://www.northscale.com">Couchbase</a> is the name of the NoSQL database company and product family created through the merger of CouchOne and Membase. Couchbase products, which are built on Apache CouchDB, Membase, and memcached open source software, represent the most comprehensive family of data management solutions for building scalable web and mobile applications.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.yassl.com"><img src="{{ STATIC_URL }}img/logos/partners/yaSSLLog_scaled____.jpg" alt="CyaSSL"></a>
-
-          <p><a href="http://www.yassl.com">CyaSSL</a> is a lightweight yet fully functional embedded SSL Library for programmers building security into applications and devices. CyaSSL employs the dual licensing model, like MySQL, so it is available under the open source GPLv2 and standard commercial licensing.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.eucalyptus.com"><img src="{{ STATIC_URL }}img/logos/partners/Logo-Eucalyptus_Logo_two_words.png" alt="Eucalyptus Systems, Inc"></a>
-
-          <p><a href="http://www.eucalyptus.com">Eucalyptus Systems, Inc</a> is an open-source system for implementing on-premise private and hybrid clouds using the hardware and software infrastructure that is in place, without modification. With Eucalyptus, IT organizations reduce both costs and system administration burden while providing end-users superior levels of service through public cloud interoperability and Linux distribution portability.</p>
-      </li>
-
-      <li class="four-col box">
-          <img src="{{ STATIC_URL }}img/logos/partners/fermat.png" alt="Fermat Consulting">
-
-          <p>Fermat Consulting is specialized in providing services for financial derivative contracts valuation and risk management. With the Fairmat project we are committed to make financial valuation accessible to (almost) everyone and to provide a flexible tool that can be extended to cover (almost) any derivative contracts on (almost) any underlying asset.<br>
-          <br></p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.fluendo.com/"><img src="{{ STATIC_URL }}img/logos/partners/Fluendo-new.png" alt="Fluendo "></a>
-
-          <p><a href="http://www.fluendo.com/">Fluendo</a> For several years Fluendo has been recognized as a leading provider of multimedia solutions for GNU/Linux and Free Software in general. Fluendo provides a wide range of products on and for GStreamer, including proprietary codecs with their respective patent licenses, a DVD player and a media center. The Fluendo MP3 decoder is included in Ubuntu ...</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.foradian.com/"><img src="{{ STATIC_URL }}img/logos/partners/foradian_logoscaled_.png" alt="Foradian Technologies"></a>
-
-          <p><a href="http://www.foradian.com/">Foradian Technologies</a> Foradian Technologies is an internet engineering company based out of India who loves developing amazing web applications on open-source technologies. Foradian is well known for Project Fedena [www.projectfedena.org] - an open-source school ERP, which is getting implemented in educational institutes all around the world.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.axigen.com/"><img src="{{ STATIC_URL }}img/logos/partners/axigen.png" alt="Gecad Technologies"></a>
-
-          <p><a href="http://www.axigen.com/">Gecad Technologies</a> Established in 2001, Gecad Technologies focuses on the development and distribution of innovative messaging solutions, under the brand name AXIGEN. AXIGEN Mail Server is THE mail server for Linux professionals, offering unmatched manageability and control over all details email traffic and being backed by outstanding 24/7 technical support services.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.graebert.com"><img src="{{ STATIC_URL }}img/logos/partners/graebert_vert_scaled.jpg" alt="Graebert GmbH"></a>
-
-          <p><a href="http://www.graebert.com">Graebert GmbH</a> ARES™ Commander Edition is the world’s first professional native DWG 2D/3D CAD software for all three major platforms: Windows®, Mac® OS X and Linux. It’s available in 13 languages, fully compatible with the latest AutoCAD® DWG/DXF standards and integrates ACIS 3D Solid Modeling. Graebert’s SDK allows companies to create custom applications based on ARES – ...</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.groundworkopensource.com"><img src="{{ STATIC_URL }}img/logos/partners/GWOS_scaled.jpg" alt="GroundWork Open Source, Inc."></a>
-
-          <p><a href="http://www.groundworkopensource.com">GroundWork Open Source, Inc.</a> is the market leader in commercial open source network and systems management software, delivering enterprise-class network, system and application management solutions at a fraction of the cost of proprietary solutions. GWOS&#39;s best of breed approach gives customers the flexibility to use diverse open source and proprietary technologies together under a unified interface, allowing users to ...</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.hansaworld.com"><img src="{{ STATIC_URL }}img/logos/partners/Hansaworld.png" alt="HansaWorld"></a>
-
-          <p><a href="http://www.hansaworld.com">HansaWorld</a> provides integrated business solutions including financials, ERP, CRM, e-Business, retail and production. HansaWorld is available in 28 languages and is represented in many countries in Europe, Latin America, Africa, Australia, Asia and the Middle East. HansaWorld carries out continuous industry leading research and development, pioneering the use of modern technology for ERP and CRM.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.i4ware.fi"><img src="{{ STATIC_URL }}img/logos/partners/i4waresoftwarelogo2.png" alt="i4ware Software"></a>
-
-          <p><a href="http://www.i4ware.fi">i4ware Software</a> i4ware Software provides a professional services and product for Application Lifecycle Management and Software Development. Company focusing to make these services and product for Ubuntu Server or Ubuntu Desktop supported.<br>
-          <br></p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.UltraEdit.com"><img src="{{ STATIC_URL }}img/logos/partners/UltraEdit.png" alt="IDM Computer Solutions"></a>
-
-          <p><a href="http://www.UltraEdit.com">IDM Computer Solutions</a> UltraEdit is the ideal text, hex and advanced programmer&#39;s editor. With millions of users worldwide, UltraEdit is the #1 selling, most powerful, value priced text editor available! Download UEx today in the Ubuntu Partner Repository and discover why millions prefer UltraEdit as their text editing solution! Exclusive Ubuntu community discounts sponsored by Canonical and IDM.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.inlab.de/balanceng/"><img src="{{ STATIC_URL }}img/logos/partners/inlab.png" alt="Inlab Software GmbH"></a>
-
-          <p><a href="http://www.inlab.de/balanceng/">Inlab Software GmbH</a> offers BalanceNG, a software based TCP/IP load-balancer.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.intalio.com"><img src="{{ STATIC_URL }}img/logos/partners/Intalio.png" alt="Intalio"></a>
-
-          <p><a href="http://www.intalio.com">Intalio</a> is the first company to deliver an integrated cloud computing platform designed for the Enterprise. Intalio|Cloud leverages a unique combination of hardware and software to deliver an enterprise-grade cloud computing experience, with dynamic provisioning and elastic scalability. Intalio offers services to enable its customers to efficiently and quickly deploy cloud-computing solutions in their Enterprises.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.K7cloud.com"><img src="{{ STATIC_URL }}img/logos/partners/K7Cloudlogo_scaled.png" alt="K7 CloudSolutions Pvt"></a>
-
-          <p><a href="http://www.K7cloud.com">K7 CloudSolutions Pvt</a> Turn public or private clouds into PaaS offerings easily with K7 Cloud&#39;s Cyclozzo. Cyclozzo is designed to easily accommodate future PaaS standards. Currently, Cyclozzo fully re-implements Google(TM) App Engine&#39;s Java and Python APIs, enabling users to migrate applications to and from GAE and Cyclozzo without changing application code.<br></p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.kaavo.com"><img src="{{ STATIC_URL }}img/logos/partners/Kaavo.png" alt="Kaavo"></a>
-
-          <p><a href="http://www.kaavo.com">Kaavo</a> provides solutions for managing distributed applications and workloads in the clouds. Kaavo is the first and only company to deliver a solution with a top down application focused approach to IT infrastructure management in public and private clouds; enabling users to maximize the full potential of cloud computing.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.karmasphere.com"><img src="{{ STATIC_URL }}img/logos/partners/karmasphere_logo_scaled.jpg" alt="Karmasphere"></a>
-
-          <p><a href="http://www.karmasphere.com">Karmasphere</a> is a Big Data Intelligence software company bringing Apache Hadoop power to the desktop. Karmasphere Studio takes developers and architects from learning to production quality development and is available in free Community and Professional editions. Karmasphere Analyst gives analysts easy, familiar, graphical SQL access to big data in Hadoop.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.knowledgetree.com"><img src="{{ STATIC_URL }}img/logos/partners/knowledgetree.png" alt="KnowledgeTree Inc"></a>
-
-          <p><a href="http://www.knowledgetree.com">KnowledgeTree Inc</a> makes sharing content and controlling document processes simple with secure, affordable online document management solutions for growing SMBs and departments at larger companies. Designed for business professionals, KnowledgeTree is easy to use, does not require extensive training and enables content to be accessed and managed anytime, anywhere via cloud computing.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.beyondtrust.com/"><img src="{{ STATIC_URL }}img/logos/partners/beyondtrustlogo.jpeg" alt="BeyondTrust"></a>
-
-          <p><a href="http://www.beyondtrust.com/">BeyondTrust</a> is the only security solution vendor providing Context-Aware Security Intelligence, giving our customers the visibility and controls necessary to reduce their IT security risks, while at the same time simplifying their compliance reporting.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.linbit.com"><img src="{{ STATIC_URL }}img/logos/partners/LB_logo_blackback_scaled.jpg" alt="Linbit"></a>
-
-          <p><a href="http://www.linbit.com">Linbit</a> has led the way in high-availability (HA) since 2001, and continues to be the OSS leader in business uptime, disaster recovery, and continuity solutions. DRBD is the industry standard for HA and data redundancy for mission critical systems. DRBD enables disaster recovery and HA for any application on Linux.<br></p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.linmin.com"><img src="{{ STATIC_URL }}img/logos/partners/Linmin.png" alt="LinMin Corp"></a>
-
-          <p><a href="http://www.linmin.com">LinMin Corp</a> LinMin Bare Metal Provisioning remotely installs Ubuntu and other operating systems onto servers, blades, desktops and virtual machines. In addition to true native and unattended distro installations, LinMin can also capture entire disk images, store them on the network and restore them for disaster recovery or clone them to identical hardware.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.magnolia-cms.com"><img src="{{ STATIC_URL }}img/logos/partners/magnolia.png" alt="Magnolia CMS"></a>
-
-          <p><a href="http://www.magnolia-cms.com">Magnolia CMS</a> powers the websites of governments as well as leading Fortune 500 enterprises world-wide. It is favored for its ease-of-use and availability under an Open Source license. Magnolia contains best-of-breed Java technology based on open standards and best practices.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.manageiq.com"><img src="{{ STATIC_URL }}img/logos/partners/ManageIQ.png" alt="ManageIQ, Inc."></a>
-
-          <p><a href="http://www.manageiq.com">ManageIQ, Inc.</a> is the emerging leader in the management and automation of virtualized computing environments. ManageIQ solutions are designed and built for the unique challenges introduced by virtualization and enable IT organizations to realize the benefits of virtualization while achieving higher levels of insight, control and automation.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.mapr.com"><img src="{{ STATIC_URL }}img/logos/partners/mapr_logo.jpg" alt="MapR"></a>
-
-          <p><a href="http://www.mapr.com">MapR</a> delivers on the promise of Hadoop with a proven, enterprise-grade platform that supports a broad set of mission-critical and real-time production uses. MapR brings unprecedented dependability, ease-of-use and world-record speed to Hadoop, NoSQL, database and streaming applications in one unified Big Data platform.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.salbaba.co.at"><img src="{{ STATIC_URL }}img/logos/partners/MartinSalbaba.png" alt="Martin Salbaba Softwaredesign"></a>
-
-          <p><a href="http://www.salbaba.co.at">Martin Salbaba Softwaredesign</a> offers with i.mdm an economic and safe ECM solution for enterprise archives.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.mulesoft.com"><img src="{{ STATIC_URL }}img/logos/partners/mulesoft.png" alt="Mulesoft"></a>
-
-          <p><a href="http://www.mulesoft.com">Mulesoft</a> is the Web Middleware Company, providing enterprise-class software based on the world&#39;s most popular open source application infrastructure products, Apache Tomcat and Mule ESB. Tcat Server is a fully-supported enterprise Tomcat server, simplifying management and application provisioning tasks for Tomcat developers and administrators. MuleSoft’s products boast over 1.5m downloads and over than 2,500 production deployments.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.muli.com.au"><img src="{{ STATIC_URL }}img/logos/partners/muli_logo_scaled.png" alt="Muli Management Pty Ltd"></a>
-
-          <p><a href="http://www.muli.com.au">Muli Management Pty Ltd</a> is a 29 year old “Open Core” developer of a suite of 500 applications providing Project Risk, Accounts and Process Management from in-house and cloud Ubuntu Linux Servers with x2go desktop access from Linux, Macintosh and Windows PC&#39;s. Our goal is to provide worldwide support and training through local Muli Associates.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.mysql.com"><img src="{{ STATIC_URL }}img/logos/partners/MySQL.png" alt="MySQL Ab "></a>
-
-          <p><a href="http://www.mysql.com">MySQL Ab</a> provides database products to meet the needs of ISV/OEM, Enterprise, and Community Users.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.nuisoft.com"><img src="{{ STATIC_URL }}img/logos/partners/nuisoft.png" alt="Nuisoft"></a>
-
-          <p><a href="http://www.nuisoft.com">Nuisoft</a> provides custom software development, training and infrastructure management solutions for business. Nuisoft specializes in virtualization and scheduling solutions and offer full service proactive management of customer environments. Managed on an on or off premise outsourced solution we reduce complexity and help manage costs.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.nullbound.com"><img src="{{ STATIC_URL }}img/logos/partners/Nullbound_.png" alt="Nullbound "></a>
-
-          <p><a href="http://www.nullbound.com">Nullbound</a> The NullBound Malware Prevention System utilizes an advanced filtering process unlike anything else. Our unique, cutting edge technology allows you to protect an entire enterprise network, regardless of size. This proactive system runs on a stable, secure Linux platform that protects your network passively through a mirrored port on your switch.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.nuxeo.com/en"><img src="{{ STATIC_URL }}img/logos/partners/nuxeo_logo_black_scaled__.png" alt="Nuxeo"></a>
-
-          <p><a href="http://www.nuxeo.com/en">Nuxeo</a> Nuxeo provides a modular, extensible Java-based open source software platform for enterprise content management and packaged applications for document management , digital asset management and case management. Designed by developers for developers, the Nuxeo platform offers modern technologies, a powerful plugin model and extensive packaging capabilities for building modern content applications.<br></p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.safesquid.com"><img src="{{ STATIC_URL }}img/logos/partners/safesquid-logo.png" alt="Office Efficiencies (India) Private Limited"></a>
-
-          <p><a href="http://www.safesquid.com">Office Efficiencies (India) Private Limited</a> SafeSquid is brought to you by Office Efficiencies (India) Private Limited - OEIPL. SafeSquid is the &quot;Best-of-the-Breed&quot; Content Filtering Proxy Server. SafeSquid arguably has the most comprehensive set of features to serve most complex and large networks. OEIPL is based in India - an extremely price and value sensitive market for IT.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.openbravo.com"><img src="{{ STATIC_URL }}img/logos/partners/openbravo__.png" alt="Openbravo"></a>
-
-          <p><a href="http://www.openbravo.com">Openbravo</a> is the leading professional web-based open source enterprise management (ERP) solution for small and midsize enterprises (SMEs). Driven by open source philosophies and best-in-class services, it delivers a fully integrated, web-based ERP system tailored to the needs of any company, regardless of size or industry sector.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.openqrm-enterprise.com"><img src="{{ STATIC_URL }}img/logos/partners/openqrm.png" alt="openQRM Enterprise"></a>
-
-          <p><a href="http://www.openqrm-enterprise.com">openQRM Enterprise</a> consolidates the technical competence of the openQRM Data Center Management and Cloud Computing Platform to supply expert knowledge, professional services and long-term support for custom, sustainable Data Center setups. openQRM Enterprise reduces the Total Cost of Ownership (TCO) for IT departments using a proven open source framework.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.opera.com"><img src="{{ STATIC_URL }}img/logos/partners/Opera.png" alt="Opera Software "></a>
-
-          <p><a href="http://www.opera.com">Opera Software</a> Secure, fast, and easy to use, the full-featured Opera browser gives The Best Internet Experience.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.opservices.com.br/"><img src="{{ STATIC_URL }}img/logos/partners/opmon_by_opservices_scaled.jpg" alt="OpServices"></a>
-
-          <p><a href="http://www.opservices.com.br/">OpServices</a> is an enterprise dedicated to IT Governance and IT infrastructure and business process monitoring. Created in 2003, offers services and products for the control of availability, performance and security of all the informatizing elements (IT) and sustain those processes, such as communication and energy networks, data banks, operational machines, etc. Its main product is the ...</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.opsview.com"><img src="{{ STATIC_URL }}img/logos/partners/opsview-logo.scaled.png" alt="Opsview "></a>
-
-          <p><a href="http://www.opsview.com">Opsview</a> delivers business-powered monitoring without the complexity or expense of proprietary software. This integrated and commercially-supported open source product gives you a simplified deployment experience, a single console for managing and monitoring distributed deployments, and a comprehensive view of your physical, virtualised and hybrid cloud infrastructure.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.optimumorg.com"><img src="{{ STATIC_URL }}img/logos/partners/Optimum.png" alt="Optimum"></a>
-
-          <p><a href="http://www.optimumorg.com">Optimum</a> provides a wide range of integrated solutions that contribute in developing the business, the solutions offered vary from: Business Consulting Services to operational excellence and Health, Safety and Environment Systems, Information Technology Professional Services as well as IT systems from ERP to business diagnosis tools and Training Services.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.parallels.com"><img src="{{ STATIC_URL }}img/logos/partners/parallels.png" alt="Parallels"></a>
-
-          <p><a href="http://www.parallels.com">Parallels</a> (formerly SWsoft) is a worldwide leader in virtualization and automation software that optimizes computing for consumers, businesses, and service providers across all major hardware, operating system, and virtualization platforms. Founded in 1999, Parallels is a fast-growing company with 900 employees in North America, Europe, and Asia.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.pgp.com"><img src="{{ STATIC_URL }}img/logos/partners/PGP.png" alt="PGP Corporation"></a>
-
-          <p><a href="http://www.pgp.com">PGP Corporation</a> is a global leader in email and data encryption software for enterprise data protection. Based on a unified key management and policy infrastructure, the PGP® Encryption Platform offers the broadest set of integrated applications for enterprise data security. PGP® platform-enabled applications allow organizations to meet current needs and expand as security requirements evolve.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://reductivelabs.com"><img src="{{ STATIC_URL }}img/logos/partners/puppet-labs-black.png" alt="Puppet Labs"></a>
-
-          <p><a href="http://reductivelabs.com">Puppet Labs</a> Puppet is the leading open source tool for data center automation. Puppet helps you save time, gain visibility into your server environment, and ensure consistency across your IT infrastructure. Our mission is to lead the development of Puppet, share our experience with others, and provide training, consulting, and support for our community.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.randrinc.com"><img src="{{ STATIC_URL }}img/logos/partners/RandrLogo.png" alt="Randr, Inc"></a>
-
-          <p><a href="http://www.randrinc.com">Randr, Inc</a> Randr develops Free Open Source Business Software Solutions for Entrepreneurial, Midrange Businesses. Our primary offerings are Rental Portal and Web Business Suite. Randr&#39;s domain expertise is in Wholesale<br>
-          Distribution, Light Manufacturing, Commercial Rental, Warehouse Management, Reverse SCM, and Organic SEO/SEM. We are working on simplifying the installation and support processes.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.real.com"><img src="{{ STATIC_URL }}img/logos/partners/Real.png" alt="RealNetworks Inc"></a>
-
-          <p><a href="http://www.real.com">RealNetworks Inc</a> RealPlayer lets you play every major media type, delivers pristine audio and video playback quality, plays CDs, DVDs and all major file type.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.realbasic.com"><img src="{{ STATIC_URL }}img/logos/partners/Realsoftware.png" alt="REAL Software Inc. "></a>
-
-          <p><a href="http://www.realbasic.com">REAL Software Inc.</a> provides powerful tools for software developers. REALbasic is a rapid-application development (RAD) environment for Linux, Windows and Mac OS X that compiles fully native applications for all three operating systems from one source project. REAL SQL Server is a fast and reliable database server ideal for use with REALbasic applications.</p>
-      </li>
-
-      <li class="four-col box">
-          <img src="{{ STATIC_URL }}img/logos/partners/rightscale_logo.png" alt="RightScale">
-
-          <p>RightScale is the leader in cloud computing management and offers a fully automated cloud management platform that enables organizations to easily deploy and manage business critical applications across multiple clouds with complete control and portability. The RightScale Cloud Management Platform is delivered as &quot;software as a service&quot; (SAAS) and is available in a range of editions.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.riptano.com"><img src="{{ STATIC_URL }}img/logos/partners/riptano-logo_scaled.png" alt="Riptano"></a>
-
-          <p><a href="http://www.riptano.com">Riptano</a> Cassandra is the most scalable and high performance database for online transactions available. Offering geographic distribution of data across multiple data centers and linear, incremental scalability, Cassandra allows the addition of resources on an as needed basis. Riptano is the company providing software, training and professional services for Apache Cassandra.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.ruffdogs.com"><img src="{{ STATIC_URL }}img/logos/partners/ruffdogs_logo.png" alt="Ruffdogs"></a>
-
-          <p><a href="http://www.ruffdogs.com">Ruffdogs</a> One of North America&#39;s Leading Linux Solutions Company. Through our channel partner program, we design, deliver, implement and support a wide range of Linux based solutions across North America.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.scalr.net"><img src="{{ STATIC_URL }}img/logos/partners/scalr_.png" alt="Scalr, Inc"></a>
-
-          <p><a href="http://www.scalr.net">Scalr, Inc</a> With Scalr, your website and web application can grow to millions of users with little work. Scalr will provision new servers on-the-fly to handle spikes in demand, and decommission them when no longer needed to lower cost. It will scale your database, application servers, and load balancers so you never have to. The end result? ...</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.smartapp.pl"><img src="{{ STATIC_URL }}img/logos/partners/smartapp-logo.png" alt="SmartApp Sp. z o.o"></a>
-
-          <p><a href="http://www.smartapp.pl">SmartApp Sp. z o.o</a> is a company specializing in the delivery of applications for the public sector in Poland, Slovakia and Serbia. The main areas of interest are: supporting judicial processes, documents management and digital signage with the special focus on the public (government) agencies.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.smartscalesystems.com"><img src="{{ STATIC_URL }}img/logos/partners/Smartscale_Logo_Scaled.png" alt="Smartscale"></a>
-
-          <p><a href="http://www.smartscalesystems.com">Smartscale</a> transforms the cloud by integrating automation, mobility and collaboration into a highly scalable cloud management platform. Your team is mobile and your cloud manager should help them engage anytime, anywhere – only Smartscale’s collaborative One Click Data Center runs on popular pads and smartphones helping you save time and money when you move to the ...</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.sparkintegration.com"><img src="{{ STATIC_URL }}img/logos/partners/Spark_Logo_canonical_scaled__.png" alt="Spark Integration Technologies Inc"></a>
-
-          <p><a href="http://www.sparkintegration.com">Spark Integration Technologies Inc</a> a maker of Distrix, is the world leader in distributed information exchange software. Distrix is a multi-platform, rapid development environment for cross-platform, network-centric systems. Used in mission critical, real time systems and large scale sensor networks, the Distrix model-driven development approach accelerates network-centric systems development.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.tersus.com"><img src="{{ STATIC_URL }}img/logos/partners/tersus.png" alt="Tersus"></a>
-
-          <p><a href="http://www.tersus.com">Tersus</a> The Tersus Visual Programming Platform enables easy creation of enterprise web applications by drawing visual flow diagrams instead of writing code.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.turnkeylinux.org/docs/tklpatch"><img src="{{ STATIC_URL }}img/logos/partners/turnkey_.png" alt="Turnkey Linux"></a>
-
-          <p><a href="http://www.turnkeylinux.org/docs/tklpatch">Turnkey Linux</a> not only offers the most comprehensive selection of appliance images for a growing list of cloud providers, it also provides an easy to use platform for building new appliances using any existing appliance as a starting point.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://ualinux.com"><img src="{{ STATIC_URL }}img/logos/partners/UALinux_spp_logo.png" alt="UA Linux"></a>
-
-          <p><a href="http://ualinux.com">UA Linux</a> Private Enterprise `UALinux` develops and maintains software and open source Ubuntu Applications Pack (UAPack). A suite of add-ons to Ubuntu Linux, to install a wide choice of software without connecting to the Internet. UAPack consists of the following:<br>
-          DesktopPack - for everyday use<br>
-          ServerPack - for server installations<br>
-          GamePack - games for ...</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.unison.com"><img src="{{ STATIC_URL }}img/logos/partners/Unison.png" alt="Unison "></a>
-
-          <p><a href="http://www.unison.com">Unison</a> is the leading unified communications software. It integrates telephony, e-mail, instant messaging and collaboration in a single Linux server and a desktop client. More powerful than old-fashioned separate systems, such as a PBX or e-mail server, Unison increases a company&#39;s productivity by 15% while vastly decreasing IT costs.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.unitrends.com"><img src="{{ STATIC_URL }}img/logos/partners/Unitrends.png" alt="Unitrends"></a>
-
-          <p><a href="http://www.unitrends.com">Unitrends</a> provides enterprise-level data protection, at the lowest total cost of ownership, through a family of scalable disk-based data protection appliances that integrate and protect existing heterogeneous computer and storage systems through a single, graphical user interface. Unitrends uses a backup and recovery engine that protects more than 100 different versions of operating systems and applications.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.unovyx.com"><img src="{{ STATIC_URL }}img/logos/partners/unovyx_large_logo_scaled.png" alt="Unovyx, LLC"></a>
-
-          <p><a href="http://www.unovyx.com">Unovyx, LLC</a> is a proud provider of products, services and solutions to the growing data storage and networking industry. Globally, data storage and networking form the foundations of computing. There is an increasing need for excellent quality and high performing products matched with services and support of the same caliber.</p>
-      </li>
-
-      <li class="four-col box">
-          <img src="{{ STATIC_URL }}img/logos/partners/Unoware_logo.scaled.png.jpg" alt="Unoware">
-
-          <p>Unoware provides enterprise-level business and IT solutions, considering the lowest total cost of ownership. Using a pack of software-based solutions, we help your company achieve the best effort possible considering the QoS required within a competitive market. Our solutions implement the best standards for SOA, BPM and EAM, considering virtualization and high-availability run times, running entirely ...</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://userful.com"><img src="{{ STATIC_URL }}img/logos/partners/Userful-new.jpg" alt="Userful"></a>
-
-          <p><a href="http://userful.com">Userful</a> effectively turns one PC into Ten. Userful Multiplier; is a simple Ubuntu software add-on (included in Multiverse) that enables a single PC equipped with extra video cards to support up to 10 simultaneous users (each with their own monitor, USB keyboard and mouse).</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.usharesoft.com"><img src="{{ STATIC_URL }}img/logos/partners/usharesoft_Scaled_.png" alt="UShareSoft"></a>
-
-          <p><a href="http://www.usharesoft.com">UShareSoft</a> simplifies software governance and application migration for the cloud. UShareSoft&#39;s UForge Appliance Factory enables &quot;à la carte&quot; software delivery by automating the creation and maintenance of image templates on any OS for any cloud, virtual or physical format. UForge Elastic Appliances are self-deployable images that automatically configure mult-tier software solutions in minutes.</p>
-      </li>
-
-      <li class="four-col box">
-          <img src="{{ STATIC_URL }}img/logos/partners/VIPcom.png" alt="VIPcom GmbH">
-
-          <p>VIPcom GmbH teamXchange - the alternative to Exchange - offers Outlook clients a high performance range mapping MAPI architecture. Up to 1,000 users have access to the same objects, e.g., calendar entries, contact data, messages and journals. Applications can be linked via open interfaces (Java SDK, MAPI, or C++). Evolution connector and Webclient released in Q4 2007.</p>
-      </li>
-
-      <li class="four-col box">
-          <img src="{{ STATIC_URL }}img/logos/partners/virtualappliances.png" alt="Virtual Appliances">
-
-          <p>Virtual Appliances are nano-sized Linux virtual machines with web user interfaces for deploying instant infrastructure and applications which run on vmware/xen/virtualpc/virtualiron.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.vbridges.com"><img src="{{ STATIC_URL }}img/logos/partners/VirtualBridges.png" alt="Virtual Bridges"></a>
-
-          <p><a href="http://www.vbridges.com">Virtual Bridges</a> VERDE is the industry&#39;s most comprehensive desktop management and provisioning solution to deliver desktops in the cloud using desktop virtualization. The VERDE solution lets enterprises transform their desktop TCO by simplifying desktop management, improving security and compliance by centralizing the administration of desktop images and data, and increasing the organizational agility.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.vladster.net"><img src="{{ STATIC_URL }}img/logos/partners/Vladster.png" alt="Vladster Ltd"></a>
-
-          <p><a href="http://www.vladster.net">Vladster Ltd</a> Vladster delivers Point of Sale and inventory management solutions for small and medium sized businesses. Our main open source product IncoPOS gives you great control over your business. IncoPOS also includes very powerful non-free add-ons which make the interaction with other management systems and data visualization a breeze.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.vmware.com"><img src="{{ STATIC_URL }}img/logos/partners/VMWare.png" alt="VMware"></a>
-
-          <p><a href="http://www.vmware.com">VMware</a> products provide enterprise-class virtual machines that increase server and other resource utilisation, improve performance, increase security and minimise system downtime, reducing the cost and complexity of delivering enterprise services.</p>
-      </li>
-
-      <li class="four-col box">
-          <img src="{{ STATIC_URL }}img/logos/partners/w3internetsolutions.png" alt="W3 Internet Solutions ">
-
-          <p>W3 Internet Solutions is a global web agency who offers its customers exclusive advantages, on the one hand by the wide range of available services and on the other hand by the special care given to the performance and to all its realizations optimization.<br></p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.wandisco.com"><img src="{{ STATIC_URL }}img/logos/partners/wandisco_scaled.png" alt="WANdisco, Inc"></a>
-
-          <p><a href="http://www.wandisco.com">WANdisco, Inc</a> are the makers of Enterprise Subversion with active core developers from the Subversion open source project on staff. WANdisco&#39;s Subversion Enterprise products add performance, replication, scalability and high availability to open source. Subversion. Subversion is recognized by Forrester as the sole leader in the Standalone Software Configuration Management (SCM) category. WANdisco Subversion binaries running on ...</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.wavemaker.com"><img src="{{ STATIC_URL }}img/logos/partners/Wavemaker.png" alt="WaveMaker Software"></a>
-
-          <p><a href="http://www.wavemaker.com">WaveMaker Software</a> is the only open and easy-to-use web and cloud development platform. WaveMaker&#39;s visual, drag and drop tools flatten the Java learning curve by 92% and create standard Java applications with 98% less code. WaveMaker applications are cloud-ready and include built-in support for multi-tenancy and elastic scaling.<br></p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://wso2.com"><img src="{{ STATIC_URL }}img/logos/partners/wso2_logo.png" alt="WSO2"></a>
-
-          <p><a href="http://wso2.com">WSO2</a> is the lean enterprise middleware company. It delivers the only complete open source enterprise SOA middleware stack purpose-built as an integrated platform to support today’s heterogeneous enterprise environments—internally and in the cloud. WSO2’s service and support team is led by technical experts who have proven success in deploying enterprise SOAs.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.xaxero.com"><img src="{{ STATIC_URL }}img/logos/partners/skylogo.png" alt="Xaxero Marine Software Engineering Limited"></a>
-
-          <p><a href="http://www.xaxero.com">Xaxero Marine Software Engineering Limited</a> A New Zealand based company offering innovative solutions to allow the mariner to See Beyond the Horizon developing radio and satellite based products for real time weather imaging and offering consulting for ocean going leisure and commercial vessels to maximize Internet access over limited bandwidth.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.xcelerit.com"><img src="{{ STATIC_URL }}img/logos/partners/xceleritlogoscaled_.png" alt="Xcelerit computing ltd"></a>
-
-          <p><a href="http://www.xcelerit.com">Xcelerit computing ltd</a> provides an SDK that boosts the performance of processing-intensive applications. It seamlessly leverages the full processing power of workstations and clusters with multi-core CPUs, GPUs, or other specialised processors. This is achieved with a single source code and without the need to specifically address parallelism (e.g. threads, synchronisation, etc.).</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.zarafa.com"><img src="{{ STATIC_URL }}img/logos/partners/zarafa.png" alt="Zarafa Deutschland GmbH"></a>
-
-          <p><a href="http://www.zarafa.com">Zarafa Deutschland GmbH</a> is a groupware server platform that enables you to share e-mail and calendars via Outlook, through the Zarafa Webaccess or on your PDA. The Zarafa Webaccess uses the familiar Outlook &#39;Look &amp; Feel&#39; interface where you can keep using all features that have always allowed you to work efficiently.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.zend.com/en/products/core/"><img src="{{ STATIC_URL }}img/logos/partners/zend.png" alt="Zend Technologies, Inc"></a>
-
-          <p><a href="http://www.zend.com/en/products/core/">Zend Technologies, Inc</a> the PHP Company, is the leading provider of products and services for developing, deploying and managing business-critical PHP applications. The Zend family of products is a comprehensive platform for supporting the entire lifecycle of PHP applications, used on over 20 million websites. For more information, please visit www.zend.com or call +1 408-253-8800.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.zenoss.com"><img src="{{ STATIC_URL }}img/logos/partners/z-logo-black.jpg" alt="Zenoss"></a>
-
-          <p><a href="http://www.zenoss.com">Zenoss</a> is a leading commercial open source provider of Unlegacy enterprise IT management products. Zenoss Enterprise is a single model-based product that enables organizations to seamlessly manage physical, virtual and cloud based infrastructure with unprecedented power, agility and value. Leveraging a commercial open source model, Zenoss products monitor over one million network and server devices daily.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.zeus.com"><img src="{{ STATIC_URL }}img/logos/partners/zeus.png" alt="Zeus Technology"></a>
-
-          <p><a href="http://www.zeus.com">Zeus Technology</a> develops application traffic management software, meaning we dramatically improve network and web-enabled applications and services making them faster, reliable, secure and easy to manage. As the only pure software traffic management solution available, we&#39;re flexible whatever your deployment environment; Zeus appliances, standard servers, blades, or virtualised environments.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.zimbra.com/"><img src="{{ STATIC_URL }}img/logos/partners/zimbra.png" alt="Zimbra"></a>
-
-          <p><a href="http://www.zimbra.com/">Zimbra</a> a VMware company, is the leader of next-generation messaging and collaboration. Zimbra Collaboration Suite is an open source platform for Ubuntu with enterprise-class email, calendaring, document authoring, instant messaging and mobile device synchronization. It is used by more than 50,000 organizations; find out more at http://www.zimbra.com.</p>
-      </li>
-
-      <li class="four-col box">
-          <a href="http://www.zmanda.com"><img src="{{ STATIC_URL }}img/logos/partners/zmanda.png" alt="Zmanda Inc"></a>
-
-          <p><a href="http://www.zmanda.com">Zmanda Inc</a> brings the benefits of open source to enterprise backup/recovery. The company offers the industry’s leading open source backup/recovery products, including Amanda Enterprise, a network backup and recovery solution based on AMANDA, the world&#39;s most popular open source backup/recovery software, and Zmanda Recovery Manager for MySQL.</p>
-      </li>
-  </ul>
-</div><!-- / .row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/partners/find-a-partner/reseller.html b/templates/partners/find-a-partner/reseller.html
deleted file mode 100755
index 7a0f7ed9318..00000000000
--- a/templates/partners/find-a-partner/reseller.html
+++ /dev/null
@@ -1,135 +0,0 @@
-{% extends "partners/base_partners.html" %}
-
-{% block title %}Reseller partners{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Partners" subsection_title="Find a partner" page_title="Reseller partners" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero">
-	<div class="eight-col">
-		<h1>Reseller partners</h1>
-	</div><!-- / .five-col -->
-	<a href="/partners/contact-us" class="link-cta-ubuntu right">Apply to become a partner</a>
-</div><!-- / .row -->
-
-<div class="row equal-height">
-	<h2 id="global">Global</h2>
-	<div class="four-col box">
-	        <a href="http://aptira.com/"><img src="{{ STATIC_URL }}img/logos/partners/aptira.png" alt="Aptira" /></a>
-	        <p><a href="http://aptira.com/">Aptira</a> is the leading provider of OpenStack in Australia, India and the APAC region, providing private and hybrid cloud solutions and technology consultancy.  Aptira works with a wide range of organisations in finance, retail, utilities and government and is the founder and prime motivator of the OpenStack community in Australia and India.</p>
-	</div>
-	<div class="four-col box">
-	        <a href="http://www.wipro.com/"><img src="{{ STATIC_URL }}img/logos/partners/wipro.jpg" alt="Wipro" /></a>
-	        <p><a href="http://www.wipro.com/">Wipro Ltd</a> is a global information technology, consulting and outsourcing company working with Canonical as an Ubuntu Advantage Reseller partner delivering professional services and support to Ubuntu users all over the world. Wipro helps customers do business better leveraging its industry-wide experience, deep technology expertise, comprehensive portfolio of services and a vertically aligned business model.</p>
-	</div>
-</div>
-
-<div class="row equal-height">
-	<h2 id="as">Asia</h2>
-	<div class="four-col box">
-		<h3 id="Malaysia">Malaysia</h3>
-        <a href="http://www.mesiniaga.com.my/"><img src="{{ STATIC_URL }}img/logos/partners/Mesiniaga_Logo_Ori-4.png" alt="Mesiniaga" /></a>
-        <p><a href="http://www.mesiniaga.com.my/">Mesiniaga</a> is one of Malaysia&#39;s leading systems integrator and is listed on Bursa Securities with a paid-up capital of RM60.4 million. In fulfilling its mission to drive customer business performance, it harnesses technology that best serves customer business objectives and combines it with expertise derived from a deep understanding of customer environment. <br /></p>
-	</div>
-	<div class="four-col box">
-		<h3 id="China">China</h3>
-        <a href="http://www.awcloud.com/"><img src="{{ STATIC_URL }}img/logos/partners/awcloud.png" alt="AWCloud" /></a>
-        <p><a href="http://www.awcloud.com/">AWCloud</a> provides enterprise-grade private and hybrid cloud solution based on OpenStack, also provides technical support, professional services and training for commercial-grade OpenStack deployments in China.<br /></p>
-	</div>
-	<div class="four-col last-col box">
-		<h3 id="Indonesia">Indonesia</h3>
-        <a href="http://www.meruvian.com/en_GB"><img src="{{ STATIC_URL }}img/logos/partners/meruvian.png" alt="Meruvian" /></a>
-        <p><a href="http://www.meruvian.com/en_GB">Meruvian</a> is an integrated Java and Enterprise OpenSource Provider, founded in 2006 by Frans Thamura, a Java Champion, JUG Indonesia Leader, OpenStack-ID Leader, CloudFoundry-ID Leader, OpenPaaS Initiative.</p>
-        <p>Meruvian provides Integrated Education Services, Training, Integration, System Integration and Business Process Outsourcing both on-premise and as Cloud/SaaS.</p>
-	</div>
-</div>
-<div class="row">
-	<div class="four-col">
-	<h2 id="af">Africa</h2>
-	    <div class="box">
-			<h3 id="South Africa">South Africa</h3>
-	        <a href="http://www.lsd.co.za/"><img src="{{ STATIC_URL }}img/logos/partners/LSD.png" alt="Linux System Dynamics" /></a>
-	        <p><a href="http://www.lsd.co.za/">LSD Information Technology</a> is a young, dynamic and energetic company founded in 2002 in Southern Africa. LSD Information Technology has fast become synonymous with Passion and Expertise in the Open Source Community and coupled with our extended skills in Linux means that we deliver a great customer experience</p>
-	    </div>
-	</div>
-
-</div>
-
-<div class="row equal-height">
-	<h2 id="eu">Europe</h2>
-	<div class="four-col box">
-		<h3 id="Denmark">Denmark</h3>
-        <a href="http://fleten.net/"><img src="{{ STATIC_URL }}img/logos/partners/fleten.netLogo1.jpg" alt="Fleten.net" /></a>
-        <p><a href="http://fleten.net/">Fleten.net</a> ApS provides solutions for schools, institutions and companies based on Ubuntu and Edubuntu. We have experience with cloud servers, LTSP and reuse of old hardware as thin clients. Our goal is to provide professional, fast, transparent and reliable systems without costly investments in software and hardware.</p>
-	</div>
-
-	<div class="four-col box">
-		<h3 id="Norway">Norway</h3>
-        <a href="http://www.linpro.no"><img src="{{ STATIC_URL }}img/logos/partners/rplp_log_rgb_200_gif.gif" alt="Redpill Linpro AS" /></a>
-        <p><a href="http://www.linpro.no">Redpill Linpro AS</a> Redpill Linpro is the leading provider of Professional Open Source services and products in the Nordic region. We provide consulting, development services, training, support, application management and IT operations for Open Source products ranging from infrastructure, databases, middleware and enterprise applications to customer specific solutions based on Open Source components.</p>
-	</div>
-
-	<div class="four-col last-col box">
-		<h3 id="Russian Federation">Russian Federation</h3>
-        <a href="http://www.ncpr.su/"><img src="{{ STATIC_URL }}img/logos/partners/NCPR_scaled____.JPG" alt="National Center of Support and Development" /></a>
-        <p><a href="http://www.ncpr.su/">National Center of Support and Development</a> (&quot;NCPR&quot;) works on creation of integrated software platform, based on open-source software, and on development of the partner solutions ecosystem on the platform&#39;s basis. &quot;NCPR&quot; cooperates with the world&#39;s leading vendors of open-source products for adaption of the world&#39;s best technologies for Russian market requirements, and for support of the products and solutions in Russia.</p>
-	</div>
-
-	<div class="four-col box">
-		<h3 id="Spain">Spain</h3>
-        <a href="http://www.zentyal.com/partners/join/"><img src="{{ STATIC_URL }}img/logos/partners/Zentyallogo.png" alt="Zentyal " /></a>
-        <p><a href="http://www.zentyal.com/partners/join/">Zentyal </a> ,developer of the Zentyal Linux small business server, has reached an agreement with Canonical offering Ubuntu Advantage to SMBs through Zentyal Partner Network. Zentyal partners provide high-value services based on Zentyal small business server and now they can also extend their offering to Ubuntu desktop and application servers. <br /></p>
-	</div>
-
-	<div class="four-col box">
-		<h3 id="United Kingdom (Great Britain)"></a> United Kingdom (Great Britain)</h3>
-        <a href="http://www.i-layer.com/ubuntu/"><img src="{{ STATIC_URL }}img/logos/partners/i-Layer.png" alt="i-Layer" /></a>
-        <p><a href="http://www.i-layer.com/ubuntu/">i-Layer</a> is the layer in any business where technical innovation can make a <br />difference to the bottom line. It might be as simple as a new website - or as <br />grand as a whole new infrastructure. <br />At Innovation Layer we have both creativity and experience in business - <br />and are long term ...</p>
-	</div>
-
-	<div class="four-col last-col box">
-		<h3 id="Germany">Germany</h3>
-        <a href="http://teuto.net/"><img src="{{ STATIC_URL }}img/logos/partners/teutonet.png" alt="Teuto.net" /></a>
-        <p><a href="http://teuto.net/">Teuto.net</a>, Netzdienste GmbH is an Internet-Service-Provider, Datacenter-Solutions-Provider and system-builder focusing on business customers in Germany. teuto.net provides Linux-based systems and solutions, consulting, management and training since 1994. Technical services are added with complex Intra- and Internet-Application development. Our own 24/7 support-center and datacenter is located in Bielefeld/NRW.</p>
-	</div>
-	<div class="four-col box">
-		<h3 id="germany">Germany</h3>
-        <a href="https://www.b1-systems.de/"><img src="{{ STATIC_URL }}img/logos/partners/b1-systems.png" alt="B1 Systems" height="50" /></a>
-        <p><a href="https://www.b1-systems.de/">B1 Systems GmbH</a> is a German provider of consulting, training, development &amp; support services based on Linux and Open Source founded in 2004. Our team of more than 65 Linux experts offers tailor-made solutions based on virtualization, high availability and cloud computing technologies as well as monitoring, system and configuration management. B1 helps turn Open Source innovation into Enterprise reliability and performance &mdash; nationally and internationally.</p>
-	</div>
-	<div class="four-col box">
-		<h3 id="belgium">Belgium</h3>
-        <a href="http://kangaroot.net/"><img src="{{ STATIC_URL }}img/logos/partners/Kangaroot.png" alt="Kangaroot" /></a>
-        <p><a href="http://kangaroot.net/">Kangaroot</a> is Belgium&rsquo;s most experienced Linux and open source service provider. Our certified engineers design, install and support infrastructure solutions for multinationals, all levels of government, mid-size companies and non-profit organisations. We deliver real added value by increasing efficiency and solving strategic business technology challenges within budget and implementation time.</p>
-	</div>
-	<div class="four-col last-col box">
-		<h3 id="switzerland">Switzerland</h3>
-        <a href="https://adfinis-sygroup.ch/"><img src="{{ STATIC_URL }}img/partners/adfinisSyGroup_Logo2C.png" alt="Adfinis SyGroup logo" /></a>
-        <p><a href="https://adfinis-sygroup.ch/">Adfinis SyGroup</a> is a well-established Swiss Linux systems integrator. As a trusted partner and service provider, they support customers from both the public and private sectors. Their portfolio includes project planning and implementation, systems operation and monitoring, and the protection of business data and processes.</p>
-	</div>
-</div>
-
-<div class="row no-border equal-height">
-	<h2 id="sa">South America</h2>
-	<div class="four-col box">
-    	<h3 id="Brazil">Brazil</h3>
-        <a href="http://www.f13.com.br"><img src="{{ STATIC_URL }}img/logos/partners/logo_f13_fundo_scaled.png" alt="F13 Tecnologia" /></a>
-        <p><a href="http://www.f13.com.br">F13 Tecnologia</a> is focused on providing services with open source solutions for the business market - from small businesses to large corporations. It provides technical support, targeted training, consulting and specialized services for managing IT infrastructures. Since 2004, F13 Tecnologia is committed to its clients in seriousness, professionalism and quality service.</p>
-	</div>
-
-	<div class="four-col box">
-    	<h3>Brazil</h3>
-        <a href="http://www.solis.coop.br/"><img src="{{ STATIC_URL }}img/logos/partners/Solis.png" alt="Solis Cooperativa de Soluções Livres Ltda" /></a>
-        <p><a href="http://www.solis.coop.br/">Solis Cooperativa de Soluções Livres Ltda</a> is a company specialized in consultancy, free software development and technological support services, mainly acting in three segments: education, coorporative and governmental. With over 50 highly qualified professionals, Solis is today a model of innovation and a reference on the IT segment.</p>
-	</div>
-
-	<div class="four-col last-col box">
-		<h3 id="Peru">Peru</h3>
-        <a href="http://www.e-nteractiva.com/"><img src="{{ STATIC_URL }}img/logos/partners/E-nteractiva2.png" alt="E-nteractiva" /></a>
-        <p><a href="http://www.e-nteractiva.com/">E-nteractiva</a> provides world-class, cloud-based platforms and services to businesses; delivering the most cost-effective technologies in the markets we operate becoming a trusted advisor to our customers and channel partners in Latin America. <br />E-nteractiva deliver Canonical Services and Support to Peru, Argentina, Chile, Ecuador and Bolivia. <br /> <br /></p>
-	</div>
-</div><!-- / .row -->
-
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/partners/hp/index.html b/templates/partners/hp/index.html
deleted file mode 100755
index 5729a947ef8..00000000000
--- a/templates/partners/hp/index.html
+++ /dev/null
@@ -1,79 +0,0 @@
-{% extends "partners/base_partners.html" %}
-
-{% block title %}HP and Ubuntu{% endblock %}
-
-{% block meta_keywords %}Ubuntu on HP Proliant Servers, HP Moonshot, HP Proliant, Ubuntu Server HP PC HP ProBook HP Elitebook  HP Microtower HP All-in-one HP Compaq Pro Elite Microtower HP Moonshot System Ubuntu HP CloudSystem HP Converged Cloud HP Cloud Services{% endblock %}
-{% block meta_description %}HP and Ubuntu partner page for ubuntu.com.  {% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Partners" page_title="HP" tertiary="true" %}
-{% endblock second_level_nav_items %}
-
-
-{% block content %}
-<div class="row row-hero row-image-centered">
-	<div class="eight-col">
-		<h1>HP and Ubuntu</h1>
-		<p>Ubuntu is the scale-out platform for HP’s ProLiant and Moonshot Systems, and the foundation for HP Cloud Services. Ubuntu is also certified and pre-loaded on the latest HP Laptop and Desktop PCs.</p>
-		<p>Together, Canonical and HP deliver joint engineering, certification and support to give customers the best experience possible.</p>
-	</div><!-- /.six-col -->
-	<span><img src="{{ STATIC_URL }}img/partners/partners-logo-hp.png" alt="Dell" /></span>
-</div><!-- / .row -->
-
-{% include "_includes/_moonshot_promo.html" %}
-
-<div class="row">
-	<div class="six-col">
-		<blockquote class="pull-quote">
-			<p><span>&ldquo;</span>Enterprises are embracing open-source cloud solutions to increase workload portability and avoid vendor lock-in&nbsp;<span>&rdquo;</span></p>
-			<p><cite>Saar Gillai, VP and GM <br />Converged Cloud, HP</cite></p>
-		</blockquote>
-	</div>
-	<div class="six-col last-col">
-		<h2>HP Cloud with Ubuntu</h2>
-		<p>HP Public Cloud is built on Ubuntu.  HP Cloud Services delivers public cloud infrastructure that&rsquo;s business grade, open source-based, and developer focused &mdash; all based on Ubuntu <br />and OpenStack.</p>
-		<p>HP Private Cloud solutions can be built using Ubuntu too.</p>
-		<p><a href="/cloud/contact-us">Find out more&nbsp;&rsaquo;</a></p>
-	</div>
-
-</div><!-- /.row -->
-<div class="row hp-pcs">
-	<div class="eight-col">
-		<h2>Ubuntu for HP PCs</h2>
-		<p>Customers who want the speed and simplicity of Ubuntu on their PC can select from a wide range of HP desktops and laptops certified and pre-loaded with <br/>the OS.</p>
-		<p>Ubuntu provides developers with the largest selection of tools. Businesses get access to legacy applications without paying for unwanted licenses. Ubuntu gives all users a smooth experience and thousands of apps.</p>
-		<p><a href="http://www.ubuntu.com/certification/desktop/models/?query=hp&category=Desktop&category=Laptop&category=Netbook&release=&level=Any">HP PCs certified with Ubuntu&nbsp;&rsaquo;</a></p>
-		<p><a href="/tour/12.04/en/" title="Take the Ubuntu 12.04 LTS Desktop Tour">Take the online tour of the Ubuntu 12.04 LTS desktop&nbsp;&rsaquo;</a></p>
-	</div>
-</div>
-
-<div class="row row-image-centered">
-	<div class="eight-col">
-		<h2>Ubuntu and HP in education</h2>
-		<p>Fast, stable, secure and easy-to-use Ubuntu pre-loaded on optimised HP hardware creates an environment that students, teachers and support staff will love using. System administrators will find management easy thanks to the OS support, and the system tools available. And the institution will benefit from HP-Ubuntu solutions&rsquo; excellent performance and  significantly lower budgetary requirements compared with their proprietary alternatives.</p>
-		<p><a href="http://insights.ubuntu.com/news/ubuntu-helps-millions-of-indian-students-to-learn/">Learn more about Ubuntu and HP in education&nbsp;&rsaquo;</a></p>
-		<!-- <p><a class="" href="#">Contact us&nbsp;&rsaquo;</a></p> -->
-	</div>
-	<span><img src="{{ STATIC_URL }}img/pictograms/image-picto-education-211.png" alt="" width="211" height="211" /></span>
-</div>
-
-<div class="row server-hp-proliant">
-	<div class="prepend-two nine-col">
-		<h2>Ubuntu Server for HP ProLiant</h2>
-		<p>With Ubuntu Server on HP ProLiant, you can deploy services faster and more flexibly than ever before.</p>
-		<p>Ubuntu is the ideal scale-out platform for web, big data and cloud. Crucially, Ubuntu Server includes Ubuntu Cloud, the Infrastructure as a Service (IAAS) platform built on OpenStack.</p>
-		<p>Ubuntu Server on HP ProLiant provides a cost-effective  scale-out foundation for datacentres and cloud infrastructure. It includes native support for thousands of next-generation applications, from virtualisation and web serving to NoSQL and big data analytics.</p>
-		<p><a href="http://www.ubuntu.com/certification/server/models/?query=hp&release=&level=Any">HP ProLiant certified with Ubuntu&nbsp;&rsaquo;</a></p>
-	</div><!-- /.six-col -->
-</div><!-- /.row -->
-<div class="row row-grey no-border certified-software">
-	<div class="six-col">
-		<img src="{{ STATIC_URL }}img/partners/hp/image-certifiedsystems.svg" width="420" height="120" alt="" />
-	</div>
-	<div class="six-col last-col">
-		<h2>Certified systems</h2>
-			<p>Ubuntu Server and Ubuntu Desktop are certified and enabled across a wide range of HP ProLiant systems, so you can deploy with confidence.</p>
-			<p><a href="http://www.ubuntu.com/certification/make/HP/">See the HP Certification and Support matrix&nbsp;&rsaquo;</a></p>
-	</div><!-- /.six-col -->
-</div><!-- /.row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/partners/hp/moonshot.html b/templates/partners/hp/moonshot.html
deleted file mode 100755
index 1f50182ff93..00000000000
--- a/templates/partners/hp/moonshot.html
+++ /dev/null
@@ -1,106 +0,0 @@
-{% extends "partners/base_partners.html" %}
-
-{% block title %}HP Moonshot and Ubuntu work together{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Partners" subsection_title="HP" page_title="Moonshot"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero">
-	<div class="seven-col">
-		<h1>Ubuntu: the OS for every Moonshot server</h1>
-		<p>Ubuntu Server is the only operating system that boasts full support for every Moonshot server cartridge, covering hardware based on both x86 and ARM chipsets.</p>
-		<p>Already recognised as the leader in hyperscale computing, Ubuntu brings proven scale-out tools to the Moonshot range, including MAAS for automated provisioning and Juju for service orchestration.</p>
-		<p><a href="/server/contact-us">Contact us about HP Moonshot&nbsp;&rsaquo;</a></p>
-	</div>
-	<div class="five-col last-col">
-		<div class="video-container">
-			<iframe width="343" height="193" src="http://www.youtube.com/embed/JmoovOU28UA?rel=0" frameborder="0" allowfullscreen></iframe>
-		</div>
-		<p class="note">Chris Kenyon, VP Sales and Business Development, Canonical, talks about Ubuntu and HP Moonshot</p>
-	</div>
-</div><!-- / .row -->
-<div class="row row-image-centered">
-
-	<div class="eight-col">
-		<h2>Cutting costs and energy consumption in the datacentre</h2>
-		<p>Ubuntu has been targeting scale&dash;out applications for several years now, making Canonical a natural partner for the HP Moonshot project. As a result, Canonical and HP are delivering massive reductions in cost and energy consumption in datacentres the world over &dash; and they&rsaquo;re doing it today. </p>
-	</div><!-- /.six-col -->
-	<span>
-		<img src="{{ STATIC_URL }}img/partners/hp/moonshot/image-hpmoonshot.svg" width="256" height="240" alt="" />
-	</span>
-</div><!-- /.row -->
-<div class="row">
-	<div class="six-col">
-		<blockquote class="pull-quote">
-			<p><span>&ldquo;</span>A new wave of workloads demand breakthrough efficiencies in density, energy, and operational costs which can be scaled to a customer&rsquo;s IT environment.<span>&rdquo;</span></p>
-			<p><cite>Paul Santeler, VP &amp; GM, Hyperscale Business Unit, HP</cite></p>
-		</blockquote>
-	</div><!-- /.six-col -->
-	<div class="six-col last-col">
-		<h2>Running low on space?<br />Talk to us about Moonshot</h2>
-		<p>The Moonshot system makes it possible to run many more servers in any given space in your datacentre &dash; with greatly reduced  power requirements for both processing and cooling, cutting your costs further. Only Ubuntu runs right across the range, leaving you free to choose only the best hardware for your needs. </p>
-		<p><a href="/server/contact-us">Contact us today about Ubuntu on HP Moonshot.  &nbsp;&rsaquo;</a></p>
-	</div><!-- /.six-col -->
-</div><!-- /.row -->
-
-<div class="row row-image-centered row-grey">
-	<div class="eight-col">
-		<h2>Part of the Pathfinder project</h2>
-		<p>The HP Pathfinder Innovation Ecosystem establishes a close collaboration of industry-leading technology partners dedicated to accelerating the development and deployment of energy-efficient, workload-optimised servers.</p>
-		<p>As a committed member, Canonical works with HP and other strategic partners to accelerate innovation that delivers breakthroughs in efficiency and scale. </p>
-	</div>
-	<span><img src="{{ STATIC_URL }}img/partners/pathfinder-moonshot.png" width="200" height="113" alt="HP Pathfinder Innovation Ecosystem logo"  /></span>
-</div><!-- /.row -->
-<div class="row row-image-centered">
-	<div class="six-col text-center">
-		<img src="{{ STATIC_URL }}img/partners/hp-moonshot-server.jpg" width="365" height="305" alt="HP moonshot server" />
-	</div>
-	<div class="six-col last-col">
-		<h2>Webscale, hyperscale, any&nbsp;scale</h2>
-		<p>The HP Moonshot System is modular, allowing datacentre managers to purchase server cartridges optimised for particular tasks. Whether it&rsquo;s web hosting, thin client desktop hosting, big data processing or any other hyperscale application, Ubuntu runs on every Moonshot cartridge and supports every conceivable workload. </p>
-		<p><a href="http://www.hp.com/go/moonshot">Find out more about HP Moonshot&nbsp;&rsaquo;</a></p>
-	</div>
-</div><!-- /.row -->
-<div class="row">
-	<div class="ten-col no-margin">
-		<h2>Service orchestration and systems management</h2>
-	</div>
-	<div class="eight-col no-margin">
-		<p>Ubuntu Server includes a sophisticated toolset for provisioning, deployment, service orchestration and ongoing systems management for cloud and hyperscale applications &dash; and it all works just as well on ARM servers as it does on x86. It includes:</p>
-	</div>
-	<div class="combined-list">
-		<ul class="list-ubuntu six-col">
-			<li>Metal as a Service (MAAS) for the automated server provisioning, across zones and datacentres</li>
-			<li class="last-item">Landscape for the ongoing management of thousands of nodes, physical or virtual</li>
-		</ul>
-		<ul class="list-ubuntu six-col last-col">
-			<li class="last-item">Juju for service orchestration, saving time and eliminating human error, even when configurations and relationships between services change</li>
-		</ul>
-	</div>
-	<div class="eight-col">
-		<p><a href="/server/hyperscale">Find out more about Ubuntu Server for Hyperscale&nbsp;&rsaquo;</a></p>
-	</div>
-</div><!-- /.row -->
-<div class="row">
-	<div class="eight-col no-margin">
-		<h2>How Canonical and HP work together</h2>
-		<p>Canonical works hand-in-hand with HP to enable Ubuntu across the Moonshot range, specifically:</p>
-	</div>
-	<div class="combined-list">
-		<ul class="list-ubuntu six-col">
-			<li>HP Moonshot System with Ubuntu are available for testing, development and validation in HP&rsquo;s Discovery Labs</li>
-			<li class="last-item">Canonical is a member of HP&rsquo;s Pathfinder Innovation Ecosystem</li>
-		</ul>
-		<ul class="list-ubuntu six-col last-col">
-			<li>Ubuntu is part of the Solution Builder Program for fast and easy customer deployments</li>
-			<li class="last-item">Canonical is involved in the HP Redstone development platform which enables hyperscale workloads to run using ultra&dash;low power levels.</li>
-		</ul>
-	</div>
-	<div class="eight-col">
-		<p><a href="/business/services/contact">Contact us to discuss how Canonical can enable your HP Moonshot System&nbsp;&rsaquo;</a></p>
-	</div>
-</div><!-- /.row -->
-
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/partners/ibm.html b/templates/partners/ibm.html
deleted file mode 100755
index 4a19bd7db8a..00000000000
--- a/templates/partners/ibm.html
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends "partners/base_partners.html" %}
-
-{% block title %}IBM and Ubuntu{% endblock %}
-
-{% block content %}
-<div class="row row-hero row-image-centered">
-	<div class="six-col">
-		<h1>IBM and Ubuntu</h1>
-		<p>Canonical and the Ubuntu community work together with IBM to ensure that Ubuntu Server and Ubuntu Cloud work seamlessly with IBM applications. Our long relationship has resulted in many open-source customer engagements. We continue to collaborate in areas like KVM, OpenStack, VDI and devops, to provide reference architectures, supported solutions and cloud offerings, now and in the future.</p>
-	</div><!-- /.six-col -->
-	<span><img src="{{ STATIC_URL }}img/partners/partners-logo-ibm.png" alt="Dell" /></span>
-</div><!-- / .row -->
-<div class="row">
-	<h2>IBM DB2 9.7 supports Ubuntu LTS</h2>
-	<div class="six-col">
-		<p>Ubuntu has successfully passed IBM&rsquo;s stringent process for ensuring compliance with DB2 Universal Database for Linux. Together, DB2 UDB and Ubuntu deliver a stable environment in which to run business applications based on DB2. Canonical and IBM are both members of oVirt and OVA - and founding members of the OpenStack foundation.</p>
-	</div><!-- /.six-col -->
-	<div class="six-col last-col">
-		<p>IBM DB2 9.7 and future versions support all LTS versions of Ubuntu. The relationship helps ensure that customers of IBM and Canonical can deploy the leading database software on the world&rsquo;s favourite free server operating system, with enterprise-grade support provided by IBM and Canonical.</p>
-	</div><!-- /.six-col -->
-</div><!-- /.row -->
-<div class="row row-image-centered">
-	<span>
-		<img src="{{ STATIC_URL }}img/partners/ibm/image-certifiedsystems.svg" alt="" />
-	</span><!-- /.six-col -->
-	<div class="six-col last-col">
-		<h2>Certified systems</h2>
-			<p>Canonical and IBM work closely together to ensure that IBM System X servers are certified for the latest Ubuntu Server versions, including Ubuntu Server 12.04 LTS, the current long-term support release.</p>
-			<p>Canonical certifies hardware using an extensive set of hardware and operating system tests, representative of in-field use to ensure System X hardware is fully compatible with Ubuntu.</p>
-			<p><a href="http://www.ubuntu.com/certification/server/make/IBM/">See all IBM systems certified by Ubuntu&nbsp;&rsaquo;</a></p>
-		<p><a href="/tour/12.04/en/" title="Take the Ubuntu 12.04 LTS Desktop Tour">Take the online tour of the Ubuntu 12.04 LTS desktop&nbsp;&rsaquo;</a></p>
-	</div><!-- /.six-col -->
-</div><!-- /.row -->
-<div class="row">
-	<h2>More information</h2>
-	<ul class="no-bullets">
-		<li><a href="https://www.ibm.com/developerworks/mydeveloperworks/blogs/gbowerman/entry/april_14_2010_1_37_am16?lang=en">Informix Developer Edition and Ubuntu</a></li>
-		<li><a href="http://www-01.ibm.com/support/docview.wss?uid=swg27016673">Informix Client Software Development Kit</a></li>
-		<li><a href="http://www-01.ibm.com/support/docview.wss?uid=swg27019218">Lotus Notes 8.5.2 supports Ubuntu LTS 10.04</a></li>
-		<li><a href="http://www-01.ibm.com/support/docview.wss?uid=swg21462179">IBM Rational ClearCase 7.1.2.2 on Ubuntu 10.04 LTS</a></li>
-	</ul>
-</div><!-- /.row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/partners/index.html b/templates/partners/index.html
deleted file mode 100755
index be18f1bfe2d..00000000000
--- a/templates/partners/index.html
+++ /dev/null
@@ -1,79 +0,0 @@
-{% extends "partners/base_partners.html" %}
-
-{% block title %}Partners{% endblock %}
-{% block extra_body_class %}partners-home{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Partners" page_title="Overview"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-margin-bottom">
-	<div class="five-col">
-		<h1>Partners</h1>
-		<p>Canonical partners help to ensure that Ubuntu will always be compatible with the latest hardware and software. And they provide a range of services from implementation support to specialist tools.</p>
-	</div><!-- / .five-col -->
-
-	<div class="seven-col last-col no-margin">
-		<img src="{{ STATIC_URL }}img/partners/partners-main.jpg" width="492" height="293" alt="Ubuntu running on a dell laptop" />
-	</div><!-- / .seven-col -->
-</div><!-- / .row -->
-
-<div class="row equal-height vertical-divider">
-	<div class="four-col">
-		<h2>Find a partner</h2>
-		<p>Canonical partners provide a variety of software, hardware and implementation services to help you make the most of your open-source IT environment.</p>
-		<ul class="no-bullets">
-			<li><a href="/partners/find-a-partner/hardware">Hardware partners&nbsp;&rsaquo;</a></li>
-			<li><a href="/partners/find-a-partner/isv/">ISV partners&nbsp;&rsaquo;</a></li>
-			<li><a href="/partners/find-a-partner/reseller/">Reseller partners&nbsp;&rsaquo;</a></li>
-		</ul>
-	</div><!-- / .four-col -->
-
-	<div class="four-col">
-		<h2>Certified software</h2>
-		<p>Certified software undergoes a rigorous testing process. It must be compatible with Ubuntu and easy to install and uninstall according to user requirements.</p>
-		<ul class="no-bullets">
-			<li><a href="http://webapps.ubuntu.com/partners/certified-software/">More about Ubuntu Certified software&nbsp;&rsaquo;</a></li>
-			<li><a href="/partners/contact-us">Certify your software&nbsp;&rsaquo;</a></li>
-		</ul>
-	</div><!-- / .four-col -->
-
-	<div class="four-col last-col no-margin-bottom">
-		<h2>Certified hardware</h2>
-		<p>Certified hardware must pass a series of validation tests conducted by Canonical. Users can be confident that any certified hardware will be compatible with Ubuntu.</p>
-		<ul class="no-bullets no-margin-bottom">
-			<li><a href="http://www.ubuntu.com/certification/">More about Ubuntu Certified hardware&nbsp;&rsaquo;</a></li>
-			<li><a href="https://certification.canonical.com/">Certify your hardware&nbsp;&rsaquo;</a></li>
-		</ul>
-	</div><!-- / .four-col -->
-
-</div><!-- / .row -->
-
-<div class="row no-margin no-border">
-	<div class="six-col">
-			<h2>Become a partner</h2>
-			<p>With more than 20 million users, Ubuntu is growing in popularity every day. This huge installed base represents an enormous market for applications and services, from games and social media to cloud consulting for the enterprise. </p>
-			<p>Canonical supports the Ubuntu project, providing marketing support, product development strategy and enterprise services, in the form of the Ubuntu Advantage programme. By partnering with Canonical, your business could benefit from early information on where Ubuntu is heading, along with opportunities to share the spotlight at events.</p>
-			<p>Whether you&rsquo;re building clouds, software or hardware, there has never been a better time to become part of the team.</p>
-		<p><a class="link-cta-ubuntu" href="/partners/contact-us">Contact Canonical</a></p>
-	</div>
-	<div class="six-col last-col">
-		<blockquote class="pull-quote">
-			<p><span>&ldquo;</span>Having Canonical teams working on OpenStack and its integration with Ubuntu is priceless.<br /> It's a very natural fit.&nbsp;&nbsp;<span>&rdquo;</span></p>
-			<p><cite>Thierry Carrez, Release Manager, OpenStack</cite></p>
-		</blockquote>
-	</div><!-- / .six-col -->
-	<div class="twelve-col">
-		<h3 class="muted-heading">Featured partners</h3>
-		<ul class="inline-logos no-bullets">
-			<li><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-openstack.svg" alt="OpenStack Cloud Software" /></li>
-			<li><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-ibm.svg" alt="IBM" /></li>
-			<li><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-cloudera.png" alt="Cloudera" /></li>
-			<li class="last-item"><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-dell.svg" alt="Dell" /></li>
-			<li><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-asus.svg" alt="ASUS" /></li>
-			<li class="last-item"><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-lenovo.svg" alt="Lenovo" /></li>
-		</ul>
-	</div>
-</div>
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/partners/partner-programmes/index.html b/templates/partners/partner-programmes/index.html
deleted file mode 100755
index c59edb23e5f..00000000000
--- a/templates/partners/partner-programmes/index.html
+++ /dev/null
@@ -1,61 +0,0 @@
-{% extends "partners/base_partners.html" %}
-
-{% block meta_description %}Canonical offers a range of partner programs covering everything from ISVs and cloud technology to mobile carriers and hardware enablement.{% endblock meta_description %}
-{% block meta_keywords %}Canonical, Ubuntu, partner, partnership, program, programme, carrier, telco, mobile, network, phone, smartphone, tablet, cloud, OpenStack, public cloud, infrastructure, guest, image, server, ISV, software, hardware, enablement, certify, certified, certification, PC, laptop, desktop, reseller, VAR, channel, developer{% endblock meta_keywords %}
-
-{% block title %}Partners | Partner programmes{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Partners" page_title=" Become a partner" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-margin-bottom">
-	<h1>Partner programmes</h1>
-	<div class="eight-col">
-		<p>As Ubuntu use grows, the world needs ever more phones, tablets, PCs, servers and clouds that are certified for compatibility. The opportunity for partners is immense.</p> 
-	                 
-		<p>To get to market quicker and reduce costs, OEMs and their partners need components that are compatible with the latest Ubuntu releases. For IHVs and ISVs, the big question is how to develop, test and certify such products.</p>
-	                 
-		<p>The answer is to work with Canonical, the company sponsoring the Ubuntu project. OEMs, IHVs, ISVs and peripheral manufacturers can subscribe to the Canonical Technical Partner Programme, which provides all the information, tools and training a manufacturer needs to keep its products ahead of the Ubuntu development curve.</p>
-		
-		<p><a class="link-cta-ubuntu" href="/partners/contact-us">Contact Canonical</a></p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row">
-	<h2 class="twelve-col">Partner programmes for solution providers</h2>
-	<ul class="twelve-col no-bullets vertical-divider">
-		<li class="four-col">
-			<h3><a href="/cloud/ecosystem/ubuntu-openstack-interoperability-lab">Public cloud providers</a></h3>
-			<p>We provide optimised Ubuntu images, management and commercial support to the world’s biggest clouds.</p>
-		</li>
-		<li class="four-col">
-			<h3><a href="http://www.ubuntu.com/phone/carrier-advisory-group">Mobile network carriers</a></h3>
-			<p>We are finalising the Ubuntu phone OS with the needs of carriers and handset makers in mind.</p>
-		</li>
-		<li class="four-col last-col">
-			<h3>Resellers</h3>
-			<p>Resellers can expand their service portfolios with Ubuntu Advantage – management and support for Ubuntu.</p>
-		</li>
-	</ul>
-</div><!-- / .row -->
-
-<div class="row no-border">
-	<h2 class="twelve-col">Partner programmes for technology providers</h2>
-	<ul class="twelve-col no-bullets vertical-divider">
-		<li class="four-col">
-			<h3><a href="/cloud/ecosystem/ubuntu-openstack-interoperability-lab">The OpenStack Interoperability Lab (OIL)</a></h3>
-			<p>An integration lab in which we test our cloud partners’ products in countless Ubuntu OpenStack configurations, currently working with over 3,000 combinations per month.</p>
-		</li>
-		<li class="four-col">
-			<h3><a href="/partners/find-a-partner/hardware">Hardware and component manufacturers</a></h3>
-			<p>We provide an end-to-end solution for manufacturers of Intel, AMD or ARM-based servers and client devices, helping them get to market on time and on budget.</p>
-		</li>
-		<li class="four-col last-col">
-			<h3>Independent software vendors</h3>
-			<p>The Canonical Technical Partner programme provides all the information, tools and training necessary to stay ahead of the Ubuntu development curve.</p>
-		</li>
-	</ul>
-</div><!-- / .row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/partners/partner-services.html b/templates/partners/partner-services.html
deleted file mode 100755
index 787cb2d7863..00000000000
--- a/templates/partners/partner-services.html
+++ /dev/null
@@ -1,73 +0,0 @@
-{% extends "partners/base_partners.html" %}
-
-{% block title %}Partner services{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Partners" page_title="Partner services" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-margin-bottom row-image-centered">
-	<div class="six-col">
-		<h1>Partner services</h1>
-		<p class="six-col">Canonical offers a full range of services to help our partners make the most of Ubuntu. Whether you need custom engineering, product certification or support, our team is on hand to help throughout your product life cycle.</p>
-	</div>
-	<span>
-		<img src="{{ STATIC_URL }}img/partners/partner-services/image-partnerservices.svg" alt="" />
-	</span>
-</div><!-- / .row -->
-
-<div class="row">
-	<div class="eight-col">
-		<h2>Engineering services</h2>
-		<p>Canonical&rsquo;s OEM Partner Programme simplifies the process of pre-loading Ubuntu onto your hardware. Canonical offers a range of engagement models to suit your business.</p>
-		<p>As a partner you will have access to a worldwide development staff in multiple timezones, including a significant local presence in Taiwan and China. Pricing is based on the scope of technical effort plus annual unit volume commitment.</p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row">
-	<div class="eight-col">
-		<h2>Custom engineering</h2>
-		<p>Canonical provides custom development services to help companies build their infrastructure on Ubuntu. From clouds for telcos to thin client migrations to building a phone or tablet, if your project needs expert custom Linux development, who better to ask than the company behind the world&rsquo;s fastest growing Linux distribution?</p>
-		<p>Pricing is based on scope of technical effort plus annual unit volume commitment. To find out more about our engineering services, <a href="/partners/contact-us">contact us today</a>.</p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row no-border">
-	<div class="eight-col">
-		<h2>Hardware certification</h2>
-		<p>With hardware certification from Canonical, you can demonstrate compatibility with Ubuntu and ensure your devices make full use of Ubuntu's features. A growing community of users is looking for hardware that works with Ubuntu &mdash; and we can help you reach them.</p>
-		<p>Whether you manufacture components or systems, we'll help you achieve maximum compatibility and communicate your commitment to Ubuntu's users.</p>
-	</div>
-	<div class="twelve-col">
-		<h3>Certification features</h3>
-		<p>Key features of the hardware certification service are:</p>
-		<div class="combined-list">
-			<ul class="list-canonical smaller six-col">
-				<li>
-					<h3>Development priority</h3>
-					<p>Any issues or regressions that risk your hardware's certification are given priority by Canonical's Ubuntu developers. Our certification staff collaborate with your engineers to identify where the issue resides so that together we can resolve it.</p>
-				</li>
-				<li>
-					<h3>Full compatibility testing</h3>
-					<p>Our extensive set of hardware and operating system tests ensure that your hardware is fully compatible with Ubuntu. Canonical's certification engineers work with the manufacturer to resolve any issues discovered and ensure that the testing is representative of in-field use. This ensures that certification is an efficient, collaborative process.</p>
-				</li>
-				<li class="last-item">
-					<h3>Public certification</h3>
-					<p>Canonical publicly certifies your hardware and supports your commitment to working with the Ubuntu community. We provide you with materials to use on your hardware and publish your certification on the Ubuntu website. You'll benefit from clear communication with Ubuntu users.</p>
-				</li>
-			</ul>
-			<ul class="list-canonical smaller six-col last-col">
-				<li>
-					<h3>Hardware coverage</h3>
-					<p>Specific certification testing is undertaken for servers and desktops. Canonical's certification team will test hardware and operating features that users commonly expect from each platform type. Hardware manufacturers benefit from Ubuntu taking advantage of the full power of their components.</p>
-				</li>
-				<li>
-					<h3>Extensive user testing</h3>
-					<p>Ubuntu is known for its speed of innovation and its regular six-month releases. Certifying with Ubuntu ensures that your technology will reach a wide base of users who value innovation. Through our open development process and public platforms, you can take an active part in the community conversation. You benefit from quickly reaching key sections of the Linux market who influence other markets.</p>
-				</li>
-			</ul>
-		</div>
-	</div>
-</div><!-- / .row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/partners/thank-you.html b/templates/partners/thank-you.html
deleted file mode 100755
index 27f52a4239e..00000000000
--- a/templates/partners/thank-you.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{% extends "partners/base_partners.html" %}
-{% block title %}Thank you | Become a partner{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Partners" page_title="Thank you"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-{% include "_includes/_thank_you.html" with thanks_context="interest in the Canonical&nbsp;Partner&nbsp;Programme" %}
-{% endblock content %}
-{% block footer_extra %}
-<!-- Google Code for Services Canonical &mdash; contact us Conversion Page -->
-<script type="text/javascript">
-/* <![CDATA[ */
-var google_conversion_id = 1012391776;
-var google_conversion_language = "en";
-var google_conversion_format = "3";
-var google_conversion_color = "ffffff";
-var google_conversion_label = "-mBBCIC5vwMQ4L7f4gM";
-var google_conversion_value = 0;
-/* ]]> */
-</script>
-<script type="text/javascript" src="http://www.googleadservices.com/pagead/conversion.js">
-</script>
-<noscript>
-<div style="display:inline;">
-<img height="1" width="1" style="border-style:none;" alt="" src="http://www.googleadservices.com/pagead/conversion/1012391776/?value=0&amp;label=-mBBCIC5vwMQ4L7f4gM&amp;guid=ON&amp;script=0"/>
-</div>
-</noscript>
-{{ marketo }}
-{% endblock footer_extra %}
diff --git a/templates/partners/ubuntu-certified/index.html b/templates/partners/ubuntu-certified/index.html
deleted file mode 100755
index c15d5a5e017..00000000000
--- a/templates/partners/ubuntu-certified/index.html
+++ /dev/null
@@ -1,40 +0,0 @@
-{% extends "partners/base_partners.html" %}
-
-{% block title %}Partners | Ubuntu Certified{% endblock %}
-{% block extra_body_class %}ubutnu-certified partners-ubuntu-certified-home{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Partners" page_title="Ubuntu Certified" tertiary="true" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-border no-margin-bottom">
-	<div class="five-col">
-		<h1>Ubuntu Certified</h1>
-		<p>We work with the world&rsquo;s leading technology providers to ensure that their products and services work with Ubuntu. From the mobile world to the cloud, you can choose from an enormous range of certified Ubuntu devices and software applications, whatever your needs.</p>
-	</div>
-	<div class="seven-col last-col">
-		<img src="{{ STATIC_URL }}img/partners/image-ubuntucertified.jpg" alt="" />
-	</div>
-</div><!-- / .row -->
-
-<div class="row no-border equal-height">
-	<ul class="no-bullets vertical-divider">
-		<li class="four-col">
-			<h3>Certified software</h3>
-			<p>Looking for partner software running on Ubuntu? Our ISV partners&rsquo; applications deliver solutions for business and personal use. And they&rsquo;re supported by commercial companies providing the highest level of service.</p>
-			<p><a href="/partners/ubuntu-certified/software/">View Ubuntu Certified software&nbsp;&rsaquo;</a></p>
-		</li>
-		<li class="four-col">
-			<h3>Certified hardware</h3>
-			<p>Ubuntu Certified hardware has passed our extensive testing and review process to make sure it is ready for your business. We work closely with the world&rsquo;s leading OEMs to make Ubuntu available on a wide range of devices.</p>
-			<p><a href="http://www.ubuntu.com/certification/">View Ubuntu Certified hardware&nbsp;&rsaquo;</a></p>
-		</li>
-		<li class="four-col last-col">
-			<h3>Component catalogue</h3>
-			<p>Our component catalogue contains devices from over 200 manufacturers that are certified by Canonical for use with Ubuntu.</p>
-			<p><a href="http://www.ubuntu.com/certification/catalog/">View Ubuntu Certified components&nbsp;&rsaquo;</a></p>
-		</li>
-	</ul>
-</div><!-- / .row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/partners/ubuntu-certified/software.html b/templates/partners/ubuntu-certified/software.html
deleted file mode 100755
index 045c00ed2fb..00000000000
--- a/templates/partners/ubuntu-certified/software.html
+++ /dev/null
@@ -1,519 +0,0 @@
-{% extends "partners/base_partners.html" %}
-
-{% block title %}Certified software{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Partners" subsection_title="Ubuntu certified" page_title="Certified software"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero">
-	<div class="eight-col">
-		<h1>Certified software</h1>
-	</div>
-	<a href="http://www.ubuntu.com/partners/contact-us" class="link-cta-ubuntu right">Apply to become a partner</a>
-</div><!-- / .row -->
-
-<div class="row no-border equal-height">
-		<div class="four-col box">
-	    <a href="http://www.10gen.com/"><img src="{{ STATIC_URL }}img/logos/partners/10genLogo_1.png" alt="10gen" /></a>
-	    <p><a href="http://www.10gen.com/">10gen</a> develops and supports MongoDB &mdash; the open source, high performance, scalable, document-oriented database. 10gen delivers technical support, professional services, and training for commercial-grade deployments of MongoDB </p>
-		</div>
-
-		<div class="four-col box">
-      <a href="http://www.2x.com"><img src="{{ STATIC_URL }}img/logos/partners/2X_logo_small_scaled_.jpg" alt="2x Software" /></a>
-      <p><a href="http://www.2x.com">2x Software</a> offers tailor-made, easy-to-implement and cost-effective server based and virtual computing solutions, including the award-winning 2X VirtualDesktopServer and 2X ApplicationServer, as well as the 2X ThinClientServer and 2X LoadBalancer. With their trademark affordability and simplicity, as well as the unique 2X per-server licensing model, 2X products unlock the full potential of virtualization platforms by improving desktop ... </p>
-		</div>
-
-		<div class="four-col last-col box">
-      <a href="http://www.accountz.com"><img src="{{ STATIC_URL }}img/logos/partners/accountz.png" alt="Accountz.com" /></a>
-      <p><a href="http://www.accountz.com">Accountz.com</a> manufacture award winning personal and business accounting software. The range is multi platform and runs on Mac, Linux and Windows. Business Accountz comes in Basic, Professional and Enterprise versions. Powerful, yet simple, a VAT return can be produced in one-click and the chart of accounts presents business performance in real-time. </p>
-		</div>
-
-		<div class="four-col box">
-      <a href="http://www.acelet.com"><img src="{{ STATIC_URL }}img/logos/partners/aceletLogo92x25.png" alt="Acelet Corporation" /></a>
-      <p><a href="http://www.acelet.com">Acelet Corporation</a> Acelet Corporation provides cross-platform applications, such as Acelet Filer and Acelet Scheduler. Acelet Filer is a file manager with similar user interface as Windows XP, so you do not have to change your finger habits. Acelet Scheduler is a task scheduler with both daemon and GUI. </p>
-		</div>
-
-		<div class="four-col box">
-      <a href="http://aws.amazon.com/"><img src="{{ STATIC_URL }}img/logos/partners/AWS.png" alt="Amazon Web Services LLC" /></a>
-      <p><a href="http://aws.amazon.com/">Amazon Web Services LLC</a> With AWS you can requisition computer power, storage, and other services&mdash;gaining access to a suite of elastic IT infrastructure services as your business demands them. You pay only for what you use, with no up-front expenses or long-term commitments, making AWS the most cost-effective way to deliver your application to your customers and clients. </p>
-		</div>
-
-		<div class="four-col last-col box">
-      <a href="http://www.appfirst.com"><img src="{{ STATIC_URL }}img/logos/partners/AppFirst_LogoScaled.jpg" alt="AppFirst" /></a>
-      <p><a href="http://www.appfirst.com">AppFirst</a> is a SaaS-based application monitoring tool that provides complete visibility of an application, helping companies proactively identify and address potential performance issues, plan for future growth, and gain understanding of their application&#39;s execution. </p>
-		</div>
-
-		<div class="four-col box">
-	    <a href="http://www.arkeia.com/en/partners/technology-partners/ubuntu"><img src="{{ STATIC_URL }}img/logos/partners/ArkeiaSoftware.png" alt="Arkeia Software" /></a>
-	    <p><a href="http://www.arkeia.com/en/partners/technology-partners/ubuntu">Arkeia Software</a> Arkeia Network Backup, Enterprise Edition for Ubuntu. Arkeia Software provides a fully-licensed, free version of Arkeia Network Backup that is available in the Ubuntu 10.04 LTS software repository. Arkeia Software provides the market&#39;s broadest and deepest support for Linux and open source applications, with more than 100 Linux platforms supported. </p>
-		</div>
-
-		<div class="four-col box">
-      <a href="http://www.baculasystems.com"><img src="{{ STATIC_URL }}img/logos/partners/Bacula.png" alt="Bacula Systems" /></a>
-      <p><a href="http://www.baculasystems.com">Bacula Systems</a> provides the highest quality support, training and professional services for the Bacula open-source backup and recovery software platform. Bacula is the leading enterprise backup solution that is 100% open-source, free of license costs and adheres strictly to open standards, eliminating the vendor lock-in of proprietary software for thousands of enterprises. </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.beemasterict.com"><img src="{{ STATIC_URL }}img/logos/partners/BEEMLOGO2.png" alt="Beemaster ICT" /></a>
-	        <p><a href="http://www.beemasterict.com">Beemaster ICT</a> delivers solutions for the Virtual Desktop and Application Delivery market. Our BeeBox allows you to publish any application from anywhere, under any operating system to any access device. With BeeBox, you have all benefits of thin client computing, without the need of a Thin client Infrastructure. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.bitdefender.com"><img src="{{ STATIC_URL }}img/logos/partners/Bitdefender.png" alt="BitDefender" /></a>
-	        <p><a href="http://www.bitdefender.com">BitDefender</a> is a leading global provider of security solutions that satisfy the protection requirements of today&#39;s computing environment. The company offers one of the industry&#39;s fastest and most effective lines of security software, setting new standards for threat prevention, timely detection and mitigation. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.bluecherrydvr.com"><img src="{{ STATIC_URL }}img/logos/partners/bluecherry.png" alt="Bluecherry " /></a>
-	        <p><a href="http://www.bluecherrydvr.com">Bluecherry </a> is a commercially maintained Linux based surveillance application which supports our hardware compression video / audio capture cards. Our interface is powerful, feature rich, and user friendly and our software is based around Ubuntu so updates are as easily downloaded from our servers, freeing you from headaches and upgrade nightmares. </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.bonitasoft.com"><img src="{{ STATIC_URL }}img/logos/partners/bonitasoft.png" alt="BonitaSoft" /></a>
-	        <p><a href="http://www.bonitasoft.com">BonitaSoft</a> is the leading open source Business Process Management (BPM) company providing Bonita Open Solution, an intuitive and powerful BPM suite: just draw your processes using a BPMN palette, then connect to your existing systems (Oracle, MySQL, LDAP, Google, Twitter, Facebook...) and run your Java BPM application in one click. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.serverdensity.com/landing/?a=site&amp;s=ubuntu-partner"><img src="{{ STATIC_URL }}img/logos/partners/BoxedIce.png" alt="Boxed Ice" /></a>
-	        <p><a href="http://www.serverdensity.com/landing/?a=site&amp;s=ubuntu-partner">Boxed Ice</a> Server Density is a server monitoring tool provided as a service that makes it easy to start monitoring your server performance and applications such as Apache and MySQL. Get e-mail, SMS and iPhone alerts when things go wrong, troubleshoot historical problems and plan future capacity. <br /> </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.bricsys.com"><img src="{{ STATIC_URL }}img/logos/partners/bricsys_logo.png" alt="Bricsys" /></a>
-	        <p><a href="http://www.bricsys.com">Bricsys</a> Bricscad is the number one DWG CAD alternative and offers a complete and recognizable feature set to professional users. Bricscad reads and writes the DWG format and offers high compatibility with AutoCAD&reg;. Bricscad has a very recognizable intuitive user interface, requires no extra training and is today available in 13 languages. </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.c12g.com"><img src="{{ STATIC_URL }}img/logos/partners/opennebula-c12g-partner-72.jpg" alt="C12G Labs" /></a>
-	        <p><a href="http://www.c12g.com">C12G Labs</a> is the company behind the OpenNebula open-source toolkit for cloud computing. C12G provides enterprise-grade solutions around OpenNebulaPro, which is a stable, certified, and supported distribution of OpenNebula. C12G offers a comprehensive set of services, through which customers and partners can get production level support or build a custom cloud </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.centrify.com"><img src="{{ STATIC_URL }}img/logos/partners/Centrify.png" alt="Centrify" /></a>
-	        <p><a href="http://www.centrify.com">Centrify</a> Centrify DirectControl delivers access control and centralized identity management by seamlessly integrating Linux, UNIX, Mac and web platforms with Microsoft Active Directory. DirectControl turns a non-Microsoft system into an Active Directory client, letting you secure that system using the same authentication and Group Policy services deployed for your Windows systems. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.cfengine.com"><img src="{{ STATIC_URL }}img/logos/partners/CFENGINE.png" alt="Cfengine" /></a>
-	        <p><a href="http://www.cfengine.com">Cfengine</a> is a versatile and lightweight datacenter management solution based on a well-established <br />theory that allows organizations to automate their IT-operations with less risk. Cfengine is one of the most popular solutions in the industry (&gt; 5,000 companies), delivering more reliable IT-services with increased ability to respond to business initiatives. </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://CirrusComputing.com/"><img src="{{ STATIC_URL }}img/logos/partners/CirrusComputing-SCALED.png" alt="Cirrus Computing" /></a>
-	        <p><a href="http://CirrusComputing.com/">Cirrus Computing</a> provides a complete &ldquo;organization in the cloud&rdquo; packaged from the world&#39;s leading open source, including networks, desktops, and applications. Access is on virtual Ubuntu desktops from any computer anywhere over the Internet, providing the best user interface available in the cloud. Scaling the organization up or down can be done with a mouse-click. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.cloudera.com"><img src="{{ STATIC_URL }}img/logos/partners/Cloudera.png" alt="Cloudera" /></a>
-	        <p><a href="http://www.cloudera.com">Cloudera</a> Cloudera provides software, support, services and training for the open-source Apache Hadoop software package. Originally developed by dominant web companies like Yahoo! and Facebook, Hadoop is now used widely in finance, telecom, media and government verticals. Cloudera builds upon Hadoop to create a unique data management platform to collect, store and process complex data then ... </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://cloudkick.com"><img src="{{ STATIC_URL }}img/logos/partners/cloudkick.png" alt="Cloudkick" /></a>
-	        <p><a href="http://cloudkick.com">Cloudkick</a> is a management tool and portability layer for cloud based infrastructure. Cloudkick provides a common set of tools, such as performance trending and fault-detection, that work across numerous cloud providers (e.g. Amazon EC2). Additionally, with Hybrid Cloudkick, companies can now manage their existing non-cloud infrastructure as if it was cloud based. </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.cohesiveft.com"><img src="{{ STATIC_URL }}img/logos/partners/Logo_CohesiveFT-Logo_2009-3-6.jpg" alt="Cohesive Flexible Technologies" /></a>
-	        <p><a href="http://www.cohesiveft.com">Cohesive Flexible Technologies</a> provides onboarding solutions for virtual and cloud computing infrastructures. Their Elastic Server&reg; platform is a web-based factory for creating, deploying and managing custom multi-sourced servers comprised of horizontal, open source and third-party software components. Additionally the VPN-Cubed&reg; packaged service gives customers control of networking in the clouds, across clouds and between their private data cente. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.colosa.com"><img src="{{ STATIC_URL }}img/logos/partners/Colosa.png" alt="Colosa Inc" /></a>
-	        <p><a href="http://www.colosa.com">Colosa Inc</a> For workers in organizations that must process and manage a heavy workload of requests as part of their job, ProcessMaker workflow automation software offers help. With limited IT resources, both technology and business users can improve communication and resolution of requests across departments, including human resources, finance, and operations. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.commandprompt.com"><img src="{{ STATIC_URL }}img/logos/partners/cmdprompt.png" alt="Command Prompt Inc. " /></a>
-	        <p><a href="http://www.commandprompt.com">Command Prompt Inc. </a> Based in Oregon, The PostgreSQL Company, Command Prompt, Inc. is the oldest and largest dedicated PostgreSQL support provider in North America. Since 1997, they have been developing, supporting, deploying and advocating the use of the &ldquo;World&#39;s Most Advanced Open Source Database&rdquo;. The preferred deployment platform for PostgreSQL is Ubuntu. </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.convirture.com"><img src="{{ STATIC_URL }}img/logos/partners/Convirture_Logo_scaled.jpg" alt="Convirture Corporation" /></a>
-	        <p><a href="http://www.convirture.com">Convirture Corporation</a> ConVirt 2.0 provides enterprise-grade management of open source virtualization platforms, enabling you to build out your virtualized data center and private cloud in the most flexible and cost effective way. ConVirt manages both Xen and KVM, shipped with commercial or community Linux distributions , from a single console and with consistent feature set across virtualization ... </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.northscale.com"><img src="{{ STATIC_URL }}img/logos/partners/couchbase_logo_final_SCALED___.png" alt="Couchbase" /></a>
-	        <p><a href="http://www.northscale.com">Couchbase</a> is the name of the NoSQL database company and product family created through the merger of CouchOne and Membase. Couchbase products, which are built on Apache CouchDB, Membase, and memcached open source software, represent the most comprehensive family of data management solutions for building scalable web and mobile applications. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.yassl.com"><img src="{{ STATIC_URL }}img/logos/partners/yaSSLLog_scaled____.jpg" alt="CyaSSL" /></a>
-	        <p><a href="http://www.yassl.com">CyaSSL</a> is a lightweight yet fully functional embedded SSL Library for programmers building security into applications and devices. CyaSSL employs the dual licensing model, like MySQL, so it is available under the open source GPLv2 and standard commercial licensing. </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.eucalyptus.com"><img src="{{ STATIC_URL }}img/logos/partners/Logo-Eucalyptus_Logo_two_words.png" alt="Eucalyptus Systems, Inc" /></a>
-	        <p><a href="http://www.eucalyptus.com">Eucalyptus Systems, Inc</a> is an open-source system for implementing on-premise private and hybrid clouds using the hardware and software infrastructure that is in place, without modification. With Eucalyptus, IT organizations reduce both costs and system administration burden while providing end-users superior levels of service through public cloud interoperability and Linux distribution portability. </p>
-		</div>
-
-		<div class="four-col box">
-	        <img src="{{ STATIC_URL }}img/logos/partners/fermat.png" alt="Fermat Consulting" />
-	        <p>Fermat Consulting is specialized in providing services for financial derivative contracts valuation and risk management. With the Fairmat project we are committed to make financial valuation accessible to (almost) everyone and to provide a flexible tool that can be extended to cover (almost) any derivative contracts on (almost) any underlying asset. <br /> <br /> </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.fluendo.com/"><img src="{{ STATIC_URL }}img/logos/partners/Fluendo-new.png" alt="Fluendo " /></a>
-	        <p><a href="http://www.fluendo.com/">Fluendo </a> For several years Fluendo has been recognized as a leading provider of multimedia solutions for GNU/Linux and Free Software in general. Fluendo provides a wide range of products on and for GStreamer, including proprietary codecs with their respective patent licenses, a DVD player and a media center. The Fluendo MP3 decoder is included in Ubuntu ... </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.foradian.com/"><img src="{{ STATIC_URL }}img/logos/partners/foradian_logoscaled_.png" alt="Foradian Technologies" /></a>
-	        <p><a href="http://www.foradian.com/">Foradian Technologies</a> Foradian Technologies is an internet engineering company based out of India who loves developing amazing web applications on open-source technologies. Foradian is well known for Project Fedena [www.projectfedena.org] - an open-source school ERP, which is getting implemented in educational institutes all around the world. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.axigen.com/"><img src="{{ STATIC_URL }}img/logos/partners/axigen.png" alt="Gecad Technologies" /></a>
-	        <p><a href="http://www.axigen.com/">Gecad Technologies</a> Established in 2001, Gecad Technologies focuses on the development and distribution of innovative messaging solutions, under the brand name AXIGEN. AXIGEN Mail Server is THE mail server for Linux professionals, offering unmatched manageability and control over all details email traffic and being backed by outstanding 24/7 technical support services. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.graebert.com"><img src="{{ STATIC_URL }}img/logos/partners/graebert_vert_scaled.jpg" alt="Graebert GmbH" /></a>
-	        <p><a href="http://www.graebert.com">Graebert GmbH</a> ARES&trade; Commander Edition is the world&rsquo;s first professional native DWG 2D/3D CAD software for all three major platforms: Windows&reg;, Mac&reg; OS X and Linux. It&rsquo;s available in 13 languages, fully compatible with the latest AutoCAD&reg; DWG/DXF standards and integrates ACIS 3D Solid Modeling. Graebert&rsquo;s SDK allows companies to create custom applications based on ARES &mdash; ... </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.groundworkopensource.com"><img src="{{ STATIC_URL }}img/logos/partners/GWOS_scaled.jpg" alt="GroundWork Open Source, Inc." /></a>
-	        <p><a href="http://www.groundworkopensource.com">GroundWork Open Source, Inc.</a> is the market leader in commercial open source network and systems management software, delivering enterprise-class network, system and application management solutions at a fraction of the cost of proprietary solutions. GWOS&#39;s best of breed approach gives customers the flexibility to use diverse open source and proprietary technologies together under a unified interface, allowing users to ... </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.hansaworld.com"><img src="{{ STATIC_URL }}img/logos/partners/Hansaworld.png" alt="HansaWorld" /></a>
-	        <p><a href="http://www.hansaworld.com">HansaWorld</a> provides integrated business solutions including financials, ERP, CRM, e-Business, retail and production. HansaWorld is available in 28 languages and is represented in many countries in Europe, Latin America, Africa, Australia, Asia and the Middle East. HansaWorld carries out continuous industry leading research and development, pioneering the use of modern technology for ERP and CRM. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.i4ware.fi"><img src="{{ STATIC_URL }}img/logos/partners/i4waresoftwarelogo2.png" alt="i4ware Software" /></a>
-	        <p><a href="http://www.i4ware.fi">i4ware Software</a> i4ware Software provides a professional services and product for Application Lifecycle Management and Software Development. Company focusing to make these services and product for Ubuntu Server or Ubuntu Desktop supported. <br /> <br /> </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.UltraEdit.com"><img src="{{ STATIC_URL }}img/logos/partners/UltraEdit.png" alt="IDM Computer Solutions" /></a>
-	        <p><a href="http://www.UltraEdit.com">IDM Computer Solutions</a> UltraEdit is the ideal text, hex and advanced programmer&#39;s editor. With millions of users worldwide, UltraEdit is the #1 selling, most powerful, value priced text editor available! Download UEx today in the Ubuntu Partner Repository and discover why millions prefer UltraEdit as their text editing solution! Exclusive Ubuntu community discounts sponsored by Canonical and IDM. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.inlab.de/balanceng/"><img src="{{ STATIC_URL }}img/logos/partners/inlab.png" alt="Inlab Software GmbH" /></a>
-	        <p><a href="http://www.inlab.de/balanceng/">Inlab Software GmbH</a> offers BalanceNG, a software based TCP/IP load-balancer. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.intalio.com"><img src="{{ STATIC_URL }}img/logos/partners/Intalio.png" alt="Intalio" /></a>
-	        <p><a href="http://www.intalio.com">Intalio</a> is the first company to deliver an integrated cloud computing platform designed for the Enterprise. Intalio|Cloud leverages a unique combination of hardware and software to deliver an enterprise-grade cloud computing experience, with dynamic provisioning and elastic scalability. Intalio offers services to enable its customers to efficiently and quickly deploy cloud-computing solutions in their Enterprises. </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.K7cloud.com"><img src="{{ STATIC_URL }}img/logos/partners/K7Cloudlogo_scaled.png" alt="K7 CloudSolutions Pvt" /></a>
-	        <p><a href="http://www.K7cloud.com">K7 CloudSolutions Pvt</a> Turn public or private clouds into PaaS offerings easily with K7 Cloud&#39;s Cyclozzo. Cyclozzo is designed to easily accommodate future PaaS standards. Currently, Cyclozzo fully re-implements Google(TM) App Engine&#39;s Java and Python APIs, enabling users to migrate applications to and from GAE and Cyclozzo without changing application code. <br /> </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.kaavo.com"><img src="{{ STATIC_URL }}img/logos/partners/Kaavo.png" alt="Kaavo" /></a>
-	        <p><a href="http://www.kaavo.com">Kaavo</a> provides solutions for managing distributed applications and workloads in the clouds. Kaavo is the first and only company to deliver a solution with a top down application focused approach to IT infrastructure management in public and private clouds; enabling users to maximize the full potential of cloud computing. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.karmasphere.com"><img src="{{ STATIC_URL }}img/logos/partners/karmasphere_logo_scaled.jpg" alt="Karmasphere" /></a>
-	        <p><a href="http://www.karmasphere.com">Karmasphere</a> is a Big Data Intelligence software company bringing Apache Hadoop power to the desktop. Karmasphere Studio takes developers and architects from learning to production quality development and is available in free Community and Professional editions. Karmasphere Analyst gives analysts easy, familiar, graphical SQL access to big data in Hadoop. </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.knowledgetree.com"><img src="{{ STATIC_URL }}img/logos/partners/knowledgetree.png" alt="KnowledgeTree Inc" /></a>
-	        <p><a href="http://www.knowledgetree.com">KnowledgeTree Inc</a> makes sharing content and controlling document processes simple with secure, affordable online document management solutions for growing SMBs and departments at larger companies. Designed for business professionals, KnowledgeTree is easy to use, does not require extensive training and enables content to be accessed and managed anytime, anywhere via cloud computing. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.beyondtrust.com/"><img src="{{ STATIC_URL }}img/logos/partners/beyondtrustlogo.jpeg" alt="beyondtrust" /></a>
-	        <p><a href="http://www.beyondtrust.com/">BeyondTrust</a> is the only security solution vendor providing Context-Aware Security Intelligence, giving our customers the visibility and controls necessary to reduce their IT security risks, while at the same time simplifying their compliance reporting.</p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.linbit.com"><img src="{{ STATIC_URL }}img/logos/partners/LB_logo_blackback_scaled.jpg" alt="Linbit" /></a>
-	        <p><a href="http://www.linbit.com">Linbit</a> has led the way in high-availability (HA) since 2001, and continues to be the OSS leader in business uptime, disaster recovery, and continuity solutions. DRBD is the industry standard for HA and data redundancy for mission critical systems. DRBD enables disaster recovery and HA for any application on Linux. <br /> </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.linmin.com"><img src="{{ STATIC_URL }}img/logos/partners/Linmin.png" alt="LinMin Corp" /></a>
-	        <p><a href="http://www.linmin.com">LinMin Corp</a> LinMin Bare Metal Provisioning remotely installs Ubuntu and other operating systems onto servers, blades, desktops and virtual machines. In addition to true native and unattended distro installations, LinMin can also capture entire disk images, store them on the network and restore them for disaster recovery or clone them to identical hardware. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.magnolia-cms.com"><img src="{{ STATIC_URL }}img/logos/partners/magnolia.png" alt="Magnolia CMS" /></a>
-	        <p><a href="http://www.magnolia-cms.com">Magnolia CMS</a> powers the websites of governments as well as leading Fortune 500 enterprises world-wide. It is favored for its ease-of-use and availability under an Open Source license. Magnolia contains best-of-breed Java technology based on open standards and best practices. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.manageiq.com"><img src="{{ STATIC_URL }}img/logos/partners/ManageIQ.png" alt="ManageIQ, Inc." /></a>
-	        <p><a href="http://www.manageiq.com">ManageIQ, Inc.</a> is the emerging leader in the management and automation of virtualized computing environments. ManageIQ solutions are designed and built for the unique challenges introduced by virtualization and enable IT organizations to realize the benefits of virtualization while achieving higher levels of insight, control and automation. </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.salbaba.co.at"><img src="{{ STATIC_URL }}img/logos/partners/MartinSalbaba.png" alt="Martin Salbaba Softwaredesign" /></a>
-	        <p><a href="http://www.salbaba.co.at">Martin Salbaba Softwaredesign</a> offers with i.mdm an economic and safe ECM solution for enterprise archives. <br /> </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.mulesoft.com"><img src="{{ STATIC_URL }}img/logos/partners/mulesoft.png" alt="Mulesoft" /></a>
-	        <p><a href="http://www.mulesoft.com">Mulesoft</a> is the Web Middleware Company, providing enterprise-class software based on the world&#39;s most popular open source application infrastructure products, Apache Tomcat and Mule ESB. Tcat Server is a fully-supported enterprise Tomcat server, simplifying management and application provisioning tasks for Tomcat developers and administrators. MuleSoft&rsquo;s products boast over 1.5m downloads and over than 2,500 production deployments. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.muli.com.au"><img src="{{ STATIC_URL }}img/logos/partners/muli_logo_scaled.png" alt="Muli Management Pty Ltd" /></a>
-	        <p><a href="http://www.muli.com.au">Muli Management Pty Ltd</a> is a 29 year old &ldquo;Open Core&rdquo; developer of a suite of 500 applications providing Project Risk, Accounts and Process Management from in-house and cloud Ubuntu Linux Servers with x2go desktop access from Linux, Macintosh and Windows PC&#39;s. Our goal is to provide worldwide support and training through local Muli Associates. </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.mysql.com"><img src="{{ STATIC_URL }}img/logos/partners/MySQL.png" alt="MySQL Ab " /></a>
-	        <p><a href="http://www.mysql.com">MySQL Ab </a> provides database products to meet the needs of ISV/OEM, Enterprise, and Community Users. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.nuisoft.com"><img src="{{ STATIC_URL }}img/logos/partners/nuisoft.png" alt="Nuisoft" /></a>
-	        <p><a href="http://www.nuisoft.com">Nuisoft</a> provides custom software development, training and infrastructure management solutions for business. Nuisoft specializes in virtualization and scheduling solutions and offer full service proactive management of customer environments. Managed on an on or off premise outsourced solution we reduce complexity and help manage costs. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.nullbound.com"><img src="{{ STATIC_URL }}img/logos/partners/Nullbound_.png" alt="Nullbound " /></a>
-	        <p><a href="http://www.nullbound.com">Nullbound </a> The NullBound Malware Prevention System utilizes an advanced filtering process unlike anything else. Our unique, cutting edge technology allows you to protect an entire enterprise network, regardless of size. This proactive system runs on a stable, secure Linux platform that protects your network passively through a mirrored port on your switch. </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.nuxeo.com/en"><img src="{{ STATIC_URL }}img/logos/partners/nuxeo_logo_black_scaled__.png" alt="Nuxeo" /></a>
-	        <p><a href="http://www.nuxeo.com/en">Nuxeo</a> Nuxeo provides a modular, extensible Java-based open source software platform for enterprise content management and packaged applications for document management , digital asset management and case management. Designed by developers for developers, the Nuxeo platform offers modern technologies, a powerful plugin model and extensive packaging capabilities for building modern content applications. <br /> </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.safesquid.com"><img src="{{ STATIC_URL }}img/logos/partners/safesquid-logo.png" alt="Office Efficiencies (India) Private Limited" /></a>
-	        <p><a href="http://www.safesquid.com">Office Efficiencies (India) Private Limited</a> SafeSquid is brought to you by Office Efficiencies (India) Private Limited - OEIPL. SafeSquid is the &quot;Best-of-the-Breed&quot; Content Filtering Proxy Server. SafeSquid arguably has the most comprehensive set of features to serve most complex and large networks. OEIPL is based in India - an extremely price and value sensitive market for IT. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.openbravo.com"><img src="{{ STATIC_URL }}img/logos/partners/openbravo__.png" alt="Openbravo" /></a>
-	        <p><a href="http://www.openbravo.com">Openbravo</a> is the leading professional web-based open source enterprise management (ERP) solution for small and midsize enterprises (SMEs). Driven by open source philosophies and best-in-class services, it delivers a fully integrated, web-based ERP system tailored to the needs of any company, regardless of size or industry sector. </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.openqrm-enterprise.com"><img src="{{ STATIC_URL }}img/logos/partners/openqrm.png" alt="openQRM Enterprise" /></a>
-	        <p><a href="http://www.openqrm-enterprise.com">openQRM Enterprise</a> consolidates the technical competence of the openQRM Data Center Management and Cloud Computing Platform to supply expert knowledge, professional services and long-term support for custom, sustainable Data Center setups. openQRM Enterprise reduces the Total Cost of Ownership (TCO) for IT departments using a proven open source framework. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.opera.com"><img src="{{ STATIC_URL }}img/logos/partners/Opera.png" alt="Opera Software " /></a>
-	        <p><a href="http://www.opera.com">Opera Software </a> Secure, fast, and easy to use, the full-featured Opera browser gives The Best Internet Experience. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.opservices.com.br/"><img src="{{ STATIC_URL }}img/logos/partners/opmon_by_opservices_scaled.jpg" alt="OpServices" /></a>
-	        <p><a href="http://www.opservices.com.br/">OpServices</a> is an enterprise dedicated to IT Governance and IT infrastructure and business process monitoring. Created in 2003, offers services and products for the control of availability, performance and security of all the informatizing elements (IT) and sustain those processes, such as communication and energy networks, data banks, operational machines, etc. Its main product is the ... </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.opsview.com"><img src="{{ STATIC_URL }}img/logos/partners/opsview-logo.scaled.png" alt="Opsview " /></a>
-	        <p><a href="http://www.opsview.com">Opsview </a> delivers business-powered monitoring without the complexity or expense of proprietary software. This integrated and commercially-supported open source product gives you a simplified deployment experience, a single console for managing and monitoring distributed deployments, and a comprehensive view of your physical, virtualised and hybrid cloud infrastructure. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.optimumorg.com"><img src="{{ STATIC_URL }}img/logos/partners/Optimum.png" alt="Optimum" /></a>
-	        <p><a href="http://www.optimumorg.com">Optimum</a> provides a wide range of integrated solutions that contribute in developing the business, the solutions offered vary from: Business Consulting Services to operational excellence and Health, Safety and Environment Systems, Information Technology Professional Services as well as IT systems from ERP to business diagnosis tools and Training Services. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.parallels.com"><img src="{{ STATIC_URL }}img/logos/partners/parallels.png" alt="Parallels" /></a>
-	        <p><a href="http://www.parallels.com">Parallels</a> (formerly SWsoft) is a worldwide leader in virtualization and automation software that optimizes computing for consumers, businesses, and service providers across all major hardware, operating system, and virtualization platforms. Founded in 1999, Parallels is a fast-growing company with 900 employees in North America, Europe, and Asia. </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.pgp.com"><img src="{{ STATIC_URL }}img/logos/partners/PGP.png" alt="PGP Corporation" /></a>
-	        <p><a href="http://www.pgp.com">PGP Corporation</a> is a global leader in email and data encryption software for enterprise data protection. Based on a unified key management and policy infrastructure, the PGP&reg; Encryption Platform offers the broadest set of integrated applications for enterprise data security. PGP&reg; platform-enabled applications allow organizations to meet current needs and expand as security requirements evolve. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://reductivelabs.com"><img src="{{ STATIC_URL }}img/logos/partners/puppet-labs-black.png" alt="Puppet Labs" /></a>
-	        <p><a href="http://reductivelabs.com">Puppet Labs</a> Puppet is the leading open source tool for data center automation. Puppet helps you save time, gain visibility into your server environment, and ensure consistency across your IT infrastructure. Our mission is to lead the development of Puppet, share our experience with others, and provide training, consulting, and support for our community. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.randrinc.com"><img src="{{ STATIC_URL }}img/logos/partners/RandrLogo.png" alt="Randr, Inc" /></a>
-	        <p><a href="http://www.randrinc.com">Randr, Inc</a> Randr develops Free Open Source Business Software Solutions for Entrepreneurial, Midrange Businesses. Our primary offerings are Rental Portal and Web Business Suite. Randr&#39;s domain expertise is in Wholesale <br />Distribution, Light Manufacturing, Commercial Rental, Warehouse Management, Reverse SCM, and Organic SEO/SEM. We are working on simplifying the installation and support processes. </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.real.com"><img src="{{ STATIC_URL }}img/logos/partners/Real.png" alt="RealNetworks Inc" /></a>
-	        <p><a href="http://www.real.com">RealNetworks Inc</a> RealPlayer lets you play every major media type, delivers pristine audio and video playback quality, plays CDs, DVDs and all major file type. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.realbasic.com"><img src="{{ STATIC_URL }}img/logos/partners/Realsoftware.png" alt="REAL Software Inc. " /></a>
-	        <p><a href="http://www.realbasic.com">REAL Software Inc. </a> provides powerful tools for software developers. REALbasic is a rapid-application development (RAD) environment for Linux, Windows and Mac OS X that compiles fully native applications for all three operating systems from one source project. REAL SQL Server is a fast and reliable database server ideal for use with REALbasic applications. </p>
-		</div>
-
-		<div class="four-col box">
-	        <img src="{{ STATIC_URL }}img/logos/partners/rightscale_logo.png" alt="RightScale" />
-	        <p>RightScale is the leader in cloud computing management and offers a fully automated cloud management platform that enables organizations to easily deploy and manage business critical applications across multiple clouds with complete control and portability. The RightScale Cloud Management Platform is delivered as &quot;software as a service&quot; (SAAS) and is available in a range of editions. </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.riptano.com"><img src="{{ STATIC_URL }}img/logos/partners/riptano-logo_scaled.png" alt="Riptano" /></a>
-	        <p><a href="http://www.riptano.com">Riptano</a> Cassandra is the most scalable and high performance database for online transactions available. Offering geographic distribution of data across multiple data centers and linear, incremental scalability, Cassandra allows the addition of resources on an as needed basis. Riptano is the company providing software, training and professional services for Apache Cassandra. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.ruffdogs.com"><img src="{{ STATIC_URL }}img/logos/partners/ruffdogs_logo.png" alt="Ruffdogs" /></a>
-	        <p><a href="http://www.ruffdogs.com">Ruffdogs</a> One of North America&#39;s Leading Linux Solutions Company. Through our channel partner program, we design, deliver, implement and support a wide range of Linux based solutions across North America. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.scalr.net"><img src="{{ STATIC_URL }}img/logos/partners/scalr_.png" alt="Scalr, Inc" /></a>
-	        <p><a href="http://www.scalr.net">Scalr, Inc</a> With Scalr, your website and web application can grow to millions of users with little work. Scalr will provision new servers on-the-fly to handle spikes in demand, and decommission them when no longer needed to lower cost. It will scale your database, application servers, and load balancers so you never have to. The end result? ... </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.smartapp.pl"><img src="{{ STATIC_URL }}img/logos/partners/smartapp-logo.png" alt="SmartApp Sp. z o.o" /></a>
-	        <p><a href="http://www.smartapp.pl">SmartApp Sp. z o.o</a> is a company specializing in the delivery of applications for the public sector in Poland, Slovakia and Serbia. The main areas of interest are: supporting judicial processes, documents management and digital signage with the special focus on the public (government) agencies. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.smartscalesystems.com"><img src="{{ STATIC_URL }}img/logos/partners/Smartscale_Logo_Scaled.png" alt="Smartscale" /></a>
-	        <p><a href="http://www.smartscalesystems.com">Smartscale</a> transforms the cloud by integrating automation, mobility and collaboration into a highly scalable cloud management platform. Your team is mobile and your cloud manager should help them engage anytime, anywhere &mdash; only Smartscale&rsquo;s collaborative One Click Data Center runs on popular pads and smartphones helping you save time and money when you move to the ... </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.sparkintegration.com"><img src="{{ STATIC_URL }}img/logos/partners/Spark_Logo_canonical_scaled__.png" alt="Spark Integration Technologies Inc" /></a>
-	        <p><a href="http://www.sparkintegration.com">Spark Integration Technologies Inc</a> a maker of Distrix, is the world leader in distributed information exchange software. Distrix is a multi-platform, rapid development environment for cross-platform, network-centric systems. Used in mission critical, real time systems and large scale sensor networks, the Distrix model-driven development approach accelerates network-centric systems development. </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.tersus.com"><img src="{{ STATIC_URL }}img/logos/partners/tersus.png" alt="Tersus" /></a>
-	        <p><a href="http://www.tersus.com">Tersus</a> The Tersus Visual Programming Platform enables easy creation of enterprise web applications by drawing visual flow diagrams instead of writing code. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.turnkeylinux.org/docs/tklpatch"><img src="{{ STATIC_URL }}img/logos/partners/turnkey_.png" alt="Turnkey Linux" /></a>
-	        <p><a href="http://www.turnkeylinux.org/docs/tklpatch">Turnkey Linux</a> not only offers the most comprehensive selection of appliance images for a growing list of cloud providers, it also provides an easy to use platform for building new appliances using any existing appliance as a starting point. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://ualinux.com"><img src="{{ STATIC_URL }}img/logos/partners/UALinux_spp_logo.png" alt="UA Linux" /></a>
-	        <p><a href="http://ualinux.com">UA Linux</a> Private Enterprise `UALinux` develops and maintains software and open source Ubuntu Applications Pack (UAPack). A suite of add-ons to Ubuntu Linux, to install a wide choice of software without connecting to the Internet. UAPack consists of the following: <br />DesktopPack - for everyday use <br />ServerPack - for server installations <br />GamePack - games for ... </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.unison.com"><img src="{{ STATIC_URL }}img/logos/partners/Unison.png" alt="Unison " /></a>
-	        <p><a href="http://www.unison.com">Unison </a> is the leading unified communications software. It integrates telephony, e-mail, instant messaging and collaboration in a single Linux server and a desktop client. More powerful than old-fashioned separate systems, such as a PBX or e-mail server, Unison increases a company&#39;s productivity by 15% while vastly decreasing IT costs. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.unitrends.com"><img src="{{ STATIC_URL }}img/logos/partners/Unitrends.png" alt="Unitrends" /></a>
-	        <p><a href="http://www.unitrends.com">Unitrends</a> provides enterprise-level data protection, at the lowest total cost of ownership, through a family of scalable disk-based data protection appliances that integrate and protect existing heterogeneous computer and storage systems through a single, graphical user interface. Unitrends uses a backup and recovery engine that protects more than 100 different versions of operating systems and applications. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.unovyx.com"><img src="{{ STATIC_URL }}img/logos/partners/unovyx_large_logo_scaled.png" alt="Unovyx, LLC" /></a>
-	        <p><a href="http://www.unovyx.com">Unovyx, LLC</a> is a proud provider of products, services and solutions to the growing data storage and networking industry. Globally, data storage and networking form the foundations of computing. There is an increasing need for excellent quality and high performing products matched with services and support of the same caliber. </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <img src="{{ STATIC_URL }}img/logos/partners/Unoware_logo.scaled.png.jpg" alt="Unoware" />
-	        <p>Unoware provides enterprise-level business and IT solutions, considering the lowest total cost of ownership. Using a pack of software-based solutions, we help your company achieve the best effort possible considering the QoS required within a competitive market. Our solutions implement the best standards for SOA, BPM and EAM, considering virtualization and high-availability run times, running entirely ... </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://userful.com"><img src="{{ STATIC_URL }}img/logos/partners/Userful-new.jpg" alt="Userful" /></a>
-	        <p><a href="http://userful.com">Userful</a> effectively turns one PC into Ten. Userful Multiplier; is a simple Ubuntu software add-on (included in Multiverse) that enables a single PC equipped with extra video cards to support up to 10 simultaneous users (each with their own monitor, USB keyboard and mouse). </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.usharesoft.com"><img src="{{ STATIC_URL }}img/logos/partners/usharesoft_Scaled_.png" alt="UShareSoft" /></a>
-	        <p><a href="http://www.usharesoft.com">UShareSoft</a> simplifies software governance and application migration for the cloud. UShareSoft&#39;s UForge Appliance Factory enables &quot;&agrave; la carte&quot; software delivery by automating the creation and maintenance of image templates on any OS for any cloud, virtual or physical format. UForge Elastic Appliances are self-deployable images that automatically configure mult-tier software solutions in minutes. </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <img src="{{ STATIC_URL }}img/logos/partners/VIPcom.png" alt="VIPcom GmbH" />
-	        <p>VIPcom GmbH teamXchange - the alternative to Exchange - offers Outlook clients a high performance range mapping MAPI architecture. Up to 1,000 users have access to the same objects, eg. calendar entries, contact data, messages, journals. Applications can be linked via open interfaces (Java SDK, MAPI, or C++). Evolution connector and Webclient released in Q4 2007. </p>
-		</div>
-
-		<div class="four-col box">
-	        <img src="{{ STATIC_URL }}img/logos/partners/virtualappliances.png" alt="Virtual Appliances" />
-	        <p>Virtual Appliances are nano-sized Linux virtual machines with web user interfaces for deploying instant infrastructure and applications which run on vmware/xen/virtualpc/virtualiron. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.vbridges.com"><img src="{{ STATIC_URL }}img/logos/partners/VirtualBridges.png" alt="Virtual Bridges" /></a>
-	        <p><a href="http://www.vbridges.com">Virtual Bridges</a> VERDE is the industry&#39;s most comprehensive desktop management and provisioning solution to deliver desktops in the cloud using desktop virtualization. The VERDE solution lets enterprises transform their desktop TCO by simplifying desktop management, improving security and compliance by centralizing the administration of desktop images and data, and increasing the organizational agility. </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.vladster.net"><img src="{{ STATIC_URL }}img/logos/partners/Vladster.png" alt="Vladster Ltd" /></a>
-	        <p><a href="http://www.vladster.net">Vladster Ltd</a> Vladster delivers Point of Sale and inventory management solutions for small and medium sized businesses. Our main open source product IncoPOS gives you great control over your business. IncoPOS also includes very powerful non-free add-ons which make the interaction with other management systems and data visualization a breeze. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.vmware.com"><img src="{{ STATIC_URL }}img/logos/partners/VMWare.png" alt="VMware" /></a>
-	        <p><a href="http://www.vmware.com">VMware</a> products provide enterprise-class virtual machines that increase server and other resource utilisation, improve performance, increase security and minimise system downtime, reducing the cost and complexity of delivering enterprise services. </p>
-		</div>
-
-		<div class="four-col box">
-	        <img src="{{ STATIC_URL }}img/logos/partners/w3internetsolutions.png" alt="W3 Internet Solutions " />
-	        <p>W3 Internet Solutions is a global web agency who offers its customers exclusive advantages, on the one hand by the wide range of available services and on the other hand by the special care given to the performance and to all its realizations optimization. <br /> </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.wandisco.com"><img src="{{ STATIC_URL }}img/logos/partners/wandisco_scaled.png" alt="WANdisco, Inc" /></a>
-	        <p><a href="http://www.wandisco.com">WANdisco, Inc</a> are the makers of Enterprise Subversion with active core developers from the Subversion open source project on staff. WANdisco&#39;s Subversion Enterprise products add performance, replication, scalability and high availability to open source. Subversion. Subversion is recognized by Forrester as the sole leader in the Standalone Software Configuration Management (SCM) category. WANdisco Subversion binaries running on ... </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.wavemaker.com"><img src="{{ STATIC_URL }}img/logos/partners/Wavemaker.png" alt="WaveMaker Software" /></a>
-	        <p><a href="http://www.wavemaker.com">WaveMaker Software</a> is the only open and easy-to-use web and cloud development platform. WaveMaker&#39;s visual, drag and drop tools flatten the Java learning curve by 92% and create standard Java applications with 98% less code. WaveMaker applications are cloud-ready and include built-in support for multi-tenancy and elastic scaling. <br /> </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://wso2.com"><img src="{{ STATIC_URL }}img/logos/partners/wso2_logo.png" alt="WSO2" /></a>
-	        <p><a href="http://wso2.com">WSO2</a> is the lean enterprise middleware company. It delivers the only complete open source enterprise SOA middleware stack purpose-built as an integrated platform to support today&rsquo;s heterogeneous enterprise environments-internally and in the cloud. WSO2&rsquo;s service and support team is led by technical experts who have proven success in deploying enterprise SOAs. </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.xaxero.com"><img src="{{ STATIC_URL }}img/logos/partners/skylogo.png" alt="Xaxero Marine Software Engineering Limited" /></a>
-	        <p><a href="http://www.xaxero.com">Xaxero Marine Software Engineering Limited</a> A New Zealand based company offering innovative solutions to allow the mariner to See Beyond the Horizon developing radio and satellite based products for real time weather imaging and offering consulting for ocean going leisure and commercial vessels to maximize Internet access over limited bandwidth. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.xcelerit.com"><img src="{{ STATIC_URL }}img/logos/partners/xceleritlogoscaled_.png" alt="Xcelerit computing ltd" /></a>
-	        <p><a href="http://www.xcelerit.com">Xcelerit computing ltd</a> provides an SDK that boosts the performance of processing-intensive applications. It seamlessly leverages the full processing power of workstations and clusters with multi-core CPUs, GPUs, or other specialised processors. This is achieved with a single source code and without the need to specifically address parallelism (e.g. threads, synchronisation, etc.). </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.zarafa.com"><img src="{{ STATIC_URL }}img/logos/partners/zarafa.png" alt="Zarafa Deutschland GmbH" /></a>
-	        <p><a href="http://www.zarafa.com">Zarafa Deutschland GmbH</a> is a groupware server platform that enables you to share e-mail and calendars via Outlook, through the Zarafa Webaccess or on your PDA. The Zarafa Webaccess uses the familiar Outlook &#39;Look &amp; Feel&#39; interface where you can keep using all features that have always allowed you to work efficiently. </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.zend.com/en/products/core/"><img src="{{ STATIC_URL }}img/logos/partners/zend.png" alt="Zend Technologies, Inc" /></a>
-	        <p><a href="http://www.zend.com/en/products/core/">Zend Technologies, Inc</a> the PHP Company, is the leading provider of products and services for developing, deploying and managing business-critical PHP applications. The Zend family of products is a comprehensive platform for supporting the entire lifecycle of PHP applications, used on over 20 million websites. For more information, please visit www.zend.com or call +1 408-253-8800. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.zenoss.com"><img src="{{ STATIC_URL }}img/logos/partners/z-logo-black.jpg" alt="Zenoss" /></a>
-	        <p><a href="http://www.zenoss.com">Zenoss</a> is a leading commercial open source provider of Unlegacy enterprise IT management products. Zenoss Enterprise is a single model-based product that enables organizations to seamlessly manage physical, virtual and cloud based infrastructure with unprecedented power, agility and value. Leveraging a commercial open source model, Zenoss products monitor over one million network and server devices daily. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.zeus.com"><img src="{{ STATIC_URL }}img/logos/partners/zeus.png" alt="Zeus Technology" /></a>
-	        <p><a href="http://www.zeus.com">Zeus Technology</a> develops application traffic management software, meaning we dramatically improve network and web-enabled applications and services making them faster, reliable, secure and easy to manage. As the only pure software traffic management solution available, we&#39;re flexible whatever your deployment environment; Zeus appliances, standard servers, blades, or virtualised environments. </p>
-		</div>
-
-		<div class="four-col last-col box">
-	        <a href="http://www.zimbra.com/"><img src="{{ STATIC_URL }}img/logos/partners/zimbra.png" alt="Zimbra" /></a>
-	        <p><a href="http://www.zimbra.com/">Zimbra</a> a VMware company, is the leader of next-generation messaging and collaboration. Zimbra Collaboration Suite is an open source platform for Ubuntu with enterprise-class email, calendaring, document authoring, instant messaging and mobile device synchronization. It is used by more than 50,000 organizations; find out more at http://www.zimbra.com. </p>
-		</div>
-
-		<div class="four-col box">
-	        <a href="http://www.zmanda.com"><img src="{{ STATIC_URL }}img/logos/partners/zmanda.png" alt="Zmanda Inc" /></a>
-	        <p><a href="http://www.zmanda.com">Zmanda Inc</a> brings the benefits of open source to enterprise backup/recovery. The company offers the industry&rsquo;s leading open source backup/recovery products, including Amanda Enterprise, a network backup and recovery solution based on AMANDA, the world&#39;s most popular open source backup/recovery software, and Zmanda Recovery Manager for MySQL. </p>
-		</div>
-</div><!-- / .row -->
-
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/phone/_includes/_contextual_footer.html b/templates/phone/_includes/_contextual_footer.html
deleted file mode 100755
index a2dad96f677..00000000000
--- a/templates/phone/_includes/_contextual_footer.html
+++ /dev/null
@@ -1,55 +0,0 @@
-{% if level_2 == 'ubuntu-for-android' %}
-	<div class="feature-two six-col">
-		<h3>Ready to talk?</h3>
-		<p>We're ready to work with you now, so if you have plans for Android devices that could benefit from a little added Ubuntu, let us know.</p>
-		<a href="/phone/ubuntu-for-android/contact-us">Get in touch&nbsp;&rsaquo;</a>
-	</div>
-	<div class="feature-four six-col last-col">
-		<h3>Further reading</h3>
-		{% include "_base/_further_reading_links.html" %}
-	</div>
-{% else %}
-	{% if level_2 == 'scopes' %}
-		<div class="feature-two four-col">
-			<h3>Start building now</h3>
-			<p>Mobile carriers, phone manufacturers and ISVs, contact us and get the commercial and technical lowdown on Ubuntu for phones.</p>
-			<p><a href="/phone/contact-us">Get in touch today &rsaquo;</a></p>
-		</div>
-		<div class="four-col">
-			<h3>More features</h3>
-			<p>Scopes are just one feature of the stunning Ubuntu experience on phones.</p>
-			<a href="/phone/features">Discover more phone features&nbsp;&rsaquo;</a>
-		</div>
-		<div class="feature-four four-col last-col">
-			<h3>Further reading</h3>
-			{% include "phone/_includes/_further_reading_phone.html" %}
-		</div>
-	{% else %}
-	<div class="feature-two four-col">
-		<h3>Start building now</h3>
-		<p>Mobile carriers, phone manufacturers and ISVs, contact us and get the commercial and technical lowdown on Ubuntu for phones.</p>
-		<p><a href="/phone/contact-us">Get in touch today&nbsp;&rsaquo;</a></p>
-	</div>
-	<div class="feature-three four-col">
-		<h3>Find out when it&rsquo;s here</h3>
-		<p>If you&rsquo;re not in the mobile industry, but you&rsquo;re as excited as we are about Ubuntu on smartphones, we can let you know when the first phone is released.</p>
-		<p><a href="/phone/register">Register to find out first&nbsp;&rsaquo;</a></p>
-	</div>
-	<div class="feature-four four-col last-col">
-		<h3>Further reading</h3>
-		<ul class="smaller no-bullets">
-			{% if level_2 == 'carrier-advisory-group' %}
-			<li><a href="{{ STATIC_URL }}files/section/devices/CAG_FAQ.pdf">CAG FAQ&nbsp;&rsaquo;</a></li>
-			<li><a href="http://insights.ubuntu.com/products-and-services/phone/">Check out our Insights blog&nbsp;&rsaquo;</a></li>
-			<li><a href="http://developer.ubuntu.com/">Start developing on Ubuntu mobile today&nbsp;&rsaquo;</a></li>
-			{% else %}
-			<li><a href="https://www.youtube.com/watch?v=cpWHJDLsqTU&amp;feature=player_embedded#t=0">Watch the Ubuntu phone video&nbsp;&rsaquo;</a></li>
-			<li><a href="http://insights.ubuntu.com/2014/02/01/mwc-2014-online-press-pack/">Ubuntu phone press release&nbsp;&rsaquo;</a></li>
-			<li><a href="https://insights.ubuntu.com/2013/02/15/ubuntu-for-smartphones-grabs-global-headlines/">Ubuntu for smartphones grabs global headlines&nbsp;&rsaquo;</a></li>
-			<li><a href="https://insights.ubuntu.com/2013/02/15/get-the-faqs-about-ubuntu-on-smartphones/"> Get the FAQs about Ubuntu on smartphones&nbsp;&rsaquo;</a></li>
-			<li><a href="https://insights.ubuntu.com/2013/02/15/developers-get-the-full-support-they-need/">Developers get the full support they need&nbsp;&rsaquo;</a></li>
-			{% endif %}
-		</ul>
-	</div>
-	{% endif %}
-{% endif %}
\ No newline at end of file
diff --git a/templates/phone/_nav_secondary.html b/templates/phone/_nav_secondary.html
index 8d1e9ae6aae..28548aba86a 100755
--- a/templates/phone/_nav_secondary.html
+++ b/templates/phone/_nav_secondary.html
@@ -1,9 +1,7 @@
 	<ul{% if list_class %} class="{{ list_class }}"{% endif %} class="second-level-nav">
 		<li class="first{% if level_1 == 'phone' and not level_2 %} active{% endif %}"><a href="/phone">Overview</a></li>
 		<li{% if level_2 == 'features' %} class="active"{% endif %}><a href="/phone/features" >Features</a></li>
-		<li{% if level_2 == 'scopes' %} class="active"{% endif %}><a href="/phone/scopes" >Scopes</a></li>
-		<li{% if level_2 == 'app-ecosystem' %}  class="active"{% endif %}><a href="/phone/app-ecosystem">App ecosystem</a></li>
-		<li{% if level_2 == 'operators-and-oems' %} class="active"{% endif %}><a href="/phone/operators-and-oems" >Operators and OEMs</a></li>
-		<li{% if level_2 == 'carrier-advisory-group' %}  class="active"{% endif %}><a href="/phone/carrier-advisory-group">Carrier Advisory Group</a></li>
-		<li{% if level_2 == 'backed-by-canonical' %} class="last-item"{% endif %}{% if level_2 == 'ubuntu-for-android' %}  class="active"{% endif %}><a href="/phone/ubuntu-for-android">Ubuntu for Android</a></li>
-	</ul>
+		<li{% if level_2 == 'devices' %} class="active"{% endif %}><a href="/phone/devices" >Devices</a></li>
+		<li{% if level_2 == 'developers' %} class="active"{% endif %}><a href="/phone/developers" >For developers</a></li>
+		<li{% if level_2 == 'partners' %}  class="active"{% endif %}><a href="/phone/partners">For partners</a></li>
+	</ul>
\ No newline at end of file
diff --git a/templates/phone/_nav_tertiary.html b/templates/phone/_nav_tertiary.html
index b3791ba7e43..e7abdd16e89 100755
--- a/templates/phone/_nav_tertiary.html
+++ b/templates/phone/_nav_tertiary.html
@@ -1,5 +1,3 @@
 <ul class="third-level-nav">
-{% if level_2 == 'ubuntu-for-android' %}
-	<li class="first{% if level_3 == 'features' %} active{% endif %}"><a href="/phone/ubuntu-for-android/features">Features</a></li>
-{% endif %}
+
 </ul>
diff --git a/templates/phone/app-ecosystem.html b/templates/phone/app-ecosystem.html
deleted file mode 100755
index bfc9f0cd4eb..00000000000
--- a/templates/phone/app-ecosystem.html
+++ /dev/null
@@ -1,99 +0,0 @@
-{% extends "phone/base_phone.html" %}
-
-{% block title %}App ecosystem | Ubuntu for phones{% endblock %}
-
-{% block meta_description %}Ubuntu brings a ready-made app ecosystem to the phone and with it, a tremendous opportunity for developers. The Ubuntu web apps API allows web developers to make their sites installable as apps on phones running Ubuntu. HTML5 apps can be ported quickly and native apps can be developed with the Ubuntu SDK.{% endblock %}
-
-{% block meta_keywords %}Ubuntu, phone, smartphone, mobile, develop, developer, ISV, app, application, store, software, centre, center, purchase, ecommerce, revenue, content, channel, movie, music, mp3, album, book, magazine, SDK, API, HTML5, web, native, OpenGL, open source, Linux, Android, Unity, cloud, U1DB{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Phone" page_title="App ecosystem"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero row-image-centered">
-	<div class="six-col">
-		<h1>A fast-evolving app ecosystem</h1>
-		<p>We&rsquo;re working closely with selected partners to get their apps onto Ubuntu; Facebook, Twitter, Dropbox, Evernote and  Amazon will be available at launch.  We have also built an expanding set of core native apps with our community. And with our API, thousands of Ubuntu developers are taking up the challenge of building a single app that works across web, desktop and mobile.</p>
-	</div>
-	<span>
-		<img src="{{ STATIC_URL }}img/phone/app-ecosystem/image-phone-appecosystem.jpg" width="402" height="312" alt="Two Ubuntu phones standing side by side" />
-	</span>
-</div><!-- / .row -->
-
-<div class="row row-app-grid row-grey no-margin">
-	<div class="six-col priority-0">
-		<img width="498" height="373" src="{{ STATIC_URL }}img/phone/app-ecosystem/image-phone-aqualitycoreofapps.jpg" alt="Collection of top apps available on Ubuntu Phone"/>
-	</div>
-	<div class="six-col last-col">
-		<h2>A quality core of apps</h2>
-		<p>From browser to camera and everything in-between, Ubuntu has an excellent selection of core apps that have been designed, built and tested entirely by the Ubuntu community. With guidance from Canonical engineers and designers, they&rsquo;ve been planned and developed in the open from the start, which means consumers benefit from the ideas and talents of a global pool of creators.</p>
-		<p>Out of the box you can expect everyday apps such as Calendar, Clock, Calculator and Weather, joined by games like Sudoku and Dropping Letters. You&rsquo;ll even find power tools like Terminal and File Manager.</p>
-	</div>
-	<div class="twelve-col for-mobile">
-		<img src="{{ STATIC_URL }}img/tablet/image-tablet-everythingdevelopersneed.jpg" alt="" width="432" height="300" />
-	</div>
-</div>
-
-<div class="row adapt-web-apps">
-	<div class="seven-col">
-		<h2>Adapt your web apps or go native</h2>
-		<p>Web apps are first class citizens on Ubuntu. Any HTML5 app can be adapted with ease. Additionally, we are working with cross-platform development frameworks like PhoneGap to make these apps work with Ubuntu.  And you can quickly adapt any web site to be installed as a phone app, with its own icon and access to system services.</p>
-		<p>For rich apps and graphics-heavy games, Ubuntu provides an amazing native developer environment using; QML for a slick development experience with engines in C or C++ and JavaScript for UI glue. We also give you full native OpenGL, which the top games companies use.</p>
-		<p>The QML toolkit and a sample application are available for download today, so there&rsquo;s no better time to get started.</p>
-		<p><a href="http://developer.ubuntu.com/gomobile">Get started&nbsp;&rsaquo;</a></p>
-	</div>
-	<div class="five-col last-col text-center">
-		<img src="{{ STATIC_URL }}img/phone/app-ecosystem/image-phone-rss.jpg" width="258" height="464" alt="" />
-	</div>
-</div><!-- / .row -->
-
-<div class="row space-for-content">
-	<div class="six-col text-center">
-		<img src="{{ STATIC_URL }}img/devices/image-phone-scopes.jpg" alt="" />
-	</div>
-	<div class="six-col last-col">
-		<h2>Space for your content to&nbsp;shine</h2>
-		<p>Developers can use Ubuntu&rsquo;s scopes to highlight content. Less chrome and controls gives you more space on the screen to make it stand out, and scopes&rsquo; strong visual presentation and easy navigation make discovery fun for the user.</p>
-		<p>Through browsing and searching, scopes can get your content seen.</p>
-		<p><a href="/phone/scopes">Learn more about scopes&nbsp;&rsaquo;</a></p>
-	</div>
-</div>
-
-<div class="row write-apps">
-	<div class="seven-col">
-		<h2>Write apps for all Ubuntu devices </h2>
-		<p>The Ubuntu Software Centre will extend to deliver phone apps, enabling users to download and install applications in seconds. And here&rsquo;s the really amazing thing: thanks to the Ubuntu SDK, apps can be written to work on all Ubuntu form factors at once.</p>
-		<p>The full Ubuntu SDK is available right now to start building apps, and it&rsquo;s a very powerful tool. It comes with the latest QtCreator IDE 2.8.1 with improved device detection and management, plus system and service APIs for making use of the sensors and alarms in any handset. The UI Toolkit gives you all the latest Ubuntu designs so you can build your app to fit beautifully with the UI.</p>
-		<p class="no-margin-bottom"><a href="http://developer.ubuntu.com/get-started/">Download the SDK now&nbsp;&rsaquo;</a></p>
-	</div>
-	<div class="five-col last-col pull-left for-tablet">
-		<img src="{{ STATIC_URL }}img/phone/app-ecosystem/image-phone-softwarecentre.jpg" alt="The Ubuntu software centre" width="390" height="401" class="touch-bottom" />
-	</div>
-</div><!-- / .row -->
-
-<div class="row">
-	<div class="four-col">
-		<ul class="no-bullets text-center">
-			<li class="four-col"><img src="{{ STATIC_URL }}img/logos/logo-everything-everywhere.png"  alt="Everywhere everywhere" /></li>
-			<li class="four-col {{ item_class }}"><img src="{{ STATIC_URL }}img/logos/logo-tmobile.png" alt="T Mobile" /></li>
-			<li class="verizon"><img src="{{ STATIC_URL }}img/logos/logo-verizon.png" alt="Verizon" /></li>
-		</ul>
-	</div>
-	<div class="eight-col last-col">
-		<h2>Integrate to differentiate</h2>
-		<p>Ubuntu was designed for differentiation from the start, with a flexible framework in place for OEMs and carriers to apply branding and promote services -- without departing from the distinctive Ubuntu visual theme. Developers can use custom scopes to highlight featured content alongside the user’s local results, and services can be integrated directly into the front-end of some core applications. It’s all done at the service layer, so it’s powerful without ever leading to OS fragmentation.</p>
-		<p>Ubuntu already has the support of some of the world’s biggest mobile operators. Verizon, T-Mobile, EE and many others have signed up to the Carrier Advisory Group to help shape the Ubuntu mobile strategy.</p>
-		<p><a href="/phone/carrier-advisory-group">Find out more about the CAG&nbsp;&rsaquo;</a></p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row row-community row-image-centered no-border no-margin-bottom">
-	<span><img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-help-orange.svg" alt="" width="135" height="135" /></span>
-	<div class="nine-col box no-border">
-		<h2>Looking for help with your app development?</h2>
-		<p>As the experts in mobile Qt development and UX design, ICS provides native app development services and localisation on Qt platforms. ICS&rsquo;s team of engineers develop elegant solutions for even the most complex requirements and can help bring your application to life on Ubuntu.</p>
-		<p><a href="http://www.ics.com/technologies/ubuntu" class="external">Visit the ICS website</a></p>
-	</div>
-</div><!-- /.row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/phone/base_phone.html b/templates/phone/base_phone.html
index 614baf51868..25365bfa4e4 100755
--- a/templates/phone/base_phone.html
+++ b/templates/phone/base_phone.html
@@ -1,6 +1,123 @@
-{% extends "_base/base.html" %}
+{% extends "templates/base.html" %}
+
+{% block head_extra %}
+<meta property="og:image" content="{{ STATIC_URL }}img/phone/facebook-share.jpg"/>
+{% if level_2 == 'features' %} 
+<style>
+@-webkit-keyframes "slideOut"{100%{left:-300px;}}@-moz-keyframes slideOut {100%{left:-300px;}}@keyframes "slideOut"{100%{left:-300px;}}@-webkit-keyframes "slideOutRight"{from{left:-300px;}to{right:0;}}@-moz-keyframes slideOutRight {from{left:-300px;}to{right:0;}}@keyframes "slideOutRight"{from{left:-300px;}to{right:0;}}@-webkit-keyframes "slideOutRight2"{from{left:0;}to{right:-300px;}}@-moz-keyframes slideOutRight2 {from{left:0;}to{right:-300px;}}@keyframes "slideOutRight2"{from{left:0;}to{right:-300px;}}@-webkit-keyframes "slideIn"{100%{left:0;}}@-moz-keyframes slideIn {100%{left:0;}}@keyframes "slideIn"{100%{left:0;}}@-webkit-keyframes "fadeIn"{from{opacity:0;}to{opacity:1;}}@-moz-keyframes fadeIn {from{opacity:0;}to{opacity:1;}}@keyframes "fadeIn"{from{opacity:0;}to{opacity:1;}}@-webkit-keyframes "fadeOut"{from{opacity:1;}to{opacity:0;}}@-moz-keyframes fadeOut {from{opacity:1;}to{opacity:0;}}@keyframes "fadeOut"{from{opacity:1;}to{opacity:0;}}@-webkit-keyframes "rotate"{from{-webkit-transform:rotate(0deg);}to{-webkit-transform:rotate(-180deg);}}@-moz-keyframes rotate {from{-moz-transform:rotate(0deg);}to{-moz-transform:rotate(-180deg);}}@keyframes "rotate"{from{transform:rotate(0deg);}to{transform:rotate(-180deg);}}@-webkit-keyframes "rotateRev"{from{-webkit-transform:rotate(-180deg);}to{-webkit-transform:rotate(0);}}@-moz-keyframes rotateRev {from{-moz-transform:rotate(-180deg);}to{-moz-transform:rotate(0);}}@keyframes "rotateRev"{from{transform:rotate(-180deg);}to{transform:rotate(0);}}@-webkit-keyframes "animatedBackground"{0%{-webkit-transform:scale(1, 1);-moz-transform:scale(1, 1);-ms-transform:scale(1, 1);-o-transform:scale(1, 1);transform:scale(1, 1);opacity:0;}100%{-webkit-transform:scale(1.1, 1.1);-moz-transform:scale(1.1, 1.1);-ms-transform:scale(1.1, 1.1);-o-transform:scale(1.1, 1.1);transform:scale(1.1, 1.1);opacity:1;}}@-moz-keyframes animatedBackground {0%{-moz-transform:scale(1, 1);transform:scale(1, 1);opacity:0;}100%{-moz-transform:scale(1.1, 1.1);transform:scale(1.1, 1.1);opacity:1;}}@keyframes "animatedBackground"{0%{-webkit-transform:scale(1, 1);-moz-transform:scale(1, 1);-ms-transform:scale(1, 1);-o-transform:scale(1, 1);transform:scale(1, 1);opacity:0;}100%{-webkit-transform:scale(1.1, 1.1);-moz-transform:scale(1.1, 1.1);-ms-transform:scale(1.1, 1.1);-o-transform:scale(1.1, 1.1);transform:scale(1.1, 1.1);opacity:1;}}</style>
+{% endif %}
+{% comment %}
+This is for the ripples animation
+{% endcomment %}
+{% if level_2 != 'contact-us' %}<style>
+    #phoneCanvas {
+        margin-top: -60px;
+        margin-left: -40px;
+        position: absolute;
+        z-index: 0;
+    }
+</style>
+<script>
+var canvas, stage;
+var bgimage;
+var bgImageList = [];
+var currentOrigamiImageIndex = 0;
+var origami;
+function init() {
+	
+		for( var i=4;--i>0;)
+		{
+			bgimage = new Image();
+			//bgimage.src = "testassets/simpleFoldTest"+i+".jpg";
+			//bgimage.src = "testassets/simpleFoldTestPortrait.jpg";
+			bgimage.src = "{{ STATIC_URL }}img/phone/overview/full-size-landscape.png";     
+			//<-- 1080P output example. Change the canvas size to 1080p as well
+
+			bgImageList.push( bgimage );
+		}
+
+		canvas = document.getElementById("phoneCanvas");
+		
+		origami = new UbuntuOrigami(canvas, bgimage);
+		
+
+		/*
+			IMAGES USED NEED TO BE 100% SCALE. AND THE SAME SIZE AS THE CANVAS UNLESS YOU WANT IT CROPPED.
+			THEY ARE BASED OFF THE 1920x1296 CROPS SENT FROM MICHAL.
+			YOU CAN FIND ROUGHS OF THE CROPS/FOLDS HERE  http:://game.canonicalwebteam.com/testassets/full-size-landscape.png & protrait.png
+			ALL IMAGES SHOULD HAVE THESE FOLDS OVERLAYED. IF YOU USE A DIFFERENT CROP SET THE OFFSETX AND OFFSETY AS THE 
+			PIXELS IN FROM THE TOP LEFT AT IT'S CURRENT SCALE.
+		*/
+		//origami.setOffset(37,0);
+
+		//SAVING
+		//If you want to output pngs use the below command pointing to a script that takes "filename" as a get
+		//And binary data as a post. See the php script in http://game.canonicalwebteam.com/canvassaver.rar for a working example.
+		//Be sure to set it to false in the onComplete! Or you'll get a never ending output.
+		//origami.setSavePngs(true, "http://localhost/canvassaver.php?");
+
+		//YOU MUST SET THE SEQUENCE BEFORE DOING ANYTHING ELSE!
+		//origami.setSequence( UbuntuOrigami.DATA_PORTRAIT, true );
+		origami.setSequence( UbuntuOrigami.DATA_LANDSCAPE, true );
+		
+		//loop can be set to 0 for infinite
+		origami.loop = 1;
+		//origami.setForwards(false);
+
+		//Should it bounce off the end and return?
+		origami.pingPong = false;
+		origami.setFPS(25);
+		origami.play(1);
+
+		origami.onComplete = nextBackground;
+
+		//This example stops on open and waits for a mouse click
+		origami.onOpen = origamiOpen;
+		//origami.loop = 2;
+		//origami.setForwards(false);
+		//origami.pingPong = true;
+		//origami.setFPS(45);
+
+}
+
+function nextBackground()
+{
+
+	currentOrigamiImageIndex++;
+	if( currentOrigamiImageIndex >= bgImageList.length )
+		currentOrigamiImageIndex = 0;
+
+	origami.setImage( bgImageList[currentOrigamiImageIndex] );
+
+	//Make it pingPong every other loop for fun
+	//if( origami.getCurrentFrame() > 1 )
+	//origami.pingPong = !origami.pingPong;
+	//origami.setFPS( 15+Math.random()*80);
+}
+
+//Here's an example of stopping on open and having click to play
+function origamiOpen() {
+	origami.stop();
+	setInterval(function(){ origami.play(); }, 5000);
+}
+
+//function origamiOpen()
+//{
+	//origami.stop();
+	//canvas.addEventListener( "click", clickToPlay );
+//}
+
+//function clickToPlay(e)
+//{
+	//canvas.removeEventListener( "click", clickToPlay );
+	//origami.play();
+//}
+</script>{% endif %}
+{% endblock %}
+{% block footer_extra %}<script src="{{ STATIC_URL }}js/plugins/UbuntuOrigami.js"></script>{% endblock %}
 
 {% block outer_content %}
     {% block content %}{% endblock %}
-		{% include "_base/_contextual_footer.html" %}
+		{% if level_2 != 'contact-us' %}{% include "phone/shared/_ripples.html" %}{% endif %}
+		{% include "templates/_contextual_footer.html" %}
 {% endblock %}
diff --git a/templates/phone/carrier-advisory-group.html b/templates/phone/carrier-advisory-group.html
deleted file mode 100755
index b5ff7dffadd..00000000000
--- a/templates/phone/carrier-advisory-group.html
+++ /dev/null
@@ -1,96 +0,0 @@
-{% extends "phone/base_phone.html" %}
-
-{% block title %}Carrier Advisory Group | Ubuntu for phones{% endblock %}
-
-{% block meta_keywords %}CAG, Carrier Advisory Group, Ubuntu carrier, Ubuntu phone, Ubuntu mobile, Ubuntu smartphone, Ubuntu Touch, phone membership, mobile operators, carrier partners, mobile operator partners, ecosystem, app developers{% endblock %}
-{% block meta_description %}The Canonical Carrier Advisory Group (CAG) enables mobile operators to shape the development of Ubuntu for smartphones.{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Phone" page_title="Carrier Advisory Group"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero">
-	<h1>Carrier Advisory Group</h1>
-	<div class="twelve-col">
-		<ul class="inline">
-			{% include "phone/_includes/_cag_list.html" with image_width="160" image_height="80" item_class="box" %}
-		</ul>
-	</div>
-	<div class="six-col">
-		<p>The Ubuntu Carrier Advisory Group (CAG) lets mobile operators shape Ubuntu&rsquo;s mobile strategy.  Members receive advance confidential briefings and provide us with industry insight to ensure that Ubuntu meets their needs.</p>
-	</div>
-	<div class="six-col last-col">
-		<p>Members of the CAG have the opportunity to be a launch partner and gain the right to ship Ubuntu in markets <br/>they serve.</p>
-	</div>
-	<div class="six-col">
-		<p><a href="https://pages.canonical.com/carrier-advisory-group-contact-us.html" class="link-cta-ubuntu">Become a member</a></p>
-		<p><a href="http://start.ubuntu-cag.com">Existing members log in&nbsp;&rsaquo;</a></p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row">
-	<h2>Benefits of joining</h2>
-	<div class="eight-col">
-		<h3>Regular <abbr title="Carrier Advisory Group">CAG</abbr> meetings</h3>
-		<p>CAG meetings take place regularly and typically include a briefing by Canonical or a partner company, followed by feedback from carriers. Members can bring domain specialists to calls for each relevant topic covered. Topics planned for discussion in the CAG forum include:</p>
-
-		<div class="combined-list">
-			<div class="four-col">
-				<ul class="list-ubuntu">
-					<li>Differentiation for OEMs and operators</li>
-					<li>Developer ecosystems and application portability</li>
-					<li>HTML5 standards, performance and compatibility</li>
-					<li class="last-item">Marketplaces for apps, content and services</li>
-				</ul>
-			</div>
-			<div class="four-col last-col">
-				<ul class="list-ubuntu">
-					<li>Revenue share models for publishers, operators, and OEMs</li>
-					<li>Payment mechanisms and standards</li>
-					<li>Platform fragmentation</li>
-					<li class="last-item">Consumer and enterprise market segments and positioning</li>
-				</ul>
-			</div>
-		</div>
-	</div>
-	<div class="four-col last-col text-center">
-		<img src="{{ STATIC_URL }}img/phone/carrier-advisory-group/image-phone-gallery.jpg" alt="Ubuntu phone on the Events scope" width="240" height="431" />
-	</div>
-</div><!-- / .row -->
-
-<div class="row row-grey row-image-centered">
-	<span>
-		<img width="192" height="120" src="{{ STATIC_URL }}img/phone/carrier-advisory-group/image-wideindustryparticipation.svg" alt="" />
-	</span>
-	<div class="eight-col">
-		<h3>Wide industry participation</h3>
-		<p>A key goal for Ubuntu is to satisfy the operators&rsquo; need for more platform competition. Wide industry participation in the group will help us to prioritise the delivery of new Ubuntu features, and grow an ecosystem of software, services and devices that meets that need.</p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row row-image-centered">
-	<div class="eight-col">
-		<h3>Launch priority</h3>
-		<p>CAG members can launch Ubuntu devices before non-members in local markets. The first two launch partners will be selected from within the group, with the next wave following six months later; non-members will face a substantial wait to gain access to the platform.</p>
-		<p>Members will have early knowledge of silicon, as well as OEM and ODM partners involved in the Ubuntu mobile initiative.</p>
-	</div>
-	<span>
-		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-partner-warmgrey.png" width="168" height="169" alt="" />
-	</span>
-</div><!-- / .row -->
-
-<div class="row independently-chained">
-	<div class="eight-col push-three">
-		<h2>Independently chaired</h2>
-		<p>The Carrier Advisory Group is chaired independently of Canonical by David Wood, who has 25 years&rsquo; experience in the mobile industry, including leadership roles at Psion, Symbian and Accenture. He has wide experience with collaborative advisory groups, and twice served on the board of directors of the OMA (Open Mobile Alliance).</p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row no-border">
-	<blockquote class="pull-quote">
-		<p><span>&ldquo;</span>The mobile industry still needs an independent platform that <br/>enables innovation and differentiation. That platform is Ubuntu. <br/>The Carrier Advisory Group will have the opportunity to influence <br/>the Ubuntu roadmap, and take full advantage of the potential of this emerging platform.&nbsp;&nbsp;<span>&rdquo;</span></p>
-		<p><cite>David Wood, CAG Chairman</cite></p>
-	</blockquote>
-</div><!-- / .row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/phone/contact-us.html b/templates/phone/contact-us.html
deleted file mode 100755
index 3c549bfaf30..00000000000
--- a/templates/phone/contact-us.html
+++ /dev/null
@@ -1,112 +0,0 @@
-{% extends "phone/base_phone.html" %}
-
-{% block title %}Contact us | Ubuntu for phones{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Phone" page_title="Contact us"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-border no-margin">
-	<h1>Let&rsquo;s go to market</h1>
-	<h2>Ubuntu is ready for smartphones at retail in early 2014.</h2>
-</div>
-
-<div class="row no-border">
-	<div class="eight-col">
-		<h3>Mobile network operator or a handset maker</h3>
-		<p>If you&rsquo;d like to help make this happen, please get in touch to arrange a meeting.</p>
-			<script type="text/javascript">
-			function fieldValidate(field) {
-			  /* call Mkto.setError(field, message) and return false to mark a field value invalid */
-			  /* return 'skip' to bypass the built-in validations */
-			  return true;
-			}
-			function getRequiredFieldMessage(domElement, label) {
-			  return "This field is required";
-			}
-			function getTelephoneInvalidMessage(domElement, label) {
-			  return "Please enter a valid telephone number";
-			}
-			function getEmailInvalidMessage(domElement, label) {
-			  return "Please enter a valid email address";
-			}
-			</script>
-		<form class="lpeRegForm formNotEmpty" method="post" enctype="application/x-www-form-urlencoded" action="https://app-g.marketo.com/index.php/leadCapture/save" id="mktForm_1083" name="mktForm_1083">
-			<fieldset class="fieldset-1">
-				<h3>Contact information</h3>
-				<ul class="mktLblLeft">
-					<li class='mktFormReq mktField' ><label for="FirstName">First name: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormString mktFReq' name="FirstName" id="FirstName" type='text' value=""  maxlength='255' tabIndex='1' required /><span class='mktFormMsg'></span></span></li>
-					<li class='mktFormReq mktField' ><label for="LastName">Last name: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormString mktFReq' name="LastName" id="LastName" type='text' value=""  maxlength='255' tabIndex='2' required /><span class='mktFormMsg'></span></span></li>
-					<li class='mktFormReq mktField' ><label for="Company">Company name: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormString mktFReq' name="Company" id="Company" type='text' value=""  maxlength='255' tabIndex='3' required /><span class='mktFormMsg'></span></span></li>
-					<li  class='mktFormReq mktField' ><label>Company website: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormUrl mktFReq' name="Website" id="Website" type='text' value=""  maxlength='255' tabIndex='4' required /><span class='mktFormMsg'></span></span></li>
-
-					<li class='mktFormReq mktField' ><label for="Email">Email address: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormEmail mktFReq' name="Email" id="Email" type='email' value=""  maxlength='255' tabIndex='5' required /><span class='mktFormMsg'></span></span></li>
-					<li class='mktFormReq mktField'><label>Phone number: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormPhone mktFReq' name="Phone" id="Phone" value="" maxlength="255" tabindex="6" type="tel" required><span class="mktFormMsg"></span></span></li>
-				</ul>
-			</fieldset>
-			<fieldset class="fieldset-2">
-				<h3>Your interests</h3>
-				<ul class='mktLblLeft'>
-					<li  class='mktField' ><label>What influence do you have over launching a phone in the next 12 to 18 months?</label><span class='mktInput'><select class='mktFormSelect' name="Level_of_Influence__c" id="Level_of_Influence__c" size='1'  tabIndex='6'><option value='Select level of influence' selected='selected'>Select level of influence</option><option value='Decision Maker'>Decision maker</option><option value='Influencer'>Influencer</option><option value='Little/none'>Little/none</option></select><span class='mktFormMsg'></span></span></li>
-					<li class="mktFormReq mktField" ><label for="Why_Mobile__c">What is your main interest in Ubuntu for phones? <span>*</span></label><span class="mktInput"><select class="mktFormSelect mktFReq" name="Why_Mobile__c" id="Why_Mobile__c" size="1" tabindex="7" required><option value="" selected="selected">Select your interest</option><option value="OEM">Designing/making a phone</option><option value="Telco">Retailing/distributing a phone</option><option value="Developer">Developing apps for Ubuntu mobile</option><option value="In-house Applications Developer">Developing in-house applications</option><option value="Community">Contributing to the development of Ubuntu mobile</option><option value="Content">Delivering content via the Ubuntu devices</option><option value="Consumer">Personal use of Ubuntu on your phone</option></select><span class="mktFormMsg"></span></span></li>
-					<li class='mktFormReg mktField' ><label for="Comments_from_lead__c">Please share more: <span>*</span></label><span class='mktInput'><textarea class='mktFormTextarea mktFormTextarea mktFReq' name="Comments_from_lead__c" id="Comments_from_lead__c" cols='20' rows='5' tabIndex='10'></textarea><span class='mktFormMsg'></span></span></li>
-				</ul>
-			</fieldset>
-			<fieldset class="fieldset-3">
-				<h3>Your organisation</h3>
-				<ul class="mktLblLeft">
-					<li class='mktFormReq mktField' ><label for="Country">Country: <span>*</span></label><span class="mktInput"><select class='mktFormSelect mktFReq' name="Country" id="Country" size='1'  tabIndex='11' required><option value='' selected='selected'>Select country</option><option value='AF'>Afghanistan</option><option value='AX'>Åland Islands</option><option value='AL'>Albania</option><option value='DZ'>Algeria</option><option value='AS'>American Samoa</option><option value='AD'>Andorra</option><option value='AO'>Angola</option><option value='AI'>Anguilla</option><option value='AQ'>Antarctica</option><option value='AG'>Antigua and Barbuda</option><option value='AR'>Argentina</option><option value='AM'>Armenia</option><option value='AW'>Aruba</option><option value='AU'>Australia</option><option value='AT'>Austria</option><option value='AZ'>Azerbaijan</option><option value='BS'>Bahamas</option><option value='BH'>Bahrain</option><option value='BD'>Bangladesh</option><option value='BB'>Barbados</option><option value='BY'>Belarus</option><option value='BE'>Belgium</option><option value='BZ'>Belize</option><option value='BJ'>Benin</option><option value='BM'>Bermuda</option><option value='BT'>Bhutan</option><option value='BO'>Bolivia</option><option value='BA'>Bosnia and Herzegovina</option><option value='BW'>Botswana</option><option value='BV'>Bouvet Island</option><option value='BR'>Brazil</option><option value='IO'>British Indian Ocean Territory</option><option value='BN'>Brunei Darussalam</option><option value='BG'>Bulgaria</option><option value='BF'>Burkina Faso</option><option value='BI'>Burundi</option><option value='KH'>Cambodia</option><option value='CM'>Cameroon</option><option value='CA'>Canada</option><option value='CV'>Cape Verde</option><option value='KY'>Cayman Islands</option><option value='CF'>Central African Republic</option><option value='TD'>Chad</option><option value='CL'>Chile</option><option value='CN'>China</option><option value='CX'>Christmas Island</option><option value='CC'>Cocos (Keeling) Islands</option><option value='CO'>Colombia</option><option value='KM'>Comoros</option><option value='CG'>Congo</option><option value='CD'>Congo (The Democratic Republic of the)</option><option value='CK'>Cook Islands</option><option value='CR'>Costa Rica</option><option value='CI'>Côte D&#039;Ivoire</option><option value='HR'>Croatia</option><option value='CU'>Cuba</option><option value='CY'>Cyprus</option><option value='CZ'>Czech Republic</option><option value='DK'>Denmark</option><option value='DJ'>Djibouti</option><option value='DM'>Dominica</option><option value='DO'>Dominican Republic</option><option value='EC'>Ecuador</option><option value='EG'>Egypt</option><option value='SV'>El Salvador</option><option value='GQ'>Equatorial Guinea</option><option value='ER'>Eritrea</option><option value='EE'>Estonia</option><option value='ET'>Ethiopia</option><option value='FK'>Falkland Islands (Malvinas)</option><option value='FO'>Faroe Islands</option><option value='FJ'>Fiji</option><option value='FI'>Finland</option><option value='FR'>France</option><option value='GF'>French Guiana</option><option value='PF'>French Polynesia</option><option value='TF'>French Southern Territories</option><option value='GA'>Gabon</option><option value='GM'>Gambia</option><option value='GE'>Georgia</option><option value='DE'>Germany</option><option value='GH'>Ghana</option><option value='GI'>Gibraltar</option><option value='GR'>Greece</option><option value='GL'>Greenland</option><option value='GD'>Grenada</option><option value='GP'>Guadeloupe</option><option value='GU'>Guam</option><option value='GT'>Guatemala</option><option value='GG'>Guernsey</option><option value='GN'>Guinea</option><option value='GW'>Guinea-Bissau</option><option value='GY'>Guyana</option><option value='HT'>Haiti</option><option value='HM'>Heard Island and McDonald Islands</option><option value='HN'>Honduras</option><option value='HK'>Hong Kong</option><option value='HU'>Hungary</option><option value='IS'>Iceland</option><option value='IN'>India</option><option value='ID'>Indonesia</option><option value='IR'>Iran (Islamic Republic of)</option><option value='IQ'>Iraq</option><option value='IE'>Ireland</option><option value='IM'>Isle of Man</option><option value='IL'>Israel</option><option value='IT'>Italy</option><option value='JM'>Jamaica</option><option value='JP'>Japan</option><option value='JE'>Jersey</option><option value='JO'>Jordan</option><option value='KZ'>Kazakhstan</option><option value='KE'>Kenya</option><option value='KI'>Kiribati</option><option value='KP'>Korea (Democratic People&amp;amp;#039;s Republic of)</option><option value='KR'>Korea (Republic of)</option><option value='KW'>Kuwait</option><option value='KG'>Kyrgyzstan</option><option value='LA'>Lao People&amp;amp;#039;s Democratic Republic</option><option value='LV'>Latvia</option><option value='LB'>Lebanon</option><option value='LS'>Lesotho</option><option value='LR'>Liberia</option><option value='LY'>Libyan Arab Jamahiriya</option><option value='LI'>Liechtenstein</option><option value='LT'>Lithuania</option><option value='LU'>Luxembourg</option><option value='MO'>Macao</option><option value='MK'>Macedonia (The Former Yugoslav Republic of)</option><option value='MG'>Madagascar</option><option value='MW'>Malawi</option><option value='MY'>Malaysia</option><option value='MV'>Maldives</option><option value='ML'>Mali</option><option value='MT'>Malta</option><option value='MH'>Marshall Islands</option><option value='MQ'>Martinique</option><option value='MR'>Mauritania</option><option value='MU'>Mauritius</option><option value='YT'>Mayotte</option><option value='MX'>Mexico</option><option value='FM'>Micronesia (Federated States of)</option><option value='MD'>Moldova (Republic of)</option><option value='MC'>Monaco</option><option value='MN'>Mongolia</option><option value='ME'>Montenegro</option><option value='MS'>Montserrat</option><option value='MA'>Morocco</option><option value='MZ'>Mozambique</option><option value='MM'>Myanmar</option><option value='NA'>Namibia</option><option value='NR'>Nauru</option><option value='NP'>Nepal</option><option value='NL'>Netherlands</option><option value='AN'>Netherlands Antilles</option><option value='NC'>New Caledonia</option><option value='NZ'>New Zealand</option><option value='NI'>Nicaragua</option><option value='NE'>Niger</option><option value='NG'>Nigeria</option><option value='NU'>Niue</option><option value='NF'>Norfolk Island</option><option value='MP'>Northern Mariana Islands</option><option value='NO'>Norway</option><option value='OM'>Oman</option><option value='PK'>Pakistan</option><option value='PW'>Palau</option><option value='PS'>Palestinian Territory (Occupied)</option><option value='PA'>Panama</option><option value='PG'>Papua New Guinea</option><option value='PY'>Paraguay</option><option value='PE'>Peru</option><option value='PH'>Philippines</option><option value='PN'>Pitcairn</option><option value='PL'>Poland</option><option value='PT'>Portugal</option><option value='PR'>Puerto Rico</option><option value='QA'>Qatar</option><option value='RE'>Réunion</option><option value='RO'>Romania</option><option value='RU'>Russian Federation</option><option value='RW'>Rwanda</option><option value='BL'>Saint Barthélemy</option><option value='SH'>Saint Helena</option><option value='KN'>Saint Kitts and Nevis</option><option value='LC'>Saint Lucia</option><option value='MF'>Saint Martin</option><option value='PM'>Saint Pierre and Miquelon</option><option value='VC'>Saint Vincent and The Grenadines</option><option value='WS'>Samoa</option><option value='SM'>San Marino</option><option value='ST'>Sao Tome and Principe</option><option value='SA'>Saudi Arabia</option><option value='SN'>Senegal</option><option value='RS'>Serbia</option><option value='SC'>Seychelles</option><option value='SL'>Sierra Leone</option><option value='SG'>Singapore</option><option value='SK'>Slovakia</option><option value='SI'>Slovenia</option><option value='SB'>Solomon Islands</option><option value='SO'>Somalia</option><option value='ZA'>South Africa</option><option value='GS'>South Georgia and the South Sandwich Islands</option><option value='ES'>Spain</option><option value='LK'>Sri Lanka</option><option value='SD'>Sudan</option><option value='SR'>Suriname</option><option value='SJ'>Svalbard and Jan Mayen</option><option value='SZ'>Swaziland</option><option value='SE'>Sweden</option><option value='CH'>Switzerland</option><option value='SY'>Syrian Arab Republic</option><option value='TW'>Taiwan</option><option value='TJ'>Tajikistan</option><option value='TZ'>Tanzania</option><option value='TH'>Thailand</option><option value='TL'>Timor-Leste</option><option value='TG'>Togo</option><option value='TK'>Tokelau</option><option value='TO'>Tonga</option><option value='TT'>Trinidad and Tobago</option><option value='TN'>Tunisia</option><option value='TR'>Turkey</option><option value='TM'>Turkmenistan</option><option value='TC'>Turks and Caicos Islands</option><option value='TV'>Tuvalu</option><option value='UG'>Uganda</option><option value='UA'>Ukraine</option><option value='AE'>United Arab Emirates</option><option value='GB'>United Kingdom</option><option value='US'>United States</option><option value='UM'>United States Minor Outlying Islands</option><option value='UY'>Uruguay</option><option value='UZ'>Uzbekistan</option><option value='VU'>Vanuatu</option><option value='VA'>Vatican City State (Holy See)</option><option value='VE'>Venezuela (Bolivarian Republic of)</option><option value='VN'>Viet Nam</option><option value='VG'>Virgin Islands (British)</option><option value='VI'>Virgin Islands (U.S.)</option><option value='WF'>Wallis and Futuna</option><option value='EH'>Western Sahara</option><option value='YE'>Yemen</option><option value='ZM'>Zambia</option><option value='ZW'>Zimbabwe</option><option value=''></option></select><span class='mktFormMsg'></span></span> </li>
-					<li class='mktFormReq mktField' ><label for="State">State: <span>*</span></label><span class='mktInput'><select class='mktFormSelect mktFReq' name="State" id="State" size='1'  tabIndex='12' required><option value='SelectProvince' selected='selected'>Select Province</option><option value='AB'>Alberta</option><option value='BC'>British Columbia</option><option value='MB'>Manitoba</option><option value='NB'>New Brunswick</option><option value='NF'>Newfoundland</option><option value='NT'>Northwest Territories</option><option value='NS'>Nova Scotia</option><option value='NU'>Nunavut</option><option value='ON'>Ontario</option><option value='PE'>Prince Edward Island</option><option value='QC'>Quebec</option><option value='SK'>Saskatchewan</option><option value='YT'>Yukon Territory</option><option value='SelectState'>Select State</option><option value='AK'>Alaska</option><option value='AL'>Alabama</option><option value='AR'>Arkansas</option><option value='AZ'>Arizona</option><option value='CA'>California</option><option value='CO'>Colorado</option><option value='CT'>Connecticut</option><option value='DC'>District of Columbia</option><option value='DE'>Delaware</option><option value='FL'>Florida</option><option value='GA'>Georgia</option><option value='HI'>Hawaii</option><option value='IA'>Iowa</option><option value='ID'>Idaho</option><option value='IL'>Illinois</option><option value='IN'>Indiana</option><option value='KS'>Kansas</option><option value='KY'>Kentucky</option><option value='LA'>Louisiana</option><option value='MA'>Massachusetts</option><option value='MD'>Maryland</option><option value='ME'>Maine</option><option value='MI'>Michigan</option><option value='MN'>Minnesota</option><option value='MO'>Missouri</option><option value='MS'>Mississippi</option><option value='MT'>Montana</option><option value='NC'>North Carolina</option><option value='ND'>North Dakota</option><option value='NE'>Nebraska</option><option value='NH'>New Hampshire</option><option value='NJ'>New Jersey</option><option value='NM'>New Mexico</option><option value='NV'>Nevada</option><option value='NY'>New York</option><option value='OH'>Ohio</option><option value='OK'>Oklahoma</option><option value='OR'>Oregon</option><option value='PA'>Pennsylvania</option><option value='PR'>Puerto Rico</option><option value='RI'>Rhode Island</option><option value='SC'>South Carolina</option><option value='SD'>South Dakota</option><option value='TN'>Tennessee</option><option value='TX'>Texas</option><option value='UT'>Utah</option><option value='VA'>Virginia</option><option value='VT'>Vermont</option><option value='WA'>Washington</option><option value='WI'>Wisconsin</option><option value='WV'>West Virginia</option><option value='WY'>Wyoming</option><option value=''></option></select><span class='mktFormMsg'></span></span></li>
-					<li class='mktFormReq mktField' ><label for="Industry">Industry: <span>*</span></label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Industry" id="Industry" size='1'  tabIndex='13'><option value='Select' selected='selected'>Select industry</option><option value='Mobile operator'>Mobile operator</option><option value='Phone manufacturer'>Phone manufacturer</option><option value='PC manufacturer'>PC manufacturer</option><option value='SOC vendor'>SOC vendor</option><option value='ODM'>ODM</option><option value='Software Development'>Software/app developer</option><option value='' disabled>------------</option><option value='Accountancy & Tax'>Accountancy &amp; tax</option><option value='Aerospace & Aviation'>Aerospace &amp; aviation</option><option value='Automotive'>Automotive</option><option value='Banking & Finance'>Banking &amp; Finance</option><option value='Business Consultancy'>Business consultancy</option><option value='Charity & Non-profit'>Charity &amp; non-profit</option><option value='Construction'>Construction</option><option value='Consumer Products'>Consumer products</option><option value='Consumer Services'>Consumer services</option><option value='Defence & Security'>Defence &amp; security</option><option value='Education & Training'>Education &amp; training</option><option value='Electronics'>Electronics</option><option value='Engineering'>Engineering</option><option value='Entertainment - media/music/broadcast'>Entertainment - media/music/broadcast</option><option value='Facilities, Property & Real Estate'>Facilities, property &amp; real estate</option><option value='Government'>Government</option><option value='Healthcare & Pharmaceuticals'>Healthcare &amp; pharmaceuticals</option><option value='HR & Recruitment'>HR &amp; Recruitment</option><option value='Information Technology'>Information technology</option><option value='Insurance'>Insurance</option><option value='Internet & New Media'>Internet &amp; new media</option><option value='Legal'>Legal</option><option value='Leisure, Travel & Hospitality'>Leisure, travel &amp; hospitality</option><option value='Manufacturer - Other'>Manufacturer - other</option><option value='Marketing, PR & Advertising'>Marketing, PR &amp; advertising</option><option value='Media - publishing or news'>Media - publishing or news</option><option value='Oil & Gas'>Oil &amp; gas</option><option value='Public Sector'>Public sector</option><option value='Retail & e-commerce'>Retail &amp; e-commerce</option><option value='Science & Environment'>Science &amp; environment</option><option value='Software Development'>Software development</option><option value='Supply Chain & Logistics'>Supply chain &amp; logistics</option><option value='Transportation &amp; Distribution'>Transportation &amp; distribution</option><option value='Utilities & Energy'>Utilities &amp; energy</option><option value='Other'>Other</option><option value='Not applicable (self)'>Not applicable (self)</option></select><span class='mktFormMsg'></span></span></li>
-					<li class='mktFormReq mktField' ><label for="Job_Role__c">Job role: <span>*</span></label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Job_Role__c" id="Job_Role__c" size='1'  tabIndex='14'><option selected='selected'>Select job role</option><option value='Executive'>Executive</option><option value='Sales & marketing'>Sales &amp; marketing</option><option value='Product management'>Product management</option><option value='Purchasing'>Purchasing</option><option value='R&D'>R&amp;D</option><option value='' disabled>------------</option><option value='Business and Project Management'>Business and project management</option><option value='Database Development and Administration'>Database development and administration</option><option value='Education'>Education</option><option value='Enterprise Systems Analysis & Integration'>Enterprise systems analysis &amp; integration</option><option value='Home User'>Home user</option><option value='Network Design and Administration'>Network design and administration</option><option value='Owner/Self Employed'>Owner/Self employed</option><option value='Press and Communications'>Press and communications/Analyst</option><option value='Programming/Software Engineering'>Programming/Software engineering</option><option value='Smartphone User'>Smartphone user</option><option value='Technical Support'>Technical support</option><option value='Technical Writing'>Technical writing</option><option value='Ubuntu Enthusiast'>Ubuntu enthusiast</option><option value='Web Development and Administration'>Web development and administration</option></select><span class='mktFormMsg'></span></span></li>
-					<li class='mktFormReq mktField' ><label for="num_employees__c">Number of employees: <span>*</span></label><span class='mktInput'><select class='mktFormSelect mktFReq' name="num_employees__c" id="num_employees__c" size='1'  tabIndex='15' required><option value='>Select employees' selected='selected'>Select employees</option><option value='None'>None</option><option value='<500'>&lt;500</option><option value='501-1000'>501-1000</option><option value='1001-2000'>1001-2000</option><option value='2001-5000'>2001-5000</option><option value='5000+'>5000+</option></select><span class='mktFormMsg'></span></span></li>
-				</ul>
-			</fieldset>
-			<fieldset class="fieldset-submit">
-				<ul class="mktLblLeft">
-					<li class='mktField' ><span class='mktInput'><input class='mktFormCheckbox' name="MobileNewsletterOpt-in" id="MobileNewsletterOpt-in" type='checkbox' value="1"  tabIndex='16' /><label for="MobileNewsletterOpt-in">Would you like to follow progress with our mobile newsletter?</label><span class='mktFormMsg'></span></span></li>
-					<li class='mktField' ><span class='mktInput'><input class='mktFormCheckbox' name="NewsletterOpt-In" id="NewsletterOpt-In" type='checkbox' value="1"  tabIndex='17' /><label for="NewsletterOpt-In">I would like to receive occasional news about Ubuntu by email.</label><span class='mktFormMsg'></span></span></li>
-
-					<li>All information provided will be handled in accordance with the Canonical <a href="http://www.ubuntu.com/privacy-policy">privacy policy</a>.</li>
-					<li id="mktFrmButtons"><!--<label>&nbsp;</label>--><input id="mktFrmSubmit" type="submit" value="Submit" name="submitButton" tabIndex='18' onclick="formSubmit(document.getElementById('mktForm_1083')); return false;">&nbsp;<input style="display: none;" id="mktFrmReset" type="reset" value="Clear" name="resetButton" onclick="formReset(document.getElementById('mktForm_1083')); return false;"></li>
-				</ul>
-			</fieldset>
-			<span style="display:none;">
-			<input type="text" name="_marketo_comments" value="" /></span>
-			<input type="hidden" name="lpId" value="1345" />
-			<input type="hidden" name="subId" value="30" />
-			<input type="hidden" name="kw" value="" />
-			<input type="hidden" name="cr" value="" />
-			<input type="hidden" name="searchstr" value="" />
-			<input type="hidden" name="lpurl" value="https://pages.canonical.com/mobile_register.html?cr={creative}&amp;kw={keyword}" />
-			<input type="hidden" name="formid" value="1083" />
-			<input type="hidden" name="returnURL" value="http://www.ubuntu.com/phone/thank-you" />
-			<input type="hidden" name="retURL" value="http://www.ubuntu.com/phone/thank-you" />
-			<input type="hidden" name="returnLPId" value="-1" />
-			<input type="hidden" name="_mkt_disp" value="return" />
-     		<input type="hidden" name="_mkt_trk" value="%MC0%" />
-  		</form>
-		<script type="text/javascript" src="http://www.ubuntu.com/misc/jquery.js?J"></script>
-		<script type="text/javascript" src="https://pages.canonical.com/js/mktFormSupport.js"></script>
-		<script type="text/javascript" src="http://pages.canonical.com/js/public/stateCountry.js"></script>
-		<script type="text/javascript">
-			function formSubmit(elt) {
-				return Mkto.formSubmit(elt);
-			}
-			function formReset(elt) {
-				return Mkto.formReset(elt);
-			}
-			$(document).ready(function(){var e=$("#tick_ces-in");var t=$("#tick_mwc-in");var n=$("#Question1");$("#tick_ces-in, #tick_mwc-in").change(function(){if(e.is(":checked")&&t.is(":checked")){n.val("CES,MWC")}else if(e.is(":checked")){n.val("CES")}else if(t.is(":checked")){n.val("MWC")}else{n.val("Neither")}})})
-		</script>
-	</div><!-- /.seven-col -->
-	<div class="four-col last-col">
-		<h3>Phone user</h3>
-		<p>If you want to know when Ubuntu launches on smartphones, please leave your details for us and we&rsquo;ll let you know when the first Ubuntu phone is released.</p>
-		<p><a href="https://forms.canonical.com/manhattan/">Register to find out first&nbsp;&rsaquo;</a></p>
-		<h3>Mobile operators</h3>
-		<p>Help shape Ubuntu&rsquo;s mobile strategy, consider joining our Ubuntu Carrier Advisory Group.</p>
-		<p><a href="/phone/carrier-advisory-group">Learn more&nbsp;&rsaquo;</a></p>
-	</div>
-</div><!-- /.row -->
-{% endblock content %}
diff --git a/templates/phone/developers.html b/templates/phone/developers.html
new file mode 100644
index 00000000000..919e3280d92
--- /dev/null
+++ b/templates/phone/developers.html
@@ -0,0 +1,102 @@
+{% extends "phone/base_phone.html" %}
+
+{% block title %}For developers | Ubuntu for phones{% endblock %}
+
+{% block meta_description %}Ubuntu phone represents a tremendous opportunity for developers. Scopes can be developed quickly, making your content available to Ubuntu users more easily than it is through traditional apps. The Ubuntu web apps API allows you to make websites installable as apps on phones running Ubuntu. HTML5 apps can be ported quickly and super-fast native apps can be developed with the Ubuntu SDK.{% endblock meta_description %} 
+
+{% block meta_keywords %}Ubuntu, phone, smartphone, mobile, develop, developer, ISV, app, application, store, scope software, centre, center, purchase, ecommerce, revenue, content, channel, movie, music, mp3, album, book, magazine, SDK, API, HTML5, web, native, OpenGL, open source, Linux, Android, Unity, Ubuntu One, cloud, U1DB{% endblock meta_keywords %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Phone" page_title="For developers"  %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row row-hero">
+	<div class="five-col append-one">
+		<h1>For developers by&nbsp;design</h1>
+		<p class="intro">A unique opportunity to build content and services into the core phone experience.</p>
+		<!-- <p><a href="http://developer.ubuntu.com/get-started/">Download the SDK&nbsp;&rsaquo;</a></p> -->
+	</div>
+	<div class="six-col last-col">
+		<img src="{{ STATIC_URL }}img/phone/developers/image-developer-hero.png" width="519" alt="" />
+	</div>
+</div><!-- /.row -->
+
+<div class="row row-slideshow no-border">
+    {% include "phone/shared/_slideshow.html" %}
+    <div id="scopes-content" class="six-col last-col prepend-five">
+        <h2>Be more than just an app</h2>
+        <p>By leveraging scopes, your content and services become integral to the core phone experience&nbsp;&mdash;&nbsp;and at a fraction of the cost of developing and maintaining a traditional app. It&rsquo;s never been this easy to develop a mobile experience.</p>
+        <p>The Ubuntu SDK also support mainstream HTML5 apps beautifully, while a rich Qt/QML based native app environment can be used to develop deeper experiences, like&nbsp;games.</p>
+    </div>
+    <div class="six-col for-mobile"><img class="left" src="{{ STATIC_URL }}img/phone/features/image-introducing-scopes.png" alt="" /></div>
+</div>
+
+
+<div class="row row-scope-frameworks">
+    <div class="six-col">
+        <h2>Introducing scopes and&nbsp;frameworks</h2>
+    	<p>With Ubuntu, you can make your content discoverable via the phone&rsquo;s default aggregating scopes (e.g. Today, NearBy, News, Music, Photos) simply by creating a new scope of your own. For even deeper API access, frameworks are coming soon. With the Messaging framework, for example, you can integrate your services with the core messaging app for the phone. With the Cloud framework, users could adjust the settings to instruct all core apps to use your service for&nbsp;storage.</p>
+    </div>
+</div><!-- /.row -->
+
+<div class="row row-grey equal-height no-border">
+    <div class="four-col align-vertically align-center">
+		<img src="{{ STATIC_URL }}img/phone/developers/image-html5-logo.png" alt="" />
+    </div>
+    <div class="eight-col last-col">
+        <h2>HTML5 and web apps: <span>the fastest path to Ubuntu</span></h2>
+        <p>If you&rsquo;ve created HTML5 apps or mobile websites for other platforms &mdash; there&rsquo;s good news: the path to Ubuntu couldn&rsquo;t be quicker. We support both the Webkit/Blink and Cordova development standards &mdash; and with a separate API that enables websites to be quickly converted to run independently of a browser, with full access to phone notifications and settings, the same goes for your web&nbsp;applications.</p>
+    </div>
+</div><!-- /.row -->
+
+<div class="row row-shine no-border">
+    <div class="for-mobile"><img src="{{ STATIC_URL }}img/phone/developers/image-content-shine-small.jpg" alt="" /></div>
+    <div class="row-shine-content five-col no-margin-bottom">
+        <h2 class="four-col">Space for your content to shine</h2>
+        <p class="clear">There&rsquo;s no better way to highlight your content and services than Ubuntu&rsquo;s thoughtfully designed scopes, giving you more space to make your content stand&nbsp;out.</p>
+        <p><a href="/phone/features">Learn more about scopes&nbsp;&rsaquo;</a></p>
+    </div>
+</div><!-- /.row -->
+
+<div class="row equal-height">
+	<div class="eight-col">
+    <h2>Going native</h2>
+        <p>The Ubuntu SDK includes everything you need to create your own scopes, repurpose your web/HTML5 content and develop native apps.</p>		
+        <ul class="list list-ubuntu">
+            <li>QtCreator IDE (2.8.1) with improved device detection and management</li>
+            <li>Full native OpenGL
+            <li>System and service APIs for accessing hardware sensors and alarms</li>
+            <li>The freedom to combine QML, C or C++ and JavaScript</li>
+            <li>The latest Ubuntu designs so you can build your app to fit with the UI</li>
+        </ul>
+
+		<p><a class="link-cta-ubuntu" href="http://developer.ubuntu.com/get-started/">Download the SDK now</a></p>
+	</div>
+    <div class="not-for-small four-col last-col align-center align-vertically">
+        <img src="{{ STATIC_URL }}img/phone/developers/logo-qt.svg" width="135" alt="" />
+    </div>
+</div><!-- /.row -->
+
+<div class="row row-community">
+    <div class="five-col align-center">
+        <img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-help-orange.svg" width="210" alt="" />
+    </div>
+	<div class="seven-col last-col">
+		<h2>A helping hand</h2>
+		<p>Our Qt development partner, ICS, offers native app development services and localisation on Qt platforms. Their team of engineers can develop elegant solutions in response to the most complex requirements &mdash; and help you bring your application to life on Ubuntu.</p>
+		<p><a class="external" href="https://www.ics.com/technologies/ubuntu">Visit the ICS website</a></p>
+	</div>
+</div><!-- /.row -->
+
+<div class="row no-border">
+	<div class="eight-col">
+		<h2>Announcing the China Mobile and Ubuntu Developer Innovation Competition</h2>
+		<p class="intro">15 December 2014 &ndash; 12 June 2015</p>
+		<p><a class="external" href="http://dream.10086.cn/yecp/match?action=ubuntu">Signup now</a></p>
+	</div>
+    <div class="four-col last-col align-center">
+        <img src="{{ STATIC_URL }}img/phone/developers/icon-china-mobile.svg" width="209" alt="" />
+    </div>
+</div><!-- /.row -->
+{% endblock content %}
diff --git a/templates/phone/devices.html b/templates/phone/devices.html
new file mode 100644
index 00000000000..08944b0daaa
--- /dev/null
+++ b/templates/phone/devices.html
@@ -0,0 +1,42 @@
+{% extends "phone/base_phone.html" %}
+
+{% block title %}Devices | Ubuntu for phones{% endblock %}
+
+{% block meta_keywords %}Ubuntu, phone, smartphone, mobile, cellphone, cell, BQ, Aquaris, E4.5, Android, Europe, Spain, Spanish, OS, Canonical, OEM, network operator, partner, operating system, platform, open source, Linux, device, handheld, handset, touch, camera, dual SIM, unlocked. {% endblock %}
+
+{% block meta_description %}Ubuntu is now available all over Europe on the BQ Aquaris E4.5, direct from the BQ website. Many more devices are in the works, so watch this space.{% endblock %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Phone" page_title="Devices"  %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div itemscope itemtype="http://schema.org/Product" class="row row-hero">
+	<div class="twelve-col">
+		<h1 itemprop="name">The all-new BQ Aquaris E4.5</h1>
+		{% comment %}<p>Ubuntu is <a href="http://store.bqreaders.com/es/aquaris-e-4-5">available now from BQ</a> on the Aquaris E4.5 Ubuntu Edition.</p>{% endcomment %}
+	</div>
+	<div class="twelve-col">
+		<div class="device-image six-col align-center">
+			<p><img itemprop="image" src="{{ STATIC_URL }}img/phone/devices/image-bq-phone.png" alt="" /></p>	
+		</div>
+		<div class="six-col last-col">
+			<ul itemprop="description" class="list-ubuntu">
+    			<li>Slots for two micro-SIM cards so you can use your phone on more than one network</li>
+                <li>Dragontrail glass for scratch and impact resistance</li>
+                <li>8 megapixel camera with autofocus and dual flash</li>
+                <li>Full HD (1080p) camera for super-sharp video recording</li>
+                <li>8 GB internal memory with MicroSD slot for extra storage (up to 32GB)</li>
+                <li>Dimensions: 137 x 67 x 9 mm</li>            
+                <li>Weight: 123g</li>
+            </ul>
+			<p itemprop="price">Only 169,90&euro;</p>
+			<p><a itemprop="url" class="link-cta-ubuntu" href="http://www.bq.com/gb/ubuntu.html">How to buy</a>&nbsp;&nbsp;<a itemprop="sameAs" href="http://www.bqreaders.com/gb/products/aquaris-e4-5.html">Learn more about the BQ Aquaris E4.5&nbsp;&rsaquo;</a></p>
+		</div><!-- /.six-col -->
+	</div>
+</div>
+
+<div class="row row-grey no-border text-center">
+	<h2 class="twelve-col">More Ubuntu phones coming soon&hellip;</h2>
+</div>
+{% endblock content %} 
\ No newline at end of file
diff --git a/templates/phone/features.html b/templates/phone/features.html
old mode 100755
new mode 100644
index 0d94115be09..d55457cde0d
--- a/templates/phone/features.html
+++ b/templates/phone/features.html
@@ -2,165 +2,242 @@
 
 {% block title %}Features | Ubuntu for phones{% endblock %}
 
-{% block meta_keywords %}Ubuntu, phone, smartphone, cellphone, cell, mobile, OS, operating system, user, interface, GUI, edge magic, content, focus, app, native, web, HTML5, Unity, gestures, handheld, handset, touch, multitouch, touchscreen, device, form factor, Linux, open source{% endblock %}
-{% block meta_description %}Ubuntu brings a stunning, natural new user interface to the mobile phone that allows the user to focus on their content, rather than on-screen application controls.{% endblock %}
+{% block meta_description %}Ubuntu brings a stunning, natural new user interface to the smartphone that makes it quicker and easier to find content, whether it&rsquo;s stored on the phone or on the web.{% endblock %}
+
+{% block meta_keywords %}Ubuntu, phone, smartphone, cellphone, cell, mobile, OS, operating system, user, interface, GUI, edge magic, content, focus, app, native, web, HTML5, Unity, gestures, handheld, handset, touch, multitouch, touchscreen, device, form factor, Linux, open source, scopes, Launcher{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Phone" page_title="Design"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Phone" page_title="Features"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
-<div class="row row-hero infographic no-margin no-border">
-	<div class="six-col">
-		<h1>A phone you can see yourself in</h1>
-		<p>Ubuntu reflects you in the personalised graphics adorning the phone&rsquo;s welcome screen. Designed by artists who specialise in finding beautiful visualisations of complex data, the welcome screen evolves as you use the phone, to be perfectly unique and personal. This isn’t so much a lock screen, it&rsquo;s a sign saying: &ldquo;come in&rdquo;. A signature flourish for Ubuntu and for you.</p>
-	</div><!-- /.six-col -->
-	<div class="six-col last-col no-print clearfix">
-		<img width="600" height="442" src="{{ STATIC_URL }}img/devices/infographic-3km-walked.png" class="main-image info-pic-0" alt="Ubuntu Phone infographic showing distance walked" />
-		<img width="600" height="442" src="{{ STATIC_URL }}img/devices/infographic-7hours-at-rest.png" class="main-image info-pic-1 hide" alt="Ubuntu Phone infographic showing hours at rest" />
-		<img width="600" height="442" src="{{ STATIC_URL }}img/devices/infographic-7messages-received.png" class="main-image info-pic-2 hide" alt="Ubuntu Phone infographic showing messages received" />
-		<img width="600" height="442" src="{{ STATIC_URL }}img/devices/infographic-14tweets-received.png" class="main-image info-pic-3 hide" alt="Ubuntu Phone infographic showing tweets received" />
-		<img width="600" height="442" src="{{ STATIC_URL }}img/devices/infographic-33minutes-talk-time.png" class="main-image info-pic-4 hide" alt="Ubuntu Phone infographic showing duration of talk" />
-	</div><!-- /.six-col -->
-</div><!-- / .row -->
+<div class="row row-hero no-border">
+    <div class="for-mobile"><img src="{{ STATIC_URL }}img/phone/features/image-features-hero-small.jpg" alt="" /></div>
+	<div class="four-col append-eight">
+		<h1>Features</h1>
+		<p class="intro">Ubuntu&rsquo;s scopes give you related content on one screen, instead of hiding it behind different apps. So everything you look for in life is now right at your&nbsp;fingertips.</p>
+	</div><!-- /.four-col -->
+</div><!-- .row -->
 
-<div class="row">
-	<div class="eight-col">
-		<h2>Naturally neat</h2>
-		<p>Your content and apps are at the heart of the Ubuntu experience - beautifully presented and neatly organised by scopes. One swipe takes you to Scopes, Apps, Music, Video. Outdated app grids are finished. Choose your favourites, just give them your star rating and tailor the phone for you.</p>
-		<p><a href="/phone/scopes">Learn more about scopes &rsaquo;</a></p>
-	</div>
-	<div class="twelve-col"><!--TODO: update image -->
-		<div class="naturallyneat-image-load" data-width="924" data-src="{{ STATIC_URL }}img/phone/features/image-phone-naturallyneat{width}.jpg" data-alt="Ubuntu phones side by side show the consistancy between different screens"></div>
-		<script>
-		    new Imager('.naturallyneat-image-load', {
-		        availableWidths: {
-		            320: '-small',
-		            924: '-medium'
-		        }
-		    });
-		</script>
-	</div>
-</div><!-- / .row -->
+<div class="row row-slideshow no-border">
+    {% include "phone/shared/_slideshow.html" %}
+    <div id="scopes-content" class="six-col last-col prepend-five">
+    	<h2>Introducing scopes</h2>
+    	<p>Ubuntu&rsquo;s scopes are like individual home screens for different kinds of content, giving you access to everything from movies and music to local services and social media, without having to go through individual apps.</p>
+    </div>
+    <div class="six-col for-mobile"><img class="left" src="{{ STATIC_URL }}img/phone/features/image-introducing-scopes.png" alt="" /></div>
+</div>
 
-<div class="row no-border row-fingertips">
-	<div class="eight-col">
-		<h2>Everything at your fingertips</h2>
-		<p>With great apps and intuitive gestures, the Ubuntu phone is quick to understand &mdash; soon you&rsquo;ll be racing between your content without a thought.  You can use natural swiping gestures from the edges of the screen to make it easier than ever to access your content and switch between apps. </p>
-	</div>
+<div class="row row--video no-border no-padding">
+    <h2>See scopes in action</h2>
+	<div class="the-video"><div></div></div>
+    <p class="video-link"><a href="//www.youtube.com/watch?v=-dpfHYpfEXY&amp;hd=1" class="show-video">Watch the video</a></p>
 </div><!-- /.row -->
 
-<div class="row row-pictures no-border edge-top"><!-- may also need phone-photos -->
-	<div class="five-col pictures-portrait text-center">
-		<div class="feature-image">
-			<img src="{{ STATIC_URL }}img/phone/features/image-phone-portrait.jpg" alt="phone-portrait" width="227" height="407" />
-			<div></div>
-		</div>
-	</div>
-	<div class="edge-magic-content pictures-landscape six-col last-col">
-		<h3>A life in pictures</h3>
-		<p>The Gallery makes it easier than  ever to organise, find and share your photos. We focus on the photo, and you can bring in the controls when you need them. Every shot is instantly uploaded to your personal cloud account, making it available on all your devices &mdash; even iOS, Android and Windows.</p>
-		<div class="feature-image">
-			<img src="{{ STATIC_URL }}img/phone/features/image-phone-landscape.jpg" alt="" width="410" height="212" />
-			<div></div>
-		</div>
-	</div>
-</div><!-- / .row -->
+<div class="row row--scopes row--scopes__nearby edge-magic">
+<div class="branded-bg"></div>
+    <div class="ten-col prepend-one append-one equal-height no-margin-bottom">
+        <div class="six-col align-vertically no-margin-bottom">
+            <div class="row--scopes__content five-col">
+                <h2 class="four-col">A scope for every facet of life</h2>
+                <h3>NearBy</h3>
+                <p>When you&rsquo;re out and about, the NearBy scope can help you find where to eat, what bands to see and even which bus to catch.</p>
+            </div>
+        </div>
+        <div class="row--scopes__image four-col last-col no-margin-bottom">
+            <div class="screens">
+                <ul class="screens-list no-margin-bottom inline">
+                    <li class="row--scopes__image__scope-screen row--scopes__image__scope-screen--nearby"></li>
+                    <li class="row--scopes__image__scope-screen row--scopes__image__scope-screen-branded row--scopes__image__scope-screen--nearby-branded"></li>
+                </ul>
+            </div>
+        </div><!-- /.scope-image -->
+    </div><!-- /.ten-col -->
+</div><!-- /.row -->
 
-<div class="row no-border edge-magic edge-left">
-	<div class="edge-magic-content six-col">
-		<h3>Favourite apps</h3>
-		<p>Most people use a small group of apps regularly. With Ubuntu all it takes is a swipe from the left edge of the screen to reveal the Launcher with all your favourites &mdash; with equal positioning for native and web apps. There&rsquo;s room for everything you use daily, available instantly with a single touch from the welcome screen or any application.</p>
-	</div>
-	<div class="six-col last-col text-center">
-		<div class="slider-animation edge-magic-animation">
-			<div class="screen">
-				<div class="screen-fade"></div>
-				<div class="launcher"></div>
-			</div>
-		</div>
-		<a href="#" class="slideless replay"></a>
-	</div>
+<div class="row row--scopes row--scopes-left row--scopes__music edge-magic">
+<div class="branded-bg"></div>
+    <div class="ten-col prepend-one append-one equal-height no-margin-bottom">
+        <div class="row--scopes__image four-col not-for-small no-margin-bottom slider-animation">
+            <div class="screens">
+                <ul class="screens-list no-margin-bottom inline">
+                    <li class="row--scopes__image__scope-screen row--scopes__image__scope-screen--music slider-animation"></li>
+                    <li class="row--scopes__image__scope-screen row--scopes__image__scope-screen-branded row--scopes__image__scope-screen--music-branded"></li>
+                </ul>
+            </div>
+        </div><!-- /.scope-image -->
+        <div class="six-col align-vertically last-col no-margin-bottom">
+            <div class="row--scopes__content five-col prepend-two">
+                <h3>Music</h3>
+                <p>Listen to music from your library, stream from Soundcloud or Grooveshark, download tracks from 7digital, or catch the latest gig with Songkick.</p>
+            </div>
+        </div>
+        <div class="row--scopes__image for-small four-col no-margin-bottom slider-animation">
+            <div class="screens">
+                <ul class="screens-list no-margin-bottom inline">
+                    <li class="row--scopes__image__scope-screen row--scopes__image__scope-screen--music slider-animation"></li>
+                    <li class="row--scopes__image__scope-screen row--scopes__image__scope-screen-branded row--scopes__image__scope-screen--music-branded"></li>
+                </ul>
+            </div>
+        </div><!-- /.scope-image -->
+    </div><!-- /.ten-col -->
 </div><!-- /.row -->
 
-<div class="row no-border edge-magic edge-top">
-	<div class="six-col search-animation">
-		<div class="slider-animation search-fade">
-			<div class="phone-background">
-			    <div class="search-screen">
-			        <img class="screen fade-1" src="{{ STATIC_URL }}img/devices/phone-search-1.png" alt="" />
-			        <img class="screen fade-2" src="{{ STATIC_URL }}img/devices/phone-search-2.png" alt="" />
-			        <img class="screen fade-3" src="{{ STATIC_URL }}img/devices/phone-search-3.png" alt="" />
-			        <img class="screen fade-4" src="{{ STATIC_URL }}img/devices/phone-search-4.png" alt="" />
-			    </div>
-			</div>
-		</div>
-		<a href="#" class="slideless replay"></a>
-	</div>
-	<div class="edge-magic-content six-col last-col">
-		<h3>Find anything, anywhere, instantly</h3>
-		<p>The Ubuntu Dash and smart searches make finding content a breeze. Just search and watch the results come in &mdash; from everywhere. Looking for music? Ubuntu searches on your phone and at online retailers, for example including Amazon and 7 Digital.</p>
-		<p>Best of all, Ubuntu gets to know you over time, so the results will grow more relevant the more you search. Wherever it is, let Dash find it for you.</p>
-	</div>
-</div><!-- / .row -->
+<div class="row row--scopes row--scopes__news edge-magic no-border">
+<div class="branded-bg"></div>
+    <div class="ten-col prepend-one append-one equal-height no-margin-bottom">
+        <div class="six-col align-vertically no-margin-bottom">
+            <div class="row--scopes__content five-col">
+                <h3>News</h3>
+                <p>Get the latest news from from a range of different sources. Use the settings in this scope to create a tailored newspaper just for you.</p>
+            </div>
+        </div>
+        <div class="row--scopes__image four-col last-col no-margin-bottom slider-animation">
+            <div class="screens">
+                <ul class="screens-list no-margin-bottom inline">
+                    <li class="row--scopes__image__scope-screen row--scopes__image__scope-screen--news"></li>
+                    <li class="row--scopes__image__scope-screen row--scopes__image__scope-screen-branded row--scopes__image__scope-screen--news-branded"></li>
+                </ul>
+            </div>
+        </div><!-- /.scope-image -->
+    </div><!-- /.ten-col -->
+</div><!-- /.row -->
 
-<div class="row row-notifications edge-magic edge-left no-border">
-	<div class="edge-magic-content six-col">
-		<h3>Clever control of settings</h3>
-		<p>With Ubuntu, all of your notifications are gathered for your attention whenever you’re ready &mdash; just swipe down from the top edge of the screen. You can reply to Facebook, Twitter, text or picture messages and even return phone calls without leaving the notifications bar. You’ll never miss a thing. It also lets you check the status of your phone and access core settings.</p>
-	</div>
-	<div class="six-col last-col text-center">
-		<div class="slider-animation notification-slider">
-			<div class="screen">
-				<div class="settings-screen"></div>
-				<div class="slider-knot"></div>
-			</div>
-		</div>
-		<a href="#" class="slideless replay"></a>
-	</div>
-</div><!-- / .row -->
+<div class="row row--today">
+    <div class="for-mobile"><img src="{{ STATIC_URL }}img/phone/features/image-today-small.jpg" alt="" /></div>
+    <div class="row--today__content five-col">
+        <h2>Today</h2>
+        <p>Head back home at any time to see your most important interactions on one screen. Personalize the Today scope so what&rsquo;s important to you, is right at your&nbsp;fingertips.</p>
+    </div>
+</div><!-- /.row -->
 
-<div class="row no-border edge-magic edge-top">
-	<div class="six-col">
-		<div class="slider-animation go-back">
-			<div class="screen">
-				<div class="gallery-screen"></div>
-				<div class="camera-screen"></div>
+<div class="row row-origami row--edge no-border">
+	<h2 class="twelve-col">Life on the edge</h2>
+	
+	<div class="three-col">
+	
+		<div id="swipe-from-top" class="three-col first">
+    		<div class="three-col">
+			    <h3>Swipe from <br />the&nbsp;top</h3>
+                <p class="three-col">Swipe down from the top for access to notifications <br />and key phone settings, without breaking <br />your stride.</p>
+    		</div>
+			<div class="three-col not-for-small">
+				<img src="{{ STATIC_URL }}img/phone/features/image-swipe-from-top.png" alt="" />
+			</div>
+		</div><!--/#swipe-from-top -->
+		
+		<div id="swipe-from-left" class="three-col no-margin-bottom">
+			<div class="three-col not-for-small">
+				<img class="right" src="{{ STATIC_URL }}img/phone/features/image-swipe-from-left.png" alt="" />
 			</div>
-		</div>
-		<a href="#" class="slideless replay"></a>
-	</div>
-	<div class="edge-magic-content six-col last-col">
-		<h3>Always running</h3>
-		<p>Got apps running? A full left-to-right swipe reveals a screen showing them all, while a swipe from the right brings you instantly to the last app you were using. Switching between running applications has never been quicker or easier.</p>
-	</div>
+			<div class="three-col">
+				<h3>Swipe from <br />the&nbsp;left</h3>
+				<p>Swipe from the left to reveal the Launcher, for quick access to your favourite features and&nbsp;apps.</p>
+			</div>
+		</div><!--/#swipe-from-left -->
+		
+	</div><!-- /.three-col -->
+	
+	<div class="six-col align-center">
+    <div id="edge-video-wrapper">
+	  <video id="edge-video" class="video-js vjs-default-skin" controls preload="none" width="292" height="518" poster="{{ STATIC_URL }}img/phone/features/image-edge-background.png" data-setup="{}">
+	    <source src="{{ STATIC_URL }}video/phone/edges/edges.mp4" type='video/mp4' />
+	    <source src="{{ STATIC_URL }}video/phone/edges/edges.webm" type='video/webm' />
+	    <source src="{{ STATIC_URL }}video/phone/edges/edges.ogv" type='video/ogg' />
+	    <p class="vjs-no-js">To view this video please enable JavaScript, and consider upgrading to a web browser that <a href="http://videojs.com/html5-video-support/">supports HTML5 video</a></p>
+	  </video>
+    </div>
+		<script> 
+			document.getElementById('edge-video').addEventListener('loadedmetadata', function() {
+			  this.currentTime = 8;
+			}, false);
+			var mediaPlayer = document.getElementById('edge-video');
+			mediaPlayer.addEventListener('timeupdate', checkProgress);
+			function checkProgress(){
+			    var progressTime = mediaPlayer.currentTime/mediaPlayer.duration;
+			    progressTime = progressTime * 54;
+			    progressTime = Math.floor(progressTime);
+			    if(progressTime == 13){
+						document.getElementById('swipe-from-left').className += " run";
+					}
+					if(progressTime > 13){
+						document.getElementById("swipe-from-left").className = document.getElementById("swipe-from-left").className.replace( /(?:^|\s)run(?!\S)/g , '' )
+					}
+			    if(progressTime == 23){
+						document.getElementById('swipe-from-top').className += " run";
+					}
+					if(progressTime > 23){
+						document.getElementById("swipe-from-top").className = document.getElementById("swipe-from-top").className.replace( /(?:^|\s)run(?!\S)/g , '' )
+					}
+			    if(progressTime == 29){
+						document.getElementById('swipe-from-right').className += " run";
+					}
+					if(progressTime > 29){
+						document.getElementById("swipe-from-right").className = document.getElementById("swipe-from-right").className.replace( /(?:^|\s)run(?!\S)/g , '' )
+					}
+			    if(progressTime == 45){
+						document.getElementById('swipe-from-bottom').className += " run";
+					}
+					if(progressTime > 45){
+						document.getElementById("swipe-from-bottom").className = document.getElementById("swipe-from-bottom").className.replace( /(?:^|\s)run(?!\S)/g , '' )
+					}
+			}
+		</script> 
+	</div><!-- /.six-col -->
+	
+	<div class="three-col last-col">
+	
+		<div id="swipe-from-right" class="three-col first">
+    		<div class="three-col">
+			    <h3>Swipe from <br />the&nbsp;right</h3>
+                <p class="three-col">A full swipe from the right reveals all your running apps. A shorter one switches between the current apps and the&nbsp;last.</p>
+    		</div>
+			<div class="clearfix not-for-small">
+				<img src="{{ STATIC_URL }}img/phone/features/image-swipe-from-right.png" alt="" />
+			</div>
+		</div><!-- /#swipe-from-right -->
+		
+		<div id="swipe-from-bottom" class="three-col">
+			<div class="three-col not-for-small">
+				<img class="right" src="{{ STATIC_URL }}img/phone/features/image-swipe-from-bottom.png" alt="" />
+			</div>
+			<div class="three-col">
+			    <h3>Swipe from the&nbsp;bottom</h3>
+                <p>When you need to see the controls, all it takes is a swipe from the bottom edge of the&nbsp;screen.</p>
+			</div>
+		</div><!-- /#swipe-from-bottom -->
+		
+	</div><!-- /.three-col -->
+
+</div><!-- /.row -->
+{% comment %}
+<div class="row infographic no-border">
+	<div class="six-col no-print clearfix">
+		<img width="600" height="442" src="{{ STATIC_URL }}img/devices/infographic-3km-walked.png" class="main-image info-pic-0" alt="Ubuntu Phone infographic showing distance walked" />
+		<img width="600" height="442" src="{{ STATIC_URL }}img/devices/infographic-7hours-at-rest.png" class="main-image info-pic-1 hide" alt="Ubuntu Phone infographic showing hours at rest" />
+		<img width="600" height="442" src="{{ STATIC_URL }}img/devices/infographic-7messages-received.png" class="main-image info-pic-2 hide" alt="Ubuntu Phone infographic showing messages received" />
+		<img width="600" height="442" src="{{ STATIC_URL }}img/devices/infographic-14tweets-received.png" class="main-image info-pic-3 hide" alt="Ubuntu Phone infographic showing tweets received" />
+		<img width="600" height="442" src="{{ STATIC_URL }}img/devices/infographic-33minutes-talk-time.png" class="main-image info-pic-4 hide" alt="Ubuntu Phone infographic showing duration of talk" />
+	</div><!-- /col -->
+	<div class="five-col append-one last-col">
+		<h2>A phone you can see yourself in</h2>
+		<p class="clear">Based on data such as the number of calls you&rsquo;ve made that day, your personalised welcome screen evolves as you use your phone. Welcome home.</p>
+	</div><!-- /col -->
+</div><!-- /.row -->
+{% endcomment %}
+<div class="row row--phone-details no-border no-margin-bottom equal-height">
+	<div class="four-col align-vertically no-margin-bottom">
+    	<div>
+    		<h2>It&rsquo;s all in the details</h2>
+    		<p>Every feature of the phone reflects Ubuntu Phone&rsquo;s design language. Consider it your first glimpse of Ubuntu&rsquo;s future style across all devices.</p>
+    	</div>
+	</div><!-- /col -->
+	<div class="eight-col last-col no-margin-bottom">
+        <img class="right pull-right-40" src="{{ STATIC_URL }}img/phone/features/image-features-switcher.png" alt="" />
+	</div><!-- /col -->
 </div><!-- /.row -->
 
-<div class="row row-notifications edge-magic edge-left">
-	<div class="edge-magic-content six-col">
-		<h3>Content, not controls</h3>
-		<p>Swiping up from the bottom edge of the phone reveals controls specific to the app you&rsquo;re currently using. If you don’t swipe, you don&rsquo;t see any controls, leaving you free to focus on the stuff that matters &mdash; your photos, web pages, music, messages and apps.</p>
-	</div>
-	<div class="six-col last-col">
-		<div class="slider-animation content-controls">
-			<div class="screen">
-				<div class="gallery-screen"></div>
-				<div class="gallery-controls"></div>
-			</div>
-		</div>
-		<a href="#" class="slideless replay"></a>
-	</div>
-</div><!-- / .row -->
+{% include "phone/shared/_store_promo.html" with extra_row_class="store-promo" promo_title="The Ubuntu Store" promo_content="You can choose from a wide range of scopes and apps in the Ubuntu Store from partners such as 7digital, Twitter and Euronews. All of these and many more are available for download in just a few&nbsp;taps." promo_link="/phone/developers" promo_link_title="More information for developers" %}
 
-<div class="row row-app-grid row-grey no-margin no-border">
-	<div class="six-col">
-		<img width="510" height="382" src="{{ STATIC_URL }}img/phone/features/image-phone-apps.jpg" alt="Collection of top apps available on Ubuntu Phone" />
-	</div>
-	<div class="six-col last-col">
-		<h2>A whole world of apps</h2>
-		<p>Web applications sit alongside native apps on Ubuntu. They get their own icons and the same access to system notifications. So apps like Facebook, Twitter, Evernote, The Weather Channel and Dropbox are all available from day one &mdash; and thanks to our web app APIs, it&rsquo;s easy for web developers to make their sites install on the phone.</p>
-		<p>But Ubuntu isn&rsquo;t limited to HTML5. Native apps are blazingly fast, taking advantage of the full capabilities of the phone’s processor and graphics hardware. And a mobile SDK does most of the work for you, giving you an Ubuntu look and feel.</p>
-		<p><a href="/phone/app-ecosystem">Read about developing for Ubuntu on smartphones &rsaquo;</a></p>
-	</div>
-</div><!-- / .row -->
-{% endblock content %}
+{% include "phone/shared/phone_promo/_phone_promo.html" with extra_row_class="no-border" phone_promo_content="<p class='clear'>The world&rsquo;s first Ubuntu phone is now available for sale all over Europe, direct from the manufacturer, BQ. The Aquaris E4.5 Ubuntu Edition includes an 8 megapixel camera, dual SIM and best of all, no network lock.</p>" phone_promo_title="Available unlocked on the BQ Aquaris E4.5" phone_promo_link="http://www.bqreaders.com/gb/products/aquaris-e4-5.html" phone_promo_link_title="Learn more about the BQ Aquaris E4.5" %}
+{% endblock content %}
\ No newline at end of file
diff --git a/templates/phone/index.html b/templates/phone/index.html
old mode 100755
new mode 100644
index b1253d96329..8ee8dca1a42
--- a/templates/phone/index.html
+++ b/templates/phone/index.html
@@ -2,85 +2,84 @@
 
 {% block title %}Ubuntu on phones{% endblock %}
 
+{% block meta_description %}With a radical new paradigm that makes it quicker and easier to find content and services than ever before, the beautifully designed Ubuntu phone is the opportunity the mobile industry has been waiting for.{% endblock %}
+
 {% block meta_keywords %}Ubuntu, phone, smartphone, mobile, cellphone, cell, OS, operating system, platform, open source, Linux, Canonical, OEM, network operator, Android, touch, handheld, multitouch, device, form factor, gestures, edge magic, PC, desktop, convergence, enterprise{% endblock %}
-{% block meta_description %}Ubuntu now runs on phones. With a beautifully designed, easy-to-use interface that enables users to find content and switch between apps faster than ever, it represents the alternative open source OS the mobile industry has been waiting for. Ubuntu offers OEMs and network operators two key opportunities: a high-end experience on low end phones and PC desktop convergence on powerful hardware.{% endblock %}
 
 {% block extra_body_class %}phone-home{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Phone" page_title="Overview"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Phone" page_title="Overview"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
-<div class="row row-hero">
-	<div class="five-col">
-		<h1>A beautiful experience</h1>
-		<h2>Users can surface their content naturally and industry can customise endlessly</h2>
-		<p><a href="/phone/scopes">Learn more about scopes&nbsp;&rsaquo;</a></p>
-	</div><!-- /.five-col -->
-	<div class="seven-col last-col text-center">
-		<img src="{{ STATIC_URL }}img/phone/image-phone-overview.jpg" width="567" height="302" alt="Ubuntu phone's with different state of screens" />
-	</div>
-</div><!-- /.row -->
-
-<div class="row row-features vertical-divider touch-border no-border">
-	<div class="four-col">
-		<h3>Feature complete</h3>
-		<p>Run all of your favourite apps from the launcher and swipe effortlessly between them using Ubuntu&rsquo;s magic edges. Use the home scope to search phone and web, and keep your life and content organised with the brilliance of the Ubuntu’s scopes.</p>
-		<p><a href="/phone/design">Learn more about Ubuntu&rsquo;s features&nbsp;&rsaquo;</a></p>
-		<div class="text-center align-base">
-			<img src="{{ STATIC_URL }}img/phone/image-phone-featurecomplete.jpg" width="224" height="117" alt="Ubuntu phone running the gallery app" />
-		</div>
+<div class="row row-hero no-border">
+    <div class="for-mobile"><img src="{{ STATIC_URL }}img/phone/overview/background-phone-overview-hero-small.jpg" alt="" /></div>
+	<div class="the-video">
+		<p class="right">
+			<a href="#" class="slideless close-video">Close the video <img src="{{ STATIC_URL }}img/devices/close-button.png" width="24" height="24" alt="" /></a>
+		</p>
+		<div></div>
 	</div>
-
-	<div class="four-col">
-		<h3>Ready for your phone</h3>
-		<p>With all-native core apps and no Java overhead, Ubuntu runs well on entry-level smartphones &mdash; yet it uses the same drivers as Android. So now it&rsquo;s easy to bring a better experience to customers all over the world.</p>
-		<p><a href="/phone/operators-and-oems">Learn about working with us&nbsp;&rsaquo;</a></p>
-		<div class="text-center">
-			<img src="{{ STATIC_URL }}img/phone/image-phone-readyforyourphone.jpg" width="227" height="192" alt="Two Ubuntu phones side by side" />
-		</div>
-	</div>
-
-	<div class="four-col last-col">
-		<h3>All developers need</h3>
-		<p>Create gorgeous native apps or lightweight HTML5 apps easily, with our SDK. Repurpose web apps fast, so they look and work like their native cousins. With one OS for all form factors, one app can have interfaces for phone and desktop in just one upload.</p>
-		<p><a href="/phone/app-ecosystem">Learn more about developing apps&nbsp;&rsaquo;</a></p>
-		<div class="text-center">
-			<img src="{{ STATIC_URL }}img/devices/image-developers.jpg" alt="Collection of top apps available on Ubuntu phone" />
-		</div>
+	<div class="row-content">
+		<div class="five-col">
+			<h1>Life at your fingertips</h1>
+			<p class="intro">Ubuntu introduces a new way to enjoy content and services on smartphones, without relying on&nbsp;traditional apps.</p>
+			<p class="video-link"><a href="//www.youtube.com/watch?v=-dpfHYpfEXY&amp;hd=1" class="show-video link-cta-ubuntu">Watch the video</a></p>
+			<div class="video-container for-mobile">
+				<iframe src="//www.youtube.com/embed/-dpfHYpfEXY" allowfullscreen></iframe>
+			</div>
+		</div><!-- /.five-col -->
 	</div>
 </div><!-- /.row -->
 
-{% include "_includes/_edge_promo.html" %}
+{% include "phone/shared/phone_promo/_phone_promo.html" with extra_row_class="store-promo no-border" phone_promo_title="Available unlocked on the BQ Aquaris E4.5" phone_promo_content="<p class='clear'>The world&rsquo;s first Ubuntu phone is now available for sale all over Europe, direct from the manufacturer, BQ. The Aquaris E4.5 Ubuntu Edition includes an 8 megapixel camera, dual SIM and best of all, no network&nbsp;lock." phone_promo_link="http://www.bqreaders.com/gb/products/aquaris-e4-5.html" phone_promo_link_title="Learn more about the BQ Aquaris E4.5" %}
 
-<div class="row row-image-centered">
-	<span class="four-col">
-		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-canonical.svg" width="167" height="167" alt="Canonical logo" />
-	</span>
-	<div class="eight-col last-col">
-		<h2>Backed by Canonical</h2>
-		<p>We provide hardware enablement services to the world&rsquo;s biggest PC OEMs and, as a result, Ubuntu now ships pre-installed on 10% of the world&rsquo;s new PCs. With staff and offices all over the world, we have the resources you need to deliver Ubuntu on smartphones.</p>
-		<p><a href="/partners/backed-by-canonical">Learn more about Canonical&nbsp;&rsaquo;</a></p>
-	</div>
+<div class="row row--natural-access no-border">
+    <div class="for-mobile"><img src="{{ STATIC_URL }}img/phone/overview/background-phone-overview-access-small.jpg" alt="" /></div>
+	<div class="row--natural-access__content four-col">
+		<h2>Access content and services naturally</h2>
+		<p class="clear">For the first time, you can use a phone that revolves around you and the content and services you use the most. Say goodbye to opening and switching between multiple apps and instead, let Ubuntu&rsquo;s unique scopes bring everything you need to one&nbsp;screen.</p>
+		<p class="no-margin-bottom"><a href="/phone/features">Learn more about scopes&nbsp;&rsaquo;</a></p>
+	</div><!-- /.col -->
 </div><!-- /.row -->
 
+<div class="row--beautiful-design edge-magic row no-border">
+    <div class="eight-col">
+        <ul id="card-list" class="slider-animation no-bullets inline">
+            <li class="card-one"></li>
+            <li class="card-two"></li>
+            <li class="card-three"></li>
+            <li class="card-four"></li>
+            <li class="card-five"></li>
+        </ul>
+    </div>
+	<div class="row--beautiful-design__content four-col last-col">
+		<h2>Beautifully designed&nbsp;features</h2>
+		<p>Ubuntu Phone has been designed with obsessive attention to detail. Form follows function throughout, from the ever-changing welcome screen to essentials like messaging and alarms. And the Launcher puts it all at your fingertips, whatever you&rsquo;re doing with your phone.</p>
+		<p><a href="/phone/features">See what Ubuntu can do&nbsp;&rsaquo;</a></p>
+	</div><!-- /.col -->
+</div><!-- /.row -->
 
-<div class="row no-border">
-	<div class="eight-col">
-		<h2>Introducing the Carrier Advisory Group</h2>
-		<p>The Carrier Advisory Group enables mobile operators to shape Ubuntu&rsquo;s product development, and provides the opportunity to be a potential launch partner.</p>
-		<p><a href="/phone/carrier-advisory-group">Read more about the CAG&nbsp;&rsaquo;</a></p>
-	</div>
-	<div class="twelve-col">
-		<ul class="inline-logos">
-			<li><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-everythingeverywhere.svg" alt="Everywhere everywhere" /></li>
-			<li><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-portugaltelecom.svg" alt="Portugal telecom" /></li>
-			<li><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-tmobile.svg" alt="T Mobile" /></li>
-			<li class="verizon"><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-verizon.svg" alt="Verizon" /></li>
-			<li class="last-item"><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-vodafone.svg" alt="Vodafone" /></li>
-		</ul>
-	</div>
-</div>
-
+<div class="row vertical-divider row-grey no-border">
+	<div class="six-col">
+		<h3>An open source phone</h3>
+		<div class="four-col">
+			<p>Our code is shared openly throughout the development cycle. We are transparent about our plans for future releases, so as a developer, carrier or manufacturer, you can work with us to start building Ubuntu mobile experiences now.</p>
+		</div>
+		<div class="two-col last-col not-for-small">
+			<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-projectswelove-orange.svg" width="130" alt="" />
+		</div>
+	</div><!-- /.six-col -->
+	<div class="six-col last-col no-margin-bottom">
+		<h3>Backed by Canonical</h3>
+		<div class="four-col">
+			<p>Canonical is the global software vendor that provides commercial, design and engineering support to the Ubuntu project. Today, our hardware enablement team supports the pre-installation of Ubuntu on more than 10% of all new PCs shipped,worldwide.</p>
+			<p><a href="http://partners.ubuntu.com/partnering-with-us">Learn more about how we support Ubuntu&nbsp;&rsaquo;</a></p>
+		</div>
+		<div class="two-col last-col not-for-small">
+			<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-canonical.png" width="130" alt="" />
+		</div>
+	</div><!-- /.six-col -->
+</div><!-- /.row -->
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/phone/operators-and-oems.html b/templates/phone/operators-and-oems.html
deleted file mode 100755
index 84ad3eb1668..00000000000
--- a/templates/phone/operators-and-oems.html
+++ /dev/null
@@ -1,169 +0,0 @@
-{% extends "phone/base_phone.html" %}
-
-{% block title %}Operator and OEM partners | Ubuntu for phones{% endblock %}
-
-{% block meta_keywords %}Ubuntu, phone, smartphone, mobile, OS, Canonical, OEM, network operator, partner, operating system, platform, open source, Linux, Android, handset, customise, customisation, customize, customization{% endblock %}
-{% block meta_description %}For mobile network operators and handset makers, Ubuntu presents an opportunity to revolutionise the handset market with the first true open source alternative to Android. Beautifully designed and with a huge developer following, Ubuntu enables partners in the mobile industry to deliver a better experience on low-end phones and desktop PC convergence at the high end.{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Phone" page_title="Operator and OEMs"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero">
-	<div class="six-col">
-		<h1>Built for the phone industry</h1>
-		<p>Ubuntu comes to phones with the specific needs of network operators, OEMs and ODMs in mind. It offers great performance on handsets with a low bill of materials, while opening up new opportunities for phone and PC convergence at the top end of the market. And there are many ways in which the user experience can be tailored to your brand.</p>
-		<p><a href="https://wiki.ubuntu.com/Touch/Install">Install Ubuntu for phones&nbsp;&rsaquo;</a><br />
-		<em class="smaller">for developers and industry partners only</em></p>
-	</div>
-	<div class="six-col last-col">
-		<img src="{{ STATIC_URL }}img/phone/operators-and-oems/image-phone-operatorsandoems.jpg" alt="Two Ubuntu phones side by side" width="408" height="312" />
-	</div>
-</div><!-- /.row -->
-
-<div class="row">
-	<div class="six-col text-center">
-		<img src="{{ STATIC_URL }}img/devices/image-open-to-everyone.png" alt="" class="priority-0" />
-	</div>
-	<div class="six-col last-col">
-		<h2>We&rsquo;re open to everyone</h2>
-		<p>Ubuntu is an open source operating system, which means our code is shared openly throughout the development cycle.  We are transparent about our plans for future releases, so as a developer, carrier or manufacturer you can start building apps and phone designs for Ubuntu immediately.</p>
-		<p><a href="http://cdimage.ubuntu.com/ubuntu-touch-preview/daily-preinstalled/current/">Download the latest daily image&nbsp;&rsaquo;</a></p>
-	</div>
-</div><!-- /.row -->
-
-<div class="row">
-	<h2>Easy, endless customisation</h2>
-	<div class="six-col">
-		<p>We&rsquo;ve built Ubuntu to include operator and OEM content, services and branding. Industry can place logos and specify colours on the expansive greeter screen, pre-install featured apps on the launcher, or create Scopes, all with Canonical&rsquo;s help if needed. Carriers specify the scopes their devices ship. So they can add useful scopes to deliver their own or partner services like local wireless, or city information.</p>
-	</div>
-	<div class="six-col last-col">
-		<p>New scopes are easy for industry to develop and publish, and can be built around campaigns or sponsorship tie-ins &mdash; with enough real-estate for brand partners. And default scopes like music and video can return prioritised content in search results with connected back-end services like billing, so the user won’t ever feel overwhelmed. It&rsquo;s customisation in a way users will appreciate.</p>
-	</div>
-	<div class="twelve-col">
-		<div class="easyendlesscustomisation-image-load" data-width="919" data-src="{{ STATIC_URL }}img/phone/operators-and-oems/image-phone-easyendlesscustomisation{width}.jpg" data-alt="Ubuntu phone customised"></div>
-		<script>
-		    new Imager('.easyendlesscustomisation-image-load', {
-		        availableWidths: {
-							919: '-medium',
-	            320: '-small'
-		        }
-		    });
-		</script>
-	</div>
-</div><!-- /.row -->
-
-<div class="row">
-	<h2>Stunning design on any smartphone</h2>
-	<div class="six-col">
-		<p>Ubuntu provides a fast and beautiful experience on inexpensive hardware. It doesn&rsquo;t have the overhead of a Java virtual machine, so all core applications run at full native speeds with a small memory footprint.</p>
-		<p>Our traditional consumer users can enjoy a blisteringly fast experience on their mid-range phones. Smart search scopes and intelligent filtering makes it easy to access a huge range of content.</p>
-	</div><!-- /.six-col -->
-	<div class="six-col last-col">
-		<p>And at the high end, Ubuntu paves the way  for a new category of superphones, with a full PC desktop accessible just by docking the device to a monitor and keyboard. A handheld PC is the future of personal computing &mdash; true convergence.</p>
-		<p><a href="/phone/features">Learn more about the Ubuntu experience on smartphones&nbsp;&rsaquo;</a></p>
-	</div><!-- /.six-col -->
-	<div class="twelve-col last-col no-margin">
-		<table>
-			<thead>
-				<tr>
-					<th scope="col">System requirements for smartphones</th>
-					<th scope="col">Entry level Ubuntu smartphone</th>
-					<th scope="col">&ldquo;Superphone&rdquo; that can be a PC</th>
-				</tr>
-			</thead>
-			<tbody>
-				<tr>
-					<th rowspan="1" scope="row">Processor architecture</th>
-					<td>Dual-core Cortex A9 or similar</td>
-					<td>Quad-core A9 or Intel Atom</td>
-				</tr>
-				<tr>
-					<th rowspan="1" scope="row">Memory</th>
-					<td>512MB &ndash; 1GB</td>
-					<td>Min 1GB</td>
-				</tr>
-				<tr>
-					<th rowspan="1" scope="row">Flash storage</th>
-					<td>4-8GB eMMC + SD</td>
-					<td>Min 32GB eMMC + SD</td>
-				</tr>
-				<tr>
-					<th rowspan="1" scope="row">Multi-touch</th>
-					<td><img width="16" height="16" alt="Yes" src="{{ STATIC_URL }}img/patterns/feats-tick.png"></td>
-					<td><img width="16" height="16" alt="Yes" src="{{ STATIC_URL }}img/patterns/feats-tick.png"></td>
-				</tr>
-				<tr>
-					<th rowspan="1" scope="row">Desktop convergence</th>
-					<td><img width="16" height="16" alt="No" src="{{ STATIC_URL }}img/patterns/greytick.png"></td>
-					<td><img width="16" height="16" alt="Yes" src="{{ STATIC_URL }}img/patterns/feats-tick.png"></td>
-				</tr>
-			</tbody>
-		</table>
-	</div>
-</div><!-- /.row -->
-
-<div class="row">
-	<h2>Easier hardware enablement</h2>
-	<div class="seven-col">
-		<p>We have teams based in Taipei, Shanghai, London, Beijing and Boston to engage with your engineering and factory operations - and their sole focus is to deliver a crisp Ubuntu experience on your device.</p>
-		<p>Ubuntu has already been adapted to run on chipsets using ARM and Intel x86 architectures, with the core system based around a typical Android Board Support Package (BSP). So chipset vendors and hardware manufacturers don&rsquo;t need to invest in or maintain new hardware support packages. In short, if you already make handsets that run Android, the work needed to adopt Ubuntu for smartphones will be trivial.</p>
-	</div>
-	<div class="four-col prepend-one last-col">
-		<blockquote class="pull-quote">
-			<p><span>&ldquo;</span>If you already <br />make handsets that run Android, the work needed to adopt Ubuntu will be trivial&nbsp;&nbsp;<span>&rdquo;</span></p>
-		</blockquote>
-	</div>
-</div><!-- /.row -->
-
-<div class="row">
-	<h2>The phone with the heart of a PC</h2>
-	<div class="six-col">
-		<p>High-end smartphones have a brain as powerful as a full PC. Ubuntu, with its next-generation Mir graphics architecture, uniquely enables a new kind of convergence device: a phone that docks to become a full PC and thin client. Enterprise IT departments will soon be able to replace phones, thin clients and laptops with a single corporate device.</p>
-		<p>With support for remote Windows apps over Microsoft RDP, Citrix or VMWare, the Ubuntu superphone is a complete enterprise solution &mdash; and a new opportunity for operators to deliver enterprise IT to SMEs in LTE markets. And because it enjoys the full capabilities of Ubuntu &mdash; including kernel-level control of every app &mdash; it puts the security and manageability of UNIX in your pocket.</p>
-	</div>
-	<div class="six-col last-col">
-		<img width="440" height="248" src="{{ STATIC_URL }}img/phone/operators-and-oems/image-phone-convergence.jpg" alt="Ubuntu phone docking to become a PC" />
-	</div>
-</div><!-- /.row -->
-
-<div class="row combined-list">
-	<h2>The developer&rsquo;s favourite OS</h2>
-	<div class="six-col">
-		<ul class="list-ubuntu no-margin">
-			<li>Existing web properties can be installed on the Ubuntu phone, where they can run as web apps independent of the browser, with full access to the system just like native apps.</li>
-			<li>Ubuntu is already a wildly popular platform for web developers and savvy users.</li>
-			<li class="last-item">The standard Android development environment is Ubuntu. </li>
-		</ul>
-	</div>
-	<div class="six-col last-col no-margin">
-		<ul class="list-ubuntu">
-			<li>HTML5 is fully supported but Ubuntu is not limited to HTML5. To use the full power of the hardware, you can develop native apps, using OpenGL and QML, with C or C++ and Javascript compiled for extra performance.</li>
-			<li class="no-border">Major game developers like EA, Valve and Unity Technologies are now committing to Ubuntu.</li>
-		</ul>
-
-	</div>
-	<div class="twelve-col">
-		<a  href="/phone/app-ecosystem">Learn more about developing apps for Ubuntu&nbsp;&rsaquo;</a>
-	</div>
-</div><!-- /.row -->
-
-<div class="row row-image-centered">
-		<span><img src="{{ STATIC_URL }}img/phone/operators-and-oems/image-globalsolutions.svg" width="225" height="200" alt="Hello written in a number of languages in Ubuntu speak bubbles" /></span>
-	<div class="six-col last-col">
-		<h2>A truly global solution</h2>
-		<p>Ubuntu is already used in over 70 countries and has been translated into over 40 languages. With 20 million desktop users around the world, it is both an established platform and an established global brand.</p>
-	</div>
-</div><!-- /.row -->
-
-<div class="row row-image-centered no-border">
-	<div class="eight-col">
-		<h2>Backed by Canonical</h2>
-		<p>Canonical is the global software vendor that provides commercial and design support to the Ubuntu project. Today, our hardware enablement team supports the pre-installation of Ubuntu on more than 10% of all new PCs shipped,worldwide.</p>
-		<p>Thanks to Canonical&rsquo;s relationships with its OEM partners, Ubuntu has an enormous retail presence in key emerging economies, with branded merchandising and trained retail staff in over 1,000 stores.</p>
-		<p><a href="/partners/backed-by-canonical">Learn more about how we support Ubuntu&nbsp;&rsaquo;</a></p>
-	</div>
-	<span><img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-canonical.svg" width="167" height="167" alt="Canonical logo" /></span>
-</div><!-- /.row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/phone/partners.html b/templates/phone/partners.html
new file mode 100644
index 00000000000..3cd73f61848
--- /dev/null
+++ b/templates/phone/partners.html
@@ -0,0 +1,102 @@
+{% extends "phone/base_phone.html" %}
+
+{% block title %}For partners | Ubuntu for phones{% endblock %}
+
+{% block meta_description %}For mobile network operators and handset makers, Ubuntu represents an opportunity to revolutionise the handset market. Beautifully designed and with a huge developer following, it enables partners in the mobile industry to deliver a better experience on low-end phones and desktop PC convergence at the high end.{% endblock %}
+
+{% block meta_keywords %}Ubuntu, phone, smartphone, mobile, OS, Canonical, OEM, network operator, partner, operating system, platform, open source, Linux, Android, device, form factor, handheld, handset, touch, multitouch, touchscreen, gestures, edge magic, PC, desktop, convergence, enterprise, customise, customisation, customize, customization{% endblock %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Phone" page_title="For partners"  %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row row-hero">
+	<div class="five-col">
+		<h1>For partners</h1>
+		<p class="intro">Be in control &mdash; own the entire service layer: content and services, user accounts, payments and the&nbsp;store.</p>
+	</div>
+	<div class="six-col prepend-one last-col">
+		<img src="{{ STATIC_URL }}img/phone/partners/image-hero-partners.png" alt="" />
+	</div><!-- /.seven-col -->
+</div><!-- .row -->
+
+<div class="row">
+	<div class="five-col">
+		<img src="{{ STATIC_URL }}img/phone/partners/image-service-layer.png" alt="" />
+	</div>
+	<div class="six-col prepend-one last-col">
+	    <h2>Differentiation without fragmentation</h2>
+		<p>Ubuntu allows you to control the entire service layer &mdash; the visual identity and the suite of digital life services &mdash; ensuring a consistent user experience. This gives you the opportunity to differentiate your handsets without fragmenting or forking the operating system. It&rsquo;s an opportunity to increase revenue that simply doesn&rsquo;t exist on other&nbsp;platforms.</p>
+        <p><a href="/phone/developers">Learn more about customising the experience&nbsp;&rsaquo;</a></p>
+	</div>
+</div><!-- .row -->
+
+<div class="row row-origami equal-height no-border">
+    <div class="eight-col">
+        <h2>Profit via user payments</h2>
+        <p>As well as integrating your content, functionality and branding, you can take over the management of your users&rsquo; financial interactions. You can integrate your own payment systems deep into the phone, via Ubuntu&rsquo;s unique frameworks. And while you can opt to use the default Ubuntu store for downloads and purchases, you can also customise it to showcase your services, or replace it with your own store. No other mobile platform makes it this easy to develop your own ecosystem and revenue streams.</p>
+    </div>
+    <div class="not-for-small four-col last-col align-vertically align-center">
+        <img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-reducecosts-orange.svg" height="134" width="134" alt="" />
+    </div>
+</div><!-- .row -->
+
+<div class="row no-border">
+    <div class="four-col no-margin-bottom">
+    	<h2 class="off-left">Minimum requirements</h2>
+    	<table class="smaller">
+    		<tbody>
+    			<tr>
+    				<th id="processor-architecture" scope="row">Processor</th>
+    				<td headers="processor-architecture">Quad core Cortex A7*</td>
+    			</tr>
+    			<tr>
+    				<th id="memory" scope="row">Memory</th>
+    				<td headers="memory">1GB</td>
+    			</tr>
+    			<tr>
+    				<th id="flash-storage" scope="row">Flash storage</th>
+    				<td>8GB eMMC</td>
+    			</tr>
+    			<tr>
+    				<th scope="row">Multi-touch</th>
+    				<td>Yes</td>
+    			</tr>
+    		</tbody>
+    	</table>
+    </div>
+    <div class="seven-col prepend-one last-col">
+        <h2>Targeting mid to high end&nbsp;devices</h2>
+        <p>With a user experience and partner differentiation strategy that revolves around content and services &mdash; Ubuntu is tailored for users that require higher data usage and higher quality devices. By targeting mid to high end devices with Ubuntu, carriers and device manufacturers can deliver a superior experience while leveraging Ubuntu&rsquo;s service layer differentiation opportunities.</p>
+    </div>
+</div><!-- /.row -->
+
+<div class="row strip-dark no-border">
+	<div class="six-col">
+		<h2>Easier hardware enablement</h2>
+		<p>Ubuntu&rsquo;s core system is based around a typical Android Board Support Package (BSP), so you don&rsquo;t need to invest in new ones. And we have teams based in Taipei, Shanghai, London, Beijing and Boston, who can engage with your engineering and factory operations.</p>
+		<p><a href="/phone/features">Learn more about the Ubuntu features&nbsp;&rsaquo;</a></p>
+	</div>
+	<div class="five-col prepend-one last-col">
+		<blockquote class="pull-quote">
+			<p><span>&ldquo;</span>If you already make handsets that run Android, the work needed to adopt Ubuntu will be&nbsp;trivial&nbsp;<span>&rdquo;</span></p>
+			<p><cite>Ad&aacute;n Mu&ntilde;oz, BQ Product Development&nbsp;Manager
+</cite></p>
+		</blockquote>
+    </div>
+</div><!-- /.row -->
+
+<div id="carrier-advisory-group" class="row no-border">
+	<div class="seven-col append-five">
+		<h2>The Ubuntu Carrier Advisory Group</h2>
+		<p>The Ubuntu Carrier Advisory Group (CAG) was formed in June 2013, enabling mobile operators from across the globe to help shape Ubuntu&rsquo;s mobile strategy. Members receive confidential briefings and share industry insights, to ensure that Ubuntu meets their needs as it develops.</p>
+		<p><a href="http://partners.ubuntu.com/programmes/phone-carrier">Learn more about the CAG&nbsp;&rsaquo;</a></p>
+	</div>
+	<div class="twelve-col">
+		<ul class="inline cag-list">
+			{% include "phone/shared/_cag_list.html" with image_width="160" image_height="80" item_class="box" %}
+		</ul>
+	</div>
+</div><!-- /.row -->
+{% endblock content %}
diff --git a/templates/phone/register/index.html b/templates/phone/register/index.html
index 95397ab96db..799610190ed 100755
--- a/templates/phone/register/index.html
+++ b/templates/phone/register/index.html
@@ -3,7 +3,7 @@
 {% block title %}Contact us | Ubuntu for phones{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Phone" page_title="Contact us"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Phone" page_title="Contact us"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/phone/register/thank-you.html b/templates/phone/register/thank-you.html
index f400aecd29a..b330b1c5270 100755
--- a/templates/phone/register/thank-you.html
+++ b/templates/phone/register/thank-you.html
@@ -3,7 +3,7 @@
 {% block title %}Thank you | Ubuntu for phones{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Phone" subsection_title="Register" page_title="Thank you"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Phone" subsection_title="Register" page_title="Thank you"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/phone/scopes.html b/templates/phone/scopes.html
deleted file mode 100755
index 636d7065dc2..00000000000
--- a/templates/phone/scopes.html
+++ /dev/null
@@ -1,134 +0,0 @@
-{% extends "phone/base_phone.html" %}
-
-{% block title %}Scopes | Ubuntu for phones{% endblock %}
-
-{% block meta_keywords %}Ubuntu, phone, smartphone, cellphone, cell, mobile, OS, operating system, user, interface, GUI,content, app, web, Unity, scope, search, surface, find, organise, Linux, open source{% endblock %}
-{% block meta_description %}Scopes help Ubuntu phone users find the content or apps they are looking for quickly and visually, on the device or web - you don't need home buttons, hard keys anymore.{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Phone" page_title="Design"  %}
-{% endblock second_level_nav_items %}
-
-
-{% block head_extra %}
-<style>
-@-moz-keyframes scope-slide-in {
-  from {
-    left: 182px;
-    opacity: .5;
-  }
-  30% {
-  	opacity: 1;
-  }
-  to {
-    left: 0;
-  }
-}
-
-@-moz-keyframes scope-slide-out {
-  from {
-    left: 0;
-    opacity: 1;
-  }
-  to {
-    left: -182px;
-    opacity: 0;
-  }
-}
-
-@-webkit-keyframes scope-slide-in {
-  from {
-    left: 182px;
-  }
-  to {
-    left: 0;
-  }
-}
-
-@-webkit-keyframes scope-slide-out {
-  from {
-    left: 0;
-    opacity: 1;
-  }
-  to {
-    left: -182px;
-    opacity: 0;
-  }
-}
-
-@keyframes scope-slide-in {
-  from {
-    left: 182px;
-  }
-  to {
-    left: 0;
-  }
-}
-
-@keyframes scope-slide-out {
-  from {
-    left: 0;
-    opacity: 1;
-  }
-  to {
-    left: -182px;
-    opacity: 0;
-  }
-}
-</style>
-{% endblock %}
-
-{% block content %}
-<div class="row row-hero">
-	<h1>Scopes &ndash; discover more</h1>
-	<div class="six-col">
-		<h2>Content and apps at your&nbsp;fingertips</h2>
-		<p>Scopes are a smart, stunning and straightforward way to discover content and applications on the Ubuntu phone. They neatly organise content into natural categories like video, music, or integrate web content right at the centre of the phone experience, then present it beautifully. Browse with a swipe, open with a touch. It&rsquo;s a visual and quick way for users to locate their most important content.</p>
-	</div><!-- /.five-col -->
-</div><!-- /.row -->
-
-<div class="row row-find-anything no-border edge-magic edge-top">
-	<div class="six-col search-animation">
-		<div class="slider-animation surface-content">
-			<ul class="screen">
-				<li class="scope-1"></li>
-				<li class="scope-2"></li>
-				<li class="scope-3"></li>
-				<li class="scope-4"></li>
-			</ul>
-		</div>
-		<a href="#" class="slideless replay"></a>
-	</div>
-	<div class="edge-magic-content six-col last-col">
-		<h3>Surface content effortlessly</h3>
-		<p>Scopes guide you to content the way you think about it. Remember that track you were listening to a few days ago? Pick up the Ubuntu phone, swipe to the music scope, glide through the beautiful carousel of track icons and tap to start listening. Fast and fluid, there&rsquo;s no need to use home buttons or hunt for the right app first.</p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row row-your-scopes edge-magic edge-left no-border">
-	<div class="edge-magic-content six-col">
-		<h3>Your scopes your way</h3>
-		<p>A new world of scopes awaits: social media scopes, news scopes, sport event scopes. Any kind of content can be held in a scope. Best of all, one tap enables you to select a favourite scope, placing it next to the default scopes. Your favourite content has never been closer.</p>
-	</div>
-	<div class="six-col last-col text-center">
-		<div class="slider-animation your-scopes">
-			<ul class="screen">
-        <li class="status-bar"></li>
-        <li class="scope-content"></li>
-			</ul>
-		</div>
-		<a href="#" class="slideless replay"></a>
-	</div>
-</div><!-- / .row -->
-
-<div class="row row-savvy-search no-border">
-	<div class="six-col">
-		<img src="{{ STATIC_URL }}img/phone/scopes/image-scopes.jpg" class="for-tablet" alt="" width="568" height="426" />
-	</div>
-  <div class="six-col last-col">
-    <h3>Savvy search</h3>
-    <p>Ubuntu&rsquo;s smart search finds exactly what you want. It searches the device, the web,  including online retailers like Amazon, eBay and other scopes. Whether it&rsquo;s media, apps or information from the web, finding what you&rsquo;re looking for has never been so easy.</p>
-  </div>
-</div><!-- / .row -->
-
-{% endblock content %}
diff --git a/templates/phone/_includes/_cag_list.html b/templates/phone/shared/_cag_list.html
similarity index 93%
rename from templates/phone/_includes/_cag_list.html
rename to templates/phone/shared/_cag_list.html
index 9b0df876420..97bf314a805 100755
--- a/templates/phone/_includes/_cag_list.html
+++ b/templates/phone/shared/_cag_list.html
@@ -9,7 +9,7 @@
 			<li class="{{ item_class }}"><img src="{{ STATIC_URL }}img/logos/logo-smart.png" width="{{ image_width }}" height="{{ image_height }}" alt="Smart" /></li>
 			<li class="{% if small %}last {% endif %}{{ item_class }}"><img src="{{ STATIC_URL }}img/logos/logo-smartfren.png" width="{{ image_width }}" height="{{ image_height }}" alt="Smartfren" /></li>
 			<li class="{{ item_class }}"><img src="{{ STATIC_URL }}img/logos/logo-south-korea-telecom.png" width="{{ image_width }}" height="{{ image_height }}" alt="South Korea telecom" /></li>
-			<li class="{{ item_class }}"><img src="{{ STATIC_URL }}img/logos/logo-tmobile.png" width="{{ image_width }}" height="{{ image_height }}" alt="T Mobile" /></li>
+			<!--<li class="{{ item_class }}"><img src="{{ STATIC_URL }}img/logos/logo-tmobile.png" width="{{ image_width }}" height="{{ image_height }}" alt="T Mobile" /></li>-->
 			<li class="{{ item_class }}"><img src="{{ STATIC_URL }}img/logos/logo-telecom-italia.png" width="{{ image_width }}" height="{{ image_height }}" alt="Telecom Italia" /></li>
 			<li class="{{ item_class }}"><img src="{{ STATIC_URL }}img/logos/logo-telstra.png" width="{{ image_width }}" height="{{ image_height }}" alt="Telstra" /></li>
 			<li class="{{ item_class }} verizon"><img src="{{ STATIC_URL }}img/logos/logo-verizon.png" width="{{ image_width }}" height="{{ image_height }}" alt="Verizon" /></li>
diff --git a/templates/phone/shared/_contextual_footer.html b/templates/phone/shared/_contextual_footer.html
new file mode 100755
index 00000000000..a0b8a07e953
--- /dev/null
+++ b/templates/phone/shared/_contextual_footer.html
@@ -0,0 +1,34 @@
+<div class="feature-two four-col">
+	<h3>A new opportunity</h3>
+	<p>Mobile networks, handset makers and developers: start building your Ubuntu 
+mobile experiences&nbsp;today. </p>
+    <ul class="no-bullets">
+        {% if level_2 != 'partners' %}<li><a href="/phone/partners">For networks and OEMs&nbsp;&rsaquo;</a></li>{% endif %}
+        {% if level_2 != 'developers' %}<li><a href="/phone/developers">For mobile developers&nbsp;&rsaquo;</a></li>{% endif %}
+    </ul>
+</div>
+<div class="feature-three four-col">
+	<h3>Keep in touch</h3>
+	<p>Stay up to date with all things Ubuntu Phone.</p>
+    <ul class="no-bullets">
+        <li><a href="https://twitter.com/ubuntu">Twitter &rsaquo;</a></li>
+        <li><a href="https://www.facebook.com/ubuntulinux">Facebook &rsaquo;</a></li>
+        <li><a href="https://plus.google.com/+Ubuntu/posts">Google Plus &rsaquo;</a></li>
+    </ul>
+</div>
+<div class="feature-four four-col last-col">
+	<h3>Further reading</h3>
+	<ul class="smaller no-bullets">
+		{% if level_2 == 'carrier-advisory-group' %}
+		<li><a href="{{ STATIC_URL }}files/section/devices/CAG_FAQ.pdf">CAG FAQ&nbsp;&rsaquo;</a></li>
+		<li><a href="http://insights.ubuntu.com/products-and-services/phone/">Check out our Insights blog&nbsp;&rsaquo;</a></li>
+		<li><a href="http://developer.ubuntu.com/">Start developing on Ubuntu mobile today&nbsp;&rsaquo;</a></li>
+		{% else %}
+		<li><a href="https://www.youtube.com/watch?v=cpWHJDLsqTU&amp;feature=player_embedded#t=0">Watch the Ubuntu phone video&nbsp;&rsaquo;</a></li>
+		<li><a href="http://insights.ubuntu.com/2014/02/01/mwc-2014-online-press-pack/">Ubuntu phone press release&nbsp;&rsaquo;</a></li>
+		<li><a href="https://insights.ubuntu.com/2013/02/15/ubuntu-for-smartphones-grabs-global-headlines/">Ubuntu for smartphones grabs global headlines&nbsp;&rsaquo;</a></li>
+		<li><a href="https://insights.ubuntu.com/2013/02/15/get-the-faqs-about-ubuntu-on-smartphones/"> Get the FAQs about Ubuntu on smartphones&nbsp;&rsaquo;</a></li>
+		<li><a href="https://insights.ubuntu.com/2013/02/15/developers-get-the-full-support-they-need/">Developers get the full support they need&nbsp;&rsaquo;</a></li>
+		{% endif %}
+	</ul>
+</div>
\ No newline at end of file
diff --git a/templates/phone/_includes/_further_reading_phone.html b/templates/phone/shared/_further_reading_phone.html
similarity index 100%
rename from templates/phone/_includes/_further_reading_phone.html
rename to templates/phone/shared/_further_reading_phone.html
diff --git a/templates/phone/shared/_origami.html b/templates/phone/shared/_origami.html
new file mode 100644
index 00000000000..ebac15f4e11
--- /dev/null
+++ b/templates/phone/shared/_origami.html
@@ -0,0 +1,5 @@
+<div class="origami">
+	<div class="first"></div>
+	<div class="second"></div>
+	<div class="third"><div></div></div>
+</div>
diff --git a/templates/phone/shared/_pop_out.html b/templates/phone/shared/_pop_out.html
new file mode 100644
index 00000000000..3bef8953537
--- /dev/null
+++ b/templates/phone/shared/_pop_out.html
@@ -0,0 +1,15 @@
+<style>
+/*Transitions*/
+	@-webkit-keyframes pop-out {
+	    0% { background-size: 0%; opacity: 0; }
+	    100% { background-size: 100%; opacity: 1; }
+	}
+	@-moz-keyframes pop-out {
+	    0% { background-size: 0%; opacity: 0; }
+	    100% { background-size: 100%; opacity: 1; }
+	}
+	@keyframes pop-out {
+	    0% { background-size: 0%; opacity: 0; }
+	    100% { background-size: 100%; opacity: 1; }
+	}
+</style>
diff --git a/templates/phone/shared/_ripples.html b/templates/phone/shared/_ripples.html
new file mode 100644
index 00000000000..419b2598076
--- /dev/null
+++ b/templates/phone/shared/_ripples.html
@@ -0,0 +1,10 @@
+<div class="row edge-magic row--campaign no-border">
+    <div id="loader"></div>
+    <div id="ubuntuPhoneGame">
+    	<canvas id="phoneCanvas" class="slider-animation" width="984" height="219"></canvas>
+    </div>
+	<div class="row--campaign_content six-col last-col">
+		<h2>Stay in the loop</h2>
+		<p class="intro"><a href="http://ubuntu-phone.eu">Get the latest news on the world&rsquo;s newest smartphone operating system&nbsp;&rsaquo;</a></p>
+	</div>
+</div><!-- /.row -->
\ No newline at end of file
diff --git a/templates/phone/shared/_slideshow.html b/templates/phone/shared/_slideshow.html
new file mode 100644
index 00000000000..989aade907c
--- /dev/null
+++ b/templates/phone/shared/_slideshow.html
@@ -0,0 +1,14 @@
+    <div class="carousel-container-overlay not-for-small"></div>
+    <div id="carousel-container" class="carousel not-for-small">
+        <div class="carousel-topbar"></div>
+        <ul>
+            <li><img src="{{ STATIC_URL }}img/phone/features/slideshow/slide-one.png" alt="Cave"></li>
+            <li><img src="{{ STATIC_URL }}img/phone/features/slideshow/slide-two.png" alt="Cave"></li>
+            <li><img src="{{ STATIC_URL }}img/phone/features/slideshow/slide-three.png" alt="Cave"></li>
+            <li><img src="{{ STATIC_URL }}img/phone/features/slideshow/slide-four.png" alt="Cave"></li>
+            <li><img src="{{ STATIC_URL }}img/phone/features/slideshow/slide-one.png" alt="Cave"></li>
+            <li><img src="{{ STATIC_URL }}img/phone/features/slideshow/slide-two.png" alt="Cave"></li>
+            <li><img src="{{ STATIC_URL }}img/phone/features/slideshow/slide-three.png" alt="Cave"></li>
+            <li><img src="{{ STATIC_URL }}img/phone/features/slideshow/slide-four.png" alt="Cave"></li>
+        </ul>
+    </div>
diff --git a/templates/phone/shared/_store_promo.html b/templates/phone/shared/_store_promo.html
new file mode 100644
index 00000000000..beeed3adabf
--- /dev/null
+++ b/templates/phone/shared/_store_promo.html
@@ -0,0 +1,10 @@
+<div class="row row--store-promo{% if extra_row_class %} {{ extra_row_class }}{% endif %}">
+	<div class="row--store-promo__content six-col">
+		<h2>{{ promo_title }}</h2>
+		<p>{{ promo_content }}</p>
+		<p><a href="{{ promo_link }}">{{ promo_link_title }}&nbsp;&rsaquo;</a></p>
+	</div>
+	<div class="six-col align-center last-col">
+		<img src="{{ STATIC_URL }}img/phone/icons/image-app-store.png" alt="" />
+	</div>
+</div><!-- .row -->
\ No newline at end of file
diff --git a/templates/phone/shared/phone_promo/_phone_promo.html b/templates/phone/shared/phone_promo/_phone_promo.html
new file mode 100644
index 00000000000..339d4cc7e50
--- /dev/null
+++ b/templates/phone/shared/phone_promo/_phone_promo.html
@@ -0,0 +1,12 @@
+<div itemscope itemtype="http://schema.org/Product" class="row {% if extra_row_class %} {{ extra_row_class }}{% endif %}">
+	<div class="four-col small-align-center">
+		<img itemprop="image" class="" src="{{ STATIC_URL }}img/phone/overview/bq-aquaris-promo.png" alt="Ubuntu for phones on the BQ Aquaris E4.5" />
+	</div><!-- /.six-col -->
+	<div class="seven-col prepend-one last-col">
+		<h2 class="six-col" itemprop="name">{{ phone_promo_title }}</h2>
+		<div itemprop="description">{{ phone_promo_content }}</div>
+		<p itemprop="price">Only 169,90&euro;</p>
+		<p><a class="link-cta-ubuntu" itemprop="url" href="http://www.bq.com/gb/ubuntu.html">How to buy</a>&nbsp;&nbsp;<a itemprop="sameAs" class="phone_promo_link" href="{{ phone_promo_link }}">{{ phone_promo_link_title }}&nbsp;&rsaquo;</a></p>
+		<!-- <p><a href="/phone/devices">Learn more about the phone&nbsp;&rsaquo;</a></p> -->
+	</div><!-- /.six-col -->
+</div><!-- /row -->
\ No newline at end of file
diff --git a/templates/phone/thank-you.html b/templates/phone/thank-you.html
deleted file mode 100755
index e1dd1516a7b..00000000000
--- a/templates/phone/thank-you.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "phone/base_phone.html" %}
-
-{% block title %}Thank you | Ubuntu for phones{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Phone" page_title="Thank you"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-image-centered row-hero no-border">
-	<div class="eight-col">
-	<h1>Thank you</h1>
-		<h2>We&rsquo;re really excited about your interest in Ubuntu for phones.</h2>
-	    <p>A member of our phone team will contact you shortly.</p>
-    </div>
-	<span>
-		<img src="{{ STATIC_URL }}img/devices/pictogram-smile-purple.svg" width="164" height="162" alt="Smile pictogram" />
-	</span>
-</div><!-- /.row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/phone/ubuntu-for-android/contact-us.html b/templates/phone/ubuntu-for-android/contact-us.html
deleted file mode 100755
index 235e2645955..00000000000
--- a/templates/phone/ubuntu-for-android/contact-us.html
+++ /dev/null
@@ -1,106 +0,0 @@
-{% extends "phone/base_phone.html" %}
-
-{% block title %}Contact us | Ubuntu for Android | Ubuntu for phones{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Phone" subsection_title="Ubuntu for Android" page_title="Contact us"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-border">
-	<h1>Contact us about Ubuntu for Android</h1>
-	<div class="eight-col">
-		<h3>Mobile network operators and handset makers</h3>
-		<p>If you&rsquo;d like to help make this happen, please get in touch to arrange a meeting.</p>
-			<script type="text/javascript">
-			function fieldValidate(field) {
-			  /* call Mkto.setError(field, message) and return false to mark a field value invalid */
-			  /* return 'skip' to bypass the built-in validations */
-			  return true;
-			}
-			function getRequiredFieldMessage(domElement, label) {
-			  return "This field is required";
-			}
-			function getTelephoneInvalidMessage(domElement, label) {
-			  return "Please enter a valid telephone number";
-			}
-			function getEmailInvalidMessage(domElement, label) {
-			  return "Please enter a valid email address";
-			}
-			</script>
-		<form class="lpeRegForm formNotEmpty" method="post" enctype="application/x-www-form-urlencoded" action="https://app-g.marketo.com/index.php/leadCapture/save" id="mktForm_1083" name="mktForm_1083">
-			<fieldset class="fieldset-1">
-				<h3>Contact information</h3>
-				<ul class="mktLblLeft">
-					<li class='mktFormReq mktField' ><label for="FirstName">First name: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormString mktFReq' name="FirstName" id="FirstName" type='text' value=""  maxlength='255' tabIndex='1' required/><span class='mktFormMsg'></span></span></li>
-					<li class='mktFormReq mktField' ><label for="LastName">Last name: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormString mktFReq' name="LastName" id="LastName" type='text' value=""  maxlength='255' tabIndex='2' required /><span class='mktFormMsg'></span></span></li>
-					<li class='mktFormReq mktField' ><label for="Company">Company name: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormString mktFReq' name="Company" id="Company" type='text' value=""  maxlength='255' tabIndex='3' required /><span class='mktFormMsg'></span></span></li>
-					<li  class='mktFormReq mktField' ><label>Company website: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormUrl mktFReq' name="Website" id="Website" type='text' value=""  maxlength='255' tabIndex='4' required /><span class='mktFormMsg'></span></span></li>
-
-					<li class='mktFormReq mktField' ><label for="Email">Email address: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormEmail mktFReq' name="Email" id="Email" type='email' value=""  maxlength='255' tabIndex='5' required /><span class='mktFormMsg'></span></span></li>
-					<li class='mktFormReq mktField'><label>Phone number: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormPhone mktFReq' name="Phone" id="Phone" value="" maxlength="255" tabindex="6" required type="tel"><span class="mktFormMsg"></span></span></li>
-				</ul>
-			</fieldset>
-			<fieldset class="fieldset-2">
-				<h3>Your interests</h3>
-				<ul class='mktLblLeft'>
-					<li  class='mktField' ><label>What influence do you have over launching a phone in the next 12 to 18 months?</label><span class='mktInput'><select class='mktFormSelect' name="Level_of_Influence__c" id="Level_of_Influence__c" size='1'  tabIndex='6'><option value='Select level of influence' selected='selected'>Select level of influence</option><option value='Decision Maker'>Decision maker</option><option value='Influencer'>Influencer</option><option value='Little/none'>Little/none</option></select><span class='mktFormMsg'></span></span></li>
-					<li class="mktFormReq mktField" ><label for="Why_Mobile__c">What is your main interest in Ubuntu for phones? <span>*</span></label><span class="mktInput"><select class="mktFormSelect mktFReq" name="Why_Mobile__c" id="Why_Mobile__c" size="1" tabindex="7" required><option value="" selected="selected">Select your interest</option><option value="OEM">Designing/making a phone</option><option value="Telco">Retailing/distributing a phone</option><option value="Developer">Developing apps for Ubuntu mobile</option><option value="In-house Applications Developer">Developing in-house applications</option><option value="Community">Contributing to the development of Ubuntu mobile</option><option value="Content">Delivering content via the Ubuntu devices</option><option value="Consumer">Personal use of Ubuntu on your phone</option></select><span class="mktFormMsg"></span></span></li>
-					<li class='mktFormReg mktField' ><label for="Comments_from_lead__c">Please share more: <span>*</span></label><span class='mktInput'><textarea class='mktFormTextarea mktFormTextarea mktFReq' name="Comments_from_lead__c" id="Comments_from_lead__c" cols='20' rows='5' tabIndex='10'></textarea><span class='mktFormMsg'></span></span></li>
-				</ul>
-			</fieldset>
-			<fieldset class="fieldset-3">
-				<h3>Your organisation</h3>
-				<ul class="mktLblLeft">
-					<li class='mktFormReq mktField' ><label for="Country">Country: <span>*</span></label><span class="mktInput"><select class='mktFormSelect mktFReq' name="Country" id="Country" size='1'  tabIndex='11' required><option value='' selected='selected'>Select country</option><option value='AF'>Afghanistan</option><option value='AX'>Åland Islands</option><option value='AL'>Albania</option><option value='DZ'>Algeria</option><option value='AS'>American Samoa</option><option value='AD'>Andorra</option><option value='AO'>Angola</option><option value='AI'>Anguilla</option><option value='AQ'>Antarctica</option><option value='AG'>Antigua and Barbuda</option><option value='AR'>Argentina</option><option value='AM'>Armenia</option><option value='AW'>Aruba</option><option value='AU'>Australia</option><option value='AT'>Austria</option><option value='AZ'>Azerbaijan</option><option value='BS'>Bahamas</option><option value='BH'>Bahrain</option><option value='BD'>Bangladesh</option><option value='BB'>Barbados</option><option value='BY'>Belarus</option><option value='BE'>Belgium</option><option value='BZ'>Belize</option><option value='BJ'>Benin</option><option value='BM'>Bermuda</option><option value='BT'>Bhutan</option><option value='BO'>Bolivia</option><option value='BA'>Bosnia and Herzegovina</option><option value='BW'>Botswana</option><option value='BV'>Bouvet Island</option><option value='BR'>Brazil</option><option value='IO'>British Indian Ocean Territory</option><option value='BN'>Brunei Darussalam</option><option value='BG'>Bulgaria</option><option value='BF'>Burkina Faso</option><option value='BI'>Burundi</option><option value='KH'>Cambodia</option><option value='CM'>Cameroon</option><option value='CA'>Canada</option><option value='CV'>Cape Verde</option><option value='KY'>Cayman Islands</option><option value='CF'>Central African Republic</option><option value='TD'>Chad</option><option value='CL'>Chile</option><option value='CN'>China</option><option value='CX'>Christmas Island</option><option value='CC'>Cocos (Keeling) Islands</option><option value='CO'>Colombia</option><option value='KM'>Comoros</option><option value='CG'>Congo</option><option value='CD'>Congo (The Democratic Republic of the)</option><option value='CK'>Cook Islands</option><option value='CR'>Costa Rica</option><option value='CI'>Côte D&#039;Ivoire</option><option value='HR'>Croatia</option><option value='CU'>Cuba</option><option value='CY'>Cyprus</option><option value='CZ'>Czech Republic</option><option value='DK'>Denmark</option><option value='DJ'>Djibouti</option><option value='DM'>Dominica</option><option value='DO'>Dominican Republic</option><option value='EC'>Ecuador</option><option value='EG'>Egypt</option><option value='SV'>El Salvador</option><option value='GQ'>Equatorial Guinea</option><option value='ER'>Eritrea</option><option value='EE'>Estonia</option><option value='ET'>Ethiopia</option><option value='FK'>Falkland Islands (Malvinas)</option><option value='FO'>Faroe Islands</option><option value='FJ'>Fiji</option><option value='FI'>Finland</option><option value='FR'>France</option><option value='GF'>French Guiana</option><option value='PF'>French Polynesia</option><option value='TF'>French Southern Territories</option><option value='GA'>Gabon</option><option value='GM'>Gambia</option><option value='GE'>Georgia</option><option value='DE'>Germany</option><option value='GH'>Ghana</option><option value='GI'>Gibraltar</option><option value='GR'>Greece</option><option value='GL'>Greenland</option><option value='GD'>Grenada</option><option value='GP'>Guadeloupe</option><option value='GU'>Guam</option><option value='GT'>Guatemala</option><option value='GG'>Guernsey</option><option value='GN'>Guinea</option><option value='GW'>Guinea-Bissau</option><option value='GY'>Guyana</option><option value='HT'>Haiti</option><option value='HM'>Heard Island and McDonald Islands</option><option value='HN'>Honduras</option><option value='HK'>Hong Kong</option><option value='HU'>Hungary</option><option value='IS'>Iceland</option><option value='IN'>India</option><option value='ID'>Indonesia</option><option value='IR'>Iran (Islamic Republic of)</option><option value='IQ'>Iraq</option><option value='IE'>Ireland</option><option value='IM'>Isle of Man</option><option value='IL'>Israel</option><option value='IT'>Italy</option><option value='JM'>Jamaica</option><option value='JP'>Japan</option><option value='JE'>Jersey</option><option value='JO'>Jordan</option><option value='KZ'>Kazakhstan</option><option value='KE'>Kenya</option><option value='KI'>Kiribati</option><option value='KP'>Korea (Democratic People&amp;amp;#039;s Republic of)</option><option value='KR'>Korea (Republic of)</option><option value='KW'>Kuwait</option><option value='KG'>Kyrgyzstan</option><option value='LA'>Lao People&amp;amp;#039;s Democratic Republic</option><option value='LV'>Latvia</option><option value='LB'>Lebanon</option><option value='LS'>Lesotho</option><option value='LR'>Liberia</option><option value='LY'>Libyan Arab Jamahiriya</option><option value='LI'>Liechtenstein</option><option value='LT'>Lithuania</option><option value='LU'>Luxembourg</option><option value='MO'>Macao</option><option value='MK'>Macedonia (The Former Yugoslav Republic of)</option><option value='MG'>Madagascar</option><option value='MW'>Malawi</option><option value='MY'>Malaysia</option><option value='MV'>Maldives</option><option value='ML'>Mali</option><option value='MT'>Malta</option><option value='MH'>Marshall Islands</option><option value='MQ'>Martinique</option><option value='MR'>Mauritania</option><option value='MU'>Mauritius</option><option value='YT'>Mayotte</option><option value='MX'>Mexico</option><option value='FM'>Micronesia (Federated States of)</option><option value='MD'>Moldova (Republic of)</option><option value='MC'>Monaco</option><option value='MN'>Mongolia</option><option value='ME'>Montenegro</option><option value='MS'>Montserrat</option><option value='MA'>Morocco</option><option value='MZ'>Mozambique</option><option value='MM'>Myanmar</option><option value='NA'>Namibia</option><option value='NR'>Nauru</option><option value='NP'>Nepal</option><option value='NL'>Netherlands</option><option value='AN'>Netherlands Antilles</option><option value='NC'>New Caledonia</option><option value='NZ'>New Zealand</option><option value='NI'>Nicaragua</option><option value='NE'>Niger</option><option value='NG'>Nigeria</option><option value='NU'>Niue</option><option value='NF'>Norfolk Island</option><option value='MP'>Northern Mariana Islands</option><option value='NO'>Norway</option><option value='OM'>Oman</option><option value='PK'>Pakistan</option><option value='PW'>Palau</option><option value='PS'>Palestinian Territory (Occupied)</option><option value='PA'>Panama</option><option value='PG'>Papua New Guinea</option><option value='PY'>Paraguay</option><option value='PE'>Peru</option><option value='PH'>Philippines</option><option value='PN'>Pitcairn</option><option value='PL'>Poland</option><option value='PT'>Portugal</option><option value='PR'>Puerto Rico</option><option value='QA'>Qatar</option><option value='RE'>Réunion</option><option value='RO'>Romania</option><option value='RU'>Russian Federation</option><option value='RW'>Rwanda</option><option value='BL'>Saint Barthélemy</option><option value='SH'>Saint Helena</option><option value='KN'>Saint Kitts and Nevis</option><option value='LC'>Saint Lucia</option><option value='MF'>Saint Martin</option><option value='PM'>Saint Pierre and Miquelon</option><option value='VC'>Saint Vincent and The Grenadines</option><option value='WS'>Samoa</option><option value='SM'>San Marino</option><option value='ST'>Sao Tome and Principe</option><option value='SA'>Saudi Arabia</option><option value='SN'>Senegal</option><option value='RS'>Serbia</option><option value='SC'>Seychelles</option><option value='SL'>Sierra Leone</option><option value='SG'>Singapore</option><option value='SK'>Slovakia</option><option value='SI'>Slovenia</option><option value='SB'>Solomon Islands</option><option value='SO'>Somalia</option><option value='ZA'>South Africa</option><option value='GS'>South Georgia and the South Sandwich Islands</option><option value='ES'>Spain</option><option value='LK'>Sri Lanka</option><option value='SD'>Sudan</option><option value='SR'>Suriname</option><option value='SJ'>Svalbard and Jan Mayen</option><option value='SZ'>Swaziland</option><option value='SE'>Sweden</option><option value='CH'>Switzerland</option><option value='SY'>Syrian Arab Republic</option><option value='TW'>Taiwan</option><option value='TJ'>Tajikistan</option><option value='TZ'>Tanzania</option><option value='TH'>Thailand</option><option value='TL'>Timor-Leste</option><option value='TG'>Togo</option><option value='TK'>Tokelau</option><option value='TO'>Tonga</option><option value='TT'>Trinidad and Tobago</option><option value='TN'>Tunisia</option><option value='TR'>Turkey</option><option value='TM'>Turkmenistan</option><option value='TC'>Turks and Caicos Islands</option><option value='TV'>Tuvalu</option><option value='UG'>Uganda</option><option value='UA'>Ukraine</option><option value='AE'>United Arab Emirates</option><option value='GB'>United Kingdom</option><option value='US'>United States</option><option value='UM'>United States Minor Outlying Islands</option><option value='UY'>Uruguay</option><option value='UZ'>Uzbekistan</option><option value='VU'>Vanuatu</option><option value='VA'>Vatican City State (Holy See)</option><option value='VE'>Venezuela (Bolivarian Republic of)</option><option value='VN'>Viet Nam</option><option value='VG'>Virgin Islands (British)</option><option value='VI'>Virgin Islands (U.S.)</option><option value='WF'>Wallis and Futuna</option><option value='EH'>Western Sahara</option><option value='YE'>Yemen</option><option value='ZM'>Zambia</option><option value='ZW'>Zimbabwe</option><option value=''></option></select><span class='mktFormMsg'></span></span> </li>
-					<li class='mktFormReq mktField' ><label for="State">State: <span>*</span></label><span class='mktInput'><select class='mktFormSelect mktFReq' name="State" id="State" size='1'  tabIndex='12' required><option value='SelectProvince' selected='selected'>Select Province</option><option value='AB'>Alberta</option><option value='BC'>British Columbia</option><option value='MB'>Manitoba</option><option value='NB'>New Brunswick</option><option value='NF'>Newfoundland</option><option value='NT'>Northwest Territories</option><option value='NS'>Nova Scotia</option><option value='NU'>Nunavut</option><option value='ON'>Ontario</option><option value='PE'>Prince Edward Island</option><option value='QC'>Quebec</option><option value='SK'>Saskatchewan</option><option value='YT'>Yukon Territory</option><option value='SelectState'>Select State</option><option value='AK'>Alaska</option><option value='AL'>Alabama</option><option value='AR'>Arkansas</option><option value='AZ'>Arizona</option><option value='CA'>California</option><option value='CO'>Colorado</option><option value='CT'>Connecticut</option><option value='DC'>District of Columbia</option><option value='DE'>Delaware</option><option value='FL'>Florida</option><option value='GA'>Georgia</option><option value='HI'>Hawaii</option><option value='IA'>Iowa</option><option value='ID'>Idaho</option><option value='IL'>Illinois</option><option value='IN'>Indiana</option><option value='KS'>Kansas</option><option value='KY'>Kentucky</option><option value='LA'>Louisiana</option><option value='MA'>Massachusetts</option><option value='MD'>Maryland</option><option value='ME'>Maine</option><option value='MI'>Michigan</option><option value='MN'>Minnesota</option><option value='MO'>Missouri</option><option value='MS'>Mississippi</option><option value='MT'>Montana</option><option value='NC'>North Carolina</option><option value='ND'>North Dakota</option><option value='NE'>Nebraska</option><option value='NH'>New Hampshire</option><option value='NJ'>New Jersey</option><option value='NM'>New Mexico</option><option value='NV'>Nevada</option><option value='NY'>New York</option><option value='OH'>Ohio</option><option value='OK'>Oklahoma</option><option value='OR'>Oregon</option><option value='PA'>Pennsylvania</option><option value='PR'>Puerto Rico</option><option value='RI'>Rhode Island</option><option value='SC'>South Carolina</option><option value='SD'>South Dakota</option><option value='TN'>Tennessee</option><option value='TX'>Texas</option><option value='UT'>Utah</option><option value='VA'>Virginia</option><option value='VT'>Vermont</option><option value='WA'>Washington</option><option value='WI'>Wisconsin</option><option value='WV'>West Virginia</option><option value='WY'>Wyoming</option><option value=''></option></select><span class='mktFormMsg'></span></span></li>
-					<li class='mktFormReq mktField' ><label for="Industry">Industry: <span>*</span></label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Industry" id="Industry" size='1'  tabIndex='13'><option value='Select' selected='selected'>Select industry</option><option value='Mobile operator'>Mobile operator</option><option value='Phone manufacturer'>Phone manufacturer</option><option value='PC manufacturer'>PC manufacturer</option><option value='SOC vendor'>SOC vendor</option><option value='ODM'>ODM</option><option value='Software Development'>Software/app developer</option><option value='' disabled>------------</option><option value='Accountancy & Tax'>Accountancy &amp; tax</option><option value='Aerospace & Aviation'>Aerospace &amp; aviation</option><option value='Automotive'>Automotive</option><option value='Banking & Finance'>Banking &amp; Finance</option><option value='Business Consultancy'>Business consultancy</option><option value='Charity & Non-profit'>Charity &amp; non-profit</option><option value='Construction'>Construction</option><option value='Consumer Products'>Consumer products</option><option value='Consumer Services'>Consumer services</option><option value='Defence & Security'>Defence &amp; security</option><option value='Education & Training'>Education &amp; training</option><option value='Electronics'>Electronics</option><option value='Engineering'>Engineering</option><option value='Entertainment - media/music/broadcast'>Entertainment - media/music/broadcast</opt`ion><option value='Facilities, Property & Real Estate'>Facilities, property &amp; real estate</option><option value='Government'>Government</option><option value='Healthcare & Pharmaceuticals'>Healthcare &amp; pharmaceuticals</option><option value='HR & Recruitment'>HR &amp; Recruitment</option><option value='Information Technology'>Information technology</option><option value='Insurance'>Insurance</option><option value='Internet & New Media'>Internet &amp; new media</option><option value='Legal'>Legal</option><option value='Leisure, Travel & Hospitality'>Leisure, travel &amp; hospitality</option><option value='Manufacturer - Other'>Manufacturer - other</option><option value='Marketing, PR & Advertising'>Marketing, PR &amp; advertising</option><option value='Media - publishing or news'>Media - publishing or news</option><option value='Oil & Gas'>Oil &amp; gas</option><option value='Public Sector'>Public sector</option><option value='Retail & e-commerce'>Retail &amp; e-commerce</option><option value='Science & Environment'>Science &amp; environment</option><option value='Software Development'>Software development</option><option value='Supply Chain & Logistics'>Supply chain &amp; logistics</option><option value='Transportation &amp; Distribution'>Transportation &amp; distribution</option><option value='Utilities & Energy'>Utilities &amp; energy</option><option value='Other'>Other</option><option value='Not applicable (self)'>Not applicable (self)</option></select><span class='mktFormMsg'></span></span></li>
-					<li class='mktFormReq mktField' ><label for="Job_Role__c">Job role: <span>*</span></label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Job_Role__c" id="Job_Role__c" size='1'  tabIndex='14' required><option selected='selected'>Select job role</option><option value='Executive'>Executive</option><option value='Sales & marketing'>Sales &amp; marketing</option><option value='Product management'>Product management</option><option value='Purchasing'>Purchasing</option><option value='R&D'>R&amp;D</option><option value='' disabled>------------</option><option value='Business and Project Management'>Business and project management</option><option value='Database Development and Administration'>Database development and administration</option><option value='Education'>Education</option><option value='Enterprise Systems Analysis & Integration'>Enterprise systems analysis &amp; integration</option><option value='Home User'>Home user</option><option value='Network Design and Administration'>Network design and administration</option><option value='Owner/Self Employed'>Owner/Self employed</option><option value='Press and Communications'>Press and communications/Analyst</option><option value='Programming/Software Engineering'>Programming/Software engineering</option><option value='Smartphone User'>Smartphone user</option><option value='Technical Support'>Technical support</option><option value='Technical Writing'>Technical writing</option><option value='Ubuntu Enthusiast'>Ubuntu enthusiast</option><option value='Web Development and Administration'>Web development and administration</option></select><span class='mktFormMsg'></span></span></li>
-					<li class='mktFormReq mktField' ><label for="num_employees__c">Number of employees: <span>*</span></label><span class='mktInput'><select class='mktFormSelect mktFReq' name="num_employees__c" id="num_employees__c" size='1'  tabIndex='15' required><option value='>Select employees' selected='selected'>Select employees</option><option value='None'>None</option><option value='<500'>&lt;500</option><option value='501-1000'>501-1000</option><option value='1001-2000'>1001-2000</option><option value='2001-5000'>2001-5000</option><option value='5000+'>5000+</option></select><span class='mktFormMsg'></span></span></li>
-				</ul>
-			</fieldset>
-			<fieldset class="fieldset-submit">
-				<ul class="mktLblLeft">
-					<li class='mktField' ><span class='mktInput'><input class='mktFormCheckbox' name="MobileNewsletterOpt-in" id="MobileNewsletterOpt-in" type='checkbox' value="1"  tabIndex='16' /><label for="MobileNewsletterOpt-in">Would you like to follow progress with our mobile newsletter?</label><span class='mktFormMsg'></span></span></li>
-					<li class='mktField' ><span class='mktInput'><input class='mktFormCheckbox' name="NewsletterOpt-In" id="NewsletterOpt-In" type='checkbox' value="1"  tabIndex='17' /><label for="NewsletterOpt-In">I would like to receive occasional news about Ubuntu by email.</label><span class='mktFormMsg'></span></span></li>
-
-					<li>All information provided will be handled in accordance with the Canonical <a href="http://www.ubuntu.com/privacy-policy" target="_blank">privacy policy</a>.</li>
-					<li id="mktFrmButtons"><!--<label>&nbsp;</label>--><input id="mktFrmSubmit" type="submit" value="Submit" name="submitButton" tabIndex='18' onclick="formSubmit(document.getElementById('mktForm_1083')); return false;">&nbsp;<input style="display: none;" id="mktFrmReset" type="reset" value="Clear" name="resetButton" onclick="formReset(document.getElementById('mktForm_1083')); return false;"></li>
-				</ul>
-			</fieldset>
-			<span style="display:none;"><input type="text" name="_marketo_comments" value="" /></span>
-			<input type="hidden" name="lpId" value="1384" />
-			<input type="hidden" name="subId" value="30" />
-			<input type="hidden" name="munchkinId" value="066-EOV-335" />
-			<input type="hidden" name="kw" value="" />
-			<input type="hidden" name="cr" value="" />
-			<input type="hidden" name="searchstr" value="" />
-			<input type="hidden" name="lpurl" value="https://pages.canonical.com/Register_AndroidRegister.html?cr={creative}&amp;kw={keyword}" />
-			<input type="hidden" name="formid" value="1083" />
-			<input type="hidden" name="returnURL" value="http://www.ubuntu.com/phone/ubuntu-for-android/thank-you" />
-			<input type="hidden" name="retURL" value="http://www.ubuntu.com/phone/ubuntu-for-android/thank-you" />
-			<input type="hidden" name="returnLPId" value="-1" />
-			<input type="hidden" name="_mkt_disp" value="return" />
-			<input type="hidden" name="_mkt_trk" value="id:066-EOV-335&token:_mch-canonical.com-1360664494214-92985" />
-
-  		</form>
-		<script type="text/javascript" src="http://www.ubuntu.com/misc/jquery.js?J"></script>
-		<script type="text/javascript" src="https://pages.canonical.com/js/mktFormSupport.js"></script>
-		<script type="text/javascript" src="http://pages.canonical.com/js/public/stateCountry.js"></script>
-		<script type="text/javascript">
-			function formSubmit(elt) {
-				return Mkto.formSubmit(elt);
-			}
-			function formReset(elt) {
-				return Mkto.formReset(elt);
-			}
-			$(document).ready(function(){var e=$("#tick_ces-in");var t=$("#tick_mwc-in");var n=$("#Question1");$("#tick_ces-in, #tick_mwc-in").change(function(){if(e.is(":checked")&&t.is(":checked")){n.val("CES,MWC")}else if(e.is(":checked")){n.val("CES")}else if(t.is(":checked")){n.val("MWC")}else{n.val("Neither")}})})
-		</script>
-	</div><!-- /.seven-col -->
-	<div class="four-col last-col">
-		<h3>Mobile operators</h3>
-		<p>Help shape Ubuntu&rsquo;s mobile strategy, consider joining our Ubuntu Carrier Advisory Group.</p>
-		<p><a href="/phone/carrier-advisory-group">Learn more&nbsp;&rsaquo;</a></p>
-	</div>
-</div><!-- /.row -->
-{% endblock content %}
diff --git a/templates/phone/ubuntu-for-android/features.html b/templates/phone/ubuntu-for-android/features.html
deleted file mode 100755
index f6077093def..00000000000
--- a/templates/phone/ubuntu-for-android/features.html
+++ /dev/null
@@ -1,119 +0,0 @@
-{% extends "phone/base_phone.html" %}
-
-{% block title %}Features and specifications | Ubuntu for Android | Ubuntu for phones{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Phone" subsection_title="Ubuntu for Android" page_title="Features and specifications"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-
-<div class="row row-hero row-image-centered">
-	<div class="seven-col">
-		<h1>Features and specifications</h1>
-		<h2>A complete Ubuntu desktop for docked Android phones</h2>
-		<p>Ubuntu for Android provides a full desktop experience, including office software, web browsing, email and media applications, on Android phones docked to a screen and keyboard. Thanks to tight integration with the Android service layer, the transition between the two environments is seamless, making it easy to access the phone's services from the desktop when docked.</p>
-	</div>
-	<span>
-		<img src="{{ STATIC_URL }}img/phone/ubuntu-for-android/features/image-ubuntuforandroid-features.jpg" width="418" height="325" alt="Ubuntu running from an Android phone" />
-	</span>
-</div><!-- / .row -->
-
-<div class="row">
-	<h3>Secure full-featured web</h3>
-	<div class="six-col">
-		<p>Sit back and enjoy a full desktop browser for multi-tab, multi-window web productivity. Ubuntu supports both Chromium and Firefox, the world's fastest browsers, and is naturally resistant to web malware, which is why enterprises and governments are adopting Ubuntu on desktops.</p>
-	</div>
-	<div class="six-col last-col">
-		<p>Surf on the move with the Android browser, then dock to continue your session on the desktop. You get the same web pages, the same bookmarks and the same browsing history, with all the real-estate of a desktop. Using web applications with a full keyboard and mouse is so much better than a tablet when you're at a desk, even in a hotel.</p>
-	</div>
-</div><!-- / .row -->
-
-
-<div class="row row-image-centered">
-	<span class="eight-col">
-		<img src="{{ STATIC_URL }}img/phone/ubuntu-for-android/features/image-ubuntuforandroid-unifiedcontacts.jpg" alt="Contacts lens on Ubuntu" width="442" height="249" />
-	</span>
-	<div class="four-col last-col">
-		<h3>Unified contacts</h3>
-		<p>Both Ubuntu and Android access the same mobile address book. So even when the phone is docked, you can view, edit, call, text or email a contact. You can even check their profiles on Facebook or Twitter.</p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row row-image-centered">
-	<div class="six-col">
-		<h3>Calendar coordination</h3>
-		<p>As with your contacts, your Android calendar data is shared with Ubuntu. This enables synchronisation with any desktop or web-based calendar application, like Google Calendar.</p>
-	</div>
-	<span>
-		<img src="{{ STATIC_URL }}img/pictograms/pictogram-calendar-164x145.gif" alt="Contacts lense on Ubuntu" width="164" height="145" />
-	</span>
-</div><!-- / .row -->
-
-<div class="row row-image-centered">
-	<div class="four-col">
-		<h3>Messaging and calls</h3>
-		<p>Read and reply to incoming SMS messages from the desktop, using Ubuntu's message indicator. You can also make and receive calls via the desktop &mdash; and you'll be alerted to voicemails so you can manage them while you work.</p>
-	</div>
-	<span>
-		<img src="{{ STATIC_URL }}img/phone/ubuntu-for-android/features/image-ubuntuforandroid-messagingandcalls.jpg" alt="Incoming message on Ubuntu" width="442" height="249" />
-	</span>
-</div><!-- / .row -->
-
-<div class="row">
-	<div class="six-col">
-		<h3>Simple integrated settings</h3>
-		<p>Alarm clock settings on the phone can be synchronised to alert you when working in the Ubuntu environment. You'll have one place to enter WiFi passwords and one place to pair your Bluetooth headset, then everything just works.</p>
-	</div>
-	<div class="six-col last-col">
-		<h3>Photos</h3>
-		<p>Manage and view photos stored on your smartphone using the Ubuntu Gallery application. Then edit them on the Ubuntu desktop and save them back to the phone. Create, edit and consume, all on one device.</p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row">
-	<div class="six-col">
-		<h3>Social networking services</h3>
-		<p>All your Android social network account credentials are synchronised seamlessly, using the Ubuntu social networking client  to provide easy access to your online communities.</p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row">
-	<div class="box box-padded twelve-col default-apps">
-		<h3>Default applications</h3>
-		<div>
-			<ul class="inline text-center">
-				<li><img src="{{ STATIC_URL }}img/phone/ubuntu-for-android/icon-chrome.png" title="Fast, secure web browsing" alt="Fast, secure web browsing" width="64" height="64" /><p>Google Chrome web browser</p></li>
-				<li><img src="{{ STATIC_URL }}img/phone/ubuntu-for-android/icon-googlecalendar.png" title="Online calendar sharing" alt="Online calendar sharing" width="64" height="64" /><p>Google Calendar</p></li>
-				<li><img src="{{ STATIC_URL }}img/devices/icon-android-docs.png" title="Collaborative documents in the cloud" alt="Collaborative documents in the cloud" width="64" height="64" /><p>Google Docs</p></li>
-				<li><img src="{{ STATIC_URL }}img/phone/ubuntu-for-android/icon-thunderbird.png" title="Simple, efficient email" alt="Simple, efficient email" width="64" height="64" /><p>Thunderbird email client</p></li>
-				<li class="last-item"><img src="{{ STATIC_URL }}img/phone/ubuntu-for-android/icon-gwibber.png" title="Facebook and Twitter integration" alt="Facebook and Twitter integration" width="64" height="64" /><p>Gwibber</p></li>
-				<li class="bottom"><img src="{{ STATIC_URL }}img/phone/ubuntu-for-android/icon-vlc.png" title="Play movies in all common formats" alt="Play movies in all common formats" width="64" height="64" /><p>VLC Player</p></li>
-				<li class="bottom"><img src="{{ STATIC_URL }}img/phone/ubuntu-for-android/icon-pitivi.png" title="Edit and share your movies" alt="Edit and share your movies" width="64" height="64" /><p>PiTiVi</p></li>
-				<li class="bottom"><img src="{{ STATIC_URL }}img/phone/ubuntu-for-android/icon-rhythmbox.png" title="Plays all common music files" alt="Plays all common music files" width="64" height="64" /><p>Ubuntu Music Player</p></li>
-				<li class="bottom"><img src="{{ STATIC_URL }}img/phone/ubuntu-for-android/icon-shotwell.png" title="Save and edit all your photos" alt="Save and edit all your photos" width="64" height="64" /><p>Ubuntu Photo Gallery</p></li>
-				<li class="bottom last-item"><img src="{{ STATIC_URL }}img/phone/ubuntu-for-android/icon-dialer.png" title="Make calls direct from the desktop" alt="Make calls direct from the desktop" width="64" height="64" /><p>Android dialer</p></li>
-			</ul>
-		</div>
-	</div><!-- /.box -->
-</div><!-- / .row -->
-
-<div class="row no-border">
-	<div class="eight-col">
-		<h3>Technical specifications</h3>
-		<p>Ubuntu for Android requires minimal custom hardware enablement, allowing fast and cost-efficient core integration. It requires a core based on Android 2.3 (Gingerbread) or any subsequent version.</p>
-		<p>Ubuntu and Android share the same kernel. When docked, the Ubuntu OS boots and runs concurrently with Android. This allows both mobile and desktop functionality to co-exist in different runtimes.</p>
-		<p>Shared services and applications are delivered using a Convergence API module which ensures the tight integration between desktop and mobile environments. Work is balanced across the cores of the phone. When the handset is not docked,  both CPU cores transfer their full power to Android.</p>
-	</div><!-- /.eight-col-->
-	<div class="four-col last-col">
-			<ul class="list-ubuntu">
-				<li>Automatic security updates</li>
-				<li>Defence against viruses</li>
-				<li>Anti-phishing</li>
-				<li>File encryption</li>
-				<li>Password protection</li>
-				<li>Built with security in mind</li>
-			</ul>
-	</div><!-- /.four-col-->
-</div><!-- / .row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/phone/ubuntu-for-android/index.html b/templates/phone/ubuntu-for-android/index.html
deleted file mode 100755
index 8bcebe8498d..00000000000
--- a/templates/phone/ubuntu-for-android/index.html
+++ /dev/null
@@ -1,172 +0,0 @@
-{% extends "phone/base_phone.html" %}
-
-{% block title %}Ubuntu for Android | Ubuntu for phones{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Phone" page_title="Ubuntu for Android" tertiary="true"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero row-hero-android">
-	<div class="five-col">
-		<h1>In every dual-core phone, there&rsquo;s a PC trying to <br/>get out.</h1>
-	</div><!-- /.four-col -->
-	<div class="seven-col last-col">
-		<img src="{{ STATIC_URL }}img/devices/photo-android-hero-749x456.jpg" alt="" width="749" height="456" />
-	</div>
-</div><!-- /.row -->
-
-<div class="row">
-	<div class="eight-col">
-		<div class="video-container">
-			<iframe width="595" height="335" src="http://www.youtube.com/embed/iv1Z7bf4jXY?showinfo=0&amp;hd=1&amp;rel=0&amp;modestbranding=0"></iframe>
-		</div>
-	</div>
-	<div class="four-col last-col">
-		<h2>What is Ubuntu for Android?</h2>
-		<p>How would you like a PC that fits in your pocket? For the lowdown on Ubuntu for Android, watch this short video. And for news on Ubuntu for Android products, watch this space.</p>
-		<a href="http://twitter.com/share" class="twitter-share-button" data-text="Why carry a phone when you can carry a phone that becomes a PC? Check out Ubuntu for Android." data-count="horizontal" data-size="large" data-counturl="http://www.ubuntu.com/devices/android" data-url="http://ubunt.eu/u4a" data-hashtags="U4A">Tweet</a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
-	</div>
-</div><!-- /.row -->
-
-<div class="row row-android-intro vertical-divider equal-height">
-	<h2 class="twelve-col">The full PC desktop for multi-core Android phones</h2>
-	<div class="four-col">
-		<p>Now multi-core Android phones can be PCs too. Ubuntu for Android enables high-end Android handsets to run Ubuntu, the world&rsquo;s favourite free PC desktop operating system. So users get the Android they know on the move, but when they connect their phone to a monitor, mouse and keyboard, it becomes a PC.</p>
-	</div><!-- / .four-col -->
-
-	<div class="four-col">
-		<h5>Benefits for network operators</h5>
-		<ul class="list-ubuntu">
-			<li>Deliver the enterprise next-gen desktop in a single device</li>
-			<li>Drive adoption of 4G handsets, as online apps like Google Docs shine with low-latency connections</li>
-			<li>Expand your service portfolio from the smart phone to the smart desktop by delivering productivity desktop apps, including managed Windows apps as a service on your network</li>
-			<li class="last-item">Satisfy demand for first PCs to families in emerging economies with no legacy wired connectivity</li>
-		</ul>
-	</div><!-- / .four-col -->
-
-	<div class="four-col last-col">
-		<h5>Benefits for handset makers</h5>
-		<ul class="list-ubuntu">
-			<li>Drive sales of multi-core phones with faster CPUs, more cores, more RAM and high-end graphics</li>
-			<li>Target lucrative markets for thin client in the enterprise and first PCs in emerging markets</li>
-			<li>Integrate easily with Android phones already in development</li>
-			<li class="last-item">Accessorise with docks, cables, keyboards and displays</li>
-		</ul>
-	</div><!-- / .four-col -->
-</div><!-- /.row -->
-
-<div class="row">
-	<div class="four-col">
-		<img src="{{ STATIC_URL }}img/devices/photo-android-phone-302x287.jpg" width="302" height="287" alt="A docked phone running Ubuntu" />
-	</div><!-- /.four-col -->
-	<div class="eight-col last-col">
-		<h2>The number one free desktop on the number one open phone</h2>
-		<p>With over 20 million users, Ubuntu is the world&rsquo;s favourite free operating system &ndash; and Ubuntu for Android is the first complete solution for office productivity on a phone. It lets Android and Ubuntu share the same Linux kernel, so they can run at the same time &ndash; Android for the phone experience and Ubuntu when docked. Which means one address book, one set of bookmarks, one place for text messages and one inbox for mail. And thanks to careful integration between the Ubuntu desktop and Android, user&rsquo;s have access to the phone&rsquo;s functions when it&rsquo;s docked &ndash; including making and receiving calls.</p>
-
-		<p><a href="/phone/ubuntu-for-android/features">See the features in full&nbsp;&rsaquo;</a></p>
-	</div><!-- /.eight-col -->
-</div><!-- /.row -->
-
-<div class="row">
-	<h2>Just cause for more cores</h2>
-	<div class="four-col">
-		<p>Ubuntu for Android gives mobile workers a compelling reason to upgrade to multi-core handsets with more RAM, more storage, faster GPUs and CPUs. It&rsquo;s not just a phone they are buying, it&rsquo;s a desktop too. While mid-range phones can deliver a perfect Android experience, it takes high-end horsepower to drive a phone and a desktop at the same time. Newer multi-core processors are up to the job, and Ubuntu is the killer app for that hot hardware. It&rsquo;s the must-have feature for high-end Android phones.</p>
-	</div><!-- /.four-col -->
-	<div class="four-col">
-		<p>A built-in desktop is also a driver of LTE, which offers higher bandwidth for productivity apps and lower latency for business users. Cloud apps like Google Docs are best used with a full desktop, and shine with LTE. The phone has traditionally been a slower, less productive tool. When you&rsquo;re at a desktop, you want to get things done, quickly. So you appreciate the difference between 3G and 4G. Adding a desktop to the phone justifies the extra cost of newer network technologies for business customers.</p>
-	</div><!-- /.four-col -->
-	<div class="three-col prepend-one last-col">
-		<blockquote class="pull-quote">
-			<p><span>&ldquo;</span>Ubuntu is the <strong>killer app</strong> for multi-core phones&nbsp;&nbsp;<span>&rdquo;</span></p>
-		</blockquote>
-	</div><!-- /.four-col -->
-</div><!-- /.row -->
-
-<div class="row">
-	<h2>New markets, new opportunities</h2>
-	<div class="six-col">
-		<p>For phone manufacturers eager to expand their audience, Ubuntu for Android gives access to entirely new markets.</p>
-		<p>Enterprise IT departments currently support a PC and at least one phone for every desk-based worker. Our solution reduces their burden to a single device for every user. So Ubuntu for Android helps you tap into the lucrative corporate PC replacement and thin client markets. Ubuntu is already the most popular replacement for Windows on the corporate desktop, with deployments of tens of thousands of desktops in multiple institutions.</p>
-		{% comment %}<a href="/phone/ubuntu-for-android/commercial-info">See commercial information in full&nbsp;&rsaquo;</a>{% endcomment %}
-	</div><!-- /.six-col -->
-	<div class="six-col last-col">
-		<p>In developing economies, where there is little historical PC penetration, the phone can define personal computing for an audience that has no legacy attachment to the desktop. For the next billion knowledge workers, their first PC could be their first smartphone, but they&rsquo;ll need a device that can do more than just be a handset, if they really want to shine.</p>
-		<p>Ubuntu ships pre-installed on millions of PC&rsquo;s from major manufacturers in China, India and Brazil today. It&rsquo;s easy, it has an amazing range of software on tap, and it&rsquo;s totally integrated with your personal cloud service. Pure 21st century goodness.</p>
-	</div><!-- /.six-col -->
-</div><!-- /.row -->
-
-<div id="easy-integration" class="row">
-	<div class="eight-col">
-		<h2>Easy to integrate to your Android phone</h2>
-		<p>Ubuntu for Android drops in cleanly alongside the rest of Android, so it is easy to integrate into current production roadmaps. The hardware requirements are straightforward and, with a broad range of ARM and x86 hardware supported, it can realistically be added to phones already in development.</p>
-		<p>Of course, your phone needs the docking capability and hardware support for HDMI and USB. But that&rsquo;s standard for high-end models in the current generation of devices in development.</p>
-	</div>
-</div><!-- /.row -->
-
-<div class="row row-free">
-	<h2>The world&rsquo;s favourite free desktop &mdash; for business and home</h2>
-	<div class="eight-col">
-		<p>The Ubuntu desktop sets the standard for ease of use. That&rsquo;s one reason why Ubuntu is now the world&rsquo;s favourite free operating system &mdash; on the desktop as well as the server. It&rsquo;s shipped by more PC brands, used by more people, targeted by more developers and covered by more journalists than any other Linux desktop.</p>
-
-		<ul class="inline-icons">
-			<li><img class="picto-office" src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-officeapplication-warmgrey.svg" width="90" height="90" alt="Office pictogram" /></li>
-			<li><img class="picto-music" src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-musicstore-warmgrey.svg" width="90" height="90" alt="Music pictogram" /></li>
-			<li><img class="picto-contacts" src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-contacts-warmgrey.svg" width="90" height="90" alt="Contacts pictogram" /></li>
-		</ul>
-
-		<p>Ubuntu for Android is a complete desktop with a full range of desktop applications including office, web browsing, email, media and messaging. Personal information like contacts, calendars, photo galleries and music can be accessed from both the phone and the desktop interface. SMS texts arrive on your desktop if you are docked when they show up, and calls are handled like VoIP if you want to stay working while you chat. Ubuntu for Android brings the desktop world together with the phone world, seamlessly.</p>
-		<p>Our reputation and brand have taken seven years to create. Because we care about quality, Ubuntu selects only the very best applications for install by default. And because we care about security, Ubuntu includes free security updates across more applications than any competitor. During the netbook era, every manufacturer created their own Linux, but customers rebelled. Today, they ship Ubuntu.</p>
-		<a href="/phone/ubuntu-for-android/features">See the features in full&nbsp;&rsaquo;</a>
-	</div><!-- /.eight-col -->
-	<div class="four-col last-col">
-		<div class="box">
-			<h3>The trusted brand in Linux</h3>
-			<p>More than 55% of all Linux developers use Ubuntu, which is why almost every Linux desktop application is certified to work with it. From VMWare&rsquo;s workstation virtualization to Citrix&rsquo; thin client to Adobe&rsquo;s creativity portfolio and loads of games, Ubuntu is number one. That&rsquo;s why it&rsquo;s being installed in large business and government projects, and why <strong>it&rsquo;s the brand that sells devices</strong>. There are hundreds of Linux distributions, but there is only one that is widely certified on the desktop, and one that is growing fastest in the enterprise: Ubuntu.</p>
-			<ul class="no-bullets inline inline-icons clearfix">
-				<li class="first"><img class="logo-citrix" src="{{ STATIC_URL }}img/third-party-logos/logo-citrix-74x30.png" width="74" height="30" alt="Citrix logo" /></li>
-				<li><img class="logo-adobe" src="{{ STATIC_URL }}img/third-party-logos/logo-adobe-30x35.png" width="30" height="35" alt="Adobe logo" /></li>
-				<li class="last-item"><img class="logo-vmware" src="{{ STATIC_URL }}img/third-party-logos/logo-vmware-108x38.png" width="100" height="36" alt="VMWare logo" /></li>
-			</ul>
-		</div>
-	</div><!-- /.four-col -->
-</div><!-- /.row -->
-
-<div id="ecosystem" class="row">
-	<h2>A whole new peripheral ecosystem</h2>
-		<div class="six-col">
-			<p>Users will want at least one dock, complete with monitor, keyboard and mouse. Many will want two of each &mdash; one for the office and one for the home. And mobile users will opt for clamshell devices that give them a laptop experience whenever they need it &mdash; on the train, on the plane or in meetings.</p>
-			<ul class="no-bullets inline inline-icons">
-				<li><img class="picto-headphones" src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-accessories-orange.svg" width="78" height="78" alt="Headphones pictogram" /></li>
-				<li><img class="picto-monitor" src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-desktop-orange.svg" width="78" height="78" alt="Monitor pictogram" /></li>
-				<li><img class="picto-laptop" src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-laptop-orange.svg" width="78" height="78" alt="Laptop pictogram" /></li>
-			</ul>
-		</div><!-- /.six-col -->
-		<div class="six-col last-col">
-			<p>Desktop productivity goes well beyond the keyboard, monitor and mouse. Imagine projectors with a phone dock built in, so you can carry less to your presentations. And imagine TVs that become home PCs when you dock your phone: perfect for the emerging market where LTE will be the normal way for new users to connect to the Internet.</p>
-		</div><!-- /.six-col -->
-</div><!-- /.ecosystem -->
-
-<div class="row row-android equal-height">
-	<div class="eight-col">
-		<h2>Why add anything to Android?</h2>
-			<p>Android is a mobile solution, designed for a touch interface on a handheld device. On the desktop, where users expect a pointer-driven experience, a PC operating system is essential. Several vendors have tried to bring Android-based desktops or laptops to market, with no success; Android was designed for touch only, and has its hands full winning the tablet wars.</p>
-			<p>A complete desktop solution needs a full range of desktop applications. While a mobile OS carries no deep desktop software catalogue, Ubuntu offers thousands of applications, all designed for the desktop and most, like Ubuntu, free. And Ubuntu is certified by governments, industry and enterprises, widely deployed on the desktop and supported by leading management solutions.</p>
-			<p>Another alternative would be a web-top, or web only desktop. But markets have not responded to web-only environments. The desktop is a high-productivity mode, not a media consumption mode or a browsing mode. That&rsquo;s why we&rsquo;ve brought the full power of a native desktop to this solution.</p>
-		</div><!-- /.eight-col -->
-		<div class="four-col last-col">
-			<span><img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-android.svg" width="129" height="129" alt="" /></span>
-		</div>
-</div><!-- /.row -->
-
-<div class="row no-border">
-	<h2>Backed by Canonical</h2>
-	<div class="six-col">
-		<p>Canonical is the commercial entity behind Ubuntu. We have staff in more than 30 countries, with offices in London, Boston, Taipei, Montreal, Shanghai and S&atilde;o Paulo.</p>
-		<p><a href="/partners/backed-by-canonical">Learn more about working with us&nbsp;&rsaquo;</a></p>
-	</div><!-- /.six-col -->
-	<div class="six-col last-col">
-		<p>We have been working with the ARM architecture for years, having co-founded Linaro, the consortium dedicated to the unification of Linux on ARM and the locus of development for ARM on servers and laptops. Canonical and Vodafone shipped the world&rsquo;s first ARM smartbook. Our OEM team has years of experience in bringing new products to market, providing complete, end&ndash;to&ndash;end solutions &mdash; identifying opportunities, developing strategies and ensuring a stunning experience on every Ubuntu device.</p>
-	</div><!-- /.six-col -->
-</div><!-- /.row -->
-{% endblock content %}
diff --git a/templates/phone/ubuntu-for-android/thank-you.html b/templates/phone/ubuntu-for-android/thank-you.html
deleted file mode 100755
index 4765238e120..00000000000
--- a/templates/phone/ubuntu-for-android/thank-you.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "phone/base_phone.html" %}
-
-{% block title %}Thank you | Ubuntu for phones{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Phone" subsection_title="Ubuntu for Android" page_title="Thank you"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero row-image-centered no-border">
-	<div class="seven-col">
-		<h1>Thank you</h1>
-		<h2>We&rsquo;re really excited about your interest in Ubuntu for Android.</h2>
-	    <p>A member of our phone team will contact you shortly.</p>
-   </div>
-	<span>
-		<img src="{{ STATIC_URL }}img/devices/pictogram-smile-purple.svg" width="164" height="162" alt="Smile pictogram" />
-	</span>
-</div><!-- /.row -->
-{% endblock content %}
diff --git a/templates/privacy-policy/third-parties.html b/templates/privacy-policy/third-parties.html
index 4ee57046ef4..97493420abf 100755
--- a/templates/privacy-policy/third-parties.html
+++ b/templates/privacy-policy/third-parties.html
@@ -1,4 +1,4 @@
-{% extends "_base/one-column.html" %}
+{% extends "templates/one-column.html" %}
 
 {% block title %}Third-party privacy policies{% endblock %}
 {% block head_extra %}{% endblock %}
diff --git a/templates/search.html b/templates/search.html
index a56b3930bce..590e04d6c1f 100755
--- a/templates/search.html
+++ b/templates/search.html
@@ -1,4 +1,4 @@
-{% extends "_base/one-column.html" %} 
+{% extends "templates/one-column.html" %} 
 
 {% block title %}Search results{% if query %} for "{{query}}"{% endif %} | Ubuntu{% endblock %}
 {% block extra_body_class %}ubuntu-search{% endblock %}
diff --git a/templates/server/base_server.html b/templates/server/base_server.html
index 1b3e8d124e6..081439ac47f 100755
--- a/templates/server/base_server.html
+++ b/templates/server/base_server.html
@@ -1,9 +1,9 @@
-{% extends "_base/base.html" %}
+{% extends "templates/base.html" %}
 {% block second_level_nav_items %}
 {% include "server/_nav_secondary.html" %}
 {% endblock second_level_nav_items %}
 
 {% block outer_content %}
     {% block content %}{% endblock %}
-		{% include "_base/_contextual_footer.html" %}
+		{% include "templates/_contextual_footer.html" %}
 {% endblock %}
diff --git a/templates/server/contact-us.html b/templates/server/contact-us.html
index 7d55860b6bb..bc60e45f989 100755
--- a/templates/server/contact-us.html
+++ b/templates/server/contact-us.html
@@ -5,7 +5,7 @@
 {% block meta_keywords %}Ubuntu, Ubuntu operating system, OS, Linux, Windows alternative, Mac alternative, thin client, Business server{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Server" page_title="Contact us"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Server" page_title="Contact us"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/server/hyperscale.html b/templates/server/hyperscale.html
index d9c4636b9c6..c2359bf5e35 100755
--- a/templates/server/hyperscale.html
+++ b/templates/server/hyperscale.html
@@ -1,11 +1,13 @@
 
 {% extends "server/base_server.html" %}
 
-{% block title %}Server services | Server{% endblock %}
-{% block meta_description %}Fast, secure, deploy-anywhere technology for fast-moving companies. Whether you're already using Ubuntu or you're just thinking about making the switch, Canonical can help.{% endblock %}
+{% block title %}Ubuntu Server and hyperscale | Server{% endblock %}
+{% block meta_description %}Unlock the promise of new extreme low-energy server technology{% endblock %}
+{% block meta_keywords %}hyperscale, scale out, hyperdense, Ubuntu server, ARM, server farm, low cost computing, low power computing{% endblock meta_keywords %}
+
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Server" page_title="Hyperscale"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Server" page_title="Hyperscale"  %}
 {% endblock second_level_nav_items %}
 
 {% block header %}
@@ -86,7 +88,7 @@ <h3>Workload-level orchestration with Juju</h3>
 	</div>
 	<div class="six-col last-col">
 		<h3>Bare-metal provisioning with MAAS</h3>
-		<p>With their unique architecture, hyperscale servers need to be provisioned through scalable automation. Canonical’s <strong>Metal As A Service (MAAS)</strong> addresses the problem of deploying hundreds of OS instances to a cluster of nodes:</p>
+		<p>With their unique architecture, hyperscale servers need to be provisioned through scalable automation. Canonical&rsquo;s Metal as a Service (MAAS) addresses the problem of deploying hundreds of OS instances to a cluster of nodes:</p>
 		<p>MAAS provides a flexible mechanism to automatically detect, provision and configure individual nodes with Ubuntu server without any complex or manual configuration </p>
 		<p><a href="/cloud/orchestration/maas">Learn more about MAAS&nbsp;&rsaquo;</a></p>
 	</div>
@@ -98,7 +100,7 @@ <h3>Deployment-time workload acceleration</h3>
 	</div>
 	<div class="box box-highlight four-col">
 		<h3>Landscape</h3>
-		<p>Ubuntu's systems management tool supports management of ARM devices on equal footing alongside your x86 infrastructure.</p>
+		<p>Ubuntu&rsquo;s systems management tool supports management of ARM devices on equal footing alongside your x86 infrastructure.</p>
 	</div>
 	<div class="box box-highlight four-col last-col ">
 		<h3>x86 and ARM support</h3>
@@ -131,31 +133,38 @@ <h3>End users</h3>
 <div class="row equal-height">
 	<h2>Hyperscale partners</h2>
 	<ul class="partner-list no-bullets">
-		<li class="four-col box">
+		<li class="six-col box">
 			<div class="partner-logo text-center">
 				<img src="{{ STATIC_URL }}img/partners/partners-logo-hp.png" width="94" height="94" alt="" />
 			</div>
 			<p>Canonical has been involved in the development of Moonshot, HP&rsquo;s hyperscale platform, from its inception. Ubuntu is the only OS that supports the full range of HP Moonshot x86 and ARM Systems, announced by HP in April 2013, providing scale out innovation at speed.</p>
-			<p><a href="/partners/hp/moonshot">Learn more&nbsp;&rsaquo;</a></p>
+			<p><a href="http://partners.ubuntu.com/hp" class="external">Learn more</a></p>
 		</li>
-		<li class="box four-col">
+		<li class="box six-col last-col">
 			<div class="partner-logo text-center">
-				<img src="{{ STATIC_URL }}img/partners/partners-logo-arm.png" width="150" height="45" alt="" />
+				<img src="{{ STATIC_URL }}img/partners/partners-logo-arm.png" width="150" height="45" alt="ARM logo" />
 			</div>
 			<p>ARM and Canonical have worked in close collaboration for a number of years to ensure that datacentres running advanced workloads such as distributed data processing or cloud infrastructure, run best on Ubuntu.</p>
-			<p><a href="/partners/arm">Learn more&nbsp;&rsaquo;</a></p>
+			<p><a href="http://partners.ubuntu.com/arm" class="external">Learn more</a></p>
 		</li>
-		<li class="box four-col last-col">
+		<li class="box six-col">
 			<div class="partner-logo text-center">
-				<img src="{{ STATIC_URL }}img/partners/partners-logo-cavium.png" width="150" height="34" alt="" />
+				<img src="{{ STATIC_URL }}img/partners/partners-logo-cavium.png" width="150" height="34" alt="Cavium logo" />
 			</div>
 			<p>Cavium is a provider of highly integrated semiconductor processors that enable intelligent networking, communications, storage, video and security applications within enterprise, datacentre, broadband/consumer, and access and service provider equipment.</p>
 			<p><a href="http://www.cavium.com">Learn more&nbsp;&rsaquo;</a></p>
 		</li>
+		<li class="box six-col last-col">
+			<div class="partner-logo text-center">
+				<img src="{{ STATIC_URL }}img/partners/partners-logo-apm.svg" width="150" alt="Applied Micro Circuits Corporation logo" />
+			</div>
+			<p>Applied Micro Circuits Corporation is a global leader in computing and connectivity solutions for next-generation cloud infrastructure and data centers. AppliedMicro delivers silicon solutions that dramatically lower total cost of ownership.</p>
+			<p><a href="https://www.apm.com/products/data-center/x-gene-family/" class="external">Learn more</a></p>
+		</li>
 	</ul>
 </div>
 
-{% include "_includes/_ubuntu_advantage_whats_inlcuded.html" %}
+{% include "shared/_ubuntu_advantage_whats_inlcuded.html" %}
 
 <div class="row no-border">
 	<div class="twelve-col clearfix">
diff --git a/templates/server/index.html b/templates/server/index.html
index cdc6136af0d..331cd830727 100755
--- a/templates/server/index.html
+++ b/templates/server/index.html
@@ -5,7 +5,7 @@
 {% block extra_body_class %}server-home{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Server" page_title="Overview"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Server" page_title="Overview"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
@@ -42,11 +42,24 @@ <h3>Ubuntu OpenStack</h3>
 		</ul>
 	</div>
 	<div class="eleven-col">
-		<p><a href="http://insights.ubuntu.com/resources/factsheets/whats-new-in-ubuntu-server-14-04-lts">Read more in the PDF guide, &lsquo;What&rsquo;s new in Ubuntu Server 14.04?&rsquo;&nbsp;&rsaquo;</a></p>
+		<p><a href="http://insights.ubuntu.com/resources/factsheets/whats-new-in-ubuntu-server-14-04-lts">Read more in the factsheet&nbsp;&rsaquo;</a></p>
 	</div>
 </div>
 
-{% include "_includes/_moonshot_promo.html" %}
+<div class="row">
+	<h2>What&rsquo;s new in 15.04</h2>
+		<ul class="list-canonical twelve-col">
+      <li class="six-col">LXD - The Linux container hypervisor</li>
+      <li class="six-col last-col">Includes Docker v1.5</li>
+      <li class="six-col">Initial release of snappy Ubuntu Core</li>
+      <li class="six-col last-col">Moved to systemd as default init system</li>
+      <li class="six-col">Linux 3.19 kernel with DPDK support for high performance network traffic handling</li>
+      <li class="six-col last-col">Database updates: MySQL 5.6, Percona XtraDB 5.6 and MariaDB 10.0.17</li>
+      <li class="six-col">OpenvSwitch 2.3.x for improved virtual network capability</li>
+		</ul>
+</div>
+
+{% include "shared/_moonshot_promo.html" %}
 
 <div class="row row-image-centered">
 	<div class="eight-col">
@@ -132,7 +145,7 @@ <h3>Stay up-to-date with regular updates and upgrades</h3>
 
 <div class="row row-support-systems-management row-image-centered">
 	<div class="eight-col">
-		<h2 id="smarter-systems-management">Landscape &mdash; Support and systems management</h2>
+		<h2 id="smarter-systems-management">Landscape &mdash; support and systems management</h2>
 		<p>The Ubuntu Advantage service programme provides fast problem resolution, direct access to Ubuntu experts and efficient administration with the Ubuntu systems management package, Landscape.</p>
 		<p>Landscape enables you to automate updates and control physical, virtual and cloud servers from a single interface. It&rsquo;s easy to set up and easy to use, giving you the power to manage thousands of machines as easily as you can manage one.</p>
 		<p><a href="/server/management">Learn more about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
@@ -216,7 +229,7 @@ <h2 id="the-fast-track-to-virtualisation">The fast track to virtualisation</h2>
 	</div><!-- /.six-col -->
 	<span><img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-startfirst-darkaubergine.svg" width="153" height="153" alt="" /></span>
 </div><!-- /.row -->
-{% include "_includes/_enterprise_blog.html" %}
-{% include "_includes/_community.html" %}
+{% include "shared/_enterprise_blog.html" %}
+{% include "shared/_community.html" %}
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
diff --git a/templates/server/management.html b/templates/server/management.html
index 4a8dfad8ecf..f58ee6d4841 100755
--- a/templates/server/management.html
+++ b/templates/server/management.html
@@ -4,7 +4,7 @@
 {% block extra_body_class %}server-server-management{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Server" page_title="Server management"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Server" page_title="Server management"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
@@ -141,13 +141,13 @@ <h3>Advanced</h3>
 <p><a href="/management/contact-us">Contact us about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
 </div><!-- /.row -->
 
-{% include "_includes/_ubuntu_advantage_whats_inlcuded.html" %}
+{% include "shared/_ubuntu_advantage_whats_inlcuded.html" %}
 
 <div class="row row-community row-image-centered no-border no-margin-bottom">
-{% include "_includes/_ubuntu_advantage_community.html" %}
+{% include "shared/_ubuntu_advantage_community.html" %}
 </div><!-- /.row -->
 
-{% include "_includes/_live_chat.html" %}
+{% include "shared/_live_chat.html" %}
 
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
diff --git a/templates/server/_includes/_contextual_footer.html b/templates/server/shared/_contextual_footer.html
similarity index 100%
rename from templates/server/_includes/_contextual_footer.html
rename to templates/server/shared/_contextual_footer.html
diff --git a/templates/server/thank-you.html b/templates/server/thank-you.html
index 5b935148218..82fae67f0c6 100755
--- a/templates/server/thank-you.html
+++ b/templates/server/thank-you.html
@@ -3,10 +3,10 @@
 {% block title %}Thank you{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Server" subsection_title="Contact-us" page_title="Thank you"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Server" subsection_title="Contact-us" page_title="Thank you"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
-{% include "_includes/_thank_you.html" with thanks_context="your interest in Ubuntu Server" %}
+{% include "shared/_thank_you.html" with thanks_context="your interest in Ubuntu Server" %}
 
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/shared/_community.html b/templates/shared/_community.html
new file mode 100755
index 00000000000..b59d81d0ee6
--- /dev/null
+++ b/templates/shared/_community.html
@@ -0,0 +1,27 @@
+<div class="row row-community equal-height {% if level_1 == 'desktop' and not level_2 %} no-border{% endif %}">
+{% if level_1 == 'desktop' and not level_2 %}
+	<div class="six-col">
+		<h2 id="a-thriving-community">A thriving community</h2>
+		<p>Want to talk to other Ubuntu users straightaway? Share ideas and get advice and help from our large, active community of IT professionals. As a community, we set high standards for friendliness and tolerance, we welcome your questions and contributions!</p>
+	</div>
+	<div class="three-col box where-to-find-us smaller">
+		<h3>Where to find us</h3>
+		<ul class="list">
+			<li class="ask-ubuntu"><a href="http://askubuntu.com">Ask Ubuntu</a></li>
+			<li class="mailing-lists"><a href="https://lists.ubuntu.com/">Mailing lists</a></li>
+			<li class="ubuntu-blog"><a href="http://planet.ubuntu.com/">Ubuntu blog</a></li>
+			<li class="ask-ubuntu"><a href="http://ubuntuforums.org">Ubuntu Forums</a></li>
+		</ul>
+	</div>
+{% else %}
+	<div class="nine-col">
+		<h2 id="a-thriving-community">A thriving community</h2>
+		<p>Exchange expertise and ideas with thousands of other IT professionals</p>
+		<p>Want to talk to other Ubuntu users straightaway? Share ideas and get advice and help from our large, active community of IT professionals. As a community, we set high standards for friendliness and tolerance, we welcome your questions and contributions!</p>
+		<p><a href="http://community.ubuntu.com/">Join the community&nbsp;&rsaquo;</a></p>
+	</div>
+{% endif %}
+	<div class="three-col last-col align-center align-vertically">
+		<span><img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-community-orange.svg" alt="" width="136" height="136" /></span>
+	</div>
+</div>
diff --git a/templates/shared/_digesto.html b/templates/shared/_digesto.html
new file mode 100644
index 00000000000..eea9d927b46
--- /dev/null
+++ b/templates/shared/_digesto.html
@@ -0,0 +1,35 @@
+<div class="box-digest">    
+  <form class='mktoForm mktoNoJS' action='https://pages.canonical.com/index.php/leadCapture/save' method='post'>
+    <h3>Sign up for email updates</h3>
+    <ul class='mktoFormRow clearfix'>
+      <li class='mktoFormCol'>
+        <label class="off-left mktoLabel" for='Email'>Your email</label>
+        <input type="text" placeholder="Your email" class='mktoField mktoTextField' name='Email' id='Email' required>
+      </li>
+    
+      <li class="mktField mktLblRight">
+        <span class="mktInput mktLblRight"><input class="mktFormCheckbox" name="NewsletterOpt-In" id="NewsletterOpt-In" value="yes" type="checkbox" required><label>I would like to receive occasional updates from Canonical by email.</label>&nbsp;<span class="mktFormMsg"></span></span>
+      </li>
+
+      <li>
+        <span style="display:none;"><input type="text" name="_marketo_comments" value=""></span>
+        <span class='mktoButtonWrap'><button type='submit' class='mktoButton'>Subscribe now</button></span>
+      {% if level_1 == 'cloud' %}
+        <input type="hidden" id="insightscloudserver" name="insightscloudserver" value="yes">{% endif %}
+      {% if level_1 == 'things' %}
+        <input type="hidden" id="insightsiot" name="insightsiot" value="yes">{% endif %}
+        <input value="1959" class="mktoField mktoFieldDescriptor" name="lpId" type="hidden">
+        <input value="30" class="mktoField mktoFieldDescriptor" name="subId" type="hidden">
+        <input type="hidden" name="lpurl" value="https://pages.canonical.com/Insights-Subscription_Insights-Subscription-test.html?cr={creative}&amp;kw={keyword}" />
+        <input value="1212" class="mktoField mktoFieldDescriptor" name="formid" type="hidden">
+        <input type="hidden" name="ret" value="http://ubuntu.com/{{ level_1 }}/newsletter-thank-you" />
+        <input value="066-EOV-335" class="mktoField mktoFieldDescriptor" name="munchkinId" type="hidden"> 
+        <input type="hidden" name="kw" value=""/>
+        <input type="hidden" name="cr" value=""/>
+        <input type="hidden" name="searchstr" value=""/>
+        <input type="hidden" name="_mkt_disp" value="return"/>
+        <input type="hidden" name="_mkt_trk" value=""/>
+      </li>
+    </ul>
+  </form>  
+</div>
\ No newline at end of file
diff --git a/templates/_includes/_edge_promo.html b/templates/shared/_edge_promo.html
similarity index 100%
rename from templates/_includes/_edge_promo.html
rename to templates/shared/_edge_promo.html
diff --git a/templates/_includes/_enterprise_blog.html b/templates/shared/_enterprise_blog.html
similarity index 100%
rename from templates/_includes/_enterprise_blog.html
rename to templates/shared/_enterprise_blog.html
diff --git a/templates/_includes/_explore_features.html b/templates/shared/_explore_features.html
similarity index 100%
rename from templates/_includes/_explore_features.html
rename to templates/shared/_explore_features.html
diff --git a/templates/_includes/_further_reading.html b/templates/shared/_further_reading.html
similarity index 100%
rename from templates/_includes/_further_reading.html
rename to templates/shared/_further_reading.html
diff --git a/templates/_includes/_live_chat.html b/templates/shared/_live_chat.html
similarity index 100%
rename from templates/_includes/_live_chat.html
rename to templates/shared/_live_chat.html
diff --git a/templates/_includes/_moonshot_promo.html b/templates/shared/_moonshot_promo.html
similarity index 100%
rename from templates/_includes/_moonshot_promo.html
rename to templates/shared/_moonshot_promo.html
diff --git a/templates/_includes/_more_features.html b/templates/shared/_more_features.html
similarity index 91%
rename from templates/_includes/_more_features.html
rename to templates/shared/_more_features.html
index 38c4f3a55f5..5607ad8d76e 100755
--- a/templates/_includes/_more_features.html
+++ b/templates/shared/_more_features.html
@@ -1,5 +1,5 @@
 <div class="row-box-alt row-do-more no-border equal-height no-margin-bottom">
-{% include "_includes/_explore_features.html" %}
+{% include "shared/_explore_features.html" %}
 		<div class="box box-padded box-get-ubuntu six-col last-col">
 			<h3>Get Ubuntu</h3>
 			<div>
diff --git a/templates/_includes/_newsletter_signup.html b/templates/shared/_newsletter_signup.html
similarity index 100%
rename from templates/_includes/_newsletter_signup.html
rename to templates/shared/_newsletter_signup.html
diff --git a/templates/shared/_newsletter_thank_you.html b/templates/shared/_newsletter_thank_you.html
new file mode 100644
index 00000000000..c099a88816e
--- /dev/null
+++ b/templates/shared/_newsletter_thank_you.html
@@ -0,0 +1,11 @@
+<div class="row row-hero no-border row-image-centered">
+	<div class="thank-you eight-col">
+    <h1>Thank you for subscribing!</h1>
+    <p class="intro">You will begin receiving emails as new content is posted. You may unsubscribe any time by clicking the link in the email.</p>
+	</div>
+	<span>
+		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-thankyou-midaubergine.svg" alt="smile" width="200" height="200" />
+	</span>
+</div><!-- /.row-hero -->
+
+{% include "shared/_thank_you_footer.html" %}	
\ No newline at end of file
diff --git a/templates/_includes/_next_steps.html b/templates/shared/_next_steps.html
similarity index 100%
rename from templates/_includes/_next_steps.html
rename to templates/shared/_next_steps.html
diff --git a/templates/_includes/_ready_to_talk.html b/templates/shared/_ready_to_talk.html
similarity index 100%
rename from templates/_includes/_ready_to_talk.html
rename to templates/shared/_ready_to_talk.html
diff --git a/templates/_includes/_share_this.html b/templates/shared/_share_this.html
similarity index 100%
rename from templates/_includes/_share_this.html
rename to templates/shared/_share_this.html
diff --git a/templates/_includes/_thank_you.html b/templates/shared/_thank_you.html
similarity index 89%
rename from templates/_includes/_thank_you.html
rename to templates/shared/_thank_you.html
index 246fbeb8b8a..f6d8d4e9710 100644
--- a/templates/_includes/_thank_you.html
+++ b/templates/shared/_thank_you.html
@@ -8,4 +8,4 @@ <h1>Thank you for {{ thanks_context }}</h1>
 	</span>
 </div><!-- /.row-hero -->
 
-{% include "_includes/_thank_you_footer.html" %}	
\ No newline at end of file
+{% include "shared/_thank_you_footer.html" %}	
\ No newline at end of file
diff --git a/templates/_includes/_thank_you_footer.html b/templates/shared/_thank_you_footer.html
similarity index 100%
rename from templates/_includes/_thank_you_footer.html
rename to templates/shared/_thank_you_footer.html
diff --git a/templates/_includes/_ubuntu_advantage_community.html b/templates/shared/_ubuntu_advantage_community.html
similarity index 100%
rename from templates/_includes/_ubuntu_advantage_community.html
rename to templates/shared/_ubuntu_advantage_community.html
diff --git a/templates/shared/_ubuntu_advantage_whats_inlcuded.html b/templates/shared/_ubuntu_advantage_whats_inlcuded.html
new file mode 100755
index 00000000000..a4c87085b6b
--- /dev/null
+++ b/templates/shared/_ubuntu_advantage_whats_inlcuded.html
@@ -0,0 +1,48 @@
+<div class="row{% if level_1 != 'management' %} row-grey{% endif %} row-ubuntu-advantage-promo">
+	<div class="eight-col">
+		<h2>Ubuntu Advantage: what&rsquo;s included?</h2>
+		<h3>Systems management: Landscape</h3>
+		<p>With the Landscape systems management tool, you can automate updates and manage physical, virtual and cloud-based systems from a single interface. It's easy to set up, easy to use and requires no special hardware. It features:</p>
+		<div class="combined-list clearfix eight-col">
+				<ul class="list-canonical four-col">
+					<li>Management at scale</li>
+					<li>Deploy or rollback security updates</li>
+					<li class="last-item">Compliance reports</li>
+				</ul>
+				<ul class="list-canonical four-col last-col">
+					<li>Role-based access</li>
+					<li class="last-item">Informative monitoring</li>
+				</ul>
+		</div><!-- /.combined-list -->
+		<p><a href="/management/landscape-features">Learn more about Landscape&nbsp;&rsaquo;</a></p>
+	</div><!-- /.eight-col -->
+	<div class="four-col last-col no-margin-bottom priority-0">
+		<img src="{{ STATIC_URL }}img/management/image-whats-included.png" alt="" class="pull-top touch-border pull-right"/>
+	</div><!-- /.four-col -->
+</div><!-- /.row -->
+{% if level_2 != 'cloud' %}
+<div class="row{% if level_1 != 'management' %} row-grey{% endif %}">
+	<div class="twelve-col vertical-divider equal-height smaller">
+		<div class="four-col">
+			<h3>24/7 support</h3>
+			<p>The Support and Technical Services team provides around-the-clock coverage for Ubuntu deployments all over the world. Telephone support gives you access to engineers with first-hand experience of your issues, while the online portal lets you track the progress of cases in real time.</p>
+		</div><!-- /.four-col -->
+		<div class="four-col">
+			<h3>Technical library</h3>
+			<p>Exclusive to Ubuntu Advantage subscribers, the Canonical Knowledge Base is an online library of articles on technical issues including security, migration and networking.</p>
+		</div><!-- /.four-col -->
+		<div class="four-col last-col no-margin-bottom">
+		{% if level_1 == 'management' %}
+		    <h3>Customer login</h3>
+            <p>Already a customer? Access the support portal or Canonical’s hosted Landscape service.</p>
+            <p><a href="https://login.ubuntu.com/+saml/init/salesforce/500/o">Support portal login&nbsp;&rsaquo;</a></p>
+            <p><a href="https://landscape.canonical.com/">Landscape login&nbsp;&rsaquo;</a></p>
+        {% else %}
+			<h3>Flexible deployment</h3>
+			<p>You can use Landscape hosted as a service or, install Landscape Dedicated Server on your hardware and enjoy the same functionality of Landscape's SaaS edition, but within the control of your own security perimeter.</p>
+        {% endif %}
+		</div><!-- /.four-col -->
+	</div><!-- /.twelve-col -->
+	<p><a href="/management/ubuntu-advantage">Learn more about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
+</div><!-- /.row -->
+{% endif %}
\ No newline at end of file
diff --git a/templates/_includes/_webinar_promo.html b/templates/shared/_webinar_promo.html
similarity index 100%
rename from templates/_includes/_webinar_promo.html
rename to templates/shared/_webinar_promo.html
diff --git a/templates/support/_base_support.html b/templates/support/_base_support.html
index 614baf51868..e23f568bbef 100755
--- a/templates/support/_base_support.html
+++ b/templates/support/_base_support.html
@@ -1,6 +1,6 @@
-{% extends "_base/base.html" %}
+{% extends "templates/base.html" %}
 
 {% block outer_content %}
     {% block content %}{% endblock %}
-		{% include "_base/_contextual_footer.html" %}
+		{% include "templates/_contextual_footer.html" %}
 {% endblock %}
diff --git a/templates/support/index.html b/templates/support/index.html
index 0f6627f78d6..ffc980fd2ec 100755
--- a/templates/support/index.html
+++ b/templates/support/index.html
@@ -3,7 +3,7 @@
 {% block title %}Support{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Support" page_title="Overview" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Support" page_title="Overview" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
@@ -14,20 +14,21 @@ <h1>Support</h1>
 
 <div class="row equal-height no-border">
 	<div class="six-col box">
+		<h3><a href="/management">Enterprise support&nbsp;&rsaquo;</a></h3>
+		<p>24/7 Enterprise support from Canonical, the company behind Ubuntu. Server and private cloud enterprise customers include: Bloomberg, Ericsson, Orange, Ebay, Wells Fargo, and Continental.</p>
+	</div><!-- /.six-col -->
+	<div class="six-col box last-col">
 		<h3><a href="https://help.ubuntu.com/" class="external">Access free documentation</a></h3>
 		<p>If you&rsquo;re stuck on a problem, someone else has probably encountered it too. Take a look at the <a href="https://help.ubuntu.com" class="external">official documentation</a>.</p>
 	</div><!-- /.six-col -->
-	<div class="six-col box last-col">
+	<div class="six-col box">
 		<h3><a href="https://answers.launchpad.net/ubuntu" class="external">Technical answers system</a></h3>
 		<p>Use Launchpad to add your support question. Keep your query active until you get an answer or browse and search historical questions and answers.</p>
 	</div><!-- /.six-col -->
-	<div class="six-col box">
-		<h3><a href="/management">Buy professional support services</a></h3>
-		<p>Canonical&rsquo;s support engineers understand how important your IT systems are. Support with our systems management tool Landscape, is available to suit all levels of demand.</p>
-	</div><!-- /.six-col -->
 	<div class="six-col box last-col">
 		<h3><a href="http://community.ubuntu.com/help-information/" class="external">Get free community support</a></h3>
-		<p>Speak with the Ubuntu Community directly using our <a href="https://help.ubuntu.com/community/InternetRelayChat" class="external">Internet relay chat (IRC) channel</a>.</p>
+		<p><a href="https://askubuntu.com/">Ask Ubuntu</a> and <a href="http://ubuntuforums.org/">Ubuntu Forums</a> are great sources of answers to common questions about installing, troubleshooting and optimizing Ubuntu. And if you want to speak with the Ubuntu Community directly, try one of these <a href="https://wiki.ubuntu.com/IRC/ChannelList">IRC channels</a>.</p>
+
 	</div><!-- /.six-col -->
 </div><!-- / .row -->
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/about/_includes/_contextual_footer.html b/templates/support/shared/_contextual_footer.html
similarity index 59%
rename from templates/about/_includes/_contextual_footer.html
rename to templates/support/shared/_contextual_footer.html
index fd593516557..3c619d9653b 100755
--- a/templates/about/_includes/_contextual_footer.html
+++ b/templates/support/shared/_contextual_footer.html
@@ -1,4 +1,4 @@
 		<div class="feature-four three-col last-col">
 			<h3>Further reading</h3>
-			{% include "_base/_further_reading_links.html" %}
+			{% include "templates/_further_reading_links.html" %}
 		</div>
diff --git a/templates/tablet/app-ecosystem.html b/templates/tablet/app-ecosystem.html
index 83049e8b593..ae46f45a133 100755
--- a/templates/tablet/app-ecosystem.html
+++ b/templates/tablet/app-ecosystem.html
@@ -6,7 +6,7 @@
 {% block meta_description %}Ubuntu comes to the phone and tablet with a ready-made app ecosystem. Thanks to its web APIs, any web property can be installed as an app for mobile devices, with its own icon and access to system services so that  to the user it appears just like a native app. Any HTML5 app can be easily ported, while native apps that use the full power of the hardware can be developed using the Ubuntu SDK. {% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Tablet" page_title="App ecosystem"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Tablet" page_title="App ecosystem"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/tablet/base_tablet.html b/templates/tablet/base_tablet.html
index 000f4d96dd3..c0fe09cc26d 100755
--- a/templates/tablet/base_tablet.html
+++ b/templates/tablet/base_tablet.html
@@ -1,4 +1,4 @@
-{% extends "_base/base.html" %}
+{% extends "templates/base.html" %}
 
 {% block meta_keywords %}ubuntu, tablet, touch, touchscreen, mobile, Linux, Unity, OS, operating system, open source, Android, iOS, iPad, user, interface, UI, GUI, thumb, side, stage, web, app, developer, ISV, SDK, HTML5, OpenGL, native, store, software, centre, OEM, manufacturer, content provider, partner{% endblock %}
 {% block meta_description %}Ubuntu is the perfect operating system for manufacturers who want to build tablets for either the consumer or enterprise market. With a unique new interface that, by allowing two apps to share the screen side-by-side, delivers the first true multitasking experience on a tablet, Ubuntu represents a remarkable opportunity for OEMs, content providers and app developers.{% endblock %}
@@ -11,5 +11,5 @@
 
 {% block outer_content %}
     {% block content %}{% endblock %}
-		{% include "_base/_contextual_footer.html" %}
+		{% include "templates/_contextual_footer.html" %}
 {% endblock %}
diff --git a/templates/tablet/contact-us.html b/templates/tablet/contact-us.html
deleted file mode 100755
index d4d35f50369..00000000000
--- a/templates/tablet/contact-us.html
+++ /dev/null
@@ -1,111 +0,0 @@
-{% extends "tablet/base_tablet.html" %}
-
-{% block title %}Contact us | Ubuntu for tablets{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Tablet" page_title="Get in touch" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-border no-margin">
-	<h1>Become a partner today</h1>
-	<h2>Ubuntu is available now to partners launching tablets<br />in the first half of 2014.</h2>
-</div>
-<div class="row no-border">
-	<div class="eight-col">
-		<h3>OEM partner, app developer or content partner</h3>
-		<p>If you&rsquo;d like to help make this happen, please get in touch to arrange a meeting.</p>
-			<script type="text/javascript">
-			function fieldValidate(field) {
-			  /* call Mkto.setError(field, message) and return false to mark a field value invalid */
-			  /* return 'skip' to bypass the built-in validations */
-			  return true;
-			}
-			function getRequiredFieldMessage(domElement, label) {
-			  return "This field is required";
-			}
-			function getTelephoneInvalidMessage(domElement, label) {
-			  return "Please enter a valid telephone number";
-			}
-			function getEmailInvalidMessage(domElement, label) {
-			  return "Please enter a valid email address";
-			}
-			</script>
-		<form class="lpeRegForm formNotEmpty" method="post" enctype="application/x-www-form-urlencoded" action="https://app-g.marketo.com/index.php/leadCapture/save" id="mktForm_1083" name="mktForm_1083">
-			<fieldset class="fieldset-1">
-				<h3>Contact information</h3>
-				<ul class="mktLblLeft">
-					<li class='mktFormReq mktField' ><label for="FirstName">First name: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormString mktFReq' name="FirstName" id="FirstName" type='text' value=""  maxlength='255' tabIndex='1' required /><span class='mktFormMsg'></span></span></li>
-					<li class='mktFormReq mktField' ><label for="LastName">Last name: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormString mktFReq' name="LastName" id="LastName" type='text' value=""  maxlength='255' tabIndex='2' required /><span class='mktFormMsg'></span></span></li>
-					<li class='mktFormReq mktField' ><label for="Company">Company name: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormString mktFReq' name="Company" id="Company" type='text' value=""  maxlength='255' tabIndex='3' required /><span class='mktFormMsg'></span></span></li>
-					<li  class='mktFormReq mktField' ><label>Company website: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormUrl mktFReq' name="Website" id="Website" type='text' value=""  maxlength='255' tabIndex='4' required /><span class='mktFormMsg'></span></span></li>
-
-					<li class='mktFormReq mktField' ><label for="Email">Email address: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormEmail mktFReq' name="Email" id="Email" type='email' value=""  maxlength='255' tabIndex='5' required /><span class='mktFormMsg'></span></span></li>
-					<li class='mktFormReq mktField'><label>Phone number: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormPhone mktFReq' name="Phone" id="Phone" value="" maxlength="255" tabindex="6" type="tel" required><span class="mktFormMsg"></span></span></li>
-				</ul>
-			</fieldset>
-			<fieldset class="fieldset-2">
-				<h3>Your interests</h3>
-				<ul class='mktLblLeft'>
-					<li  class='mktField' ><label>What influence do you have over launching a phone in the next 12 to 18 months?</label><span class='mktInput'><select class='mktFormSelect' name="Level_of_Influence__c" id="Level_of_Influence__c" size='1'  tabIndex='7'><option value='Select level of influence' selected='selected'>Select level of influence</option><option value='Decision Maker'>Decision maker</option><option value='Influencer'>Influencer</option><option value='Little/none'>Little/none</option></select><span class='mktFormMsg'></span></span></li>
-					<li class="mktFormReq mktField" ><label for="Why_Mobile__c">What is your main interest in Ubuntu for phones? <span>*</span></label><span class="mktInput"><select class="mktFormSelect mktFReq" name="Why_Mobile__c" id="Why_Mobile__c" size="1" tabindex="8" required><option value="" selected="selected">Select your interest</option><option value="OEM">Designing/making a phone</option><option value="Telco">Retailing/distributing a phone</option><option value="Developer">Developing apps for Ubuntu mobile</option><option value="In-house Applications Developer">Developing in-house applications</option><option value="Community">Contributing to the development of Ubuntu mobile</option><option value="Content">Delivering content via the Ubuntu devices</option><option value="Consumer">Personal use of Ubuntu on your phone</option></select><span class="mktFormMsg"></span></span></li>
-					<li class='mktFormReg mktField' ><label for="Comments_from_lead__c">Please share more: <span>*</span></label><span class='mktInput'><textarea class='mktFormTextarea mktFormTextarea mktFReq' name="Comments_from_lead__c" id="Comments_from_lead__c" cols='20' rows='5' tabIndex='10'></textarea><span class='mktFormMsg'></span></span></li>
-				</ul>
-			</fieldset>
-			<fieldset class="fieldset-3">
-				<h3>Your organisation</h3>
-				<ul class="mktLblLeft">
-					<li class='mktFormReq mktField' ><label for="Country">Country: <span>*</span></label><span class="mktInput"><select class='mktFormSelect mktFReq' name="Country" id="Country" size='1'  tabIndex='11' required><option value='' selected='selected'>Select country</option><option value='AF'>Afghanistan</option><option value='AX'>脜land Islands</option><option value='AL'>Albania</option><option value='DZ'>Algeria</option><option value='AS'>American Samoa</option><option value='AD'>Andorra</option><option value='AO'>Angola</option><option value='AI'>Anguilla</option><option value='AQ'>Antarctica</option><option value='AG'>Antigua and Barbuda</option><option value='AR'>Argentina</option><option value='AM'>Armenia</option><option value='AW'>Aruba</option><option value='AU'>Australia</option><option value='AT'>Austria</option><option value='AZ'>Azerbaijan</option><option value='BS'>Bahamas</option><option value='BH'>Bahrain</option><option value='BD'>Bangladesh</option><option value='BB'>Barbados</option><option value='BY'>Belarus</option><option value='BE'>Belgium</option><option value='BZ'>Belize</option><option value='BJ'>Benin</option><option value='BM'>Bermuda</option><option value='BT'>Bhutan</option><option value='BO'>Bolivia</option><option value='BA'>Bosnia and Herzegovina</option><option value='BW'>Botswana</option><option value='BV'>Bouvet Island</option><option value='BR'>Brazil</option><option value='IO'>British Indian Ocean Territory</option><option value='BN'>Brunei Darussalam</option><option value='BG'>Bulgaria</option><option value='BF'>Burkina Faso</option><option value='BI'>Burundi</option><option value='KH'>Cambodia</option><option value='CM'>Cameroon</option><option value='CA'>Canada</option><option value='CV'>Cape Verde</option><option value='KY'>Cayman Islands</option><option value='CF'>Central African Republic</option><option value='TD'>Chad</option><option value='CL'>Chile</option><option value='CN'>China</option><option value='CX'>Christmas Island</option><option value='CC'>Cocos (Keeling) Islands</option><option value='CO'>Colombia</option><option value='KM'>Comoros</option><option value='CG'>Congo</option><option value='CD'>Congo (The Democratic Republic of the)</option><option value='CK'>Cook Islands</option><option value='CR'>Costa Rica</option><option value='CI'>C么te D&#039;Ivoire</option><option value='HR'>Croatia</option><option value='CU'>Cuba</option><option value='CY'>Cyprus</option><option value='CZ'>Czech Republic</option><option value='DK'>Denmark</option><option value='DJ'>Djibouti</option><option value='DM'>Dominica</option><option value='DO'>Dominican Republic</option><option value='EC'>Ecuador</option><option value='EG'>Egypt</option><option value='SV'>El Salvador</option><option value='GQ'>Equatorial Guinea</option><option value='ER'>Eritrea</option><option value='EE'>Estonia</option><option value='ET'>Ethiopia</option><option value='FK'>Falkland Islands (Malvinas)</option><option value='FO'>Faroe Islands</option><option value='FJ'>Fiji</option><option value='FI'>Finland</option><option value='FR'>France</option><option value='GF'>French Guiana</option><option value='PF'>French Polynesia</option><option value='TF'>French Southern Territories</option><option value='GA'>Gabon</option><option value='GM'>Gambia</option><option value='GE'>Georgia</option><option value='DE'>Germany</option><option value='GH'>Ghana</option><option value='GI'>Gibraltar</option><option value='GR'>Greece</option><option value='GL'>Greenland</option><option value='GD'>Grenada</option><option value='GP'>Guadeloupe</option><option value='GU'>Guam</option><option value='GT'>Guatemala</option><option value='GG'>Guernsey</option><option value='GN'>Guinea</option><option value='GW'>Guinea-Bissau</option><option value='GY'>Guyana</option><option value='HT'>Haiti</option><option value='HM'>Heard Island and McDonald Islands</option><option value='HN'>Honduras</option><option value='HK'>Hong Kong</option><option value='HU'>Hungary</option><option value='IS'>Iceland</option><option value='IN'>India</option><option value='ID'>Indonesia</option><option value='IR'>Iran (Islamic Republic of)</option><option value='IQ'>Iraq</option><option value='IE'>Ireland</option><option value='IM'>Isle of Man</option><option value='IL'>Israel</option><option value='IT'>Italy</option><option value='JM'>Jamaica</option><option value='JP'>Japan</option><option value='JE'>Jersey</option><option value='JO'>Jordan</option><option value='KZ'>Kazakhstan</option><option value='KE'>Kenya</option><option value='KI'>Kiribati</option><option value='KP'>Korea (Democratic People&amp;amp;#039;s Republic of)</option><option value='KR'>Korea (Republic of)</option><option value='KW'>Kuwait</option><option value='KG'>Kyrgyzstan</option><option value='LA'>Lao People&amp;amp;#039;s Democratic Republic</option><option value='LV'>Latvia</option><option value='LB'>Lebanon</option><option value='LS'>Lesotho</option><option value='LR'>Liberia</option><option value='LY'>Libyan Arab Jamahiriya</option><option value='LI'>Liechtenstein</option><option value='LT'>Lithuania</option><option value='LU'>Luxembourg</option><option value='MO'>Macao</option><option value='MK'>Macedonia (The Former Yugoslav Republic of)</option><option value='MG'>Madagascar</option><option value='MW'>Malawi</option><option value='MY'>Malaysia</option><option value='MV'>Maldives</option><option value='ML'>Mali</option><option value='MT'>Malta</option><option value='MH'>Marshall Islands</option><option value='MQ'>Martinique</option><option value='MR'>Mauritania</option><option value='MU'>Mauritius</option><option value='YT'>Mayotte</option><option value='MX'>Mexico</option><option value='FM'>Micronesia (Federated States of)</option><option value='MD'>Moldova (Republic of)</option><option value='MC'>Monaco</option><option value='MN'>Mongolia</option><option value='ME'>Montenegro</option><option value='MS'>Montserrat</option><option value='MA'>Morocco</option><option value='MZ'>Mozambique</option><option value='MM'>Myanmar</option><option value='NA'>Namibia</option><option value='NR'>Nauru</option><option value='NP'>Nepal</option><option value='NL'>Netherlands</option><option value='AN'>Netherlands Antilles</option><option value='NC'>New Caledonia</option><option value='NZ'>New Zealand</option><option value='NI'>Nicaragua</option><option value='NE'>Niger</option><option value='NG'>Nigeria</option><option value='NU'>Niue</option><option value='NF'>Norfolk Island</option><option value='MP'>Northern Mariana Islands</option><option value='NO'>Norway</option><option value='OM'>Oman</option><option value='PK'>Pakistan</option><option value='PW'>Palau</option><option value='PS'>Palestinian Territory (Occupied)</option><option value='PA'>Panama</option><option value='PG'>Papua New Guinea</option><option value='PY'>Paraguay</option><option value='PE'>Peru</option><option value='PH'>Philippines</option><option value='PN'>Pitcairn</option><option value='PL'>Poland</option><option value='PT'>Portugal</option><option value='PR'>Puerto Rico</option><option value='QA'>Qatar</option><option value='RE'>R茅union</option><option value='RO'>Romania</option><option value='RU'>Russian Federation</option><option value='RW'>Rwanda</option><option value='BL'>Saint Barth茅lemy</option><option value='SH'>Saint Helena</option><option value='KN'>Saint Kitts and Nevis</option><option value='LC'>Saint Lucia</option><option value='MF'>Saint Martin</option><option value='PM'>Saint Pierre and Miquelon</option><option value='VC'>Saint Vincent and The Grenadines</option><option value='WS'>Samoa</option><option value='SM'>San Marino</option><option value='ST'>Sao Tome and Principe</option><option value='SA'>Saudi Arabia</option><option value='SN'>Senegal</option><option value='RS'>Serbia</option><option value='SC'>Seychelles</option><option value='SL'>Sierra Leone</option><option value='SG'>Singapore</option><option value='SK'>Slovakia</option><option value='SI'>Slovenia</option><option value='SB'>Solomon Islands</option><option value='SO'>Somalia</option><option value='ZA'>South Africa</option><option value='GS'>South Georgia and the South Sandwich Islands</option><option value='ES'>Spain</option><option value='LK'>Sri Lanka</option><option value='SD'>Sudan</option><option value='SR'>Suriname</option><option value='SJ'>Svalbard and Jan Mayen</option><option value='SZ'>Swaziland</option><option value='SE'>Sweden</option><option value='CH'>Switzerland</option><option value='SY'>Syrian Arab Republic</option><option value='TW'>Taiwan</option><option value='TJ'>Tajikistan</option><option value='TZ'>Tanzania</option><option value='TH'>Thailand</option><option value='TL'>Timor-Leste</option><option value='TG'>Togo</option><option value='TK'>Tokelau</option><option value='TO'>Tonga</option><option value='TT'>Trinidad and Tobago</option><option value='TN'>Tunisia</option><option value='TR'>Turkey</option><option value='TM'>Turkmenistan</option><option value='TC'>Turks and Caicos Islands</option><option value='TV'>Tuvalu</option><option value='UG'>Uganda</option><option value='UA'>Ukraine</option><option value='AE'>United Arab Emirates</option><option value='GB'>United Kingdom</option><option value='US'>United States</option><option value='UM'>United States Minor Outlying Islands</option><option value='UY'>Uruguay</option><option value='UZ'>Uzbekistan</option><option value='VU'>Vanuatu</option><option value='VA'>Vatican City State (Holy See)</option><option value='VE'>Venezuela (Bolivarian Republic of)</option><option value='VN'>Viet Nam</option><option value='VG'>Virgin Islands (British)</option><option value='VI'>Virgin Islands (U.S.)</option><option value='WF'>Wallis and Futuna</option><option value='EH'>Western Sahara</option><option value='YE'>Yemen</option><option value='ZM'>Zambia</option><option value='ZW'>Zimbabwe</option><option value=''></option></select><span class='mktFormMsg'></span></span> </li>
-					<li class='mktFormReq mktField' ><label for="State">State: <span>*</span></label><span class='mktInput'><select class='mktFormSelect mktFReq' name="State" id="State" size='1'  tabIndex='12' required><option value='SelectProvince' selected='selected'>Select Province</option><option value='AB'>Alberta</option><option value='BC'>British Columbia</option><option value='MB'>Manitoba</option><option value='NB'>New Brunswick</option><option value='NF'>Newfoundland</option><option value='NT'>Northwest Territories</option><option value='NS'>Nova Scotia</option><option value='NU'>Nunavut</option><option value='ON'>Ontario</option><option value='PE'>Prince Edward Island</option><option value='QC'>Quebec</option><option value='SK'>Saskatchewan</option><option value='YT'>Yukon Territory</option><option value='SelectState'>Select State</option><option value='AK'>Alaska</option><option value='AL'>Alabama</option><option value='AR'>Arkansas</option><option value='AZ'>Arizona</option><option value='CA'>California</option><option value='CO'>Colorado</option><option value='CT'>Connecticut</option><option value='DC'>District of Columbia</option><option value='DE'>Delaware</option><option value='FL'>Florida</option><option value='GA'>Georgia</option><option value='HI'>Hawaii</option><option value='IA'>Iowa</option><option value='ID'>Idaho</option><option value='IL'>Illinois</option><option value='IN'>Indiana</option><option value='KS'>Kansas</option><option value='KY'>Kentucky</option><option value='LA'>Louisiana</option><option value='MA'>Massachusetts</option><option value='MD'>Maryland</option><option value='ME'>Maine</option><option value='MI'>Michigan</option><option value='MN'>Minnesota</option><option value='MO'>Missouri</option><option value='MS'>Mississippi</option><option value='MT'>Montana</option><option value='NC'>North Carolina</option><option value='ND'>North Dakota</option><option value='NE'>Nebraska</option><option value='NH'>New Hampshire</option><option value='NJ'>New Jersey</option><option value='NM'>New Mexico</option><option value='NV'>Nevada</option><option value='NY'>New York</option><option value='OH'>Ohio</option><option value='OK'>Oklahoma</option><option value='OR'>Oregon</option><option value='PA'>Pennsylvania</option><option value='PR'>Puerto Rico</option><option value='RI'>Rhode Island</option><option value='SC'>South Carolina</option><option value='SD'>South Dakota</option><option value='TN'>Tennessee</option><option value='TX'>Texas</option><option value='UT'>Utah</option><option value='VA'>Virginia</option><option value='VT'>Vermont</option><option value='WA'>Washington</option><option value='WI'>Wisconsin</option><option value='WV'>West Virginia</option><option value='WY'>Wyoming</option><option value=''></option></select><span class='mktFormMsg'></span></span></li>
-					<li class='mktFormReq mktField' ><label for="Industry">Industry: <span>*</span></label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Industry" id="Industry" size='1'  tabIndex='13' required><option value='Select' selected='selected'>Select industry</option><option value='Mobile operator'>Mobile operator</option><option value='Phone manufacturer'>Phone manufacturer</option><option value='PC manufacturer'>PC manufacturer</option><option value='SOC vendor'>SOC vendor</option><option value='ODM'>ODM</option><option value='Software Development'>Software/app developer</option><option value='' disabled>------------</option><option value='Accountancy & Tax'>Accountancy &amp; tax</option><option value='Aerospace & Aviation'>Aerospace &amp; aviation</option><option value='Automotive'>Automotive</option><option value='Banking & Finance'>Banking &amp; Finance</option><option value='Business Consultancy'>Business consultancy</option><option value='Charity & Non-profit'>Charity &amp; non-profit</option><option value='Construction'>Construction</option><option value='Consumer Products'>Consumer products</option><option value='Consumer Services'>Consumer services</option><option value='Defence & Security'>Defence &amp; security</option><option value='Education & Training'>Education &amp; training</option><option value='Electronics'>Electronics</option><option value='Engineering'>Engineering</option><option value='Entertainment - media/music/broadcast'>Entertainment - media/music/broadcast</option><option value='Facilities, Property & Real Estate'>Facilities, property &amp; real estate</option><option value='Government'>Government</option><option value='Healthcare & Pharmaceuticals'>Healthcare &amp; pharmaceuticals</option><option value='HR & Recruitment'>HR &amp; Recruitment</option><option value='Information Technology'>Information technology</option><option value='Insurance'>Insurance</option><option value='Internet & New Media'>Internet &amp; new media</option><option value='Legal'>Legal</option><option value='Leisure, Travel & Hospitality'>Leisure, travel &amp; hospitality</option><option value='Manufacturer - Other'>Manufacturer - other</option><option value='Marketing, PR & Advertising'>Marketing, PR &amp; advertising</option><option value='Media - publishing or news'>Media - publishing or news</option><option value='Oil & Gas'>Oil &amp; gas</option><option value='Public Sector'>Public sector</option><option value='Retail & e-commerce'>Retail &amp; e-commerce</option><option value='Science & Environment'>Science &amp; environment</option><option value='Software Development'>Software development</option><option value='Supply Chain & Logistics'>Supply chain &amp; logistics</option><option value='Transportation &amp; Distribution'>Transportation &amp; distribution</option><option value='Utilities & Energy'>Utilities &amp; energy</option><option value='Other'>Other</option><option value='Not applicable (self)'>Not applicable (self)</option></select><span class='mktFormMsg'></span></span></li>
-					<li class='mktFormReq mktField' ><label for="Job_Role__c">Job role: <span>*</span></label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Job_Role__c" id="Job_Role__c" size='1'  tabIndex='14' required><option selected='selected'>Select job role</option><option value='Executive'>Executive</option><option value='Sales & marketing'>Sales &amp; marketing</option><option value='Product management'>Product management</option><option value='Purchasing'>Purchasing</option><option value='R&D'>R&amp;D</option><option value='' disabled>------------</option><option value='Business and Project Management'>Business and project management</option><option value='Database Development and Administration'>Database development and administration</option><option value='Education'>Education</option><option value='Enterprise Systems Analysis & Integration'>Enterprise systems analysis &amp; integration</option><option value='Home User'>Home user</option><option value='Network Design and Administration'>Network design and administration</option><option value='Owner/Self Employed'>Owner/Self employed</option><option value='Press and Communications'>Press and communications/Analyst</option><option value='Programming/Software Engineering'>Programming/Software engineering</option><option value='Smartphone User'>Smartphone user</option><option value='Technical Support'>Technical support</option><option value='Technical Writing'>Technical writing</option><option value='Ubuntu Enthusiast'>Ubuntu enthusiast</option><option value='Web Development and Administration'>Web development and administration</option></select><span class='mktFormMsg'></span></span></li>
-					<li class='mktFormReq mktField' ><label for="num_employees__c">Number of employees: <span>*</span></label><span class='mktInput'><select class='mktFormSelect mktFReq' name="num_employees__c" id="num_employees__c" size='1'  tabIndex='15' required><option value='>Select employees' selected='selected'>Select employees</option><option value='None'>None</option><option value='<500'>&lt;500</option><option value='501-1000'>501-1000</option><option value='1001-2000'>1001-2000</option><option value='2001-5000'>2001-5000</option><option value='5000+'>5000+</option></select><span class='mktFormMsg'></span></span></li>
-				</ul>
-			</fieldset>
-			<fieldset class="fieldset-submit">
-				<ul class="mktLblLeft">
-					<li class='mktField' ><span class='mktInput'><input class='mktFormCheckbox' name="MobileNewsletterOpt-in" id="MobileNewsletterOpt-in" type='checkbox' value="1"  tabIndex='16' /><label for="MobileNewsletterOpt-in">Would you like to follow progress with our mobile newsletter?</label><span class='mktFormMsg'></span></span></li>
-					<li class='mktField' ><span class='mktInput'><input class='mktFormCheckbox' name="NewsletterOpt-In" id="NewsletterOpt-In" type='checkbox' value="1"  tabIndex='17' /><label for="NewsletterOpt-In">I would like to receive occasional news about Ubuntu by email.</label><span class='mktFormMsg'></span></span></li>
-
-					<li>All information provided will be handled in accordance with the Canonical <a href="http://www.ubuntu.com/privacy-policy" target="_blank">privacy policy</a>.</li>
-					<li id="mktFrmButtons"><!--<label>&nbsp;</label>--><input id="mktFrmSubmit" type="submit" value="Submit" name="submitButton" tabIndex='18' onclick="formSubmit(document.getElementById('mktForm_1083')); return false;">&nbsp;<input style="display: none;" id="mktFrmReset" type="reset" value="Clear" name="resetButton" onclick="formReset(document.getElementById('mktForm_1083')); return false;"></li>
-				</ul>
-			</fieldset>
-			<span style="display:none;"><input type="text" name="_marketo_comments" value="" /></span>
-			<input type="hidden" name="lpId" value="1382" />
-			<input type="hidden" name="subId" value="30" />
-			<input type="hidden" name="munchkinId" value="066-EOV-335" />
-			<input type="hidden" name="kw" value="" />
-			<input type="hidden" name="cr" value="" />
-			<input type="hidden" name="searchstr" value="" />
-			<input type="hidden" name="lpurl" value="https://pages.canonical.com/Register_TabletRegister.html?cr={creative}&kw={keyword}" />
-			<input type="hidden" name="formid" value="1083" />
-			<input type="hidden" name="returnURL" value="http://www.ubuntu.com/tablet/thank-you" />
-			<input type="hidden" name="retURL" value="http://www.ubuntu.com/tablet/thank-you" />
-			<input type="hidden" name="returnLPId" value="-1" />
-			<input type="hidden" name="_mkt_disp" value="return" />
-			<input type="hidden" name="_mkt_trk" value="id:066-EOV-335&token:_mch-canonical.com-1360690789919-67765" />
-  		</form>
-		<script type="text/javascript" src="http://www.ubuntu.com/misc/jquery.js?J"></script>
-		<script type="text/javascript" src="https://pages.canonical.com/js/mktFormSupport.js"></script>
-		<script type="text/javascript" src="http://pages.canonical.com/js/public/stateCountry.js"></script>
-		<script type="text/javascript">
-			function formSubmit(elt) {
-				return Mkto.formSubmit(elt);
-			}
-			function formReset(elt) {
-				return Mkto.formReset(elt);
-			}
-			$(document).ready(function(){var e=$("#tick_ces-in");var t=$("#tick_mwc-in");var n=$("#Question1");$("#tick_ces-in, #tick_mwc-in").change(function(){if(e.is(":checked")&&t.is(":checked")){n.val("CES,MWC")}else if(e.is(":checked")){n.val("CES")}else if(t.is(":checked")){n.val("MWC")}else{n.val("Neither")}})})
-		</script>
-	</div><!-- /.seven-col -->
-	<div class="four-col last-col">
-		<h3>Tablet user?</h3>
-		<p>If you want to know when Ubuntu launches on tablets, please leave your details for us and we&rsquo;ll let you know when the first one is released.</p>
-		<p><a href="https://forms.canonical.com/capetown/">Register to find out first&nbsp;&rsaquo;</a></p>
-		<h3>Mobile operators</h3>
-		<p>Help shape Ubuntu&rsquo;s mobile strategy, consider joining our Ubuntu Carrier Advisory Group.</p>
-		<p><a href="/phone/carrier-advisory-group">Learn more&nbsp;&rsaquo;</a></p>
-	</div>
-</div><!-- /.row -->
-{% endblock content %}
diff --git a/templates/tablet/index.html b/templates/tablet/index.html
index c2da1ab8f6a..1929f51b3ad 100755
--- a/templates/tablet/index.html
+++ b/templates/tablet/index.html
@@ -5,7 +5,7 @@
 {% block extra_body_class %}tablet-design{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Tablet" page_title="Overview"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Tablet" page_title="Overview"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/tablet/operators-and-oems.html b/templates/tablet/operators-and-oems.html
index 8323376eecc..a45959b6377 100755
--- a/templates/tablet/operators-and-oems.html
+++ b/templates/tablet/operators-and-oems.html
@@ -6,7 +6,7 @@
 {% block meta_description %}For OEM partners looking for an OS on which to deliver a groundbreaking customer experience, Ubuntu provides a customisable, open source and easily adopted platform on which to build their devices. It also offers opportunities for content providers and mobile developers to integrate their applications and services.{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Tablet" page_title="Operators and OEMs"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Tablet" page_title="Operators and OEMs"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/tablet/register/index.html b/templates/tablet/register/index.html
index 27f2d5a8f22..8483b77318f 100755
--- a/templates/tablet/register/index.html
+++ b/templates/tablet/register/index.html
@@ -3,7 +3,7 @@
 {% block title %}Contact us | Ubuntu for tablets{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Tablet" page_title="Contact us"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Tablet" page_title="Contact us"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/tablet/register/thank-you.html b/templates/tablet/register/thank-you.html
index 01ded4a403f..db3807611fa 100755
--- a/templates/tablet/register/thank-you.html
+++ b/templates/tablet/register/thank-you.html
@@ -3,7 +3,7 @@
 {% block title %}Thank you | Ubuntu for tablets{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Tablet" subsection_title="Register" page_title="Thank you"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Tablet" subsection_title="Register" page_title="Thank you"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/tablet/_includes/_contextual_footer.html b/templates/tablet/shared/_contextual_footer.html
similarity index 83%
rename from templates/tablet/_includes/_contextual_footer.html
rename to templates/tablet/shared/_contextual_footer.html
index 4ae47e85372..4235a37d8b0 100755
--- a/templates/tablet/_includes/_contextual_footer.html
+++ b/templates/tablet/shared/_contextual_footer.html
@@ -4,9 +4,9 @@ <h3>Find out when it&rsquo;s here</h3>
 		<p><a href="/tablet/register">Register to find out first&nbsp;&rsaquo;</a></p>
 	</div>
 	<div class="feature-three four-col">
-		<h3>Contact us today</h3>
-		<p>If you&rsquo;re an OEM or content provider, please get in touch to talk in more detail about Ubuntu on tablets.</p>
-		<p><a href="/tablet/contact-us" class="link-cta-ubuntu">Get in touch</a></p>
+		<h3>A new opportunity</h3>
+		<p>OEMs start building your Ubuntu mobile experiences today.</p>
+		<p><a href="http://partners.ubuntu.com/programmes/hardware" class="external">For OEMs</a></p>
 	</div>
 	<div class="feature-four four-col last-col">
 		<h3>Further reading</h3>
diff --git a/templates/tablet/thank-you.html b/templates/tablet/thank-you.html
deleted file mode 100755
index 40552f05072..00000000000
--- a/templates/tablet/thank-you.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "tablet/base_tablet.html" %}
-
-{% block title %}Thank you | Ubuntu for tablets{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="Tablet" page_title="Thank you"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero row-image-centered no-border">
-	<div class="eight-col">
-		<h1>Thank you</h1>
-		<h2>We appreciate your interest in Ubuntu on tablets.</h2>
-	    <p>We are working to prioritise our responses to partners. A member of our tablet team will contact you shortly.</p>
-    </div>
-	<span>
-		<img src="{{ STATIC_URL }}img/devices/pictogram-smile-purple.svg" width="164" height="162" alt="Smile pictogram" />
-	</span>
-</div><!-- /.row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/takeovers/_14.10_takeover.html b/templates/takeovers/_14.10_takeover.html
new file mode 100644
index 00000000000..50109474601
--- /dev/null
+++ b/templates/takeovers/_14.10_takeover.html
@@ -0,0 +1,10 @@
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="six-col">
+			<h1>Number one for scale-out, containers and interoperability</h1>
+            <p><a class="link-cta-ubuntu cta-large" href="/download/desktop" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'Utopic Unicorn launch takeover', 'From Ubuntu homepage Get Ubuntu 14.10 now link']);">Download Ubuntu 14.10</a></p>
+            <p><a class="alternate" href="/tour">Take the tour&nbsp;&rsaquo;</a></p>
+            <img src="{{ STATIC_URL }}img/homepage/Dell_XPS_Laptop_Left_Small.png" alt="Ubuntu laptop" class="for-mobile" />
+		</div>
+	</div>
+</section><!-- /.row -->
diff --git a/templates/takeovers/_1410_takeover.html b/templates/takeovers/_1410_takeover.html
new file mode 100644
index 00000000000..cf1b29ffa44
--- /dev/null
+++ b/templates/takeovers/_1410_takeover.html
@@ -0,0 +1,37 @@
+<section class="row strip no-border row-popular-cloud">
+	<div class="strip-inner-wrapper">
+		<div class="six-col">
+			<h1>Number one for scale-out, containers and interoperability</h1>
+			<p class="intro five-col">Ubuntu 14.10 for cloud and servers</p>
+			<div class="six-col text-center for-mobile">
+				<img alt="Ubuntu Cloud" src="{{ STATIC_URL }}img/homepage/1404/image-cloud.svg" />
+			</div>
+			<p><a class="link-cta-ubuntu cta-large" href="/download/cloud" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'Utopic Unicorn launch takeover', 'From Ubuntu homepage Get Ubuntu Cloud 14.10 now link']);">Get Ubuntu for cloud</a></p>
+		</div>
+		<div class="six-col last-col">
+			<img class="priority-0" alt="Ubuntu Cloud" src="{{ STATIC_URL }}img/homepage/1404/image-cloud.svg" />
+		</div>
+	</div>
+</section>
+<section class="row strip row-background no-border row-favourite-desktop">
+	<div class="strip-inner-wrapper">
+		<div class="six-col">
+			<h2>Your favourite desktop, now smarter and faster than ever</h2>
+			<div class="six-col text-center for-mobile">
+				<img alt="Full-screen browser" src="{{ STATIC_URL }}img/homepage/1410/desktop-small.png" />
+			</div>
+			<p class="intro five-col">Ubuntu 14.10 for your PC</p>
+			<p><a class="link-cta-ubuntu cta-large" href="/download/desktop">Get Ubuntu for desktop</a></p>
+		</div>
+	</div>
+	<div class="browser" />
+</section>
+
+<section class="row strip no-border row-birthday">
+	<div class="strip-inner-wrapper align-center">
+        <h2>Ubuntu is 10 years old!</h2>
+        <p class="intro">Thank you for your support and contributions. We look forward to the next 10 years.</p>
+    </div>
+</div>
+<hr />
+</section>
diff --git a/templates/takeovers/_1504_takeover.html b/templates/takeovers/_1504_takeover.html
new file mode 100644
index 00000000000..def2840c9ef
--- /dev/null
+++ b/templates/takeovers/_1504_takeover.html
@@ -0,0 +1,10 @@
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="eight-col">
+			<h1>Ubuntu 15.04 is here</h1>
+			<p class="intro">Download the latest Ubuntu <br />for your laptops and PCs.</p>
+			<p><a href="/download/desktop" onclick="_gaq.push(['_trackEvent', 'Homepage Link', '15.04 release takeover', 'Get Ubuntu Desktop']);" class="link-cta-ubuntu">Get Ubuntu Desktop</a></p>
+			<p><a href="/desktop" onclick="_gaq.push(['_trackEvent', 'Homepage Link', '15.04 release takeover', 'Learn more about Ubuntu']);">Learn more about Ubuntu&nbsp;&rsaquo;</a></p>
+		</div>
+	</div>
+</section>
diff --git a/templates/takeovers/_apm_takeover.html b/templates/takeovers/_apm_takeover.html
new file mode 100644
index 00000000000..cc418053c34
--- /dev/null
+++ b/templates/takeovers/_apm_takeover.html
@@ -0,0 +1,12 @@
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="five-col append-one">
+			<h1>A revolution in ARM servers</h1>
+			<p class="intro">The first commercially available ARMv8 developer platform brought to you by APM and Canonical</p>
+			<p class="intro"><a href="https://insights.ubuntu.com/got-64-bit-arm-hardware/" onclick="_gaq.push(['_trackEvent', 'External Link', 'Knock your SoCs off 25.11.2014', 'Learn more on insights.ubuntu.com']);" class="external">Learn more on insights.ubuntu.com</a></p>
+		</div>
+		<div class="six-col last-col small-align-center">
+			<img src="{{ STATIC_URL }}img/homepage/image-apm.svg" alt="Applied Micro logo with pictograms">
+		</div>
+	</div>
+</section>
diff --git a/templates/takeovers/_bigdata_takeover.html b/templates/takeovers/_bigdata_takeover.html
new file mode 100644
index 00000000000..7f5af165179
--- /dev/null
+++ b/templates/takeovers/_bigdata_takeover.html
@@ -0,0 +1,12 @@
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="five-col append-one">
+			<h1>Maximum PaaS. <br />Maximum Big Data.</h1>
+			<h2>Complex workloads, instant solutions. At scale.</h2>
+			<p><a href="https://insights.ubuntu.com/2014/11/03/extreme-openstack" class="external" onclick="_gaq.push(['_trackEvent', 'External Link', 'OpenStack Summit Paris takeover 05.11.2014', 'Visit our OpenStack summit page']);">Visit our OpenStack summit page</a></p>
+		</div>
+		<div class="six-col last-col openstack-paris">
+			<img src="{{ STATIC_URL }}img/homepage/big-data-bundle.png" alt="Big data bundle" />
+		</div>
+	</div>
+</section>
\ No newline at end of file
diff --git a/templates/takeovers/_china_dev.html b/templates/takeovers/_china_dev.html
new file mode 100644
index 00000000000..a00626145ac
--- /dev/null
+++ b/templates/takeovers/_china_dev.html
@@ -0,0 +1,24 @@
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="five-col">
+			<h1>中国移动&amp;Ubuntu开发者创新大赛正式开启</h1>{# Announcing the China Mobile and Ubuntu Developer Innovation Competition #}
+			<p class="intro">大赛时间：2014年12月15日 - 2015年6月12日 </p>{# 15 December 2014 - 12 June 2015 #}
+			<p class="intro"><a href="http://dev.10086.cn/yecp/match?action=ubuntu">现在就参赛&nbsp;&rsaquo;</a></p>{# Sign-up now > #}
+			<div class="box clear smaller">
+				<img alt="China Mobile" class="china-mobile" src="{{ STATIC_URL }}img/homepage/kylin/china-mobile-orange.svg" />
+				<ul class="list--social">
+					<li class="list--social__item list--social__item--weibo"><a href="http://weibo.com/u/1278359237">Weibo</a></li>
+					<li class="list--social__item list--social__item--wechat"><a href="http://weixin.qq.com/r/-3WAmA7EM1NMrUr79yDt">WeChat</a></li>
+				</ul>
+			</div>
+		</div><!-- /.five-col -->
+		<div class="prepend-one six-col last-col">
+			<img alt="" class="phones" src="{{ STATIC_URL }}img/homepage/kylin/phones-edge.png" />
+		</div><!-- /.seven-col -->
+	</div><!-- /.strip-inner-wrapper -->
+</section>
+<section class="row strip no-border row-china-promo">
+	<div class="strip-inner-wrapper">
+		<h2 class="right"><a class="external" href="http://www.ubuntu-china.cn" onclick="_gaq.push(['_trackEvent', 'External Link', 'Kylin China homepage Ubuntu China website announcement', 'From Ubuntu homepage']);">Ubuntu 中国网站现已面世</a></h2>
+	</div>
+</section>
\ No newline at end of file
diff --git a/templates/takeovers/_cloud_survey_takeover.html b/templates/takeovers/_cloud_survey_takeover.html
new file mode 100644
index 00000000000..e492f49c41b
--- /dev/null
+++ b/templates/takeovers/_cloud_survey_takeover.html
@@ -0,0 +1,12 @@
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="six-col align-center">
+			<img class="priority-0" src="{{ STATIC_URL }}img/homepage/image-cloud-survey.png" alt="Ubuntu Cloud survey" />
+		</div>
+		<div class="six-col last-col align-vertically">
+			<h1>Have your say</h1>
+			<p class="intro-large">Help shape the future of Ubuntu&nbsp;Cloud</p>
+			<p class="intro"><a class="external" href="https://www.surveymonkey.com/s/52WWHHQ" onclick="_gaq.push(['_trackEvent', 'External Link', 'Ubuntu Cloud survey takeover', 'From Ubuntu homepage Take part in our survey link']);">Take part in our survey</a></p>
+		</div>
+	</div>
+</section><!-- /.row -->
diff --git a/templates/takeovers/_dell_latam_takeover.html b/templates/takeovers/_dell_latam_takeover.html
new file mode 100644
index 00000000000..315293c229d
--- /dev/null
+++ b/templates/takeovers/_dell_latam_takeover.html
@@ -0,0 +1,11 @@
+<section class="row row-hero strip no-border takeover">
+    <div class="strip-inner-wrapper">
+        <div class="six-col">
+            <img src="{{ STATIC_URL }}img/third-party-logos/logo-dell-67x67.png" alt="Dell logo">
+            <h1>Ubuntu has arrived</h1>
+            <p class="intro">Now you can buy a Dell PC with Ubuntu in one of 500 stores across Latin America</p>
+            <p><a href="http://insights.ubuntu.com/2015/03/02/dell-launches-ubuntu-loaded-machines-across-500-stores-in-latin-america" onclick="_gaq.push(['_trackEvent', 'External Link', 'Dell LATAM takeover - 2015-03-02', 'Find out more']);" class="external">Find out more</a></p>
+            <img src="{{ STATIC_URL }}img/homepage/image-dell-laptop.png" class="laptop" alt="Dell laptop">
+        </div>
+    </div>
+</section>
\ No newline at end of file
diff --git a/templates/takeovers/_dell_xps_takeover.html b/templates/takeovers/_dell_xps_takeover.html
new file mode 100644
index 00000000000..d2451f9a488
--- /dev/null
+++ b/templates/takeovers/_dell_xps_takeover.html
@@ -0,0 +1,11 @@
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="seven-col">
+			<img src="{{ STATIC_URL }}img/third-party-logos/logo-dell-67x67.png" alt="Dell logo" class="dell-logo">
+			<h1>Designed for developers</h1>
+			<p class="intro">Lightweight, powerful and preinstalled with Ubuntu, get&nbsp;the latest generation Dell XPS 13 or the all-new Dell&nbsp;Precision M3800.</p>
+			<p><a href="https://insights.ubuntu.com/designed-for-developers-dell-launches-two-new-ubuntu-based-systems/" onclick="_gaq.push(['_trackEvent', 'External Link', 'Dell XPS takeover - 2015-04-09', 'Learn more']);" class="external">Learn more</a></p>
+		</div>
+		<img src="{{ STATIC_URL }}img/homepage/image-dell-xps-laptop.png" class="laptop" alt="Dell XPS laptop">
+	</div>
+</section>
diff --git a/templates/takeovers/_footer_homepage.html b/templates/takeovers/_footer_homepage.html
index 05500247dc4..6d1aa083dc6 100755
--- a/templates/takeovers/_footer_homepage.html
+++ b/templates/takeovers/_footer_homepage.html
@@ -1,31 +1,108 @@
 <section class="row strip row-aux no-border">
-	<div class="strip-inner-wrapper vertical-divider">
-		<div class="four-col ready-for-smartphones">
+	<div class="strip-inner-wrapper">
+  	<div class="vertical-divider twelve-col no-margin-bottom">
+
+		{% comment %}<!--
+		<div class="four-col bootstack">
+			<a href="/cloud/bootstack">
+				<h2>Hosted cloud&nbsp;&rsaquo;</h2>
+				<p class="no-margin-bottom">Get a BootStack hosted cloud from Canonical for just &dollar;15 per server per day.</p>
+				<div>
+					<img alt="" src="{{ STATIC_URL }}img/cloud/bootstack/easy-way-in.svg" width="170" />
+				</div>
+			</a>
+		</div>
+		-->{% endcomment %}
+
+    	{% comment %}<!--
+    	<div class="four-col ready-for-smartphones">
 			<a href="/phone">
-				<h2>Ready for smartphones &rsaquo;</h2>
+				<h2>Ready for smartphones&nbsp;&rsaquo;</h2>
 				<p>Ubuntu on phones is now ready for the mobile phone industry.</p>
 				<div>
-					<img alt="OpenStack Developer Summit" src="{{ STATIC_URL }}img/homepage/image-phone.png" />
+					<img alt="" src="{{ STATIC_URL }}img/homepage/image-phone-operatorsandoems.png" />
 				</div>
 			</a>
 		</div>
+		-->{% endcomment %}
+
+    	{% comment %}<!--
+    	<div class="four-col openstack-in-action">
+			<a href="http://ubunt.eu/mvjyc2">
+				<h2>OpenStack in action&nbsp;&rsaquo;</h2>
+				<p>Canonical's OpenStack Roadshow is coming to a city near you!</p>
+				<div>
+					<img src="{{ STATIC_URL }}img/homepage/globe-promo.svg" width="123" alt="" />
+				</div>
+			</a>
+		</div>
+		-->{% endcomment %}
+
+		{% comment %}<!--
 		<div class="four-col number-one-for-cloud">
 			<a href="/cloud">
-				<h2>Number one for cloud &rsaquo;</h2>
-				<p>OpenStack Icehouse plus the best deployment and management tools.</p>
+				<h2>Ubuntu for cloud&nbsp;&rsaquo;</h2>
+				<p>Number one for scale-out, containers and interoperability.</p>
+				<div>
+					<img src="{{ STATIC_URL }}img/homepage/openstack.png" alt="OpenStack Developer Summit" />
+				</div>
+			</a>
+		</div>
+		-->{% endcomment %}
+
+		{% comment %}<!--
+		<div class="four-col ready-for-smartphones">
+			<a href="/phone">
+				<h2>Ready for smartphones&nbsp;&rsaquo;</h2>
+				<p>Ubuntu on phones is now ready for the mobile phone industry.</p>
 				<div>
-					<img alt="OpenStack Developer Summit" src="{{ STATIC_URL }}img/homepage/image-cloud.png" />
+					<img alt="" src="{{ STATIC_URL }}img/homepage/image-phone-operatorsandoems.png" />
 				</div>
 			</a>
 		</div>
+		-->{% endcomment %}
+
+		{% comment %}<!--
 		<div class="four-col last-col download-ubuntu no-margin-bottom">
 			<a href="/download">
-				<h2>Download Ubuntu &rsaquo;</h2>
-				<p>Smarter and faster than ever, get Ubuntu 14.04 LTS today.</p>
+				<h2>Download Ubuntu&nbsp;&rsaquo;</h2>
+				<p>Smarter and faster than ever, get Ubuntu 14.10 today.</p>
 				<div>
-					<img alt="OpenStack Developer Summit" src="{{ STATIC_URL }}img/homepage/image-desktop.png" />
+					<img src="{{ STATIC_URL }}img/homepage/Dell_XPS_Laptop_Front.png" alt="OpenStack Developer Summit" />
 				</div>
 			</a>
 		</div>
+		-->{% endcomment %}
+
+		<div class="four-col ubuntu-openstack no-margin-bottom">
+			<a href="/download/cloud">
+				<h2>Get Ubuntu OpenStack&nbsp;&rsaquo;</h2>
+				<p>Install the latest version of the Canonical Distribution of Ubuntu OpenStack.</p>
+				<div class="four-col align-center">
+					<img alt="" src="{{ STATIC_URL }}img/logos/logo-pack/logo-openstack.svg" />
+				</div>
+			</a>
+		</div>
+
+		<div class="four-col ubuntu-server no-margin-bottom">
+			<a href="/download/server">
+				<h2>Get Ubuntu Server&nbsp;&rsaquo;</h2>
+				<p>Download the latest version of Ubuntu Server for ARM, POWER8 and x86.</p>
+				<div class="four-col align-center">
+					<img alt="" src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-server-warmgrey.svg" />
+				</div>
+			</a>
+		</div>
+
+		<div class="four-col last-col ubuntu-core no-margin-bottom">
+			<a href="http://developer.ubuntu.com/en/snappy/">
+				<h2>Get Ubuntu Core&nbsp;&rsaquo;</h2>
+				<p>Start using the snappy Ubuntu Core for the cloud and all your things.</p>
+				<div class="four-col align-center">
+					<img alt="" src="{{ STATIC_URL }}img/cloud/tools/snappy/snappy.png" />
+				</div>
+			</a>
+		</div>
+	</div>
 	</div>
 </section>
\ No newline at end of file
diff --git a/templates/takeovers/_footer_homepage_google.html b/templates/takeovers/_footer_homepage_google.html
new file mode 100755
index 00000000000..9835f9428b9
--- /dev/null
+++ b/templates/takeovers/_footer_homepage_google.html
@@ -0,0 +1,31 @@
+<section class="row strip row-aux no-border">
+	<div class="strip-inner-wrapper vertical-divider">
+		<div class="four-col ready-for-smartphones">
+			<a href="/phone" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'Homepage promo box 1', 'Ready for smartphones']);">
+				<h2>Ready for smartphones&nbsp;&rsaquo;</h2>
+				<p>Ubuntu on phones is now ready for the mobile phone industry.</p>
+				<div>
+					<img alt="OpenStack Developer Summit" src="{{ STATIC_URL }}img/homepage/image-phone-operatorsandoems.png" />
+				</div>
+			</a>
+		</div>
+		<div class="four-col">
+			<a href="http://insights.ubuntu.com/2014/11/03/certified-ubuntu-images-available-on-google-cloud-platform/"  onclick="_gaq.push(['_trackEvent', 'External Link', 'Homepage promo box 2', 'Now on Google Cloud Platform']);">
+				<h2>Now on Google Cloud Platform&nbsp;&rsaquo;</h2>
+				<p>Optimised Ubuntu images available.</p>
+				<div>
+					<img alt="OpenStack Developer Summit" src="{{ STATIC_URL }}img/homepage/homepage-google-cloud.png" />
+				</div>
+			</a>
+		</div>
+		<div class="four-col last-col download-ubuntu no-margin-bottom"  onclick="_gaq.push(['_trackEvent', 'Internal Link', 'Homepage promo box 3', 'Download Ubuntu']);">
+			<a href="/download">
+				<h2>Download Ubuntu&nbsp;&rsaquo;</h2>
+				<p>Smarter and faster than ever, get Ubuntu 14.10 today.</p>
+				<div>
+					<img alt="OpenStack Developer Summit" src="{{ STATIC_URL }}img/homepage/Dell_XPS_Laptop_Front.png" />
+				</div>
+			</a>
+		</div>
+	</div>
+</section>
\ No newline at end of file
diff --git a/templates/takeovers/_footer_homepage_kylin.html b/templates/takeovers/_footer_homepage_kylin.html
index bb3ac24b260..3a414c6fdeb 100755
--- a/templates/takeovers/_footer_homepage_kylin.html
+++ b/templates/takeovers/_footer_homepage_kylin.html
@@ -1,29 +1,29 @@
 <section class="row strip row-aux no-border">
 	<div class="strip-inner-wrapper vertical-divider">
 		<div class="four-col ready-for-smartphones">
-			<a href="http://ubuntu-china.cn/phone">
-				<h2>Ready for smartphones&nbsp;&rsaquo;</h2>
-				<p>Ubuntu手机版准备就绪，整装待发。</p>
+			<a href="http://cn.ubuntu.com/phone">
+				<h2>最新的手机玩法体验&nbsp;&rsaquo;</h2>
+				<p>Ubuntu打破传统布局，直接展示你最关注的</p>
 				<div>
-					<img alt="OpenStack Developer Summit" src="{{ STATIC_URL }}img/homepage/image-phone.png" />
+					<img alt="" src="{{ STATIC_URL }}img/homepage/image-phone-operatorsandoems.png" />
 				</div>
 			</a>
 		</div>
 		<div class="four-col number-one-for-cloud">
-			<a href="/cloud">
-				<h2>Get Ubuntu OpenStack&nbsp;&rsaquo;</h2>
-			<p>使用OpenStack哈瓦那软件建造属于您自己的云&#12290;</p>
+			<a href="http://cn.ubuntu.com/cloud">
+				<h2>头号云服务平台&nbsp;&rsaquo;</h2>
+				<p>OpenStack Juno，还提供最好的工具和五年支持服务。&#12290;</p>
 				<div>
-					<img alt="OpenStack Developer Summit" src="{{ STATIC_URL }}img/homepage/image-cloud.png" />
+					<img alt="" src="{{ STATIC_URL }}img/homepage/openstack.png" />
 				</div>
 			</a>
 		</div>
 		<div class="four-col last-col download-ubuntu">
-			<a href="http://ubuntu-china.cn/download">
-				<h2>Download Ubuntu&nbsp;&rsaquo;</h2>
-				<p>更聪明，比以往更快，得到的Ubuntu14.04 LTS的今天&#12290;</p>
+			<a href="https://landscape.canonical.com/">
+				<h2>Landscape free for 30 days&nbsp;&rsaquo;</h2>
+				<p>用于Ubuntu OpenStack的最佳云管理工具&#12290;</p>
 				<div>
-					<img alt="OpenStack Developer Summit" src="{{ STATIC_URL }}img/homepage/image-desktop.png" />
+					<img alt="" src="{{ STATIC_URL }}img/homepage/kylin/screenshot-landscape-288-160.jpg" />
 				</div>
 			</a>
 		</div>
diff --git a/templates/takeovers/_google_cloud_takeover.html b/templates/takeovers/_google_cloud_takeover.html
new file mode 100644
index 00000000000..973e5aab041
--- /dev/null
+++ b/templates/takeovers/_google_cloud_takeover.html
@@ -0,0 +1,12 @@
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="five-col append-one">
+			<h1>Ubuntu now on Google Cloud Platform</h1>
+			<h2>Optimised Ubuntu images available.</h2>
+			<p><a href="http://insights.ubuntu.com/2014/11/03/certified-ubuntu-images-available-on-google-cloud-platform/" onclick="_gaq.push(['_trackEvent', 'External Link', 'Ubuntu now on Google Cloud Platform 07.11.2014', 'Learn more on insights.ubuntu.com']);" class="external">Learn more on insights.ubuntu.com</a></p>
+		</div>
+		<div class="six-col last-col">
+			<img src="{{ STATIC_URL }}img/homepage/homepage-google-cloud-big.png" alt="">
+		</div>
+	</div>
+</section>
diff --git a/templates/takeovers/_jumpstart_takeover.html b/templates/takeovers/_jumpstart_takeover.html
index a3dfc5d1fe6..ac3a68ace8d 100644
--- a/templates/takeovers/_jumpstart_takeover.html
+++ b/templates/takeovers/_jumpstart_takeover.html
@@ -6,7 +6,7 @@ <h1>Jumpstart Training for&nbsp;OpenStack</h1>
 				<img src="{{ STATIC_URL }}img/cloud/orange-box/image-orangebox-small.png" alt="The orange box" />
 			</div>
 			<p class="intro">We bring the box. <span class="clearfix">You bring the workloads.</span></p>
-			<p class="intro"><a href="/cloud/jumpstart-training" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'Jumpstart Training takeover', 'From Ubuntu homepage Learn more about Jumpstart Training link']);">Learn more about Jumpstart Training&nbsp;&rsaquo;</a></p>
+			<p class="intro"><a href="/cloud/training" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'Jumpstart Training takeover', 'From Ubuntu homepage Learn more about Jumpstart Training link']);">Learn more about Jumpstart Training&nbsp;&rsaquo;</a></p>
 		</div>
 		<div class="text-center six-col last-col">
 			<img class="priority-0" src="{{ STATIC_URL }}img/cloud/orange-box/image-orangebox.png" alt="The orange box" />
diff --git a/templates/takeovers/_kylin.html b/templates/takeovers/_kylin.html
index c620ce45444..969a1c468f6 100755
--- a/templates/takeovers/_kylin.html
+++ b/templates/takeovers/_kylin.html
@@ -1,10 +1,10 @@
 <section class="row strip no-border">
 	<div class="strip-inner-wrapper">
 		<div class="five-col append-one">
-			<h1>了解 Ubuntu Kylin</h1>
-			<p class="intro">中国制造，为中国用户量身定制。</p>
-			<p class="intro"><a href="/download/zh-CN" title="立即下载" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'Kylin China homepage takeover', 'From Ubuntu homepage']);">立即下载</a></p>
-			<p><a href="/desktop/ubuntu-kylin-chinese" class="link-cta-ubuntu cta-large" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'Kylin China homepage takeover', 'From Ubuntu homepage']);">进一步了解 Ubuntu Kylin</a></p>
+			<h1>请见Ubuntu Kylin</h1>
+			<p class="intro">具有2TB内建云储存，Ubuntu Kylin是中国的免費个人电脑操作系统。</p>
+			<p class="intro"><a href="/download/zh-CN" title="立即下载" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'Kylin China homepage takeover', 'From Ubuntu homepage']);">立即下载&nbsp;&rsaquo;</a></p>
+			<p><a href="/desktop/ubuntu-kylin-chinese" class="link-cta-ubuntu cta-large" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'Kylin China homepage takeover', 'From Ubuntu homepage']);">下载 Ubuntu Kylin 14.10&nbsp;&rsaquo;</a></p>
 			
 		<div class="box clear smaller">
 			<h2 class=""><a class="external" href="http://www.ubuntu-china.cn" onclick="_gaq.push(['_trackEvent', 'External Link', 'Kylin China homepage Ubuntu China website announcement', 'From Ubuntu homepage']);">Ubuntu 中国网站现已面世</a></h2>
diff --git a/templates/takeovers/_lxd_takeover.html b/templates/takeovers/_lxd_takeover.html
new file mode 100644
index 00000000000..eadd958603b
--- /dev/null
+++ b/templates/takeovers/_lxd_takeover.html
@@ -0,0 +1,12 @@
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="four-col append-one prepend-one">
+			<img src="{{ STATIC_URL }}img/homepage/lxd_takeover.png" alt="LXD" />
+		</div>
+		<div class="five-col last-col openstack-paris lxd">
+			<h1>Introducing LXD</h1>
+			<h2>Welcome to the world of high-density containers.</h2>
+			<p><a href="https://insights.ubuntu.com/2014/11/03/extreme-openstack" class="external">Visit our OpenStack summit page</a></p>
+		</div>
+	</div>
+</section>
\ No newline at end of file
diff --git a/templates/takeovers/_machine_view_takeover.html b/templates/takeovers/_machine_view_takeover.html
new file mode 100644
index 00000000000..6bb29b232f0
--- /dev/null
+++ b/templates/takeovers/_machine_view_takeover.html
@@ -0,0 +1,13 @@
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="five-col">
+			<img class="logo" src="{{ STATIC_URL }}img/logos/logo-juju-130.png" alt="Juju logo" />
+			<h1>Total control</h1>
+			<p>Juju’s new machine view feature gives you <br />machine-level access to your services.</p>
+			<p><a class="external" href="https://insights.ubuntu.com/2014/09/26/juju-machine-view-more-control-at-your-fingertips/" onclick="_gaq.push(['_trackEvent', 'External Link', 'Machine view launch takeover', 'From Ubuntu homepage Learn more on insights.ubuntu.com link']);">Learn more on insights.ubuntu.com</a></p>
+		</div>
+		<div class="seven-col last-col">
+			<img class="priority-0 touch-border" src="{{ STATIC_URL }}img/homepage/image-juju-laptop.png" alt="Juju on a laptop" />
+		</div>
+	</div>
+</section><!-- /.row -->
diff --git a/templates/takeovers/_mission_critical_things_takeover.html b/templates/takeovers/_mission_critical_things_takeover.html
new file mode 100644
index 00000000000..3dfbc6b3de3
--- /dev/null
+++ b/templates/takeovers/_mission_critical_things_takeover.html
@@ -0,0 +1,23 @@
+
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="six-col">
+			<h1>Mission Critical Things</h1>
+			<p class="intro">Canonical announces partnerships for enterprise and national infrastructure</p>
+			<p>Microsoft, Amazon, Cavium, Texas Instruments, RTI, Eclipse and many others to support Ubuntu Core for enterprise and telco IoT.</p>
+			<p><a href="/things" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'Ubuntu Core Mission Critical Things homepage takeover', 'Learn more']);">Learn more&nbsp;&rsaquo;</a></p>
+		</div>
+		<div class="prepend-one five-col last-col">
+			<img src="{{ STATIC_URL }}img/cloud/tools/snappy/snappy.png" alt="">
+		</div>
+		<div class="twelve-col">
+			<ul class="inline-icons">
+				<li><img src="{{ STATIC_URL }}img/things/cavium-logo.png" alt="Cavium logo" /></li>
+				<li><img src="{{ STATIC_URL }}img/things/forge-logo.png" alt="Forgerock logo" /></li>
+				<li><img src="{{ STATIC_URL }}img/things/texas-logo.png" alt="Texas Instruments logo" /></li>
+				<li><img src="{{ STATIC_URL }}img/things/rti-logo.png" alt="RTI logo" /></li>
+				<li class="last-item"><img src="{{ STATIC_URL }}img/things/microsoft-logo.png" alt="Microsoft logo" /></li>
+			</ul>
+		</div>
+	</div>
+</section>
diff --git a/templates/takeovers/_mwc_2014_takeover.html b/templates/takeovers/_mwc_2014_takeover.html
index afdc7607ff8..11d575c6b64 100755
--- a/templates/takeovers/_mwc_2014_takeover.html
+++ b/templates/takeovers/_mwc_2014_takeover.html
@@ -24,7 +24,7 @@ <h1>See you at MWC 2014</h1>
 			<p><a href="http://ubunt.eu/mwcshow" onclick="_gaq.push(['_trackEvent', 'External Link', 'MWC takeover', 'From Ubuntu homepage find out more link']);">Find out more&nbsp;&rsaquo;</a></p>
 		</div>
 		<div class="eight-col last-col">
-			<img src="{{ STATIC_URL }}img/homepage/homepage-takeover-mwc-icons.png" alt="" width="680" height="426" class="fallback-image" />
+			<img src="{{STATIC_URL}}u/img/homepage/homepage-takeover-mwc-icons.png" alt="" width="680" height="426" class="fallback-image" />
 			<div class="animated">
 				<ul class="mwc-icons">
 				    <li class="icon-1"></li>
diff --git a/templates/takeovers/_mwc_2015_takeover.html b/templates/takeovers/_mwc_2015_takeover.html
new file mode 100644
index 00000000000..6a912686326
--- /dev/null
+++ b/templates/takeovers/_mwc_2015_takeover.html
@@ -0,0 +1,14 @@
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="six-col">
+			<h1>Phones. Clouds. Things.</h1>
+			<h2>See how Ubuntu makes it all work</h2>
+			<p class="intro">Visit us at MWC 2015 in Barcelona.</p>
+			<p><a class="external" href="http://ubunt.eu/mwc2015" onclick="_gaq.push(['_trackEvent', 'Homepage takeover', 'MWC 2015 takeover - 02.03.15', 'Learn more']);">Learn more on insights.ubuntu.com</a></p>
+		</div>
+		<div class="row-hero-image five-col prepend-one last-col">
+			<img src="{{ STATIC_URL }}img/homepage/mwc-cluster.svg" alt="" />
+      <div class="dots"></div>
+		</div>
+	</div>
+</section>
\ No newline at end of file
diff --git a/templates/takeovers/_ninja_sphere_takeover.html b/templates/takeovers/_ninja_sphere_takeover.html
new file mode 100644
index 00000000000..2816c51e064
--- /dev/null
+++ b/templates/takeovers/_ninja_sphere_takeover.html
@@ -0,0 +1,10 @@
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="eight-col">
+			<h1>Apps for your home</h1>
+			<p class="intro">Build apps for your home with the Ninja Sphere hardware and&nbsp;platform from Ninja Blocks. Powered by Ubuntu Core.</p>
+			<p><a href="https://ninjablocks.com/" onclick="_gaq.push(['_trackEvent', 'Homepage Link', 'Ninja Sphere takeover', 'From Ubuntu homepage Developer sale now on']);" class="link-cta-inverted">Developer sale now on</a></p>
+			<p><a href="/things" onclick="_gaq.push(['_trackEvent', 'Homepage Link', 'Ninja Sphere takeover', 'From Ubuntu homepage Learn about Snappy Core']);" class="link-inverted">Learn about Snappy Core&nbsp;&rsaquo;</a></p>
+		</div>
+	</div>
+</section>
diff --git a/templates/takeovers/_openstack_fundamentals_training.html b/templates/takeovers/_openstack_fundamentals_training.html
new file mode 100644
index 00000000000..c7dd153230e
--- /dev/null
+++ b/templates/takeovers/_openstack_fundamentals_training.html
@@ -0,0 +1,19 @@
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="six-col">
+			<h1>New Ubuntu OpenStack Fundamentals training courses</h1>
+			<p>Book your session in London, Baltimore or Vancouver.</p>
+			<p><a class="external" href="https://insights.ubuntu.com/2015/02/20/new-ubuntu-openstack-fundamentals-training-sessions-available/" onclick="_gaq.push(['_trackEvent', 'External Link', 'OpenStack Fundamentals Training Programme takeover', 'From Ubuntu homepage Learn more on insights.ubuntu.com link']);">Learn more on insights.ubuntu.com</a></p>
+			<img class="priority-0 main-cloud" src="{{ STATIC_URL }}img/homepage/main-cloud.png" alt="Cloud with pictograms" />
+			<img class="priority-0 small-cloud" src="{{ STATIC_URL }}img/homepage/small-cloud.png" alt="Small cloud" />
+			<img class="priority-0 purple-cloud" src="{{ STATIC_URL }}img/homepage/purple-cloud.png" alt="Purple cloud" />
+		</div>
+	</div>
+</section>
+
+
+
+
+
+
+
diff --git a/templates/takeovers/_openstack_installer_autopilot_takeover.html b/templates/takeovers/_openstack_installer_autopilot_takeover.html
new file mode 100644
index 00000000000..a6960f8aa82
--- /dev/null
+++ b/templates/takeovers/_openstack_installer_autopilot_takeover.html
@@ -0,0 +1,27 @@
+<section class="row strip no-border row-popular-cloud">
+    <div class="strip-inner-wrapper">
+        <div class="twelve-col">
+            <h1 class="no-margin-bottom">Put your OpenStack on autopilot</h1>
+            <div class="seven-col">
+                <p class="intro">Try The Canonical Distribution of Ubuntu OpenStack for free on 10 machines.</p>
+            </div>
+        </div>
+        <ul class="twelve-col no-margin-bottom no-bullets">
+            <li class="four-col">
+                <p>Configure cloud</p>
+                <img src="{{ STATIC_URL }}img/homepage/image-configure-new.png" width="292" height="166" alt="" />
+            </li>
+            <li class="four-col">
+                <p>Install regions</p>
+                <img src="{{ STATIC_URL }}img/cloud/ubuntu-openstack/image-install.png" width="292" height="166" alt="" />
+            </li>
+            <li class="four-col last-col">
+                <p>Monitor performance</p>
+                <img src="{{ STATIC_URL }}img/cloud/ubuntu-openstack/image-monitor.png" width="292" height="166" alt="" />
+            </li>
+        </ul>
+        <p class="clear eight-col">
+            <a href="http://www.ubuntu.com/download/cloud/install-ubuntu-openstack" class="link-cta-ubuntu" onclick="_gaq.push(['_trackEvent', 'Homepage takeover', 'worldwide openstack autopilot takeover 09.04.2015', 'Learn more']);">Get started now</a></a>
+        </p>
+    </div>
+</section>
\ No newline at end of file
diff --git a/templates/takeovers/_openstack_installer_takeover.html b/templates/takeovers/_openstack_installer_takeover.html
new file mode 100644
index 00000000000..8a5c7471020
--- /dev/null
+++ b/templates/takeovers/_openstack_installer_takeover.html
@@ -0,0 +1,25 @@
+<section class="row strip no-border row-popular-cloud">
+	<div class="strip-inner-wrapper">
+		<div class="twelve-col intro">
+            <h1 class="no-margin-bottom">Ubuntu OpenStack &mdash; The Canonical&nbsp;Distribution</h1>
+            <p class="intro">Your autopilot to a fast, customised, reference OpenStack cloud</p>
+		</div>
+        <ul class="twelve-col no-margin-bottom no-bullets">
+        	<li class="four-col">
+        		<p>Configure cloud</p>
+        		<img src="{{ STATIC_URL }}img/homepage/image-configure-new.png" width="292" height="166" alt="" />
+        	</li>
+        	<li class="four-col">
+        		<p>Install regions</p>
+        		<img src="{{ STATIC_URL }}img/cloud/ubuntu-openstack/image-install.png" width="292" height="166" alt="" />
+        	</li>
+        	<li class="four-col last-col">
+        		<p>Monitor performance</p>
+        		<img src="{{ STATIC_URL }}img/cloud/ubuntu-openstack/image-monitor.png" width="292" height="166" alt="" />
+        	</li>
+    	</ul>
+        <p class="clear eight-col">
+            <a href="/download/cloud/install-ubuntu-openstack" class="link-cta-ubuntu">Try now</a> or <a href="http://insights.ubuntu.com/2014/10/28/introducing-the-canonical-distribution-of-ubuntu-openstack-your-autopilot-for-rapid-customised-openstack-private-cloud-deployment-and-management">read the press release&nbsp;&rsaquo;</a>
+        </p>
+	</div>
+</section>
\ No newline at end of file
diff --git a/templates/takeovers/_openstack_roadshow_takeover.html b/templates/takeovers/_openstack_roadshow_takeover.html
new file mode 100644
index 00000000000..70d97fdf07a
--- /dev/null
+++ b/templates/takeovers/_openstack_roadshow_takeover.html
@@ -0,0 +1,14 @@
+{% comment %}body class: openstack_roadshow{% endcomment %}
+
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="six-col">
+			<h1>Canonical&rsquo;s OpenStack Roadshow is coming to a city near you!</h1>
+			<p class="intro">Join Mark Shuttleworth to learn about  &ldquo;OpenStack In Action&rdquo;</p>
+			<p><a href="http://ubunt.eu/mvjyc2" onclick="_gaq.push(['_trackEvent', 'Homepage Link', 'Canonical's OpenStack Roadshow homepage takeover', 'Sign up today']);" class="external">Sign up today</a></p>
+		</div>
+		<div class="prepend-one five-col last-col no-margin-bottom not-for-small">
+			<img src="{{ STATIC_URL }}img/homepage/openstack-roadshow-globe.svg" width="794" height="990" alt="">
+		</div>
+	</div>
+</section>
diff --git a/templates/takeovers/_openstack_summit_paris_takeover.html b/templates/takeovers/_openstack_summit_paris_takeover.html
index ebef381b37f..e7d30492291 100644
--- a/templates/takeovers/_openstack_summit_paris_takeover.html
+++ b/templates/takeovers/_openstack_summit_paris_takeover.html
@@ -1,16 +1,16 @@
-<section class="row strip no-border">
+<section class="row row-hero strip no-border">
 	<div class="strip-inner-wrapper">
-		<div class="four-col">
-			<h1>Going to ODS?<br>
-			Use your vote</h1>
-			<div class="six-col text-center for-mobile">
-				<img src="{{ STATIC_URL }}img/homepage/ods-takeover-image.png" alt="OpenStack Summit Paris" />
-			</div>
-			<p class="intro">Choose the subjects you want to see covered in Paris.</span></p>
-			<p class="intro"><a href="http://insights.ubuntu.com/2014/07/31/voting-begins-for-openstack-summit-sessions-in-paris/" class="external" onclick="_gaq.push(['_trackEvent', 'External Link', 'OpenStack Summit Paris takeover', 'From Ubuntu homepage Learn more link']);">Learn more</a></p>
+		<div class="six-col">
+			<h1>Extreme OpenStack</h1>
+			<p class="intro">
+				Maximum scale.<br/>
+				Maximum performance.<br/>
+				Maximum value.
+			</p>
+			<p><a href="https://insights.ubuntu.com/2014/11/03/extreme-openstack/" class="external" onclick="_gaq.push(['_trackEvent', 'External Link', 'OpenStack Summit Paris takeover 01.11.2014', 'Come visit us at the OpenStack Summit, booth #C8 on level 1']);">Come see us at the Openstack Summit,<br/>Palais des congrès de Paris</a></p>
 		</div>
-		<div class="text-center seven-col last-col push-one openstack-paris">
-			<img class="priority-0" src="{{ STATIC_URL }}img/homepage/ods-takeover-image.png" alt="OpenStack Summit Paris" />
+		<div class="five-col append-one last-col openstack-paris">
+			<img class="right" src="{{ STATIC_URL }}img/homepage/openstack-cluster.png" alt="OpenStack Summit Paris" />
 		</div>
 	</div>
 </section>
\ No newline at end of file
diff --git a/templates/takeovers/_openstack_training.html b/templates/takeovers/_openstack_training.html
new file mode 100644
index 00000000000..9615e52c322
--- /dev/null
+++ b/templates/takeovers/_openstack_training.html
@@ -0,0 +1,13 @@
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="six-col">
+			<img class="logo" src="{{ STATIC_URL }}img/homepage/open-stack-cloud-computing-logo.png" alt="OpenStack Cloud Computing logo" />
+			<h1>New Ubuntu OpenStack Fundamentals training course</h1>
+			<p>Book your session in Vancouver.</p>
+			<p><a class="external" href="https://insights.ubuntu.com/2015/02/20/new-ubuntu-openstack-fundamentals-training-sessions-available/ " onclick="_gaq.push(['_trackEvent', 'External Link', 'OpenStack Fundamentals training courses', 'From Ubuntu homepage Learn more on insights.ubuntu.com link']);">Learn more on insights.ubuntu.com</a></p>
+			<img class="priority-0 main-cloud" src="{{ STATIC_URL }}img/homepage/main-cloud.png" alt="Cloud with pictograms" />
+			<img class="priority-0 small-cloud" src="{{ STATIC_URL }}img/homepage/small-cloud.png" alt="Small cloud" />
+			<img class="priority-0 purple-cloud" src="{{ STATIC_URL }}img/homepage/purple-cloud.png" alt="Purple cloud" />
+		</div>
+	</div>
+</section><!-- /.row -->
diff --git a/templates/takeovers/_phone_flash_one_takeover.html b/templates/takeovers/_phone_flash_one_takeover.html
new file mode 100644
index 00000000000..3fbae6703f4
--- /dev/null
+++ b/templates/takeovers/_phone_flash_one_takeover.html
@@ -0,0 +1,13 @@
+{% comment %}body class: phone-flash-one-takeover{% endcomment %}
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="five-col">
+			<h1>Come and get it</h1>
+			<p class="intro">Flash sale on now</p>
+			<p><a onclick="_gaq.push(['_trackEvent', 'Homepage takeover', 'Phone - Buy one while you can - 02.03.2015', 'Flash sale link']);" href="http://www.bq.com/gb/ubuntu.html">Buy one while you can&nbsp;&rsaquo;</a></p>
+		</div>
+		<div class="seven-col last-col no-margin-bottom">
+			<img src="{{ STATIC_URL }}img/homepage/phone/flash-hero.png" alt="" />
+		</div>
+	</div>
+</section>
\ No newline at end of file
diff --git a/templates/takeovers/_phone_launch_takeover.html b/templates/takeovers/_phone_launch_takeover.html
new file mode 100644
index 00000000000..009273d39f2
--- /dev/null
+++ b/templates/takeovers/_phone_launch_takeover.html
@@ -0,0 +1,11 @@
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="six-col">
+			<h1>It&rsquo;s here</h1>
+			<p class="intro">Introducing Ubuntu Phone</p>
+			<p class="no-margin-bottom"><a href="http://ubunt.eu/BQphone" onclick="_gaq.push(['_trackEvent', 'Homepage takeover', 'Phone launch - 09.02.2015', 'Read our press release']);">Read our press release&nbsp;&rsaquo;</a></p>
+			<p><a href="/phone" onclick="_gaq.push(['_trackEvent', 'Homepage takeover', 'Phone launch - 09.02.2015', 'Find out more']);">Find out more<span class="off-left"> about Ubuntu Phone</span>&nbsp;&rsaquo;</a></p>
+			<p class="intro strap">Life at your fingertips</p>
+		</div>
+	</div>
+</section>
\ No newline at end of file
diff --git a/templates/takeovers/_phone_prelaunch_takeover.html b/templates/takeovers/_phone_prelaunch_takeover.html
new file mode 100644
index 00000000000..c153a0b9d74
--- /dev/null
+++ b/templates/takeovers/_phone_prelaunch_takeover.html
@@ -0,0 +1,11 @@
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="six-col">
+			<h1>Coming soon</h1>
+			<p><a onclick="_gaq.push(['_trackEvent', 'Homepage takeover', 'Phone - coming soon - 06.02.2015', 'Press release link']);" href="http://ubunt.eu/BQphone">Read our press release&nbsp;&rsaquo;</a></p>
+		</div>
+		<div class="six-col last-col no-margin-bottom">
+			<img src="{{ STATIC_URL }}img/homepage/phone/phone.png" alt="" />
+		</div>
+	</div>
+</section>
\ No newline at end of file
diff --git a/templates/takeovers/_roadshow_takeover.html b/templates/takeovers/_roadshow_takeover.html
new file mode 100644
index 00000000000..377b33024f4
--- /dev/null
+++ b/templates/takeovers/_roadshow_takeover.html
@@ -0,0 +1,14 @@
+{% comment %}body class: openstack_roadshow{% endcomment %}
+
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="six-col">
+			<h1>Canonical&rsquo;s OpenStack Roadshow is coming to Asia this May!</h1>
+			<p class="intro">Join Mark Shuttleworth to learn about  &ldquo;OpenStack In Action&rdquo;</p>
+			<p><a href="http://ubunt.eu/osrsasia" onclick="_gaq.push(['_trackEvent', 'Homepage Link', 'Canonical's OpenStack Roadshow Asia homepage takeover - 27-04-2015', 'Sign up today']);" class="external">Sign up today</a></p>
+		</div>
+		<div class="prepend-one five-col last-col no-margin-bottom not-for-small">
+			<img src="{{ STATIC_URL }}img/homepage/globe-asia.png" alt="Globe with OpenStack logo">
+		</div>
+	</div>
+</section>
diff --git a/templates/takeovers/_snappy_takeover.html b/templates/takeovers/_snappy_takeover.html
new file mode 100644
index 00000000000..56629c22b96
--- /dev/null
+++ b/templates/takeovers/_snappy_takeover.html
@@ -0,0 +1,13 @@
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="six-col">
+			<h1>Introducing <a href="/cloud/tools/snappy" onclick="_gaq.push(['_trackEvent', 'Homepage takeover', 'snappy on azure takeover 09.12.2014', 'Snappy']);">Snappy</a>&nbsp;Ubuntu&nbsp;Core</h1>
+			<p class="intro">Everything you love about Ubuntu on the cloud, now with perfect transactional updates. Snappy.</p>
+			<p>Try it today on the Microsoft Azure cloud.</p>
+			<p><a href="/cloud/tools/snappy" onclick="_gaq.push(['_trackEvent', 'Homepage takeover', 'snappy on azure takeover 09.12.2014', 'Learn more']);">Learn more&nbsp;&rsaquo;</a></p>
+		</div>
+		<div class="five-col prepend-one last-col">
+			<img src="{{ STATIC_URL }}img/cloud/tools/snappy/snappy.svg" alt="Snappy logo" />
+		</div>
+	</div>
+</section>
\ No newline at end of file
diff --git a/templates/takeovers/_snappy_takeover_aws.html b/templates/takeovers/_snappy_takeover_aws.html
new file mode 100644
index 00000000000..eee060b0b7e
--- /dev/null
+++ b/templates/takeovers/_snappy_takeover_aws.html
@@ -0,0 +1,13 @@
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="six-col">
+			<h1><a href="/cloud/tools/snappy" onclick="_gaq.push(['_trackEvent', 'Homepage takeover', 'snappy on AWS takeover - top - 19.12.2014', 'Snappy']);">Snappy</a>&nbsp;Ubuntu&nbsp;Core <br />now on&nbsp;Amazon</h1>
+			<p class="intro">Everything you love about Ubuntu on the cloud, now with perfect transactional updates. Snappy.</p>
+			<p>Try it today on the Amazon Web Services EC2.</p>
+			<p><a href="/cloud/tools/snappy" onclick="_gaq.push(['_trackEvent', 'Homepage takeover', 'snappy on AWS takeover - bottom - 19.12.2014', 'Learn more']);">Learn more&nbsp;&rsaquo;</a></p>
+		</div>
+		<div class="five-col prepend-one last-col">
+			<img src="{{ STATIC_URL }}img/cloud/tools/snappy/snappy.svg" alt="Snappy logo" />
+		</div>
+	</div>
+</section>
\ No newline at end of file
diff --git a/templates/takeovers/_snappy_takeover_gce.html b/templates/takeovers/_snappy_takeover_gce.html
new file mode 100644
index 00000000000..d17d6310da7
--- /dev/null
+++ b/templates/takeovers/_snappy_takeover_gce.html
@@ -0,0 +1,13 @@
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="six-col">
+			<h1><a href="/cloud/tools/snappy" onclick="_gaq.push(['_trackEvent', 'Homepage takeover', 'snappy on Google takeover - top - 16.12.2014', 'Snappy']);">Snappy</a>&nbsp;Ubuntu&nbsp;Core<br /> now on Google</h1>
+			<p class="intro">Everything you love about Ubuntu on the cloud, now with perfect transactional updates. Snappy.</p>
+			<p>Try it today on the Google Compute Environment.</p>
+			<p><a href="/cloud/tools/snappy" onclick="_gaq.push(['_trackEvent', 'Homepage takeover', 'snappy on Google takeover - bottom - 16.12.2014', 'Learn more']);">Learn more&nbsp;&rsaquo;</a></p>
+		</div>
+		<div class="five-col prepend-one last-col">
+			<img src="{{ STATIC_URL }}img/cloud/tools/snappy/snappy.svg" alt="Snappy logo" />
+		</div>
+	</div>
+</section>
\ No newline at end of file
diff --git a/templates/takeovers/_things_takeover.html b/templates/takeovers/_things_takeover.html
new file mode 100644
index 00000000000..9d05c5de397
--- /dev/null
+++ b/templates/takeovers/_things_takeover.html
@@ -0,0 +1,13 @@
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="six-col">
+			<h1>Got a thing for Ubuntu?</h1>
+			<p class="intro">The snappy platform for inventors, with security at the core.</p>
+			<p>Ubuntu Core is now available on a wide range of developer boards to power the amazing world of robots, drones and devices.</p>
+			<p><a href="/things" onclick="_gaq.push(['_trackEvent', 'Homepage takeover', 'things takeover - 20.01.15', 'Learn more']);">Learn more&nbsp;&rsaquo;</a></p>
+		</div>
+		<div class="five-col prepend-one last-col">
+			<img src="{{ STATIC_URL }}img/cloud/tools/snappy/snappy.svg" alt="Snappy logo" />
+		</div>
+	</div>
+</section>
\ No newline at end of file
diff --git a/templates/takeovers/_vivid_release_kylin.html b/templates/takeovers/_vivid_release_kylin.html
new file mode 100644
index 00000000000..5f6beed69e5
--- /dev/null
+++ b/templates/takeovers/_vivid_release_kylin.html
@@ -0,0 +1,10 @@
+<section class="row row-hero strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="eight-col">
+			<h1>U现已着陆！</h1>
+			<p class="intro">即刻便可获得优麒麟最新的15.04版本</p>
+			<p><a href="http://cn.ubuntu.com/download" onclick="_gaq.push(['_trackEvent', 'Homepage Link', '15.04 release takeover - kylin', 'Get Ubuntu Desktop']);" class="link-cta-ubuntu">立刻下载</a></p>
+			<p><a href="http://cn.ubuntu.com/desktop" onclick="_gaq.push(['_trackEvent', 'Homepage Link', '15.04 release takeover - kylin', 'Learn more about Ubuntu']);">了解优麒麟详情&nbsp;&rsaquo;</a></p>
+		</div>
+	</div>
+</section>
diff --git a/templates/_base/404.html b/templates/templates/404.html
similarity index 92%
rename from templates/_base/404.html
rename to templates/templates/404.html
index c0669ec7fe2..3d82f7b5d00 100755
--- a/templates/_base/404.html
+++ b/templates/templates/404.html
@@ -1,4 +1,4 @@
-{% extends "_base/one-column.html" %}
+{% extends "templates/one-column.html" %}
 
 {% block title %}404 Page not found{% endblock %}
 
diff --git a/templates/_base/500.html b/templates/templates/500.html
similarity index 97%
rename from templates/_base/500.html
rename to templates/templates/500.html
index 61733e00ed1..b2de921b926 100755
--- a/templates/_base/500.html
+++ b/templates/templates/500.html
@@ -1,4 +1,4 @@
-{% extends "_base/one-column.html" %}
+{% extends "templates/one-column.html" %}
 
 {% block title %}Ubuntu | Server error{% endblock %}
 
diff --git a/templates/_base/_contextual_footer.html b/templates/templates/_contextual_footer.html
similarity index 73%
rename from templates/_base/_contextual_footer.html
rename to templates/templates/_contextual_footer.html
index d93f946d847..d8adfc8ee5c 100755
--- a/templates/_base/_contextual_footer.html
+++ b/templates/templates/_contextual_footer.html
@@ -1,15 +1,15 @@
-{% if level_2 == 'contact-us' and not level_3 or level_3 == 'contact-us' or level_4 == 'contact-us' and not level_5 or level_1 == 'privacy-policy' or level_1 == '2012' or level_1 == '2013' or level_2 == 'register' or level_1 == 'testing' or level_1 == 'legal' %}
+{% if level_2 == 'contact-us' and not level_3 or level_3 == 'contact-us' or level_4 == 'contact-us' and not level_5 or level_1 == 'privacy-policy' or level_1 == '2012' or level_1 == '2013' or level_2 == 'register' or level_1 == 'testing' or level_1 == 'legal' or level_3 == 'training-form' or level_2 == 'newsletter-thank-you' %}
 {% else %}
 <div id="context-footer" class="{{ level_1 }}-context-footer no-border">
 <hr />
 	<div class="twelve-col vertical-divider">
-	{% with ""|add:level_1|add:"/_includes/_contextual_footer.html" as contextual %}
-		<!--<div class="feature-one three-col">
+	{% with ""|add:level_1|add:"/shared/_contextual_footer.html" as contextual %}
+	{% comment %}	<!--<div class="feature-one three-col">
 			<h3>Explore further</h3>
 			{% with ""|add:level_1|add:"/_nav_secondary.html" as explore %}
 				{% include explore with list_class="list smaller" %}
 			{% endwith %}
-		</div>-->
+		</div>-->{% endcomment %}
 	{% include contextual %}
 	{% endwith %}
 	</div><!-- /.twelve-col -->
diff --git a/templates/_base/_further_reading_links.html b/templates/templates/_further_reading_links.html
similarity index 100%
rename from templates/_base/_further_reading_links.html
rename to templates/templates/_further_reading_links.html
diff --git a/templates/_base/_nav_breadcrumb.html b/templates/templates/_nav_breadcrumb.html
similarity index 100%
rename from templates/_base/_nav_breadcrumb.html
rename to templates/templates/_nav_breadcrumb.html
diff --git a/templates/_base/base.html b/templates/templates/base.html
similarity index 75%
rename from templates/_base/base.html
rename to templates/templates/base.html
index 3c0babd6698..71e327f1c06 100755
--- a/templates/_base/base.html
+++ b/templates/templates/base.html
@@ -8,9 +8,12 @@
 
 <meta charset="UTF-8" />
 <meta name="description" content="{% block meta_description %}Ubuntu is an open source software platform that runs everywhere from the smartphone, the tablet and the PC to the server and the cloud.{% endblock %}" />
-<meta name="keywords" content="{% block meta_keywords %}Ubuntu, Ubuntu operating system, OS, platform, Linux, distribution, OpenStack, Ubuntu OpenStack, Ubuntu Cloud, server, tablet, smartphone, phone, Windows alternative, Mac alternative, free software, open source, thin client, Juju, MAAS, Landscape, Ubuntu Advantage, download Ubuntu, deployment, provisioning, service orchestration, services, commercial support, paid support, long term support, LTS, 14.04, Trusty Tahr, Icehouse{% endblock %}" />
+<meta name="keywords" content="{% block meta_keywords %}Ubuntu, Ubuntu operating system, OS, platform, Linux, distribution, OpenStack, Ubuntu OpenStack, Ubuntu Cloud, server, tablet, smartphone, phone, Windows alternative, Mac alternative, free software, open source, thin client, Juju, MAAS, Landscape, Ubuntu Advantage, download Ubuntu, deployment, provisioning, service orchestration, services, commercial support, paid support, long term support, LTS, 14.04, 14.10, Trusty Tahr, Utopic Unicorn, Icehouse, Juno{% endblock %}" />
 <meta name="author" content="Canonical" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
+<meta property="twitter:account_id" content="4503599627481511" />
+<meta name="google-site-verification" content="ddh2iq7ZuKf1LpkL_gtM_T7DkKDVD7ibq6Ceue4a_3M" />
+<meta name="theme-color" content="#DD4814">
 
 <!--[if IE]>
 <meta http-equiv="X-UA-Compatible" content="IE=8">
@@ -26,9 +29,6 @@
 <link rel="apple-touch-icon-precomposed" href="{{ STATIC_URL }}img/apple-touch-icon-precomposed.png">
 <link type="text/plain" rel="author" href="{{ STATIC_URL }}files/humans.txt" />
 
-<!-- google fonts -->
-<link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic%7CUbuntu+Mono' rel='stylesheet' type='text/css' />
-
 <!-- stylesheets -->
 <link rel="stylesheet" type="text/css" media="screen" href="//assets.ubuntu.com/sites/guidelines/css/responsive/latest/ubuntu-styles.css" />
 <link rel="stylesheet" type="text/css" media="screen" href="{{ STATIC_URL }}css/styles.css" />
@@ -41,8 +41,22 @@
 
 {% block head_extra %}{% endblock %}
 
+<!-- Google tag manager -->{% comment %}Bug 1445370 relates{% endcomment %}
+<script>dataLayer = [];</script>
+
 </head>
-<body class="{% if level_1 != "" %}{% if level_1 == '2012' %}body-{% endif %}{{ level_1 }}{% endif %}{% if level_2 %} {% if level_1 == '2012' %}body-{% endif %}{{ level_1 }}-{{ level_2 }}{% endif %}{% if level_3 %} {% if level_1 == '2012' %}body-{% endif %}{{ level_1 }}-{{ level_2 }}-{{ level_3 }} {% endif %} {% include "_base/body-class.html" %}{% if extra_body_class != "" %} {% block extra_body_class %}{% endblock %}{% endif %}">
+
+<body{% if level_1 == 'phone' %} onload="init();"{% endif %} class="{% if level_1 != "" %}{% if level_1 == '2012' %}body-{% endif %}{{ level_1 }}{% endif %}{% if level_2 %} {% if level_1 == '2012' %}body-{% endif %}{{ level_1 }}-{{ level_2 }}{% endif %}{% if level_3 %} {% if level_1 == '2012' %}body-{% endif %}{{ level_1 }}-{{ level_2 }}-{{ level_3 }} {% endif %} {% include "templates/body-class.html" %}{% if extra_body_class != "" %} {% block extra_body_class %}{% endblock %}{% endif %}">
+
+<!-- Google Tag Manager -->
+<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-K92JCQ"
+height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+'//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+})(window,document,'script','dataLayer','GTM-K92JCQ');</script>
+<!-- End Google Tag Manager -->
 
 <header class="banner global" role="banner">
 {% block header_banner %}
@@ -80,7 +94,7 @@
 				{% include "download/_nav_secondary.html" with promo="true" %}
 			</li>
 		</ul>
-		{% include "_base/search.html" %}
+		{% include "templates/search.html" %}
 	</nav>
 {% endblock header_banner %}
 </header>
@@ -102,7 +116,7 @@
 </div><!-- /.wrapper -->
 
 <!-- footer content goes here -->
-{% include "_base/footer.html" %}
+{% include "templates/footer.html" %}
 
 <!-- Use this only until Modernizr fixes Opera Mini background-size detection -->
 <script>
@@ -140,13 +154,22 @@
 </script>
 {% endif %}
 
-<!-- crazy egg -->
+<!-- Google Code for Remarketing Tag -->
 <script type="text/javascript">
-   setTimeout(function(){var a=document.createElement("script");
-   var b=document.getElementsByTagName('script')[0];
-   a.src=document.location.protocol+"//dnn506yrbagrg.cloudfront.net/pages/scripts/0011/8875.js?"+Math.floor(new Date().getTime()/3600000);
-   a.async=true;a.type="text/javascript";b.parentNode.insertBefore(a,b)}, 1);
+/* <![CDATA[ */
+var google_conversion_id = 1012391776;
+var google_custom_params = window.google_tag_params;
+var google_remarketing_only = true;
+/* ]]> */
+</script>
+<script type="text/javascript" src="//www.googleadservices.com/pagead/conversion.js">
 </script>
+<noscript>
+	<div style="display:inline;">
+		<img height="1" width="1" style="border-style:none;" alt="" src="//googleads.g.doubleclick.net/pagead/viewthroughconversion/1012391776/?value=0&amp;guid=ON&amp;script=0"/>
+	</div>
+</noscript>
+
 
 </body>
-</html><!-- the end -->
\ No newline at end of file
+</html>
diff --git a/templates/_base/body-class.html b/templates/templates/body-class.html
similarity index 100%
rename from templates/_base/body-class.html
rename to templates/templates/body-class.html
diff --git a/templates/_base/cookie-policy.html b/templates/templates/cookie-policy.html
similarity index 100%
rename from templates/_base/cookie-policy.html
rename to templates/templates/cookie-policy.html
diff --git a/templates/templates/error.html b/templates/templates/error.html
new file mode 100644
index 00000000000..23a25a52585
--- /dev/null
+++ b/templates/templates/error.html
@@ -0,0 +1,21 @@
+{% extends "templates/one-column.html" %}
+
+{% block title %}404 Page not found{% endblock %}
+
+{% block extra_body_class %}error-page error404{% endblock %}
+
+{% block head_extra %}{% endblock %}
+
+{% block header %}
+<div class="row no-border hero-box">
+	<div class="six-col">
+		<img src="{{ STATIC_URL }}img/error/image-404.svg" alt="Error owl" width="365" />
+	</div>
+	<div class="six-col last-col">
+		<h1>Error</h1>
+		<p>{{ error }}</p>
+	</div>
+</div><!-- / .row -->
+{% endblock %}
+{% block content %}
+{% endblock content %}
diff --git a/templates/_base/footer.html b/templates/templates/footer.html
similarity index 90%
rename from templates/_base/footer.html
rename to templates/templates/footer.html
index b9c9bae3520..a8ae8726330 100755
--- a/templates/_base/footer.html
+++ b/templates/templates/footer.html
@@ -40,16 +40,14 @@
 		<li><h2><a href="/support/">Support</a></h2>
 			{% include "support/_nav_secondary.html" %}
 		</li>
-		<li><h2><a href="/partners/">Partners</a></h2>
-			{% include "partners/_nav_secondary.html" %}
-		</li>
 		<li><h2><a href="/about/">About</a></h2>
 			<ul class="second-level-nav">
 				<li><a href="/about/about-ubuntu">About Ubuntu</a></li>
 				<li><a href="http://www.canonical.com/careers">Careers</a></li>
 				<li><a href="/about/canonical-and-ubuntu">Canonical and Ubuntu</a></li>
 				<li><a accesskey="7" href="/about/contact-us">Contact us</a></li>
-				<li><a accesskey="2" href="http://insights.ubuntu.com/feed/">Canonical news feed</a></li>
+				<li><a href="http://insights.ubuntu.com/feed/">Canonical news feed</a></li>
+				<li class="last-item"><a accesskey="2" href="https://insights.ubuntu.com/press-centre/">Press centre</a></li>
 			</ul>
 		</li>
 	</ul>
@@ -58,7 +56,7 @@
 <div class="legal clearfix">
  <p class="twelve-col">&copy; {% now "Y" %} Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
  <ul class="inline clear">
-	 <li><a href="/legal">Legal information</a></li>
+	 <li><a accesskey="8" href="/legal">Legal information</a></li>
 	 <li><a href="https://bugs.launchpad.net/ubuntu-website-content/">Report a bug on this site</a></li>
 </ul>
 <span class="accessibility-aid"><a href="#">Got to the top of the page</a></span>
diff --git a/templates/_base/header.html b/templates/templates/header.html
similarity index 97%
rename from templates/_base/header.html
rename to templates/templates/header.html
index 6bdb4ce1e95..b367a8541b0 100755
--- a/templates/_base/header.html
+++ b/templates/templates/header.html
@@ -14,6 +14,6 @@
 		<li><a href="http://shop.canonical.com/">Shop</a></li>
 	</ul>
 	<a class="logo-ubuntu" href="/">
-		<img width="118" height="27" src="{{ STATIC_URL }}img/logo.png" alt="Ubuntu logo"/>
+		<img width="118" height="27" src="{{ STATIC_URL }}img/logo.png" alt="Ubuntu logo" />
 	</a>
 </nav>
diff --git a/templates/_base/marketo.html b/templates/templates/marketo.html
similarity index 100%
rename from templates/_base/marketo.html
rename to templates/templates/marketo.html
diff --git a/templates/_base/meta.html b/templates/templates/meta.html
similarity index 100%
rename from templates/_base/meta.html
rename to templates/templates/meta.html
diff --git a/templates/_base/one-column.html b/templates/templates/one-column.html
similarity index 60%
rename from templates/_base/one-column.html
rename to templates/templates/one-column.html
index f31787929b5..05eb9f27743 100755
--- a/templates/_base/one-column.html
+++ b/templates/templates/one-column.html
@@ -1,4 +1,4 @@
-{% extends "_base/base.html" %}
+{% extends "../sites/ubuntu/templates/base.html" %}
 
 {% block outer_content %}
     {% block content %}{% endblock %}
diff --git a/templates/_base/search.html b/templates/templates/search.html
similarity index 100%
rename from templates/_base/search.html
rename to templates/templates/search.html
diff --git a/templates/things/_nav_secondary.html b/templates/things/_nav_secondary.html
new file mode 100755
index 00000000000..c3c81d6a703
--- /dev/null
+++ b/templates/things/_nav_secondary.html
@@ -0,0 +1,10 @@
+	<ul{% if list_class %} class="{{ list_class }}"{% endif %} class="second-level-nav">
+		<li class="first{% if level_1 == 'things' and not level_2 %} active{% endif %}"><a href="/cloud">Overview</a></li>
+		<li{% if level_2 == 'openstack' %} class="active"{% endif %}><a href="/cloud/openstack">OpenStack</a></li>
+		<li{% if level_2 == 'bootstack' %} class="active"{% endif %}><a href="/cloud/bootstack">BootStack</a></li>
+		<li{% if level_2 == 'training' %} class="active"{% endif %}><a href="/cloud/training">Training</a></li>
+		<li{% if level_2 == 'public-cloud' %} class="active"{% endif %}><a href="/cloud/public-cloud">Public cloud</a></li>
+		<li{% if level_2 == 'tools' %} class="active"{% endif %}><a href="/cloud/tools">Tools</a></li>
+		<li{% if level_2 == 'management' %} class="active"{% endif %}><a href="/cloud/management">Cloud management</a></li>
+		<li{% if level_2 == 'labs' %} class="last-item"{% endif %}{% if level_2 == 'ecosystem' %} class="active"{% endif %}><a href="/cloud/ecosystem">Ecosystem</a></li>
+	</ul>
diff --git a/templates/things/base_things.html b/templates/things/base_things.html
new file mode 100755
index 00000000000..9ff55994573
--- /dev/null
+++ b/templates/things/base_things.html
@@ -0,0 +1,7 @@
+{% extends "templates/base.html" %}
+{% block meta_keywords %}snappy, Core Ubuntu, Internet of things, IoT{% endblock %}
+
+{% block outer_content %}
+    {% block content %}{% endblock %}
+		{% include "templates/_contextual_footer.html" %}
+{% endblock %}
diff --git a/templates/things/index.html b/templates/things/index.html
new file mode 100644
index 00000000000..ed1a9f293b8
--- /dev/null
+++ b/templates/things/index.html
@@ -0,0 +1,250 @@
+{% extends "things/base_things.html" %}
+
+{% block title %}Ubuntu Core on Internet Things | Snappy{% endblock %}
+
+{% block meta_description %}A new, transactionally updated Ubuntu for clouds and devices.{% endblock meta_description %}
+{% block meta_keywords %}snappy, containers, docker, cloud development, click packages, transactional image updates, ubuntu core{% endblock meta_keywords %}
+
+{% block second_level_nav_items %}
+    <ul class="breadcrumb"><li><a href="/things/">Things</a>&nbsp;›</li></ul>
+    <ul class="second-level-nav"><li class="first active"><a href="/things/">Overview</a></li></ul>
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row ro-hero">
+   <div class="twelve-col no-margin-bottom">
+        <div class="eight-col">
+          <h2>Ubuntu Core on Internet Things</h2>
+        	<p>Snappy Ubuntu Core delivers bullet-proof security, reliable updates and the enormous Ubuntu ecosystem at your fingertips, bringing the developer&#39;s favourite cloud platform to a wide range of internet things, connected devices and autonomous machines. Now available on a wide range of 32 and 64-bit ARM and X86 platforms.</p>
+          <p><a class="link-cta-ubuntu" href="http://developer.ubuntu.com/snappy/start">Get started with Ubuntu Core</a></p>
+        	<p><a href="/snappy">Learn more about Snappy Ubuntu Core&nbsp;&rsaquo;</a></p>
+    	</div>
+        <div class="four-col last-col align-center">
+            <img src="{{ STATIC_URL }}img/cloud/tools/snappy/snappy.png" alt="Snappy logo" />
+        </div>
+    </div>
+</div><!-- /row -->
+
+<div class="row row-grey">
+   <div class="twelve-col no-margin-bottom equal-height">
+        <div class="eight-col">
+            <h2>Secure critical infrastructure and devices</h2>
+            <p>Critical infrastructure systems are an attack vector for espionage and disruption. Ubuntu Core devices are automatically updated to address systemic vulnerabilities - fast. Ubuntu Core also provides best-in-class application isolation based on kernel containers, minimising the impact of errors and vulnerabilities in third-party applications.</p>
+            <p>&#8220;Certified and supported Ubuntu Core platforms set the new standard for safety and security in connected devices&#8221; said Mark Shuttleworth, founder of Canonical and Ubuntu. &#8220;Device manufacturers who choose Ubuntu Core on certified platforms now have a popular platform that meets corporate and government requirements for security updates and management.&#8221;</p>
+
+        </div>
+        <div class="four-col last-col align-center align-vertically">
+            <img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-ubuntu.png" width="167" height="167" alt="" />
+        </div>
+    </div>
+</div><!-- /row -->
+
+<div class="row no-border">
+   <div class="twelve-col no-margin-bottom">
+        <div class="eight-col">
+            <h2>Smarter, safer robots</h2>
+            <p>Early users of Ubuntu on connected devices are pioneers in robotics, drones and open hubs for connected things. Ubuntu Core is the secure platform for super-smart stuff, with an app store that brings the very latest software straight to your device and easy connections to every cloud.</p>
+            <p>That&#39;s why Ubuntu underpins the work of the Open Source Robotics Foundation.</p>
+        </div>
+        <div class="four-col last-col align-center">
+            <img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-safety-orange.svg" width="167" height="167" alt="" />
+        </div>
+    </div>
+</div><!-- /row -->
+
+<div class="row row-quote">
+    <blockquote class="pull-quote">
+        <p><span>&ldquo;</span>Ubuntu Core enables our new app store for open robots. That creates a market for innovation and competition in smart robotics, with apps and updates delivered straight from developers to a new class of open, intelligent robots powered by open platforms and open protocols.<span>&rdquo;</span></p>
+        <p><cite>Brian Gerkey, CEO of the Open Source Robotics Foundation</cite></p>
+    </blockquote>
+</div><!-- /.row quote no-border -->
+
+<div class="row row-grey equal-height">
+   <div class="twelve-col no-margin-bottom equal-height">
+        <div class="eight-col">
+            <h2>Software-defined appliances simplify telco CPE</h2>
+            <p>Canonical is working with telecoms operators to simplify customer premises equipment acquisition, deployment and maintenance, building on the carrier-grade systems and application update mechanisms built into snappy Ubuntu Core. Instead of branded hardware appliances with fragmented management systems, customers can look forward to standard management systems on commodity X86 and ARM hardware for a wide range of software-defined CPE appliances delivered as snappy apps and frameworks.</p>
+            <p>&#8220;Snappy Ubuntu Core is a valuable and powerful IoT enabler for talented developers and inventors. Our mission is to support them with Deutsche Telekom&#39;s resources and business knowledge. We believe that our partnership will bring groundbreaking products and services created by creative individuals gathered inside and around Ubuntu community.&#8221; said Jakub Probola, of Deutsche Telekom&#39;s incubator, hub:raum.</p>
+        </div>
+        <div class="four-col last-col align-center align-vertically">
+            <img src="{{ STATIC_URL }}img/partners/partner-logo-hubraum.png" width="167" alt="hub:raum logo" />
+        </div>
+    </div>
+</div><!-- /row -->
+
+<div class="row no-border no-margin-bottom equal-height">
+    <div class="eight-col">
+        <h2>Amazing autonomous things</h2>
+        <p>Commercial vendors of drones and other smart things can now deliver reliable software updates automatically, and sell software to their customers, on an open platform.</p>
+    </div>
+    <div class="four-col last-col align-center align-vertically">
+        <img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-virtualisation-orange.svg" width="167" height="167" alt="" />
+    </div>
+</div><!-- /row -->
+
+<div class="row row-quote equal-height">
+    <div class="three-col align-center align-vertically">
+        <img src="{{ STATIC_URL }}img/snappy/erlecopter_211_173.png" width="211" height="173" alt="Erle Copter" />
+    </div>
+    <div class="nine-col last-col">
+        <blockquote class="pull-quote">
+            <p><span>&ldquo;</span>We are delighted to reveal the Erle-Copter as the world&#39;s first Ubuntu Core powered drone that will stay secure automatically and can be upgraded with additional capabilities from the app store. An open platform attracts innovators and experts to collaborate and compete, we are excited to lead the way with open drones for education, research and invention.<span>&rdquo;</span></p>
+            <p><cite>Victor Mayoral Vilches, CTO of <a href="http://erlerobotics.com/blog/home-creative/" class="external">Erle Robotics</a></cite></p>
+        </blockquote>
+    </div>
+</div><!-- /.row quote no-border -->
+
+<div class="row row-grey equal-height">
+    <div class="eight-col">
+        <h2>Smarter switches, radical routers</h2>
+        <p>Next-generation switches are capable of running Ubuntu Core and a collection of network-centric applications.</p>
+        <p>Cavium, one of the world&#39;s leaders in network silicon, will support Ubuntu Core for its switch and router solutions, accelerating the development of next-generation smart networking infrastructure by a wide range of <span class="caps">OEM </span>manufacturers.</p>
+        <p>&#8220;Ubuntu met our need for a secure and reliable platform that enables real-time updates and an open marketplace for network intelligence&#8221; says Larry Wikelius, Director of Ecosystems and Partner Enabling at Cavium, &#8220;and it is easy to bring our Linux-based applications to Ubuntu Core.&#8221;</p>
+    </div>
+    <div class="four-col last-col align-center align-vertically">
+        <img src="{{ STATIC_URL }}img/partners/partners-logo-cavium.png" width="167" height="" alt="Cavium logo" />
+    </div>
+</div><!-- /row -->
+
+<div class="row no-border equal-height">
+    <div class="eight-col">
+        <h2>A marketplace for incredible apps on open devices</h2>
+        <p>General-purpose, extensible devices like hubs, set-top boxes and gateways create a market for apps from a global developer community. &#8220;The app store for internet things is now open on Ubuntu,&#8221; says Maarten Ectors, VP of Internet Things at Canonical, the company that leads Ubuntu development. &#8220;Ubuntu makes it easy to develop amazing apps for incredible devices on your laptop, test on the cloud and publish straight to a global market of diverse devices.&#8221;</p>
+    </div>
+    <div class="four-col last-col align-center align-vertically">
+        <img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-shop-orange.svg" width="167" height="167" alt="" />
+    </div>
+</div><!-- /row -->
+
+<div class="row  row-grey equal-height">
+    <div class="eight-col">
+    	<h2>Enterprise grade, industry hardened</h2>
+    	<p>Ubuntu&#39;s widespread deployment in enterprise data centres sets the stage for its entry to industrial control and management systems.</p>
+    	<p>&#8220;RTI is excited about the work Canonical is doing with the Snappy Ubuntu Core.  It will enable <span class="caps">RTI </span>customers to more easily build secure distributed systems for the Industrial IoT&#8221; said Stan Schneider, CEO of Real-Time Innovations, Inc. &#8220;As a member of the Industrial Internet Consortium Steering Committee, I am also excited to have Canonical join the IIC.&#8221;</p>
+    </div>
+    <div class="four-col last-col align-center align-vertically">
+        <img src="{{ STATIC_URL }}img/partners/partner-logo-rti.png" width="167" height="" alt="RTI logo" />
+    </div>
+</div><!-- /row -->
+
+<div class="row equal-height no-border">
+    <div class="eight-col">
+        <h2>The developer&#39;s favourite</h2>
+        <p>The huge range of software on Ubuntu helps developers with sophisticated processing such as vision, sensor processing, motion and location. This popularity leads to frequent sightings of &#8220;Ubuntu in the wild&#8221; in projects as diverse self-driving cars, entertainment control systems, deep space mission control centers, and smart display systems. Ubuntu Core provides a production-ready platform for products that will ship across the globe, be hard to access physically and be connected to the internet for updates and security fixes.</p>
+    </div>
+    <div class="four-col last-col align-center align-vertically">
+        <img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-developer-orange.svg" width="167" height="167" alt="" />
+    </div>
+</div><!-- /row -->
+
+<div class="row row-quote">
+        <blockquote class="pull-quote">
+                <p><span>&ldquo;</span>We are inspired to support entrepreneurs and inventors focused on life-changing projects. From scientific breakthroughs by autonomous robotic explorers to everyday miracles like home safety and energy efficiency, our world is being transformed by smart machines that can see, hear, move, communicate and sense in unprecedented ways.<span>&rdquo;</span></p>
+                <p><cite>Maarten Ectors, VP IoT, Canonical</cite></p>
+        </blockquote>
+</div><!-- /.row quote no-border -->
+
+<div class="row row-grey equal-height">
+    <div class="eight-col">
+        <h2>Cloud connectivity with Azure and AWS</h2>
+        <p>Both Microsoft and Amazon have agreed to publish their IoT developer APIs on Ubuntu Core for snappy developers.</p>
+        <p>&#8220;Smart industrial system need secure cloud back-ends for data storage and analysis. Microsoft and Canonical are partnering to deliver developer APIs to enable Ubuntu Core for snappy developers. This partnership will simplify cloud-backed device development.&#8221; says John Shewchuk, Technical Fellow at Microsoft.</p>
+    </div>
+    <div class="four-col last-col align-center align-vertically">
+        <img src="{{ STATIC_URL }}img/partners/partner-logo-microsoft.png" width="" height="167" alt="Microsoft logo" />
+    </div>
+</div><!-- /row -->
+
+<div class="row no-border equal-height">
+    <div class="eight-col">
+        <h2>One platform, from cloud to device</h2>
+        <p>Ubuntu Core presents a single identical platform from cloud to device. &#8220;It has never been easier to develop for embedded devices,&#8221; comments Alexander Sack, who leads device engineering at Canonical. &#8220;Ubuntu Core on the cloud is a perfect platform for test and dev, I can simulate my device online and launch thousands of simulated devices on demand.&#8221; Canonical ensures that Ubuntu Core on the cloud and on devices present the exact same APIs and receive identical security updates.</p>
+        <p>Developers of ownCloud, the popular private personal cloud solution, have already published ownCloud in the app store, so any spare PC can be turned into a personal, private and secure file sync and share with Ubuntu Core.</p>
+    </div>
+    <div class="four-col last-col align-center align-vertically">
+        <img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-accessories-orange.svg" width="167" height="167" alt="" />
+    </div>
+</div><!-- /row -->
+
+<div class="row row-quote equal-height">
+    <div class="three-col align-center align-vertically">
+        <img src="{{ STATIC_URL }}img/partners/partners-logo-owncloud.svg" width="167" height="119" alt="ownCloud logo" />
+    </div>
+    <div class="nine-col last-col">
+        <blockquote class="pull-quote">
+            <p><span>&ldquo;</span>We are able to deliver the latest ownCloud straight to your device, adding features and fixing problems for worry-free, secure personal cloud systems.<span>&rdquo;</span></p>
+            <p><cite>Frank Karlitschek, founder and CTO of ownCloud</cite></p>
+        </blockquote>
+    </div>
+</div><!-- /.row quote no-border -->
+
+<div class="row row-grey equal-height">
+    <div class="eight-col">
+        <h2>Access to the best enterprise software</h2>
+        <p>As smart devices move into the enterprise they will need to integrate with existing identity, management and monitoring systems, and Ubuntu brings the widest range of cloud-era solutions to the table. For example, Forgerock is a widely adopted leader in identity and access management for all things including people, things, places and events, and will make available its solutions for developers on Ubuntu Core systems.</p>
+        <p>&#8220;Identity for IoT has driven Identity Management to increasing importance.  We are very happy to jointly assure that each Ubuntu Core powered smart device can be securely identified and corporations can easily control access to it from the cloud.&#8221; says Lasse Andresen, CTO of Forgerock.</p>
+    </div>
+    <div class="four-col last-col align-center align-vertically">
+        <img src="{{ STATIC_URL }}img/partners/partner-logo-forgerock.png" width="167" height="" alt="ForgeRock logo" />
+    </div>
+</div><!-- /row -->
+
+<div class="row no-border no-margin-bottom  equal-height">
+    <div class="eight-col">
+        <h2>Widest range of supported devices</h2>
+        <p>Both ARMv7 and X86-64 are supported. Using standard PC equipment makes device prototyping easy. &#8220;A spare laptop or PC becomes your initial development board,&#8221; explains Alexander Sack. &#8220;Turn an old PC into a home storage server or prototype your robot app on a spare laptop or virtual machine.&#8221;</p>
+        <h3>From low-cost consumer developer boards&#8230;</h3>
+        <p>From the $35 ARMv7 Odroid-C1, which offers 1 GB RAM along with gigabit networking and a wide range of RaspberryPi-style expansion ports and pins, to the $179 2 Ghz Octacore Odroid-XU3 with 2 GB RAM and loads of display and I/O, Ubuntu works across the widest range of ARM developer boards, helping you develop your application secure in the knowledge that you can select the right silicon close the point of manufacture. Reducing the time between innovation and sales is a key advantage for Ubuntu based devices.</p>
+        <p>Ubuntu Core requires a 600 mhz processor with 128 MB RAM. Devices require 4GB flash for factory reset and system rollback. Ubuntu Core itself uses 40MB RAM leaving the rest for applications. The <a href="http://beagleboard.org/black-snappy" class="external">Beaglebone Black</a>, <a href="http://www.hardkernel.com/main/products/prdt_info.php?g_code=G141578608433" class="external">Odroid-C1</a>, and <a href="https://insights.ubuntu.com/2015/02/02/snappy-ubuntu-core-on-raspberry-pi-2/" class="external">Raspberry Pi 2</a> are recommended ARM development boards. For x86, any spare laptop, PC or virtual machine will also serve as a development platform.</p>
+        <p><a href="http://developer.ubuntu.com/snappy" class="external">Read more installation details&nbsp;&rsaquo;</a></p>
+    </div>
+    <div class="four-col last-col align-center align-vertical">
+        <p><img src="{{ STATIC_URL }}img/snappy/beaglebone_black.jpg" width="167" height="247" alt="BeagleBone Black board" /></p>
+    </div>
+</div><!-- /row -->
+
+<div class="row row-quote no-border no-margin-bottom equal-height">
+    <div class="three-col align-center align-vertically">
+        <img src="{{ STATIC_URL }}img/partners/partner-logo-beagleboard.png" width="167" height="211" alt="BeagleBoard logo" />
+    </div>
+    <div class="nine-col last-col">
+        <blockquote class="pull-quote">
+            <p><span>&ldquo;</span>BeagleBone Black and Snappy Ubuntu Core together answer the pervasive questions around the Internet of Things, so I am obviously thrilled. Experts and developers often ask me how they can normalize their application  environment and have confidence in the security of the system. With a reference design of Snappy on BeagleBone Black, Canonical and BeagleBoard.org have partnered to ensure anyone can build an IoT prototype quickly and affordable, without any barriers to taking their designs to production.<span>&rdquo;</span></p>
+            <p><cite>Jason Kridner, co-founder of <a href="http://BeagleBoard.org" class="external">BeagleBoard.org</a></cite></p>
+        </blockquote>
+    </div>
+</div><!-- /.row quote no-border -->
+
+<div class="row">
+    <div class="eight-col">
+    	<h3>&#8230; to high-end server appliances</h3>
+    	<p>The fastest Xeon server, and the massively multi-core ARM CPUs such as Thunder from Cavium, are equally well supported by Ubuntu Core. For high-end server appliances that power the next generation of switches and routers, to hyperscale container-oriented infrastructure and rack-centric transcoding engines, Ubuntu Core supports the widest range of server-class silicon for appliance designers and developers, and it’s already widely accepted in enterprise data centres too.</p>
+    </div>
+</div><!-- /.row -->
+
+<div class="row no-border">
+  <div class="twelve-col">
+    <h2 class="muted-heading">A selection of our Internet of Things</h2>
+      <ul id="iot-partners" class="inline-logos no-bullets no-margin dynamic-logos"></ul>
+      <p class="align-center"><a class="external" href="http://partners.ubuntu.com/programmes/iot">See all Internet of Things partners</a></p>
+  </div>
+</div>
+
+{% endblock content %}
+
+{% block footer_extra %}
+ {% comment %} <script>
+      /*function equalHeight() {
+          core.setEqualHeight('company-wrapper')
+      }
+      window.setTimeout(equalHeight, 1000);*/
+  </script>
+{% endcomment %}
+  <script>
+      YUI().use('event-base', function (Y) {
+          Y.on('domready', function () {
+              core.loadPartners('?programme__name=Internet%20of%20Things', '#iot-partners');
+          });
+      });
+  </script>
+{% endblock %}
diff --git a/templates/things/newsletter-thank-you.html b/templates/things/newsletter-thank-you.html
new file mode 100644
index 00000000000..02a72c1acfe
--- /dev/null
+++ b/templates/things/newsletter-thank-you.html
@@ -0,0 +1,14 @@
+{% extends "things/base_things.html" %}
+
+{% block extra_body_class %}things-thank-you{% endblock %}
+
+{% block title %}Thank you{% endblock %}
+
+{% block second_level_nav_items %}
+    <ul class="breadcrumb"><li><a href="/things/">Things</a>&nbsp;›</li></ul>
+    <ul class="second-level-nav"><li class="first active"><a href="/things/">Thank you</a></li></ul>
+{% endblock second_level_nav_items %}
+
+{% block content %}
+{% include "shared/_newsletter_thank_you.html" %}
+{% endblock content %}
\ No newline at end of file
diff --git a/templates/things/shared/_contextual_footer.html b/templates/things/shared/_contextual_footer.html
new file mode 100755
index 00000000000..432e568cd7f
--- /dev/null
+++ b/templates/things/shared/_contextual_footer.html
@@ -0,0 +1,79 @@
+{% if level_2 == 'tools' and not level_3 %}
+	<div class="feature-two four-col">
+        <h3>Experience Juju</h3>
+        <p>Try the demo to experience how easy it is to manage services in the cloud.</p>
+		<p><a href="https://demo.jujucharms.com/">Try the Juju demo&nbsp;&rsaquo;</a></p>
+{% endif %}{% if level_3 == 'juju' or level_3 == 'training' or level_3 == 'bootstack' %}
+	<div class="feature-two four-col">
+        <h3>Experience Juju</h3>
+        <p>Try our Juju demo to see how easy it is to manage services in the cloud. Plus, get more information, including training and how to join the Juju community.</p>
+		<p><a href="https://demo.jujucharms.com/">Try the Juju demo&nbsp;&rsaquo;</a></p>
+{% endif %}{% if level_3 == 'maas' %}
+	<div class="feature-two four-col picto-maas">
+        <h3>Install MAAS</h3>
+        <p>Metal as a Service (MAAS) brings the language of the cloud to physical servers.</p>
+		<p><a href="http://maas.ubuntu.com">Find out more at maas.ubuntu.com&nbsp;&rsaquo;</a></p>
+{% endif %}{% if level_3 == 'snappy' %}
+	<div class="feature-two four-col">
+        <p><img src="{{ STATIC_URL }}img/partners/partners-logo-microsoft-azure.png" alt="Microsoft Azure logo" width="195" height="25" /></p>
+        <p>Get started with snappy Ubuntu Core on Azure, the open and flexible cloud platform from  Microsoft, today.</p>
+		<p><a href="http://azure.microsoft.com">azure.microsoft.com&nbsp;&rsaquo;</a></p>
+{% endif %}{% if level_2 != 'use-a-cloud' and level_2 != 'tools' and level_3 != 'juju' and level_3 != 'lxd' and level_3 != 'maas' and level_3 != 'training' and level_2 != 'openstack' %}
+	<div class="feature-two four-col">
+		<h3>Canonical Distribution</h3>
+    	<p>Follow these instructions to download and build your cloud using The Canonical Distribution of Ubuntu OpenStack.</p>
+		<p><a href="/download/cloud/install-ubuntu-openstack">Find out how&nbsp;&rsaquo;</a></p>
+{% endif %}{% if level_2 == 'use-a-cloud'  %}
+	<div class="feature-two four-col">
+		<h3>Try Ubuntu guest today</h3>
+    	<p>Ubuntu is the most popular guest OS on both public and private clouds, thanks to its security, versatility and continually updated features. Spinning up an Ubuntu instance in your cloud couldn&rsquo;t be easier, and Canonical offers industry-leading support.</p>
+		<p><a href="http://cloud-images.ubuntu.com/precise/current/">Try Ubuntu guest today&nbsp;&rsaquo;</a></p>
+{% endif %}{% if level_2 == "openstack" or level_3 == "lxd" %}
+	<div class="feature-two four-col">
+        <h3>Canonical Distribution</h3>
+    	<p>Follow these instructions to download and build your cloud using The Canonical Distribution of Ubuntu OpenStack.</p>
+		<p><a href="/download/cloud/install-ubuntu-openstack">Find out how&nbsp;&rsaquo;</a></p>
+{% endif %}
+	</div><!-- /.feature-two -->
+
+{% if level_2 == 'use-a-cloud' or level_3 == 'maas' %}
+	<div class="feature-three four-col">
+		<h3>Canonical Distribution</h3>
+    	<p>Follow these instructions to download and build your cloud using The Canonical Distribution of Ubuntu OpenStack.</p>
+		<p><a href="/download/cloud/install-ubuntu-openstack">Find out how&nbsp;&rsaquo;</a></p>
+{% endif %}{% if level_3 == 'training' or level_3 == 'bootstack' or level_2 == 'tools' and  level_3 != 'maas' and level_3 != 'juju' and level_3 != 'lxd' and level_3 != 'snappy' %}
+	<div class="feature-three four-col picto-maas">
+        <h3>Provisioning through MAAS</h3>
+        <p>Metal as a Service (MAAS) brings the language of the cloud to physical servers.</p>
+		<p><a href="http://maas.ubuntu.com">Find out more at maas.ubuntu.com&nbsp;&rsaquo;</a></p>
+{% endif %}{% if level_3 == 'juju' %}
+	<div class="feature-three four-col picto">
+        <h3>Browse the Charm Store</h3>
+        <p>Charms are scripts that can be written in any language to deploy and configure services.</p>
+		<p><a href="http://jujucharms.com">Find out more at jujucharms.com&nbsp;&rsaquo;</a></p>
+{% endif %}{% if level_2 == 'management' %}
+	<div class="feature-three four-col">
+        <h3>Ubuntu Advantage</h3>
+        <p>The Ubuntu Advantage service offers efficient systems administration, fast problem resolution and access to the Ubuntu experts as and when you need them.</p>
+		<p><a href="/cloud/management">Learn more about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
+{% endif %}{% if level_2 != 'use-a-cloud' and level_2 != 'management' and level_2 != 'tools' and not level_3 or level_2 == 'openstack' or level_3 == 'ubuntu-openstack-interoperability-lab' or level_3 == 'ubuntu-certified-public-cloud' or level_3 == 'reference-architecture' or level_3 == 'snappy' %}
+	<div class="feature-three four-col picto">
+		<h3>Talk to us</h3>
+		<p>Let our cloud experts help you take the next step.</p>
+		<p><a href="/cloud/contact-us">Contact us&nbsp;&rsaquo;</a></p>
+    {% include "shared/_digesto.html" with section="things" %}
+{% endif %}
+{% if level_3 == 'lxd' %}
+	<div class="feature-three four-col picto">
+		<h3>Talk to us</h3>
+		<p>Let our cloud experts help you take the next step.</p>
+		<p><a href="/cloud/contact-us">Contact us&nbsp;&rsaquo;</a></p>
+		<h3>Keep up to date</h3>
+		<p>Get our cloud newsletter.</p>
+		<p><a href="https://pages.ubuntu.com/canonical-optin.html">Sign-up today&nbsp;&rsaquo;</a></p>
+{% endif %}
+	</div><!-- /.feature-three -->
+	<div class="feature-four four-col last-col">
+		<h3>Further reading</h3>
+		{% include "cloud/shared/_further_reading_links.html" %}
+	</div>
\ No newline at end of file
diff --git a/templates/tv/base_tv.html b/templates/tv/base_tv.html
index 6d4ac84549a..a60b5f30e97 100755
--- a/templates/tv/base_tv.html
+++ b/templates/tv/base_tv.html
@@ -1,6 +1,6 @@
-{% extends "_base/base.html" %}
+{% extends "templates/base.html" %}
 
 {% block outer_content %}
 	{% block content %}{% endblock %}
-	{% include "_base/_contextual_footer.html" %}
+	{% include "templates/_contextual_footer.html" %}
 {% endblock %}
diff --git a/templates/tv/commercial-info.html b/templates/tv/commercial-info.html
index 166e1faf86f..7b6436d19eb 100755
--- a/templates/tv/commercial-info.html
+++ b/templates/tv/commercial-info.html
@@ -3,7 +3,7 @@
 {% block title %}Commercial info | Ubuntu TV{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="TV" page_title="Commerical info"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="TV" page_title="Commerical info"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/tv/contributors.html b/templates/tv/contributors.html
index 1d0620004b1..3c1ea67d757 100755
--- a/templates/tv/contributors.html
+++ b/templates/tv/contributors.html
@@ -3,7 +3,7 @@
 {% block title %}Contributing to Ubuntu TV | Ubuntu TV{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="TV" page_title="Contributors"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="TV" page_title="Contributors"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/tv/experience.html b/templates/tv/experience.html
index 83f03b32782..a38f7e28ad0 100755
--- a/templates/tv/experience.html
+++ b/templates/tv/experience.html
@@ -3,7 +3,7 @@
 {% block title %}Experience Ubuntu TV | Ubuntu TV{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="TV" page_title="Experience"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="TV" page_title="Experience"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/tv/features-and-specs.html b/templates/tv/features-and-specs.html
index ca1160a8249..d0e65615764 100755
--- a/templates/tv/features-and-specs.html
+++ b/templates/tv/features-and-specs.html
@@ -3,7 +3,7 @@
 {% block title %}TV features and specifications | Ubuntu TV{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="TV" page_title="Features and specs"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="TV" page_title="Features and specs"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/tv/index.html b/templates/tv/index.html
index 8676c968117..5cde973e83d 100755
--- a/templates/tv/index.html
+++ b/templates/tv/index.html
@@ -4,7 +4,7 @@
 {% block extra_body_class %}tv-home{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="TV" page_title="Overview"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="TV" page_title="Overview"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/tv/industry.html b/templates/tv/industry.html
index 62f8bdcb789..435649d42ea 100755
--- a/templates/tv/industry.html
+++ b/templates/tv/industry.html
@@ -3,7 +3,7 @@
 {% block title %}Made for the TV industry | Ubuntu TV{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "_base/_nav_breadcrumb.html" with section_title="TV" page_title="Industry"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="TV" page_title="Industry"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
diff --git a/templates/tv/_includes/_contextual_footer.html b/templates/tv/shared/_contextual_footer.html
similarity index 85%
rename from templates/tv/_includes/_contextual_footer.html
rename to templates/tv/shared/_contextual_footer.html
index d654ed4a954..bbeb787a1cf 100755
--- a/templates/tv/_includes/_contextual_footer.html
+++ b/templates/tv/shared/_contextual_footer.html
@@ -5,5 +5,5 @@ <h3>Start building now</h3>
 	</div>
 	<div class="feature-four four-col last-col">
 		<h3>Further reading</h3>
-		{% include "_base/_further_reading_links.html" %}
+		{% include "templates/_further_reading_links.html" %}
 	</div>
diff --git a/templates/ubuntu-ai.txt b/templates/ubuntu-ai.txt
index 6a5bdaf31b4..d4a1fec51fa 100755
--- a/templates/ubuntu-ai.txt
+++ b/templates/ubuntu-ai.txt
@@ -81,7 +81,7 @@ How to create a bootable USB stick on OS X | Ubuntu	/download/desktop/create-a-u
 Download Ubuntu | Ubuntu	/download/desktop/thank-you/
 Install Ubuntu 13.10 | Ubuntu	/download/desktop/install-desktop-latest/
 How to burn a DVD on Windows | Ubuntu	/download/desktop/burn-a-dvd-on-windows/
-Install Ubuntu 14.04.1 LTS | Ubuntu	/download/desktop/install-desktop-long-term-support/
+Install Ubuntu 14.04.2 LTS | Ubuntu	/download/desktop/install-desktop-long-term-support/
 Ubuntu Advantage Service Description | Ubuntu	/ua-servicedescription/
 Trademark policy | Ubuntu	/intellectual-property-policy/
 Landscape features | Management | Ubuntu	/management/landscape-features/
diff --git a/webapp/dev_settings.py b/webapp/dev_settings.py
index 14d2a176776..b96f742ad22 100644
--- a/webapp/dev_settings.py
+++ b/webapp/dev_settings.py
@@ -1,4 +1,4 @@
 from settings import *
 
 INSTALLED_APPS += ['django_extensions']
-TEMPLATE_DEBUG = True
+TEMPLATE_DEBUG = False