diff --git a/.gitignore b/.gitignore
index 6624275a336..370cef18776 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,9 @@
 *.pyc
-templates/static/css/styles.css
+*.bak
+*.tmp
+*.css.map
 .sass-cache
-.~1~
+*.~*~
+env/
+static/css/styles.css
+static/css/core-print.css
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 00000000000..118aa1a0853
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,5 @@
+# A sample Gemfile
+source "https://rubygems.org"
+
+# gem "rails"
+gem 'sass'
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000000..30bbe344eb8
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,156 @@
+SHELL := /bin/bash # Use bash syntax
+
+define HELP_TEXT
+Canonical.com website project
+===
+
+Usage:
+
+> make setup    # Install dependencies
+> make develop  # Auto-compile sass files and run the dev server
+
+endef
+
+# Variables
+##
+
+ENVPATH=${VIRTUAL_ENV}
+VEX=vex --path ${ENVPATH}
+ifeq ($(ENVPATH),)
+	ENVPATH=env
+endif
+
+##
+# Print help text
+##
+help:
+	$(info ${HELP_TEXT})
+
+##
+# Start the development server
+##
+develop: sass-watch dev-server
+
+##
+# Prepare the project
+##
+setup: install-dependencies update-env
+
+##
+# Run server
+##
+dev-server:
+	${VEX} ./manage.py runserver_plus 0.0.0.0:8000
+
+##
+# Run SASS watcher
+##
+sass-watch:
+	sass --debug-info --watch static/css/styles.scss &
+	sass --debug-info --watch static/css/core-print.scss &
+
+##
+# Build SASS
+##
+sass-build:
+	sass --style compressed --update static/css/styles.scss
+	sass --style compressed --update static/css/core-print.scss
+
+##
+# Get virtualenv ready
+##
+update-env:
+	${MAKE} create-env
+
+	${VEX} ${MAKE} install-requirements
+
+	# Get download mirrors file
+	wget --output-document=/tmp/mirrors.rss https://launchpad.net/ubuntu/+cdmirrors-rss
+
+##
+# Make virtualenv directory if it doesn't exist and we're not in an env
+##
+create-env:
+	if [ ! -d ${ENVPATH} ]; then virtualenv ${ENVPATH}; fi
+
+##
+# Install pip requirements
+# Only if inside a virtualenv
+##
+install-requirements:
+	if [ "${VIRTUAL_ENV}" ]; then pip install -r requirements/dev.txt; fi
+
+##
+# Install required system dependencies
+##
+install-dependencies:
+	if [ $$(command -v apt-get) ]; then ${MAKE} apt-dependencies; fi
+	if [ $$(command -v brew) ]; then ${MAKE} brew-dependencies; fi
+
+	if [ ! $$(command -v virtualenv) ]; then sudo pip install virtualenv; fi
+	if [ ! $$(command -v vex) ]; then sudo pip install vex; fi
+
+## Install dependencies with apt
+apt-dependencies:
+	if [ ! $$(command -v pip) ]; then sudo apt-get install python-pip; fi
+	if [ ! $$(command -v sass) ]; then sudo apt-get install ruby-sass; fi
+
+## Install dependencies with brew
+brew-dependencies:
+	if [ ! $$(command -v pip) ]; then sudo easy_install pip; fi
+	if [ ! $$(command -v sass) ]; then sudo gem install sass; fi
+
+update-templates:
+	rm -rf templates
+	rm -rf static
+	bzr branch lp:ubuntu-website-content templates
+	rm -rf templates/.bzr*
+
+	mv templates/static .
+
+	# Template replacements
+	# ==
+	find templates -type f -name '*.html' | xargs sed -i '/^ *[{][%] load scss [%][}] *$$/d'  # Remove references to scss module
+	find templates -type f -name '*.html' | xargs sed -i 's/[{][%]\s*scss\s\+["]\([^"]\+\).scss["]\s*[%][}]/\1.css/g'  # Point to CSS instead of SCSS
+	find templates -type f -name '*.html' | xargs sed -i 's/[{][{] *STATIC_URL *[}][}]u[/]/{{ STATIC_URL }}/g'  # Fix static file locations
+	find templates -type f -name '*.html' | xargs sed -i 's/[{][%] *\(extends\|include\|with\) \+["]ubuntu[/]/{% \1 "/g'  # Remove "ubuntu" from include paths
+
+	# Stylesheet replacements
+	# ==
+	find static/css -type f -name '*.scss' | xargs sed -i 's/[%][%]/%/g'  # Remove erroneous double-percent
+	find static/css -type f -name '*.scss' | xargs sed -i 's/[@]import ["]css[/]/@import "/g'  # Fix include paths for sass
+
+update-templates-local:
+	rm -rf templates
+	rm -rf static
+	#bzr branch lp:ubuntu-website-content templates
+	bzr pull --directory ../ubuntu-website-content 
+	cp -rf ../ubuntu-website-content templates
+	rm -rf templates/.bzr*
+
+	mv templates/static .
+
+	# Template replacements
+	# ==
+	find templates -type f -name '*.html' | xargs sed -i '/^ *[{][%] load scss [%][}] *$$/d'  # Remove references to scss module
+	find templates -type f -name '*.html' | xargs sed -i 's/[{][%]\s*scss\s\+["]\([^"]\+\).scss["]\s*[%][}]/\1.css/g'  # Point to CSS instead of SCSS
+	find templates -type f -name '*.html' | xargs sed -i 's/[{][{] *STATIC_URL *[}][}]u[/]/{{ STATIC_URL }}/g'  # Fix static file locations
+	find templates -type f -name '*.html' | xargs sed -i 's/[{][%] *\(extends\|include\|with\) \+["]ubuntu[/]/{% \1 "/g'  # Remove "ubuntu" from include paths
+
+	# Stylesheet replacements
+	# ==
+	find static/css -type f -name '*.scss' | xargs sed -i 's/[%][%]/%/g'  # Remove erroneous double-percent
+	find static/css -type f -name '*.scss' | xargs sed -i 's/[@]import ["]css[/]/@import "/g'  # Fix include paths for sass
+
+clean:
+	rm -rf env static/css/styles.css static/css/core-print.css
+
+# The below targets
+# are just there to allow you to type "make it so"
+# as a replacement for "make" or "make develop"
+# - Thanks to https://directory.canonical.com/list/ircnick/deadlight/
+
+it:
+	# Nothing
+
+so: develop
\ No newline at end of file
diff --git a/README.md b/README.md
index 3d38af47549..ddb6b6fb9d0 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,27 @@
-Run site
+Ubuntu.com website project
 ===
 
+To run the site locally:
+
 ``` bash
-sass --watch --debug-info templates/static/css/styles.scss &
-./manage runserver
+make setup    # Install dependencies - only needed the first time
+make develop  # Auto-compile sass files and run the dev server
 ```
 
-Updating templates to work with this project
-===
+Now visit <http://127.0.0.1:8000>
 
-``` bash
-perl -pi -e 's/\{\{ STATIC_URL \}\}u\//{{ STATIC_URL }}/g' `find .`
-perl -pi -e 's/\{\% (extends|include) "ubuntu\//{% $1 "/g' `find .`
-```
+Fenchurch
+---
 
-Updating sass files to compile correctly
-===
+This site depends on [Fenchurch 3](https://launchpad.net/fenchurch/3.0.0) - which is currently a private repository. Make sure you have SSH access to the above repository before attempting to install dependencies.
+
+Updating templates from [ubuntu-website-content](https://launchpad.net/ubuntu-website-content)
+---
+
+Until this project is released, new template work will be being added to the [ubuntu-website-content](https://launchpad.net/ubuntu-website-content) project.
+
+To update the templates directory with the template changes from this repository:
 
 ``` bash
-perl -pi -e 's/\@import \"css\//\@import \"/g' `find . -name '*.scss'`
+make update-templates
 ```
-=======
diff --git a/templates/2012/_nav_secondary.html b/db.sqlite3
similarity index 100%
rename from templates/2012/_nav_secondary.html
rename to db.sqlite3
diff --git a/templates/2012/shared/_contextual_footer.html b/lib/__init__.py
similarity index 100%
rename from templates/2012/shared/_contextual_footer.html
rename to lib/__init__.py
diff --git a/lib/gsa.py b/lib/gsa.py
new file mode 100644
index 00000000000..4efef56477f
--- /dev/null
+++ b/lib/gsa.py
@@ -0,0 +1,120 @@
+import requests
+
+
+class GSAParser:
+    """
+    Query the Google Search Appliance
+    for results in JSON format
+    and fix the results in various ways
+    before returning them as a data object
+
+    Usage:
+
+    search_parser = GSAParser(domain="gsa.example.com")
+    results = search_parser.fixed_results(query="hello world")
+    """
+
+    domain = ""
+    client = ""
+    default_collection = ""
+    stylesheet = ""
+
+    def __init__(
+        self, domain,
+        client="default_frontend",
+        site_collection="default_collection",
+        stylesheet="json_frontend"
+    ):
+        self.domain = domain
+        self.client = client
+        self.site_collection = site_collection
+        self.stylesheet = stylesheet
+
+    def fixed_results(self, query, start=0, num=10):
+        """
+        Return a data object of results from the GSA,
+        fixed to show the correct total and avoid errors:
+        {
+            "query": <GSA's generated query>,
+            "results": [
+                {
+                    "url": ..,
+                    "title": ..,
+                    "summary": ..,
+                    "meta_tags" : [..],
+                    "size": ..
+                }, ..
+            ],
+            "results_nav": {
+                "total_results": <total - fixed to be accurate>,
+                "results_start": ..,
+                "results_end": ..,
+                "current_view": ..,
+                "have_prev": "1", # may exist
+                "have_next": "1", # may exist
+            }
+        }
+        """
+
+        results_data = self.results(query, start, num)
+        results_data["results_nav"]["total_results"] = self.total_results(query)
+
+        return results_data
+
+    def total_results(self, query):
+        """
+        Inexplicably, the GSA returns a completely incorrect total
+        This is a hack to get the correct total.
+
+        If you request with start>1000, the GSA returns nothing.
+        But if you request with start = 990, it returns the last page
+        even if there are only 10 results.
+
+        Therefore this is the way to get the real total
+        """
+
+        last_results = self.results(query, start=990, num=10)
+
+        return last_results["results_nav"]["results_end"]
+
+    def results(self, query, start, num):
+        """
+        GSA often returns invalid JSON - attempt to fix it
+        """
+
+        results_json = self.results_json(query, start, num)
+
+        return results_json
+
+    def results_json(self, query, start, num):
+        """
+        Query the GSA to get response in JSON format
+        and return it
+
+        Throws a URLError exception if it fails to
+        communicate with the GSA
+        """
+
+        # Query mustn't have spaces - or BREAKZ!
+        query = query.replace(' ', '+')
+
+        # Build the GSA URL
+        search_url_template = (
+            'http://{domain}/search'
+            '?q={q}&num={num}&start={start}&client={client}'
+            '&site={site}&output=xml_no_dtd'
+            '&proxystylesheet={stylesheet}'
+        )
+        search_url = search_url_template.format(
+            domain=self.domain,
+            q=query,
+            num=str(num),
+            start=str(start),
+            client=self.client,
+            site=self.site_collection,
+            stylesheet=self.stylesheet
+        )
+
+        response = requests.get(search_url)
+
+        return response.json()
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 404494c7791..00000000000
--- a/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Django==1.6.2
--e bzr+ssh://bazaar.launchpad.net/+branch/fenchurch/3.0.0/#egg=fenchurch
diff --git a/requirements/base.txt b/requirements/base.txt
new file mode 100644
index 00000000000..71d88046009
--- /dev/null
+++ b/requirements/base.txt
@@ -0,0 +1,3 @@
+Django==1.6.2
+feedparser==5.1.3
+requests==2.3.0
diff --git a/requirements/dev.txt b/requirements/dev.txt
new file mode 100644
index 00000000000..9db53515f58
--- /dev/null
+++ b/requirements/dev.txt
@@ -0,0 +1,4 @@
+-r standard.txt
+django-extensions
+werkzeug
+ipdb
diff --git a/requirements/standard.txt b/requirements/standard.txt
new file mode 100644
index 00000000000..4817d27a214
--- /dev/null
+++ b/requirements/standard.txt
@@ -0,0 +1,2 @@
+-r base.txt
+-e bzr+ssh://bazaar.launchpad.net/+branch/fenchurch/3.0.0/#egg=fenchurch
diff --git a/static/css/beta/global-responsive.css b/static/css/beta/global-responsive.css
new file mode 100644
index 00000000000..69f47e84c0a
--- /dev/null
+++ b/static/css/beta/global-responsive.css
@@ -0,0 +1,352 @@
+@charset "UTF-8";
+/**
+ * Ubuntu Patterns Stylesheet
+ *
+ * The CSS file required by Ubuntu patterns page
+ *
+ * @project		Ubuntu Patterns
+ * @author		Web Team at Canonical Ltd
+ * @copyright	2012 Canonical Ltd
+ *
+ * @see 		http://design.ubuntu.com
+ */
+/**
+ * standard colors
+ *
+ * @colordef standard colors
+ */
+/* assets database path */
+/* usage: background: url(//assets.ubuntu.com/sites/ubuntu/latest/u/img//backgrounds/background.jpg) no-repeat 0 0; */
+/* ubuntu orange (used for text links also on any site except canonical) */
+/* used as background on pre text */
+/* canonical aubergine */
+/* light aubergine (consumer) */
+/* mid aubergine (both) */
+/* dark aubergine (enterprise) */
+/* warm grey */
+/* cool grey */
+/* light grey */
+/* notifications */
+/* red */
+/* yellow */
+/* green */
+/* cyan */
+/* colour coded status - from negative to positive (Icon: canonical circle) */
+/* red, for status that require immediate attention */
+/* grey, for disabled status or ones that don’t require attention */
+/* yellow, for status that require attention */
+/* blue, for status that don’t require action */
+/* green, for positive status */
+/* misc colours */
+/* This is the global link color, mainly used for links in content */
+/* grid variables */
+/**
+ * mixins
+ *
+ * @section mixins
+ */
+/* @section global nav
+-------------------------------------------------------------- */
+footer #nav-global {
+  display: block;
+  margin: 0 -10px;
+  margin-top: -4px;
+  margin-bottom: 10px;
+  overflow: hidden; }
+  footer #nav-global div {
+    display: none; }
+    footer #nav-global div.active {
+      border-top: 1px solid #d4d7d4;
+      display: block;
+      margin-top: -1px; }
+  footer #nav-global h2 {
+    letter-spacing: 0;
+    position: relative;
+    z-index: 2; }
+    footer #nav-global h2 span {
+      background-image: url("//assets.ubuntu.com/sites/ubuntu/latest/u/img//arrow_down_9fa097.svg");
+      background-position: 0 2px;
+      background-repeat: no-repeat;
+      -moz-background-size: 100% 100%;
+      -webkit-background-size: 100% 100%;
+      -o-background-size: 100% 100%;
+      background-size: 100% 100%;
+      clear: none;
+      display: inline-block;
+      margin-left: 6px;
+      float: right;
+      height: 13px;
+      width: 13px;
+      margin-right: 20px;
+      position: relative; }
+    footer #nav-global h2.active span {
+      background-image: url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/arrow_up_9fa097.svg");
+      background-position: 0 0; }
+  footer #nav-global li ul {
+    clear: both;
+    display: block;
+    overflow: hidden;
+    float: left; }
+  footer #nav-global li.more {
+    width: 100%;
+    line-height: 0;
+    padding: 0;
+    margin: 0; }
+  footer #nav-global li.more a {
+    text-indent: -999em;
+    display: block;
+    padding: 0;
+    margin: 0;
+    border: 0; }
+  footer #nav-global li.more li a {
+    background: none;
+    text-indent: 0;
+    margin-left: 0;
+    font-size: 14px; }
+  footer #nav-global h2 {
+    border-bottom: 1px solid #D4D7D4;
+    color: #888888;
+    margin: 0;
+    padding: 10px 10px;
+    width: 100%;
+    text-transform: uppercase;
+    font-size: 0.75em;
+    letter-spacing: .05em; }
+  footer #nav-global h2:before {
+    background-image: url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/external-link-9fa097.svg");
+    -moz-background-size: 14px 14px;
+    -webkit-background-size: 14px 14px;
+    -o-background-size: 14px 14px;
+    background-size: 14px 14px;
+    background-repeat: no-repeat;
+    content: "";
+    display: inline-block;
+    height: 15px;
+    width: 15px;
+    margin-right: 3px;
+    top: 3px;
+    position: relative; }
+  footer #nav-global ul {
+    margin: 0;
+    padding: 0; }
+  footer #nav-global li a {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    font-size: 1.14286 em;
+    margin-bottom: 0.75 em;
+    border-bottom: 1px solid #d4d7d4;
+    color: #333333;
+    display: block;
+    float: left;
+    overflow: hidden;
+    padding: 8px 10px;
+    text-align: left;
+    white-space: normal;
+    width: 100%;
+    margin-bottom: 0; }
+  footer #nav-global li a.external:after {
+    background: none; }
+  footer #nav-global li.more li a {
+    border-bottom: 1px solid #d4d7d4;
+    font-size: 14px;
+    line-height: 1.6;
+    padding: 8px 10px; }
+  footer #nav-global li.more li {
+    border-bottom: 1px solid #f2f2f4; }
+  footer #nav-global li {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    border-bottom: 1px solid #f2f2f4;
+    border-left: 1px solid #d4d7d4;
+    display: block;
+    float: left;
+    margin: 0;
+    width: 50%; }
+  footer #nav-global li:last-item,
+  footer #nav-global li:last-item a {
+    border: 0; }
+  footer #nav-global li:nth-child(odd) {
+    border-left: 0; }
+
+@media only screen and (min-width: 768px) {
+  body {
+    padding-top: 30px; }
+
+  #nav-global {
+    background: #efefef;
+    width: 100%;
+    height: 30px;
+    line-height: 19.2px;
+    display: block;
+    z-index: 101;
+    position: relative;
+    -webkit-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
+    -moz-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
+    box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
+    margin-top: -30px; }
+
+  #nav-global .nav-global-wrapper {
+    -moz-box-sizing: border-box;
+    background: none repeat scroll 0 0 #FFFFFF;
+    margin: 0 auto;
+    position: relative;
+    text-align: left;
+    width: 984px; }
+
+  #nav-global.drop-shadow {
+    -webkit-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
+    -moz-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
+    box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2); }
+
+  #nav-global div {
+    background: #efefef;
+    box-shadow: none;
+    margin-top: 0;
+    margin-bottom: 0; }
+
+  #nav-global ul {
+    margin-bottom: 0;
+    margin-left: 0;
+    top: 0; }
+
+  #nav-global ul li {
+    float: left;
+    display: block;
+    text-align: left;
+    margin: 0;
+    height: 30px;
+    margin-top: -1px;
+    position: relative;
+    top: 0; }
+
+  #nav-global ul ul {
+    display: none;
+    float: none;
+    background: #fff;
+    position: absolute;
+    min-width: 120px;
+    top: 30px;
+    border-top: 1px solid #d7d7d7;
+    -webkit-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.3);
+    -moz-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.3);
+    box-shadow: 0 2px 2px rgba(0, 0, 0, 0.3); }
+
+  #nav-global ul ul a:link, #nav-global ul ul a:visited {
+    border-top: none;
+    float: none; }
+
+  #nav-global ul ul li {
+    float: none; }
+
+  #nav-global ul ul li:first-of-type {
+    padding-top: 5px; }
+
+  #nav-global .more {
+    border-left: 1px solid transparent;
+    border-right: 1px solid transparent;
+    min-width: 60px; }
+
+  #nav-global .more span {
+    display: block;
+    top: -10px;
+    left: 46px;
+    line-height: 19.2px;
+    height: 0;
+    position: relative;
+    -webkit-transform-origin: 0 0;
+    -moz-transform-origin: 0 0;
+    -ms-transform-origin: 0 0;
+    -o-transform-origin: 0 0;
+    -webkit-transform: rotate(90deg);
+    -moz-transform: rotate(90deg);
+    -ms-transform: rotate(90deg);
+    -o-transform: rotate(90deg);
+    filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1); }
+
+  #nav-global .open {
+    background: #fff;
+    min-width: 120px;
+    border-left: 1px solid #d7d7d7;
+    border-right: 1px solid #d7d7d7; }
+
+  #nav-global a:link, #nav-global a:visited {
+    color: #333;
+    font-size: 12px;
+    font-weight: 300;
+    line-height: 1.6;
+    border-top: 3px solid transparent;
+    border-bottom: 0;
+    margin-right: 10px;
+    margin-left: 10px;
+    padding-top: 3px;
+    padding-bottom: 4px;
+    position: relative;
+    text-decoration: none;
+    -moz-transition: opacity 0.25s ease-in-out;
+    -webkit-transition: opacity 0.25s ease-in-out;
+    transition: opacity 0.25s ease-in-out;
+    display: block;
+    list-style-image: none; }
+
+  #nav-global a.active {
+    color: #dd4814;
+    border-top: 3px solid #dd4814;
+    text-decoration: none;
+    opacity: 1; }
+
+  #nav-global a:hover {
+    color: #dd4814;
+    text-decoration: none; }
+
+  #nav-global:hover a {
+    opacity: 1; }
+
+  #nav-global .open a:link,
+  #nav-global .open a:visited,
+  #nav-global .open span {
+    color: #dd4814;
+    opacity: 1; }
+
+  #nav-global .open ul a:link,
+  #nav-global .open ul a:visited {
+    color: #333;
+    opacity: 1; }
+
+  #nav-global .open ul a:hover {
+    color: #dd4814;
+    text-decoration: none; }
+
+  #nav-global .open ul {
+    display: block; }
+
+  #nav-global ul ul li:first-of-type a {
+    margin-left: 10px; }
+
+  body #nav-global li:first-of-type a {
+    margin-left: 0; }
+
+  /*
+  * Temp styles
+  */
+  .login-logout {
+    z-index: 5; } }
+@media only screen and (min-width: 768px) {
+  body #nav-global li:first-of-type a {
+    margin-left: 10px; } }
+@media only screen and (min-width: 768px) and (min-width: 768px) {
+  #nav-global .nav-global-wrapper {
+    width: auto !important; } }
+@media only screen and (max-width: 768px) {
+  body #nav-global li:first-of-type a {
+    margin-left: 10px; }
+
+  #nav-global .nav-global-wrapper {
+    width: 100%; } }
+@media only screen and (min-width: 984px) {
+  body #nav-global li:first-of-type a {
+    margin-left: 0; }
+
+  #nav-global .nav-global-wrapper {
+    width: 984px !important; } }
diff --git a/static/css/beta/global-responsive.scss b/static/css/beta/global-responsive.scss
new file mode 100644
index 00000000000..2de466abd43
--- /dev/null
+++ b/static/css/beta/global-responsive.scss
@@ -0,0 +1,359 @@
+@charset "UTF-8";
+
+@import "../core-constants";
+@import "../core-mixins";
+
+/* @section global nav
+-------------------------------------------------------------- */
+footer #nav-global {
+  display: block;
+  margin: 0 -10px;
+  //padding-top: 10px;
+  margin-top: -4px;
+  margin-bottom: 10px;
+  //  -moz-box-shadow: 0 4px 4px -4px rgba(0, 0, 0, 0.3) inset;
+  //  -webkit-box-shadow: 0 4px 4px -4px rgba(0, 0, 0, 0.3) inset;
+  //box-shadow: 0 4px 4px -4px rgba(0, 0, 0, 0.3) inset;
+  overflow: hidden;
+
+  div {
+    display: none;
+
+    &.active {
+      border-top: 1px solid $nav-border-dark;
+      display: block;
+      margin-top: -1px;
+    }
+  }
+
+  h2 {
+    letter-spacing: 0;
+    position: relative;
+    z-index: 2;
+
+    span {
+      background-image: url('#{$asset-path}/arrow_down_9fa097.svg');
+      background-position: 0 2px;
+      background-repeat: no-repeat;
+      @include background_size(100% 100%);
+      clear: none;
+      display: inline-block;
+      margin-left: 6px;
+      float: right;
+      height: 13px;
+      width: 13px;
+      margin-right: 20px;
+      position: relative;
+    }
+
+    &.active span {
+      background-image: url('#{$asset-path}arrow_up_9fa097.svg');
+      background-position: 0 0;
+    }
+  }
+
+  li ul {
+    clear: both;
+    display: block;
+    overflow: hidden;
+    float: left;
+  }
+
+  li.more {
+    width: 100%;
+    line-height: 0;
+    padding: 0;
+    margin: 0;
+  }
+
+  li.more a {
+    text-indent: -999em;
+    display: block;
+    padding: 0;
+    margin: 0;
+    border: 0;
+  }
+
+  li.more li a  {
+    background: none;
+    text-indent: 0;
+    margin-left: 0;
+    font-size: 14px;
+  }
+
+  h2 {
+    border-bottom: 1px solid #D4D7D4;
+    //border-top: 1px solid #D4D7D4;
+    color: $warm-grey;
+    margin: 0;
+    padding: 10px 10px;
+    width: 100%;
+    text-transform: uppercase;
+    font-size: 0.75em;
+    letter-spacing: .05em;
+  }
+
+  h2:before {
+    background-image: url('#{$asset-path}external-link-9fa097.svg');
+    @include background_size(14px 14px);
+    background-repeat: no-repeat;
+    content: "";
+    display: inline-block;
+    height: 15px;
+    width: 15px;
+    margin-right: 3px;
+    top: 3px;
+    position: relative;
+  }
+
+  ul {
+    margin: 0;
+    padding: 0;
+  }
+
+  li a {
+    @include box_sizing();
+    @include font_size (16);
+    border-bottom: 1px solid $nav-border-dark;
+    color: $cool-grey;
+    display: block;
+    float: left;
+    overflow: hidden;
+    padding: 8px 10px;
+    text-align: left;
+    white-space: normal;
+    width: 100%;
+    margin-bottom: 0;
+  }
+
+  li a.external:after {
+    background: none;
+  }
+
+  li.more li a {
+    border-bottom: 1px solid $nav-border-dark;
+    font-size: 14px;
+    line-height: 1.6;
+    padding: 8px 10px;
+  }
+
+  li.more li {
+    border-bottom: 1px solid $nav-border-light;
+  }
+
+  li {
+    @include box_sizing();
+    border-bottom: 1px solid $nav-border-light;
+    border-left: 1px solid $nav-border-dark;
+    display: block;
+    float: left;
+    margin: 0;
+    width: 50%;
+  }
+
+  li:last-item,
+  li:last-item a { border: 0; }
+
+  li:nth-child(odd) { border-left: 0; }
+}
+
+@media only screen and (min-width : 768px) {
+	body {
+		padding-top: 30px;
+	}
+	#nav-global {
+		background: #efefef;
+		width: 100%;
+		height: 30px;
+		line-height: 19.2px;
+		display: block;
+		z-index: 101;
+		position: relative;
+			-webkit-box-shadow: 0 2px 2px rgba(0,0,0,0.2);
+			-moz-box-shadow: 0 2px 2px rgba(0,0,0,0.2);
+		box-shadow: 0 2px 2px rgba(0,0,0,0.2);
+		margin-top: -30px;
+	}
+	#nav-global .nav-global-wrapper {
+	  -moz-box-sizing: border-box;
+	  background: none repeat scroll 0 0 #FFFFFF;
+	  margin: 0 auto;
+	  position: relative;
+	  text-align: left;
+	  width: 984px;
+	}
+	#nav-global.drop-shadow {
+		-webkit-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
+		-moz-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
+		box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
+	}
+	#nav-global div {
+		background: #efefef;
+		box-shadow: none;
+		margin-top: 0;
+		margin-bottom: 0;
+
+	}
+	#nav-global ul {
+		margin-bottom: 0;
+		margin-left: 0;
+		top: 0;
+	}
+	#nav-global ul li {
+		float: left;
+		display: block;
+		text-align: left;
+		margin: 0;
+		height: 30px;
+		margin-top: -1px;
+		position: relative;
+		top: 0;
+	}
+	#nav-global ul ul {
+		display: none;
+		float: none;
+		background: #fff;
+		position: absolute;
+		min-width: 120px;
+		top: 30px;
+		border-top: 1px solid #d7d7d7;
+		-webkit-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.3);
+		-moz-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.3);
+		box-shadow: 0 2px 2px rgba(0, 0, 0, 0.3);
+	}
+	#nav-global ul ul a:link, #nav-global ul ul a:visited {
+		border-top: none;
+		float: none;
+	}
+	#nav-global ul ul li {
+		float: none;
+	}
+	#nav-global ul ul li:first-of-type {
+		padding-top: 5px;
+	}
+	#nav-global .more {
+		border-left: 1px solid transparent;
+		border-right: 1px solid transparent;
+		min-width: 60px;
+	}
+	#nav-global .more span {
+		display: block;
+		top: -10px;
+		left: 46px;
+		line-height: 19.2px;
+		height: 0;
+		position: relative;
+		-webkit-transform-origin: 0 0;
+		-moz-transform-origin: 0 0;
+		-ms-transform-origin: 0 0;
+		-o-transform-origin: 0 0;
+		-webkit-transform: rotate(90deg);
+		-moz-transform: rotate(90deg);
+		-ms-transform: rotate(90deg);
+		-o-transform: rotate(90deg);
+		filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
+	}
+	#nav-global .open {
+		background: #fff;
+		min-width: 120px;
+		border-left: 1px solid #d7d7d7;
+		border-right: 1px solid #d7d7d7;
+	}
+
+	#nav-global a:link, #nav-global a:visited {
+		color: #333;
+		font-size: 12px;
+		font-weight: 300;
+		line-height: 1.6;
+		border-top: 3px solid transparent;
+		border-bottom: 0;
+		margin-right: 10px;
+		margin-left: 10px;
+		padding-top: 3px;
+		padding-bottom: 4px;
+		position: relative;
+		text-decoration: none;
+			  -moz-transition: opacity 0.25s ease-in-out;
+			  -webkit-transition: opacity 0.25s ease-in-out;
+		transition: opacity 0.25s ease-in-out;
+		display: block;
+		list-style-image: none;
+	}
+
+	#nav-global a.active {
+		color: #dd4814;
+		border-top: 3px solid #dd4814;
+		text-decoration: none;
+		opacity: 1;
+	}
+	#nav-global a:hover {
+		color: #dd4814;
+		text-decoration: none;
+	}
+	#nav-global:hover a {
+		opacity: 1;
+	}
+	#nav-global .open a:link,
+	#nav-global .open a:visited,
+	#nav-global .open span {
+		color: #dd4814;
+		opacity: 1;
+	}
+	#nav-global .open ul a:link,
+	#nav-global .open ul a:visited{
+		color: #333;
+		opacity: 1;
+	}
+
+	#nav-global .open ul a:hover {
+		color: #dd4814;
+		text-decoration: none;
+	}
+
+	#nav-global .open ul {
+		display: block;
+	}
+	#nav-global ul ul li:first-of-type a {
+		margin-left: 10px;
+	}
+	
+	body #nav-global li:first-of-type a {
+		margin-left: 0;
+	}
+	/*
+	* Temp styles
+	*/
+
+	.login-logout {
+		z-index: 5;
+	}
+}
+
+@media only screen and (min-width : 768px) {
+	body #nav-global li:first-of-type a {
+		margin-left: 10px;
+	}
+@media only screen and (min-width : 768px) {
+	#nav-global .nav-global-wrapper {
+		width: auto !important;		
+	}
+}
+}
+
+@media only screen and (max-width : 768px) {
+  body #nav-global li:first-of-type a {
+    margin-left: 10px;
+  }
+  #nav-global .nav-global-wrapper {
+    width: 100%;
+  }
+}
+
+@media only screen and (min-width : 984px) {
+  body #nav-global li:first-of-type a {
+    margin-left: 0;
+  }
+	#nav-global .nav-global-wrapper {
+		width: 984px !important;		
+	}
+}
\ No newline at end of file
diff --git a/static/css/core-constants.scss b/static/css/core-constants.scss
new file mode 100755
index 00000000000..83789aa4516
--- /dev/null
+++ b/static/css/core-constants.scss
@@ -0,0 +1,82 @@
+@charset "UTF-8";
+/**
+ * Ubuntu Patterns Stylesheet
+ *
+ * The CSS file required by Ubuntu patterns page
+ *
+ * @project		Ubuntu Patterns
+ * @author		Web Team at Canonical Ltd
+ * @copyright	2012 Canonical Ltd
+ *
+ * @see 		http://design.ubuntu.com
+ */
+
+/**
+ * standard colors
+ *
+ * @colordef standard colors
+ */
+
+/* assets database path */
+$asset-path: "//assets.ubuntu.com/sites/ubuntu/latest/u/img/";
+/* usage: background: url(#{$asset-path}/backgrounds/background.jpg) no-repeat 0 0; */
+
+$ubuntu-orange:			  #dd4814; /* ubuntu orange (used for text links also on any site except canonical) */
+$light-orange:        #fdf6f2; /* used as background on pre text */
+$canonical-aubergine:	#772953; /* canonical aubergine */
+$light-aubergine:		  #77216f; /* light aubergine (consumer) */
+$mid-aubergine:			  #5e2750; /* mid aubergine (both) */
+$dark-aubergine:		  #2c001e; /* dark aubergine (enterprise) */
+$warm-grey:				    #888888; /* warm grey */
+$cool-grey:				    #333333; /* cool grey */
+$light-grey:			    #f7f7f7; /* light grey */
+
+/* notifications */
+$error:					      #df382c; /* red */
+$warning:				      #eca918; /* yellow */
+$success:				      #38b44a; /* green */
+$information:			    #19b6ee; /* cyan */
+
+/* colour coded status - from negative to positive (Icon: canonical circle) */
+$status-red:			    #df382c; /* red, for status that require immediate attention */
+$status-grey:			    #888888; /* grey, for disabled status or ones that don’t require attention */
+$status-yellow:			  #efb73e; /* yellow, for status that require attention */
+$status-blue:			    #19b6ee; /* blue, for status that don’t require action */
+$status-green:			  #38b44a; /* green, for positive status */
+
+/* misc colours */
+$box-solid-grey:		  #efefef;
+$link-color:			    $ubuntu-orange; /* This is the global link color, mainly used for links in content */
+
+/* grid variables */
+$base:					14;
+$gutter-width:	20px;
+$grid-gutter:		20px;
+$gutter:				2.12766%;
+
+$one-col:       6.38297%;
+$two-col:       14.89361%;
+$three-col:     23.40425%;
+$four-col:      31.91489%;
+$five-col:      40.42553%;
+$six-col:       48.93617%;
+$seven-col:     57.4468%;
+$eight-col:     65.95744%;
+$nine-col:      74.46808%;
+$ten-col:       82.97872%;
+$eleven-col:    91.48936%;
+
+$nav-bg:						#f0f0f0;
+$nav-link-color:		#333;
+$nav-border-dark:		#d4d7d4;
+$nav-border-light:	#f2f2f4;
+$nav-hover-bg:      #d0d0d0;
+$nav-active-bg:     #ddd;
+
+$breakpoint-medium: "only screen and (min_width: 768px)";
+
+$breakpoint-large: "only screen and (min_width: 984px)";
+
+@media only screen and (min_width : 768px) { $base: 15; }
+
+@media only screen and (min_width: 984px) { $base: 14; }
\ No newline at end of file
diff --git a/static/css/core-mixins.scss b/static/css/core-mixins.scss
new file mode 100755
index 00000000000..ccfc48d0528
--- /dev/null
+++ b/static/css/core-mixins.scss
@@ -0,0 +1,88 @@
+/**
+ * mixins
+ *
+ * @section mixins
+ */
+
+@mixin vertical-align {
+  position: relative;
+  top: 50%;
+  -webkit-transform: translateY(-50%);
+  -ms-transform: translateY(-50%);
+  transform: translateY(-50%);
+}
+
+
+@mixin background_size($size: 100% 100%) {
+  -moz-background-size: $size;
+  -webkit-background-size: $size;
+  -o-background-size: $size;
+  background-size: $size;
+}
+
+@mixin font_size ($size: 16) {
+  font-size: ($size / $base)em;
+  margin-bottom: (12 / $size)em;
+}
+
+@mixin box_sizing ($type: border-box) {
+	-webkit-box-sizing: $type;
+	-moz-box-sizing:    $type;
+	box-sizing:         $type;
+}
+
+@mixin rounded_corners($radius: 4px 4px 4px 4px) {
+  -webkit-border-radius: $radius;
+  -moz-border-radius: $radius;
+  border-radius: $radius;
+}
+
+@mixin box_shadow($shadow: 0 2px 2px 0 #c2c2c2) {
+  -moz-box-shadow: $shadow;
+  -webkit-box-shadow: $shadow;
+  box-shadow: $shadow;
+}
+
+@mixin gradient($from, $to) {
+  background-color: $to;
+  background-image: -moz-linear-gradient($from, $to);
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from($from), to($to));
+  background-image: -webkit-linear-gradient($from, $to);
+  background-image: -o-linear-gradient($from, $to);
+}
+
+@mixin footer($background) {
+  padding: $gutter-width $two-col $gutter-width $four-col;
+  margin-bottom: 0;
+  background: url($background) no-repeat scroll $one-col center #F7F7F7;
+}
+
+@mixin clearfix() {
+  *zoom:1;
+
+  &:before,
+  &:after {
+      content:"";
+      display:table;
+  }
+  &:after {
+      clear:both;
+  }
+}
+
+// border
+@mixin border($width: 1px, $style: dotted, $color: #ddd) {
+  border-right: $width $style $color;
+  margin-right: $gutter-width / 2;
+  padding-right: .5625em; /* .625 - 1px */
+}
+
+// CSS3 colunms
+@mixin columns($num: 3, $gap: 20) {
+  -moz-column-count: $num;
+  -moz-column-gap: ($gap / $base)em;
+  -webkit-column-count: $num;
+  -webkit-column-gap: ($gap / $base)em;
+  column-count: $num;
+  column-gap: ($gap / $base)em;
+}
\ No newline at end of file
diff --git a/templates/static/css/core-print.scss b/static/css/core-print.scss
old mode 100644
new mode 100755
similarity index 92%
rename from templates/static/css/core-print.scss
rename to static/css/core-print.scss
index c0cdd223527..f6e0659bf06
--- a/templates/static/css/core-print.scss
+++ b/static/css/core-print.scss
@@ -2,13 +2,13 @@
 /**
  * Ubuntu print Stylesheet
  *
- * 
+ *
  * @project		Ubuntu Patterns
  * @author		Web Team at Canonical Ltd
  * @copyright	2012 Canonical Ltd
  *
  */
- 
+
 * { background: #fff; color: #000; }
 
 body {
@@ -32,6 +32,10 @@ footer {
 	display: none;
 }
 
+nav.nav-secondary {
+	display: block;
+}
+
 .wrapper {
 	width: auto;
 	margin: 0 5%;
diff --git a/static/css/global-responsive.css b/static/css/global-responsive.css
new file mode 100755
index 00000000000..05ab0b59aab
--- /dev/null
+++ b/static/css/global-responsive.css
@@ -0,0 +1,200 @@
+@charset "UTF-8";
+
+@media only screen and (min-width : 768px) {
+	body {
+		padding-top: 30px;
+	}
+	#nav-global {
+		background: #efefef;
+		width: 100%;
+		height: 30px;
+		line-height: 19.2px;
+		display: block;
+		z-index: 101;
+		position: relative;
+			-webkit-box-shadow: 0 2px 2px rgba(0,0,0,0.2);
+			-moz-box-shadow: 0 2px 2px rgba(0,0,0,0.2);
+		box-shadow: 0 2px 2px rgba(0,0,0,0.2);
+		margin-top: -30px;
+	}
+	#nav-global .nav-global-wrapper {
+	  -moz-box-sizing: border-box;
+	  background: none repeat scroll 0 0 #FFFFFF;
+	  margin: 0 auto;
+	  position: relative;
+	  text-align: left;
+	  width: 984px;
+	}
+	#nav-global.drop-shadow {
+		-webkit-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
+		-moz-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
+		box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
+	}
+	#nav-global div {
+		background: #efefef;
+		box-shadow: none;
+		margin-top: 0;
+		margin-bottom: 0;
+
+	}
+	#nav-global ul {
+		margin-bottom: 0;
+		margin-left: 0;
+		top: 0;
+	}
+	#nav-global ul li {
+		float: left;
+		display: block;
+		text-align: left;
+		margin: 0;
+		height: 30px;
+		margin-top: -1px;
+		position: relative;
+		top: 0;
+	}
+	#nav-global ul ul {
+		display: none;
+		float: none;
+		background: #fff;
+		position: absolute;
+		min-width: 120px;
+		top: 30px;
+		border-top: 1px solid #d7d7d7;
+		-webkit-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.3);
+		-moz-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.3);
+		box-shadow: 0 2px 2px rgba(0, 0, 0, 0.3);
+	}
+	#nav-global ul ul a:link, #nav-global ul ul a:visited {
+		border-top: none;
+		float: none;
+	}
+	#nav-global ul ul li {
+		float: none;
+	}
+	#nav-global ul ul li:first-of-type {
+		padding-top: 5px;
+	}
+	#nav-global .more {
+		border-left: 1px solid transparent;
+		border-right: 1px solid transparent;
+		min-width: 60px;
+	}
+	#nav-global .more span {
+		display: block;
+		top: -10px;
+		left: 46px;
+		line-height: 19.2px;
+		height: 0;
+		position: relative;
+		-webkit-transform-origin: 0 0;
+		-moz-transform-origin: 0 0;
+		-ms-transform-origin: 0 0;
+		-o-transform-origin: 0 0;
+		-webkit-transform: rotate(90deg);
+		-moz-transform: rotate(90deg);
+		-ms-transform: rotate(90deg);
+		-o-transform: rotate(90deg);
+		filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
+	}
+	#nav-global .open {
+		background: #fff;
+		min-width: 120px;
+		border-left: 1px solid #d7d7d7;
+		border-right: 1px solid #d7d7d7;
+	}
+
+	#nav-global a:link, #nav-global a:visited {
+		color: #333;
+		font-size: 12px;
+		font-weight: 300;
+		line-height: 1.6;
+		border-top: 3px solid transparent;
+		border-bottom: 0;
+		margin-right: 10px;
+		margin-left: 10px;
+		padding-top: 3px;
+		padding-bottom: 4px;
+		position: relative;
+		text-decoration: none;
+			  -moz-transition: opacity 0.25s ease-in-out;
+			  -webkit-transition: opacity 0.25s ease-in-out;
+		transition: opacity 0.25s ease-in-out;
+		display: block;
+		list-style-image: none;
+	}
+
+	#nav-global a.active {
+		color: #dd4814;
+		border-top: 3px solid #dd4814;
+		text-decoration: none;
+		opacity: 1;
+	}
+	#nav-global a:hover {
+		color: #dd4814;
+		text-decoration: none;
+	}
+	#nav-global:hover a {
+		opacity: 1;
+	}
+	#nav-global .open a:link,
+	#nav-global .open a:visited,
+	#nav-global .open span {
+		color: #dd4814;
+		opacity: 1;
+	}
+	#nav-global .open ul a:link,
+	#nav-global .open ul a:visited{
+		color: #333;
+		opacity: 1;
+	}
+
+	#nav-global .open ul a:hover {
+		color: #dd4814;
+		text-decoration: none;
+	}
+
+	#nav-global .open ul {
+		display: block;
+	}
+	#nav-global ul ul li:first-of-type a {
+		margin-left: 10px;
+	}
+	
+	body #nav-global li:first-of-type a {
+		margin-left: 0;
+	}
+	/*
+	* Temp styles
+	*/
+
+	.login-logout {
+		z-index: 5;
+	}
+}
+
+@media only screen and (min-width : 768px) {
+	body #nav-global li:first-of-type a {
+		margin-left: 10px;
+	}
+	#nav-global .nav-global-wrapper {
+		width: auto !important;		
+	}
+}
+
+@media only screen and (max-width : 768px) {
+  body #nav-global li:first-of-type a {
+    margin-left: 10px;
+  }
+  #nav-global .nav-global-wrapper {
+    width: 100%;
+  }
+} /* @media only screen and (max-width : 768px) */
+
+@media only screen and (min-width : 984px) {
+  body #nav-global li:first-of-type a {
+    margin-left: 0;
+  }
+	#nav-global .nav-global-wrapper {
+		width: 984px !important;		
+	}
+} /* @media only screen and (min-width : 984px) */
diff --git a/static/css/global.css b/static/css/global.css
new file mode 100755
index 00000000000..f361c3f4b0c
--- /dev/null
+++ b/static/css/global.css
@@ -0,0 +1,175 @@
+@charset "UTF-8";
+
+body {
+	padding-top: 30px;
+}
+#nav-global {
+	background: #efefef;
+	width: 100%;
+	height: 30px;
+	line-height: 19.2px;
+	display: block;
+	z-index: 101;
+	position: relative;
+	 -webkit-box-shadow: 0 2px 2px rgba(0,0,0,0.2);
+	  -moz-box-shadow: 0 2px 2px rgba(0,0,0,0.2);
+	box-shadow: 0 2px 2px rgba(0,0,0,0.2);
+	margin-top: -30px;
+}
+#nav-global .nav-global-wrapper {
+    -moz-box-sizing: border-box;
+    background: none repeat scroll 0 0 #FFFFFF;
+    margin: 0 auto;
+    position: relative;
+    text-align: left;
+    width: 984px;
+}
+#nav-global.drop-shadow {
+	-webkit-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
+	-moz-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
+	box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
+}
+#nav-global div {
+	background: #efefef;
+	box-shadow: none;
+	margin-top: 0;
+	margin-bottom: 0;
+
+}
+#nav-global ul {
+	margin-bottom: 0;
+	margin-left: 0;
+	top: 0;
+}
+#nav-global ul li {
+	float: left;
+	display: block;
+	text-align: left;
+	margin: 0;
+	height: 30px;
+	margin-top: -1px;
+	position: relative;
+	top: 0;
+}
+#nav-global ul ul {
+	display: none;
+	float: none;
+	background: #fff;
+	position: absolute;
+	min-width: 120px;
+	top: 30px;
+	border-top: 1px solid #d7d7d7;
+	-webkit-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.3);
+	-moz-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.3);
+	box-shadow: 0 2px 2px rgba(0, 0, 0, 0.3);
+}
+#nav-global ul ul a:link, #nav-global ul ul a:visited {
+	border-top: none;
+	float: none;
+}
+#nav-global ul ul li {
+	float: none;
+}
+#nav-global ul ul li:first-of-type {
+	padding-top: 5px;
+}
+#nav-global .more {
+	border-left: 1px solid transparent;
+	border-right: 1px solid transparent;
+	min-width: 60px;
+}
+#nav-global .more span {
+	display: block;
+	top: -10px;
+	left: 46px;
+	line-height: 19.2px;
+	height: 0;
+	position: relative;
+	-webkit-transform-origin: 0 0;
+	-moz-transform-origin: 0 0;
+	-ms-transform-origin: 0 0;
+	-o-transform-origin: 0 0;
+	-webkit-transform: rotate(90deg);
+	-moz-transform: rotate(90deg);
+	-ms-transform: rotate(90deg);
+	-o-transform: rotate(90deg);
+	filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
+}
+#nav-global .open {
+	background: #fff;
+	min-width: 120px;
+	border-left: 1px solid #d7d7d7;
+	border-right: 1px solid #d7d7d7;
+}
+
+#nav-global a:link, #nav-global a:visited {
+	color: #333;
+	font-size: 12px;
+	font-weight: 300;
+	line-height: 1.6;
+	border-top: 3px solid transparent;
+	border-bottom: 0;
+	margin-right: 10px;
+	margin-left: 10px;
+	padding-top: 3px;
+	padding-bottom: 4px;
+	position: relative;
+	text-decoration: none;
+		  -moz-transition: opacity 0.25s ease-in-out;
+		  -webkit-transition: opacity 0.25s ease-in-out;
+	transition: opacity 0.25s ease-in-out;
+	display: block;
+	list-style-image: none;
+}
+
+#nav-global a.active {
+	color: #dd4814;
+	border-top: 3px solid #dd4814;
+	text-decoration: none;
+	opacity: 1;
+}
+#nav-global a:hover {
+	color: #dd4814;
+	text-decoration: none;
+}
+#nav-global:hover a {
+	opacity: 1;
+}
+#nav-global .open a:link,
+#nav-global .open a:visited,
+#nav-global .open span {
+	color: #dd4814;
+	opacity: 1;
+}
+#nav-global .open ul a:link,
+#nav-global .open ul a:visited{
+	color: #333;
+	opacity: 1;
+}
+
+#nav-global .open ul a:hover {
+	color: #dd4814;
+	text-decoration: none;
+}
+
+#nav-global .open ul {
+	display: block;
+}
+
+body #nav-global li:first-of-type a {
+   margin-left: 0;
+}
+
+/*
+* Temp styles
+*/
+
+.login-logout {
+	z-index: 5;
+}
+
+@media only screen and (min-width : 768px) {
+	body #nav-global li:first-of-type a {
+		margin-left: 10px;
+	}
+}
\ No newline at end of file
diff --git a/templates/static/css/ie/ie6.scss b/static/css/ie/ie6.scss
old mode 100644
new mode 100755
similarity index 77%
rename from templates/static/css/ie/ie6.scss
rename to static/css/ie/ie6.scss
index a468820a4d2..c90b1dea30a
--- a/templates/static/css/ie/ie6.scss
+++ b/static/css/ie/ie6.scss
@@ -14,7 +14,7 @@ html.lt-ie7 {
 	
 	.inner-wrapper { 
 		border-bottom: 1px solid #c7c6c5; /* to make up for the lack of box-shadow */
-		padding-bottom: $gutter_width;
+		padding-bottom: $gutter-width;
 	}
 	
 	header.banner .logo-ubuntu {
@@ -28,16 +28,16 @@ html.lt-ie7 {
 	#box-search {
 		float: none;
 		position: absolute;
-		right: $gutter_width;
+		right: $gutter-width;
 		top: 58px;
 	}
 	
 	#box-search form input.form-text { /* this is needed as we're using input[type="text"] in core.scss */
 		border: 1px solid #ccc;
 		float: left;
-		margin: 0 ( $gutter_width / 2 ) 0 0;
+		margin: 0 ( $gutter-width / 2 ) 0 0;
 		padding: 4px 4px 3px;
-		width: $two_col/* + $grid_gutter*/;
+		width: $two-col/* + $grid-gutter*/;
 	}
 		
 	footer { 
@@ -46,7 +46,7 @@ html.lt-ie7 {
 		float: left;
 		position: relative;
 		display: block;
-		width: 100%/* + $gutter_width*/;
+		width: 100%/* + $gutter-width*/;
 	}
 	
 	/* homepage */
@@ -57,7 +57,7 @@ html.lt-ie7 {
 	/* ubuntu */
 	.row-do-more .six-col {
 		display: inline;
-	    width: $six_col/* - ($gutter_width / 2)*/;
+	    width: $six-col/* - ($gutter-width / 2)*/;
 	}
 	
 	.quote-right-top { 
@@ -66,7 +66,7 @@ html.lt-ie7 {
 		padding: 0;
 	}
     
-	.quote-right-top p { color: $ubuntu_orange; }
+	.quote-right-top p { color: $ubuntu-orange; }
 
 	.ubuntu-why-use-ubuntu .quote-right-right {
 		position: absolute;
@@ -75,18 +75,18 @@ html.lt-ie7 {
 	
 	.ubuntu-why-use-ubuntu .row-free .article  .quote-right-alt {
     	height: 207px;
-    	top: -($gutter_width * 3.1);
+    	top: -($gutter-width * 3.1);
     	padding-top: 20px;
 	}
 	
 	body.ubuntu-why-is-it-free .quote-right {
 		background: none;
-		top: -($gutter_width * 3);
-		right:  -( 2 * $gutter_width );		
+		top: -($gutter-width * 3);
+		right:  -( 2 * $gutter-width );		
 		width: 220px;
 	}
 	
-	body.ubuntu-why-is-it-free .quote-right p { color: $ubuntu_orange; }
+	body.ubuntu-why-is-it-free .quote-right p { color: $ubuntu-orange; }
 	
 	/* business */
 	body.business .row-hero-business, body.business-desktop-remix .row-hero, .row-ubuntu-advantage {
@@ -100,28 +100,28 @@ html.lt-ie7 {
 	body.business .row-enterprise .quote-canonical {
 	    background: #fff;
 		height: 0;
-		margin-top: $gutter_width;
+		margin-top: $gutter-width;
 	    padding-bottom: 0;
 	}
 	
 	body.business .row-community {
-		padding-bottom: $gutter_width;
+		padding-bottom: $gutter-width;
 	}
 		
 	body.business .row-community .nine-col {
-	    padding-left: $three_col;
-	    width: $nine_col - $four_col;
+	    padding-left: $three-col;
+	    width: $nine-col - $four-col;
 	}
 	
 	/* cloud */
 	.row-cloud-guest .eight-col, 
 	.row-consultancy .eight-col {
-		border-right: 1px solid $warm_grey;
-		width: $eight_col/* - ( 4 * $gutter_width)*/;
+		border-right: 1px solid $warm-grey;
+		width: $eight-col/* - ( 4 * $gutter-width)*/;
 	}	
 	
 	.row-providers .six-col {
-		width: $six_col/* - ( 2 * $gutter_width)*/;
+		width: $six-col/* - ( 2 * $gutter-width)*/;
 	}
 	
 	/*	@subsection download > desktop/server & cloud
@@ -132,7 +132,7 @@ html.lt-ie7 {
 	
 	body.download .row-hero .intro { 
 		padding-right: 0; 
-		width: $six_col - (200/$base); 
+		width: $six-col - (200/$base); 
 	}
 	
 	body.download .row-hero .intro p { 
@@ -140,8 +140,8 @@ html.lt-ie7 {
 	}
 	
 	#download-help {
-		background: $light_grey;
-		width: $eight_col/* - ( 8 * $gutter_width )*/;
+		background: $light-grey;
+		width: $eight-col/* - ( 8 * $gutter-width )*/;
 	}
 	
 	#download-help li span {
@@ -153,8 +153,8 @@ html.lt-ie7 {
 	/* cloud */
 	.row-home .intro {
 		background: none;
-		padding: 0 19px $gutter_width 0;
-		width: $eight_col;
+		padding: 0 19px $gutter-width 0;
+		width: $eight-col;
 	} 
 	.row-home .box-openstack-cloud {
 		background: none;
@@ -164,7 +164,7 @@ html.lt-ie7 {
 		display: block;
 		float: left;
 		clear: both;
-		width: $three_col/* - ( 1.5 * $gutter_width)*/;
+		width: $three-col/* - ( 1.5 * $gutter-width)*/;
 		margin-bottom: 0;
 	}
 	.row-features .list-features-content li .list-feature-footer {
@@ -177,7 +177,7 @@ html.lt-ie7 {
 	}
 	.row-cloud-services div { 
 		padding-right: 0;
-		width: $three_col/* + (2 * $gutter_width)*/;
+		width: $three-col/* + (2 * $gutter-width)*/;
 	}
 	
 	/* min-height fixes */
diff --git a/templates/static/css/ie/ie7.scss b/static/css/ie/ie7.scss
old mode 100644
new mode 100755
similarity index 87%
rename from templates/static/css/ie/ie7.scss
rename to static/css/ie/ie7.scss
index 77288ea9a91..55178f12925
--- a/templates/static/css/ie/ie7.scss
+++ b/static/css/ie/ie7.scss
@@ -51,7 +51,7 @@ html.lt-ie8 {
 	
 	.inner-wrapper { 
 		border-bottom: 1px solid #c7c6c5; /* to make up for the lack of box-shadow */
-		padding-bottom: $gutter_width;
+		padding-bottom: $gutter-width;
 		width: 984px;
 	}
 	
@@ -66,16 +66,16 @@ html.lt-ie8 {
 	#box-search {
 		float: none;
 		position: absolute;
-		right: $gutter_width;
+		right: $gutter-width;
 		top: 58px;
 	}
 	
 	#box-search form input.form-text { /* this is needed as we're using input[type="text"] in core.scss */
 		border: 1px solid #ccc;
 		float: left;
-		margin: 0 ( $gutter_width / 2 ) 0 0;
+		margin: 0 ( $gutter-width / 2 ) 0 0;
 		padding: 4px 4px 3px;
-		width: $two_col/* + $grid_gutter*/;
+		width: $two-col/* + $grid-gutter*/;
 	}
 		
 	footer { 
@@ -84,7 +84,7 @@ html.lt-ie8 {
 		float: left;
 		position: relative;
 		display: block;
-		width: 100%/* + $gutter_width*/;
+		width: 100%/* + $gutter-width*/;
 	}
 	
 	/* homepage */
@@ -96,7 +96,7 @@ html.lt-ie8 {
 	.row-do-more { padding-left: 0; }
 	.row-do-more .six-col {
 		display: inline;
-	    width: $six_col/* - ($gutter_width / 2)*/;
+	    width: $six-col/* - ($gutter-width / 2)*/;
 	}
 	
 	.quote-right-top { 
@@ -105,7 +105,7 @@ html.lt-ie8 {
 		padding: 0;
 	}
     
-	.quote-right-top p { color: $ubuntu_orange; }
+	.quote-right-top p { color: $ubuntu-orange; }
 
 	.ubuntu-why-use-ubuntu .quote-right-right {
 		position: absolute;
@@ -114,18 +114,18 @@ html.lt-ie8 {
 	
 	.ubuntu-why-use-ubuntu .row-free .article  .quote-right-alt {
     	height: 207px;
-    	top: -($gutter_width * 3.1);
+    	top: -($gutter-width * 3.1);
     	padding-top: 20px;
 	}
 	
 	body.ubuntu-why-is-it-free .quote-right {
 		background: none;
-		top: -($gutter_width * 3);
-		right:  -( 2 * $gutter_width );		
+		top: -($gutter-width * 3);
+		right:  -( 2 * $gutter-width );		
 		width: 220px;
 	}
 	
-	body.ubuntu-why-is-it-free .quote-right p { color: $ubuntu_orange; }
+	body.ubuntu-why-is-it-free .quote-right p { color: $ubuntu-orange; }
 	
 	/* business */
 	body.business .row-hero p.strip {
@@ -158,28 +158,28 @@ html.lt-ie8 {
 	body.business .row-enterprise .quote-canonical {
 	    background: #fff;
 		height: auto;
-		margin-top: $gutter_width;
+		margin-top: $gutter-width;
 	    padding-bottom: 0;
 	}
 	
 	body.business .row-community {
-		padding-bottom: $gutter_width;
+		padding-bottom: $gutter-width;
 	}
 		
 	body.business .row-community .nine-col {
-	    padding-left: $three_col;
-	    width: $nine_col - $four_col;
+	    padding-left: $three-col;
+	    width: $nine-col - $four-col;
 	}
 	
 	/* cloud */
 	.row-cloud-guest .eight-col, 
 	.row-consultancy .eight-col {
-		border-right: 1px solid $warm_grey;
-		width: $eight_col/* - ( 4 * $gutter_width)*/;
+		border-right: 1px solid $warm-grey;
+		width: $eight-col/* - ( 4 * $gutter-width)*/;
 	}	
 	
 	.row-providers .six-col {
-		width: $six_col/* - ( 2 * $gutter_width)*/;
+		width: $six-col/* - ( 2 * $gutter-width)*/;
 	}
 	
 	/*	@subsection download > desktop/server & cloud
@@ -190,7 +190,7 @@ html.lt-ie8 {
 	
 	body.download .row-hero .intro { 
 		padding-right: 0; 
-		width: $six_col/* - (200/$base)/*/; 
+		width: $six-col/* - (200/$base)/*/; 
 	}
 	
 	body.download .row-hero .intro p { 
@@ -198,8 +198,8 @@ html.lt-ie8 {
 	}
 	
 	#download-help {
-		background: $light_grey;
-		width: $eight_col/* - ( 8 * $gutter_width )/*/;
+		background: $light-grey;
+		width: $eight-col/* - ( 8 * $gutter-width )/*/;
 	}
 	
 	#download-help li span {
diff --git a/templates/static/css/ie/ie8.scss b/static/css/ie/ie8.scss
old mode 100644
new mode 100755
similarity index 100%
rename from templates/static/css/ie/ie8.scss
rename to static/css/ie/ie8.scss
diff --git a/templates/static/css/minisites/juju.css b/static/css/minisites/juju.css
old mode 100644
new mode 100755
similarity index 98%
rename from templates/static/css/minisites/juju.css
rename to static/css/minisites/juju.css
index 21c16695e10..c52a4f8ecb1
--- a/templates/static/css/minisites/juju.css
+++ b/static/css/minisites/juju.css
@@ -15,7 +15,7 @@ Copyright (C) 2012 Canonical Ltd
 	#77216f; light aubergine (consumer) 
 	#5e2750; mid aubergine (both) 
 	#2c001e; dark aubergine (enterprise) 
-	#aea79f; warm grey 
+	#888888; warm grey 
 	#333333; cool grey
 	#f7f7f7; light grey
 	
@@ -27,7 +27,7 @@ Copyright (C) 2012 Canonical Ltd
 	
 	Colour coded status - from negative to positive (icon: canonical circle) 
 	#df382c; red, for status that require immediate attention 
-	#aea79f; grey, for disabled status or ones that don't require attention 
+	#888888; grey, for disabled status or ones that don't require attention 
 	#efb73e; yellow, for status that require attention 
 	#19b6ee; blue, for status that don't require action 
 	#38b44a; green, for positive status 
@@ -151,7 +151,7 @@ body.home #main-content .row-strap h4 {
 	font-size: 32px;
 }
 body.home #main-content .row-strap li {
-	border-right: 1px dotted #AEA79F;
+	border-right: 1px dotted #888888;
 	padding-right: 20px;
 	margin-right: 10px;
 }
@@ -362,7 +362,7 @@ body.page-features #main-content .row-landscape {
 }
 
 body.page-deployment #main-content .row-hero h2 {
-	border-top: 1px dotted #AEA79F;
+	border-top: 1px dotted #888888;
 	padding-top: 24px;
 	margin-bottom: 30px;
 }
@@ -407,8 +407,8 @@ body.page-install #main-content .step span {
 	width: 18px;
 }
 body.page-install #main-content .step span {
-	background-color: #aea79f;
-	border: 3px solid #aea79f;
+	background-color: #888888;
+	border: 3px solid #888888;
 	border-radius: 40px;
 	font-size: 1.25em;
 	height: 26px;
diff --git a/static/css/scratch.scss b/static/css/scratch.scss
new file mode 100755
index 00000000000..85dedf95ded
--- /dev/null
+++ b/static/css/scratch.scss
@@ -0,0 +1,14 @@
+/*
+ * 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/templates/static/css/section/business.scss b/static/css/section/business.scss
old mode 100644
new mode 100755
similarity index 77%
rename from templates/static/css/section/business.scss
rename to static/css/section/business.scss
index 0f704c50156..216ec19b5fd
--- a/templates/static/css/section/business.scss
+++ b/static/css/section/business.scss
@@ -2,13 +2,13 @@
 /* ---------------------------------------------------------------
 ------------------------------------------------------------------
 	DO NOT EDIT STYLES.CSS
-	It is autogenerated. 
-	
+	It is autogenerated.
+
 	Project:		Ubuntu Front-End Business section
 	Author:			Web Team at Canonical Ltd
-	Last edited by: 
-	Last edited on: 
-  
+	Last edited by:
+	Last edited on:
+
   	CONTENTS:
 	-----------------------------------------------------------------
 	@section business
@@ -20,64 +20,64 @@
 	@section Needs to go into patterns
 
 	@this may turn into a pattern
-	
+
 	Rounded corners
 	-----------------------------------------------------------------
 	@include rounded_corners(top-left top-right bottom-right bottom-left);
 		examples
 		@include rounded_corners(0 0 4px 4px); rounded bottoms
 		@include rounded_corners(4px); all corners rounded
-		
+
 	Base grid sass, this lives in /sites/core/static/css/core-grid.scss
 	-----------------------------------------------------------------
 	$base: 			16;
 	$column_width:	( 60 / $base )em;
-	$gutter_width: 	( 20 / $base )em;
+	$gutter-width: 	( 20 / $base )em;
 	$grid_column: 	( 57 / $base )em; nested columns
-	$grid_gutter: 	( 18 / $base )em;
-	
+	$grid-gutter: 	( 18 / $base )em;
+
 	Available grid widths
 	-----------------------------------------------------------------
-	$one_col - 100%
+	$one-col - 100%
 
 	Using these enables us to give individual elements specific widths without adding a static width:
 
-	padding: $gutter_width;
-	width: 100% - ( 2 * $gutter_width );
+	padding: $gutter-width;
+	width: 100% - ( 2 * $gutter-width );
 
 	Colour definitiions are in /sites/core/static/css/core-constants.scss
 	-----------------------------------------------------------------
-	$ubuntu_orange:			#dd4814; ubuntu orange (used for text links also on any site except canonical) 
-	$canonical_aubergine:	#772953; canonical aubergine 
-	$light_aubergine:		#77216f; light aubergine (consumer) 
-	$mid_aubergine:			#5e2750; mid aubergine (both) 
-	$dark_aubergine:		#2c001e; dark aubergine (enterprise) 
-	$warm_grey:				#aea79f; warm grey 
-	$cool_grey:				#333333; cool grey
-	$light_grey:			#f7f7f7; light grey
-	
-	notifications 
-	$error:					#df382c; red 
-	$warning:				#eca918; yellow 
-	$success:				#38b44a; green 
-	$information:			#19b6ee; cyan 
-	
-	colour coded status - from negative to positive (icon: canonical circle) 
-	$status_red:			#df382c; red, for status that require immediate attention 
-	$status_grey:			#aea79f; grey, for disabled status or ones that donÕt require attention 
-	$status_yellow:			#efb73e; yellow, for status that require attention 
-	$status_blue:			#19b6ee; blue, for status that donÕt require action 
-	$status_green:			#38b44a; green, for positive status 
-	
-	misc colours 
-	$box_solid_grey:		#efefef;
-	
-	$link_color:			$ubuntu_orange; this is the global link color, mainly used for links in content
-		
+	$ubuntu-orange:			#dd4814; ubuntu orange (used for text links also on any site except canonical)
+	$canonical-aubergine:	#772953; canonical aubergine
+	$light-aubergine:		#77216f; light aubergine (consumer)
+	$mid-aubergine:			#5e2750; mid aubergine (both)
+	$dark-aubergine:		#2c001e; dark aubergine (enterprise)
+	$warm-grey:				#888888; warm grey
+	$cool-grey:				#333333; cool grey
+	$light-grey:			#f7f7f7; light grey
+
+	notifications
+	$error:					#df382c; red
+	$warning:				#eca918; yellow
+	$success:				#38b44a; green
+	$information:			#19b6ee; cyan
+
+	colour coded status - from negative to positive (icon: canonical circle)
+	$status-red:			#df382c; red, for status that require immediate attention
+	$status-grey:			#888888; grey, for disabled status or ones that donÕt require attention
+	$status-yellow:			#efb73e; yellow, for status that require attention
+	$status-blue:			#19b6ee; blue, for status that donÕt require action
+	$status-green:			#38b44a; green, for positive status
+
+	misc colours
+	$box-solid-grey:		#efefef;
+
+	$link-color:			$ubuntu-orange; this is the global link color, mainly used for links in content
+
 	notes:
 	-----------------------------------------------------------------
 	Using '.yui3-js-enabled' for CSS with JS enabled as it's there for free atm, be nice to have just js-enabled as a class.
-		
+
 -----------------------------------------------------------------
 -------------------------------------------------------------- */
 
@@ -94,33 +94,33 @@ body.business .box .six-col { margin-bottom: 0; }
 
 body.business .row-hero {
 	background: #efefef;
-	border-bottom: 1px dotted $warm_grey;
+	border-bottom: 1px dotted $warm-grey;
 	padding: 20px;
 	position: relative;
 }
 
 body.business .row-hero { /* First bit of content on a page, normally contains h1 and sometimes a bit of blurb */
-	position: relative;	
+	position: relative;
 	border-bottom: 0;
 }
 
 body.business .row-enterprise {
-	background: $canonical_aubergine;
+	background: $canonical-aubergine;
 }
 
 body.business .row-hero-business p {
-    @include font_size (25); 
+    @include font_size (25);
 }
 
 body.business .row-hero p.strip {
 	@include box_sizing;
-	@include font_size (18); 
+	@include font_size (18);
 	background: #e0deda;
 	bottom: 0;
 	display: block;
 	left: 0;
 	margin: 0;
-	padding: $grid_gutter;
+	padding: $grid-gutter;
 	position: absolute;
 	width: 100%;
 	z-index: 1;
@@ -137,12 +137,12 @@ body.business {
   .where-to-find-us .ask-ubuntu a { background: url("../img/patterns/icon-irc.png") 0 2px no-repeat; }
   .where-to-find-us .mailing-lists a { background: url("../img/patterns/icon-mail.png") 0 2px no-repeat; }
   .where-to-find-us .ubuntu-blog a { background: url("../img/patterns/icon-rss.png") 0 2px no-repeat; }
-} 
+}
 
 body.business .row-webinars {
     @include rounded_corners(4px);
 	background: #fff;
-	color: $cool_grey;	
+	color: $cool-grey;
 }
 
 body.business .row-webinars div {
@@ -153,7 +153,7 @@ body.business .row-webinars div img {
 	margin: 0 2.5em 0 12em;
 }
 
-body.business .row-ubuntu-advantage { 
+body.business .row-ubuntu-advantage {
 	background-color: #efeeec;
 }
 
@@ -178,8 +178,7 @@ body.business-services .row-quote {
 	padding-bottom: 10px;
 }
 body.business-services .row-hero p.intro {
-	@include font_size (20);
-	padding-right: $three_col;
+	padding-right: $three-col;
 }
 
 body.business-services .row-hero p.twelve-col {
@@ -193,30 +192,30 @@ body.business-services .row-hero a {
 
 body.business-services .row-blockquote {
 	background: #e2d4dc;
-	color: $canonical_aubergine;
+	color: $canonical-aubergine;
 	margin-bottom: 0;
-	margin-left: -$grid_gutter;
-	padding-top: $gutter_width;
+	margin-left: -$grid-gutter;
+	padding-top: $gutter-width;
 	width: 100%;
 }
 
 body.business-services .row-help {
 	@include rounded_corners(0 0 4px 4px);
-	background: $canonical_aubergine;
+	background: $canonical-aubergine;
 	color: #fff;
-	margin: 0 -$grid_gutter;
-	padding: $grid_gutter;
-	width: 100%/* -($grid_gutter * 2)/*/;
+	margin: 0 -$grid-gutter;
+	padding: $grid-gutter;
+	width: 100%/* -($grid-gutter * 2)/*/;
 }
 
 body.business-services .row-help div {
 	@include rounded_corners(4px);
 	background-color: #fff;
-	background-position: $gutter_width $gutter_width;
+	background-position: $gutter-width $gutter-width;
 	background-repeat: no-repeat;
-	color: $cool_grey;
-	padding: $gutter_width $gutter_width ($gutter_width/2) /*($one_col+($gutter_width)*1.5)/*/;
-	/*width: $six_col-$two_col-$gutter_width;/*/
+	color: $cool-grey;
+	padding: $gutter-width $gutter-width ($gutter-width/2) /*($one-col+($gutter-width)*1.5)/*/;
+	/*width: $six-col-$two-col-$gutter-width;/*/
 }
 
 body.business-services .row-help div.ubuntu-switch { background-image: url(../img/pictograms/pictogram-service-switching-74x74.png); }
@@ -244,11 +243,11 @@ body.business-case-studies #main-content h4,
 body.business-case-studies #main-content h5 {
 	font-size: 16px;
 	font-weight: normal;
-	line-height: 1.6;	
+	line-height: 1.6;
 }
 
 body.business-case-studies .row {
-	border-bottom: 1px dotted $warm_grey;
+	border-bottom: 1px dotted $warm-grey;
 }
 
 body.business-case-studies .row.no-border {
@@ -265,7 +264,7 @@ body.business-case-studies .row-hero {
 }
 
 body.business-case-studies .row-hero h2 {
-	@include font_size (38); 
+	@include font_size (38);
 	padding-right: 400px;
 }
 
@@ -289,7 +288,7 @@ body.business-case-studies .row-sectors-more {
 }
 
 body.business-case-studies .row-sectors-more h5 {
-	border-bottom: 1px dotted $warm_grey;
+	border-bottom: 1px dotted $warm-grey;
 	padding-top: .5em;
 	padding-bottom: .5em;
 	margin-bottom: 0;
@@ -301,13 +300,13 @@ body.business-case-studies .row-services {
 }
 
 body.business .row-sectors p a:after,
-body.business .row-sectors-more ul li a:after, 
+body.business .row-sectors-more ul li a:after,
 body.business-case-studies .row-services .four-col a:after {
 	content: "\0000a0›";
 }
 
 body.business .row-sectors .four-col, body.business .row-sectors-more .four-col {
-	border-right: 1px dotted $warm_grey;
+	border-right: 1px dotted $warm-grey;
 	padding-right: 1.1875em;
 	padding-bottom: 2em;
 }
@@ -328,7 +327,7 @@ body.business-case-studies .row-services .four-col img {
 }
 
 body.business-case-studies .row-services .four-col {
-	border-right: 1px dotted $warm_grey;
+	border-right: 1px dotted $warm-grey;
 	padding-right: (20/$base)em;
 }
 
@@ -341,19 +340,19 @@ body.business-case-studies .row-services .last-col img {
     padding: (20/$base)em (94/$base)em;
 }
 
-body.business-case-studies .row-services .four-col h4, 
+body.business-case-studies .row-services .four-col h4,
 body.business-case-studies .row-services .four-col p {
 	background: #fff;
 }
 
 #thank-you-extra .four-col {
-	border-right: 1px dotted $warm_grey;
-	padding-right: (20/$base)em;
-} 
+	border-bottom: 1px dotted $warm-grey;
+	padding-bottom: (20/$base)em;
+}
 
 #thank-you-extra .last-col {
 	border: 0;
-	padding-right: 0;
+	padding-bottom: 0;
 }
 
 /* row-landscape-trial */
@@ -370,7 +369,7 @@ body.business-case-studies .row-services .four-col p {
 .row-landscape-trial div p {
 	margin-top: 10px;
 	float: left;
-	width: $ten_col;
+	width: $ten-col;
 }
 .row-landscape-trial div p.last .link-cta-canonical {
 	margin-top: -7px;
@@ -384,12 +383,12 @@ body.business-case-studies .row-services .four-col p {
   @include box_sizing;
   @include rounded_corners(4px);
   background-color: #fff;
-  border: 1px solid $warm_grey;
+  border: 1px solid $warm-grey;
   margin-bottom: 20px;
   overflow: visible;
-  padding: ( $gutter_width / 2 );
+  padding: ( $gutter-width / 2 );
   position: relative;
-  width: $six_col;
+  width: $six-col;
 }
 
 .row-ubuntu-advantage li.first {
@@ -413,7 +412,7 @@ body.business-case-studies .row-services .four-col p {
   padding-top: 10px;
   margin-bottom: 0;
   padding-left: 25px;
-  border-bottom: 1px dotted $warm_grey;
+  border-bottom: 1px dotted $warm-grey;
   float: left;
   display: inline-block;
 }
@@ -421,13 +420,13 @@ body.business-case-studies .row-services .four-col p {
 .row-ubuntu-advantage img {
   bottom: 0;
   position: absolute;
-  left: $gutter_width;
+  left: $gutter-width;
 }
 
-.packages { 
+.packages {
   background: #efeeec;
   position: relative;
-  
+
   h2 {
     @include box_sizing;
     background: #efeeec url(../img/cloud/bg-servicesserver-owl-125x101.png) no-repeat 20px 35px;
@@ -436,9 +435,9 @@ body.business-case-studies .row-services .four-col p {
     margin-bottom: 0;
     padding: 30px 20px 120px 170px;
     position: relative;
-    width: $five_col;
+    width: $five-col;
   }
-  
+
   .price-annual, .price-monthly  {
     @include font_size (16);
     color: #000;
@@ -449,8 +448,8 @@ body.business-case-studies .row-services .four-col p {
     top: 238px;
     font-weight: normal;
   }
-  .price-monthly { 
-    top: 196px; 
+  .price-monthly {
+    top: 196px;
   }
   dl {
     border-left: 1px dotted #9a989b;
@@ -475,7 +474,7 @@ body.business-case-studies .row-services .four-col p {
     margin: 0;
     line-height: 1.4;
   }
-  
+
   dd.price {
     color: #6E6F71;
     min-height: 0;
@@ -495,21 +494,21 @@ body.pc-business .packages h2 {
 
 .newsletter-signup {
   margin-bottom: 0;
-  
+
   ul {
     margin-bottom: 0;
   }
-  
+
   fieldset {
     background: none;
     padding: 0;
   }
-  
-  fieldset p { 
-    @include font_size (13); 
+
+  fieldset p {
+    @include font_size (13);
     margin-bottom: 0;
   }
-  
+
   input[type="text"]{
     margin-bottom: 0;
     width: 234px;
@@ -519,7 +518,7 @@ body.pc-business .packages h2 {
     width: auto;
   }
   input[type="radio"] { margin: 0; }
-  
+
   .error {
     color: $error;
     @include font_size (13);
@@ -539,3 +538,19 @@ body.pc-business .packages h2 {
 .row-cost-effective {
   background: url("../img/homepage/hero-landscape-screenshot.png") no-repeat scroll 575px -5px;
 }
+
+/* Medium / Tablet viewport
+-------------------------------------------------------------- */
+@media only screen and (min-width : 769px) {
+
+	#thank-you-extra .four-col {
+		border-right: 1px dotted $warm-grey;
+		padding-right: (20/$base)em;
+		border-bottom: 0;
+	}
+
+	#thank-you-extra .last-col {
+		border: 0;
+		padding-right: 0;
+	}
+}
\ No newline at end of file
diff --git a/static/css/section/cloud.scss b/static/css/section/cloud.scss
new file mode 100755
index 00000000000..c44aa6dad16
--- /dev/null
+++ b/static/css/section/cloud.scss
@@ -0,0 +1,961 @@
+@charset "UTF-8";
+/* ---------------------------------------------------------------
+------------------------------------------------------------------
+	DO NOT EDIT STYLES.CSS
+	It is autogenerated.
+
+	Project:		Ubuntu Front-End Cloud section
+	Author:			Web Team at Canonical Ltd
+	Last edited by:
+	Last edited on:
+
+  	CONTENTS:
+	-----------------------------------------------------------------
+	@section cloud
+		@subsection cloud > insights
+		@subsection cloud > public-cloud
+		@subsection cloud > private-cloud
+		@subsection cloud > orchestration
+		@subsection cloud > solutions
+		@subsection cloud > tools
+
+		Medium / Tablet viewport
+		Large / Desktop viewport
+
+		$ubuntu-orange:			  #dd4814; /* ubuntu orange (used for text links also on any site except canonical)
+		$light-orange:        #fdf6f2; - used as background on pre text
+		$canonical-aubergine:	#772953; - canonical aubergine
+		$light-aubergine:		  #77216f; - light aubergine (consumer)
+		$mid-aubergine:			  #5e2750; - mid aubergine (both)
+		$dark-aubergine:		  #2c001e; - dark aubergine (enterprise)
+		$warm-grey:				    #888888; - warm grey
+		$cool-grey:				    #333333; - cool grey
+		$light-grey:			    #f7f7f7; - light grey
+
+------------------------------------------------------------------
+-------------------------------------------------------------- */
+/*body.cloud a[href=""]:after {
+	content:" - DEV NOTE: NEEDS URL";
+	color: #333;
+	font-weight: bold;
+}*/
+
+/*	@section cloud
+-------------------------------------------------------------- */
+body.cloud-home {
+	#main-content .row-hero {
+		margin-top: 0;
+		padding-top: 40px;
+
+		.intro {
+			font-size: 2em;
+			line-height: 1.4;
+			margin-bottom: 20px;
+		}
+
+		h1 {
+			font-size: 2.8125em;
+			margin-bottom: 10px;
+
+			span {
+				color: $ubuntu-orange;
+				display: inline;
+			}
+		}
+	}
+
+	.row-cloud-tools .note {
+		color: $warm-grey;
+		letter-spacing: 0.1em;
+		text-transform: uppercase;
+	}
+
+	.row-services {
+		img {
+			margin-bottom: 20px;
+		}
+	}
+}
+
+.maas-col h3 a, .juju-col h3 a, .landscape-col h3 a {
+	background-position: center left;
+	background-repeat: no-repeat;
+	padding: 6px 0 6px 2.3em;
+	margin-bottom: 0;
+	background-size: 1.8em auto;
+}
+.maas-col h3 a {
+	background-image: url("../img/cloud/maas-logo.svg");
+	background-size: 2em auto;
+}
+html.no-svg, .opera-mini {
+	.maas-col h3 a {
+		background-image: url("../img/pictograms/image-picto-maas-40.png");
+	}
+}
+
+.juju-col h3 a {
+	background-image: url("../img/pictograms/image-picto-juju-40.png");
+}
+
+.landscape-col h3 a {
+	background-image: url("../img/pictograms/image-picto-landscape-40.png");
+}
+
+body.cloud .row-hero {
+	padding-top: 20px;
+}
+
+body.cloud .last-row, body.cloud .no-border { border-bottom: 0; }
+
+body.cloud .six-col .inline-items li {
+	display: inline;
+	float: left;
+	margin-right: 25px;
+}
+
+body.cloud .six-col .inline-items li.last-item { margin-right: 0; }
+
+.nav-list-features ul {
+	margin-right: -$gutter-width;
+	position: relative;
+}
+
+.nav-list-features li {
+	display: inherit;
+	margin-right: 0;
+	margin-top: 26px;
+	text-align: right;
+}
+
+.nav-list-features li a:link, .nav-list-features li a:visited {
+	color: $cool-grey;
+	display: block;
+	padding-right: $gutter-width;
+}
+
+.nav-list-features li a:hover { text-decoration: none; }
+
+.nav-list-features li a:after { content: ""; }
+
+.yui3-js-enabled .nav-list-features li a.active {
+	background: url(../img/cloud/feature-arrows.png) 100% 0 no-repeat;
+	font-weight: normal;
+	margin-right: -1px;
+}
+
+.yui3-js-enabled .nav-list-features li#nav-list-feature-private a.active, .yui3-js-enabled .nav-list-features li#nav-list-feature-virtualisation a.active { background-position: right -18px; }
+
+.list-features-content li {
+    	-moz-box-shadow:inset 0 0 5px 1px rgba(0,0,0,0.1);
+    	-webkit-box-shadow:inset 0 0 5px 1px rgba(0,0,0,0.1);
+    @include rounded_corners(4px);
+    background-color: $light-grey;
+    box-shadow:inset 0 0 5px 1px rgba(0,0,0,0.1);
+    min-height: 255px;
+    padding: 30px 30px 100px 30px;
+    position: relative;
+}
+
+/* @subsection cloud > public-cloud */
+body.public-cloud-home {
+	.row-hero {
+		background: url(../img/pictograms/pictograms-public-cloud-353x119.png) 574px 70px no-repeat;
+	}
+	.row-hero h2 {
+		padding: 0 480px 25px 0;
+	}
+	.row-why-public-cloud  {
+		background: #fff url(../img/cloud/pictogram-public-cloud-cropped-235x351.png) right 50px no-repeat;
+	}
+}
+
+.box-cloud-contact-header h2 { margin-bottom: 10px; }
+
+.box-cloud-contact .box-cloud-contact-header {
+	border-bottom: 1px dotted $warm-grey;
+	margin-bottom: 20px;
+	padding-bottom: 15px;
+	float: left;
+	margin-right: 20px;
+}
+
+.box-cloud-contact p.six-col {
+	margin: -5px 0 0 -50px;
+}
+
+.box-cloud-contact .box-cloud-contact-header p {
+    color: #656565;
+	@include font_size (21);
+	margin-bottom: 0;
+    line-height: 1.4;
+    margin: 0;
+}
+
+.box-try-cloud-guest {
+	padding-bottom: 0;
+}
+
+.box-try-cloud-guest p {
+	border-bottom: 1px dotted $warm-grey;
+	margin-bottom: 20px;
+	padding-bottom: 20px;
+}
+
+.box-cloud-contact p a.link-cta-canonical {
+    float: left;
+}
+
+body.cloud-public-cloud-strategy .row-hero {
+  background: #fff url(../img/pictograms/pictogram-public-cloud-350x350.png) no-repeat scroll 105% 20px;
+}
+
+body.cloud .packages {
+  h2 { width: 45.4761%; }
+
+  .price-annual  { top: 242px; }
+  .price-monthly { top: 200px; }
+}
+
+/* jumpstart */
+.list-jumpstart h3 {
+	@include font_size (19.5);
+	padding-top: 3px;
+}
+.list-jumpstart h3 img {
+	float: left;
+	margin-right: 10px;
+	margin-top: -3px;
+}
+
+.cloud-solutions-jumpstart .row-hero {
+	background: #efefef;
+	padding-bottom: 10px;
+}
+
+body.cloud-cloud-management {
+	.row-hero {
+		.intro {
+			margin-bottom: 35px;
+		}
+		img {
+			margin-bottom: 20px;
+		}
+	}
+	.audience-enterprise {
+		margin-top: 18px;
+
+		.truncated {
+			display: inline;
+		}
+
+		.full {
+			display: none;
+		}
+	}
+}
+
+/* @subsection cloud > tools */
+body.cloud-tools {
+	.row-juju {
+		background: url(../img/cloud/image-juju-background-pattern.png);
+		position: relative;
+		overflow: visible;
+
+		img {
+			margin-bottom: 20px;
+		}
+	}
+
+	.row-computers-selected {
+
+	  .computers-selected p {
+		font-size: 8.5em;
+	    color: $mid-aubergine;
+	    float: left;
+	    letter-spacing: -8px;
+	    padding-left: 15px;
+	    margin-bottom: 0;
+	    width: 433px;
+
+	    span {
+			float: right;
+			font-size: 0.333333333em;
+			line-height: 1.2em;
+			margin-top: 0.9em;
+			width: 275px;
+			letter-spacing: normal;
+	    }
+	  }
+	}
+} /* end @subsection cloud > tools */
+
+body.cloud-build-a-cloud {
+
+  .openstack-open-cloud {
+    margin-top: 20px;
+  }
+  .start-today h2 {
+    margin-top: 10px;
+  }
+}
+
+body.cloud-public-cloud {
+  .certified-public-clouds {
+    .inline-icons{
+      margin-bottom: 0;
+
+      li {
+        margin: 20px 40px 20px 0;
+      }
+
+      li.last-item {
+        margin-right: 0;
+      }
+    }
+  }
+
+  .developers-favourite {
+    img {
+      margin-left: -10px;
+      margin-top: 10px;
+    }
+  }
+  .row-juju-advantage {
+  	div {
+  		min-height: 144px;
+  	}
+
+  	.last-col .pull-left-20 {
+	    margin-left: 0;
+		}
+  }
+}
+
+body.cloud-tools-juju {
+
+	.row-hero {
+		a {
+			margin-top: 20px;
+		}
+		img {
+			margin: 10px 0 10px;
+		}
+	}
+	.row-one-stop-shop img {
+	  margin-bottom: $gutter-width;
+	}
+
+  .row-join-the-fun h2 {
+    margin-top: 15px;
+  }
+}
+
+body.cloud-tools-maas {
+  .row-hero {
+    background: url(../img/cloud/cloud-maas-screenshot.jpg) no-repeat 420px 0px;
+  }
+  h1 {
+		background-image: url("../img/cloud/maas-logo.svg");
+		background-repeat: no-repeat;
+		background-position: 0 5px;
+		background-size: 1.4em;
+		padding-left: 1.5em;
+		margin-left: -6px;
+		padding-top: 5px;
+  }
+}
+html.no-svg, .opera-mini {
+	body.cloud-tools-maas h1 {
+		background-image: url("../img/pictograms/image-picto-maas-40.png");
+	}
+}
+
+body.cloud .row-community { padding-bottom: 40px !important; }
+
+body.cloud-labs {
+  .box { margin-bottom: $gutter-width; }
+}
+body.cloud-ecosystem {
+  img.partner-logo { margin: 10px 0 20px; }
+}
+
+/* cloud helper classes */
+.offer {
+	color: $warm-grey;
+	font-size: 14px;
+	letter-spacing: 1px;
+	position: relative;
+	text-transform: uppercase;
+}
+
+.tight-section {
+  padding-top: 0;
+  padding-bottom: 0;
+
+  a {
+    margin-bottom: 40px;
+    display: block;
+  }
+
+  .ubuntu-column a { margin-bottom: 0; }
+}
+
+/* ubuntu-openstack-interoperability-lab */
+.cloud-ecosystem-ubuntu-openstack-interoperability-lab {
+	li.box {
+		text-align: center;
+		width: 63px;
+		margin-right: 20px;
+		margin-bottom: 20px;
+		padding: 20px 10px 14px;
+	}
+	#main-content .row-get-involved {
+		overflow: hidden;
+
+		span img {
+			margin: initial;
+			margin-left: -10px;
+			margin-bottom: 20px;
+		}
+	}
+}
+
+.cloud-ecosystem-ubuntu-openstack-interoperability-lab .row-partners li { text-align: center; }
+
+.cloud-ecosystem-ubuntu-openstack-interoperability-lab .row-partners li:nth-child(4n) { margin: 0 0 20px 0; }
+
+.cloud-ecosystem-ubuntu-openstack-interoperability-lab .row-partners li:not(:nth-child(4n)) { margin: 0 20px 20px 0; }
+
+/* end @subsection cloud > ecosystem > ubuntu OIL */
+
+/* reference architecture */
+body.cloud-openstack-reference-architecture {
+
+	.tabbed-content .twelve-col img {
+		vertical-align: text-bottom;
+		padding-bottom: 40px;
+	}
+	.twelve-col .for-mobile {
+		display: block;
+		position: absolute;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		height: 100%;
+	}
+	.twelve-col .for-mobile span {
+		position: absolute;
+		bottom: 10px;
+	}
+}
+
+body.cloud-tools-openstack-home {
+	.inner-wrapper { overflow: hidden; }
+
+	.row-hero img {
+		margin-top: -20px;
+		margin-bottom: 20px;
+	}
+}
+
+.row-step {
+	h2 {
+		height: 50px;
+		margin-bottom: 10px;
+
+		span {
+			float: left;
+			margin-right: 10px;
+		}
+	}
+}
+
+
+/* Medium / Tablet viewport
+-------------------------------------------------------------- */
+@media only screen and (min-width : 768px) {
+
+	body.cloud-home {
+		.row-hero {
+			overflow: hidden;
+			padding-bottom: 30px;
+
+			.cloud-ladder img {
+				position: relative;
+				z-index: 10;
+			}
+			.cloud-ladder .ladder {
+				-webkit-animation: slidedown ease-in .6s forwards 1s;
+				animation: slidedown ease-in .6s forwards 1s;
+				position: absolute;
+				top: 0;
+				z-index: 9;
+				right: 70px;
+			}
+		}
+		.row-build-your-cloud {
+			background: url(../img/backgrounds/image-background-jujugradient.svg) repeat-x left bottom;
+
+			.build-your-own {
+				border-top: 1px dotted #888;
+				margin-top: 20px;
+				padding-top: 40px;
+			}
+		}
+
+		.row-public-cloud {
+			ul li {
+				margin-top: 40px;
+				margin-bottom: 0;
+			}
+
+			ul li.first-item { padding-left: 0; }
+
+			ul li.last-item {
+			  border: 0;
+			  padding-right: 0;
+			}
+		}
+
+		.row-cloud-tools .landscape img { margin-top: -26px; }
+
+		.row-cloud-tools p.text-center { min-height: 170px; }
+
+		.row-cloud-jobs-promo .seven-col { padding-top: 65px; }
+
+		.row-your-cloud .seven-col { padding-top: 27px; }
+
+		.row-diverse-ecosystem .seven-col { padding-top: 55px; }
+
+		.row-services {
+			overflow: hidden;
+
+			img {
+				position: absolute;
+				top: 0;
+				left: 50.9362%;
+			}
+		}
+
+	  .tight-section div div { padding-bottom: 40px; }
+	}
+	html.no-svg, .opera-mini {
+		body.cloud-home {
+			.row-build-your-cloud {
+				background: url(../img/backgrounds/image-background-jujugradient.png) repeat-x left bottom;
+			}
+		}
+	}
+
+	body.cloud-build-a-cloud {
+		.row-hero {
+		    h2 {
+		      font-size: 2.25em;
+		    }
+		}
+
+		.ubuntu-column img {
+			display: block;
+		}
+		.row-management {
+   			background: url(../img/cloud/screenshot-landscape-358x37.png) no-repeat 107% 0%;
+			min-height: 0;
+		}
+		.row-interoperability img {
+			margin-bottom: -60px;
+			position: relative;
+			top: -62px;
+		}
+	}
+
+
+
+	body.cloud-cloud-management {
+		.row-hero {
+			.intro {
+				margin-bottom: 35px;
+			}
+			img {
+				margin-bottom: 60px;
+			}
+		}
+		.audience-enterprise {
+			margin-top: 18px;
+
+			.truncated {
+				display: none;
+			}
+
+			.full {
+				display: inline;
+			}
+		}
+		.uawi {
+			background: $light-grey url(../img/cloud/management/image-landscape.png) top right no-repeat;
+		}
+	}
+	body.cloud-tools {
+		.row-juju {
+			padding: 85px 40px 20px; /* default is 20px 40px */
+
+			img {
+				position: absolute;
+				left: 0;
+				top: -35px;
+				margin-bottom: 0;
+			}
+		}
+		.row-computers-selected {
+			background: url("../img/cloud/tools/image-landscape-medium.png") no-repeat left bottom;
+
+	  		.computers-selected p {
+			    color: $mid-aubergine;
+			    float: left;
+			    font-size: 6.5em;
+			    letter-spacing: -8px;
+			    margin-bottom: 0;
+			    padding-left: 0.3em;
+			    width: 395px;
+			}
+	  	}
+	}
+
+	body.cloud-tools-openstack-home {
+		.row-hero{
+			min-height: 280px;
+
+			img {
+				margin-top: 0;
+				margin-bottom: 0;
+				position: absolute;
+				top: -40px;
+				right: 0px;
+			}
+		}
+
+	}
+
+	.cloud-tools-jumpstart {
+		.row-jumpstart-training img {
+			margin-top: 20px;
+		}
+
+		.row-orange-box img {
+			margin: 55px auto;
+		}
+	}
+
+	.row-step h2 {
+		height: auto;
+
+		span {
+			float: none;
+			margin-right: 0;
+		}
+	}
+	.row-step {
+		background-repeat: no-repeat;
+		background-position: right 60px;
+		height: 100%;
+
+		.step {
+			top: -3px;
+			left: -80px;
+			position: absolute;
+			z-index: 3;
+		}
+		&.step-one .step::after {
+			content: "";
+			height: 1630px;
+			width: 115px;
+			background: #fff url(../img/cloud/ubuntu-openstack/image-list-stroke.png) repeat-y 53% top;
+			position: absolute;
+			top: 47px;
+			left: -40px;
+			z-index: 2;
+		}
+		&.step-five .step::after {
+			content: "";
+			background: #fff;
+			width: 115px;
+			top: 47px;
+			height: 280px;
+			left: -40px;
+			position: absolute;
+		}
+	}
+
+	body.cloud-openstack-reference-architecture {
+		.tabbed-menu li a { font-weight: normal; padding: 0 30px; }
+		.tabbed-menu li a span { font-weight: 300; }
+		.tabbed-content .twelve-col img { padding-bottom: 0; }
+		.twelve-col .for-mobile { left: -999em; }
+	}
+
+	body.cloud-tools-juju {
+		.row-hero {
+			background: url(../img/cloud/tools/juju/image-juju.jpg) no-repeat 420px 0;
+		}
+		.row-config-scale h2 {
+		  	margin-top: 30px;
+		}
+		.row-one-stop-shop img {
+		  margin-left: -$gutter-width * 2;
+		  margin-bottom: $gutter-width * 2;
+		}
+	}
+	body.cloud-public-cloud {
+		.row-juju-advantage {
+			div {
+				min-height: 540px;
+			}
+			overflow: hidden;
+			.last-col .pull-left-20 {
+				position: absolute;
+				bottom: 0;
+				left: -16px;
+			}
+			.pull-left-40 {
+				left: -130px;
+				position: absolute;
+				bottom: 40px;
+			}
+		}
+		.box-management {
+			position: relative;
+		}
+		.box-management img {
+			position: absolute;
+			margin-left: -20px;
+			margin-top: 10px;
+		}
+		.push-down {
+			margin-top: 50px;
+		}
+
+		.row-get-started {
+			.box {
+				min-height: 190px;
+			}
+			.box div {
+				min-height: 85px;
+				border-bottom: 1px dotted $warm-grey;
+				margin-bottom: 15px;
+			}
+			img {
+				display: block;
+				margin: 0 auto;
+				vertical-align: middle;
+			}
+			.logo-joyent,
+			.logo-windowsazure {
+				padding-top: 15px;
+			}
+			.logo-hpcloud {
+				padding-top: 10px;
+			}
+			a:hover p {
+				text-decoration: underline;
+			}
+		}
+
+		.row-services {
+			padding-bottom: 0;
+			min-height: 420px;
+
+			img {
+				max-width: none;
+				margin-top: 20px;
+			}
+			div {
+				border-right: 1px dotted $warm-grey;
+				margin-bottom: 0;
+				padding-right: $gutter-width;
+			}
+			div.last-col {
+				border-right: none;
+				padding-right: 0;
+			}
+		}
+	}
+	body.cloud-contact-us {
+		.row-hero {
+			padding-bottom: 0;
+		}
+	}
+
+
+	.cloud-ecosystem-ubuntu-openstack-interoperability-lab {
+		li.box {
+			width: 140px;
+		}
+
+		#main-content .row-get-involved {
+			overflow: hidden;
+
+			span img {
+				margin: initial;
+				margin-left: -40px;
+			}
+		}
+	}
+
+	/* @subsection cloud > ecosystem > ubuntu OIL */
+	.cloud-ecosystem-ubuntu-openstack-interoperability-lab {
+		.row-testing-integration {
+			background-image: url("../img/cloud/ecosystem/ubuntu-oil/image-ubuntuopenstackinteroperabilitylab.svg");
+			background-repeat: no-repeat;
+			background-size: 326px auto;
+			background-position: 95% 40%;
+			background-color: #fff;
+		}
+	}
+	html.no-svg, .opera-mini {
+		.cloud-ecosystem-ubuntu-openstack-interoperability-lab .row-testing-integration {
+			background-image: url("../img/cloud/ecosystem/ubuntu-oil/image-ubuntuopenstackinteroperabilitylab.png");
+		}
+	}
+}
+
+/* Large / Desktop viewport
+-------------------------------------------------------------- */
+@media only screen and (min-width : 984px) {
+	#context-footer.cloud-context-footer div.feature-three.picto {
+	    background-image: url("../img/pictograms/picto-pack/picto-cloud-orange.svg");
+	    background-repeat: no-repeat;
+	    background-position: 160% center;
+	    background-size: 160px 160px;
+
+	    h3,
+	    p {
+	        padding-right: 65px;
+	    }
+	}
+	html.no-svg {
+		#context-footer.cloud-context-footer div.feature-three.picto {
+			background-image: url("../img/pictograms/picto-pack/picto-cloud-orange.png");
+		}
+	}
+
+	.cloud-context-footer .picto-maas {
+	    background: url("../img/cloud/picto-footer-maas.png") no-repeat scroll right center transparent;
+	    min-height: 170px;
+
+	    p,
+	    h3 {
+	        padding-right: 65px;
+	    }
+	}
+	body.cloud-home {
+		.row-cloud-tools .landscape img {
+			margin-top: -117px;
+		}
+	}
+
+	body.cloud-tools-openstack-home {
+		.row-hero{
+			img {
+				right: 40px;
+			}
+		}
+		.step-one 	{ background-image: url(../img/cloud/ubuntu-openstack/image-ubuntuserver.jpg); }
+		.step-two 	{ background-image: url(../img/cloud/ubuntu-openstack/image-maas.jpg); }
+		.step-three { background-image: url(../img/cloud/ubuntu-openstack/image-openstack.jpg); }
+		.step-four 	{ background-image: url(../img/cloud/ubuntu-openstack/image-juju.jpg); }
+		.step-five 	{ background-image: url(../img/cloud/ubuntu-openstack/image-landscape.jpg); }
+	}
+	body.cloud-openstack-reference-architecture {
+		.tabbed-menu li a { padding: 0; }
+	}
+	body.cloud-tools {
+		.row-hero {
+			padding-bottom: 50px;
+		}
+
+		.row-computers-selected {
+			.computers-selected p {
+				font-size: 8.5em;
+			    color: $mid-aubergine;
+			    float: left;
+			    letter-spacing: -8px;
+			    padding-left: 15px;
+			    margin-bottom: 0;
+			    width: 433px;
+			}
+		}
+	}
+	/* ubuntu-openstack-interoperability-lab */
+	.cloud-ecosystem-ubuntu-openstack-interoperability-lab {
+		.row-hero ul {
+			margin-top: 20px;
+		}
+		li.box {
+			width: 189px;
+		}
+		li.box.last-item {
+			margin-right: 0;
+		}
+		#main-content .row-get-involved {
+			span img {
+				margin-left: -40px;
+			}
+		}
+	}
+	body.cloud-public-cloud {
+		.row-get-started {
+			.box {
+				min-height: 170px;
+			}
+		}
+		.row-juju-advantage {
+			overflow: hidden;
+			.last-col .pull-left-20 {
+				left: -20px;
+				margin-top: 20px;
+				position: relative;
+			}
+			.pull-left-40 {
+				left: -40px;
+				padding-top: 40px;
+				position: relative;
+			}
+		}
+	}
+	body.cloud-cloud-management {
+		.row-hero {
+			img {
+				margin-bottom: 20px;
+			}
+		}
+	}
+
+	body.cloud-tools-cluster .inner-wrapper {
+		img {
+			margin-top: 20px;
+		}
+		.row-hero img {
+			margin-top: 60px;
+		}
+	}
+
+	.thank-you {
+		p.intro {
+			@include font_size (28);
+		}
+	}
+	.ui-datepicker {
+		font-family: ubuntu;
+		display: none;
+	}
+	.ui-widget-header {
+		background: $ubuntu-orange;
+	}
+	.ui-datepicker-calendar {
+		tbody { background: #fff; }
+	}
+	.ui-datepicker-calendar td {
+		text-align: center;
+	}
+
+}/* end @media only screen and (min-width : 984px) */
\ No newline at end of file
diff --git a/templates/static/css/section/community.scss b/static/css/section/community.scss
old mode 100644
new mode 100755
similarity index 88%
rename from templates/static/css/section/community.scss
rename to static/css/section/community.scss
index 5f77a9cae64..6f6ac28b65f
--- a/templates/static/css/section/community.scss
+++ b/static/css/section/community.scss
@@ -8,17 +8,14 @@ body.community {
 	  @include font_size (16);
 	  line-height: 1.3;
 	}
-	.row-hero p.intro {
+  #main-content .two-col h2 {
   	@include font_size (19.5);
   }
-  #main-content .two-col h2 { 
-  	@include font_size (19.5); 
-  }
   .social {
 		text-align: center;
 		background: url(../img/community/small-background-dots.png);
 		padding-top: 20px;
-		border-bottom: 1px dotted $warm_grey;
+		border-bottom: 1px dotted $warm-grey;
 		height: 162px;
 		margin: -20px;
 	}
diff --git a/static/css/section/desktop.scss b/static/css/section/desktop.scss
new file mode 100755
index 00000000000..a88f1b5ccbf
--- /dev/null
+++ b/static/css/section/desktop.scss
@@ -0,0 +1,1238 @@
+
+/*	@section pc
+--------------------------------------------------------------
+	Contents:
+		@section general
+		@section home
+		@section features
+			@subsection ubuntu > features > ubuntu-software-centre
+			@subsection ubuntu > features > photos and videos
+			@subsection ubuntu > features > ubuntu-one
+		@section desktop remix
+		@subsection for-business > desktop
+		@section desktop developer
+		@section desktop management (see management.scss)
+		@section contextualised footer #context-footer
+		@section UbuntuKylin
+
+------------------------------------------------------------- */
+
+/*	@section general
+-------------------------------------------------------------- */
+body.desktop .share-this {
+	height: 25px;
+	position: relative;
+	display: block;
+	float: left;
+	clear: both;
+	width: 100%;
+}
+
+body.desktop .share-this iframe {
+	width: 80px;
+	padding: 0;
+	float: left;
+	display: inline-block;
+	margin: 0 0 0;
+}
+
+body.desktop .share-this iframe:first-child {
+	width: 80px;
+}
+body.desktop .share-this iframe:last-child {
+	margin-right: 0;
+}
+
+body.desktop .share-this .twitter-share-button {
+	width: 58px;
+	display: inline-block;
+	float: none;
+}
+
+body.desktop-features-home .share-this {
+	right: auto;
+}
+
+.box-get-ubuntu{
+  div {
+    min-height: 176px;
+  }
+  @media screen and (-webkit-min-device-pixel-ratio:0) {
+	  div {
+	    min-height: 173px;
+	  }
+  }
+  li {
+    float: left;
+    list-style-type: none;
+    text-align: center;
+    width: 24.8%;
+    margin-top:20px;
+
+    a {
+      background: url(../img/pictograms/sprite-pictograms-get-ubuntu-66x772.png) top center no-repeat;
+      display:block;
+      padding-top:75px;
+      line-height: 1.3;
+    }
+  }
+  li.cd a { background-position: center -303px; }
+  li.windows a { background-position: center -606px; }
+  li.download a { background-position: center -919px; }
+
+  li a:hover { background-position: center -161px; }
+  li.cd a:hover { background-position: center -464px; }
+  li.windows a:hover { background-position: center -767px; }
+  li.download a:hover { background-position: center -1080px; }
+}
+
+/*	@section home
+-------------------------------------------------------------- */
+body.desktop-home {
+	.row-hero {
+		min-height: 415px;
+	}
+	.row-reach-out .no-margin-bottom {
+		margin-bottom: 20px;
+	}
+	.tabbed-menu-hover {
+		p {
+			color: #333;
+		}
+		h3 {
+			background-size: 2em 2em;
+			padding-top: .5em;
+			padding-bottom: .5em;
+			padding-left: 2.5em;
+			background-position: left center;
+			background-repeat: no-repeat;
+		}
+		.for-you h3 {
+			background-image: url(../img/pictograms/picto-pack/picto-contacts-warmgrey.svg)
+		}
+		.for-business h3 {
+			background-image: url(../img/pictograms/picto-pack/picto-business-warmgrey.svg);
+		}
+		.for-developers h3 {
+			background-image: url(../img/pictograms/picto-pack/picto-developer-warmgrey.svg);
+		}
+	}
+	#main-content {
+		overflow: hidden;
+	}
+
+	.share-this {
+		margin-top: 30px;
+	}
+	.intro {
+		margin-bottom: 30px;
+		padding-right: 50px;
+	}
+
+	.loaded {
+		background-image: url(../img/desktop/desktop-loaded.png);
+		background-position: left 0;
+		background-repeat: no-repeat;
+		padding-top: 150px;
+	}
+
+	.row-free {
+		blockquote {
+			margin-top: -70px;
+		}
+	}
+	.take-the-tour .no-margin-bottom {
+		margin-bottom: 20px;
+	}
+} /* end @section home */
+
+html.no-svg,
+.opera-mini {
+	body.desktop-home {
+		.tabbed-menu-hover {
+			.for-you h3 {
+				background-image: url(../img/pictograms/picto-pack/picto-contacts-warmgrey.png)
+			}
+			.for-business h3 {
+				background-image: url(../img/pictograms/picto-pack/picto-business-warmgrey.png);
+			}
+			.for-developers h3 {
+				background-image: url(../img/pictograms/picto-pack/picto-developer-warmgrey.png);
+			}
+		}
+	}
+}
+
+/*	@section features
+-------------------------------------------------------------- */
+body.desktop-features {
+	.intro {
+		padding-top: 0;
+
+		div {
+			margin-bottom: 0;
+		}
+	}
+	.intro .share-this {
+		margin-top: -10px;
+	}
+
+	.intro p + .share-this {
+		margin-top: 0;
+	}
+	.row-hero {
+		h1 {
+			margin-bottom: 0.267em;
+			position: relative;
+			z-index: 2;
+		}
+		img {
+			margin-top: 20px;
+		}
+		.clearfix {
+			margin-bottom: $gutter-width;
+		}
+	}
+	.box-explore-ubuntu {
+		@include box_sizing;
+		background: $light-grey;
+			-moz-box-shadow: inset 0 0 2px 1px #dedede;
+			-webkit-box-shadow: inset 0 0 2px 1px #dedede;
+		box-shadow: inset 0 0 2px 1px #dedede;
+		margin: 20px 0 20px 0;
+		margin-left: 40px;
+		margin-right: 40px;
+		position: relative;
+	}
+	.row-explore-ubuntu {
+		padding-top: 0;
+	}
+}
+
+body.desktop-features .box-explore-ubuntu {
+	margin: 20px 0 40px;
+}
+
+body.desktop-features .box-explore-ubuntu h2 {
+	@include font_size (16);
+	color: $cool-grey;
+	margin-bottom: 1.25em;
+}
+
+body.desktop-features .box-explore-ubuntu ul {
+	margin: 0;
+}
+
+body.desktop-features .box-explore-ubuntu ul li {
+	float: left;
+	margin-bottom: 0;
+	padding-bottom: 0;
+	text-align: center;
+	width: 19.85%;
+}
+
+body.desktop-features .box-explore-ubuntu ul li a {
+	color: $cool-grey;
+}
+
+body.desktop-features .box-explore-ubuntu ul li a:hover {
+	color: $ubuntu-orange;
+	text-decoration: none;
+}
+
+body.desktop-features .box-explore-ubuntu ul li p {
+	margin-bottom: 0;
+}
+
+/*body.desktop-features .box-explore-ubuntu li.current {
+	background: url("../img/tertiary-arrow.png") center bottom no-repeat;
+	padding-bottom: 42px;
+	margin-bottom: -22px;
+}
+*/
+body.desktop-features .box-explore-ubuntu li.current a {
+	color: $ubuntu-orange;
+}
+
+body.desktop-features .row-accessible {
+	border-bottom: 1px dotted $warm-grey;
+	height: 287px;
+	margin-bottom: 20px;
+}
+
+body.desktop-features .row-accessible img.pull-bottom-right {
+	margin-top: -19px;
+	margin-right: -41px;
+}
+
+body.desktop-features .row-compatible div {
+	margin-bottom: 0;
+}
+
+body.desktop-features .row-compatible img {
+	margin-top: 35px;
+}
+
+body.desktop-features .row-fast .box {
+	padding-bottom: 0;
+}
+
+body.desktop-features .row-fast blockquote {
+	position: absolute;
+	color: #fff;
+	width: 148px;
+	top: 58px;
+	left: 60px;
+}
+
+body.desktop-features .row-fast blockquote p:first-child {
+	@include font_size (20)
+}
+
+body.desktop-features .row-fast blockquote cite {
+	font-style: normal;
+}
+
+body.desktop-features .row-fast img {
+	margin-bottom: -20px;
+}
+
+body.desktop-features .row-developer {
+	@include box_sizing();
+	background-image: url(../img/patterns/developer-dot-pattern.png);
+	position: relative;
+
+	h3, p {
+		background: #fff;
+	}
+}
+
+body.desktop-features .row-hero .box { background: none; }
+
+body.desktop-features .row .four-col h3,
+body.desktop-features .row .eight-col h3 {
+	@include font_size (16);
+	font-weight: normal;
+}
+
+body.desktop-features .box-compatible img {
+	margin: 55px 0 0 10px;
+}
+
+body.ubuntu .row-hero { position: relative; }
+
+body.desktop-features .box-skype img {
+	bottom: -11px;
+	position: relative;
+}
+
+body.desktop-features .box-padded-feature ul.vertical-divider {
+	margin-left: 0;
+}
+
+/* @subsection features > office-applications
+-------------------------------------------------------------- */
+body.desktop-features-office-applications {
+	.inline-icons li.row-text {
+		margin-right: 10px;
+	}
+	.inline-icons {
+		text-align: left;
+	}
+
+	.row.intro {
+		.no-bullets li {
+			margin-bottom: 0;
+		}
+	}
+}
+
+/*	@subsection games-apps
+-------------------------------------------------------------- */
+
+
+body.desktop-features .row-humble-indie-bundle {
+	background: url(../img/desktop/features/image-fez-background.jpg) no-repeat;
+	background-position: 0 -60px;
+	min-height: 300px;
+}
+
+#preload-fez {
+	background: url(../img/desktop/features/image-fez-gomez-rollover.gif) no-repeat;
+}
+
+
+body.desktop-features .row-humble-indie-bundle .fez {
+	background: url(../img/desktop/features/image-fez-gomez.gif) no-repeat;
+	width: 60px;
+	height: 60px;
+	position: absolute;
+	left: 149px;
+    top: 195px;
+}
+
+body.desktop-features .row-humble-indie-bundle .fez:hover {
+	background: url(../img/desktop/features/image-fez-gomez-rollover.gif) no-repeat;
+}
+
+body.desktop-features .row .box-ratings-and-reviews {
+	background: #fff url(../img/ubuntu/features/bg-usc-ratings-288x285.jpg) 0 170px no-repeat;
+	padding-bottom: 260px;
+}
+
+body.desktop-features .row .box-education-resources {
+
+}
+
+body.desktop-features .row .box-fun-and-games {
+
+}
+
+.free-apps h3 {
+	@include font_size (16);
+	font-weight: normal;
+}
+
+/* music an mobile page */
+.row-feats-intro .box {
+	padding-bottom: 190px;
+}
+
+.row-feats-intro img {
+	@include rounded_corners(0 0 4px 4px);
+	position: absolute;
+	left: 0;
+	bottom: 0;
+}
+
+/* @subsection ubuntu > features > photos and videos  */
+.compatible-device {
+	@include rounded_corners(4px);
+	background: $ubuntu-orange;
+	color: #fff;
+	padding: $gutter-width;
+}
+
+/* @subsection ubuntu > features > ubuntu-one */
+
+body.desktop-features-personal-cloud {
+
+	.vertical-divider .inline-icons li {
+		display: inline-block;
+	}
+	.one-intro {
+		padding-right: 20px;
+	}
+	.one-picto-list {
+		padding-left: 10px;
+		margin-bottom: 0;
+	}
+	.row-one-features {
+		margin-bottom: 0;
+		border-bottom: 0;
+
+		h3 {
+			@include font_size (16);
+			font-weight: normal;
+		}
+		ul li {
+			text-align: center;
+
+			img {
+				margin-bottom: 20px;
+			}
+
+			h3, p {
+				text-align: left;
+			}
+		}
+	}
+}
+
+/*	@section desktop remix
+-------------------------------------------------------------- */
+body.desktop-desktop-remix .row-hero {
+	padding-bottom: $gutter-width;
+}
+body.desktop-desktop-remix .row-hero div {
+	padding-bottom: $gutter-width;
+	padding-top: $gutter-width;
+}
+body.desktop-desktop-remix .row-hero h2{
+	color: #666;
+}
+body.desktop-desktop-remix .remix-download a {
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+body.desktop-desktop-remix #mktFrmSubmit {
+	padding: 10px 14px;
+  font-family: Ubuntu, Arial, "libra sans", sans-serif;
+	@include font_size (16);
+}
+
+/* @subsection for-business > desktop
+-------------------------------------------------------------- */
+body.desktop-business {
+	.row-hero .quote {
+		top: 0;
+	}
+
+	.row-hero .quote-right-bottom {
+		padding-left: 46px;
+		padding-top: 70px;
+	}
+
+	th {
+		font-weight: normal;
+	}
+
+	tfoot th {
+		font-weight:  bold;
+	}
+
+	.row-list-ticks,
+	.row-methodology {
+		background: $light-grey;
+	}
+
+	.row-list-ticks {
+		@include rounded_corners(0 0 4px 4px);
+	}
+
+	.row-list-ticks ul {
+		padding-bottom: 0;
+		margin-bottom: 0;
+	}
+
+	.row-list-ticks li {
+		font-size: 14px;
+	}
+
+}
+
+/* enterprise blog promo on /business/desktop */
+body.business .row-enterprise-blog {
+	background: #fff;
+	padding-bottom: 10px;
+	padding-top: 20px;
+}
+
+body.business {
+  .item-download a,
+  .item-contact a,
+  .item-desktop a,
+  .item-server a,
+  .item-cloud a{
+    display: block;
+    height: 37px;
+    line-height: 37px;
+    padding-left: 47px;
+  }
+
+  .item-download a { background: url('../img/pictograms/pictogram-grey-download-37x37.png') no-repeat; }
+  .item-contact a { background: url('../img/pictograms/pictogram-grey-contact-37x37.png') no-repeat; }
+  .item-desktop a { background: url('../img/pictograms/pictogram-grey-desktop-37x37.png') no-repeat; }
+  .item-server a { background: url('../img/pictograms/pictogram-grey-server-37x37.png') no-repeat; }
+  .item-cloud a { background: url('../img/pictograms/pictogram-grey-cloud-37x37.png') no-repeat; }
+}
+
+body.desktop-business .row-developer-desktop .six-col img {
+	margin-top: 170px;
+}
+
+body.desktop-business .row-business-as-usual {
+	background: $light-grey;
+}
+
+body.desktop-business .row-business-as-usual h3 {
+	@include font_size (16);
+	font-weight: 400;
+}
+
+body.desktop-business .row-business-as-usual .quote-right-bottom {
+	right: auto;
+	left: 3 * $gutter-width;
+	top: -3em;
+	padding: 60px 35px 60px 45px;
+}
+
+body.desktop-business .row-professional-support {
+	position: relative;
+	clear: both;
+}
+
+body.desktop-business .row-professional-support .link-cta-canonical {
+	position: absolute;
+	right: $gutter-width;
+	bottom: 2.5em;
+}
+
+body.desktop-business .row-methodology .box {
+	background: #fff;
+	border-color: $warm-grey;
+}
+
+body.desktop-business .row-methodology .list-ubuntu {
+	margin-right: -$gutter-width;
+}
+
+body.desktop-business .row-methodology .list-ubuntu li {
+	display: inline-block;
+	float: left;
+	margin-right: $gutter-width;
+	width: $three-col;
+}
+
+body.desktop-business .packages dd {
+	min-height: 100px;
+}
+
+body.desktop-business .packages dd.price {
+	min-height: 0;
+}
+
+body.desktop-business .packages dl {
+	width: 245px;
+	width: 29.7%;
+}
+
+body.desktop-business .row-ubuntu-advantage {
+	background-color: #efeeec;
+}
+
+body.desktop-business .row-ubuntu-advantage .list-details {
+	margin-bottom: 0;
+}
+
+body.desktop-business .row-ubuntu-advantage li.first {
+	height: 33.55em;
+}
+
+body.desktop-business .row-consultancy .quote {
+	margin-top: -80px;
+}
+
+body.desktop-business .row-methodology  {
+	background: #efeeec;
+}
+
+.row-community {
+	background: #fff url(../img/patterns/background-dots.png);
+	color: $cool-grey;
+	padding: 40px 20px 20px;
+}
+
+.row-community .eight-col,
+.row-community .eight-col.box,
+.row-community .six-col,
+.row-community .nine-col {
+	padding: 20px;
+}
+
+.row-community div.six-col, .box-community div.six-col, .row-community div.eight-col, {
+	background: rgba(255,255,255,1);
+	position: relative;
+}
+
+.row-community .box {
+	border: 0;
+}
+
+.where-to-find-us {
+  background: #fff;
+  margin: 0;
+  padding: 15px 20px;
+}
+
+.where-to-find-us ul {
+	margin-bottom: 0;
+}
+
+.row-community .where-to-find-us h3,
+.row-community .where-to-find-us h4 {
+	@include font_size (16);
+	border-bottom: 1px dotted $warm-grey;
+	padding-bottom: 10px;
+	margin-bottom: 10px;
+}
+
+.where-to-find-us a { padding: 2px 0 2px 26px; }
+
+.where-to-find-us .ask-ubuntu a { background: url("../img/patterns/icon-irc.png") 0 2px no-repeat; }
+
+.where-to-find-us .mailing-lists a { background: url("../img/patterns/icon-mail.png") 0 2px no-repeat; }
+
+.where-to-find-us .ubuntu-blog a { background: url("../img/patterns/icon-rss.png") 0 2px no-repeat; }
+
+.row-community .nine-col div.six-col {
+    background: #fff;
+    display: block;
+}
+
+body.desktop-business .row-community,
+body.server .row-community {
+	background: #fff url(../img/patterns/background-dots.png);
+	color: $cool-grey;
+}
+
+body.desktop-business .where-to-find-us,
+body.server .where-to-find-us {
+  background: #fff;
+  margin: 0;
+}
+
+body.desktop-business .row-community .where-to-find-us h3,
+body.desktop-business .row-community .where-to-find-us h4,
+body.server .row-community .where-to-find-us h3,
+body.server .row-community .where-to-find-us h4 {
+	@include font_size (16);
+	border-bottom: 1px dotted $warm-grey;
+	padding-bottom: 5px;
+	margin-bottom: 10px;
+}
+
+body.desktop-business .row-community .nine-col div,
+body.server .row-community .nine-col div {
+    background: #fff;
+    float: left;
+    display: block;
+}
+
+body.desktop-business .row-ubuntu-advantage {
+	background-color: #efeeec;
+}
+
+body.desktop-business-desktop .row-ubuntu-advantage .list-details {
+	margin-bottom: 0;
+}
+
+body.desktop-business-desktop .row-ubuntu-advantage li.first {
+	height: 33.55em;
+}
+
+body.desktop-business-desktop .row-consultancy .quote {
+	margin-top: -80px;
+}
+
+body.desktop-business-desktop .row-methodology  {
+	background: #efeeec;
+}
+
+/*	@section desktop developer
+-------------------------------------------------------------- */
+body.desktop-for-developers {
+	/* Why use Ubuntu for development? */
+	.row-why-ubuntu li {
+		font-size: 13px;
+	}
+
+	/* With Ubuntu, you're in good company */
+
+	/* All the tools developers need */
+
+	/* Deployment made easy */
+
+	.row-easy-deployment {
+		background-color: $box-solid-grey;
+	}
+
+	/* Support that's tailored to the needs of developers */
+
+	.row-tailored-support {
+		border-bottom: 0;
+	}
+
+	.row-tailored-support table {
+		margin: 20px 0;
+	}
+} /* end pc-developers-desktop */
+
+/*	@section photos-and-videos
+-------------------------------------------------------------- */
+.desktop-features-social-and-email {
+	.row.intro {
+		.inline-icons li {
+			margin-bottom: 0;
+		}
+	}
+	.eight-col.box {
+		overflow: hidden;
+		position: relative;
+
+		img {
+			bottom: -20px;
+		}
+	}
+}
+
+
+/*	@section UbuntuKylin
+-------------------------------------------------------------- */
+$item_margin: 40px;
+
+body.desktop-ubuntu-kylin, body.desktop-ubuntu-kylin-zh-CN {
+	.lang-switch {
+		position: absolute;
+		top: -20px;
+		right: 40px;
+	}
+	.screenshot-shadowed {
+		margin-left: -5px;
+	}
+
+	.row-partnership ul {
+		margin-left: -$item_margin;
+
+		li {
+			margin-left: $item_margin;
+		}
+	}
+	.row-ubuntu-kylin-more img {
+		margin-top: -95px;
+	}
+	.right {
+		float: right;
+	}
+	.pull-left-40,
+	.pull-right-40 {
+		margin-left: 0;
+		margin-right: 0;
+	}
+
+
+} /* end body.desktop-ubuntukylin */
+
+body.desktop-ubuntu-kylin-zh-CN .row-hero {
+	padding-bottom: 80px;
+}
+
+li#feature-for-business > img, li#feature-for-business:hover > img {
+	z-index: 1;
+	top: -82px;
+	right: 523px;
+	left: auto;
+	opacity: 1;
+}
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+	li#feature-for-business > img, li#feature-for-business:hover > img {
+		top: -80px;
+	}
+}
+li#feature-for-business > img { opacity: 0; }
+
+li#feature-for-developers > img, li#feature-for-developers:hover > img {
+	z-index: 1;
+	opacity: 1;
+	top: -212px;
+	right: 523px;
+	left: auto;
+}
+
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+  li#feature-for-developers > img, li#feature-for-developers:hover > img {
+		top: -208px;
+  }
+}
+
+li#feature-for-developers > img { opacity: 0; }
+
+.desktop-desktop-management{
+	.inner-wrapper {
+		overflow: hidden;
+	}
+	.row-hero img {
+		margin-top: 20px;
+		margin-bottom: -10px;
+	}
+}
+
+/* Medium / Tablet viewport
+-------------------------------------------------------------- */
+@media only screen and (min-width : 768px) {
+	body.desktop-home {
+		.row-reach-out .no-margin-bottom,
+		.row-beautiful .no-margin-bottom {
+			margin-bottom: 0;
+		}
+		.row-hero {
+			background: url(../img/desktop/image-laptop.jpg) 350px 10px no-repeat;
+			p {
+				padding-right: 90px;
+			}
+		}
+
+		.right {
+			float: right;
+			margin-right: -40px;
+		}
+		.four-col p:last-child {
+			margin-bottom: 10px;
+		}
+
+		.loaded {
+			padding-top: 60px;
+			background-position: left center;
+		}
+		.take-the-tour {
+			.no-margin-bottom {
+				margin-bottom: 0;
+			}
+		}
+
+		.row-free p.first {
+			padding-right: 186px;
+		}
+
+		.row-free > div.open-source {
+			background: url(../img/pictograms/picto-pack/picto-projectswelove-orange.svg) 93% 40% no-repeat;
+			background-size: 140px 140px;
+		}
+
+		.row-free > div.backed-by-canonical {
+			background: url(../img/pictograms/picto-pack/picto-canonical.svg) 93% 40% no-repeat;
+			background-size: 140px 140px;
+		}
+		.row-ubuntu-for-china img {
+			margin-top: -80px;
+		}
+		.loaded {
+			background-size: 64% auto;
+		}
+	}
+	html.no-svg,
+	html.opera-mini {
+		body.desktop-home .row-free > div.open-source {
+			background-image: url(../img/pictograms/picto-pack/picto-projectswelove-orange.png);
+		}
+		body.desktop-home .row-free > div.backed-by-canonical {
+			background-image: url(../img/pictograms/picto-pack/picto-canonical.png);
+		}
+	}
+
+	body.desktop-features .row-hero .clearfix {
+		margin-bottom: 0;
+	}
+	.row-community .eight-col,
+	.row-community .eight-col.box,
+	.row-community .six-col,
+	.row-community .nine-col {
+		padding: 0 20px;
+	}
+	.row-community .nine-col div.six-col {
+	    float: left;
+	}
+
+	body.desktop-features .row-hero .link-cta-ubuntu {
+		margin: 15px 0 0 0;
+	}
+
+  	body.desktop-features .row-humble-indie-bundle .fez {
+		left: 560px;
+		top: 244px;
+	}
+
+	body.desktop-features .row-humble-indie-bundle {
+		background-position: 0 0;
+		min-height: 360px;
+	}
+
+	body.desktop-features .share-this {
+		margin-top: 25px;
+		padding-bottom: 0;
+	}
+	body.desktop-features-personal-cloud .one-picto-list {
+		margin-bottom: 20px;
+	}
+	body.desktop-features-personal-cloud .row-one-features {
+		margin-bottom: 40px;
+		border-bottom: 1px dotted $warm-grey;
+	}
+	body.desktop-features {
+		img.screenshot {
+		  position: absolute;
+		  right: 0;
+		  bottom: 0;
+		  width: 60%;
+		}
+	}
+
+	body.desktop-features-photos-and-videos {
+		.intro {
+			padding-bottom: 0;
+
+			img.right {
+				bottom: 0;
+				position: absolute;
+				right: -40px;
+				top: 9px;
+			}
+		}
+		.pull-bottom-right {
+			bottom: auto;
+		}
+		.box {
+			overflow: hidden;
+		}
+		.eight-col.box img.right {
+			bottom: 0;
+			position: absolute;
+			right: 0;
+			top: auto;
+		}
+	}
+	.row-organise .box {
+		height: 258px;
+		overflow: hidden;
+	}
+	.compatible-device {
+		background: $ubuntu-orange;
+	}
+
+	html.no-svg,
+	html.opera-mini {
+		.desktop-desktop-management .row-hero {
+			background-image: url(../img/desktop/desktop-management-pictos.png);
+		}
+	}
+	body.desktop-for-developers {
+		.row-developer-tools {
+
+			.pull-bottom-right {
+				bottom: -3px;
+				float:right;
+			}
+		}
+		.pull-bottom-left {
+			margin-left: -30px;
+			margin-bottom: -30px;
+			float: left;
+		}
+	}
+
+
+
+	body.desktop-features .row-hero div,
+	body.desktop-features .row-hero p {
+		margin-bottom: 0;
+		padding-bottom: 0;
+	}
+
+	body.desktop-features .row-your-ubuntu {
+		margin-bottom: 40px;
+	}
+	body.desktop-for-business {
+		.row-hero .quote-right-bottom {
+			padding-left: 55px;
+	    	padding-top: 50px;
+	    	height: 176px;
+		}
+		.box-padded-feature .six-col {
+			border-right: 1px dotted $warm-grey;
+
+			&.last-col {
+				border-right: 0;
+			}
+		}
+	}
+
+	body.desktop-take-the-tour {
+	  .row-hero {
+	    background: url("../img/desktop/take-the-tour/image-takethetour.jpg") no-repeat scroll 425px 0;
+	    min-height: 360px;
+	  }
+	}
+	body.desktop-ubuntu-kylin, body.desktop-ubuntu-kylin-zh-CN {
+		.row-hero {
+			background: url(../img/desktop/ubuntu-kylin/image-ubuntukylin.jpg) 200% center no-repeat;
+			padding-bottom: 55px;
+		}
+		.row-ubuntu-kylin-more h2 {
+			margin-top: 60px;
+		}
+		.row-youker img {
+			margin-top: 25px;
+		}
+		.row-sogou img {
+			margin-top: 12px;
+			position: absolute;
+		}
+		.pull-left-40 {
+			margin-left: -30px;
+			margin-bottom: -30px;
+		}
+		.pull-right-40 {
+			margin-right: -30px;
+			margin-bottom: -10px;
+		}
+	}
+	body.desktop-features-office-applications {
+		.inline-icons li.row-text {
+			display: block;
+		}
+		.pull-bottom-right {
+			position: absolute;
+			bottom: -20px;
+		}
+	}
+
+}
+
+
+@media only screen and (min-width : 984px) {
+
+	body.desktop-home {
+		.accessible {
+			background: url(../img/desktop/desktop-accessible.jpg) 103% top no-repeat;
+			min-height: 311px;
+		}
+		.tabbed-menu-hover {
+			img {
+				position: absolute;
+				top: -444px;
+				opacity: 0;
+				right: 0;
+				z-index: 50;
+				max-width: none;
+				-webkit-transition:  opacity .25s ease;
+				-moz-transition: opacity .25s ease;
+				-o-transition:  opacity .25s ease;
+				-ms-transition:  opacity .25s ease;
+				transition:  opacity .25s ease;
+			}
+			.for-you img {
+				right: -703px;
+			}
+			.for-business img {
+				right: -396px;
+			}
+			.for-developers img {
+				right: -88px;
+			}
+			a:hover {
+				.for-you h3 {
+					background-image: url(../img/pictograms/picto-pack/picto-contacts-orange.svg)
+				}
+				.for-business h3 {
+					background-image: url(../img/pictograms/picto-pack/picto-business-orange.svg);
+				}
+				.for-developers h3 {
+					background-image: url(../img/pictograms/picto-pack/picto-developer-orange.svg);
+				}
+				.box {
+					background: $light-grey;
+				}
+				h3 {
+					text-decoration: underline;
+				}
+				img {
+					opacity: 1;
+				}
+			}
+		}
+	}
+	html.no-svg, .opera-mini {
+		body.desktop-home {
+			.tabbed-menu-hover {
+				a:hover {
+					.for-you h3 {
+						background-image: url(../img/pictograms/picto-pack/picto-contacts-orange.png)
+					}
+					.for-business h3 {
+						background-image: url(../img/pictograms/picto-pack/picto-business-orange.png);
+					}
+					.for-developers h3 {
+						background-image: url(../img/pictograms/picto-pack/picto-developer-orange.png);
+					}
+				}
+			}
+		}
+	}
+	body.desktop-features .row-humble-indie-bundle .fez {
+		top: 213px;
+	}
+	body.desktop-desktop-management {
+		.row-hero img {
+			margin-top: 20px;
+			margin-bottom: -10px;
+		}
+		.uawi {
+			background: $light-grey url(../img/desktop/management/image-ubuntuadvantage.jpg) top right no-repeat;
+
+			img {
+				display: none;
+			}
+		}
+	}
+	body.desktop-for-developers {
+		.row-hero {
+			background: url(../img/desktop/developers/image-developers.svg) 540px 120px no-repeat;
+		}
+		.row-developer-tools {
+
+			.pull-bottom-right {
+				bottom: -60px;
+				float:right;
+			}
+		}
+		.pull-bottom-left {
+			margin-left: -40px;
+			margin-bottom: -60px;
+			float: left;
+		}
+	}
+	html.no-svg, .opera-mini {
+		body.desktop-for-developers {
+			.row-hero {
+				background: url(../img/desktop/developers/image-developers.png) 540px 120px no-repeat;
+			}
+		}
+	}
+	body.desktop-ubuntu-kylin, body.desktop-ubuntu-kylin-zh-CN {
+		.row-hero {
+			background: url(../img/desktop/ubuntu-kylin/image-ubuntukylin.jpg) 498px 80px no-repeat;
+			padding-bottom: 55px;
+		}
+	}
+	/*	@section contextualised footer #context-footer
+	-------------------------------------------------------------- */
+	.desktop-context-footer .feature-two {
+		background-image: url(../img/pictograms/picto-pack/picto-download-warmgrey.svg);
+		background-position: 90% 30px;
+		background-repeat: no-repeat;
+		background-size: 100px 100px;
+		min-height: 170px;
+
+		p {
+			padding-right: 120px;
+		}
+
+	}
+	html.no-svg,
+	.opera-mini {
+	 .desktop-context-footer .feature-two {
+			background-image: url(../img/pictograms/pictogram-download-136.png);
+		}
+	}
+
+	body.desktop-ubuntu-kylin, body.desktop-ubuntu-kylin-zh-CN {
+		.pull-left-40 {
+			margin-bottom: -60px;
+		    margin-left: -40px;
+		}
+		.pull-right-40 {
+			margin-bottom: -40px;
+		    margin-right: -40px;
+		}
+	}
+}
+
+@media screen and (-webkit-min-device-pixel-ratio:0 ) {
+	body.desktop-home {
+		.tabbed-menu-hover {
+			img {
+				top: -444px;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/templates/static/css/section/devices.scss b/static/css/section/devices.scss
old mode 100644
new mode 100755
similarity index 85%
rename from templates/static/css/section/devices.scss
rename to static/css/section/devices.scss
index 7bf93a317af..6be147b270b
--- a/templates/static/css/section/devices.scss
+++ b/static/css/section/devices.scss
@@ -10,7 +10,7 @@ body.devices .box-highlight {
 
 body.devices-home .row-hero h2 { @include font_size (23); }
 body.devices .row img.touch-border { 
-  margin-bottom: -$gutter_width; 
+  margin-bottom: -$gutter-width; 
   margin-left: auto;
   margin-right: auto;
   display: block;
@@ -28,7 +28,7 @@ body.devices .box-build .six-col { margin-bottom: 0; }
 
 .feature-list-four li {
 	background: #fff;
-	padding: $gutter_width;
+	padding: $gutter-width;
 }
 
 body.devices .row-hero { 
@@ -38,12 +38,12 @@ body.devices .row-hero {
 
 .row-get-involved .article {
 	background-image: url(../img/pictograms/pictogram-community-124x124.gif);
-	background-position: $nine_col top;
+	background-position: $nine-col top;
 }
 
 .row-contributors .article {
 	background-image: url(../img/pictograms/pictogram-discussion-124x124.gif);
-	background-position: $nine_col top;
+	background-position: $nine-col top;
 }
 
 .devices-commercial-info .row-engineering .article,
@@ -51,8 +51,8 @@ body.devices .row-hero {
 .row-licensing .article,
 .row-engineering .article {
 	background-repeat: no-repeat;
-	background-position: $one_col 48px;
-	padding: 0 0 $gutter_width $four_col;
+	background-position: $one-col 48px;
+	padding: 0 0 $gutter-width $four-col;
 }
 
 .row-code-download .article {
diff --git a/static/css/section/download.scss b/static/css/section/download.scss
new file mode 100755
index 00000000000..2e253e5c4e1
--- /dev/null
+++ b/static/css/section/download.scss
@@ -0,0 +1,1028 @@
+@charset "UTF-8";
+/* ---------------------------------------------------------------
+------------------------------------------------------------------
+	DO NOT EDIT STYLES.CSS
+	It is autogenerated.
+
+	Project:		Ubuntu Front-End download section
+	Author:			Web Team at Canonical Ltd
+	Last edited by:
+	Last edited on:
+
+  	CONTENTS:
+	-----------------------------------------------------------------
+	@section download homepage
+	@section download >  desktop/server & cloud
+	@section download > download-zh-CN
+	@section help
+
+	@section Needs to go into patterns
+
+	@this may turn into a pattern
+
+	Rounded corners
+	-----------------------------------------------------------------
+	@include rounded_corners(top-left top-right bottom-right bottom-left);
+		examples
+		@include rounded_corners(0 0 4px 4px); rounded bottoms
+		@include rounded_corners(4px); all corners rounded
+
+	Base grid sass, this lives in /sites/core/static/css/core-grid.scss
+	-----------------------------------------------------------------
+	$base: 			16;
+	$column_width:	( 60 / $base )em;
+	$gutter-width: 	( 20 / $base )em;
+	$grid_column: 	( 57 / $base )em; nested columns
+	$grid-gutter: 	( 18 / $base )em;
+
+	Available grid widths
+	-----------------------------------------------------------------
+	$one-col - 100%
+
+	Using these enables us to give individual elements specific widths without adding a static width:
+
+	padding: $gutter-width;
+	width: 100% - ( 2 * $gutter-width );
+
+	Colour definitiions are in /sites/core/static/css/core-constants.scss
+	-----------------------------------------------------------------
+	$ubuntu-orange:			#dd4814; ubuntu orange (used for text links also on any site except canonical)
+	$canonical-aubergine:	#772953; canonical aubergine
+	$light-aubergine:		#77216f; light aubergine (consumer)
+	$mid-aubergine:			#5e2750; mid aubergine (both)
+	$dark-aubergine:		#2c001e; dark aubergine (enterprise)
+	$warm-grey:				#888888; warm grey
+	$cool-grey:				#333333; cool grey
+	$light-grey:			#f7f7f7; light grey
+
+	notifications
+	$error:					#df382c; red
+	$warning:				#eca918; yellow
+	$success:				#38b44a; green
+	$information:			#19b6ee; cyan
+
+	colour coded status - from negative to positive (icon: canonical circle)
+	$status-red:			#df382c; red, for status that require immediate attention
+	$status-grey:			#888888; grey, for disabled status or ones that don�t require attention
+	$status-yellow:			#efb73e; yellow, for status that require attention
+	$status-blue:			#19b6ee; blue, for status that don�t require action
+	$status-green:			#38b44a; green, for positive status
+
+	misc colours
+	$box-solid-grey:		#EFEFEF;
+
+	$link-color:			$ubuntu-orange; This is the global link color, mainly used for links in content
+
+	Notes:
+	-----------------------------------------------------------------
+	Using '.yui3-js-enabled' for CSS with JS enabled as it's there for free atm, be nice to have just js-enabled as a class.
+
+-----------------------------------------------------------------
+-------------------------------------------------------------- */
+//@import "core-constants";
+
+/*	@section download homepage
+-------------------------------------------------------------- */
+body.download {
+	#main-content .row-hero {
+		margin-bottom: 0;
+		border-bottom: 0;
+	}
+	.gap-from-top {
+		margin-top: 20px;
+	}
+	.last-row {
+		margin-bottom: 60px;
+	}
+	.chinese-download {
+		margin-bottom: 20px;
+	}
+	.row-list-download {
+		padding-bottom: 0;
+		padding-top: 0;
+
+		.box-highlight {
+			margin-bottom: 0;
+		}
+		.media--image__vcentered {
+			margin-top: 38px;
+		}
+	}
+	p.ubuntu-upgrade {
+		background: $light-grey url(../img/pictograms/picto-pack/picto-upgrade-warmgrey.svg) 20px center no-repeat;
+		background-size: 40px 40px;
+		border: 2px solid #e3e3e3;
+		border-radius: 0 0 4px 4px;
+		display: block;
+		margin-bottom: 0;
+		padding: 20px 0 20px 84px;
+	}
+}
+html.no-svg,
+html.opera-mini {
+	body.download p.ubuntu-upgrade {
+		background-image: url(../img/pictograms/pictorgram-upgrade-44x44.png);
+	}
+}
+
+body.download-home {
+	.row-hero p {
+		@include font_size (19.5);
+	}
+}
+
+body.download-desktop-home {
+  .row .download-description {
+    border: 0;
+    margin-right: 0;
+  }
+}
+
+body.download-alternative-downloads {
+    #main-content .row-hero {
+        border-bottom: 1px dotted $warm-grey;
+    }
+}
+
+body.download-desktop-upgrade {
+	#main-content .row-hero {
+		padding-bottom: 0;
+	}
+	.alternative-options {
+		margin-top: 20px;
+	}
+}
+
+.chinese-download {
+	padding-top: 0;
+}
+
+.windows-installer {
+	@include box_sizing;
+	@include font_size (13);
+	background: $light-grey url(../img/pictograms/pictogram-windows-44x44.png) $gutter-width center no-repeat;
+	border-top: 2px solid #e3e3e3;
+	display: inline-block;
+	margin-left: -(25/$base)em;
+	margin-right: -(25/$base)em;
+	padding: $gutter-width $gutter-width $gutter-width 84px;
+}
+
+/* heros */
+body.download-desktop-windows-installer .row-hero,
+body.download-alternative-downloads .row-hero,
+body.download-desktop-upgrade .row-hero,
+body.download-ubuntu-kylin-zh-CN .row-hero { background: none; }
+body.download-ubuntu-kylin-zh-CN .lang-switch,
+body.download-ubuntu-kylin .lang-switch {
+	position: absolute;
+	top: 20px;
+	right: 40px;
+	color: #fff;
+}
+body.download-desktop-windows-installer .row-hero { padding-bottom: 0; }
+
+body.download-desktop-windows-installer .row-windows-installer { padding-top: 0;}
+body.download-desktop-windows-installer .row-windows-installer .box-highlight p {
+	padding-right: $gutter-width;
+}
+
+body.download-ubuntu-kylin-zh-CN .row-zh-CN .box-highlight {
+	@include box_sizing;
+}
+
+body.download-ubuntu-kylin-zh-CN .row-zh-CN .box-highlight h2,
+body.download-ubuntu-kylin-zh-CN .row-zh-CN .box-highlight p {
+	padding-right: 20px;
+}
+
+body.download-ubuntu-kylin,
+body.download-ubuntu-kylin-zh-CN {
+	#context-footer hr {
+		background: none;
+		box-shadow: none;
+	}
+}
+
+/*body.download .row-hero .box { padding-left: $three-col; }*/
+
+/*	@section download > desktop/server & cloud
+-------------------------------------------------------------- */
+body.download .box-highlight.no-margin-bottom { margin-bottom: 0px; }
+
+body.download-desktop .windows-8 { padding-top: $gutter-width; }
+
+body.download .desktop.box-highlight { margin-bottom: 40px; }
+
+body.download-ubuntu-kylin-zh-CN .download-description { min-height: 9.5em; }
+
+body.download .inner-wrapper form fieldset {
+	background: none;
+	margin: 0;
+	padding-left: $gutter-width;
+	padding: 0;
+}
+
+body.download .inner-wrapper form select {
+	font-weight: 300;
+	margin-bottom: 30px;
+	width: 100%;
+}
+
+body.download .inner-wrapper form button,
+body.download .inner-wrapper form .link-cta-download {
+	@include font_size (19.5);
+	padding: 10px 14px;
+	border: 0;
+	float: left;
+	text-align: center;
+	width: 100%;
+}
+
+body.download-ubuntu-kylin-zh-CN .inner-wrapper form button { margin-left: 0; }
+
+body.download .inner-wrapper .small {
+	@include font_size (13);
+	display: block;
+	text-align: center;
+	margin-top: -.2em;
+}
+body.download .inner-wrapper .form-download .small {
+	margin-bottom: 2em;
+}
+body.download .inner-wrapper .form-download:last-of-type .small {
+	margin-bottom: 0;
+}
+
+body.download-ubuntu-kylin-zh-CN .inner-wrapper  {
+	.link-cta-download, .small { margin-left: 0; }
+}
+
+body.download-cloud-home .row-hero form.form-download p { font-size: 0.8125em; }
+body.download-cloud-home .inline-icons li {
+	margin-bottom: 0;
+}
+
+body.download-desktop {
+  div.warning {
+    padding: 20px 40px;
+    margin-bottom: $gutter-width;
+  }
+}
+
+/* body.download */
+
+.download-cloud #download-other .cloud .box {
+	background: #fff url(../img/pictograms/pictogram-cloud-113x113.png) 93% 60px no-repeat;
+	min-height: 0;
+	padding-right: $four-col;
+	padding-top: 1.538em;
+}
+
+#download-other form fieldset {
+	background: none;
+	padding: 0;
+}
+
+body.download .inner-wrapper #download-other form button {
+	@include font_size (16);
+	float: left;
+	margin: 0;
+	display: inline-block;
+	text-align: center;
+	width: 100%;
+}
+
+#download-other .box {
+	background-color: #fff;
+	background-position: center $gutter-width;
+	background-repeat: no-repeat;
+	padding-top: 153px;
+	min-height: 27.5em;
+}
+
+body.download-ubuntu-kylin-zh-CN #download-other .box { min-height: auto; }
+
+body.download-desktop #download-other .box { margin-bottom: 20px; }
+
+body.download-server #download-other .box { min-height: 34em; }
+
+#download-other .windows { background-image: url(../img/pictograms/pictogram-windows-grey-113x113.png); }
+#download-other .cd { background-image: url(../img/pictograms/pictogram-cd-grey-113x113.png); }
+#download-other .chinese { background-image: url(../img/pictograms/ubuntu-kylin-chinese-grey.png); }
+#download-other .cloud { background-image: url(../img/pictograms/pictogram-juju-113x113.png); }
+body.download-server #download-other .juju,
+body.download-cloud #download-other .juju {
+	background: #fff url(../img/pictograms/pictogram-juju-113x113.png) 90% 50% no-repeat;
+	min-height: 1em;
+	padding-top: 20px;
+}
+body.download-server #download-other .juju p,
+body.download-cloud #download-other .juju p  { padding-right: 150px; }
+body.download-desktop-windows-installer #download-other .desktop  { background-image: url(../img/pictograms/pictogram-desktop-113x113.png); }
+body.download .sidebar .box { padding-top: 0; }
+
+body.download-help {
+	.row-hero {
+		padding-bottom: 0;
+
+		& + .row {
+			padding-top: $gutter-width;
+		}
+	}
+
+	.box-arm,
+	.box-juju  {
+		padding-left: $four-col/* + ( $gutter-width / 2 )/*/;
+		margin-bottom: 0;
+	}
+}
+
+body.download-help .box-juju {
+	padding-top: 2 * $gutter-width;
+	padding-bottom: 2 * $gutter-width;
+}
+
+body.download #download-other {
+  @include rounded_corners(4px);
+	background: $light-grey;
+	padding: 20px;
+	/*width: 67.9292%;*/
+}
+
+body.download .sidebar {
+	h4 { font-size: 1em; font-weight: normal; }
+
+	li h5 {
+		font-weight: normal;
+		color: $cool-grey;
+		margin-left: -15px;
+	}
+
+	ul { margin-left: 15px }
+
+	ul ul { margin-left: 0; }
+
+	li li { list-style-type: disc; }
+}
+
+body.download {
+	.header--ubuntu,
+	.header--windows,
+	.header--mac,
+	.header--dvd,
+	.header--download,
+	.header--kylin,
+	.header--openstack,
+	.header--server  {
+		background-repeat: no-repeat;
+		background-size: 2em 2em;
+		background-position: 0 center;
+		padding: .3em 0 .6em 2.4em;
+	}
+	.header--ubuntu {
+		background-image: url("../img/pictograms/picto-pack/picto-ubuntu.svg");
+	}
+	.header--windows {
+		background-image: url("../img/pictograms/picto-pack/picto-windows.svg");
+	}
+	.header--mac {
+		background-image: url("../img/pictograms/picto-pack/picto-mac.svg");
+	}
+	.header--dvd {
+		background-image: url("../img/pictograms/picto-pack/picto-cddvd-warmgrey.svg");
+	}
+	.header--download {
+		background-image: url("../img/pictograms/picto-pack/picto-download-warmgrey.svg");
+	}
+	.header--kylin {
+		background-image: url("../img/pictograms/picto-pack/picto-ubuntukylin.svg");
+	}
+	.header--openstack {
+		background-image: url("../img/pictograms/picto-pack/picto-openstack.svg");
+	}
+	.header--server {
+		background-image: url("../img/pictograms/picto-pack/picto-server-warmgrey.svg");
+	}
+
+	.row-easy-ways {
+		.box-highlight{
+			p {
+				border-bottom: 1px dotted $warm-grey;
+				padding-bottom: 20px;
+				margin-bottom: 20px;
+			}
+			ul {
+				margin-bottom: 0;
+			}
+		}
+	}
+
+	#main-content .row-background {
+		background: url("../img/backgrounds/image-background-wallpaper1404.jpg") no-repeat scroll 0 bottom #4B1827;
+		margin-top: 0;
+		padding-top: 40px;
+
+		h1,
+		p {
+			color: #ffffff;
+		}
+		a:link,
+		a:visited {
+			text-decoration: underline;
+			color: #fff;
+		}
+		a:hover {
+			color: rgba(255,255,255,0.6);
+		}
+
+		a.external {
+			background-image: url("../img/icons/icon-externallink-white.svg");
+		}
+
+		a.external:hover {
+			background-image: url("../img/icons/icon-externallink-warmgrey.svg");
+		}
+
+		.box-highlight {
+			border: none;
+				-moz-box-shadow: inset 0 1px 2px 0 rgba(0,0,0,0.2);
+				-webkit-box-shadow: inset 0 1px 2px 0 rgba(0,0,0,0.2);
+   			box-shadow: inset 0 1px 2px 0 rgba(0,0,0,0.2);
+			background-color: rgba(0, 0, 0, .25);
+			color: #ffffff;
+		}
+
+		.vertical-divider > div,
+		.vertical-divider > li {
+			border-color: rgba(255,255,255,0.2); /*#78515f;*/
+		}
+	}
+}
+html.no-svg,
+html.opera-mini {
+	body.download {
+		.header--ubuntu {
+			background-image: url("../img/pictograms/picto-pack/picto-ubuntu.png");
+		}
+		.header--windows {
+			background-image: url("../img/pictograms/picto-pack/picto-windows.png");
+		}
+		.header--mac {
+			background-image: url("../img/pictograms/picto-pack/picto-mac.png");
+		}
+		.header--dvd {
+			background-image: url("../img/pictograms/picto-pack/picto-cddvd-warmgrey.png");
+		}
+		.header--download {
+			background-image: url("../img/pictograms/picto-pack/picto-download-warmgrey.png");
+		}
+		.header--kylin {
+			background-image: url("../img/pictograms/picto-pack/picto-ubuntukylin.png");
+		}
+		.header--openstack {
+			background-image: url("../img/pictograms/picto-pack/picto-openstack.png");
+		}
+		.header--server {
+			background-image: url("../img/pictograms/picto-pack/picto-server-warmgrey.png");
+		}
+	}
+}
+body.download .box,
+body.download .box-highlight {
+	margin-bottom: 20px;
+}
+body.download .box h4 {
+	@include font_size (16);
+	font-weight: normal;
+}
+
+body.download .sidebar li a,
+body.download .box ul li,
+body.download-alternative-downloads #main-content ul li { color: $ubuntu-orange; }
+
+body.download .box ul li p {
+	color: #333;
+	margin-bottom: 0;
+}
+
+/* @section download > download-zh-CN */
+body.download-ubuntu-kylin-zh-CN h1 span,
+body.download-ubuntu-kylin-zh-CN h2 span {
+	float: none;
+	clear: none;
+	display: inline;
+}
+.download .row-download-thanks {
+	margin-left: 10px;
+	margin-right: 10px;
+}
+/* Thank you pages */
+.download-thank-you .row-download-thanks {
+
+	.four-col .box {
+		background-color: #fff;
+		background-position: center $gutter-width;
+		background-repeat: no-repeat;
+		padding-top: 160px;
+	}
+	.one .box { background-image: url(../img/pictograms/pictogram-ubuntu-one-113x113.png); }
+	.support .box { background-image: url(../img/pictograms/pictogram-support-113x113.png); }
+	.ask .box { background-image: url(../img/pictograms/pictogram-ask-ubuntu-113x113.png); }
+	.jumpstart .box { background-image:  url(../img/pictograms/pictogram-jumpstart-113x113.png); }
+	.advantage .box { background-image: url(../img/pictograms/pictogram-advantage-113x113.png); }
+	.consulting .box { background-image:  url(../img/pictograms/pictogram-consulting-113x113.png); }
+}
+
+.row-next-steps {
+	li {
+		border-right: 1px dotted $warm-grey;
+		margin: 0 $gutter-width 0 0;
+		padding-right: $gutter-width;
+		width: $four-col;
+	}
+	li.last-col {
+		border-right: 0;
+		margin-right: 0;
+		padding-right: 0;
+	}
+}
+
+/*	@section help
+-------------------------------------------------------------- */
+#download-help {
+	li {
+		border-bottom: 1px dotted $warm-grey;
+		margin-bottom: 1.25em;
+		min-height: 5em;
+		padding-bottom: .625em;
+		padding-left: 17%;
+		position: relative;
+	}
+
+	li:last-child {
+		border-bottom: 0;
+		margin-bottom: 0;
+	}
+
+	ol.no-bullets li {
+		border-bottom: 0;
+	}
+
+	li li {
+		border-bottom: 0;
+		list-style-type: disc;
+		padding-left: 0;
+		margin-bottom: 0;
+		min-height: 0;
+		color: #333;
+	}
+
+	.box-tip p { margin-bottom: 0; }
+
+	.row-wiki {
+		border-bottom: 1px dotted $warm-grey;
+		margin-top: 20px;
+	}
+
+	dl {
+		@include font_size (16);
+	    border-top: 1px dotted $warm-grey;
+	    margin-bottom: 10px;
+	    padding-top: 10px;
+	    position: relative;
+	}
+
+	dl.last { border-bottom: 1px dotted $warm-grey; }
+
+	dd {
+		padding-bottom: 10px;
+		margin-left: 0;
+	}
+
+	dt {
+		margin-bottom: 10px;
+	}
+
+	.help-image {
+		position: relative;
+
+		a {
+			text-indent: -9999px;
+			display: block;
+			position: absolute;
+			height: 100%;
+			width: 100%;
+			top: 0;
+
+		}
+	}
+
+	.ask-ubuntu-box {
+		background-image: url(../img/pictograms/picto-pack/picto-forum-warmgrey.svg);
+		background-size: 50px 50px;
+		background-repeat: no-repeat;
+		background-position: 0 center;
+		padding: 30px 0 20px 70px;
+	}
+
+} /* end .download-help */
+html.no-svg,
+html.opera-mini {
+	.ask-ubuntu-box {
+		background-image: url(../img/pictograms/picto-pack/picto-forum-warmgrey.png);
+	}
+}
+
+.download-cloud-install-ubuntu-cloud #download-help dl:first-of-type {
+	border-top: 0;
+}
+
+.download-cloud-cloud-archive-instructions #download-help li { padding-left: 0; }
+
+#ubuntu-help {
+	margin-bottom: 60px;
+}
+
+#download-help li span,
+#ubuntu-help li span {
+  @include rounded_corners(40px);
+	background-color: #DD4814;
+	border: 3px solid #DD4814;
+	color: #fff;
+	display: block;
+	float: left;
+	text-align: center;
+	vertical-align: top;
+	width: 18px;
+	@include font_size (22);
+	padding: 0 5px;
+	margin-left: -45px;
+	height: auto;
+}
+
+#ubuntu-help li span {
+	margin-left: 0;
+	margin-right: 20px;
+}
+
+#download-help li.double span,
+#download-help li span.double,
+#ubuntu-help li.double span,
+#ubuntu-help li span.double { text-indent: -11px; }
+
+#ubuntu-help .no-numbers li {
+	padding-left: 0;
+}
+
+.row-ask {
+	margin-top: 20px;
+}
+
+.row-ask p {
+	padding: 15px 0 0;
+}
+
+body.download p.link-wrap {
+	clear: both;
+	display: inline-block;
+	float: left;
+	margin-bottom: 10px;
+	width: 100%;
+}
+
+/* /download/help/install-ubuntu-cloud */
+.download-cloud-install-ubuntu-cloud {
+	.row .cloud, .row .server, .row .juju {
+    border-bottom: 1px dotted $warm-grey;
+		margin-bottom: 15px;
+		padding-bottom: 20px;
+	}
+	.row .juju {
+		border: 0;
+		margin: 0;
+		padding: 0;
+	}
+	.row .cloud h3, .row .server h3, .row .juju h3 {
+		background-color: #fff;
+		background-position: left 50%;
+		background-repeat: no-repeat;
+		background-size: 40px 40px;
+		padding: 10px 0 10px 50px;
+	}
+
+	.row .cloud h3 { background-image: url(../img/pictograms/picto-pack/picto-server-darkaubergine.svg); }
+	.row .server h3 { background-image: url(../img/pictograms/picto-pack/picto-openstack.svg); }
+	.row .juju h3 { background-image: url(../img/pictograms/picto-pack/picto-juju.svg); }
+
+	.row .cloud h2, .row .server h2, .row .juju h2 { @include font_size (23); }
+
+	#cloud-infra {
+		margin-top: 20px;
+		display: block;
+		float: left;
+		width: 100%;
+	}
+}
+html.no-svg,
+html.opera-mini {
+	.download-cloud-install-ubuntu-cloud {
+		.row .cloud h3 { background-image: url(../img/pictograms/image-picto-server-40.png); }
+		.row .server h3 { background-image: url(../img/pictograms/image-picto-openstack-40.png); }
+		.row .juju h3 { background-image: url(../img/pictograms/image-picto-juju-40.png); }
+	}
+}
+
+/* Contribute page */
+
+.contribute-to-ubuntu {
+	form input[type=number] {
+        -webkit-border-radius: 2px;
+        -moz-border-radius: 2px;
+        border-radius: 2px;
+        background: #fff;
+        border: 1px solid #999;
+        font-family: Ubuntu,Arial,"libra sans",sans-serif;
+        padding: 4px;
+        width: 50px;
+        display: inline-block;
+        font-size: 16px;
+        padding-top: 2px;
+    }
+    form input[type=number]:focus {
+		border: 1px solid #000;
+	}
+
+    /* Styling for contributions slider rows */
+    .contribution-intro-row {
+        padding-bottom: 0;
+    }
+    .contribution-intro {
+    	display: none;
+    }
+    .contribution-intro:first-child {
+    	display: block;
+    }
+    .sliders-container {
+        background-color: #EFEFEF;
+        padding: 20px;
+        border-radius: 5px;
+        max-width: 584px;
+    }
+    .slider-area {
+        overflow: hidden;
+        margin-top: 20px;
+    }
+    .slider-area p {
+        margin-bottom: 0;
+    }
+    .slider-area:first-child {
+        margin-top: 0;
+    }
+
+    .slider-area p {
+        float: left;
+    }
+
+    .contribution-slider {
+        float: left;
+        margin-top: 4px;
+    }
+
+    .contribution-value, body.download .inner-wrapper .contribution-value {
+        float: right;
+        font-size: 16px;
+    }
+    .contribution-value label {
+        display: inline-block;
+        color: $warm-grey;
+    }
+
+    /* totalling area styling */
+    .contribution {
+        float: right;
+        font-size: 20px;
+    }
+    .contribution .price {
+        float: right;
+    }
+    .contribution .currency {
+        color: $warm-grey;
+    }
+    .contribution .final-amount {
+        display: inline-block;
+        padding: 0 5px;
+        border-radius: 5px;
+        text-align: right;
+    }
+    .price-equivalent {
+        max-width: 350px;
+    }
+    .price-equivalent p {
+        margin-bottom: 0;
+    }
+    .price-equivalent img {
+        margin-right: 20px;
+        margin-bottom: 20px;
+    }
+    .price-equivalent .title {
+        font-weight: bold;
+    }
+    .price-equivalent .price {
+        color: $warm-grey;
+    }
+    .total-area {
+        max-width: 624px;
+    }
+    .total-area-row.noscript {
+        display: none;
+    }
+
+    .total-area .contribution .title {
+        margin-top: -0.3em;
+        margin-bottom: 0;
+    }
+    .total-area .contribution .price .final-amount {
+        font-weight: bold;
+    }
+
+    .contribute-row {
+        padding-top: 20px;
+    }
+    .contribute {
+        border-top: 1px solid #efefef;
+        padding-top: 20px;
+        max-width: 624px;
+    }
+    .contribute .pay-with-paypal, body.download .contribute button.pay-with-paypal {
+        float: right;
+        font-size: 1em;
+        width: auto;
+    }
+
+    /*  Slider styles */
+    .yui3-slider-content, .yui3-widget {
+        display: block;
+        padding: 5px 0;
+    }
+    .yui3-slider-rail-cap-left, .yui3-slider-rail-cap-right {
+        display: none;
+    }
+    .yui3-slider-rail {
+        display: block;
+        height: 4px;
+        background-color: #DD4713;
+        background: linear-gradient(to left, #E1DAD2 98.4%, #DD4713 0%);
+        border-radius: 2px;
+        overflow: visible;
+        box-shadow: inset 0px 1px 0px 0px rgba(0, 0, 0, 0.15);
+        cursor: pointer;
+    }
+    .yui3-slider-rail .yui3-slider-thumb {
+        width:  18px;
+        height: 18px;
+        border-radius: 4px;
+        background: #fff;
+        overflow: visible;
+        display: block;
+        position: relative;
+        top: -7px !important;
+        outline: none;
+        box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.2);
+        cursor: pointer;
+    }
+
+    .yui3-slider-rail .yui3-slider-thumb:hover {
+        -webkit-transform: scale(1.25, 1.25);
+        transform: scale(1.25, 1.25);
+        -ms-transition: transform 0.1s cubic-bezier(0.895, 0.03, 0.685, 0.22);
+        transition:  transform 0.1s cubic-bezier(0.895, 0.03, 0.685, 0.22);
+    }
+
+    .yui3-slider-thumb-shadow, .yui3-slider-thumb-image {
+        display: none;
+    }
+}
+
+/* Special overrides for JS-enabled */
+.js .contribute-to-ubuntu {
+    .contribution-intro:first-child {
+    	display: none;
+    }
+    .contribution-intro-row {
+    	min-height: 95px;
+    }
+
+    .slider-area p {
+        float: none;
+    }
+    .contribution-slider {
+    	min-height: 24px;
+    	min-width: 10px;
+    }
+}
+
+
+/* Desktop thankyou page */
+.download-thankyou {
+    .download-cross-sells {
+        margin-top: 40px;
+    }
+    .download-cross-sells .box-highlight {
+        height: 380px;
+    }
+    .download-cross-sells .box-highlight img {
+        display: block;
+        margin: 0 auto 20px auto;
+    }
+}
+
+/* Medium / Tablet viewport
+-------------------------------------------------------------- */
+@media only screen and (min-width : 769px) {
+
+
+	body.download #main-content .row-background {
+		background-position: 0 center;
+	}
+
+	/* Thank you pages */
+	.download .row-download-thanks {
+		margin-left: 0;
+		margin-right: 0;
+	}
+
+	body.download .download-description {
+		@include box_sizing;
+		border-right: 1px dotted $warm-grey;
+		display: inline;
+		float: left;
+		min-height: 8em;
+		padding-right: 10px;
+	}
+	body.download-cloud-home .inline-icons li {
+		margin-bottom: 20px;
+	}
+	body.contribute-to-ubuntu .price-equivalent img {
+    	float: left;
+	}
+
+	#download-help li span,
+	#ubuntu-help li span {
+		@include font_size (36);
+	  height: 38px;
+	  margin-left: -(80/36)em;
+	  padding: 0 21px 20px 19px;
+	}
+
+	#ubuntu-help li span {
+		margin-left: 0;
+		margin-right: 20px;
+	}
+
+
+	#download-help {
+		dt {
+		    display: inline-block;
+		    left: 0;
+		    position: absolute;
+		    top: 10px;
+		    width: 40%;
+		}
+
+		dd {
+		    float: right;
+		    width: 55%;
+		}
+		.help-image a {
+			display: none;
+		}
+		.box-tip {
+			background: #fff url(../img/pictograms/pictogram-download-tip-60x49.png) $gutter-width $gutter-width no-repeat;
+			margin-bottom: 1.538em;
+			padding-left: 100px;
+			padding-bottom: 1.25em;
+		}
+	}
+	#download-other .box {
+		margin-bottom: 0;
+	}
+	body.download {
+		.gap-from-top {
+			margin-top: 53px;
+		}
+	}
+}
+
+/* Large / Desktop viewport
+-------------------------------------------------------------- */
+@media only screen and (min-width : 984px) {
+	.download-thankyou {
+		.equal-height img {
+			height: 113px;
+			width: 113pc;
+		}
+	}
+}
+
+
diff --git a/static/css/section/error.scss b/static/css/section/error.scss
new file mode 100755
index 00000000000..660e5c45dab
--- /dev/null
+++ b/static/css/section/error.scss
@@ -0,0 +1,60 @@
+@charset "UTF-8";
+/*  @section error
+-------------------------------------------------------------- */
+
+/**
+ * 404 page
+ *
+ * @subsection 404
+ */
+
+body.error-page {
+  #main-content {
+    .hero-box {
+    	padding-bottom: 0;
+    	position: relative;
+
+      div{
+        position: relative;
+      }
+      span {
+        display: none;
+        background: url(../img/error/image-quote-154.png);
+        color: #fff;
+        font-size: 90px;
+        font-weight: bold;
+        height: 126px;
+        padding-top: 28px;
+        position: absolute;
+        right: 0;
+        text-align: center;
+        top: 10px;
+        width: 154px;
+      }
+      p {
+        font-size: 21px;
+      }
+      .last-col {
+        padding-top: 30px;
+      }
+    }
+
+    h2 {
+      font-size: 21px;
+    }
+    .events a{
+      float:right;
+    }
+  }
+}
+
+/* Medium / Tablet viewport
+-------------------------------------------------------------- */
+@media only screen and (min-width : 769px) {
+  body.error-page #main-content .hero-box .last-col {
+      padding-top: 110px;
+  }
+  body.error-page #main-content .hero-box span {
+    display: block;
+  }
+}
\ No newline at end of file
diff --git a/static/css/section/homepage.scss b/static/css/section/homepage.scss
new file mode 100755
index 00000000000..d36c5cbac96
--- /dev/null
+++ b/static/css/section/homepage.scss
@@ -0,0 +1,2131 @@
+/*
+  DO NOT EDIT HOMEPAGE.CSS
+  It is autogenerated.
+
+  Project:    Ubuntu homepage
+  Author:     Web Team at Canonical Ltd
+  Last edited by:
+  Last edited on:
+
+    CONTENTS:
+  -----------------------------------------------------------------
+  body.homepage - general homepage styles
+  body.homepage-default - default fall-back design - currently 12.10
+  body.homepage-humble - Humble Indie Bundle specific
+  body.homepage-phone  - Ubuntu phone specific
+  body.homepage-hp - HP specific (UK only)
+  body.homepage-sputnik - Dell Sputnik specific (US & Canada, Germany and France only)
+  body.homepage-dell-server - Dell server
+  body.homepage-juju
+  body.homepage-cag
+  body.homepage-charm - Charm championship
+  body.homepage-edge - Edge
+  body.homepage-1310 - 13.10 launch
+
+-------------------------------------------------------------- */
+body.homepage {
+
+  .lang-switch {
+    float: right;
+    margin-right: 20px;
+    margin-top: 20px;
+    z-index: 1000;
+  }
+
+  h1 {
+		//font-size: 45px;
+	}
+
+	.intro { font-size: 1.4em; }
+
+  .nav-secondary {
+    display: none;
+  }
+
+  .row-hero { padding-bottom: 0; }
+
+  .row{
+    padding-left: 20px;
+    padding-right: 20px;
+  }
+
+  .inner-wrapper .box li img { vertical-align: middle; }
+
+  #main-content {
+    background: none;
+    box-shadow: none;
+  }
+
+  #main-content .box-hero {
+     border: 0;
+   @include rounded_corners(4px);
+    margin: 0 0 20px;
+    padding: 0;
+  }
+
+  .box-stylish div {
+    display: inline-block;
+    float: left;
+  }
+
+  .box-stylish .left-side {
+    @include border();
+    margin-right: $gutter-width;
+    width: $three-col/* - ( $gutter-width )/*/;
+  }
+
+  .box-stylish .right-side {
+    width: $three-col/* - ( 2 * $gutter-width )/*/;
+  }
+
+  .box-cloud { position: relative; }
+
+  .box-cloud div {
+    background: url(../img/pictograms/pictogram-cloud-100x100.png) 99% center no-repeat;
+    display: block;
+    padding-right: 120px;
+  }
+
+  .box-highlight {
+      -moz-box-shadow: 0 1px 6px 0 #c2c2c2;
+      -webkit-box-shadow: 0 1px 6px 0 #c2c2c2;
+    box-shadow: 0 1px 6px 0 #c2c2c2;
+    border: 1px solid #f7f7f7;
+  }
+
+  /* homepage feature boxes */
+  .box-textured, .box-feature-one, .box-feature-two, .box-feature-three {
+    background-repeat: no-repeat, repeat;
+  }
+  .box-textured {
+    background-color: $light-grey;
+    padding: 24px 20px 20px;
+    min-height: 304px;
+
+    h2 {
+      font-size: 21px;
+    }
+
+    p {
+      font-size: 16px;
+    }
+  } /* end box-textured */
+
+  .box-textured.box-feature-one {
+    background-image: url("../img/homepage/cnet-award-phone-tablet.png"), url("../img/patterns/grey-textured-background.jpg");
+    background-position: center 160px, 0 0;
+  }
+  .box-textured.box-feature-two {
+    background-image: url("../img/homepage/homepage-12.10-launch-ubuntu.png"), url("../img/patterns/grey-textured-background.jpg");
+    background-position: 16px 237px, 0 0;
+  }
+  .box-textured.box-feature-three {
+    /* Raring promo */
+    background-image: url("../img/homepage/raring-promo-bg.png"), url("../img/patterns/grey-textured-background.jpg");
+    background-position: 190px 104%, 0 0;
+   /* Landscape Prono */
+    /*background-image: url("../img/homepage/hero-landscape-screenshot-small.png"), url("../img/patterns/grey-textured-background.jpg");
+    background-position: 170px 68px, 0 0;*/
+
+    p {
+      /* raring padding-right: 100px; */
+      padding-right: 123px;
+    }
+  }
+  .homepage-features {
+
+    .box {
+      padding: 0;
+      background-position: 50% 85%;
+      background-repeat: no-repeat;
+      background-color: #fff;
+      border: 0;
+    }
+    a {
+      padding: 20px 20px 191px;
+      display: block;
+    }
+    a p {
+      color: #333;
+    }
+    a:hover {
+      text-decoration: none
+    }
+    a:hover h2 {
+      text-decoration: underline;
+    }
+    .box-feature-one {
+      background-image: url(../img/homepage/image-phone.png);
+    }
+    .box-feature-two {
+      background-image: url(../img/homepage/image-openstack.png);
+    }
+    .box-feature-three {
+      background-image: url(../img/homepage/image-take-the-tour.png);
+      background-position: right bottom;
+    }
+  }
+
+} /* end body.homepage */
+
+/* body.homepage-default
+-------------------------------------------------------------- */
+body.homepage-default {
+    .row-hero .box {
+    background: #fff url(../img/homepage/homepage-1204-background-laptop.png) 355px 30px no-repeat;
+  }
+
+  .row-hero div div {
+    padding-bottom: $gutter-width;
+    padding-top: 2 * $gutter-width;
+    text-align: center;
+    width: $five-col;
+  }
+
+  .row-hero p {
+    @include font_size (18);
+  }
+} /* end body.default */
+
+/* body.homepage-raring
+-------------------------------------------------------------- */
+body.homepage-raring {
+  .row-hero {
+    padding: 0 0 0 50px;
+    position: relative;
+    overflow: visible;
+  }
+
+  .row-hero img {
+    display: none;
+  }
+
+  .row-hero h1 {
+    @include font_size (45);
+    line-height: 1.2;
+    margin-bottom: 12px;
+    margin-top: 22px;
+    padding-top: 32px;
+  }
+
+  .row-hero .tagline {
+    @include font_size (24);
+    line-height: 1.4;
+    margin-bottom: 5px;
+  }
+
+  .row-hero .hero {
+      -moz-border-radius: 0 4px 0 0;
+      -webkit-border-radius: 0 4px 0 0;
+    background: #fff url(../img/homepage/1304-takeover-laptop.png) 361px 14px no-repeat;
+    border-bottom: 0;
+    border-radius: 0 4px 0 0;
+    border-right: 0;
+  }
+
+  .row-hero div div {
+      padding-bottom: $gutter-width;
+      width: 450px;
+      margin-left: $gutter-width;
+  }
+
+  .row-hero .share-this {
+    padding-top: 0;
+    padding-bottom: 0;
+  }
+
+   .row-hero a.link-cta-ubuntu {
+     margin-bottom: 20px;
+   }
+
+  .row-hero p.tagline {
+    font-size: 24px;
+    margin-bottom: 20px;
+  }
+
+  a.hidden {
+      display: block;
+      height: 306px;
+      left: 0;
+      position: absolute;
+      top: 0;
+      width: 301px;
+  }
+
+  .row-hero .share-this {
+    text-align: left;
+    width: 290px;
+    margin-top: 20px;
+    margin-left: 0;
+    float: none;
+
+    iframe, div {
+      float: right;
+    }
+
+    .twitter-share-button{
+      width: 101px !important;
+    }
+  }
+
+} /* End Raring */
+
+/* body.homepage-charm
+-------------------------------------------------------------- */
+body.homepage-charm {
+  .inner-wrapper {
+    background-image: url(../img/homepage/charm/juju_bg.png);
+  }
+
+  #main-content .row-hero {
+    background: url(../img/homepage/charm/juju-main.png) 105% 70px no-repeat;
+    position: relative;
+    overflow: visible;
+    margin-bottom: 20px;
+  }
+    #main-content .row-hero br{
+    margin-bottom: 10px;
+    }
+
+  .row-hero .tagline {
+    @include font_size (26);
+    line-height: 1.4;
+    margin-bottom: 20px;
+    padding-right: 440px;
+  }
+  .row-hero .link-cta-ubuntu {
+    margin-right: 10px;
+  }
+  .hero {
+    background: url(../img/homepage/charm/icon-juju-logo.png) 20px 70px no-repeat;
+    padding-left: 20px;
+    margin-top: -50px;
+    padding-top: 130px;
+  }
+}/* end homepage-charm */
+
+/* body.homepage-edge
+-------------------------------------------------------------- */
+body.homepage-edge {
+  h1 {
+    background: url(../img/homepage/edge-logo.png) no-repeat;
+    display: block;
+    height: 74px;
+    margin-bottom: 7px;
+    margin-left: -10px;
+    text-indent: -999em;
+    width: 320px;
+  }
+  #main-content .row-hero {
+    background: #282828;
+    height: 355px;
+    margin-bottom: 0;
+    margin-top: 0;
+    overflow: hidden;
+    position: relative;
+    width: 100%;
+    z-index: 2;
+    @include rounded_corners(4px 4px 0 0);
+  }
+  .hero {
+    position: relative;
+    z-index: 3;
+    padding-top: 0;
+    top: 65px;
+    position: relative;
+    padding-left: 40px;
+  }
+  #edge {
+    background: url(../img/homepage/2_3_generic.jpg) right -400px no-repeat;
+    color: #fff;
+    display: block;
+    height: 600px;
+    left: 55%;
+    position: absolute;
+    top: 0;
+    width: 922px;
+    z-index: 1;
+  }
+  .tagline {
+    @include font_size (24);
+    color: #fff;
+    margin-bottom: 25px;
+    text-shadow: 0 2px 4px rgba(0,0,0,.6);
+    line-height: 54px;
+    width: 490px;
+  }
+  .tagline {
+    line-height: 1.3;
+   }
+  .link-cta-ubuntu {
+    -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
+    -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
+  }
+} /* end homepage-edge */
+
+/* body.homepage-azure
+-------------------------------------------------------------- */
+body.homepage-azure {
+  #main-content .row-hero {
+    background: url(../img/homepage/image-windows-azure-charms.png) 100% 30px no-repeat;
+    position: relative;
+    overflow: visible;
+    margin-bottom: 15px;
+    padding-bottom: 20px;
+  }
+  #main-content h1 {
+    @include font_size (38);
+    margin-bottom: 30px;
+  }
+  #main-content h1 span {
+    display: inline;
+    background: url(../img/homepage/logo-windows-azure-280.png) 0 2px no-repeat;
+    text-indent: -999em;
+    display: inline-block;
+    width: 280px;
+    height: 47px;
+    margin-left: 6px;
+  }
+  .row-hero p a {
+    text-decoration: none;
+  }
+  .row-hero p {
+    @include font_size (20);
+  }
+  .row-hero p a {
+    color: #333;
+  }
+  .row-hero p a span {
+    color: $ubuntu-orange;;
+  }
+  .row-hero p a:hover span {
+    text-decoration: underline;
+  }
+  .row-hero .tagline {
+    @include font_size (30);
+    line-height: 1.4;
+    margin-bottom: 20px;
+    padding-right: 440px;
+  }
+  .hero {
+    padding-left: 20px;
+    padding-top: 60px;
+  }
+}/* end homepage-azure */
+
+/* body.homepage-openstack
+-------------------------------------------------------------- */
+body.homepage-openstack {
+  #main-content .row-hero,
+  #main-content .box-hero {
+    @include box_sizing;
+    background: #fff url(../img/homepage/image-ubuntu-openstack-medals.png) 90% 0 no-repeat;
+    clear: both;
+    display: block;
+    width: 100%;
+    float: left;
+    overflow: visible;
+    padding-bottom: 70px;
+    padding-top: 60px;
+    position: relative;
+  }
+  #main-content .row-hero {
+    margin-top: 0;
+  }
+  #main-content .box-hero {
+    padding-left: 20px;
+    padding-bottom: 70px;
+  }
+  #main-content h1 {
+    padding-right: 10em;
+  }
+  #main-content .box-hero h1 {
+    @include font_size (43);
+    margin-bottom: 10px;
+  }
+  .row-hero .tagline,
+  .box-hero .tagline {
+    @include font_size (30);
+    line-height: 1.4;
+    margin-bottom: 20px;
+  }
+  .row-hero .tagline {
+    max-width: 400px;
+  }
+  .box-hero .hero {
+    padding-left: 20px;
+    padding-top: 0;
+  }
+
+}/* end homepage-openstack */
+
+/* body.homepage-1310
+-------------------------------------------------------------- */
+body.homepage-1310 {
+  #main-content .box-hero {
+    @include rounded_corners(4px);
+    background: #3b0208 url(../img/homepage/image-ubuntu-dash.png) right top no-repeat;
+    margin: 0 0 20px;
+    padding: 0;
+    border: 0;
+  }
+  #main-content h1 {
+    text-shadow: 0 2px 4px rgba(0,0,0,.6);
+    @include font_size (58);
+    color: #fff;
+    margin-bottom: 10px;
+  }
+  .box-hero .tagline {
+    @include font_size (30);
+    line-height: 1.4;
+    margin-bottom: 20px;
+    padding-right: 360px;
+    text-shadow: 0 2px 4px rgba(0,0,0,.6);
+  }
+  .hero {
+    @include rounded_corners(4px);
+    background: url(../img/homepage/image-ubuntu-dash-dock.jpg) no-repeat;
+    color: #fff;
+    margin-top: 0;
+    padding: 128px 20px 8px 120px;
+    height: 325px;
+  }
+  .hero .link-cta-ubuntu {
+    -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
+    -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
+  }
+  #main-content .box-hero p a {
+    @include font_size (18);
+    color: #fff;
+    text-shadow: 0 2px 4px rgba(0,0,0,.6);
+  }
+}/* end homepage-1310 */
+
+/* body.homepage-uoil
+-------------------------------------------------------------- */
+body.homepage-uoil{
+  #main-content {
+    background: none;
+    box-shadow: none;
+  }
+  .box-highlight {
+      -moz-box-shadow: 0 1px 6px 0 #c2c2c2;
+      -webkit-box-shadow: 0 1px 6px 0 #c2c2c2;
+    box-shadow: 0 1px 6px 0 #c2c2c2;
+    border: 1px solid #f7f7f7;
+  }
+  #main-content h1 {
+    @include font_size (60);
+    color: #333;
+    margin-bottom: 10px;
+  }
+  .box-hero .tagline,
+  .box-hero a {
+    @include font_size (23);
+    line-height: 1.3;
+    margin-bottom: 20px;
+    padding-right: 455px;
+  }
+  .hero {
+    @include rounded_corners(4px);
+    background: url(../img/homepage/interoperability-lab.png) no-repeat right center;
+    color: #333;
+    margin-top: 0;
+    padding: 100px 0 0 50px;
+    height: 358px;
+  }
+  .hero .link-cta-ubuntu {
+    margin-bottom: 15px;
+  }
+  #main-content h2 {
+    @include font_size (21);
+  }
+}
+/* end homepage uoil */
+
+/* body.homepage-landscape
+-------------------------------------------------------------- */
+body.homepage-landscape {
+  .box-hero {
+    @include rounded_corners(4px);
+    position: relative;
+    overflow: visible;
+  }
+
+  .hero {
+    @include rounded_corners(4px);
+    padding-left: 20px;
+  }
+
+  .box-hero img {
+    display: none;
+  }
+
+  .box-hero h1 {
+    @include font_size (45);
+    padding-top: 60px;
+    margin-bottom: 20px;
+    line-height: 1.2;
+  }
+
+  .box-hero .tagline {
+    @include font_size (24);
+    line-height: 1.4;
+    margin-bottom: 5px;
+  }
+
+  .box-hero .hero {
+    background: #fff url(../img/homepage/hero-landscape-screenshot.png) 532px -6px no-repeat;
+    border-bottom: 0;
+    border-right: 0;
+  }
+
+  .box-hero div div {
+      padding-bottom: 42px;
+      width: 450px;
+      margin-left: $gutter-width;
+  }
+
+  .box-hero .share-this {
+    padding-top: 0;
+  }
+
+  .box-hero p {
+    font-size: 24px;
+  }
+
+  a.hidden {
+      display: block;
+      height: 306px;
+      left: 0;
+      position: absolute;
+      top: 0;
+      width: 301px;
+  }
+
+} /* End Landscape */
+
+/* body.homepage-cesg
+-------------------------------------------------------------- */
+body.homepage-cesg {
+  .box-hero {
+    @include rounded_corners(4px);
+    position: relative;
+    overflow: visible;
+  }
+
+  .hero {
+    @include rounded_corners(4px);
+    padding-left: 20px;
+  }
+
+  .box-hero img {
+    position: absolute;
+    bottom: 0;
+  }
+
+  .box-hero h1 {
+    @include font_size (45);
+    padding-top: 85px;
+    margin-bottom: 20px;
+    line-height: 1.2;
+  }
+
+  .box-hero .tagline {
+    @include font_size (24);
+    line-height: 1.4;
+    margin-bottom: 5px;
+  }
+
+  .box-hero .hero {
+    border-bottom: 0;
+    border-right: 0;
+  }
+
+  .box-hero div .copy {
+      padding-bottom: 42px;
+      width: 450px;
+      margin-left: $gutter-width;
+  }
+
+  .box-hero .share-this {
+    padding-top: 0;
+  }
+
+  .box-hero p {
+    font-size: 24px;
+  }
+
+  a.hidden {
+      display: block;
+      height: 306px;
+      left: 0;
+      position: absolute;
+      top: 0;
+      width: 301px;
+  }
+}
+
+.bar-chart {
+    width: 430px;
+    height: 396px;
+    margin: auto;
+    position: absolute;
+    right: 40px;
+    bottom: 0;
+}
+
+.bar-chart div {
+    position: absolute;
+    width: 30px;
+    height: 0;
+    bottom: 0;
+    -webkit-border-top-left-radius: 4px;
+    -moz-border-radius-topleft: 4px;
+    border-top-left-radius: 4px;
+    -webkit-border-top-right-radius: 4px;
+    -moz-border-radius-topright: 4px;
+    border-top-right-radius: 4px;
+    -moz-border-radius-topleft: 4px;
+    -moz-border-radius-topright: 4px;
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+    filter: alpha(opacity=0);
+    opacity: 0
+}
+
+.bar {
+    background-color: #ada69e;
+    height: 0;
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+    filter: alpha(opacity=0);
+    opacity: 0;
+    -moz-transition: all 1s cubic-bezier(0.19, 1, 0.22, 1);
+    -o-transition: all 1s cubic-bezier(0.19, 1, 0.22, 1);
+    -webkit-transition: all 1s cubic-bezier(0.19, 1, 0.22, 1);
+    transition: all 1s cubic-bezier(0.19, 1, 0.22, 1);
+}
+
+.bar1 {
+    left: 0;
+    -moz-transition-delay: 1s;
+    -o-transition-delay: 1s;
+    -webkit-transition-delay: 1s;
+    transition-delay: 1s
+}
+
+.no-transitions .bar1, .run .bar1 {
+    height: 176px;
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=20)";
+    filter: alpha(opacity=20);
+    opacity: 0.2
+}
+
+.bar2 {
+    left: 40px;
+    -moz-transition-delay: 1.1s;
+    -o-transition-delay: 1.1s;
+    -webkit-transition-delay: 1.1s;
+    transition-delay: 1.1s
+}
+
+.no-transitions .bar2, .run .bar2 {
+    height: 176px;
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=20)";
+    filter: alpha(opacity=20);
+    opacity: 0.2
+}
+
+.bar3 {
+    left: 80px;
+    -moz-transition-delay: 1.2s;
+    -o-transition-delay: 1.2s;
+    -webkit-transition-delay: 1.2s;
+    transition-delay: 1.2s
+}
+
+.no-transitions .bar3, .run .bar3 {
+    height: 220px;
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
+    filter: alpha(opacity=30);
+    opacity: 0.3
+}
+
+.bar4 {
+    left: 120px;
+    -moz-transition-delay: 1.3s;
+    -o-transition-delay: 1.3s;
+    -webkit-transition-delay: 1.3s;
+    transition-delay: 1.3s
+}
+
+.no-transitions .bar4, .run .bar4 {
+    height: 264px;
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=40)";
+    filter: alpha(opacity=40);
+    opacity: 0.4
+}
+
+.bar5 {
+    left: 160px;
+    -moz-transition-delay: 1.4s;
+    -o-transition-delay: 1.4s;
+    -webkit-transition-delay: 1.4s;
+    transition-delay: 1.4s
+}
+
+.no-transitions .bar5, .run .bar5 {
+    height: 264px;
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=40)";
+    filter: alpha(opacity=40);
+    opacity: 0.4
+}
+
+.bar6 {
+    left: 200px;
+    -moz-transition-delay: 1.5s;
+    -o-transition-delay: 1.5s;
+    -webkit-transition-delay: 1.5s;
+    transition-delay: 1.5s
+}
+
+.no-transitions .bar6, .run .bar6 {
+    height: 308px;
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
+    filter: alpha(opacity=50);
+    opacity: 0.5
+}
+
+.bar7 {
+    left: 240px;
+    -moz-transition-delay: 1.6s;
+    -o-transition-delay: 1.6s;
+    -webkit-transition-delay: 1.6s;
+    transition-delay: 1.6s
+}
+
+.no-transitions .bar7, .run .bar7 {
+    height: 352px;
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
+    filter: alpha(opacity=60);
+    opacity: 0.6
+}
+
+.bar8 {
+    left: 280px;
+    -moz-transition-delay: 1.7s;
+    -o-transition-delay: 1.7s;
+    -webkit-transition-delay: 1.7s;
+    transition-delay: 1.7s
+}
+
+.no-transitions .bar8, .run .bar8 {
+    height: 352px;
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
+    filter: alpha(opacity=60);
+    opacity: 0.6
+}
+
+.bar9 {
+    left: 320px;
+    -moz-transition-delay: 1.8s;
+    -o-transition-delay: 1.8s;
+    -webkit-transition-delay: 1.8s;
+    transition-delay: 1.8s
+}
+
+.no-transitions .bar9, .run .bar9 {
+    height: 352px;
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
+    filter: alpha(opacity=60);
+    opacity: 0.6
+}
+
+.bar10 {
+    left: 360px;
+    -moz-transition-delay: 1.9s;
+    -o-transition-delay: 1.9s;
+    -webkit-transition-delay: 1.9s;
+    transition-delay: 1.9s
+}
+
+.no-transitions .bar10, .run .bar10 {
+    height: 352px;
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
+    filter: alpha(opacity=60);
+    opacity: 0.6
+}
+
+.bar11 {
+    left: 400px;
+    background-color: #dd4813;
+    -moz-transition-delay: 2s;
+    -o-transition-delay: 2s;
+    -webkit-transition-delay: 2s;
+    transition-delay: 2s
+}
+
+.no-transitions .bar11, .run .bar11 {
+    height: 396px;
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+    filter: alpha(opacity=100);
+    opacity: 1
+}
+
+
+
+/* body.homepage-asus - USA only 22 Nov - 3 Dec 2013
+-------------------------------------------------------------- */
+body.homepage-asus {
+  .box-hero .hero {
+    background: url("../img/homepage/1015e-takeover.jpg") 390px 15px no-repeat;
+    padding-top: 65px;
+    padding-left: 40px;
+    padding-bottom: 55px
+
+    h1 {
+      background: url("../img/third-party-logos/logo-asus-130x28.png") 0 10px no-repeat;
+      @include font_size (45);
+      padding-top: 66px;
+      padding-right: 0;
+      margin-bottom: 20px;
+    }
+    p {
+      margin-bottom: 20px;
+      line-height: 1.4;
+    }
+    p.tagline {
+      @include font_size (21);
+      margin-bottom: 20px;
+      font-weight: 300;
+      line-height: 1.5;
+      padding-right: 40px;
+    }
+    p:last-child {
+      margin-bottom: 0;
+    }
+    .share-this {
+      margin-bottom: -20px;
+      margin-top: 0;
+    }
+   }
+}
+
+body.index_asus {
+  .row-hero .hero {
+    padding-top: 30px;
+  }
+}
+
+/* body.homepage-community
+-------------------------------------------------------------- */
+body.homepage-community {
+  .box-hero .hero {
+    background: #DD4713 url("../img/homepage/hand-illustration.png") 425px 50% no-repeat;
+    padding-top: 120px;
+    @include rounded_corners(4px);
+    color: #fff;
+    padding-left: 40px;
+    padding-bottom: 30px;
+    height: 293px;
+
+    h1 {
+      @include font_size (60);
+    }
+    p {
+      @include font_size (21);
+      margin-bottom: 20px;
+      line-height: 1.4;
+    }
+    p.tagline {
+      margin-bottom: 20px;
+      font-weight: 300;
+      line-height: 1.5;
+      width: 300px;
+    }
+    p:last-child {
+      margin-bottom: 0;
+    }
+    a:link, a:visited {
+      color: #fff;
+    }
+   }
+
+} /* End homepage-community */
+
+/* body.homepage-hp-emea aka HP Discover EMEA
+-------------------------------------------------------------- */
+body.homepage-hp-emea {
+  .box-hero {
+    background: #fff url(../img/homepage/hpemea-takeover.png) 324px 250px no-repeat;
+  }
+  .box-hero .hero {
+    @include rounded_corners(4px);
+    padding-left: 40px;
+    padding-bottom: 125px;
+    width: 65%;
+
+      h1 {
+        @include font_size (50);
+        padding-top: 66px;
+        padding-right: 0;
+        margin-bottom: 10px;
+      }
+      p {
+        @include font_size (23);
+        margin-bottom: 20px;
+        line-height: 1.4;
+      }
+      p.tagline {
+        margin-bottom: 20px;
+        font-weight: 300;
+        line-height: 1.5;
+        padding-right: 40px;
+      }
+
+    }
+
+} /* End homepage-hp-emea */
+
+/* body.homepage-xmas-shop-13
+-------------------------------------------------------------- */
+body.homepage-xmas-shop-13 {
+  .box-hero {
+    background: #fff url(../img/homepage/homepage-xmas-shop.jpg) right 0 no-repeat;
+  }
+  .box-hero .hero {
+    @include rounded_corners(4px);
+    padding-left: 40px;
+    padding-bottom: 50px;
+    width: 360px;
+
+      h1 {
+        @include font_size (50);
+        padding-top: 56px;
+        padding-right: 0;
+        margin-bottom: 15px;
+      }
+      p {
+        @include font_size (23);
+        margin-bottom: 20px;
+        line-height: 1.4;
+      }
+      p.tagline {
+        margin-bottom: 20px;
+        font-weight: 300;
+        line-height: 1.5;
+        padding-right: 40px;
+      }
+
+    }
+
+} /* End homepage-xmas-shop-13 */
+
+/* body.homepage-cloud-survey
+-------------------------------------------------------------- */
+body.homepage-cloud-survey {
+  .box-hero .hero {
+    @include rounded_corners(4px);
+    padding: 60px 40px;
+
+      h1 {
+        @include font_size (45);
+        margin-bottom: 15px;
+      }
+      p {
+        @include font_size (23);
+        line-height: 1.4;
+        margin-bottom: 0;
+      }
+      p.intro {
+        margin-bottom: 20px;
+      }
+
+    }
+
+} /* End homepage-cloud-survey */
+
+/* body.homepage-vmw1
+-------------------------------------------------------------- */
+body.homepage-vmw1 {
+  .box-hero {
+    @include rounded_corners(4px);
+    position: relative;
+    overflow: visible;
+  }
+
+  .hero {
+    @include rounded_corners(4px);
+    padding-left: 20px;
+    height: 460px;
+  }
+
+  .box-hero {
+    img {
+      position: absolute;
+      bottom: 0;
+    }
+    img.webinar {
+      top: 30px;
+      right: 0px;
+    }
+  }
+
+  .box-hero h1 {
+    @include font_size (45);
+    padding-top: 85px;
+    margin-bottom: 20px;
+    line-height: 1.2;
+  }
+
+  .box-hero .tagline {
+    @include font_size (24);
+    line-height: 1.4;
+    margin-bottom: 5px;
+  }
+
+  .box-hero .hero {
+    border-bottom: 0;
+    border-right: 0;
+  }
+
+  .box-hero div .copy {
+      margin-left: $gutter-width;
+  }
+
+  .box-hero .share-this {
+    padding-top: 0;
+  }
+
+  .box-hero p {
+    font-size: 24px;
+  }
+
+  a.hidden {
+      display: block;
+      height: 306px;
+      left: 0;
+      position: absolute;
+      top: 0;
+      width: 301px;
+  }
+}
+
+/* body.homepage-mwc1
+-------------------------------------------------------------- */
+body.homepage-mwc1,
+body.homepage-mwc2 {
+  background: #fff url(../img/backgrounds/image-background-paper.png) repeat-y center top;
+  .box-hero {
+    @include rounded_corners(4px);
+    position: relative;
+    overflow: visible;
+  }
+
+  .box-hero {
+    background-image: url(../img/homepage/image-takeover-left.png);
+    background-repeat: no-repeat;
+    background-position: left 5px;
+  }
+
+  .hero {
+    @include rounded_corners(4px);
+    padding-left: 20px;
+    background-image: url(../img/homepage/image-takeover-right.png);
+    background-repeat: no-repeat;
+    background-position: right 5px;
+    height: 438px;
+  }
+
+  .box-hero img {
+
+  }
+
+  .box-hero h1 {
+    @include font_size (45);
+    padding-top: 125px;
+    margin-bottom: 20px;
+  }
+
+  .box-hero .hero {
+    border-bottom: 0;
+    border-right: 0;
+  }
+
+  .box-hero div .copy {
+      margin-left: $gutter-width;
+  }
+
+  .box-hero .share-this {
+    padding-top: 0;
+  }
+
+  .box-hero p {
+    font-size: 24px;
+  }
+
+  a.hidden {
+      display: block;
+      height: 306px;
+      left: 0;
+      position: absolute;
+      top: 0;
+      width: 301px;
+  }
+}
+
+
+.scopes {
+  position: absolute;
+  top: 40px;
+  right: 20px;
+  width: 562px;
+  height: 360px;
+}
+.scopes #scope-1, .scopes #scope-2, .scopes #scope-3, .scopes #scope-4 {
+  position: absolute;
+  margin-top: 20px;
+  width: 180px;
+  height: 320px;
+  -webkit-box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.4);
+  -moz-box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.4);
+  box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.4);
+  background-repeat: no-repeat;
+  opacity: 0;
+  -moz-transition: all 0.5s cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  -o-transition: all 0.5s cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  -webkit-transition: all 0.5s cubic-bezier(0.25, 0.46, 0.45, 0.94);
+  transition: all 0.5s cubic-bezier(0.25, 0.46, 0.45, 0.94);
+}
+
+.scopes #scope-1 {
+  margin-left: 362px;
+  background-image: url('../img/homepage/phone-scopes-1.jpg');
+  z-index: 4;
+  opacity: 1;
+}
+
+.run .scopes #scope-1 {
+  opacity: 1;
+}
+
+.scopes #scope-2 {
+  margin-left: 362px;
+  background-image: url('../img/homepage/phone-scopes-2.jpg');
+  z-index: 3;
+  -moz-transition-delay: 0.5s;
+  -o-transition-delay: 0.5s;
+  -webkit-transition-delay: 0.5s;
+  transition-delay: 0.5s;
+  opacity: 1;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+
+.run .scopes #scope-2 {
+  margin-left: 248px;
+  opacity: 1;
+  -webkit-box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.4);
+  -moz-box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.4);
+  box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.4);
+}
+
+.scopes #scope-3 {
+  /*margin-left: 248px;*/
+  margin-left: 362px;
+  background-image: url('../img/homepage/phone-scopes-3.jpg');
+  z-index: 2;
+  -moz-transition-delay: 1s;
+  -o-transition-delay: 1s;
+  -webkit-transition-delay: 1s;
+  transition-delay: 1s;
+  opacity: 1;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+
+.run .scopes #scope-3 {
+  margin-left: 134px;
+  opacity: 1;
+  -webkit-box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.4);
+  -moz-box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.4);
+  box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.4);
+}
+
+.scopes #scope-4 {
+  /*margin-left: 134px;*/
+  margin-left: 362px;
+  background-image: url('../img/homepage/phone-scopes-4.jpg');
+  z-index: 1;
+  -moz-transition-delay: 1.5s;
+  -o-transition-delay: 1.5s;
+  -webkit-transition-delay: 1.5s;
+  transition-delay: 1.5s;
+  opacity: 1;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+
+.run .scopes #scope-4 {
+  margin-left: 20px;
+  opacity: 1;
+  -webkit-box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.4);
+  -moz-box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.4);
+  box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.4);
+}
+
+body.homepage-mwc2 {
+  .box-hero h1 {
+    margin-bottom: .267em;
+    padding-top: 105px;
+  }
+  .box-hero p.tagline {
+    @include font_size (32);
+    line-height: 1.4;
+    margin-bottom: 5px;
+  }
+  .bq {
+    position: absolute;
+    left: 40px;
+    bottom: 50px;
+  }
+
+  .meizu {
+    position: absolute;
+    left: 132px;
+    bottom: 57px;
+  }
+}
+
+.run body.homepage-mwc2{
+ .scopes {
+    #scope-2 {
+      margin-left: 269px;
+    }
+
+    #scope-3 {
+      margin-left: 176px;
+    }
+
+    #scope-4 {
+      margin-left: 83px;
+    }
+  }
+}
+
+.lt-ie10 {
+  body.homepage-mwc1 {
+    .box-hero {
+      background-image: url(../img/homepage/mwc-preview.png);
+      background-repeat: no-repeat;
+      background-position: 402px 40px;
+    }
+    .scopes {
+      display: none;
+    }
+  }
+  body.homepage-mwc2 {
+    .box-hero {
+      background-image: url(../img/homepage/mwc-preview-compact.png);
+      background-repeat: no-repeat;
+      background-position: 402px 40px;
+    }
+    .scopes {
+      display: none;
+    }
+  }
+}
+
+
+/* body.homepage-vmw1
+-------------------------------------------------------------- */
+body.homepage-mwc-2014 {
+   #main-content .box-hero {
+    @include rounded_corners(4px);
+    position: relative;
+    overflow: visible;
+    background-image: url(../img/homepage/image-takeover-left.png);
+    background-repeat: no-repeat;
+    background-position: left 5px;
+  }
+
+  .hero {
+    background-image: url(../img/homepage/image-takeover-right.png);
+    background-repeat: no-repeat;
+    background-position: right 5px;
+    @include rounded_corners(4px);
+    padding-left: 40px;
+    padding-top: 30px;
+    padding-bottom: 10px;
+    overflow: hidden;
+    min-height: 445px;
+  }
+
+  .box-hero h1 {
+    @include font_size (50);
+    padding-top: 85px;
+    margin-bottom: 20px;
+    line-height: 1.2;
+  }
+
+  .box-hero .tagline {
+    @include font_size (24);
+    line-height: 1.4;
+    margin-bottom: 5px;
+  }
+
+  .box-hero img.fallback-image {
+    margin-left: -15px;
+    display: none;
+  }
+
+  .box-hero p {
+    @include font_size (24);
+  }
+    .mwc-icons {
+        position: absolute;
+        margin: auto;
+        top: 0; left: 0; bottom: 0; right: 0;
+        margin-left: -15px;
+
+        li {
+          list-style-type: none;
+          position: absolute;
+            -moz-animation: pop-out 0.5s cubic-bezier(0.19, 1, 0.22, 1) forwards;
+            -webkit-animation: pop-out 0.5s cubic-bezier(0.19, 1, 0.22, 1) forwards;
+          -animation: pop-out 0.5s cubic-bezier(0.19, 1, 0.22, 1) forwards;
+          opacity: 0;
+          background-size: 0%;
+        }
+    }
+    .mwc-icons .icon-1 {
+        width: 144px;
+        height: 134px;
+        left: 0px;
+        top: 105px;
+        background: url('../img/homepage/mwc-app-icons/icon-1.png') no-repeat;
+        -moz-animation-delay: 1s;
+        -webkit-animation-delay: 1s;
+        -animation-delay: 1s;
+    }
+    .mwc-icons .icon-2 {
+        width: 144px;
+        height: 134px;
+        left: 156px;
+        top: 0px;
+        background: url('../img/homepage/mwc-app-icons/icon-2.png') 50% 50% no-repeat;
+        -moz-animation-delay: 1.1s;
+        -webkit-animation-delay: 1.1s;
+        -animation-delay: 1.1s;
+    }
+    .mwc-icons .icon-3 {
+        width: 100px;
+        height: 93px;
+        left: 156px;
+        top: 146px;
+        background: url('../img/homepage/mwc-app-icons/icon-3.png') 50% 50% no-repeat;
+        -moz-animation-delay: 1.15s;
+        -webkit-animation-delay: 1.15s;
+        -animation-delay: 1.15s;
+    }
+    .mwc-icons .icon-4 {
+        width: 144px;
+        height: 134px;
+        left: 112px;
+        top: 251px;
+        background: url('../img/homepage/mwc-app-icons/icon-4.png') 50% 50% no-repeat;
+        -moz-animation-delay: 1.2s;
+        -webkit-animation-delay: 1.2s;
+        -animation-delay: 1.2s;
+    }
+    .mwc-icons .icon-5 {
+        width: 100px;
+        height: 93px;
+        left: 312px;
+        top: 41px;
+        background: url('../img/homepage/mwc-app-icons/icon-5.png') 50% 50% no-repeat;
+        -moz-animation-delay: 1.25s;
+        -webkit-animation-delay: 1.25s;
+        -animation-delay: 1.25s;
+    }
+    .mwc-icons .icon-6 {
+        width: 144px;
+        height: 134px;
+        left: 312px;
+        top: 146px;
+        background: url('../img/homepage/mwc-app-icons/icon-6.png') 50% 50% no-repeat;
+        -moz-animation-delay: 1.3s;
+        -webkit-animation-delay: 1.3s;
+        -animation-delay: 1.3s;
+    }
+    .mwc-icons .icon-7 {
+        width: 100px;
+        height: 93px;
+        left: 268px;
+        top: 292px;
+        background: url('../img/homepage/mwc-app-icons/icon-7.png') 50% 50% no-repeat;
+        -moz-animation-delay: 1.35s;
+        -webkit-animation-delay: 1.35s;
+        -animation-delay: 1.35s;
+    }
+    .mwc-icons .icon-8 {
+        width: 144px;
+        height: 134px;
+        left: 468px;
+        top: 41px;
+        background: url('../img/homepage/mwc-app-icons/icon-8.png') 50% 50% no-repeat;
+        -moz-animation-delay: 1.4s;
+        -webkit-animation-delay: 1.4s;
+        -animation-delay: 1.4s;
+    }
+    .mwc-icons .icon-9 {
+        width: 100px;
+        height: 93px;
+        left: 468px;
+        top: 187px;
+        background: url('../img/homepage/mwc-app-icons/icon-9.png') 50% 50% no-repeat;
+        -moz-animation-delay: 1.45s;
+        -webkit-animation-delay: 1.45s;
+        -animation-delay: 1.45s;
+    }
+    .mwc-icons .icon-10 {
+        width: 144px;
+        height: 134px;
+        left: 380px;
+        top: 292px;
+        background: url('../img/homepage/mwc-app-icons/icon-10.png') 50% 50% no-repeat;
+        -webkit-animation-delay: 1.5s;
+        -moz-animation-delay: 1.5s;
+        -webkit-animation-delay: 1.5s;
+        -animation-delay: 1.5s;
+    }
+    .mwc-icons .icon-11 {
+        width: 100px;
+        height: 93px;
+        left: 580px;
+        top: 187px;
+        background: url('../img/homepage/mwc-app-icons/icon-11.png') 50% 50% no-repeat;
+        -moz-animation-delay: 1.55s;
+        -webkit-animation-delay: 1.55s;
+        -animation-delay: 1.55s;
+    }
+
+    &.no-cssanimations {
+      .mwc-icons {
+        display: none;
+      }
+      .fallback-image {
+        display: block;
+      }
+    }
+}
+/* Medium / Tablet viewport
+-------------------------------------------------------------- */
+@media only screen and (max-width : 986px) {
+  body.homepage {
+    #main-content .box-hero {
+      margin: 20px;
+    }
+    .homepage-features {
+      padding-left: 20px;
+      padding-right: 20px;
+    }
+  }
+}
+
+/* body.homepage-vmw2
+-------------------------------------------------------------- */
+body.homepage-vmw2 {
+  .box-hero {
+    @include rounded_corners(4px);
+    position: relative;
+    overflow: hidden;
+    background-image: url(../img/homepage/image-takeover-left.png);
+    background-repeat: no-repeat;
+    background-position: left 5px;
+  }
+
+  .hero {
+    background-image: url(../img/homepage/image-takeover-right.png);
+    background-repeat: no-repeat;
+    background-position: right 5px;
+    @include rounded_corners(4px);
+    padding-top: 30px;
+    padding-bottom: 10px;
+    overflow: hidden;
+    padding-left: 20px;
+    height: 420px;
+  }
+
+  .box-hero {
+    img {
+      position: absolute;
+      bottom: 0;
+    }
+    img.webinar {
+      top: 35px;
+      right: -155px;
+    }
+  }
+
+  .box-hero h1 {
+    font-size: 3.125em;
+    padding-top: 80px;
+    margin-bottom: 20px;
+    line-height: 1.2;
+  }
+
+  .box-hero .tagline {
+    @include font_size (24);
+    line-height: 1.4;
+    margin-bottom: 5px;
+  }
+
+  .box-hero .hero {
+    border-bottom: 0;
+    border-right: 0;
+  }
+
+  .box-hero div .copy {
+      margin-left: $gutter-width;
+  }
+
+  .box-hero .share-this {
+    padding-top: 0;
+  }
+
+  .box-hero p {
+    font-size: 22px;
+    line-height: 1.4em;
+  }
+
+  a.hidden {
+      display: block;
+      height: 306px;
+      left: 0;
+      position: absolute;
+      top: 0;
+      width: 301px;
+  }
+}
+
+/* body.homepage-kylin
+-------------------------------------------------------------- */
+body.homepage-kylin {
+  .box-hero {
+    @include rounded_corners(4px);
+    position: relative;
+    overflow: hidden;
+    background-image: url(../img/homepage/image-takeover-left.png);
+    background-repeat: no-repeat;
+    background-position: left 5px;
+  }
+
+  .hero {
+    background-image: url(../img/homepage/image-takeover-right.png);
+    background-repeat: no-repeat;
+    background-position: right 5px;
+    @include rounded_corners(4px);
+    padding-top: 30px;
+    padding-bottom: 10px;
+    overflow: hidden;
+    padding-left: 20px;
+  }
+
+  .copy {
+    padding: 60px 0 0 20px;
+  }
+
+  h1 {
+    font-size: 2em;
+    margin-bottom: 0.5em;
+  }
+  .nav-secondary {
+    padding: 0;
+  }
+
+  a.link-cta-ubuntu {
+    margin-top: 10px;
+  }
+
+  .row-image-centered {
+    padding-right: 40px;
+  }
+
+  .homepage-features {
+    .box-feature-three {
+      background-image: url(../img/homepage/kylin/screenshot-landscape-288-160.jpg);
+      background-position: right bottom;
+    }
+  }
+
+  .lang-switch {
+    margin-bottom: -40px;
+  }
+
+  @media only screen and (min-width : 768px) {
+    .row-image-centered {
+      padding-right: 80px;
+    }
+  }
+
+  @media only screen and (min-width : 984px) {
+    h1 {
+      font-size: 3em;
+    }
+  }
+}
+
+/* body.homepage-juju-bundles
+-------------------------------------------------------------- */
+body.homepage-juju-bundles {
+
+  .hero {
+    padding-top: 30px;
+    padding-bottom: 10px;
+    overflow: hidden;
+
+    .juju-logo {
+      margin-bottom: 20px;
+    }
+
+    @media only screen and (min-width : 768px) {
+      .juju-logo {
+        margin-top: 30px;
+      }
+    }
+
+    span img {
+      margin-top: 15px;
+    }
+  }
+
+  .row-aux {
+    h2 {
+      @include font_size (21);
+    }
+    .four-col.last-col {
+      margin-bottom: 0;
+    }
+  }
+}
+
+/* body.homepage-gigaom
+-------------------------------------------------------------- */
+body.homepage-gigaom {
+  .box-hero {
+    @include rounded_corners(4px);
+    position: relative;
+    overflow: hidden;
+    background-image: url(../img/homepage/image-takeover-left.png);
+    background-repeat: no-repeat;
+    background-position: left 5px;
+  }
+
+  .hero {
+    background-image: url(../img/homepage/image-takeover-right.png);
+    background-repeat: no-repeat;
+    background-position: right 5px;
+    @include rounded_corners(4px);
+    padding-top: 30px;
+    padding-bottom: 10px;
+    overflow: hidden;
+    padding-left: 20px;
+    height: 420px;
+  }
+
+  .box-hero {
+    img {
+      position: absolute;
+      bottom: 0;
+    }
+    img.openstack {
+      top: 32px;
+      right: -18px;
+    }
+  }
+
+  .box-hero h1 {
+    font-size: 3.125em;
+    margin-bottom: 20px;
+    line-height: 1.2;
+  }
+
+  .box-hero .tagline {
+    font-size: 1.5em;
+    margin-bottom: 0.5em;
+    line-height: 1.4;
+    margin-bottom: 10px;
+  }
+
+  .box-hero .hero {
+    border-bottom: 0;
+    border-right: 0;
+  }
+
+  .box-hero div .copy {
+      padding-top: 40px;
+      margin-left: $gutter-width;
+      height: 390px;
+  }
+
+  .box-hero .logo {
+    position: absolute;
+    bottom: 0;
+  }
+}
+
+/* body.homepage-1404
+-------------------------------------------------------------- */
+body.homepage-1404 {
+  .wrapper {
+    width: 100%;
+    background: none;
+  }
+  .cookie-policy .wrapper {
+    width: auto;
+  }
+  #main-content {
+    padding-bottom: 0;
+    margin-bottom: 0;
+  }
+  .strip-inner-wrapper {
+    background: none;
+    border: none;
+    margin: 0;
+    padding: 0 8px;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+    box-sizing: border-box;
+    margin: 0 auto;
+    max-width: 984px;
+    float: none;
+  }
+  .row {
+    padding-left: 0;
+    padding-right: 0;
+  }
+  .row-popular-cloud {
+    img.for-mobile {
+      margin: 0 auto;
+    }
+  }
+  .row-favourite-desktop {
+    -webkit-box-shadow: inset 0px -5px 6px -4px rgba(0, 0, 0, 0.2), inset 0px 5px 6px -4px rgba(0, 0, 0, 0.2);
+    -moz-box-shadow: inset 0px -5px 6px -4px rgba(0, 0, 0, 0.2), inset 0px 5px 6px -4px rgba(0, 0, 0, 0.2);
+    box-shadow: inset 0px -5px 6px -4px rgba(0, 0, 0, 0.2), inset 0px 5px 6px -4px rgba(0, 0, 0, 0.2);
+    overflow: hidden;
+    img.overflow {
+      display: none;
+    }
+    img {
+      width: 100%;
+      zoom: 1;
+    }
+  }
+
+  footer.global {
+    -moz-box-shadow: none;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+  }
+
+  @media only screen and (min-width : 768px) {
+    .strip-inner-wrapper {
+      padding: 0 30px;
+    }
+    .row-popular-cloud {
+      h1 {
+        margin-top: 60px;
+      }
+      img.for-tablet {
+        display: block;
+        float: right;
+      }
+    }
+    .row-favourite-desktop {
+      height: 360px;
+      h1 {
+        margin-top: 40px;
+      }
+      .browser {
+        margin-left: 50%;
+        width: 100%;
+        height: 360px;
+        margin-top: -30px;
+        background-image: url(../img/homepage/1404/image-bbc-medium.png);
+        background-size: 90%;
+        background-repeat: no-repeat;
+        background-position: 10px 40px;
+      }
+    }
+  }
+  @media only screen and (min-width : 984px) {
+    .row {
+      height: 540px;
+    }
+    .strip-inner-wrapper {
+      padding: 0;
+    }
+    .cookie-policy .wrapper {
+      width: 984px;
+    }
+    .row-popular-cloud {
+      h1 {
+        margin-top: 18px;
+      }
+    }
+    .row-favourite-desktop {
+      height: 540px;
+      h1 {
+        margin-top: 60px;
+      }
+      .browser {
+        height: 540px;
+        margin-top: -60px;
+        background-position: 10px 60px;
+        background-size: auto;
+      }
+    }
+  }
+}
+
+/* body.homepage
+-------------------------------------------------------------- */
+body.homepage {
+  .wrapper {
+    width: 100%;
+    background: none;
+  }
+  .cookie-policy .wrapper {
+    width: auto;
+  }
+  #main-content {
+    padding-bottom: 0;
+    margin-bottom: 0;
+  }
+  .strip-inner-wrapper {
+    background: none;
+    border: none;
+    margin: 0;
+    padding: 0 8px;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+    box-sizing: border-box;
+    margin: 0 auto;
+    max-width: 984px;
+    float: none;
+  }
+  .row {
+    padding-left: 0;
+    padding-right: 0;
+  }
+
+  .row-aux {
+    a {
+      display: block;
+    }
+    a:hover,
+    a:active {
+      text-decoration: none;
+    }
+    a:hover h2,
+    a:active h2 {
+      text-decoration: underline;
+    }
+    img {
+      width: 100%;
+    }
+    h2 {
+      @include font_size (21);
+    }
+  }
+
+
+  @media only screen and (min-width : 768px) {
+    .strip-inner-wrapper {
+      padding: 0 30px;
+    }
+    .number-one-for-cloud {
+      position: relative;
+    }
+  }
+  @media only screen and (min-width : 984px) {
+    .row {
+      padding: 40px 0;
+    }
+    .strip-inner-wrapper {
+      padding: 0;
+    }
+    .cookie-policy .wrapper {
+      width: 984px;
+    }
+    .row-aux {
+      img {
+        width: 260px;
+      }
+    }
+  }
+}
+
+.homepage-ods-2014 {
+
+  @media only screen and (min-width : 768px) {
+    .five-col {
+      padding-top: 30px;
+    }
+    #main-content h1 {
+      font-size: 3.2em;
+    }
+  }
+  @media only screen and (min-width : 984px) {
+    .five-col {
+      padding-top: 30px;
+    }
+    #main-content h1 {
+      margin-top: 50px;
+    }
+  }
+}
+
+
+.homepage-mae-2014 {
+	.box {
+  	@include rounded_corners(0);
+		border: none;
+		border-top: 1px dotted #AEA79F;
+		background-color: none;
+		background: none;
+		margin-top: 20px;
+		padding: 20px 0 0;
+	}
+
+  @media only screen and (min-width : 768px) {
+    .five-col {
+      padding-top: 10px;
+    }
+    #main-content h1 {
+      margin-top: 20px;
+      font-size: 2.1em;
+    }
+  }
+  @media only screen and (min-width : 984px) {
+    .five-col {
+      padding-top: 60px;
+    }
+     #main-content h1 {
+      margin-top: 0;
+      font-size: 2.5em;
+    }
+  }
+}
+
+body.homepage-kylin {
+	.box {
+  	@include rounded_corners(0);
+		border: none;
+		border-top: 1px dotted #AEA79F;
+		background-color: none;
+		background: none;
+		margin-top: 20px;
+		padding: 20px 0 0;
+	}
+
+} // body.homepage-kylin
+
+  @media only screen and (min-width : 984px) {
+.homepage {
+    header.banner {
+      margin-bottom: 5px;
+    }
+    #main-content h1 {
+    }
+    .takeover {
+      overflow: hidden;
+
+      img.background {
+        width: auto;
+        float: none;
+        left: 38%;
+        position: absolute;
+        top: 0;
+        z-index: 1;
+      }
+      .four-col {
+        padding: 75px 0 0;
+        margin: 0;
+
+        img {
+          padding-top: 90px;
+        }
+      }
+    }
+  }
+ }
+
+  .index_kylin {
+    .lang-switch-wrapper {
+      padding-bottom: 0;
+    }
+
+    @media only screen and (min-width : 768px) {
+      .five-col {
+        padding-top: 0;
+      }
+      #main-content h1 {
+        margin-top: 0;
+        font-size: 2.1em;
+      }
+    }
+    @media only screen and (min-width : 984px) {
+      .five-col {
+        padding-top: 0;
+      }
+      #main-content h1 {
+        margin-top: 0;
+        font-size: 2.5em;
+      }
+    }
+  }
+
+
+body.homepage-jumpstart-takeover {
+	h1 {
+		padding-top: 30px;
+	}
+} //body.homepage-jumpstart-takeover
+
+body.homepage-cloud-default {
+	@media only screen and (min-width : 768px) {
+		.row-popular-cloud {
+			padding: 20px 0 0;
+		}
+		h1 {
+			padding-top: 90px;
+		}
+	}
+	@media only screen and (min-width : 984px) {
+		.row-popular-cloud {
+			padding: 10px 0;
+		}
+		h1 { padding-top: 105px; }
+		.intro { font-size: 23px; }
+	} // @media only screen and (min-width : 984px)
+} // body.homepage-cloud-default
+
+body.openstack-summit-paris-takeover {
+  @media only screen and (min-width : 768px) {
+    h1 {
+      margin-top: 15%;
+    }
+    .openstack-paris {
+      margin-bottom: 10px;
+    }
+  }
+} //body.openstack-summit-paris-takeover
\ No newline at end of file
diff --git a/static/css/section/legal.scss b/static/css/section/legal.scss
new file mode 100755
index 00000000000..6bbcba38096
--- /dev/null
+++ b/static/css/section/legal.scss
@@ -0,0 +1,96 @@
+@charset "UTF-8";
+/* ---------------------------------------------------------------
+------------------------------------------------------------------
+	DO NOT EDIT STYLES.CSS
+	It is autogenerated.
+
+	Project:		Ubuntu Front-End Cloud section
+	Author:			Web Team at Canonical Ltd
+	Last edited by:
+	Last edited on:
+
+  	CONTENTS:
+	-----------------------------------------------------------------
+	@section cloud
+		@subsection cloud > insights
+		@subsection cloud > public-cloud
+		@subsection cloud > private-cloud
+		@subsection cloud > orchestration
+		@subsection cloud > solutions
+		@subsection cloud > tools
+
+		Medium / Tablet viewport
+		Large / Desktop viewport
+
+		$ubuntu-orange:			  #dd4814; /* ubuntu orange (used for text links also on any site except canonical)
+		$light-orange:        #fdf6f2; - used as background on pre text
+		$canonical-aubergine:	#772953; - canonical aubergine
+		$light-aubergine:		  #77216f; - light aubergine (consumer)
+		$mid-aubergine:			  #5e2750; - mid aubergine (both)
+		$dark-aubergine:		  #2c001e; - dark aubergine (enterprise)
+		$warm-grey:				    #aea79f; - warm grey
+		$cool-grey:				    #333333; - cool grey
+		$light-grey:			    #f7f7f7; - light grey
+
+------------------------------------------------------------------
+-------------------------------------------------------------- */
+
+/* assets database path */
+$asset-path: "//assets.ubuntu.com/sites/ubuntu/latest/u/img/";
+/* usage: background: url(#{$asset-path}/backgrounds/background.jpg) no-repeat 0 0; */
+
+/* home
+-------------------------------------------------------------- */
+.legal {
+	table td {
+		text-align: left;
+	}
+
+	.offstate-c,
+	.offstate-d {
+		display: none;
+	}
+
+	.row-you-will-find {
+		h3 {
+			background-size: 2em 2em;
+			padding-top: .5em;
+			padding-bottom: .5em;
+			padding-left: 2.5em;
+			background-position: left center;
+			background-repeat: no-repeat;
+		}
+
+		.web-terms {
+			background-image: url('http://assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/picto-pack/picto-internet-warmgrey.svg');
+		}
+
+		.ubuntu-advantage {
+			background-image: url('http://assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/picto-pack/picto-discussion-warmgrey.svg');
+		}
+
+		.contributors {
+			background-image: url('http://assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/picto-pack/picto-business-warmgrey.svg');
+		}
+
+		a:hover {
+			.web-terms {
+				background-image: url('http://assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/picto-pack/picto-internet-orange.svg');
+			}
+
+			.ubuntu-advantage {
+				background-image: url('http://assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/picto-pack/picto-discussion-orange.svg');
+			}
+
+			.contributors {
+				background-image: url('http://assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/picto-pack/picto-business-orange.svg');
+			}
+		}
+	}
+
+	@media only screen and (min-width : 769px) {
+		img.priority-0 {
+			display: inline;
+		}
+	}
+}
\ No newline at end of file
diff --git a/static/css/section/local.scss b/static/css/section/local.scss
new file mode 100755
index 00000000000..4e3c442f4ac
--- /dev/null
+++ b/static/css/section/local.scss
@@ -0,0 +1,713 @@
+
+/*
+ * Cookie policy style updates
+ * To be updated in core-patterns
+ */
+footer.global .legal.has-cookie {
+  /* if the cookie message is being displayed add padding so the legal links are still visible */
+  padding-bottom: 70px;
+}
+
+.cookie-policy {
+  @include box_shadow(0 -1px 2px rgba(0, 0, 0, 0.2));
+  background-color: #fae4dc;
+  bottom: 0;
+  position: fixed;
+  width: 100%;
+  z-index: 100;
+
+  .wrapper {
+    background: transparent;
+  }
+
+  p {
+    @include box_sizing();
+    font-size: 13px;
+    margin-bottom: 0;
+    margin-left: 0;
+    padding: 8px 10px;
+    width: 100%;
+  }
+
+  .link-cta {
+    background-image: url(../img/icons/close-orange.svg);
+    background-repeat: no-repeat;
+    color: #fff;
+    float: right;
+    font-size: 1em;
+    height: 15px;
+    margin: 12px 10px;
+    margin-top: 12px;
+    padding: 0;
+    text-decoration: none;
+    text-indent: -9999px;
+    width: 16px;
+  }
+}
+html.no-svg,
+html.opera-mini {
+  .cookie-policy .link-cta {
+    background-image: url(../img/icons/close-orange.png);
+  }
+}
+html.opera-mini {
+  .cookie-policy {
+    position: relative;
+    top: 0;
+  }
+}
+
+/* resource hub content */
+.resource {
+    -moz-transition: background .2s ease-out;
+    -webkit-transition: background .2s ease-out;
+  transition: background .2s ease-out;
+  position: relative;
+  cursor: pointer;
+  padding-bottom: 40px;
+
+  &.four-col h2 {
+    a:link,
+    a:visited { font-size: 1.125em; /* 36 / 32 */ }
+  }
+
+  &.twelve-col h2 {
+    a:link,
+    a:visited { font-size: 1.40625em; /* 36 / 32 */ }
+  }
+  &:hover { background-color: #fafafa; }
+
+  &:after {
+      -moz-transition: all .2s ease-out;
+      -webkit-transition: all .2s ease-out;
+    transition: all .2s ease-out;
+    content: "";
+    position: absolute;
+    z-index: 2;
+    right: -6px;
+    top: 14px;
+    height: 1px;
+    width: 41px;
+    -ms-transform:rotate(45deg);
+    -webkit-transform:rotate(45deg);
+    transform:rotate(45deg);
+      -moz-box-shadow: 0 -1px 2px 0 #ddd;
+      -webkit-box-shadow: 0 -1px 2px 0 #ddd;
+    box-shadow: 0 -1px 2px 0 #ddd;
+  }
+  &:hover:after {
+    right: -9px;
+    top: 18px;
+    width: 48px;
+  }
+  &:before {
+    content: "";
+    position: absolute;
+      -moz-transition: border-width .2s ease-out;
+      -webkit-transition: border-width .2s ease-out;
+    transition: border-width .2s ease-out;
+    top: -2px;
+    right: -3px;
+    width: 0px;
+    height: 0px;
+    border-bottom: 30px solid #fdfdfd;
+    border-right: 30px solid #fff;
+    -webkit-box-shadow: -2px 2px 2px rgba(176, 176, 176, 0.4);
+    -moz-box-shadow: -2px 2px 2px rgba(176, 176, 176, 0.4);
+    box-shadow: -2px 2px 2px rgba(176, 176, 176, 0.4);
+    z-index: 2;
+    @include rounded_corners(0 0 0 0);
+  }
+  &:hover:before {
+    border-bottom-width: 35px;
+    border-right-width: 35px;
+  }
+  &:last-of-type {
+    margin-bottom: 30px;
+  }
+  .content-cat {
+    color: $warm-grey;
+    font-size: 14px;
+    letter-spacing: 1px;
+    margin: 0;
+    padding: 0;
+    padding-left: 20px;
+    position: absolute;
+    text-transform: uppercase;
+  }
+  .content-cat {
+    background: url("../img/icons/icon-resource-hub-icon-document.png") left center no-repeat;
+  }
+  .content-cat-webinar {
+    background: url("../img/icons/icon-resource-hub-webinar.png") left center no-repeat;
+  }
+  &.box-image-centered div + span img {
+    margin-top: 40px;
+  }
+}
+html.yui3-js-enabled .resource:hover a {
+  text-decoration: underline;
+}
+.row-grey .resource:before {
+  border-right-color: #F7F7F7;
+}
+
+footer.global {
+	.footer-a {
+		display: block;
+		border-bottom: 1px solid #d8d8d8;
+		clear: both;
+
+		ul li {
+			border-right: 1px dotted $warm-grey;
+			display: table-cell;
+			float: none;
+			margin-left: 0;
+			padding-bottom: 0;
+			padding-left: 0;
+			padding-right: 0;
+			width: auto;
+			width: 124px;
+		}
+
+		ul li.secondary-desktop {
+			width: 128px;
+		}
+
+		ul li.secondary-server {
+			width: 118px;
+		}
+
+		ul li.secondary-tablet {
+			width: 123px;
+		}
+
+		ul li.secondary-cloud {
+			width: 115px;
+		}
+
+		ul li.secondary-tv {
+			width: 115px;
+		}
+
+		ul li.secondary-management {
+			width: 143px;
+		}
+
+		ul li:last-child, ul li.last-item {
+			border: 0;
+			padding-right: 0;
+		}
+
+		ul ul {
+			margin-left: 0;
+			display: block;
+		}
+
+		li li {
+			margin-left: 0;
+			float: none;
+			width: auto;
+			display: block;
+			min-height: 0;
+			border: 0;
+			margin-bottom: 2px;
+			padding-left: 0;
+			padding-bottom: inherit;
+			background: none;
+		}
+
+		li li:last-child {
+			margin-bottom: 0;
+		}
+
+		li li a {
+			display: block;
+		}
+
+		#nav-global li:first-of-type a {
+			margin-left: 0;
+		}
+
+	}/* end footer-a */
+
+	.footer-b {
+		padding: 0 0 20px;
+		margin: 0 auto;
+
+		ul ul, ul li, ul ul, h2, h2 a {
+			margin: 0;
+			padding: 0;
+			line-height: 2;
+			width: auto;
+			float: none;
+		}
+		h2 {
+			float: left;
+			margin-right: 6px;
+			display: inline;
+
+			a i {
+				font-style: normal;
+				display: none;
+			}
+		}
+		li {
+			width: 100%;
+			display: block;
+			clear: both;
+			overflow: hidden;
+		}
+		li li {
+			width: auto;
+			background: 0;
+			float: left;
+			clear: none;
+		}
+		li li:last-child {
+			width: 200px;
+		}
+		li li:after {
+			content: "|";
+			padding-left: 6px;
+			padding-right: 6px;
+			position: relative;
+		}
+		li h2 a:after,
+		li li:last-child:after  {
+				content: "";
+		}
+
+	}/* end footer-b */
+}
+
+nav div.footer-a div {
+	/* Can be removed once live */
+	margin: 0 auto;
+	width: 100%; /* 980px / 15px (baseline font); 980px + (60px x 2) = 1100px */
+}
+
+html.no-svg,
+html.opera-mini {
+  footer.global .footer-a ul li h2 span,
+  footer.global .footer-a ul li.secondary-cloud h2 span,
+  footer.global .footer-a ul li.secondary-desktop h2 span,
+  footer.global .footer-a ul li.secondary-management h2 span,
+  footer.global .footer-a ul li.secondary-phone h2 span,
+  footer.global .footer-a ul li.secondary-server h2 span,
+  footer.global .footer-a ul li.secondary-tablet h2 span,
+  footer.global .footer-a ul li.secondary-tv h2 span,
+  footer.global .footer-b ul li h2 span,
+  footer.global .footer-b ul li.secondary-cloud h2 span,
+  footer.global .footer-b ul li.secondary-desktop h2 span,
+  footer.global .footer-b ul li.secondary-management h2 span,
+  footer.global .footer-b ul li.secondary-phone h2 span,
+  footer.global .footer-b ul li.secondary-server h2 span,
+  footer.global .footer-b ul li.secondary-tablet h2 span,
+  footer.global .footer-b ul li.secondary-tv h2 span {
+    background-image: url("../img/arrow_down_9fa097.png");
+  }
+  footer.global .footer-a ul li h2.active span,
+  footer.global .footer-a ul li.secondary-cloud h2.active span,
+  footer.global .footer-a ul li.secondary-desktop h2.active span,
+  footer.global .footer-a ul li.secondary-management h2.active span,
+  footer.global .footer-a ul li.secondary-phone h2.active span,
+  footer.global .footer-a ul li.secondary-server h2.active span,
+  footer.global .footer-a ul li.secondary-tablet h2.active span,
+  footer.global .footer-a ul li.secondary-tv h2.active span,
+  footer.global .footer-b ul li h2.active span,
+  footer.global .footer-b ul li.secondary-cloud h2.active span,
+  footer.global .footer-b ul li.secondary-desktop h2.active span,
+  footer.global .footer-b ul li.secondary-management h2.active span,
+  footer.global .footer-b ul li.secondary-phone h2.active span,
+  footer.global .footer-b ul li.secondary-server h2.active span,
+  footer.global .footer-b ul li.secondary-tablet h2.active span,
+  footer.global .footer-b ul li.secondary-tv h2.active span {
+    //background-image: url("../img/arrow_up_9fa097.png");
+  }
+  footer.global .top-link a {
+    background-image: url("../img/pictograms/picto-pack/picto-upload-warmgrey.png");
+  }
+  .nav-secondary ul.breadcrumb li .after {
+    background-image: url("../img/patterns/nav-down-arrow.png");
+  }
+  .nav-secondary.open ul.breadcrumb li .after {
+    background-image: url("../img/patterns/nav-up-arrow.png"), none;
+  }
+}
+
+@media only screen and (max-width : 768px) {
+  footer.global {
+    overflow: hidden;
+    padding-top: 0;
+
+    .footer-a,
+    .footer-b {
+      display: block;
+      border-bottom: 0;
+      margin-bottom: 0;
+      padding-bottom: 0;
+
+      .clearfix {
+        padding-bottom: 0;
+      }
+
+      ul {
+        margin-left: 0;
+        margin-right: -10px;
+      }
+
+      ul li.secondary-cloud,
+      ul li.secondary-server,
+      ul li.secondary-desktop,
+      ul li.secondary-phone,
+      ul li.secondary-tablet,
+      ul li.secondary-tv,
+      ul li.secondary-management,
+      ul li {
+				border-bottom: 1px solid #D4D7D4;
+        width: 100%;
+        display: block;
+        border-right: 0;
+        border-left: 0;
+        margin-bottom: 0;
+        float: left;
+        padding: 0;
+        overflow: visible;
+        margin-left: -10px;
+        margin-right: -10px;
+				padding-left: 10px;
+
+        &.last-item {
+          padding-bottom: 0;
+        }
+
+        h2 {
+         	@include box_sizing();
+         	margin: 0 0 10px 0;
+          padding: 10px 0;
+          width: 100%;
+          cursor: pointer;
+          margin-bottom: 0;
+          display: inline-block;
+          float: left;
+          background-image: url("../img/arrow_down_9fa097.svg");
+          background-position: 96% 50%;
+          background-repeat: no-repeat;
+          background-size: 13px 13px;
+
+          &.active {
+          	background-image: url("../img/arrow_up_9fa097.svg");
+          }
+
+          &.active + ul.second-level-nav {
+						margin-bottom: -1px;
+						border-top: 1px solid #D4D7D4;
+						float: left;
+					}
+
+          a:link,
+          a:visited {
+            color: $warm-grey;
+            letter-spacing: 0.05em;
+            margin: 0;
+            text-transform: uppercase;
+            margin-top: 8px;
+          }
+          a:hover {
+            color: $warm-grey;
+            text-decoration: none;
+          }
+          span {
+            background-image: url("../img/arrow_down_9fa097.svg");
+            background-position: 0 2px;
+            background-repeat: no-repeat;
+            background-size: 100% 100%;
+            clear: none;
+            display: block;
+            float: right;
+            height: 13px;
+            margin-left: 6px;
+            width: 13px;
+            top: 10px;
+            right: 10px;
+            position: absolute;
+            z-index: -3;
+          }
+          .secondary-management,
+          & + ul.second-level-nav {
+            display: none;
+          }
+          &.active + ul.second-level-nav {
+            display: block;
+          }
+        }
+
+        ul.second-level-nav {
+          //margin-left: -10px;
+          //padding-right: 25px;
+          float: left;
+          width: 100%;
+          margin-left: -10px;
+          margin-right: -10px;
+          padding-left: 10px;
+
+          li {
+            border-bottom: 0;
+            display: block;
+            margin: 0;
+            padding: 0;
+            /*width: 50%;*/
+            width: 100%;
+            float: left;
+            padding-right: 10px;
+
+
+            a {
+              //margin-left: -15px;
+              border-bottom: 1px solid #D4D7D4;
+              color: #333333;
+              display: block;
+              float: left;
+              font-size: 1.166em;
+              margin-bottom: 0;
+              overflow: hidden;
+              padding: 8px 0 8px 20px;
+              margin-left: -10px;
+              text-align: left;
+              white-space: normal;
+              width: 100%;
+            }
+          }
+          li:after {
+            content: "";
+            padding-left: 0;
+            padding-right: 0;
+            position: static;
+          }
+        }
+      }
+      ul li.secondary-management h2 span {
+        margin-right: -15px;
+      }
+    }
+    .footer-b {
+      ul li {
+        line-height: 1;
+
+        h2 {
+        margin-left: 0;
+        margin-top: 0;
+        line-height: 1;
+
+          a {
+            line-height: 1;
+          }
+
+          span {
+            margin-right: 0;
+          }
+
+          li {
+            margin-left: 30px;
+          }
+        }
+        ul.second-level-nav li a {
+          margin-left: 0;
+          padding: 10px 20px;;
+        }
+        ul.second-level-nav li {
+          padding-right: 10px;
+        }
+      }
+      ul.second-level-nav {
+        margin-left: -10px;
+        margin-right: -25px;
+      }
+      ul li:first-of-type h2 {
+        border-top: 0;
+      }
+      ul li:last-of-type h2 {
+        border-bottom: 0;
+      }
+    }
+  }
+  footer #nav-global {
+    padding-top: 0;
+    margin-top: 0;
+  }
+}
+
+
+html.opera-mini,
+html.no-svg {
+  footer #nav-global {
+    h2 span {
+      background-image: url("../img/arrow_down_9fa097.png");
+    }
+    h2.active span {
+      background-image: url("../img/arrow_up_9fa097.png");
+    }
+    h2:before {
+      background-image: url('../img/external-link.png');
+    }
+  }
+}
+
+footer.global ul.inline li:after {
+  content: "•";
+}
+
+#livechat-full,
+#livechat-compact-container {
+  display: none;
+}
+
+
+/* Medium / Tablet viewport
+-------------------------------------------------------------- */
+@media only screen and (min-width : 768px) {
+	footer.global .legal.has-cookie {
+	  /* if the cookie message is being displayed add padding so the legal links are still visible */
+	  padding-bottom: 40px;
+	}
+
+  .resource .content-cat {
+    bottom: 16px;
+    left: 20px;
+  }
+
+  #nav-global,
+  #livechat-full,
+  #livechat-compact-container  {
+    display: block;
+      -moz-box-shadow: none;
+      -webkit-box-shadow: none;
+    box-shadow: none;
+  }
+  footer #nav-global {
+    display: none;
+  }
+
+  footer #nav-global div {
+    display: none;
+  }
+
+  footer #nav-global .nav-global-wrapper ul {
+    margin-left: 10px;
+  }
+
+  footer #nav-global .nav-global-wrapper ul ul {
+    margin-left: 0;
+  }
+  footer.global {
+    .two-col {
+      width: 14.89361%;
+      display: inline-block;
+      min-height: 0;
+    }
+  }
+	footer.global .footer-a {
+		//padding-bottom: 20px;
+		//margin-bottom: 20px;
+
+	}
+}
+
+@media only screen and (min-width : 769px) {
+	footer.global .footer-a {
+		padding-bottom: 20px;
+		margin-bottom: 20px;
+
+		ul {
+			margin-left: -15px;
+		}
+			div {
+			padding-bottom: 10px;
+		}
+		h2 {
+			padding-left: 15px;
+		}
+		ul {
+			//margin-left: -15px;
+			padding-left: 15px;
+			border-collapse: collapse;
+			display: table;
+			float: none;
+			padding-bottom: 0;
+			width: 100%;
+		}
+		ul li {
+			border-right: 1px dotted $warm-grey;
+		}
+
+		ul li a {
+			padding-right: 20px;
+		}
+
+		ul li li {
+			border: 0;
+		}
+}
+}
+
+@media only screen and (max-width : 800px) and (min-width : 769px) {
+	header.banner nav.nav-primary {
+		ul li a:active,
+		ul li a:hover,
+		ul li a:visited,
+		ul li a:link {
+			padding: 12px 12px 14px;
+			transition: padding .4s;
+		}
+	}
+}
+
+@media only screen and (max-width : 768px) {
+  header.banner {
+    .search-toggle {
+    	right: 48px;
+    }
+   }
+}
+
+
+/* @section Large / Desktop viewport
+-------------------------------------------------------------- */
+@media only screen and (min-width : 984px) {
+	footer.global nav div.footer-a div,
+	footer.global .footer-b,
+	footer.global .footer-b,
+	footer.global .inline-lists ul {
+		width: 984px; /* 980px / 15px (baseline font); 980px + (60px x 2) = 1100px */
+	}
+
+	footer.global .legal.has-cookie {
+	  /* if the cookie message is being displayed add padding so the legal links are still visible */
+	  padding-bottom: 30px;
+	}
+  .cookie-policy p {
+    padding-left: 0;
+    padding-right: 0;
+  }
+  #nav-global li.more a {
+    text-indent: 0;
+    display: block;
+  }
+  footer.global {
+    padding-top: 40px;
+
+    .row {
+      padding-left: 40px;
+      padding-right: 40px;
+    }
+  }
+
+  footer.global .footer-b li h2 a:after { content: ":"; }
+
+} // end @media only screen and (min-width : 984px)
+
+#context-footer div div.feature-one { display: table-cell; }
+
+#context-footer div div.feature-two { padding-left: 0; }
+
diff --git a/static/css/section/management.scss b/static/css/section/management.scss
new file mode 100755
index 00000000000..f061c2047c5
--- /dev/null
+++ b/static/css/section/management.scss
@@ -0,0 +1,485 @@
+/*	@section management ubuntu.com/management
+--------------------------------------------------------------
+	Contents:
+		@section general
+		@section management-landscape-features
+		@section ubuntu-advantage
+		@section return-on-investment
+		@section working-with-landscape
+		@section desktop, server and cloud management pages in other sections
+
+-------------------------------------------------------------- */
+
+/*	@section general
+-------------------------------------------------------------- */
+body.management .row-hero { /* First bit of content on a page, normally contains h1 and sometimes a bit of blurb */
+	position: relative;
+}
+
+body.management {
+	.row-benefits .six-col {
+		border-right: 1px dotted $warm-grey;
+		padding-right: $gutter-width;
+	}
+	.row-benefits .last-col {
+		border: 0;
+		padding-right: 0;
+	}
+	.stats-panel {
+		@include box_sizing();
+		background: #f6f6f6;
+		padding-top: 1.5em;
+	}
+	.stats-panel dl, .stat dl {
+		@include box_sizing();
+	    float: left;
+	    min-height: 107px;
+	    padding: 20px 0 0;
+	    text-align: center;
+	}
+	.stats-panel dl.last-col {
+		border: 0;
+	}
+	.stat dl {
+    	padding-top: 6px;
+		border: 0;
+		font-size: 32px;
+		text-align: center;
+    }
+
+	.stats-panel dt, .stat dt {
+	    font-size: 2.7em;
+	    font-weight: normal;
+	    height: 20px;
+	    line-height: 20px;
+	    margin: 20px 0 40px;
+	    color: $canonical-aubergine;
+	}
+	.stats-panel dd, .stat dd {
+		margin-left: 0;
+	}
+	.stats-panel p {
+    	color: #555;
+    	@include font_size (21);
+    	font-style: italic;
+    	text-align: center;
+    	clear: both;
+    	padding: 0 ($grid-gutter/1.5);
+    }
+    .stats-panel p.first {
+	    font-style: normal;
+    }
+    .stats-panel dt span {
+    	@include font_size (8.5);
+    	margin-left: -15px;
+    }
+	.row-landscape {
+		margin-bottom: 0;
+	}
+	.row-image-float-right p {
+		width: $eight-col;
+	}
+} /* end body.management */
+body.management-return-on-investment,
+body.management-compliance {
+	.row-hero {
+		.link-cta-canonical {
+			margin-bottom: 10px;
+		}
+	}
+	.stats-panel dt, .stat dt {
+	    font-size: 5em;
+	}
+}
+body.management-home {
+	#main-content .row-whats-included {
+		position: relative;
+	}
+	.row-whats-included {
+		overflow: hidden;
+		h3 {
+			background-image: url("../img/pictograms/picto-pack/picto-reducecosts-warmgrey.svg");
+			background-position: 0 center;
+			background-repeat: no-repeat;
+			background-size: 40px 40px;
+			padding: 6px 0 10px 50px;
+			margin-top: 18px;
+		}
+		.priority-0 {
+			bottom: 0;
+			float: none;
+			margin: 0;
+			padding: 0;
+			position: absolute;
+			top: 0;
+			right: -40px;
+		}
+	}
+
+	.support h3 {
+		background-image: url("../img/pictograms/picto-pack/picto-support-warmgrey.svg");
+		background-position: 0 center;
+		background-repeat: no-repeat;
+		background-size: 40px 40px;
+		padding: 10px 0 10px 50px;
+	}
+	.technical-library h3 {
+		background-image: url("../img/pictograms/picto-pack/picto-articles-warmgrey.svg");
+		background-position: 0 center;
+		background-repeat: no-repeat;
+		background-size: 40px 40px;
+		padding: 10px 0 10px 50px;
+	}
+	.legal-assurance h3 {
+		background-image: url("../img/pictograms/picto-pack/picto-business-warmgrey.svg");
+		background-position: 0 center;
+		background-repeat: no-repeat;
+		background-size: 40px 40px;
+		padding: 10px 0 10px 50px;
+	}
+} /* end body.management-home */
+html.no-svg,
+html.opera-mini {
+	body.management-home {
+		.row-whats-included h3 {
+			background-image: url("../img/pictograms/picto-reduce-costs-grey.png");
+		}
+		.support h3 {
+			background-image: url("../img/pictograms/picto-support-grey.png");
+		}
+		.technical-library h3 {
+			background-image: url("../img/pictograms/picto-articles-grey.png");
+		}
+		.legal-assurance h3 {
+			background-image: url("../img/pictograms/picto-business-grey.png");
+		}
+	}
+}
+
+body.management .row-landscape-trial-home div {
+	@include rounded_corners(4px);
+	border: 1px solid #dfdcd9;
+	box-shadow: none;
+	margin-bottom: inherit;
+	margin-left: 0;
+	margin-right: 0;
+}
+
+/*	@section management-landscape-features
+-------------------------------------------------------------- */
+body.management-landscape-features {
+  .tabbed-content {
+  	background: #F7F7F7;
+  	border-radius: 4px;
+
+  	h3 { display: none; }
+
+  	&.open { padding-bottom: 10px; }
+  }
+  .tabbed-content #management ul { margin-bottom: 0; }
+  
+  .tabbed-content #management .six-col, .tabbed-content #deployment .six-col, .tabbed-content #monitoring .six-col, .tabbed-content #inventory .six-col {
+  	border-right: 1px dotted $warm-grey;
+  	padding-right: (20/$base)em;
+  }
+  .tabbed-content a.right {
+  	float: none;
+  }
+  .tabbed-content #management .last-col, .tabbed-content #deployment .last-col, .tabbed-content #monitoring .last-col, .tabbed-content #inventory .last-col  {
+  	border: 0;
+  	padding-right: 0;
+  }
+
+  #inventory {
+  	margin-bottom: 30px;
+  }
+}
+
+body.management-ubuntu-advantage,
+body.management-working-with-landscape {
+	.row-hero p.last {
+		margin-top: 40px;
+		background: none;
+	}
+	.row-hero .link-cta-canonical {
+		margin-bottom: 10px;
+	}
+	.ubuntu-advantage { margin-bottom: 0; }
+	.ubuntu-advantage img { margin-left: -$grid-gutter; }
+	.row-purchase-advantage .box {
+		background: $light-grey url(../img/pictograms/pictogram-reduce-costs-115x115.png) 20px 20px no-repeat;
+		padding-bottom: 1em;
+	}
+	.row-purchase-advantage .promo-description {
+		padding-left: 135px;
+		border-right: 1px dotted $warm-grey;
+		padding-right: 1.1875em;
+		min-height: 9em;
+		margin-bottom: 0;
+	}
+	.row-purchase-advantage .promo-price {
+	}
+	.row-purchase-advantage .box div {
+		margin-bottom: 0;
+	}
+	.row-purchase-advantage .box p.last-item {
+		margin-top: 20px;
+		float: left;
+		font-style: italic;
+		@include font_size (13);
+	}
+} /* end body.business-systems-management-ubuntu-advantage */
+html.no-svg,
+html.opera-mini {
+	body.management-ubuntu-advantage,
+	body.management-working-with-landscape {
+		.row-hero {
+			background-image: url(../img/management/ubuntu-advantage/image-ubuntuadvantage.png);
+		}
+	}
+}
+
+/*	@section ubuntu-advantage
+-------------------------------------------------------------- */
+body.management-ubuntu-advantage {
+	#main-content .row-hero {
+		padding-top: 0;
+	}
+	#main-content .row-hero p span {
+		@include font_size (18);
+	}
+
+	.row-management .product-intro h2 {
+		@include font_size (23);
+	}
+
+	.price {
+		font-size:0.813em;
+		bottom: 0;
+	}
+
+	.row-cloud-management .price {
+		height: 48px;
+	}
+
+	.price p {
+		margin: 0;
+		padding: 0;
+	}
+
+	.price span {
+		@include font_size (18);
+		font-weight: normal;
+	}
+
+} /* end body.management-ubuntu-advantage */
+
+.three-divided {
+	@include box_sizing;
+}
+.three-divided li {
+    margin-bottom: 20px;
+    margin-right: 20px;
+    padding-bottom: 10px;
+	width: 100%;
+}
+.three-divided li.last-col {
+	margin-bottom: 0;
+	padding-bottom: 0;
+}
+
+html.no-svg, html.opera-mini {
+	body.management-compliance .row-hero,
+	body.management-return-on-investment .row-hero {
+		background: url("../img/pictograms/pictogram-reduce-costs-300x300.png") no-repeat scroll 654px 50% #FFFFFF;
+	}
+}
+
+body.management-return-on-investment {
+	.row-hero {
+		padding-bottom: 40px;
+	}
+	.row-box {
+		padding-bottom: 40px;
+		padding-top: 40px;
+	}
+	.row-landscape-trial {
+		margin-bottom: 20px;
+		padding-bottom: 0;
+	}
+	.logos img { margin: 20px 0 0 40px; }
+}
+
+/*	@section working-with-landscape
+-------------------------------------------------------------- */
+body.management-working-with-landscape {
+/*	.row {
+		padding-bottom: 60px;
+	}
+	.row-hero {
+		padding-bottom: 40px;
+	}*/
+	.row-hero .eight-col {
+		margin-bottom: 0;
+		padding-bottom: 1.25em;
+	}
+	//.row .six-col { margin-bottom: 0; }
+
+	iframe { margin-bottom: 1.25em; }
+
+	.row-landscape-trial {
+		padding-bottom: 0;
+		border-bottom: 0;
+	}
+}
+
+body.management-ema-whitepaper {
+	.row iframe {
+		width: 100%;
+	}
+}
+
+/* end @section desktop management */
+
+/* Medium / Tablet viewport
+-------------------------------------------------------------- */
+@media only screen and (max-width : 768px) {
+	.row-ubuntu-advantage-promo {
+		position: relative;
+		img {
+			position: relative;
+			right: 0;
+			bottom: -19px;
+			top: auto;
+		}
+	}
+	body.management-ubuntu-advantage {
+		.equal-height > li {
+			height: auto !important;
+		}
+	}
+}
+
+/* Medium / Tablet viewport
+-------------------------------------------------------------- */
+@media only screen and (min-width : 768px) {
+	body.management {
+		.stat dl {
+	    	margin: 0 0 0 40px;
+	    }
+		.stats-panel dd, .stat dd {
+		    margin-left: 0;
+		}
+		.stats-panel p a {
+	    	@include font_size (13);
+	    }
+
+		.row-return-investment {
+			background-image: url("../img/management/image-cutyouritcosts.svg");
+			background-position: 125px bottom;
+			background-repeat: no-repeat;
+		}
+		img.flush-right {
+			float: right;
+			margin-right: -40px;
+			margin-left: 20px;
+		}
+		img.flush-left {
+			float: left;
+			margin-left: -40px;
+		}
+
+		.tabbed-content {
+			@include rounded_corners(0 0 4px 4px);
+			background: $light-grey;
+		    border-bottom: 0;
+
+		  	h3 {
+		  		display: block;
+		  	}
+
+		  	a.right {
+			  	margin-bottom: 1.25em;
+			  	margin-left: (20/$base)em;
+			  	float: right;
+			}
+
+			.row {
+				padding-top: 0;
+			}
+		}
+	}
+	html.no-svg,
+	html.opera-mini {
+		.row-return-investment {
+			background-image: url("../img/management/image-cutyouritcosts.png");
+		}
+	}
+	body.management-return-on-investment {
+	    .stats-panel dt, .stat dt {
+		    margin-left: -30px;
+		}
+	}
+	body.management-home {
+		.margin-top { margin-top: 20px; }
+	}
+	.three-divided li {
+		width: 30%;
+		padding-bottom: 38px;
+	}
+
+	.row-cloud-management .three-divided li {
+		padding-bottom: 0;
+	}
+	body.management-ubuntu-advantage {
+		.price {
+			margin-bottom: 0;
+		}
+	}
+
+	html.no-svg,
+	html.opera-mini {
+		body.management .row-return-investment {
+			background-image: url("../img/management/image-cutyouritcosts.png");
+		}
+	}
+	body.management-ubuntu-advantage,
+	body.management-working-with-landscape {
+		.row-hero .link-cta-canonical {
+			margin-bottom: 0;
+		}
+	}
+
+/*	body.management-working-with-landscape {
+		.row {
+			padding-bottom: 60px;
+		}
+		.row-hero {
+			padding-bottom: 40px;
+		}
+	}*/
+	body.management-landscape-features {
+	  .tabbed-menu {
+	  }
+	}
+}
+
+/* Medium / Tablet viewport
+-------------------------------------------------------------- */
+@media only screen and (min-width : 986px) {
+	body.management-ubuntu-advantage,
+	body.management-working-with-landscape {
+		.row-hero {
+			background-image: url(../img/management/ubuntu-advantage/image-ubuntuadvantage.svg);
+			background-position: 694px 50%;
+			background-repeat: no-repeat;
+		}
+	}
+	body.management {
+		.tabbed-menu {
+		}
+		.tabbed-content {
+
+		}
+	}
+}
diff --git a/static/css/section/partners.scss b/static/css/section/partners.scss
new file mode 100755
index 00000000000..9721212caca
--- /dev/null
+++ b/static/css/section/partners.scss
@@ -0,0 +1,140 @@
+/*	@section partners
+-------------------------------------------------------------- */
+body.partners {
+	.row:last-child {
+		border-bottom: 0;
+	}
+	.four-col h2 {
+		@include font_size (23); /* Same as h3 */
+	}
+
+} /*  end @section partners */
+
+
+body.partners-home {
+	.box-padded-feature .inline-icons li {
+	  height: 50px;
+	}
+	.row {
+		border-bottom: 0;
+	}
+}
+
+body.partners .row-hero div {
+	-moz-column-count: inherit;
+	-webkit-column-count: 1;
+	column-count: 1;
+	-moz-column-gap: 0;
+	-webkit-column-gap: 0;
+	column-gap: 0;
+}
+
+body.partners-dell #dell-quotes {
+	border-top: 1px dotted $warm-grey;
+	padding-top: 20px;
+}
+
+body.partners-dell #servers img {
+	margin-bottom: 20px;
+}
+
+
+body.partners-dell-dellxps #dell-buy-now {
+	float: left;
+}
+
+body.partners-dell-dellxps #dell-buy-now a  {
+	display: block;
+}
+
+body.partners-dell-dellxps .border {
+	border-bottom: 1px dotted $warm-grey;
+	padding-bottom: 10px;
+}
+
+body.partners-find-a-partner,
+body.partners-certified-software {
+	.row-hero .link-cta-ubuntu {
+		margin-top: 20px;
+	}
+
+	.box {
+		img {
+			max-height: 50px;
+			margin-bottom: 10px;
+		}
+
+		h3 {
+			color: $warm-grey;
+			font-size: 15px;
+			margin-bottom: $gutter-width;
+		}
+	}
+
+	.row ul {
+		margin-bottom: 10px;
+	}
+
+	.list-partners li:nth-child(3n) {
+		margin-right: 0;
+	}
+}
+body.partners-find-a-partner-hardware .box p:first-child {
+	min-height: 60px;
+	margin-bottom: 0;
+}
+body.partners-hp {
+  blockquote.pull-quote p cite {
+    margin: 10px 0 0;
+    text-indent: 0;
+  }
+
+  .hp-pcs {
+    background: url("../img/partners/hp-partners-laptop.jpg") no-repeat scroll 670px 18px #fff;
+    padding-bottom: 70px;
+  }
+  .certified-software img {
+    margin-top: 30px;
+  }
+}
+
+body.partners-become-a-partner h2.isv-partner,
+body.partners-become-a-partner h2.reseller-partner,
+body.partners-become-a-partner h2.hardware-partner {
+	background-position: 0 50%;
+	background-repeat: no-repeat;
+	padding-left: 40px;
+}
+
+body.partners-become-a-partner h2.isv-partner { background-image: url("../img/partners/pictogram-become-a-partner-isv.png"); }
+body.partners-become-a-partner h2.reseller-partner { background-image: url("../img/partners/pictogram-become-a-partner-reseller.png"); }
+body.partners-become-a-partner h2.hardware-partner { background-image: url("../img/partners/pictogram-become-a-partner-hardware.png"); }
+
+
+
+
+@media only screen and (min-width : 768px) {
+	body.partners-arm .row div {
+		-moz-column-count: 2;
+		-moz-column-gap: 20px;
+		-webkit-column-count: 2;
+		-webkit-column-gap: 20px;
+		column-count: 2;
+		column-gap: 20px;
+	}
+
+	body.partners-dell-dellxps .row-hero {
+		padding-bottom: 0;
+
+		img {
+			margin-top: -60px;
+		}
+	}
+	body.partners-hp {
+	  .server-hp-proliant {
+	    background: url("../img/partners/hp-partners-server.jpg") no-repeat scroll -213px 30px #fff;
+	    padding-bottom: 40px;
+	    padding-top: 65px;
+	  }
+	}
+}
\ No newline at end of file
diff --git a/static/css/section/phone.scss b/static/css/section/phone.scss
new file mode 100755
index 00000000000..79e60d35721
--- /dev/null
+++ b/static/css/section/phone.scss
@@ -0,0 +1,1249 @@
+/*	@section phone
+--------------------------------------------------------------
+
+	Contents:
+		@section general
+		@section phone home (LOL)
+		@section more general
+		@section operators-and-oems
+		@section animations on design page
+		@section design
+		@section ubuntu-for-android
+		@section ubuntu-for-android > features
+		@section backed-by-canonical
+		@section contextualised footer
+
+-------------------------------------------------------------- */
+
+/*	@section general
+-------------------------------------------------------------- */
+
+.box-phone, .box-android {
+	min-height: 15em;
+	padding-right: $six-col;
+}
+
+.box-phone { background: #fff url(../img/devices/devices-phone-hero-353x206.png) 95% center no-repeat; }
+
+.box-android { background: #fff url(../img/devices/photo-industry-android-381x230.jpg) 90% center no-repeat; }
+
+
+
+/*	@section phone home (LOL)
+-------------------------------------------------------------- */
+body.phone-home {
+
+  li.verizon img {
+    position: relative;
+    top: -8px;
+  }
+
+  .the-video {
+    width: 569px;
+    height: 320px;
+    position: absolute;
+    left: 210px;
+    z-index: 20;
+  }
+
+  .video-background {
+    display: block;
+    width: 569px;
+    height: 320px;
+    background: #000;
+    margin-bottom: 5px;
+  }
+
+  .video.hide {
+    display: none;
+  }
+	.inline-icons {
+		text-align: center;
+	}
+  .inline-icons li.last {
+    margin-right: 0;
+  }
+}
+
+/*	@section more general
+-------------------------------------------------------------- */
+body.phone {
+  .row-app-grid {
+    overflow: hidden;
+  }
+  .row-hero {
+    padding-top: 0;
+
+    a img {
+      vertical-align: middle;
+      margin-right: 10px;
+    }
+
+    a.close-video {
+      margin-top: 5px;
+      img {
+        vertical-align: top;
+      }
+    }
+  }
+  .thumbs {
+    margin-right: $gutter-width;
+  }
+  .thumbs li {
+    float: right;
+    margin-right: ($gutter-width * 2);
+    margin-bottom: 1.2em;
+    list-style-type: none;
+    padding: 0;
+  }
+  .thumbs li.last-item {
+    margin-right: 0;
+  }
+  .thumbs li.bottom {
+    margin-bottom: 0;
+  }
+  .thumbs li img {
+    float: left;
+  }
+
+  .row-interlinks {
+    padding: 0 56px 0 $gutter-width;
+    border-bottom: 1px solid #CDCDCD;
+    background: $light-grey;
+      -moz-border-radius: 0;
+      -webkit-border-radius: 0;
+    border-bottom: 1px solid #CDCDCD;
+    border-radius: 0;
+    margin-bottom: 0;
+    margin-left: 0;
+    padding: 0 56px 0 $gutter-width;
+
+    .navigation {
+
+      li {
+        float: left;
+        margin-right: $gutter-width;
+        list-style-type: none;
+        font-weight: normal;
+        margin-bottom: 0;
+
+        a {
+          font-size: 13px;
+          color: #333;
+          text-decoration: none;
+          display: block;
+          border-top: 4px solid transparent;
+          padding: 12px 10px 16px;
+        }
+        a:hover {
+          color: #dd4814;
+        }
+        a.active {
+          border-top: 4px solid #dd4814;
+          color: #dd4814;
+        }
+      }
+    }
+  }
+  .next-steps li {
+    border-bottom: 1px dotted $warm-grey;
+    padding: 8px 0 10px;
+  }
+  .next-steps li:first-child {
+    border-top: 1px dotted $warm-grey;
+  }
+}
+
+/*	@section app-ecosystem
+-------------------------------------------------------------- */
+body.phone-app-ecosystem {
+  .row-hero {
+    img {
+      padding-top: $gutter-width * 2;
+    }
+  }
+	.row-box-feature {
+		overflow: hidden;
+
+    img {
+      margin-left: -80px;
+      margin-top: 55px;
+    }
+  }
+}
+
+/*	@section operators-and-oems
+-------------------------------------------------------------- */
+body.phone-operators-and-oems {
+  .list-link {
+    padding-left: 30px;
+    position: relative;
+    top: -8px;
+  }
+  .combined-list {
+    padding-bottom: 20px;
+  }
+}
+
+/*  @section thank-you
+-------------------------------------------------------------- */
+body.phone-thank-you {
+  .row-hero{
+    height: auto;
+    padding-bottom: 20px;
+  }
+  .row-box {
+    @include rounded_corners(0);
+  }
+}
+
+/*	@section animations on design page
+-------------------------------------------------------------- */
+body.phone-features {
+	.row strong {
+		font-weight: bold;
+	}
+  .clever-convos {
+    background: url("../img/devices/phone-conversations-324x576.jpg") no-repeat scroll 580px 30px;
+    height: 450px;
+  }
+
+  .edge-magic {
+    padding-bottom: 0;
+    padding-top: 0;
+    z-index: 5;
+
+    .replay {
+      background: url("../img/devices/phone-animation-repeat.png") no-repeat;
+      width: 25px;
+      height: 21px;
+      overflow: hidden;
+      position: absolute;
+      top: 360px;
+      left: 0;
+      outline: none;
+    }
+    .replay:hover {
+      background-position: 0 -21px;
+    }
+  }
+  .edge-top {
+    margin-top: 0;
+    z-index: 20;
+  }
+  .edge-left {
+    z-index: 10;
+
+    .edge-magic-content {
+        padding-right: 0;
+      }
+  }
+  .edge-bottom {
+    z-index: 1;
+  }
+
+ .slider-animation {
+  width: 275px;
+  height: 447px;
+  position: relative;
+  background: url(../img/phone/features/image-phone-portrait.jpg) no-repeat center 0;
+  margin: 0 auto;
+
+    .screen {
+      width: 182px;
+      height: 324px;
+      position: absolute;
+      top: 55px;
+      left: 46px;
+      overflow: hidden;
+
+      .launcher {
+        width: 44px;
+        height: 324px;
+        position: absolute;
+        top: 0;
+        left: -100px;
+      }
+    }
+  }
+
+  .edge-magic-animation .screen {
+    background: url("../img/phone/features/image-phone-music.jpg") no-repeat;
+    .launcher {
+      background: url("../img/phone/features/image-phone-launcher.png") no-repeat;
+    }
+    .screen-fade {
+      background: #000;
+      opacity: 0;
+      width: 182px;
+      height: 324px;
+    }
+  }
+
+  .go-back {
+    background: url(../img/phone/features/image-phone-portrait.jpg) no-repeat center 0;
+    .screen {
+      .camera-screen {
+        background: url("../img/phone/features/image-phone-camera-portrait.jpg") no-repeat;
+        width: 182px;
+        height: 324px;
+        position: absolute;
+        top: 0;
+        left: 0;
+      }
+      .gallery-screen {
+        background: url("../img/phone/features/image-phone-gallery-edge.jpg") no-repeat scroll center center #000;
+        background-size: 142px 250px;
+        height: 324px;
+        left: 0;
+        position: absolute;
+        top: 0;
+        width: 182px;
+      }
+    }
+  }
+
+  .content-controls {
+    background: url(../img/phone/features/image-phone-portrait.jpg) no-repeat center 0;
+    margin-bottom: $gutter-width;
+    .screen {
+      .gallery-screen {
+        background: url("../img/phone/features/image-phone-gallery.jpg") no-repeat;
+        width: 182px;
+        height: 324px;
+        position: absolute;
+        top: 0;
+        left: 0;
+        display: none;
+      }
+      .gallery-controls {
+        background: url("../img/devices/phone-edge-magic-gallery-controls.png") no-repeat;
+        width: 182px;
+        height: 324px;
+        position: absolute;
+        top: 317px;
+        left: 0;
+      }
+    }
+  }
+
+  .edge-magic-animation.run {
+    .screen .launcher {
+        -moz-transition: left 1s;
+        -webkit-transition: left 1s;
+        -o-transition: left 1s;
+      transition: left 1s;
+      left: 0;
+    }
+    .screen .screen-fade {
+        -moz-transition-delay: 1s;
+        -webkit-transition-delay: 1s;
+        -o-transition-delay: 1s;
+      transition-delay: 1s;
+        -moz-transition: opacity 1s;
+        -webkit-transition: opacity 1s;
+        -o-transition: opacity 1s;
+      transition: opacity 1s;
+      opacity: 0.3;
+    }
+  }
+
+  .full-swipe.run .screen {
+    .launcher{
+      left: 0;
+        -moz-transition: left 1s;
+        -webkit-transition: left 1s;
+        -o-transition: left 1s;
+      transition: left 1s;
+    }
+    .launcher.return {
+      left: -100px;
+    }
+    .fb-screen {
+       left: 182px;
+
+        -moz-transition: left 1s;
+        -webkit-transition: left 1s;
+        -o-transition: left 1s;
+      transition: left 1s;
+        -moz-transition-delay: .7s;
+        -webkit-transition-delay: .7s;
+        -o-transition-delay: .7s;
+      transition-delay: .7s;
+    }
+  }
+
+  .go-back.run .screen {
+    .camera-screen{
+      left: -182px;
+          -moz-transition: left 1s;
+          -webkit-transition: left 1s;
+          -o-transition: left 1s;
+        transition: left 1s;
+    }
+    .gallery-screen {
+      background-size: 182px 324px;
+        -moz-transition: left 1s ease 1.5s;
+          -webkit-transition: left 1s ease 1.5s;
+          -o-transition: left 1s ease 1.5s;
+        transition: left 1s ease 1.5s;
+          -moz-transition: background-size 1s ease;
+          -webkit-transition: background-size 1s ease;
+          -o-transition: background-size 1s ease;
+        transition: background-size 1s ease;
+    }
+  }
+
+  .content-controls.run {
+    .screen .gallery-controls {
+      top: 280px;
+        -moz-transition: top 0.5s;
+        -webkit-transition: top 0.5s;
+        -o-transition: top 0.5s;
+      transition: top 0.5s;
+    }
+  }
+
+  .row-notifications {
+
+    .screen {
+		  background: url(../img/phone/features/image-phone-notifications.jpg) no-repeat;
+		}
+
+		.settings-screen {
+		  transition: height .8s;
+		  background: url(../img/phone/features/image-phone-messages.jpg) no-repeat;
+		  width: 182px;
+      height: 0;
+      position: absolute;
+      top: 0;
+      left: 0;
+		}
+
+		.slider-knot {
+		  transition: top .8s;
+		  background: url(../img/devices/phone-anim-slider-knot.png) no-repeat;
+		  width: 182px;
+		  height: 15px;
+		  position: absolute;
+		  top: -15px;
+		  left: 0;
+		}
+
+		.run {
+		   .slider-knot {
+		     top: 309px;
+		   }
+		   .settings-screen {
+		     height: 324px;
+		   }
+		}
+  }
+
+  .row-hud .screen {
+		background: url(../img/devices/phone-hud.png) no-repeat;
+  }
+}
+
+body.phone-contact-us {
+  .row {
+    margin-bottom: 0;
+    padding-bottom: 0;
+    padding-top: 0
+  }
+  .row-hero {
+    height: auto;
+  }
+}
+
+/*	@section design
+-------------------------------------------------------------- */
+body.phone-features {
+  .row-hero {
+    background: url("../img/devices/phone-photo-hero-561x323.png") no-repeat scroll 96% 20px;
+
+    h1 {
+      margin-bottom: 0.267em;
+    }
+
+    div {
+      margin-bottom: 0;
+    }
+  }
+  #main-content .infographic {
+    background:url("../img/devices/phone-infographic-background.jpg") no-repeat;
+    background-size: 100% 100%;
+    color: #fff;
+    padding-top: 0 ;
+    padding-bottom: $gutter-width;
+    margin-top: 0;
+    overflow: hidden;
+
+    h1 {
+      margin-top: 40px;
+      padding-right: 40px;
+    }
+
+    .main-image {
+      opacity: 1;
+        -moz-transition: opacity 2s;
+        -webkit-transition: opacity 2s;
+        -o-transition: opacity 2s;
+      transition: opacity 2s;
+      position: absolute;
+      margin-left: -38px;
+    }
+
+    .no-print {
+      text-align: center;
+
+      .main-image {
+        display: none;
+      }
+      .info-pic-1 {
+        display: block;
+        opacity: 1;
+        margin-left: 0;
+        position: static;
+      }
+    }
+
+    .hide {
+      opacity: 0;
+    }
+
+    .thumbnails {
+      list-style-type: none;
+      height: 80px;
+      position: absolute;
+      top: 350px;
+      text-align: center;
+      padding-bottom: 20px;
+      width: 550px;
+
+      img {
+        margin-right: 20px;
+      }
+    }
+  }
+
+  .search-animation {
+    .slider-animation {
+  	  width: 275px;
+  	  height: 447px;
+  	  position: relative;
+
+      .search-screen{
+          background-image: url(../img/devices/phone-search-background.png);
+          height: 324px;
+          width: 182px;
+          position: absolute;
+          top: 55px;
+          left: 39px;
+      }
+      .search-screen.run {
+
+      }
+      .phone-background{
+          background: url(../img/phone/features/image-phone-portrait.jpg) no-repeat center 0;
+          height: 420px;
+          width: 258px;
+          position: relative;
+      }
+
+      .screen{
+          position: absolute;
+          top: 0px;
+          left: 0px;
+      }
+
+      .fade-1 {
+          z-index: 4000;
+      }
+
+      .fade-2 {
+          z-index: 3000;
+      }
+
+      .fade-3 {
+          z-index: 2000;
+      }
+
+      .fade-4 {
+          z-index: 1000;
+      }
+    }
+
+    .slider-animation.run {
+      .screen{
+          /* Fade out */
+          transition: opacity;
+          transition-timing-function: ease-out;
+          transition-duration: 250ms;
+          transition-delay: 2s;
+
+          -ms-transition: opacity;
+          -ms-transition-timing-function: ease-out;
+          -ms-transition-duration: 250ms;
+          -ms-transition-delay: 2s;
+
+          -moz-transition: opacity;
+          -moz-transition-timing-function: ease-out;
+          -moz-transition-duration: 250ms;
+          -moz-transition-delay: 2s;
+
+          -webkit-transition: opacity;
+          -webkit-transition-timing-function: ease-out;
+          -webkit-transition-duration: 250ms;
+          -webkit-transition-delay: 2s;
+      }
+
+      .fade-1{
+          opacity: 0;
+      }
+
+      .fade-2{
+          transition-delay: 4s;
+          -ms-transition-delay: 4s;
+          -moz-transition-delay: 4s;
+          -webkit-transition-delay: 4s;
+          opacity: 0;
+      }
+
+      .fade-3{
+          transition-delay: 6s;
+          -ms-transition-delay: 6s;
+          -moz-transition-delay: 6s;
+          -webkit-transition-delay: 6s;
+          opacity: 0;
+      }
+    }
+  }
+  .phone-photos {
+    padding-bottom: 0;
+    overflow: hidden;
+
+    h2{
+      margin-top: 30px;
+    }
+
+    .phone-camera {
+      margin-left: -80px;
+      margin-top: $gutter-width;
+    }
+
+    .photo-gallery {
+      margin-left: -30px;
+    }
+  }
+  .row.row-fingertips {
+    padding-bottom: 0;
+  }
+  .row-pictures {
+	  overflow: hidden;
+  }
+  .row-pictures div.feature-image {
+		background: #000;
+		position: relative;
+		top: 0;
+		left: 0;
+  }
+  .row-pictures .pictures-portrait .feature-image {
+    -moz-background-size: 100% auto;
+    -webkit-background-size: 100% auto;
+    -o-background-size: 100% auto;
+    background-size: 100% auto;
+  	background: url("../img/phone/features/image-phone-gallery.jpg") center 53px no-repeat;
+  }
+  .row-pictures .pictures-portrait img {
+		position: relative;
+		z-index: -1;
+	}
+  .row-pictures .pictures-landscape .feature-image {
+  	display: none;
+  }
+  .row-pictures .pictures-landscape img {
+		display: none;
+  }
+}
+
+body.phone-ubuntu-for-android {
+	.row-free .eight-col ul {
+		background:url('../img/patterns/android-background-dotted.png');
+		padding: $gutter-width 0;
+		text-align: center;
+		width: 100%;
+	}
+
+  inline inline-icons
+
+	#ecosystem .inline-icons li {
+		margin-bottom: 0;
+	}
+}
+
+body.phone-ubuntu-for-android #easy-integration {
+	background: $light-grey url(../img/devices/bg-android-integrate-301x296.png) right bottom no-repeat;
+	background-size: 311px 306px;
+	margin-bottom: 0;
+	width: 100%;
+}
+
+body.phone-ubuntu-for-android #ecosystem {
+	background: $light-grey;
+}
+
+.row-android .four-col {
+	background:url('../img/patterns/android-background-dotted.png') 0 2px;
+	display: table;
+	text-align: center;
+}
+
+.row-android span {
+	display: table-cell;
+	vertical-align: middle;
+  padding-top: 20px;
+  padding-bottom: 20px;
+}
+
+body.phone-ubuntu-for-android .box-contact {
+	@include rounded_corners(4px);
+	padding: $gutter-width;
+	margin-bottom: $gutter-width;
+}
+
+/*	@section ubuntu-for-android > features
+-------------------------------------------------------------- */
+body.phone-ubuntu-for-android-features {
+  h1 {
+    position: relative;
+    z-index: 2;
+  }
+  .row-hero { overflow: visible; }
+  .row-hero img { margin-bottom: $gutter-width; }
+  .default-apps{
+    ul {
+      padding: 20px 0;
+    }
+    li {
+      width: 50%;
+      min-height: 125px;
+    }
+  }
+}
+
+/*	@section backed-by-canonical
+-------------------------------------------------------------- */
+body.phone-backed-by-canonical,
+body.tablet-backed-by-canonical {
+	#main-content .row-hero {
+		height: auto;
+		min-height: 0;
+		padding-top: 40px;
+
+		p {
+		  width: 570px;
+		}
+	}
+	#main-content .intro {
+		background-image: url(../img/pictograms/picto-pack/picto-canonical.svg);
+    background-position: 90% center;
+    background-repeat: no-repeat;
+		padding: 0 $four-col 0 0;
+	}
+	.intro li .link-cta-ubuntu { margin-right: $gutter-width; }
+	.row-experience .five-col { margin-top: $gutter-width * 4; }
+}
+html.no-svg,
+html.opera-mini {
+  body.phone-backed-by-canonical,
+  body.tablet-backed-by-canonical {
+    #main-content .intro {
+      background-image: url(../img/pictograms/picto-pack/picto-canonical.png);
+    }
+  }
+}
+
+
+body.phone-ubuntu-for-android-contact-us .row-hero {
+	height: auto;
+}
+
+
+
+/*  @section carrier-advisory-group
+-------------------------------------------------------------- */
+body.phone-carrier-advisory-group {
+  #main-content .list li:first-of-type {
+    padding-top: 0;
+  }
+  .row-hero ul {
+    margin-top: 35px;
+    margin-right: -20px;
+    text-align: center;
+    li {
+      margin-right: 20px;
+      margin-bottom: 20px;
+      padding: 20px 10px 14px;
+      /*width: 117px;*/
+      width: 63px;
+    }
+    li img {
+    	float: none;
+    }
+    li.five {
+      margin-right: 25px;
+    }
+    li.verizon img {
+      position: relative;
+      top: -8px;
+    }
+  }
+
+
+  .independently-chained {
+    background-color: #f7f7f7;
+  }
+
+  .row .pull-quote {
+    margin-bottom: 30px;
+  }
+}
+/* Edge Indiegogo promo */
+.edge-promo {
+
+	background: #282828;
+    -moz-box-shadow:    inset 0  4px 6px -4px rgba(0, 0, 0, 0.6),
+                        inset 0 -4px 6px -4px rgba(0, 0, 0, 0.6);
+    -webkit-box-shadow: inset 0  4px 6px -4px rgba(0, 0, 0, 0.6),
+                        inset 0 -4px 6px -4px rgba(0, 0, 0, 0.6);
+     box-shadow:        inset 0  4px 6px -4px rgba(0, 0, 0, 0.6),
+                        inset 0 -4px 6px -4px rgba(0, 0, 0, 0.6);
+	color: #fff;
+
+	h2 {
+			text-shadow: 0 2px 4px rgba(0,0,0,.6);
+	}
+
+	p {
+		margin-bottom: 25px;
+	}
+	p:last-child {
+		margin-bottom: 0;
+	}
+
+	.link-cta-ubuntu {
+		-moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
+		-webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
+	}
+}
+
+
+body.phone-scopes {
+
+  .edge-magic {
+      padding-bottom: 0;
+      padding-top: 0;
+    }
+
+  .row-find-anything .slider-animation,
+  .row-your-scopes .slider-animation {
+
+    background: url("../img/devices/phone-portrait.png") no-repeat scroll 0 0 rgba(0, 0, 0, 0);
+    height: 447px;
+    margin: 0 auto;
+    position: relative;
+    width: 275px;
+
+    .screen {
+      background: url(../img/devices/image-phone-scopes-background.png) no-repeat;
+      margin: 0;
+      height: 324px;
+      left: 46px;
+      overflow: hidden;
+      position: absolute;
+      top: 55px;
+      width: 182px;
+    }
+  }
+
+  .row-your-scopes .slider-animation {
+    .status-bar {
+      width: 182px;
+      height: 15px;
+      top: 0;
+      position: absolute;
+      list-style-type: none;
+      background: url(../img/devices/image-phone-scopes-statusbar.png) no-repeat;
+
+    }
+    .scope-content {
+      width: 182px;
+      height: 309px;
+      top: 15px;
+      position: absolute;
+      list-style-type: none;
+      background: url(../img/devices/image-phone-scopes-page.png) no-repeat;
+      background-position: 0 -15px;
+        -moz-transition: background-position 1s;
+        -webkit-transition: background-position 1s;
+      transition: background-position 1s;
+    }
+
+    &.run .scope-content {
+      background-position: 0 -300px;
+    }
+  }
+
+  .row-find-anything .slider-animation,
+  .row-your-scope .slide-animation {
+
+    li {
+      width: 182px;
+      height: 324px;
+      top: 0;
+      position: absolute;
+      list-style-type: none;
+    }
+    .scope-1 {
+      background: url(../img/devices/image-phone-scopes-content-1.png) no-repeat;
+      left: 0;
+    }
+    .scope-2 {
+      background: url(../img/devices/image-phone-scopes-content-2.png) no-repeat;
+      left: 182px;
+    }
+    .scope-3 {
+      background: url(../img/devices/image-phone-scopes-content-3.png) no-repeat;
+      left: 182px;
+    }
+    .scope-4 {
+      background: url(../img/devices/image-phone-scopes-content-4.png) no-repeat;
+      left: 182px;
+    }
+
+    &.run {
+      .scope-1 {
+        -webkit-animation: scope-slide-out 1s normal forwards ease;
+        -moz-animation: scope-slide-out 1s normal forwards ease;
+        animation: scope-slide-out 1s normal forwards ease;
+      }
+      .scope-2 {
+        -webkit-animation: scope-slide-in 1s normal forwards ease,
+                           scope-slide-out 1s normal forwards ease;
+        -moz-animation: scope-slide-in 1s normal forwards ease,
+                        scope-slide-out 1s normal forwards ease;
+        animation: scope-slide-in 1s normal forwards ease,
+                   scope-slide-out 1s normal forwards ease;
+          -moz-animation-delay: 0s, 2s;
+          -webkit-animation-delay: 0s, 2s;
+        animation-delay: 0s, 2s;
+      }
+      .scope-3 {
+        -webkit-animation: scope-slide-in 1s normal forwards ease,
+                           scope-slide-out 1s normal forwards ease;
+        -moz-animation: scope-slide-in 1s normal forwards ease,
+                        scope-slide-out 1s normal forwards ease;
+        animation: scope-slide-in 1s normal forwards ease,
+                   scope-slide-out 1s normal forwards ease;
+          -moz-animation-delay: 2s, 4s;
+          -webkit-animation-delay: 2s, 4s;
+        animation-delay: 2s, 4s;
+      }
+      .scope-4 {
+        -webkit-animation: scope-slide-in 1s normal forwards ease;
+        -moz-animation: scope-slide-in 1s normal forwards ease;
+        animation: scope-slide-in 1s normal forwards ease;
+          -moz-animation-delay: 4s;
+          -webkit-animation-delay: 4s;
+        animation-delay: 4s;
+      }
+    }
+  }
+}
+
+/* Medium / Tablet viewport
+-------------------------------------------------------------- */
+@media only screen and (min-width : 768px) {
+  body.phone {
+    .row-app-grid img {
+      margin-left: -80px;
+      margin-top: 0;
+    }
+  }
+
+  body.phone-home {
+    .touch-border {
+      img {
+        margin-top: $gutter-width;
+      }
+    }
+    .touch-border {
+      padding-bottom: 0;
+
+      div {
+        margin-bottom: 0;
+        padding-bottom: $gutter-width;
+      }
+    }
+
+    .inline-icons li {
+      margin-right: 75px;
+      margin-bottom: 30px;
+    }
+    .edge-promo {
+      background: url("../img/homepage/2_3_generic.jpg") no-repeat scroll -350% 72% #282828;
+    }
+  }
+
+  body.phone-app-ecosystem {
+    .row.adapt-web-apps {
+      overflow: hidden;
+
+      img {
+        margin-bottom: -80px;
+      }
+    }
+
+    .space-for-content h2 {
+      margin-top: 60px;
+    }
+  }
+
+  body.phone-carrier-advisory-group {
+    .row-image-centered {
+      padding-bottom: 40px;
+    }
+    .row-hero ul li {
+      width: 140px;
+    }
+  }
+
+  body.phone-features {
+    #main-content .infographic {
+      height: 442px;
+      margin-top: 0;
+
+      h1 {
+        margin-top: 70px;
+      }
+      .no-print {
+        text-align: left;
+      }
+      .no-print .info-pic-1 {
+        display: block;
+        opacity: 1;
+        margin-left: -38px;
+        position: absolute;
+      }
+      .info-pic-1.hide {
+        opacity: 0;
+      }
+      .no-print .main-image {
+        display: block;
+        left: -50px;
+        max-width: none;
+        position: absolute;
+      }
+      .main-image img {
+        left: -50px;
+        position: absolute;
+        max-width: none;
+      }
+
+    }
+    .row-pictures {
+      .pictures-portrait .feature-image {
+        margin-top: 74px;
+      }
+      .edge-magic-content {
+        margin-top: 20px;
+      }
+    }
+    .edge-magic-content {
+      margin-top: 95px;
+      padding-right: 60px;
+    }
+    .edge-magic {
+      padding-bottom: 0;
+      padding-top: 0;
+      margin-top: -70px;
+      z-index: 5;
+
+      .replay {
+        background: url("../img/devices/phone-animation-repeat.png") no-repeat;
+        width: 25px;
+        height: 21px;
+        overflow: hidden;
+        position: absolute;
+        top: 360px;
+        left: 295px;
+        outline: none;
+      }
+      .replay:hover {
+        background-position: 0 -21px;
+      }
+    }
+    .edge-top {
+      margin-top: 0;
+      z-index: 20;
+    }
+    .edge-left {
+      z-index: 10;
+
+      .edge-magic-content {
+          padding-left: 100px;
+      }
+
+    }
+    .row-pictures .pictures-landscape .feature-image {
+      background: url("../img/phone/features/image-phone-camera-landscape.jpg") 51px 15px no-repeat;
+      width: 500px;
+      height: 258px;
+      margin-top: 30px;
+      margin-bottom: 20px;
+      display: block;
+
+      img {
+        display: block;
+        position: relative;
+        z-index: -1;
+      }
+    }
+  }
+  body.phone-operators-and-oems {
+    div.row-hero.row-image-centered div + span img {
+      margin-right: 0;
+    }
+  }
+  body.phone-ubuntu-for-android-features {
+    .default-apps{
+      ul {
+        padding: 20px;
+      }
+      li {
+        width: 17.7953%;
+        padding-top: 10px;
+        border-bottom: 0;
+        border-right: 0;
+        height: 130px;
+        width: 155px;
+        text-align: center;
+        margin-bottom: 0;
+      }
+      li.bottom {
+        border-bottom: 0;
+        margin-bottom: $gutter-width;
+      }
+      li.last-item {
+        border-right: 0;
+      }
+    }
+  }
+  body.phone-scopes {
+    #main-content .row-hero {
+      background: url(../img/devices/image-phone-scopes-hero.jpg) no-repeat 133% top;
+      margin-top: 0;
+      padding-top: 40px;
+      margin-bottom: 50px;
+    }
+    .edge-magic-content {
+        margin-top: 100px;
+    }
+    .row-savvy-search {
+      h3 {
+        margin-top: 40px;
+      }
+    }
+  }
+  body.phone-carrier-advisory-group .independently-chained {
+    background: url("../img/devices/phone-photo-app.png") no-repeat scroll -20px center #F7F7F7;
+    padding-bottom: 60px;
+    padding-top: 60px;
+  }
+
+
+  body.phone-ubuntu-for-android {
+    .row-hero-android img {
+      display: block;
+    }
+  }
+}
+
+
+
+
+/* Large / Desktop viewport
+-------------------------------------------------------------- */
+@media only screen and (min-width : 984px) {
+
+  body.phone-home {
+    .edge-promo {
+      background: url("../img/homepage/2_3_generic.jpg") no-repeat scroll 680% 72% #282828;
+    }
+    .align-base {
+      margin-top: 86px;
+    }
+  }
+
+  body.phone-ubuntu-for-android {
+    .row-hero-android {
+      background: url(../img/devices/photo-android-hero-749x456.jpg) 145% top no-repeat;
+      min-height: 22.5em;
+      margin-bottom: 0;
+
+      img {
+        display: none;
+      }
+    }
+  }
+  body.phone-carrier-advisory-group {
+    .row-hero ul li {
+      width: 189px;
+    }
+    .independently-chained {
+      background: url("../img/devices/phone-photo-app.png") no-repeat scroll 0 center #F7F7F7;
+    }
+  }
+  body.phone-scopes {
+    #main-content .row-hero {
+      background: url(../img/devices/image-phone-scopes-hero.jpg) no-repeat right top;
+    }
+    .row-savvy-search {
+      height: 480px;
+      background: url(../img/phone/scopes/image-scopes.jpg) no-repeat -115px top;
+    }
+  }
+  /*  @section contextualised footer #context-footer
+  -------------------------------------------------------------- */
+  .phone-context-footer .feature-three {
+    background: url(../img/devices/phone-bottom-find-out.png) right center no-repeat;
+    min-height: 170px;
+
+    p {
+      padding-right: 65px;
+    }
+  }
+
+  body.phone-features .edge-magic .replay {
+    left: 333px;
+  }
+
+  body.phone-app-ecosystem .write-apps {
+    background: url("../img/phone/app-ecosystem/image-phone-softwarecentre.jpg") no-repeat scroll right 55px;
+  }
+
+  body.phone-ubuntu-for-android-features {
+    .default-apps{
+        li {
+        width: 17.7953%;
+        padding-top: 20px;
+        border-bottom: 1px dotted $warm-grey;
+        border-right: 1px dotted $warm-grey;
+        height: 150px;
+        width: 166px;
+      }
+		}
+	}
+}
\ No newline at end of file
diff --git a/static/css/section/search.scss b/static/css/section/search.scss
new file mode 100755
index 00000000000..12ee5654c38
--- /dev/null
+++ b/static/css/section/search.scss
@@ -0,0 +1,239 @@
+@charset "UTF-8";
+/* ---------------------------------------------------------------
+------------------------------------------------------------------
+	DO NOT EDIT STYLES.CSS
+	It is autogenerated.
+
+	Project:		Ubuntu Front-End download section
+	Author:			Web Team at Canonical Ltd
+	Last edited by:
+	Last edited on:
+
+  	CONTENTS:
+	-----------------------------------------------------------------
+	@section download homepage
+	@section download >  desktop/server & cloud
+	@section download > download-zh-CN
+	@section help
+
+	@section Needs to go into patterns
+
+	@this may turn into a pattern
+
+	Rounded corners
+	-----------------------------------------------------------------
+	@include rounded_corners(top-left top-right bottom-right bottom-left);
+		examples
+		@include rounded_corners(0 0 4px 4px); rounded bottoms
+		@include rounded_corners(4px); all corners rounded
+
+	Base grid sass, this lives in /sites/core/static/css/core-grid.scss
+	-----------------------------------------------------------------
+	$base: 			16;
+	$column_width:	( 60 / $base )em;
+	$gutter-width: 	( 20 / $base )em;
+	$grid_column: 	( 57 / $base )em; nested columns
+	$grid-gutter: 	( 18 / $base )em;
+
+	Available grid widths
+	-----------------------------------------------------------------
+	$one-col - 100%
+
+	Using these enables us to give individual elements specific widths without adding a static width:
+
+	padding: $gutter-width;
+	width: 100% - ( 2 * $gutter-width );
+
+	Colour definitiions are in /sites/core/static/css/core-constants.scss
+	-----------------------------------------------------------------
+	$ubuntu-orange:			#dd4814; ubuntu orange (used for text links also on any site except canonical)
+	$canonical-aubergine:	#772953; canonical aubergine
+	$light-aubergine:		#77216f; light aubergine (consumer)
+	$mid-aubergine:			#5e2750; mid aubergine (both)
+	$dark-aubergine:		#2c001e; dark aubergine (enterprise)
+	$warm-grey:				#888888; warm grey
+	$cool-grey:				#333333; cool grey
+	$light-grey:			#f7f7f7; light grey
+
+	notifications
+	$error:					#df382c; red
+	$warning:				#eca918; yellow
+	$success:				#38b44a; green
+	$information:			#19b6ee; cyan
+
+	colour coded status - from negative to positive (icon: canonical circle)
+	$status-red:			#df382c; red, for status that require immediate attention
+	$status-grey:			#888888; grey, for disabled status or ones that don�t require attention
+	$status-yellow:			#efb73e; yellow, for status that require attention
+	$status-blue:			#19b6ee; blue, for status that don�t require action
+	$status-green:			#38b44a; green, for positive status
+
+	misc colours
+	$box-solid-grey:		#EFEFEF;
+
+	$link-color:			$ubuntu-orange; This is the global link color, mainly used for links in content
+
+-----------------------------------------------------------------
+-------------------------------------------------------------- */
+//@import "core-constants";
+
+/*	@section download homepage
+-------------------------------------------------------------- */
+body.search .nav-secondary {
+	display: none;
+}
+
+.ubuntu-search {
+		.nav-secondary {
+			display: none;
+		}
+    section > h1, 
+    section article h1 {
+        padding-bottom: 10px;
+        font-size: 1.438em;
+        margin-bottom: 0;
+    }
+    section > h1 {
+        border-bottom: 1px dotted #dfdcd9;
+    }
+    .main-search {
+        padding: 20px 0;
+        margin: 0 0 20px 0;
+        background-color: transparent;
+
+        input[type="search"] {
+            float: left;
+            width: 100%;
+            font-size: 2em;
+            border: 1px solid #999;
+            -moz-box-sizing: border-box;
+            box-sizing: border-box;
+            padding: 0.2em 65px 0.2em 0.2em;
+        }
+        button[type=submit] {
+            padding: 4px;
+            line-height: 0;
+            float: left;
+            margin-left: -53px;
+            display: block;
+            background: none;
+            overflow: visible;
+            width: auto;
+            margin-top: -4px;
+
+            &:hover {
+                background: none;
+            }
+
+            img {
+              height: 45px;
+              width: 45px;
+            }
+        }
+    }
+
+    .search-result h1 .title-main {
+        margin-right: 20px;
+    }
+    .search-result h1 .result-url {
+        color: #999;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: block;
+        vertical-align: bottom;
+        padding-bottom: 2px;
+    }
+    .search-result h1 .result-url a {
+        color: #999;
+    }
+    .search-result p {
+        margin-bottom: 0;
+    }
+
+    .num-results {
+        display: inline-block;
+        margin-left: 20px;
+    }
+
+    .bottom-results-total {
+        text-align: center;
+        width: 100%;
+        overflow: visible;
+        padding-top: 20px;
+        margin: 0;
+    }
+
+    .bottom-nav {
+        overflow: hidden;
+        margin-top: -26px;
+    }
+    .bottom-nav ul {
+        margin-bottom: 0;
+        margin-left: 0;
+        padding: 0;
+        overflow: hidden;
+    }
+    .bottom-nav li {
+        float: left;
+        margin-left: 15px;
+    }
+    .bottom-nav li:first-child {
+        margin-left: 0;
+    }
+    .nav-back {
+        float: left;
+    }
+    .nav-back li:before {
+        content: "\2039"; /* left chevron &lsaquo; */
+        color: $ubuntu-orange;
+        margin-right: 5px;
+    }
+    .nav-back li.item-extreme:before {
+        content: "\2039\2039"; /* double left chevron &lsaquo; */
+    }
+    .nav-forward {
+        float: right;
+    }
+    .nav-forward li:after {
+        content: "\203A"; /* right chevron&nbsp;&rsaquo; */
+        color: $ubuntu-orange;
+        margin-left: 5px;
+    }
+    .nav-forward li.item-extreme:after {
+        content: "\203A\203A"; /* double right chevron&nbsp;&rsaquo; */
+    }
+
+    .error-notification {
+        background-color: #fdffdc;
+        color: #333;
+        padding: 20px;
+        -moz-box-sizing: border-box;
+        box-sizing: border-box;
+        width: 100%;
+        margin-top: 20px;
+        display: block;
+    }
+
+    .result-line {
+        color: #ada69e;
+    }
+    .results-top {
+        border-bottom: 1px dotted #dfdcd9;
+        padding-bottom: 0.5em;
+    }
+
+    .search-container {
+        padding-bottom: 0;
+    }
+}
+
+@media only screen and (min-width : 768px) {
+	.ubuntu-search {
+		.main-search {
+			button[type=submit] {
+				margin-left: -60px;
+				margin-top: 0;
+			}
+		}
+	}
+} /* end @media only screen and (min-width : 768px) */
diff --git a/static/css/section/server.scss b/static/css/section/server.scss
new file mode 100755
index 00000000000..ace18afdbf5
--- /dev/null
+++ b/static/css/section/server.scss
@@ -0,0 +1,210 @@
+/*	@section server
+--------------------------------------------------------------
+	Contents:
+		@section general
+		@section server-services
+-------------------------------------------------------------- */
+
+/*	@section general
+-------------------------------------------------------------- */
+
+body.server {
+	.row-hero { /* First bit of content on a page, normally contains h1 and sometimes a bit of blurb */
+		position: relative;
+
+		h2 {
+			color: $warm-grey;
+			padding-top: 20px;
+		}
+	}
+	th { font-weight: normal; }
+	tfoot th { font-weight:  bold; }
+	.button-right {
+		margin-top: 18px;
+		margin-bottom: 0;
+	}
+
+
+	.row-experts .eight-col,
+	.row-support .six-col { border-right: 1px dotted $warm-grey; }
+	.row-support .six-col { min-height: 6em; }
+	.row-experts .last-col,
+	.row-support .last-col {
+		border: 0;
+		width: (246/$base)em
+	}
+	.row-experts .last-col .link-cta-canonical { width: auto; }
+
+	.row-budget .box div {
+		border-bottom: 1px dotted $warm-grey;
+		margin-bottom: .769em;
+	}
+	.row-integration {
+		background: #efeeec url(../img/pictograms/pictogram-server-integration-352x90.png) 3em center no-repeat;
+		margin-bottom: 0;
+
+		div {
+			padding-left: $six-col;
+			padding-bottom: $gutter-width;
+		}
+	}
+	.row-landscape img {
+		height: auto;
+		max-width: 100%;
+	}
+	.row-community {
+		margin-bottom: 0;
+		border-bottom: 0;
+		padding: 40px 20px;
+	}
+	.row-community {	margin-bottom: 0; border-bottom: 0; }
+	.row-community .nine-col { background: #fff; }
+
+	.box-padded ul.inline-icons {
+		margin-bottom: 0;
+	}
+}
+
+
+.row-juju-maas div {
+	padding-bottom: 0;
+}
+
+
+/*	@section server-services
+-------------------------------------------------------------- */
+body.server-services .row-hero {
+	background-image: none;
+	border: 0;
+	padding-bottom: 0;
+}
+
+body.server-services .row-hero h2 {
+	background: none;
+	color: inherit;
+	padding: 0;
+	text-align: left;
+}
+
+body.server-services .packages {	margin-bottom: 20px; }
+
+body.server-services .packages h2 {
+	background: #efeeec url(../img/cloud/bg-servicesserver-owl-125x101.png) no-repeat 20px 50%;
+	width: 45.5%;
+	padding-top: 85px;
+	padding-bottom: 77px;
+}
+
+body.server-services .packages dd {	min-height: 10em; }
+body.server-services .packages dd.price {	min-height: 0; }
+body.server-services .packages .price-annual  {	top: 220px; }
+body.server-services .row-ubuntu-advantage { padding-bottom: 0; }
+body.server-services .row-ubuntu-advantage h3 { @include font_size (19.5); }
+body.server-services .row-ubuntu-advantage .list-details { margin-bottom: 0; }
+body.server-services .row-ubuntu-advantage li.first { height: 38.7em; }
+
+body.server-services .row-blockquote {
+	background: #e2d4dc;
+	padding-top: $gutter-width;
+	margin-bottom: 0;
+	padding-bottom: $gutter-width/2;
+}
+
+body.server-services .row-blockquote p.last {
+	padding-left: 25px;
+	display: block;
+	float: left;
+}
+
+body.server-services .row-blockquote p a { @include font_size (16); }
+
+body.server-services .row-enterprise {
+	padding-top: $gutter-width;
+	margin-bottom: 0;
+	overflow: hidden;
+}
+
+body.server-services .row-ubuntu-advantage { padding-top: 30px; }
+
+body.server-services .row-enterprise .quote-canonical {
+	margin-right: 20px;
+	padding: 20px 40px 0 80px;
+}
+
+body.server-services .row-methodology {
+	background: #e2d4dc;
+	padding-top: $gutter-width;
+}
+
+body.server-services .row-methodology .arrow-left {
+	bottom: auto;
+	top: 20px;
+}
+
+body.server-hyperscale h1 {
+  float: none;
+  margin-bottom: 18px;
+}
+
+body.server-contact-us .row-hero h2,
+body.server-thank-you .row-hero h2   {
+  color: #333;
+  padding-top: 0;
+}
+body.server-hyperscale {
+	.partner-logo {
+		margin-bottom: 10px;
+	}
+}
+
+
+/* Medium / Tablet viewport
+-------------------------------------------------------------- */
+@media only screen and (min-width : 769px) {
+	body.server {
+		.box-padded-feature {
+			.six-col {
+				border-right: 1px dotted $warm-grey;
+			}
+			.six-col.last-col {
+				border-right: 0;
+			}
+			.border-bottom {
+				border-bottom: 1px dotted $warm-grey;
+				padding-bottom: 10px;
+				margin-bottom: 10px;
+			}
+		}
+	}
+	body.server-hyperscale {
+		.partner-logo {
+			height: 105px;
+		}
+		.partner-logo img {
+			@include vertical-align;
+		}
+
+		.welcome-hyperscale {
+		  background-image: url("../img/server/hyperscale/image-server-hyperscale.svg");
+		  background-repeat: no-repeat;
+		  background-position: 575px center;
+		}
+	}
+	html.no-svg,
+	html.opera-mini {
+		body.server-hyperscale .welcome-hyperscale {
+	  		background-image: url("../img/server/hyperscale/image-server-hyperscale.png");
+	  	}
+	}
+
+	body.server-hyperscale .uawi {
+		background: url(../img/server/hyperscale/image-landscape.jpg) no-repeat top right $light-grey;
+		min-height: 460px;
+	}
+}
+
+/* Large / Desktop viewport
+-------------------------------------------------------------- */
+@media only screen and (min-width : 984px) {
+
+}
\ No newline at end of file
diff --git a/static/css/section/tablet.scss b/static/css/section/tablet.scss
new file mode 100755
index 00000000000..200795e239f
--- /dev/null
+++ b/static/css/section/tablet.scss
@@ -0,0 +1,496 @@
+/*	@section tablet
+--------------------------------------------------------------
+	Contents:
+		@section general
+		@section tablet home
+		@section Get in touch and thank you
+		@section app ecosystem
+		@section tablet animations
+		@section contextualised footer #context-footer
+
+-------------------------------------------------------------- */
+
+/*	@section general
+-------------------------------------------------------------- */
+.box-tablet {
+	background: url("../img/devices/devices-tablet-hero-432x252.jpg") no-repeat scroll 98% center #FFFFFF;
+	min-height: 15em;
+	padding-right: $six-col;
+}
+
+body.tablet  {
+
+  .instant-share {
+    .touch-top-left {
+      margin-top: -20px;
+      margin-left: -10px;
+    }
+  }
+
+  .row h2 + img {
+    margin-top: 20px;
+  }
+
+  .row-box-feature {
+  	background: url("../img/patterns/grey-textured-background.jpg");
+  }
+
+  .row-hero {
+    padding-top: 0;
+
+    .twelve-col { padding: 0 1em; }
+    .eight-col { margin-bottom: 0; }
+
+    a img {
+      vertical-align: middle;
+      margin-right: 10px;
+    }
+
+    a.close-video {
+      margin-top: 5px;
+      img {
+        vertical-align: top;
+      }
+    }
+  }
+
+  .row-bottom {
+  	background: none;
+  	border-bottom: 0;
+    padding-top: 0;
+    border-bottom: 0;
+
+    div {
+      min-height: 305px;
+    }
+
+    div p:first-of-type {
+      padding-right: 74px;
+    }
+    .meet-us {
+      background: url("../img/devices/phone-bottom-meet-us.png") no-repeat right 60px, url("../img/patterns/grey-textured-background.jpg");
+    }
+
+    .when-its-here {
+      background: url("../img/devices/phone-bottom-find-out.png") no-repeat right 60px, url("../img/patterns/grey-textured-background.jpg");
+    }
+  }
+	.box-highlight {
+		border: 0;
+		margin-bottom: 40px;
+	}
+  .box {
+    border: 0;
+    padding-bottom: 0;
+  }
+  .next-steps li {
+    border-bottom: 1px dotted $warm-grey;
+    padding: 8px 0 10px;
+  }
+  .next-steps li:first-child {
+    border-top: 1px dotted $warm-grey;
+  }
+  .row-build-a-tablet {
+    img {
+      margin-bottom: $gutter-width;
+    }
+  }
+}
+
+body.tablet-contact-us .row-hero,
+body.tablet-thank-you .row-hero {
+	min-height: 0;
+}
+
+/*	@section tablet home
+-------------------------------------------------------------- */
+body.tablet-design {
+  .row-hero {
+
+    .the-video {
+      .close-video {
+        display: none;
+      }
+      iframe {
+          width: 100%;
+      }
+    }
+
+    .mobile-video {
+      position: relative;
+      padding-bottom: 56.25%;
+      padding-top: 25px;
+      height: 0;
+      margin-bottom: 20px;
+
+      iframe {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+      }
+    }
+
+    .video-link {
+      display: none;
+    }
+
+    a {
+      outline: none;
+    }
+  }
+
+  /*.instant-share {
+    background: url("../img/tablet/image-tablet-videoplayershare.png") no-repeat scroll;
+    background-size: 100%;
+    padding-top: 100%;
+  }*/
+
+  .safer-sharing {
+    background: url("../img/tablet/image-tablet-safersharing-background.png") no-repeat scroll 0 0 #290E18;
+    color: #fff;
+  }
+}
+
+/*	@section Get in touch and thank you
+-------------------------------------------------------------- */
+body.tablet-contact-us,
+body.tablet-thank-you {
+
+  .row-hero {
+    height: auto;
+  }
+}
+
+body.tablet-operators-and-oems {
+
+  .row-dark-enterprise {
+    background: $dark-aubergine;
+    color: #fff;
+  }
+
+  .pull-quote {
+    margin-top: 80px;
+  }
+}
+
+/*	@section tablet animations
+-------------------------------------------------------------- */
+body.tablet {
+  .replay {
+    background: url("../img/devices/phone-animation-repeat.png") no-repeat;
+    width: 25px;
+    height: 21px;
+    overflow: hidden;
+    position: absolute;
+    outline: none;
+    top: 420px;
+    left: 280px;
+    display: none;
+  }
+
+  .replay:hover {
+    background-position: 0 -21px;
+  }
+
+  /*.slider-animation {
+    display: none;
+
+    & + a.replay {
+      display: none;
+    }
+  }*/
+
+  .row-tight .instant-launch {
+    .screen {
+      background: url("../img/tablet/image-tablet-album.png") no-repeat;
+      .launcher {
+        background: url("../img/devices/tablet-launcher.png") no-repeat;
+      }
+      .screen-fade {
+        background: #000;
+        opacity: 0;
+        width: 487px;
+        height: 306px;
+      }
+    }
+  }
+  .instant-launch.run {
+    .screen .launcher {
+        -moz-transition: left 1s;
+        -webkit-transition: left 1s;
+        -o-transition: left 1s;
+      transition: left 1s;
+      left: 0;
+      top: 0;
+    }
+    .screen .screen-fade {
+        -moz-transition-delay: 1s;
+        -webkit-transition-delay: 1s;
+        -o-transition-delay: 1s;
+      transition-delay: 1s;
+        -moz-transition: opacity 1s;
+        -webkit-transition: opacity 1s;
+        -o-transition: opacity 1s;
+      transition: opacity 1s;
+      opacity: 0.3;
+    }
+  }
+
+  .row-tight .system-service {
+    z-index: -1;
+    .screen {
+      background: url("../img/devices/tablet-google-doc-screen.png") no-repeat;
+      .messages {
+        background: url("../img/devices/tablet-messages.png") no-repeat;
+        height: 0;
+      }
+      .screen-fade {
+        background: #000;
+        opacity: 0;
+        width: 487px;
+        height: 306px;
+      }
+    }
+  }
+  .system-service.run {
+    .screen .messages {
+        -moz-transition: height .8s;
+        -webkit-transition: height .8s;
+        -o-transition: height .8s;
+      transition: height .8s;
+      height: 306px;
+    }
+    .screen .screen-fade {
+        -moz-transition-delay: .8s;
+        -webkit-transition-delay: .8s;
+        -o-transition-delay: .8s;
+      transition-delay: .8s;
+        -moz-transition: opacity .8s;
+        -webkit-transition: opacity .8s;
+        -o-transition: opacity .8s;
+      transition: opacity .8s;
+      opacity: 0.3;
+    }
+  }
+
+  .row-tight .content-controls {
+    .screen {
+      background: url("../img/tablet/image-tablet-videoplayer.png") no-repeat;
+      .menu {
+        position: relative;
+        background: url("../img/devices/tablet-media-controls.png") no-repeat;
+        top: 306px;
+        width: 487px;
+        height: 27px;
+      }
+    }
+  }
+  .content-controls.run {
+    .screen .menu {
+        -moz-transition: top .5s;
+        -webkit-transition: top .5s;
+        -o-transition: top .5s;
+      transition: top .5s;
+      top: 280px;
+    }
+  }
+}
+
+.yui3-js-enabled body.tablet .replay {
+  display: block;
+}
+
+@media only screen and (max-width : 769px) {
+  body.tablet .slider-animation {
+      -moz-transform: translate3d(100%, 50%, 1);
+      -webkit-transform: translate3d(100%, 50%, 1);
+     transform: translate3d(100%, 50%, 1);
+  }
+}
+
+/* Medium / Tablet viewport
+-------------------------------------------------------------- */
+@media only screen and (min-width : 768px) {
+  body.tablet-design {
+    .row-tight .four-col {
+      width: 100%;
+    }
+    .row-tight.no-border {
+      border-bottom: 1px dotted $warm-grey;
+    }
+    .gorgeous-gallery p,
+    .gorgeous-gallery h2 {
+      padding-left: 30px;
+      padding-right: 20px;
+    }
+    .instant-share {
+      .touch-top-left {
+        margin-top: -30px;
+        margin-left: -30px;
+      }
+    }
+  }
+  body.tablet  {
+
+    .row-tight {
+      overflow: hidden;
+    }
+    .naturally-neat h2 {
+      margin-top: 50px;
+    }
+    .row-build-a-tablet {
+      .last-col img {
+        margin-bottom: $gutter-width + 18;
+      }
+    }
+    .slider-animation {
+      width: 682px;
+      height: 433px;
+      position: relative;
+      background: url("../img/tablet/image-tablet-landscape.jpg") no-repeat;
+      margin: 0 auto;
+      display: block;
+
+      .screen {
+        width: 487px;
+        height: 306px;
+        position: absolute;
+        top: 47px;
+        left: 99px;
+        overflow: hidden;
+
+        .launcher {
+          width: 44px;
+          height: 324px;
+          position: absolute;
+          top: 0;
+          left: -100px;
+        }
+
+        .messages {
+          width: 155px;
+          height: 0px;
+          position: absolute;
+          top: 0;
+          right: 0;
+        }
+      }
+      & + a.replay {
+        display: block;
+      }
+    }
+  }
+
+  body.tablet-design {
+    .gorgeous-gallery {
+      background: url("../img/tablet/image-tablet-gorgeousgallery-1-medium.jpg"), url("../img/tablet/image-tablet-gorgeousgallery-2-medium.jpg");
+      background-repeat: no-repeat;
+      background-position: left 40px, right 40px;
+      background-color: $light-grey;
+      height: 666px;
+    }
+  }
+  body.tablet-design .row-hero {
+      -moz-transition: height 0.3s linear;
+      -webkit-ttransition: height 0.3s linear;
+      -o-transition: height 0.3s linear;
+    transition: height 0.3s linear;
+
+    .the-video {
+      position: absolute;
+      left: 0;
+      height: 554px;
+      width: 100%;
+      background: #fff;
+      display: none;
+
+      p {
+        padding: 5px;
+        margin: 0 $gutter-width/2 0 $gutter-width;
+      }
+
+      div {
+        margin-top: 20px;
+      }
+
+      .close-video {
+        display: block;
+      }
+
+    }
+    .mobile-video {
+      display: none;
+    }
+
+    .the-video.show {
+      display: block;
+      z-index: 10;
+    }
+    .video-link {
+      display: block;
+      margin-top: 30px;
+    }
+  }
+}
+/* Large / Desktop viewport
+-------------------------------------------------------------- */
+@media only screen and (min-width : 984px) {
+  body.tablet  {
+    .row-tight {
+      padding-top: 0;
+      .four-col {
+	      width: 31.91489%;
+      }
+    }
+    .row img.shadow-fix {
+      margin-left: -40px;
+    }
+    .slider-animation {
+      width: 682px;
+    }
+
+    .row-tight .instant-launch,
+    .row-tight .content-controls {
+      margin-left: -50px;
+    }
+    .row-tight .system-service {
+      margin-left: -40px;
+    }
+    .row-tight.no-border {
+      border-bottom: 0;
+    }
+
+    .row-tight h3 {
+      margin-top: 40px;
+    }
+    .gorgeous-gallery p,
+    .gorgeous-gallery h2 {
+      padding-left: 0;
+      padding-right: 0;
+    }
+
+    .instant-share {
+      background: url("../img/tablet/image-tablet-videoplayershare.png") no-repeat scroll;
+      height: 480px;
+    }
+
+    .world-of-apps {
+      background: url("../img/tablet/image-tablet-worldofapps.jpg") no-repeat scroll right 57px;
+    }
+  }
+  body.tablet-app-ecosystem {
+    .write-apps {
+      background: url("../img/tablet/app-ecosystem/image-tablet-softwarecentre.jpg") no-repeat scroll right 55px;
+    }
+  }
+  .tablet-context-footer .feature-three {
+    background: url(../img/devices/phone-bottom-find-out.png) right center no-repeat;
+    min-height: 170px;
+
+    p {
+      padding-right: 65px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/static/css/section/third-party.scss b/static/css/section/third-party.scss
new file mode 100755
index 00000000000..2d4bc6365d9
--- /dev/null
+++ b/static/css/section/third-party.scss
@@ -0,0 +1,8 @@
+
+/* live chat plugin */
+#livechat-eye-catcher {
+  display: none;
+}
+#livechat-compact-container {
+  z-index: 90 !important;
+}
diff --git a/static/css/section/tv.scss b/static/css/section/tv.scss
new file mode 100755
index 00000000000..78d75fd84f5
--- /dev/null
+++ b/static/css/section/tv.scss
@@ -0,0 +1,121 @@
+/*	@section tv
+--------------------------------------------------------------
+	Contents:
+		@section general
+		@section experience
+		@section commercial-info & contributors
+
+-------------------------------------------------------------- */
+
+/*	@section general
+-------------------------------------------------------------- */
+
+
+body.tv .row-hero p { padding-left: 0; }
+.box-tv {
+	min-height: 15em;
+	padding-right: $six-col;
+}
+
+.box-tv { background: #fff url(../img/devices/photo-industry-tv-427x247.jpg) 95% center no-repeat; }
+
+.tv .no-margin { margin-bottom: 0; }
+
+body.tv .row-hero iframe { margin-bottom: 20px }
+body.tv-experience {
+	blockquote.quote-grey br {
+		display: block;
+	}
+}
+body.tv-features-and-specs .inline-icons li { margin-top: 1.25em; margin-bottom: 0; }
+
+body.tv-features-and-specs .row-hero h2 { margin-bottom: 1em; }
+
+
+
+/*	@section experience
+-------------------------------------------------------------- */
+body.tv-experience .row-hero {
+	overflow: hidden;
+}
+
+.row-tv-start .box {
+	background: url(../img/pictograms/pictogram-develop-125x125.png) $two-col top no-repeat;
+	padding-left: $six-col/* - $grid-gutter/*/;
+}
+
+.row-tv-talk {
+	@include rounded_corners(0);
+	padding-top: 0;
+}
+
+.row-tv-talk .box {
+	background: $light-grey;
+}
+
+/*	@section commercial-info & contributors
+-------------------------------------------------------------- */
+.tv-commercial-info .row-terms .article,
+.tv-commercial-info .row-maintenance .article,
+.row-contributors .article,
+.row-get-involved .article {
+	background-position: $nine-col 48px;
+	background-repeat: no-repeat;
+	padding: 0 $four-col $gutter-width 0;
+}
+
+.tv-commercial-info .row-terms .article {
+	background-image: url(../img/pictograms/pictogram-partner-124x124.png);
+}
+
+.tv-commercial-info .row-maintenance .article {
+	background-image: url(../img/pictograms/pictogram-upgrade-124x124.png);
+}
+
+.tv-commercial-info .row-engineering .article {
+	background-image: url(../img/pictograms/pictogram-engineering-124x124.png);
+}
+
+body.tv .row-tv-contact {
+	border-bottom: 0;
+	padding: 20px 0 20px $grid-gutter;
+}
+
+
+/* Medium / Tablet viewport
+-------------------------------------------------------------- */
+@media only screen and (min-width : 768px) {
+
+
+	body.tv-experience .row-hero h2,
+	body.tv-industry .row-hero h2,
+	body.tv-features-and-specs .row-hero h2 { @include font_size (25); }
+}
+
+/* Large / Desktop viewport
+-------------------------------------------------------------- */
+@media only screen and (min-width : 984px) {
+	body.tv-experience {
+	 	.row-hero .intro {
+			padding: 0 $seven-col 2em 0;
+			margin: 0;
+		}
+		.inner-wrapper .row-hero .intro img {
+			position: absolute;
+			right: -120px;
+			bottom: -35px;
+		}
+	}
+	body.tv #context-footer .feature-two {
+		background: url(../img/pictograms/picto-pack/picto-developer-warmgrey.svg) 95% 20px no-repeat;
+		background-size: 125px 125px;
+
+		p {
+			padding-right: 60px;
+		}
+	}
+	html.no-svg,
+	html.opera-mini {
+		background-image: url(../img/pictograms/pictogram-develop-125x125.png);
+	}
+}
\ No newline at end of file
diff --git a/templates/static/css/section/ubuntu.scss b/static/css/section/ubuntu.scss
old mode 100644
new mode 100755
similarity index 76%
rename from templates/static/css/section/ubuntu.scss
rename to static/css/section/ubuntu.scss
index 236fa2adf1a..ea371f5e064
--- a/templates/static/css/section/ubuntu.scss
+++ b/static/css/section/ubuntu.scss
@@ -2,12 +2,12 @@
 /* ---------------------------------------------------------------
 ------------------------------------------------------------------
 	DO NOT EDIT UBUNTU.CSS
-	It is autogenerated. 
-	
+	It is autogenerated.
+
 	Project:		Ubuntu Front-End Ubuntu section
 	Author:			Web Team at Canonical Ltd
-	Last edited by: 
-  
+	Last edited by:
+
   	CONTENTS:
 	-----------------------------------------------------------------
 	@section ubuntu
@@ -24,62 +24,62 @@
 	@section Needs to go into patterns
 
 	@this may turn into a pattern
-	
+
 	Rounded corners
 	-----------------------------------------------------------------
 	@include rounded_corners(top-left top-right bottom-right bottom-left);
 		examples
 		@include rounded_corners(0 0 4px 4px); rounded bottoms
 		@include rounded_corners(4px); all corners rounded
-		
+
 	Base grid sass, this lives in /sites/core/static/css/core-grid.scss
 	-----------------------------------------------------------------
 	$base: 			16;
 	$column_width:	( 60 / $base )em;
-	$gutter_width: 	( 20 / $base )em;
+	$gutter-width: 	( 20 / $base )em;
 	$grid_column: 	( 57 / $base )em; nested columns
-	$grid_gutter: 	( 18 / $base )em;
-	
+	$grid-gutter: 	( 18 / $base )em;
+
 	Available grid widths
 	-----------------------------------------------------------------
-	$one_col - 100%
+	$one-col - 100%
 
 	Using these enables us to give individual elements specific widths without adding a static width:
 
-	padding: $gutter_width;
-	width: 100% - ( 2 * $gutter_width );
+	padding: $gutter-width;
+	width: 100% - ( 2 * $gutter-width );
 
 	Colour definitiions are in /sites/core/static/css/core-constants.scss
 	-----------------------------------------------------------------
-	$ubuntu_orange:			#DD4814; ubuntu orange (used for text links also on any site except canonical) 
-	$canonical_aubergine:	#772953; canonical aubergine 
-	$light_aubergine:		#77216F; light aubergine (Consumer) 
-	$mid_aubergine:			#5E2750; mid aubergine (Both) 
-	$dark_aubergine:		#2C001E; dark aubergine (Enterprise) 
-	$warm_grey:				#AEA79F; warm grey 
-	$cool_grey:				#333333; cool grey
-	$light_grey:			#F7F7F7; light grey
-	
-	notifications 
-	$error:					#DF382C; red 
-	$warning:				#ECA918; yellow 
-	$success:				#38B44A; green 
-	$information:			#19B6EE; cyan 
-	
-	colour coded status - from negative to positive (Icon: canonical circle) 
-	$status_red:			#DF382C; Red, for status that require immediate attention 
-	$status_grey:			#AEA79F; Grey, for disabled status or ones that don�t require attention 
-	$status_yellow:			#EFB73E; Yellow, for status that require attention 
-	$status_blue:			#19B6EE; Blue, for status that don�t require action 
-	$status_green:			#38B44A; Green, for positive status 
-	
-	misc colours 
-	$box_solid_grey:		#EFEFEF;
-			
+	$ubuntu-orange:			#DD4814; ubuntu orange (used for text links also on any site except canonical)
+	$canonical-aubergine:	#772953; canonical aubergine
+	$light-aubergine:		#77216F; light aubergine (Consumer)
+	$mid-aubergine:			#5E2750; mid aubergine (Both)
+	$dark-aubergine:		#2C001E; dark aubergine (Enterprise)
+	$warm-grey:				#888888; warm grey
+	$cool-grey:				#333333; cool grey
+	$light-grey:			#F7F7F7; light grey
+
+	notifications
+	$error:					#DF382C; red
+	$warning:				#ECA918; yellow
+	$success:				#38B44A; green
+	$information:			#19B6EE; cyan
+
+	colour coded status - from negative to positive (Icon: canonical circle)
+	$status-red:			#DF382C; Red, for status that require immediate attention
+	$status-grey:			#888888; Grey, for disabled status or ones that don�t require attention
+	$status-yellow:			#EFB73E; Yellow, for status that require attention
+	$status-blue:			#19B6EE; Blue, for status that don�t require action
+	$status-green:			#38B44A; Green, for positive status
+
+	misc colours
+	$box-solid-grey:		#EFEFEF;
+
 	Notes:
 	-----------------------------------------------------------------
 	Using '.yui3-js-enabled' for CSS with JS enabled as it's there for free atm, be nice to have just js-enabled as a class.
-		
+
 -----------------------------------------------------------------
 -------------------------------------------------------------- */
 
@@ -108,7 +108,7 @@ body.ubuntu {
       text-align: center;
       width: 24.8%;
       margin-top:20px;
-        
+
       a {
         background: url(../img/pictograms/sprite-pictograms-get-ubuntu-66x772.png) top center no-repeat;
         display:block;
@@ -119,7 +119,7 @@ body.ubuntu {
     li.cd a { background-position: center -303px; }
     li.windows a { background-position: center -606px; }
     li.download a { background-position: center -919px; }
-    
+
     li a:hover { background-position: center -161px; }
     li.cd a:hover { background-position: center -464px; }
     li.windows a:hover { background-position: center -767px; }
@@ -144,13 +144,13 @@ img.meet-laptop {
 /* @subsection ubuntu > whats-new */
 body.row-whats-new-hero .seven-col img {
 	margin-top: 10px;
-	margin-left: -20px;	
+	margin-left: -20px;
 }
 body.ubuntu-take-the-tour .seven-col img {
 	margin-top: 10px;
 	float: right;
 }
-.ubuntu-whats-new .row { border-bottom: 1px dotted $warm_grey; }
+.ubuntu-whats-new .row { border-bottom: 1px dotted $warm-grey; }
 .ubuntu-whats-new .row-last, .ubuntu-whats-new .row:last-child { border-bottom: 0; }
 .ubuntu-whats-new .row:last-child { margin-bottom: 0; }
 .box-full-screengrab {
@@ -170,12 +170,12 @@ body.ubuntu-take-the-tour .seven-col img {
 		position: absolute;
 		width: 34px;
 		/*text-indent: -999em;*/
-		
+
 	span {
 		@include rounded_corners(4px);
 		display: inline;
 		background: #fff;
-		color: $warm_grey;
+		color: $warm-grey;
 		position: absolute;
 		top: 45px;
 		color: #333;
@@ -187,35 +187,35 @@ body.ubuntu-take-the-tour .seven-col img {
 		border: 4px solid #ffffff;
 		left: -19px;
 		}
-		span:after, .span:before { 
-			bottom: 100%; 
-			border: solid transparent; 
-			content: " "; 
-			height: 0; 
-			width: 0; 
-			position: absolute; 
-			pointer-events: none; 
-		} 
-		span:after { 
-			border-color: rgba(255, 255, 255, 0); 
-			border-bottom-color: #ffffff; 
-			border-width: 15px; 
-			left: 10%; 
-			margin-left: -15px; 
-		} 
-		span:before { 
-			border-color: rgba(255, 255, 255, 0); 
-			border-bottom-color: #ffffff; 
-			border-width: 21px; 
-			left: 10%; 
-			margin-left: -21px; 
+		span:after, .span:before {
+			bottom: 100%;
+			border: solid transparent;
+			content: " ";
+			height: 0;
+			width: 0;
+			position: absolute;
+			pointer-events: none;
+		}
+		span:after {
+			border-color: rgba(255, 255, 255, 0);
+			border-bottom-color: #ffffff;
+			border-width: 15px;
+			left: 10%;
+			margin-left: -15px;
+		}
+		span:before {
+			border-color: rgba(255, 255, 255, 0);
+			border-bottom-color: #ffffff;
+			border-width: 21px;
+			left: 10%;
+			margin-left: -21px;
 		}
 	}
-	
+
 	.marker:hover span, .box-full-screengrab:hover span {
       display: none;
     }
-    
+
     .box-full-screengrab:hover .marker:hover span { display: inline; }
 
 	.marker-1 {
@@ -254,17 +254,17 @@ body.ubuntu-take-the-tour .seven-col img {
 	    left: 252px;
 	    top: 105px;
 	}
-	
+
 	.row-web-apps .marker-1 {
 		left: 22px;
 		top: 152px;
 	}
-	
+
 	.row-online-search .marker-1 {
     	left: 190px;
     	top: 22px;
 	}
-	
+
 	.row-dash-previews .marker-1 {
     	left: auto;
     	right: 320px;
@@ -289,12 +289,12 @@ body.ubuntu-take-the-tour .seven-col img {
 
 .ubuntu-why-use-ubuntu .row-hero {
 	@include rounded_corners(4px);
-	background: $light_grey url(../img/ubuntu/screenshot-whyuse-464x334.png) top right no-repeat;
+	background: $light-grey url(../img/ubuntu/screenshot-whyuse-464x334.png) top right no-repeat;
 	min-height: 18em;
 }
 
 .ubuntu-why-use-ubuntu .row-hero .box {
-	background: $light_grey;
+	background: $light-grey;
 	padding-top: 60px;
 	padding-left: 57px;
 }
@@ -323,27 +323,27 @@ body.ubuntu-take-the-tour .seven-col img {
 /* .ubuntu-why-use-ubuntu */ .row-download .article {
 	background: url(../img/ubuntu/whyuse-laptop-356x217.jpg) 20px 20px no-repeat;
 	min-height: (230/$base)em;
-	padding-left: $six_col;
-	padding-right: $one_col;
-	padding-top: 20px; 
+	padding-left: $six-col;
+	padding-right: $one-col;
+	padding-top: 20px;
 }
 .ubuntu-why-use-ubuntu {
-  
+
   .row { margin-bottom: 2px; }
-  
+
   .row-quote {
     @include rounded_corners(4px);
     background: #fcece7;
     border: 0;
     padding-bottom: 0;
-    
+
     blockquote{
       @include font_size (24);
       margin-bottom: 0;
     }
-    
+
     p {
-      color: $ubuntu_orange;
+      color: $ubuntu-orange;
       margin-bottom: 0;
     }
   }
@@ -357,24 +357,24 @@ body.ubuntu-take-the-tour .seven-col img {
 
 .ubuntu-why-use-ubuntu .row-tour .article {
 	background: url(../img/ubuntu/features/screenshot-features-music-main-614x326.png) 490px 6px no-repeat;
-	padding: 50px $seven_col 60px 100px;
+	padding: 50px $seven-col 60px 100px;
 	margin: 0;
 	margin-right: 40px;
 }
 
 .ubuntu .row-community {
 	@include rounded_corners(4px);
-	background: $light_grey url(../img/pictograms/pictogram-community-193x174.png) 60px center no-repeat;
-	padding: (2 * $gutter_width) $one_col (2 * $gutter_width) $six_col;
+	background: $light-grey url(../img/pictograms/pictogram-community-193x174.png) 60px center no-repeat;
+	padding: (2 * $gutter-width) $one-col (2 * $gutter-width) $six-col;
 }
 
 .ubuntu-why-use-ubuntu .row-free {
 	@include rounded_corners(4px);
-	background: $ubuntu_orange;
+	background: $ubuntu-orange;
 	color: #fff;
 	margin: ( 4 / $base )em 20px;
 	overflow: hidden;
-	padding: ( 2 * $gutter_width) 0 $gutter_width 77px;
+	padding: ( 2 * $gutter-width) 0 $gutter-width 77px;
 }
 
 .ubuntu-why-use-ubuntu .row-free p, .ubuntu-why-use-ubuntu .row-free h2 {
@@ -395,11 +395,11 @@ body.ubuntu-take-the-tour .seven-col img {
 
 .row-no-viruses ul { margin-bottom: 0; }
 
-.row-no-viruses .seven-col { 
-	padding-top: ( 2 * $gutter_width); 
+.row-no-viruses .seven-col {
+	padding-top: ( 2 * $gutter-width);
 }
 
-#postit { margin-top: $gutter_width; }
+#postit { margin-top: $gutter-width; }
 
 #postit li {
 	@include font_size (20);
@@ -416,14 +416,14 @@ body.ubuntu-take-the-tour .seven-col img {
 #postit li.worries { background-image: url(../img/pictograms/pictogram-notes-thanks-41x41.png); }
 
 .ubuntu-why-use-ubuntu .row-support .box {
-	padding: ( 2 * $gutter_width ) $one_col ( 2 * $gutter_width ) $six_col;
+	padding: ( 2 * $gutter-width ) $one-col ( 2 * $gutter-width ) $six-col;
 	background-image: url(../img/pictograms/pictogram-local-184x182.png);
-	background-position:  $one_col center;
+	background-position:  $one-col center;
 	background-repeat:  no-repeat;
 }
 
 .row-updates .article {
-	background: url(../img/pictograms/pictograms-updates-400x107.png) $six_col center no-repeat;
+	background: url(../img/pictograms/pictograms-updates-400x107.png) $six-col center no-repeat;
 }
 
 .ubuntu-why-use-ubuntu .row-download-ready {
@@ -436,32 +436,32 @@ body.ubuntu-take-the-tour .seven-col img {
 .ubuntu-why-use-ubuntu .row-download-ready .article {
 	color: #fff;
 	overflow: hidden;
-	padding: ( 2 * $gutter_width ) 0 ( 4 * $gutter_width ) $one_col;
+	padding: ( 2 * $gutter-width ) 0 ( 4 * $gutter-width ) $one-col;
 	@include rounded_corners(4px);
 }
 
 .ubuntu-why-use-ubuntu .row-download-ready .article a.link-arrow { color: #C9A9BA; }
 
-.ubuntu-why-use-ubuntu .row-download-ready a.link-cta-canonical { 
-	color: $canonical_aubergine; 
+.ubuntu-why-use-ubuntu .row-download-ready a.link-cta-canonical {
+	color: $canonical-aubergine;
 	float: left;
 }
 
 .ubuntu-why-use-ubuntu .row-download-ready img {
 	position: absolute;
-	right: -$one_col;
-	top: $gutter_width;
+	right: -$one-col;
+	top: $gutter-width;
 }
 
 /* @subsection ubuntu > why-is-it-free */
 body.ubuntu-why-is-it-free .box-tour,
 body.ubuntu-why-is-it-free .box-download {
-	background: $canonical_aubergine;
+	background: $canonical-aubergine;
 	border: 0;
 	color: #fff;
 }
 
-body.ubuntu-why-is-it-free .box-tour a, 
+body.ubuntu-why-is-it-free .box-tour a,
 body.ubuntu-why-is-it-free .box-download a {
 	color: #fff;
 }
@@ -470,7 +470,7 @@ body.ubuntu-why-is-it-free .row-do-more a:after {
 	content: "";
 }
 
-body.ubuntu-why-is-it-free .box-download { background: $ubuntu_orange; }
+body.ubuntu-why-is-it-free .box-download { background: $ubuntu-orange; }
 
 body.ubuntu-why-is-it-free ol.numbered-list {
 	margin-left: -20px;
@@ -480,12 +480,12 @@ body.ubuntu-why-is-it-free ol.numbered-list {
 ol.numbered-list li {
 	@include rounded_corners(4px);
 	float: left;
-	margin-bottom: (2/$base)em; /* 2px in em  + $gutter_width */
-	padding: 3.076em 0 0 80px;	
+	margin-bottom: (2/$base)em; /* 2px in em  + $gutter-width */
+	padding: 3.076em 0 0 80px;
 }
 
 ol.numbered-list .item-one {
-	background: $light_grey url("../img/patterns/fieldsets-1.png") -14px -14px no-repeat;
+	background: $light-grey url("../img/patterns/fieldsets-1.png") -14px -14px no-repeat;
 }
 
 ol.numbered-list .item-two {
@@ -501,12 +501,12 @@ body.ubuntu-why-is-it-free ol.numbered-list .item-two img {
 	top: -50px;
 }
 
-.intro img.right { margin-right: -$grid_gutter; }
+.intro img.right { margin-right: -$grid-gutter; }
 
 body.ubuntu .intro img.right { margin-right: -20px; }
 
 .box-full-image {
-	border-bottom: 1px dotted $warm_grey; 
+	border-bottom: 1px dotted $warm-grey;
   float: left;
   height: 306px;
   margin: -20px 0 1.538em -18px;
diff --git a/static/css/section/widgets.scss b/static/css/section/widgets.scss
new file mode 100755
index 00000000000..13adc191f8f
--- /dev/null
+++ b/static/css/section/widgets.scss
@@ -0,0 +1,42 @@
+/* insights blog widget */
+#insights-feed ul { display: table; }
+
+#insights-feed ul li {
+	line-height: 1.4;
+	float: none;
+}
+
+#insights-feed ul li a {
+	display: block;
+	margin-bottom: 6px;
+}
+
+#insights-feed ul li span {
+	text-transform: uppercase;
+}
+
+#insights-feed ul li span.date {
+	text-transform: none;
+}
+
+#insights-feed ul li:first-child {
+	padding-left: 0;
+}
+
+#insights-feed ul li:last-child {
+	margin-right: 0;
+}
+
+/* Medium / Tablet viewport
+-------------------------------------------------------------- */
+@media only screen and (min-width : 769px) {
+	#insights-feed ul li {
+		display: table-cell;
+		padding-left: 20px;
+	}
+}
+
+/* non js enterprise promo */
+.yui3-js-enabled .row-enterprise-blog {
+	display: none;
+}
\ No newline at end of file
diff --git a/templates/static/css/styles.scss b/static/css/styles.scss
old mode 100644
new mode 100755
similarity index 80%
rename from templates/static/css/styles.scss
rename to static/css/styles.scss
index 063fd503b8e..d830ef7bb69
--- a/templates/static/css/styles.scss
+++ b/static/css/styles.scss
@@ -1,4 +1,5 @@
 @charset "UTF-8";
+
 /* ---------------------------------------------------------------
 ------------------------------------------------------------------
 	DO NOT EDIT STYLES.CSS
@@ -38,29 +39,29 @@
 	-----------------------------------------------------------------
 	$base: 			16;
 	$column_width:	( 60 / $base )em;
-	$gutter_width: 	( 20 / $base )em;
+	$gutter-width: 	( 20 / $base )em;
 	$grid_column: 	( 57 / $base )em; nested columns
-	$grid_gutter: 	( 18 / $base )em;
+	$grid-gutter: 	( 18 / $base )em;
 
 	Available grid widths
 	-----------------------------------------------------------------
-	$one_col - $twelve_col
+	$one-col - $twelve_col
 
 	Using these enables us to give individual elements specific widths without adding a static width:
 
-	padding: $gutter_width;
-	width: $twelve_col - ( 2 * $gutter_width );
+	padding: $gutter-width;
+	width: $twelve_col - ( 2 * $gutter-width );
 
 	Colour definitiions are in /sites/core/static/core-constants.scss
 	-----------------------------------------------------------------
-	$ubuntu_orange:			#dd4814; ubuntu orange (used for text links also on any site except canonical)
-	$canonical_aubergine:	#772953; canonical aubergine
-	$light_aubergine:		#77216f; light aubergine (consumer)
-	$mid_aubergine:			#5e2750; mid aubergine (both)
-	$dark_aubergine:		#2c001e; dark aubergine (enterprise)
-	$warm_grey:				#aea79f; warm grey
-	$cool_grey:				#333333; cool grey
-	$light_grey:			#f7f7f7; light grey
+	$ubuntu-orange:			#dd4814; ubuntu orange (used for text links also on any site except canonical)
+	$canonical-aubergine:	#772953; canonical aubergine
+	$light-aubergine:		#77216f; light aubergine (consumer)
+	$mid-aubergine:			#5e2750; mid aubergine (both)
+	$dark-aubergine:		#2c001e; dark aubergine (enterprise)
+	$warm-grey:				#888888; warm grey
+	$cool-grey:				#333333; cool grey
+	$light-grey:			#f7f7f7; light grey
 
 	Notifications
 	$error:					#df382c; red
@@ -69,16 +70,16 @@
 	$information:			#19b6ee; cyan
 
 	Colour coded status - from negative to positive (icon: canonical circle)
-	$status_red:			#df382c; red, for status that require immediate attention
-	$status_grey:			#aea79f; grey, for disabled status or ones that don’t require attention
-	$status_yellow:			#efb73e; yellow, for status that require attention
-	$status_blue:			#19b6ee; blue, for status that don’t require action
-	$status_green:			#38b44a; green, for positive status
+	$status-red:			#df382c; red, for status that require immediate attention
+	$status-grey:			#888888; grey, for disabled status or ones that don’t require attention
+	$status-yellow:			#efb73e; yellow, for status that require attention
+	$status-blue:			#19b6ee; blue, for status that don’t require action
+	$status-green:			#38b44a; green, for positive status
 
 	misc colours
-	$box_solid_grey:		#efefef;
+	$box-solid-grey:		#efefef;
 
-	$link_color:			$ubuntu_orange; This is the global link color, mainly used for links in content
+	$link-color:			$ubuntu-orange; This is the global link color, mainly used for links in content
 
 	Notes:
 	-----------------------------------------------------------------
@@ -93,13 +94,6 @@ core scss files are in /sites/core/static/css
 -------------------------------------------------------------- */
 @import "core-constants";
 @import "core-mixins";
-@import "core-grid";
-/*
-@import "core";
-@import "core-templates";
-@import "core-pattern";
-*/
-//@import "responsive";
 
 @import "scratch";
 
@@ -119,13 +113,13 @@ core scss files are in /sites/core/static/css
 -------------------------------------------------------------- */
 @import "section/download";
 
-/*	@section ubuntu
+/*	@section legal
 -------------------------------------------------------------- */
-//@import "section/ubuntu";
+@import "section/legal";
 
-/*	@section devices
+/*	@section search
 -------------------------------------------------------------- */
-//@import "section/devices";
+@import "section/search";
 
 /*	@section desktop
 -------------------------------------------------------------- */
@@ -171,6 +165,11 @@ core scss files are in /sites/core/static/css
 -------------------------------------------------------------- */
 @import "section/local";
 
+/*  @section thirdy party
+-------------------------------------------------------------- */
+@import "section/third-party";
+
+
 /*  @ie specific
 -------------------------------------------------------------- */
 //@import "ie/ie8";
diff --git a/templates/static/files/humans.txt b/static/files/humans.txt
old mode 100644
new mode 100755
similarity index 100%
rename from templates/static/files/humans.txt
rename to static/files/humans.txt
diff --git a/templates/static/js/core.js b/static/js/core.js
old mode 100644
new mode 100755
similarity index 91%
rename from templates/static/js/core.js
rename to static/js/core.js
index 367d449f868..d0b6d72a0a1
--- a/templates/static/js/core.js
+++ b/static/js/core.js
@@ -144,7 +144,10 @@ YUI().use('node', 'anim', function(Y) {
 	}
 
 	core.sectionTabs = function() {
+
 		if(Y.one('.tabbed-content')) {
+			Y.one('.tabbed-menu').append('<img src="/static/u/img/patterns/tabbed-nav-arrow.png" class="arrow" height="6" width="12" alt="">');
+
 			var p = Y.one('.tabbed-menu a.active');
 			var s = p.get('href').split('#')[1];
 			var a = Y.one('.arrow');
@@ -172,9 +175,20 @@ YUI().use('node', 'anim', function(Y) {
 
 	}
 
+	core.svgFallback = function() {
+		if(Modernizr){
+			if (!Modernizr.svg || !Modernizr.backgroundsize) {
+				Y.all("img[src$='.svg']").each(function(node) {
+					node.setAttribute("src", node.getAttribute('src').toString().match(/.*\/(.+?)\./)[0]+'png');
+				});
+			}
+		}
+	};
+
 	core.sectionTabs();
 	core.hashBang();
 	core.setEqualHeight('equal-height');
 	core.getPullQuotes();
 	core.setupTooltips();
+	core.svgFallback();
 });
\ No newline at end of file
diff --git a/templates/static/js/custom/demo-patterns.js b/static/js/custom/demo-patterns.js
old mode 100644
new mode 100755
similarity index 100%
rename from templates/static/js/custom/demo-patterns.js
rename to static/js/custom/demo-patterns.js
diff --git a/templates/static/js/custom/mrkto-toggle.js b/static/js/custom/mrkto-toggle.js
old mode 100644
new mode 100755
similarity index 100%
rename from templates/static/js/custom/mrkto-toggle.js
rename to static/js/custom/mrkto-toggle.js
diff --git a/templates/static/js/error.js b/static/js/error.js
old mode 100644
new mode 100755
similarity index 98%
rename from templates/static/js/error.js
rename to static/js/error.js
index dd3cb1d1332..295439cc5ff
--- a/templates/static/js/error.js
+++ b/static/js/error.js
@@ -2,9 +2,9 @@
  * Ubuntu Core Front-End Framework
  *
  * Core javascript file part of Ubuntu Core Front-End Framework
- * 
- * This file containes the error object used to record javascript errors. 
- * 
+ *
+ * This file containes the error object used to record javascript errors.
+ *
  * @project		Ubuntu Core Front-End Framework
  * @author		Web Team at Canonical Ltd
  * @copyright	2012 Canonical Ltd
@@ -17,14 +17,14 @@ function ErrorSystem($debug){
 	var displaying = false;
 	var messageArray = new Array();
 	var notificationTimeout = null;
-	
+
 	this.report = function($message, $description){
 		messageArray.push(new Error($message, $description));
 		if(!displaying){
 			this.showNotification();
 		}
 	}
-	
+
 	this.showNotification = function(){
 		if(_debug){
 			displaying = true;
@@ -37,7 +37,7 @@ function ErrorSystem($debug){
 			});
 		}
 	}
-	
+
 	this.startTimeout = function(){
 		YUI().use('node', function (Y) {
 			notificationTimeout = setTimeout(function() {
@@ -46,7 +46,7 @@ function ErrorSystem($debug){
 			}, 4000);
 		});
 	}
-	
+
 	this.killTimeout = function(){
 		YUI().use('node', function (Y) {
 			var notification = Y.one('.notification');
@@ -59,14 +59,14 @@ function ErrorSystem($debug){
 		displaying = false;
 		_this.runNext();
 	}
-	
+
 	this.runNext = function(){
 		messageArray.splice(0,1);
 		if(messageArray.length > 0){
 			this.showNotification();
 		}
 	}
-	
+
 	this.stopTimeout = function(){
 		clearInterval(notificationTimeout);
 		notificationTimeout = null;
@@ -76,13 +76,13 @@ function ErrorSystem($debug){
 function Error($message, $description){
 	if($message == undefined){ $message = "Error: Blank error"; }
 	if($description == undefined){ $description = ""; }
-	
+
 	var _message = $message;
 	var _description = $description;
-	
+
 	this.message = function(){ return _message; }
 	this.description = function(){ return _description; }
-	
+
 	this.setMessage = function($message){ _message = $message; }
 	this.setDescription = function($description){ _description = $description; }
 }
\ No newline at end of file
diff --git a/templates/static/js/found_js.txt b/static/js/found_js.txt
old mode 100644
new mode 100755
similarity index 100%
rename from templates/static/js/found_js.txt
rename to static/js/found_js.txt
diff --git a/templates/static/js/global.js b/static/js/global.js
old mode 100644
new mode 100755
similarity index 94%
rename from templates/static/js/global.js
rename to static/js/global.js
index 0b4f141159b..bb404975b2d
--- a/templates/static/js/global.js
+++ b/static/js/global.js
@@ -3,20 +3,21 @@ var ai = [{ url: "http://www.ubuntu.com", title:"Ubuntu" },
 { url: "http://community.ubuntu.com/", title:"Community" },
 { url: "http://askubuntu.com", title:"Ask!" },
 { url: "http://developer.ubuntu.com", title:"Developer" },
-{ url: "http://design.ubuntu.com", title:"Design" },
+{ url: "https://design.ubuntu.com", title:"Design" },
 { 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: "http://shop.ubuntu.com", title:"Shop" }];
 
 var more = [{ url: "http://apps.ubuntu.com", title:"Apps" },
 { url: "https://help.ubuntu.com", title:"Help" },
 { url: "http://ubuntuforums.org", title:"Forum" },
-{ url: "http://one.ubuntu.com", title:"Ubuntu One" },
 { url: "http://www.launchpad.net", title:"Launchpad" },
-{ url: "http://juju.ubuntu.com", title:"Juju" },
 { url: "http://maas.ubuntu.com", title:"MAAS" },
 { url: "http://www.canonical.com", title:"Canonical" }];
 
+
 if(!core){ var core = {}; }
 
 core.setupGlobalNav = function () {
diff --git a/templates/static/js/helpers.js b/static/js/helpers.js
old mode 100644
new mode 100755
similarity index 100%
rename from templates/static/js/helpers.js
rename to static/js/helpers.js
diff --git a/static/js/scratch.js b/static/js/scratch.js
new file mode 100755
index 00000000000..dc214cc23d2
--- /dev/null
+++ b/static/js/scratch.js
@@ -0,0 +1,460 @@
+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();
+});
diff --git a/templates/static/js/test-publishing.js b/static/js/test-publishing.js
old mode 100644
new mode 100755
similarity index 100%
rename from templates/static/js/test-publishing.js
rename to static/js/test-publishing.js
diff --git a/templates/2012/11/dellworld.html b/templates/2012/11/dellworld.html
deleted file mode 100644
index dcc7db737ba..00000000000
--- a/templates/2012/11/dellworld.html
+++ /dev/null
@@ -1,233 +0,0 @@
-{% extends "templates/one-column.html" %}
-
-{% block title %}Ubuntu at Dell World 2012{% endblock %}
-{% block extra_body_class %}{% endblock %}
-
-{% block head_extra %}
-<style type="text/css">
-h1 {
-  white-space: nowrap;  
-}
-
-.row-hero p {
-  font-size: 23px;
-}
-
-.footer {
-  background: #f7f7f7;
-}
-
-.footer ul {
-  float: left;
-  width: 100%;
-}
-
-.footer .nine-col,
-.footer p {
-  margin-bottom: 0;
-}
-
-.footer img {
-  margin: 10px 
-}
-
-.four-col h2 {
-  font-size: 23px;
-}
-
-.row .mktFormCheckbox {
-  display: inline;
-  float: left;
-  margin: 5px 6px 0 0;
-}
-
-label.small {
-  font-size: 14px;
-  margin: 0;
-}
-
-.lpeRegForm .mktError {
-  color: red;
-  font-style: italic;
-  float: left;
-}
-
-.row .mktFormText {
-  font-size: 14px;
-  width: 238px;
-}
-form input[type="checkbox"] {
-    margin: 0 5px 0 0;
-    position: relative;
-    top: 5px;
-}
-
-</style>
-{% endblock %}
-
-{% block content %}
-
-<div class="row row-hero row-image-centered">
-	<div class="seven-col">
-		<h1>Ubuntu at Dell World 2012</h1>
-		<p>Ubuntu, the leading open-source operating system, will showcase at Dell World, Austin, December 2012</p>
-	</div><!-- /.six-col -->
-	<span><img src="{{ STATIC_URL }}img/partners/partners-logo-dell.png" alt="Dell" /></span>
-</div><!-- / .row -->
-
-<div class="row no-margin vertical-divider">
-	<div class="seven-col">
-		<h2>Ubuntu and Dell partnership</h2>
-	
-		<p>Dell and Canonical, the commercial firm behind Ubuntu, are working closely together to deliver leading open-source products and solutions for business, public sector firms and consumers across the world.</p>
-	
-		<ul>
-		    <li>Dell PC and servers certified with Ubuntu</li>
-		    <li>Millions of Dell units shipped with Ubuntu pre-loaded</li>
-		    <li>Ubuntu and Dell Partnership for Cloud, based on OpenStack platform	</li>
-		    <li>Thin Client offerings</li>
-		    <li>Canonical services and consulting partnership available through Dell</li>	
-		</ul>
-	</div><!-- /.six-col -->
-	<div itemscope itemtype="http://schema.org/Event" class="five-col last-col">
-		<h2>Join us in Austin</h2>
-		<p>Come and visit booth 1E8 at <span itemprop="name">Dell World</span> to meet our team and hear what&rsquo;s behind the Ubuntu phenomena.</p>
-	
-		<p itemprop="description">Listen to our presentation and find out why so many firms are building their cloud on Ubuntu.</p>
-		
-		<ul>
-			<li><strong>Date: </strong><meta itemprop="startDate" content="2012-12-12T09:00">, Wednesday 12th December</li>
-			<li><strong>Time: </strong>9am</li>
-			<li><strong>Location: </strong>Cloud Track</li>
-		</ul>
-		
-	</div><!-- /.six-col -->
-</div><!-- / .row -->
-	
-<div class="row equal-height vertical-divider">
-	<div class="four-col">
-		<h2>What&rsquo;s new at Dell World</h2>
-		<p>Canonical will make a number of announcements at Dell World.  Watch this space.</p>
-	</div><!-- /.four-col -->
-
-	<div class="four-col">
-		<h2>Register an enquiry</h2>
-		<p>If you have a project where Canonical and Dell could provide technology or services, <a href="/business/services/contact">contact our sales team</a></p>
-	</div><!-- /.four-col -->
-	
-	<div class="four-col last-col">
-		<h2>Stay ahead with Ubuntu</h2>	
-		<p>Make sure you get the latest news, invitations and feature articles about Ubuntu. </p>
-		<script>
-			var profiling = {
-			  isEnabled: false,
-			  numberOfProfilingFields: 3,
-			  alwaysShowFields: [ 'mktDummyEntry']
-			};
-		</script>
-		<script>function mktoGetForm() {return document.getElementById('mktForm_1077'); }</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_1077" name="mktForm_1077">
-			<ul class='no-margin mktLblLeft'>
-				<li class='mktFormReq mktField'>
-					<label class="accessibility-aid">Email address:</label>
-					<span class='mktInput'>
-						<input class='mktFormText mktFormEmail mktFReq text' name="Email" id="Email" type='text' value="Enter your email address" maxlength='255' tabIndex='1'/>
-						<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='2' />
-						<span class='mktFormMsg'></span>
-					</span>
-					<label for="NewsletterOpt-In" class="small">I would like to receive occasional news from Canonical by email.</label>
-				</li>
-				<li id='mktFrmButtons'>
-					<input id='mktFrmSubmit' type='submit' value='Submit' name='submitButton' onclick='formSubmit(document.getElementById("mktForm_1077")); return false;' />
-				</li> 
-			</ul>
-			<span style="display:none;"><input type="text" name="_marketo_comments" value="" /></span>
-			<input type="hidden" name="lpId" value="1302" />
-			<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/canonical-optin.html?cr={creative}&amp;kw={keyword}" />
-			<input type="hidden" name="formid" value="1077" />
-			<input type="hidden" name="returnURL" value="https://pages.canonical.com/Canonical-optin-thankyou.html" />
-			<input type="hidden" name="retURL" value="https://pages.canonical.com/Canonical-optin-thankyou.html" />
-			<input type="hidden" name="returnLPId" value="1337" />
-			<input type="hidden" name="_mkt_disp" value="return" />
-			<input type="hidden" name="_mkt_trk" value="id:066-EOV-335&amp;token:_mch-canonical.com-1348657274348-58487" />
-		</form>
-		<script src="http://www.ubuntu.com/misc/jquery.js?J"></script>
-		<script src="https://pages.canonical.com/js/public/stateCountry.js"></script>
-		<script src="https://pages.canonical.com/js/mktFormSupport.js"></script>
-		<script>
-			function formSubmit(elt) {
-			  return Mkto.formSubmit(elt);
-			}
-			function formReset(elt) {
-			  return Mkto.formReset(elt);
-			}
-		</script>
-		<script>
-			$(document).ready(function() {
-				// Can't bind multiple event handlers simultaneously in this version of jQuery
-				var email_input = $('#Email');
-			
-				email_input.focus(function() {
-					if ($(this).val() == 'Enter your email address') {
-						$(this).val('');
-						$(this).css('font-style', 'normal');
-						$(this).css('color', '#333');
-					}
-				});
-				email_input.blur(function() {
-					if ($(this).val() == '') {
-						$(this).val('Enter your email address');
-						$(this).css('font-style', 'italic');
-						$(this).css('color', '#999');
-					}
-				});
-			});
-		</script>
-	</div><!-- /.four-col -->
-</div><!-- / .row -->
-
-<div class="row row-gery no-border">
-	<div class="box footer clearfix">
-		<img src="{{ STATIC_URL }}img/pictograms/pictogram-contact-grey-113x113.png" alt="pictogram-contact-grey-113x113" width="113" height="113" />
-		<div class="nine-col right">
-			<h2>Contacts</h2>
-			<p>Canonical has dedicated resources assigned to work with Dell and Dell customers across the world:</p>
-			<ul class="no-bullets">
-				<li itemscope itemtype="http://schema.org/Person">
-					<a href="mailto:mark.murphy@canonical.com">
-						<span class="accessibility-aid" itemprop="name">Canonical Ltd</span>
-						<span itemprop="name">Mark Murphy</span> &ndash; 
-						<span itemprop="jobtitle">Alliance Director</span> 
-						<span class="accessibility-aid" itemprop="email">mark.murphy@canonical.com</span>
-					</a>
-				</li>
-				<li itemscope itemtype="http://schema.org/Person">
-					<a href="mailto:sam.herren@canonical.com">
-						<span class="accessibility-aid" itemprop="name">Canonical Ltd</span>
-						<span itemprop="name">Sam Herren</span> &ndash; 
-						<span itemprop="jobtitle">North America Sales</span>
-						<span class="accessibility-aid" itemprop="email">sam.herren@canonical.com</span>
-					</a>
-				</li>
-				<li itemscope itemtype="http://schema.org/Person">
-					<a href="mailto:nicole@canonical.com">
-						<span class="accessibility-aid" itemprop="name">Canonical Ltd</span>
-						<span itemprop="name">Nicole Poepsel-Wunderlich</span> &ndash; 
-						<span itemprop="jobtitle">Sales excluding North America</span>
-						<span class="accessibility-aid" itemprop="email">nicole@canonical.com</span>
-					</a>
-				</li>
-			</ul>
-		</div>
-	</div><!-- /.box -->
-</div><!-- / .row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/2012/11/hpdiscover.html b/templates/2012/11/hpdiscover.html
deleted file mode 100644
index bb522050ec7..00000000000
--- a/templates/2012/11/hpdiscover.html
+++ /dev/null
@@ -1,246 +0,0 @@
-{% extends "templates/one-column.html" %}
-
-{% block title %}Ubuntu at HP Discover 2012{% endblock %}
-
-{% block head_extra %}
-<style type="text/css">
-h1 {
-  white-space: nowrap;  
-}
-
-.row-hero p {
-  font-size: 23px;
-}
-
-.footer {
-  background: #f7f7f7;
-}
-
-.footer ul {
-  float: left;
-  width: 100%;
-}
-
-.footer .nine-col,
-.footer p {
-  margin-bottom: 0;
-}
-
-.footer li {
-  width: 40%;
-}
-
-.footer li {
-  display: block;
-  float: left;
-  width: 100%;
-}
-
-.footer img {
-  margin: 10px 
-}
-
-.four-col h2 {
-  font-size: 23px;
-}
-
-.row .mktFormCheckbox {
-  display: inline;
-  float: left;
-  margin: 5px 6px 0 0;
-}
-
-label.small {
-  font-size: 14px;
-  margin: 0;
-}
-
-.lpeRegForm .mktError {
-  color: red;
-  font-style: italic;
-  float: left;
-}
-
-.row .mktFormText {
-  font-size: 14px;
-  width: 238px;
-}
-</style>
-{% endblock %}
-
-{% block content %}
-
-<div class="row row-hero row-image-centered">
-	<div class="seven-col">
-		<h1>Ubuntu at HP Discover 2012</h1>
-		<p>Ubuntu, the leading open-source operating system, will showcase at HP Discover Frankfurt, <br />December 2012</p>
-	</div><!-- /.six-col -->
-	<span><img src="{{ STATIC_URL }}img/partners/partners-logo-hp.png" alt="HP" /></span>
-</div><!-- / .row -->
-
-<div class="row no-margin vertical-divider">
-	<div class="seven-col">
-	
-		<h2>Ubuntu and HP partnership</h2>
-	
-		<p>HP and Canonical, the commercial firm behind Ubuntu, are working closely together to deliver leading open-source products and solutions on PCs, ProLiant servers and private and public clouds for business, public sector firms and consumers across the world.</p>
-	
-		<ul>
-		    <li>Over 25 HP laptops, desktops and workstations are certified for Ubuntu</li>
-			<li>30 ProLiant servers are certified with Ubuntu</li>
-			<li>HP&rsquo;s public cloud, HP Cloud Services, runs on Ubuntu</li>
-			<li>Ubuntu is the most popular cloud guest on HP Cloud Services</li>
-			<li>HP and Ubuntu are working together on OpenStack for private cloud solutions</li>
-			<li>Ubuntu Advantage is available through HP</li>	
-		</ul>
-		<p>For details about the Ubuntu and HP partnership go to <a href="http://www.ubuntu.com/hp">www.ubuntu.com/hp</a></p>
-	</div><!-- /.six-col -->
-	<div itemscope itemtype="http://schema.org/Event" class="five-col last-col">
-		<h2>Join us in Frankfurt</h2>
-		<p>Come and visit booth 505 at <span itemprop="name">HP Discover in Frankfurt</span>, to meet our team and hear what&rsquo;s behind the Ubuntu phenomenon.</p>
-	
-		<p itemprop="description">Learn why so many firms are moving to Ubuntu in the presentation, &lsquo;Ubuntu and HP: Making Magic from Cloud to Client&rsquo;</p>
-		
-		<ul>
-			<li><strong>Date: </strong><meta itemprop="startDate" content="2012-12-04T11:00">Tuesday 4th December</li>
-			<li><strong>Time: </strong>11am</li>
-			<li><strong>Location: </strong>Demo Theatre 2</li>
-		</ul>
-	</div><!-- /.six-col -->
-</div><!-- / .row -->
-	
-<div class="row equal-height no-margin vertical-divider">
-	<div class="four-col">
-		<h2>What&rsquo;s new at HP Discover</h2>
-		<p>Canonical will make a number of announcements at HP Discover. Watch this space!</p>
-	</div><!-- /.four-col -->
-
-	<div class="four-col">
-		<h2>Register an enquiry</h2>
-		<p>If you have a project where Canonical and HP could provide technology or services, <a href="/business/services/contact">contact our sales team</a></p>
-	</div><!-- /.four-col -->
-	
-	<div class="four-col last-col">
-		<h2>Stay ahead with Ubuntu</h2>	
-		<p>Make sure you get the latest news, invitations and feature articles about Ubuntu. </p>
-		<script>
-			var profiling = {
-			  isEnabled: false,
-			  numberOfProfilingFields: 3,
-			  alwaysShowFields: [ 'mktDummyEntry']
-			};
-		</script>
-		<script>function mktoGetForm() {return document.getElementById('mktForm_1077'); }</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_1077" name="mktForm_1077">
-			<ul class='no-margin mktLblLeft'>
-				<li class='mktFormReq mktField'>
-					<label class="accessibility-aid">Email address:</label>
-					<span class='mktInput'>
-						<input class='mktFormText mktFormEmail mktFReq text' name="Email" id="Email" type='text' value="Enter your email address" maxlength='255' tabIndex='1'/>
-						<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='2' />
-						<span class='mktFormMsg'></span>
-					</span>
-					<label for="NewsletterOpt-In" class="small">I would like to receive occasional news from Canonical by email.</label>
-				</li>
-				<li id='mktFrmButtons'>
-					<input id='mktFrmSubmit' type='submit' value='Submit' name='submitButton' onclick='formSubmit(document.getElementById("mktForm_1077")); return false;' />
-				</li> 
-			</ul>
-			<span style="display:none;"><input type="text" name="_marketo_comments" value="" /></span>
-			<input type="hidden" name="lpId" value="1302" />
-			<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/canonical-optin.html?cr={creative}&amp;kw={keyword}" />
-			<input type="hidden" name="formid" value="1077" />
-			<input type="hidden" name="returnURL" value="https://pages.canonical.com/Canonical-optin-thankyou.html" />
-			<input type="hidden" name="retURL" value="https://pages.canonical.com/Canonical-optin-thankyou.html" />
-			<input type="hidden" name="returnLPId" value="1337" />
-			<input type="hidden" name="_mkt_disp" value="return" />
-			<input type="hidden" name="_mkt_trk" value="id:066-EOV-335&amp;token:_mch-canonical.com-1348657274348-58487" />
-		</form>
-		<script src="http://www.ubuntu.com/misc/jquery.js?J"></script>
-		<script src="https://pages.canonical.com/js/public/stateCountry.js"></script>
-		<script src="https://pages.canonical.com/js/mktFormSupport.js"></script>
-		<script>
-			function formSubmit(elt) {
-			  return Mkto.formSubmit(elt);
-			}
-			function formReset(elt) {
-			  return Mkto.formReset(elt);
-			}
-		</script>
-		<script>
-			$(document).ready(function() {
-				// Can't bind multiple event handlers simultaneously in this version of jQuery
-				var email_input = $('#Email');
-			
-				email_input.focus(function() {
-					if ($(this).val() == 'Enter your email address') {
-						$(this).val('');
-						$(this).css('font-style', 'normal');
-						$(this).css('color', '#333');
-					}
-				});
-				email_input.blur(function() {
-					if ($(this).val() == '') {
-						$(this).val('Enter your email address');
-						$(this).css('font-style', 'italic');
-						$(this).css('color', '#999');
-					}
-				});
-			});
-		</script>
-	</div><!-- /.four-col -->
-</div><!-- / .row -->
-
-<div class="row no-border">
-	<div class="box footer clearfix">
-		<img src="{{ STATIC_URL }}img/pictograms/pictogram-contact-grey-113x113.png" alt="pictogram-contact-grey-113x113" width="113" height="113" />
-		<div class="nine-col right">
-			<h2>Contacts</h2>
-			<p>Canonical has dedicated resources assigned to work with HP and HP customers across the world:</p>
-			<ul class="no-bullets">
-				<li itemscope itemtype="http://schema.org/Person">
-					<a href="mailto:mark.murphy@canonical.com">
-						<span class="accessibility-aid" itemprop="name">Canonical Ltd</span>
-						<span itemprop="name">Mark Murphy</span> &ndash; 
-						<span itemprop="jobtitle">Alliance Director</span> 
-						<span class="accessibility-aid" itemprop="email">mark.murphy@canonical.com</span>
-					</a>
-				</li>
-				<li itemscope itemtype="http://schema.org/Person">
-					<a href="mailto:john.zannos@canonical.com">
-						<span class="accessibility-aid" itemprop="name">Canonical Ltd</span>
-						<span itemprop="name">John Zannos</span> &ndash; 
-						<span itemprop="jobtitle">Canonical / Alliance and Business Development / Director</span>
-						<span class="accessibility-aid" itemprop="email">john.zannos@canonical.com</span>
-					</a>
-				</li>
-				<li itemscope itemtype="http://schema.org/Person">
-					<a href="mailto:lowry.snow@canonical.com">
-						<span class="accessibility-aid" itemprop="name">Canonical Ltd</span>
-						<span itemprop="name">Lowry Snow</span> &ndash; 
-						<span itemprop="jobtitle">North America Sales - PC clients</span>
-						<span class="accessibility-aid" itemprop="email">lowry.snow@canonical.com</span>
-					</a>
-				</li>
-				<li itemscope itemtype="http://schema.org/Person">
-					<a href="mailto:Nicole@canonical.com">
-						<span class="accessibility-aid" itemprop="name">Canonical Ltd</span>
-						<span itemprop="name">Nicole Poepsel-Wunderlich</span> &ndash;
-						<span itemprop="jobtitle">Sales outside North America</span>
-						<span class="accessibility-aid" itemprop="email">Nicole@canonical.com</span>
-					</a>
-				</li>
-			</ul>
-		</div>
-	</div><!-- /.box -->
-</div><!-- / .row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/2013/01/press-pack-ubuntu-phone/index.html b/templates/2013/01/press-pack-ubuntu-phone/index.html
old mode 100644
new mode 100755
index 5f583ba5f67..e996881ff65
--- a/templates/2013/01/press-pack-ubuntu-phone/index.html
+++ b/templates/2013/01/press-pack-ubuntu-phone/index.html
@@ -9,24 +9,26 @@ <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/phone-design-hero-584x340.jpg" width="584" height="340" alt="Ubuntu on phone" style="margin-top: 10px;" />
+		<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">
+<div class="row combined-list">
 	<h2>About Ubuntu on phone</h2>
-	<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 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>
 
@@ -35,24 +37,26 @@ <h2>About Ubuntu on phone</h2>
 		<h2>Downloadable assets</h2>
 		<p>You can find more information about Ubuntu and the phone interface here:</p>
 	</div>
-	<div class="four-col">
-		<ul class="list">
-			<li><a href="{{ STATIC_URL }}files/section/devices/Ubuntu-phone-FAQ.pdf">Download FAQ &rsaquo;</a></li>
-			<li><a href="{{ STATIC_URL }}files/section/devices/Ubuntu-fast_facts.pdf">Download fast facts &rsaquo;</a></li>
-			<li class="last-item"><a href="http://design.ubuntu.com/downloads?metadata=element-logo+brand-ubuntu">Download Ubuntu logos &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 &rsaquo;</a></li>
-			<li class="last-item"><a href="{{ STATIC_URL }}files/section/devices/Ubuntu-phone-press_brochure.pdf">Download press brochure &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 &rsaquo;</a></li>
-			<li class="last-item"><a href="{{ STATIC_URL }}files/section/devices/Ubuntu-phone-product_image.zip">Download product image &rsaquo;</a></li>
-		</ul>
+	<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>
 
@@ -62,24 +66,24 @@ <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">优酷视频 &rsaquo;</a></small></h3>
-		<p><object width="460" 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="460" height="259" allowscriptaccess="always" allowfullscreen="true"></embed></object></p>
+		<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">优酷视频 &rsaquo;</a></small></h3>
-		<p><object width="460" 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="460" height="259" allowscriptaccess="always" allowfullscreen="true"></embed></object></p>
+		<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="460" 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="460" height="259" allowscriptaccess="always" allowfullscreen="true"></embed></object></p>
+		<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="460" 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="460" height="259" allowscriptaccess="always" allowfullscreen="true"></embed></object></p>
+		<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">
+<div class="row combined-list">
 	<h2>Main features</h2>
 	<div class="six-col">
 		<ul class="list-ubuntu">
@@ -103,6 +107,6 @@ <h2>About Canonical</h2>
 		<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/logos/canonical-symbol-167x167.png" width="167" height="167" alt="Canonical logo" /></span>
+	<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/dellfrs.html b/templates/2013/02/dellfrs.html
deleted file mode 100644
index 199be685d2a..00000000000
--- a/templates/2013/02/dellfrs.html
+++ /dev/null
@@ -1,246 +0,0 @@
-{% extends "templates/one-column.html" %}
-
-{% block title %}Ubuntu at Dell World 2012{% endblock %}
-
-{% block head_extra %}
-<style type="text/css">
-h1 {
-  white-space: nowrap;  
-}
-
-.row-hero {
-  border-bottom: 1px dotted #aea79f;
-  padding-bottom: 1.25em;
-}
-
-.row-hero p {
-  font-size: 23px;
-}
-
-.footer {
-  background: #f7f7f7;
-}
-
-.footer ul {
-  float: left;
-  width: 100%;
-}
-
-.footer .nine-col,
-.footer p {
-  margin-bottom: 0;
-}
-/*
-.footer li {
-  width: $four_col - (.8*$grid_gutter);
-}
-*/
-.footer li {
-  display: block;
-  float: left;
-  width: 100%;
-}
-
-.footer img {
-  margin: 10px 
-}
-
-.four-col h2 {
-  font-size: 23px;
-}
-
-.mktFormCheckbox {
-  display: inline;
-  float: left;
-  margin: 5px 6px 0 0;
-}
-
-label.small {
-  font-size: 14px;
-  margin: 0;
-}
-
-.lpeRegForm .mktError {
-  color: red;
-  font-style: italic;
-  float: left;
-}
-
-.mktFormText {
-  font-size: 14px;
-  width: 248px;
-}
-form input[type="checkbox"] {
-    margin: 0 5px 0 0;
-    position: relative;
-    top: 5px;
-}
-</style>
-{% endblock %}
-
-{% block content %}
-
-<div class="row row-hero row-image-centered">
-	<div class="seven-col">
-		<h1>Ubuntu at Dell FRS 2013</h1>
-		<p>Ubuntu, the leading open-source operating system, will showcase at Dell FRS, Las Vegas, February 2013</p>
-	</div><!-- /.six-col -->
-	<span><img src="{{ STATIC_URL }}img/partners/partners-logo-dell.png" alt="Dell" /></span>
-</div><!-- / .row -->
-
-<div class="row no-margin vertical-divider">
-	<div class="seven-col">
-		<h2>Expanding the Ubuntu and Dell partnership</h2>
-	
-		<p>Dell and Canonical, the commercial firm behind Ubuntu, are working closely together to deliver a growing number of products and solutions for business, public sector firms and consumers across the world.</p>
-	
-		<ul>
-		    <li>Dell PC and servers certified with Ubuntu</li>
-		    <li>Millions of Dell units shipped with Ubuntu pre-loaded</li>
-		    <li>Ubuntu and Dell Partnership for Cloud, based on OpenStack platform</li>
-		    <li>Thin Client offerings</li>
-		    <li>Canonical services and consulting partnership available through Dell</li>	
-		</ul>
-	</div><!-- /.seven-col -->
-	<div itemscope itemtype="http://schema.org/Event" class="five-col last-col">
-		<h2>Join us in Vegas</h2>
-		<p>Come and visit the Ubuntu / Canonical Booth at Dell FRS to meet our team and hear what&rsquo;s behind the Ubuntu phenomenon.</p>
-		
-		<ul>
-			<li><strong>Date: </strong><time itemprop="startDate" datetime="2013-02-05">Tuesday 5th February</time> to <time itemprop="endDate" datetime="2013-02-07">Thursday 7th February</time></li>
-			​<li itemprop="address" itemscope itemtype="http://data-vocabulary.org/Address"><strong>Where: </strong>
-				​<span itemprop="name">Mandalay Bay Hotel</span>
-		         <span itemprop="street-address">3950 South Las Vegas Boulevard</span>, 
-		         <span itemprop="locality">Las Vegas</span>, 
-		         <span itemprop="region">NV</span>
-		     </li>
-		</ul>
-	</div><!-- /.six-col -->
-</div><!-- / .row -->
-	
-<div class="row row-equal-height no-margin">
-	<div class="seven-col">
-		<div class="box">
-			<h2>Register an enquiry</h2>
-			<p>If you have a project where Canonical and Dell could provide technology or services, <a href="http://www.ubuntu.com/business/services/contact">contact our sales team</a>.</p>
-		</div><!-- /.box -->
-	</div><!-- /.six-col -->
-
-	<div class="five-col last-col">
-		<div class="box">
-			<h2>Stay ahead with Ubuntu</h2>	
-			<p>Make sure you get the latest news, invitations and feature articles about Ubuntu.</p>
-			<script>
-				var profiling = {
-				  isEnabled: false,
-				  numberOfProfilingFields: 3,
-				  alwaysShowFields: [ 'mktDummyEntry']
-				};
-			</script>
-			<script>function mktoGetForm() {return document.getElementById('mktForm_1077'); }</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_1077" name="mktForm_1077">
-				<ul class='no-margin mktLblLeft'>
-					<li class='mktFormReq mktField'>
-						<label class="accessibility-aid">Email address:</label>
-						<span class='mktInput'>
-							<input class='mktFormText mktFormEmail mktFReq text' name="Email" id="Email" type='text' value="Enter your email address" maxlength='255' tabIndex='1'/>
-							<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='2' />
-							<span class='mktFormMsg'></span>
-						</span>
-						<label for="NewsletterOpt-In" class="small">I would like to receive occasional news from Canonical by email.</label>
-					</li>
-					<li id='mktFrmButtons'>
-						<input id='mktFrmSubmit' type='submit' value='Submit' name='submitButton' onclick='formSubmit(document.getElementById("mktForm_1077")); return false;' />
-					</li> 
-				</ul>
-				<span style="display:none;"><input type="text" name="_marketo_comments" value="" /></span>
-				<input type="hidden" name="lpId" value="1302" />
-				<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/canonical-optin.html?cr={creative}&amp;kw={keyword}" />
-				<input type="hidden" name="formid" value="1077" />
-				<input type="hidden" name="returnURL" value="https://pages.canonical.com/Canonical-optin-thankyou.html" />
-				<input type="hidden" name="retURL" value="https://pages.canonical.com/Canonical-optin-thankyou.html" />
-				<input type="hidden" name="returnLPId" value="1337" />
-				<input type="hidden" name="_mkt_disp" value="return" />
-				<input type="hidden" name="_mkt_trk" value="id:066-EOV-335&amp;token:_mch-canonical.com-1348657274348-58487" />
-			</form>
-			<script src="http://www.ubuntu.com/misc/jquery.js?J"></script>
-			<script src="https://pages.canonical.com/js/public/stateCountry.js"></script>
-			<script src="https://pages.canonical.com/js/mktFormSupport.js"></script>
-			<script>
-				function formSubmit(elt) {
-				  return Mkto.formSubmit(elt);
-				}
-				function formReset(elt) {
-				  return Mkto.formReset(elt);
-				}
-			</script>
-			<script>
-				$(document).ready(function() {
-					// Can't bind multiple event handlers simultaneously in this version of jQuery
-					var email_input = $('#Email');
-				
-					email_input.focus(function() {
-						if ($(this).val() == 'Enter your email address') {
-							$(this).val('');
-							$(this).css('font-style', 'normal');
-							$(this).css('color', '#333');
-						}
-					});
-					email_input.blur(function() {
-						if ($(this).val() == '') {
-							$(this).val('Enter your email address');
-							$(this).css('font-style', 'italic');
-							$(this).css('color', '#999');
-						}
-					});
-				});
-			</script>
-		</div><!-- /.box -->
-	</div><!-- /.four-col -->
-</div><!-- / .row -->
-
-<div class="row">
-	<div class="box footer clearfix">
-		<img src="{{ STATIC_URL }}img/pictograms/pictogram-contact-grey-113x113.png" alt="pictogram-contact-grey-113x113" width="113" height="113" />
-		<div class="nine-col right">
-			<h2>Contacts</h2>
-			<p>Canonical has dedicated resources assigned to work with Dell and Dell customers across the world:</p>
-			<ul class="no-bullets">
-				<li itemscope itemtype="http://schema.org/Person">
-					<a href="mailto:mark.murphy@canonical.com">
-						<span class="accessibility-aid" itemprop="name">Canonical Ltd</span>
-						<span itemprop="name">Mark Murphy</span> &ndash; 
-						<span itemprop="jobtitle">Alliance Director</span> 
-						<span class="accessibility-aid" itemprop="email">mark.murphy@canonical.com</span>
-					</a>
-				</li>
-				<li itemscope itemtype="http://schema.org/Person">
-					<a href="mailto:sam.herren@canonical.com">
-						<span class="accessibility-aid" itemprop="name">Canonical Ltd</span>
-						<span itemprop="name">Sam Herren</span> &ndash; 
-						<span itemprop="jobtitle">North America Sales</span>
-						<span class="accessibility-aid" itemprop="email">sam.herren@canonical.com</span>
-					</a>
-				</li>
-				<li itemscope itemtype="http://schema.org/Person">
-					<a href="mailto:nicole@canonical.com">
-						<span class="accessibility-aid" itemprop="name">Canonical Ltd</span>
-						<span itemprop="name">Nicole Poepsel-Wunderlich</span> &ndash; 
-						<span itemprop="jobtitle">Sales excluding North America</span>
-						<span class="accessibility-aid" itemprop="email">nicole@canonical.com</span>
-					</a>
-				</li>
-			</ul>
-		</div>
-	</div><!-- /.box -->
-</div><!-- / .row -->
-{% 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
old mode 100644
new mode 100755
index d1cc664d6db..50e485ee354
--- a/templates/2013/02/press-pack-ubuntu-tablet/faq.html
+++ b/templates/2013/02/press-pack-ubuntu-tablet/faq.html
@@ -5,7 +5,7 @@
 {% block content %}
 <div class="row row-hero">
 	<div class="eight-col">
-		<h1>Media FAQ For Press Pack: Tablet</h1>
+		<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>
diff --git a/templates/2013/02/press-pack-ubuntu-tablet/index.html b/templates/2013/02/press-pack-ubuntu-tablet/index.html
old mode 100644
new mode 100755
index 6beb7dfdee9..c4039986fa6
--- a/templates/2013/02/press-pack-ubuntu-tablet/index.html
+++ b/templates/2013/02/press-pack-ubuntu-tablet/index.html
@@ -25,28 +25,26 @@ <h2>About Ubuntu tablet</h2>
 		<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 &rsaquo;</a></li>
-			<li><a href="{{ STATIC_URL }}files/section/devices/Ubuntu-tablet-press-release-cn.pdf">Chinese press release &rsaquo;</a></li>
-			<li class="last-item"><a href="{{ STATIC_URL }}files/section/devices/Ubuntu-tablet-press-release-es.pdf">Spanish press release &rsaquo;</a></li>
+			<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="four-col">
-		<ul class="list">
-			<li><a href="{{ STATIC_URL }}files/section/devices/Ubuntu-tablet-spokespeople.pdf">Download spokespeople bios &rsaquo;</a></li>
-			<li><a href="{{ STATIC_URL }}files/section/devices/Ubuntu-tablet-brochure.pdf">Download press brochure &rsaquo;</a></li>
-			<li class="last-item"><a href="http://design.ubuntu.com/downloads?metadata=element-logo+brand-ubuntu">Download Ubuntu logos &rsaquo;</a></li>
+	<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 class="four-col last-col ">
-		<ul class="list">
-			<li><a href="{{ STATIC_URL }}files/section/devices/Ubuntu-fast_facts.pdf">Download fast facts &rsaquo;</a></li>
-			<li><a href="{{ STATIC_URL }}files/section/devices/Ubuntu-tablet-product_image.zip">Download product image &rsaquo;</a></li>
-			<li class="last-item"><a href="/2013/02/press-pack-ubuntu-tablet/faq">Media FAQ &rsaquo;</a></li>
-		</ul>   
 	</div>
 </div>
 
@@ -56,29 +54,31 @@ <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">优酷视频 &rsaquo;</a></small></h3>
-		<p><iframe width="460" height="259" src="http://www.youtube.com/embed/h384z7Ph0gU?rel=0&vq=hd1080&showinfo=0" frameborder="0" allowfullscreen></iframe></p>
+		<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><iframe width="460" height="259" src="http://www.youtube.com/embed/5_4fXQcxFRs?rel=0&vq=hd1080&showinfo=0" frameborder="0" allowfullscreen></iframe></p>
+		<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="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 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>
 
@@ -88,6 +88,6 @@ <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/logos/canonical-symbol-167x167.png" width="167" height="167" alt="Canonical logo" /></span>
+	<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/_founders.html b/templates/2013/07/_founders.html
old mode 100644
new mode 100755
diff --git a/templates/2013/07/edge-founders.html b/templates/2013/07/edge-founders.html
old mode 100644
new mode 100755
index 99db9fd1fac..c1612a4b821
--- a/templates/2013/07/edge-founders.html
+++ b/templates/2013/07/edge-founders.html
@@ -1,25 +1,18 @@
 {% extends "templates/one-column.html" %}
 
-{% block title %}Ubuntu Edge founders page{% endblock %}
+{% block title %}Ubuntu Edge founders{% endblock %}
 
 {% block head_extra %}
 <style>
 	#main-content .row-hero {
 		background: #282828 url({{ STATIC_URL }}img/devices/edge_1_launch.jpg) 390% 65% no-repeat;
 		color: #fff;
-		padding-top: 70px;
 		padding-bottom: 50px;
 		margin-top: 0;
-	  -webkit-border-radius: 4px 4px 0 0;
-	  -moz-border-radius: 4px 4px 0 0;
-	  border-radius: 4px 4px 0 0;
-	}
-	#main-content .row-hero h1 {
-		padding-right: 400px;
+		padding-top: 40px;
 	}
 	#main-content .row-hero .message {
 		font-size: 18px;
-		padding-right: 380px;
 		line-height: 1.3;
 	}
 	#main-content h2 {
@@ -27,27 +20,45 @@
 		padding-left: 70px;
 	}
 	ul.edge-founders {
-	  -webkit-column-count: 4; 
+	  -webkit-column-count: 2;
 	  -webkit-column-width: auto;
-	  -webkit-column-gap: 40px; 
-	  -webkit-column-rule: 1px dotted #ddd; 
-	     -moz-column-count: 4; 
-	     -moz-column-width: auto; 
-	     -moz-column-gap: 40px; 
+	  -webkit-column-gap: 40px;
+	  -webkit-column-rule: 1px dotted #ddd;
+	     -moz-column-count: 2;
+	     -moz-column-width: auto;
+	     -moz-column-gap: 40px;
 	     -moz-column-rule: 1px dotted #ddd;
-	          column-count: 4; 
-	          column-width: auto; 
-	          column-gap: 40px; 
-	          column-rule: 1px dotted #ddd; 
-	}
-	ul.edge-founders li {
-		
+	          column-count: 2;
+	          column-width: auto;
+	          column-gap: 40px;
+	          column-rule: 1px dotted #ddd;
 	}
 	.row-hero .link-cta-ubuntu {
 		-moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
 		-webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
 		box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
 	}
+
+@media only screen and (min-width : 768px) {
+	ul.edge-founders {
+	  -webkit-column-count: 4;
+	     -moz-column-count: 4;
+	          column-count: 4;
+	}
+	#main-content .row-hero {
+		padding-top: 70px;
+	  -webkit-border-radius: 4px 4px 0 0;
+	  -moz-border-radius: 4px 4px 0 0;
+	  border-radius: 4px 4px 0 0;
+	}
+	#main-content .row-hero h1 {
+		padding-right: 400px;
+	}
+	#main-content .row-hero .message {
+		padding-right: 380px;
+	}
+}
+
 </style>
 {% endblock head_extra %}
 
diff --git a/templates/2013/07/press-pack-ubuntu-edge/index.html b/templates/2013/07/press-pack-ubuntu-edge/index.html
old mode 100644
new mode 100755
index 51c63249e02..68f43a56edd
--- a/templates/2013/07/press-pack-ubuntu-edge/index.html
+++ b/templates/2013/07/press-pack-ubuntu-edge/index.html
@@ -4,15 +4,15 @@
 
 {% block head_extra %}
 <style>
+	#main-content {
+	    margin-top: -4px;
+	}
 	#main-content .row-hero {
-		background: #282828 url({{ STATIC_URL }}img/devices/edge_1_launch.jpg) 350% 64% no-repeat;
+		background: #282828;
 		color: #fff;
-		padding-top: 70px;
-		padding-bottom: 70px;
+		padding-top: 30px;
+		padding-bottom: 30px;
 		margin-top: 0;
-	  -webkit-border-radius: 4px 4px 0 0;
-	  -moz-border-radius: 4px 4px 0 0;
-	  border-radius: 4px 4px 0 0;
 	}
 	#main-content .row-hero .message {
 		font-size: 20px;
@@ -26,7 +26,39 @@
 		box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
 		margin-top: 20px;
 	}
+	header.banner {
+		-moz-box-shadow: none;
+		-webkit-box-shadow: none;
+		box-shadow: none;
+	}
+	/* Medium / Tablet viewport
+	-------------------------------------------------------------- */
+	@media only screen and (min-width : 769px) {
+		#main-content .row-hero {
+			-webkit-border-radius: 4px 4px 0 0;
+			-moz-border-radius: 4px 4px 0 0;
+			border-radius: 4px 4px 0 0;
+			background: #282828 url({{ STATIC_URL }}img/devices/edge_1_launch.jpg) 350% 64% no-repeat;
+			color: #fff;
+			padding-top: 70px;
+			padding-bottom: 70px;
+			margin-top: 0;
+		}
+	}
+
+	/* Large / Desktop viewport
+	------------------------------------------------------------- */
+	@media only screen and )min-width : 986px) {
+		header.banner {
+			-moz-box-shadow: 0 2px 2px -2px #777777 inset, 2px 1px #FFFFFF;
+			-webkit-box-shadow: 0 2px 2px -2px #777777 inset, 2px 1px #FFFFFF;
+			box-shadow: 0 2px 2px -2px #777777 inset, 2px 1px #FFFFFF;
+		}
+	}
 ​</style>
+
+
+
 {% endblock head_extra %}
 
 {% block content %}
@@ -62,6 +94,6 @@ <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/logos/canonical-symbol-167x167.png" width="167" height="167" alt="Canonical logo" /></span>
+	<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/_nav_secondary.html b/templates/2013/_nav_secondary.html
old mode 100644
new mode 100755
diff --git a/templates/2013/shared/_contextual_footer.html b/templates/2013/shared/_contextual_footer.html
old mode 100644
new mode 100755
diff --git a/templates/about/_nav_secondary.html b/templates/about/_nav_secondary.html
old mode 100644
new mode 100755
index 8cab5d5ea1d..3195cd6c306
--- a/templates/about/_nav_secondary.html
+++ b/templates/about/_nav_secondary.html
@@ -1,4 +1,4 @@
-	<ul{% if list_class %} class="{{ list_class }}"{% endif %}>
+	<ul{% if list_class %} class="{{ list_class }}"{% endif %} class="second-level-nav">
 		<li class="first{% if level_1 == 'about' and not level_2 %}  active{% endif %}"><a href="/about">Overview</a></li>
 		<li{% if level_2 == 'about-ubuntu' %} class="active"{% endif %}><a href="/about/about-ubuntu">About Ubuntu</a></li>
 		<li class="{% if level_2 == 'contact-us' %}last-item {% endif %}{% if level_2 == 'canonical-and-ubuntu' %} active{% endif %}"><a href="/about/canonical-and-ubuntu" >Canonical and Ubuntu</a></li>
diff --git a/templates/about/_nav_tertiary.html b/templates/about/_nav_tertiary.html
old mode 100644
new mode 100755
index 2f640c0a18c..8a74fed19a7
--- a/templates/about/_nav_tertiary.html
+++ b/templates/about/_nav_tertiary.html
@@ -1,4 +1,4 @@
-		<ul>
+		<ul class="second-level-nav">
 {% if level_2 == 'about-ubuntu' %}
 			<li{% if level_3 == 'our-philosophy' %} class="active"{% endif %}><a href="/about/about-ubuntu/our-philosophy">Philosophy</a></li>
 			<li{% if level_3 == 'licensing' %} class="active"{% endif %}><a href="/about/about-ubuntu/licensing">Licensing</a></li>
diff --git a/templates/about/about-ubuntu/conduct.html b/templates/about/about-ubuntu/conduct.html
old mode 100644
new mode 100755
index 271243ca646..9ecdd3ff1cb
--- a/templates/about/about-ubuntu/conduct.html
+++ b/templates/about/about-ubuntu/conduct.html
@@ -19,7 +19,7 @@ <h2>Community</h2>
 	
 	<p>We gain strength from diversity, and actively seek participation from those who enhance it. This code of conduct exists to ensure that diverse groups collaborate to mutual advantage and enjoyment. We will challenge prejudice that could jeopardise the participation of any person in the project.</p>
 	
-	<p>The Code of Conduct governs how we behave in public or in private whenever the project will be judged by our actions. We expect it to be honored by everyone who represents the project officially or
+	<p>The Code of Conduct governs how we behave in public or in private whenever the project will be judged by our actions. We expect it to be honoured by everyone who represents the project officially or
 	informally, claims affiliation with the project, or participates directly.</p>
 	
 	<h3>We strive to:</h3>
@@ -111,7 +111,7 @@ <h4>Conflicts of interest</h4>
 
 	<p>When in doubt, ask for a second opinion. Perceived conflicts of interest are important to address; as a leader, act to ensure that decisions are credible even if they must occasionally be unpopular, difficult or favourable to the interests of one group over another.</p>
 
-	<p>This Code is not exhaustive or complete. It is not a rulebook; it serves to distill our common understanding of a collaborative, shared environment and goals. We expect it to be followed in spirit as much as in the letter.</p>
+	<p>This Code is not exhaustive or complete. It is not a rulebook; it serves to distil our common understanding of a collaborative, shared environment and goals. We expect it to be followed in spirit as much as in the letter.</p>
 
 
 	<p><em>The Ubuntu Code of Conduct is licensed under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share Alike 3.0 license</a>. You may re-use it for your own project, and modify it as you wish, just please allow others to use your modifications and give credit to the Ubuntu Project!</em></p>
diff --git a/templates/about/about-ubuntu/derivatives.html b/templates/about/about-ubuntu/derivatives.html
old mode 100644
new mode 100755
diff --git a/templates/about/about-ubuntu/diversity.html b/templates/about/about-ubuntu/diversity.html
old mode 100644
new mode 100755
index 013a10f2236..c6ab965440a
--- a/templates/about/about-ubuntu/diversity.html
+++ b/templates/about/about-ubuntu/diversity.html
@@ -13,7 +13,7 @@ <h1>Diversity</h1>
 	<div class="eight-col">
 		<p>The Ubuntu project welcomes and encourages participation by everyone. We are committed to being a community that everyone feels good about  joining. Although we may not be able to satisfy everyone, we will always  work to treat everyone well.</p>
 
-		<p>Standards for behavior in the Ubuntu community are detailed in the  <a href="/about/about-ubuntu/conduct">Code of Conduct</a>. We expect participants  in our community to meet these standards in all their interactions and  to help others to do so as well.</p>
+		<p>Standards for behaviour in the Ubuntu community are detailed in the  <a href="/about/about-ubuntu/conduct">Code of Conduct</a>. We expect participants  in our community to meet these standards in all their interactions and  to help others to do so as well.</p>
 
 		<p>Whenever any participant has made a mistake, we expect them to take  responsibility for it. If someone has been harmed or offended, it is our  responsibility to listen carefully and respectfully, and do our best to  right the wrong.</p>
 
diff --git a/templates/about/about-ubuntu/governance.html b/templates/about/about-ubuntu/governance.html
old mode 100644
new mode 100755
index 6354f2ef8f1..738fd01c86c
--- a/templates/about/about-ubuntu/governance.html
+++ b/templates/about/about-ubuntu/governance.html
@@ -39,7 +39,7 @@ <h3>Ubuntu Technical Board</h3>
 		<h3>SABDFL</h3>
 		<p>This is not a democracy, it's a meritocracy. We try to operate more on consensus than on votes, seeking agreement from the people who will have to do the work. <a href="https://wiki.ubuntu.com/MarkShuttleworth">Mark Shuttleworth</a>, as self-appointed benevolent dictator for life (SABDFL), plays a happily undemocratic role as sponsor of the project. He has the ability, with regard to Canonical employees, to ask people to work on specific projects, specific feature goals and specific bugs.</p>
  
-		<p>He also has a casting vote on the Technical Board and Community Council, should it come to a vote. This capacity is not used lightly. The community functions best when it can reach broad consensus about a way forward. However, it is not uncommon in the open-source world for there to be multiple good arguments, no clear consensus, and for arguments to divide communities rather than enrich them. The argument absorbs the energy that might otherwise have gone towards the creation of a solution. In many cases, there is no one 'right' answer, and what is needed is a decision more than a debate. The sabdfl acts to provide clear leadership on difficult issues, and set the pace for the project.</p>
+		<p>He also has a casting vote on the Technical Board and Community Council, should it come to a vote. This capacity is not used lightly. The community functions best when it can reach broad consensus about a way forward. However, it is not uncommon in the open-source world for there to be multiple good arguments, no clear consensus, and for arguments to divide communities rather than enrich them. The argument absorbs the energy that might otherwise have gone towards the creation of a solution. In many cases, there is no one 'right' answer, and what is needed is a decision more than a debate. The SABDFL acts to provide clear leadership on difficult issues, and set the pace for the project.</p>
  
 		<h3>Appointments</h3>
 		<p>Mark, as project sponsor, is responsible for nominating candidates for both the Community Council and Technical Board. In each case, a poll of relevant members of the project is conducted to select, or veto, the final membership of the Community Council and Technical Board.</p>
diff --git a/templates/about/about-ubuntu/index.html b/templates/about/about-ubuntu/index.html
old mode 100644
new mode 100755
diff --git a/templates/about/about-ubuntu/licensing.html b/templates/about/about-ubuntu/licensing.html
old mode 100644
new mode 100755
diff --git a/templates/about/about-ubuntu/old-leadership-conduct.html b/templates/about/about-ubuntu/old-leadership-conduct.html
deleted file mode 100644
index 6b7da33e1a0..00000000000
--- a/templates/about/about-ubuntu/old-leadership-conduct.html
+++ /dev/null
@@ -1,45 +0,0 @@
-{% extends "about/base_about.html" %}
-
-{% block title %}Leadership | About Ubuntu{% endblock %}
-
-{% block header %}
-<div class="row">
-	<h1>Leadership</h1>
-</div>
-{% endblock %}
-
-{% block third-level-nav %}{% include "about/about-ubuntu/nav/third-level-nav.html" %}{% endblock %}
-
-{% block content %}
-<div class="row no-border">
-	<div class="seven-col">
-		<h2>Ubuntu Leadership Code of Conduct</h2>
-		<p>The Ubuntu Code of Conduct describes the standard for all conduct in the Ubuntu community. Leaders however, are expected to be held to a higher standard. This document provides a set of guidelines and explains to all members the high standards of conduct that leaders in the Ubuntu community should be held.</p>
-
-		<p>There are many, many people who hold leadership positions in Ubuntu - from the leaders of translation teams for specific languages, to the folks who hold positions on our Technical Board and Community Council. Our community depends on the drive and inspiration of many people who start LoCo teams or project teams focused on a particular end goal. We expect anybody who takes on a leadership role to meet this higher standard of conduct.</p>
-
-		<h3>Leadership By Example</h3>
-		<p>We expect leadership by example. In Ubuntu, leadership is not an award, right, or title; it is a privilege. A leader will only retain his or her position as long as he or she acts as a leader. This means that they act with civility, respect, and trust in the ways described in the Code of Conduct. It also means that their contributions are sustained, significant, and reliable for the period that they lead. Leaders in Ubuntu are not autocrats. Leaders in Ubuntu can not and will not stay leaders only because they got there first. Their role stems from shared recognition and respect from their team.</p>
-
-		<h3>Respecting Ubuntu Processes and Principles</h3>
-		<p>The Code of Conduct does not only apply to leaders. It applies to leaders more. Leaders show more patience, more respect, and more civility than other members of the Ubuntu community. As leaders, they represent their team and, ultimately, the whole Ubuntu project. Leaders do their best to reflect the values that Ubuntu stands for and the behaviors that Ubuntu holds as paramount. Additionally, they take care to act in accordance with Ubuntu governance principles and structures and work within the Ubuntu system to change them.</p>
-
-		<h3>Delegation</h3>
-		<p>A virtuoso is judged by their actions. A leader is judged by the actions of their team. A leader in Ubuntu knows when to ask for help and when to step back. Good leaders know when not to make a decision but to delegate it to their team. The best leaders balance hard work in the community. Of course, leadership does not mean that leaders delegate unpleasant work to others. Instead, leaders balance hard work on their own -- leadership by example -- with delegation to others and hard work on their own. A leader's foremost goal is ensuring that their team members and team succeed.</p>
-
-		<h3>Credit</h3>
-		<p>A good leader does not seek the limelight but aims to congratulate their team for the work they do. While leaders are frequently more visible than their team, leaders in Ubuntu use their visibility to highlight the great work of their team members and others.</p>
-
-		<h3>Conflicts of Interest</h3>
-		<p>A leader notices when they are conflicted and delegates decisions to others on their team or to other teams or governing councils. When in doubt, leaders publicly ask for a second opinion. They realize that perceived conflicts of interest are as important as real conflicts of interest and are cognizant of perceptions; they understand that their actions are as tainted by perceived conflicts as by real ones.</p>
-
-		<h3>Keeping the Personal Personal</h3>
-		<p>No team is an extension of its leader's personality and leaders' personal feelings and desires will diverge from the interest of their teams. When acting in their capacity of leaders, leaders should not ignore their own beliefs, feelings, and principles but must hold the interests of their team and the Ubuntu community above their own convictions. Leaders make difficult choices but are careful to act in the best interests of their communities. They work with established processes in the community and delegate decisions to others who can.</p>
-
-		<h3>Stepping Down</h3>
-		<p>The Ubuntu Code of Conduct discusses the importance of gracefully stepping down from a position. This is particularly important for leaders who are responsible for decisions or specific processes - for example, if your participation is needed to reach quorum in a team council. If someone in a leadership role does not have time to fulfill their role temporarily, they should warn their team in advance. If an absence becomes extended, they should step down from their leadership position until they have more time to follow through. Similarly, leaders should step down gracefully -- as described in the Code of Conduct. When someone takes on a leadership position in Ubuntu, they are making a commitment to step down gracefully and to ensure that others on the team can easily continue where they leave off.</p>
-
-		<p>Note that this is less important in cases where the leadership role does not "block" decisions while the person is absent. For example, if you are one of a team of 50 list moderators, then an extended absence does not mean you should necessarily step down, because decisions will not be blocked by you not being there. Conversely, if your leadership seat is essential for decisions, then extended absences should be very carefully managed, and you should consider stepping down or at least nominating a stand-in while you will be away.</p>
-	</div><!-- / .seven-col -->
-</div><!-- / .row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/about/about-ubuntu/our-philosophy.html b/templates/about/about-ubuntu/our-philosophy.html
old mode 100644
new mode 100755
index 6cb5622495b..3283f89c57e
--- a/templates/about/about-ubuntu/our-philosophy.html
+++ b/templates/about/about-ubuntu/our-philosophy.html
@@ -25,9 +25,9 @@ <h3>Our work is driven by a belief that software should be free and accessible t
 		<h3>Free software</h3>
 		<p>Ubuntu software is free. Always was, always will be. Free software gives everyone the freedom to use it however they want and share with whoever they like. This freedom has huge benefits. At one end of the spectrum it enables the Ubuntu community to grow and share its collective experience and expertise to continually improve all things Ubuntu. At the other, we are able to give access to essential software for those who couldn’t otherwise afford it – an advantage that’s keenly felt by individuals and organisations all over the world.</p>
 		<p>Quoting the <a href="http://www.fsf.org">Free Software Foundation's</a>, <a href="http://www.gnu.org/philosophy/free-sw.html">'What is Free Software,'</a> the freedoms at the core of free software are defined as:</p>
-		<p>The freedom to run the program, for any purpose.</p>
 
 		<ul>
+			<li>The freedom to run the program, for any purpose.</li>
 			<li>The freedom to study how the program works and adapt it to your needs.</li> 
 			<li>The freedom to redistribute copies so you can help others. </li> 
 			<li>The freedom to improve the program and release your improvements to the public, so that everyone benefits. </li> 
diff --git a/templates/about/about-ubuntu/ubuntu-and-debian.html b/templates/about/about-ubuntu/ubuntu-and-debian.html
old mode 100644
new mode 100755
index 2c3da084253..c877c720abe
--- a/templates/about/about-ubuntu/ubuntu-and-debian.html
+++ b/templates/about/about-ubuntu/ubuntu-and-debian.html
@@ -12,14 +12,14 @@ <h1>Ubuntu and Debian</h1>
 
 	<div class="eight-col">
 		<h3>Ubuntu and Debian are closely related.</h3>
-		<p>Ubuntu builds on the foundations of Debian's architecture and infrastructure, but has a different community and release process.</p>
+		<p>Ubuntu builds on the foundations of Debian&#39;s architecture and infrastructure, but there are important differences. Ubuntu has its own user interface, a separate developer community (though many developers participate in both projects) and a different release process.</p>
 
 		<h3>About Debian</h3>
-		<p><a href="http://www.debian.org/">Debian</a> is 'the rock upon which Ubuntu is built'.</p>
-		<p>Debian is a volunteer project that works on developing a GNU/Linux operating system. The Debian project began more than a decade ago and has since grown to comprise more than 1,000 members with official developer status, and many more volunteers and contributors. It has expanded to encompass over 20,000 'packages' of free and open-source applications and documentation.</p>
+		<p><a href="http://www.debian.org/">Debian</a> can be considered the rock upon which Ubuntu is built. It is a volunteer project that has developed and maintained a GNU/Linux operating system of the same name for well over a decade. Since its launch, the Debian project has grown to comprise more than 1,000 members with official developer status, alongside many more volunteers and contributors. Today, Debian encompasses over 20,000 packages of free, open source applications and documentation.</p>
 
 		<h3>About Ubuntu</h3>
-		<p>Ubuntu provides a system based on Debian with frequent, regular releases and a consistent desktop interface. It is backed by Canonical's commercial services and support on both the desktop and the server. It releases critical bug fixes and is never more than six months away from the latest version of anything in the open-source world.</p>
+		<p>Ubuntu is an open source project that develops and maintains a cross-platform, open-source operating system based on Debian. It includes Unity, a consistent user interface for the smartphone, the tablet and the PC. Upgrades are released every six months and support is guaranteed by Canonical for up to five years. Canonical also provides commercial support for Ubuntu deployments across the desktop, the server and the cloud.</p>
+		
 		<p><a href="https://wiki.ubuntu.com/Debian">Learn more about how Debian and Ubuntu fit together</a>.</p>
 	</div><!-- / .seven-col -->
 </div><!-- / .row -->
diff --git a/templates/about/base_about.html b/templates/about/base_about.html
old mode 100644
new mode 100755
diff --git a/templates/about/canonical-and-ubuntu.html b/templates/about/canonical-and-ubuntu.html
old mode 100644
new mode 100755
diff --git a/templates/about/contact-us/form/index.html b/templates/about/contact-us/form/index.html
old mode 100644
new mode 100755
index c0c48e2538f..fb29e8b4be9
--- a/templates/about/contact-us/form/index.html
+++ b/templates/about/contact-us/form/index.html
@@ -63,11 +63,11 @@ <h2>Considering Ubuntu for your business?</h2>
 	<div class="eight-col">
 
 	<p>Just fill in the form below and a member of our team will be in touch within two working days.</p>
-	
+
 	<p>If you just need support for yourself, you can <a href="http://www.ubuntu.com/support">get help from the community</a>, <a href="http://www.ubuntu.com/support">join a forum</a>, or <a href="http://www.ubuntu.com/support">take a look at our official documentation</a>.</p>
-	
+
 	<p>All fields are required.</p>
-	
+
 
 <form class="lpeRegForm formNotEmpty" method="post" enctype="application/x-www-form-urlencoded" action="https://pages.canonical.com/index.php/leadCapture/save" id="mktForm_1003" name="mktForm_1003">
 	<fieldset class="fieldset-1">
@@ -110,17 +110,17 @@ <h3>Contact information</h3>
 				<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="2"><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="3"><span class="mktFormMsg"></span></span>
 			</li>
-			
+
 			<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="4"><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="text" value="" maxlength="255" tabindex="5"><span class="mktFormMsg"></span></span>
@@ -208,7 +208,7 @@ <h3>Your organisation</h3>
 			<label for="Country">Country: <span>*</span></label>
 			<span class="mktInput">
 			<select class="mktFormSelect mktFReq" name="Country" id="Country" size="1" tabindex="9">
-				<option value="Select Country:" selected="selected">Select Country:</option>
+				<option value="Select Country:" selected="selected">Select country:</option>
 				<option value="AF">Afghanistan</option>
 				<option value="AX">&Aring;land Islands</option>
 				<option value="AL">Albania</option>
@@ -463,7 +463,7 @@ <h3>Your organisation</h3>
 			<label for="State">State: <span>*</span></label>
 			<span class="mktInput">
 			<select class="mktFormSelect mktFReq" name="State" id="State" size="1" tabindex="10">
-				<option value="SelectProvince" selected="selected">Select Province</option>
+				<option value="SelectProvince" selected="selected">Select province</option>
 				<option value="AB">Alberta</option>
 				<option value="BC">British Columbia</option>
 				<option value="MB">Manitoba</option>
@@ -538,7 +538,7 @@ <h3>Your organisation</h3>
 			<label for="Phone">Phone: <span>*</span></label>
 			<span class="mktInput">
 				<input class="mktFormText mktFormPhone mktFReq" name="Phone" id="Phone" type="text" value="" maxlength="255" tabindex="11">
-				<span class="mktFormMsg"></span>	
+				<span class="mktFormMsg"></span>
 			</span>
 		</li>
 	</ul>
@@ -563,14 +563,14 @@ <h3>Your comments</h3>
 		</li>
 	</ul>
 	</fieldset>
-	
+
 	<fieldset class="fieldset-submit">
 	<ul class="mktLblLeft">
 		<li>All information provided will be handled in accordance with the Canonical <a href="http://www.ubuntu.com/legal">privacy policy</a>.</li>
 		<li id="mktFrmButtons">
 			<input id="mktFrmSubmit" type="submit" value="Submit" name="submitButton" onclick="formSubmit(document.getElementById('mktForm_1003')); return false;" />
 			<input id="mktFrmReset" type="reset" value="Clear" name="resetButton" />
-		</li>     
+		</li>
 
 	</ul>
 	</fieldset>
diff --git a/templates/about/contact-us/form/thank-you.html b/templates/about/contact-us/form/thank-you.html
old mode 100644
new mode 100755
index b39b6d107f9..09cf3e91fb3
--- a/templates/about/contact-us/form/thank-you.html
+++ b/templates/about/contact-us/form/thank-you.html
@@ -4,35 +4,32 @@
 
 {% block content %}
 
-<div class="row row-hero no-border">	
-	<h1>Thanks for getting in touch</h1>
-</div>
-
 <div class="row row-hero no-margin-bottom">
-	<h2>A member of our team will be in touch within <br/><strong>five working days</strong>.</h2>
+	<h1>Thanks for getting in touch</h1>
+	<h2>A member of our team will be in touch within <br/><strong>one working day</strong>.</h2>
 </div><!-- /.row-hero -->
-	
-<div class="row equal-height">
+
+<div class="row equal-height no-border">
 	<ul id="thank-you-extra" class="no-bullets">
 		<h3>More about our enterprise services</h3>
 		<li class="advantage four-col first">
 			<h4>Ubuntu Advantage</h4>
 			<p>Purchase our desktop support and access Ubuntu experts whenever you need.</p>
-			<p><a href="/business/advantage">Learn about Ubuntu Advantage &rsaquo;</a></p>
+			<p><a href="/business/advantage">Learn about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
 		</li>
 		<li class="cloud four-col">
 			<h4>Ubuntu Cloud</h4>
 			<p>Our OpenStack-based public and private cloud platform.<br/><br/></p>
-			<p><a href="/cloud">Learn about Ubuntu Cloud &rsaquo;</a></p>
+			<p><a href="/cloud">Learn about Ubuntu Cloud&nbsp;&rsaquo;</a></p>
 		</li>
 		<li class="jumpstart four-col last-col">
 			<h4>Cloud Jumpstart</h4>
-			<p>Let a Canonical engineer build a seed cloud on your premises in just five days.</p>
-			<p><a href="/cloud/solutions/jumpstart">Learn about Cloud Jumpstart &rsaquo;</a></p>
+			<p>Let a Canonical engineer help you build a test cloud on your premises.</p>
+			<p><a href="/cloud/solutions/jumpstart">Learn about Cloud Jumpstart&nbsp;&rsaquo;</a></p>
 		</li>
 	</ul>
 </div><!-- end row-->
-	
+
 {% endblock content %}
 {% block footer_extra %}
 <!-- Google Code for Services Canonical - contact us Conversion Page -->
diff --git a/templates/about/contact-us/index.html b/templates/about/contact-us/index.html
old mode 100644
new mode 100755
index b97e62564e9..10fd7f5e456
--- a/templates/about/contact-us/index.html
+++ b/templates/about/contact-us/index.html
@@ -7,27 +7,33 @@
 {% endblock second_level_nav_items %}
 
 {% block content %}
-<div class="row row-hero">
+<div class="row no-border row-hero">
 	<div class="eight-col">
 		<h1>Contact us</h1>
-		
+
 		<p>We try to respond to all enquiries as quickly as we can. Choose a contact channel below and we'll make sure we put you in touch with the right person.</p>
-		
+
 		<h2>Get involved</h2>
 		<p>There are many ways you can participate in the Ubuntu community, from simply giving advice to fellow Ubuntu users to becoming a maintainer of core packages.  Please <a href="http://community.ubuntu.com/contribute/">get involved</a>.</p>
-		
+
 		<h2>Technical assistance</h2>
 		<p>If you are looking for help with Ubuntu, <a href="/support">our support team</a> can help.</p>
-		
+
 		<h2>Web feedback</h2>
 		<p>If you have suggestions or corrections for ubuntu.com or canonical.com, email us at <a href="mailto:webmaster@ubuntu.com">webmaster@ubuntu.com</a> or <a href="mailto:webmaster@canonical.com">webmaster@canonical.com.</a></p>
-		
+
 		<h2>Sales enquiries</h2>
 		<p>Please <a href="/about/contact-us/form">contact Canonical</a> if you would like to discuss support, training or technical consulting.</p>
-		
+
 		<h2>Press enquiries</h2>
 		<p>Journalists or analysts seeking press information should email <a href="mailto:pr@canonical.com">pr@canonical.com</a>. We regret we cannot respond to non-media or analyst enquiries.</p>
-		
+
+		<h2>Legal enquiries</h2>
+		<p>Please note that we cannot provide you with legal advice. For any other queries, please contact us on <a href="mailto:legal@canonical.com">legal@canonical.com</a></p>
+
+		<h2>Trademark enquiries</h2>
+		<p>To request an Ubuntu trademark licence, or to make any other trademark enquiry, please <a href="/legal/terms-and-policies/contact-us">submit an enquiry</a>. A member of our trademarks team will be in touch with you shortly.</p>
+
 		<div itemscope itemtype="http://schema.org/Organization">
 		<h2>Canonical address</h2>
 		<p>If you want to speak to someone right away, don't forget you can call or write to Canonical. The London-based office is a good place to start.</p>
diff --git a/templates/about/index.html b/templates/about/index.html
old mode 100644
new mode 100755
index 3bdc87e9614..bbcd0dd4137
--- a/templates/about/index.html
+++ b/templates/about/index.html
@@ -21,12 +21,12 @@ <h3>The Ubuntu Promise</h3>
 		<p>Ubuntu comes with full support and all kinds of services available worldwide.</p>
 	</div><!-- / .four-col -->
 	<div class="four-col">
-		<h3><a href="/about/about-ubuntu/our-philosophy">Open-source software &rsaquo;</a></h3> 
+		<h3><a href="/about/about-ubuntu/our-philosophy">Open-source software&nbsp;&rsaquo;</a></h3>
 		<p>Ubuntu is created by open-source developers because we believe that everybody should have access to the best possible technologies.</p>
 		<p>This passionate global community works together to continually evolve the best systems in the world and then make them available to everybody, absolutely free.</p>
 	</div><!-- / .four-col -->
 	<div class="four-col last-col">
-		<h3><a href="/about/canonical-and-ubuntu">Ubuntu and Canonical &rsaquo;</a></h3>
+		<h3><a href="/about/canonical-and-ubuntu">Ubuntu and Canonical&nbsp;&rsaquo;</a></h3>
 		<p>Ubuntu is backed by Canonical &mdash; the number-one Ubuntu services provider.</p>
 		<p>Companies can choose to receive expert training, support or consultancy for a fee that goes towards the continued development of Ubuntu.</p>
 	</div><!-- / .four-col -->
@@ -52,11 +52,11 @@ <h2>Why use Ubuntu?</h2>
 		</li>
 	</ul>
 	<div class="two-col last-col">
-		<h3>Take a look:</h3>     
+		<h3>Take a look:</h3>
 			<ul class="list">
-				<li><a href="/ubuntu">Ubuntu</a></li> 
-				<li><a href="/server">Ubuntu Server</a></li> 
-				<li><a href="http://community.ubuntu.com/contribute/">Get involved</a></li> 
+				<li><a href="/desktop">Ubuntu</a></li>
+				<li><a href="/server">Ubuntu Server</a></li>
+				<li><a href="http://community.ubuntu.com/contribute/">Get involved</a></li>
 			</ul>
 	</div>
 </div><!-- / .row -->
diff --git a/templates/about/shared/_contextual_footer.html b/templates/about/shared/_contextual_footer.html
old mode 100644
new mode 100755
diff --git a/templates/about/ubuntu-font.html b/templates/about/ubuntu-font.html
old mode 100644
new mode 100755
index 8f425c047ac..9d54f5cd83b
--- a/templates/about/ubuntu-font.html
+++ b/templates/about/ubuntu-font.html
@@ -1,18 +1,27 @@
 {% extends "about/base_about.html" %}
 
-{% block title %}Ubuntu Font{% endblock %}
+{% block title %}Ubuntu font{% endblock %}
 
 {% block content %}
 <div class="row row-hero">
 	<h1>Ubuntu font</h1>
 </div>
 
-<div class="row">
-		<p><img src="{{ STATIC_URL }}img/project/ubuntu-font.jpg" alt="" width="900" height="159" /></p>
-	
+<div class="row no-border">
+	<div class="twelve-col">
+		<div class="ubuntufont-image-load" data-width="900" data-src="{{ STATIC_URL }}img/about/ubuntu-font{width}.jpg" data-alt=""></div>
+		<script>
+		    new Imager('.ubuntufont-image-load', {
+		        availableWidths: {
+		            320: '-small',
+		            900: '-medium'
+		        }
+		    });
+		</script>
+	</div>
 	<div class="six-col">
 		<p>Fonts have become one of the most essential communication tools today.</p><p>They allow us to convey our thoughts to one another, be that by letter or text message, with clarity and purpose.</p><p>Dalton Maag, a London-based studio, has laid the foundations for the Ubuntu font project with a beautiful design that aims to produce every character to support every language and interest in the world.</p><p>This is the most ambitious font project ever undertaken. Its success depends on the willingness of designers around the world to participate and work with the teams at Dalton Maag and Canonical to deliver the most comprehensive font suite ever. It&rsquo;s a true testament to the power of collaborative working in technology and design.</p>
-	
+
 		<ul>
 			<li><a href="http://font.ubuntu.com">font.ubuntu.com</a></li>
 			<li><a href="http://www.designmuseum.org">designmuseum.org</a></li>
diff --git a/templates/base_index.html b/templates/base_index.html
old mode 100644
new mode 100755
index 4bd36644bb5..db7857673be
--- a/templates/base_index.html
+++ b/templates/base_index.html
@@ -1,6 +1,6 @@
 {% extends "templates/base.html" %}
 
-{% block title %}The world's most popular free OS{% endblock %}
+{% 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 %}
 
 {% block outer_content %}
diff --git a/templates/cloud/_nav_secondary.html b/templates/cloud/_nav_secondary.html
old mode 100644
new mode 100755
index b3e79cbad7c..0cfe27be70b
--- a/templates/cloud/_nav_secondary.html
+++ b/templates/cloud/_nav_secondary.html
@@ -1,10 +1,11 @@
-	<ul{% if list_class %} class="{{ list_class }}"{% endif %}>
-		{% if arrow %} <li class="arrow-up"></li> {% endif %}
+	<ul{% if list_class %} class="{{ list_class }}"{% endif %} class="second-level-nav">
 		<li class="first{% if level_1 == 'cloud' and not level_2 %} active{% endif %}"><a href="/cloud">Overview</a></li>
-		<li{% if level_2 == 'build-a-cloud' %} class="active" {% endif %}><a href="/cloud/build-a-cloud">Build a cloud</a></li>
-		<li{% if level_2 == 'use-a-cloud' %} class="active" {% endif %}><a href="/cloud/use-a-cloud">Use a cloud</a></li>
-		<li{% if level_2 == 'tools' %} class="active" {% endif %}><a href="/cloud/tools">Cloud tools</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 == 'jumpstart-training' %} class="active"{% endif %}><a href="/cloud/jumpstart-training">Jumpstart 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>
-		<li{% if level_2 == 'labs' %} class="active" {% endif %}><a href="/cloud/labs">Cloud labs</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>
+		<li{% if level_2 == 'labs' %} class="active"{% endif %}><a href="/cloud/labs">Labs</a></li>
 	</ul>
diff --git a/templates/cloud/_nav_tertiary.html b/templates/cloud/_nav_tertiary.html
old mode 100644
new mode 100755
index 5386e126599..445b8dd9c6d
--- a/templates/cloud/_nav_tertiary.html
+++ b/templates/cloud/_nav_tertiary.html
@@ -1,26 +1,34 @@
-	<ul>
+	<ul class="third-level-nav">
 {% if level_5 == 'thank-you' %}
 		<li{% if level_5 == 'thank-you' %} class="active"{% endif %}>Thank you</li>
 {% endif %}
 {% if level_3 == 'thank-you' and not level_4 %}
 		<li{% if level_3 == 'thank-you' %} class="active"{% endif %}>Thank you</li>
 {% endif %}
-{% if level_2 == 'build-a-cloud' %}
-		<li{% if level_3 == 'turnkey-solutions' %} class="active"{% endif %}><a href="/cloud/build-a-cloud/turnkey-solutions">Turnkey solutions</a></li>
-		<li{% if level_3 == 'jumpstart' %} class="active"{% endif %}><a href="/cloud/build-a-cloud/jumpstart">Jumpstart</a></li>
-		<li{% if level_3 == 'openstack' %} class="active"{% endif %}><a href="/cloud/build-a-cloud/openstack">OpenStack</a></li>
-		<li{% if level_3 == 'reference-architecture' %} class="active"{% endif %}><a href="/cloud/build-a-cloud/reference-architecture">Reference architecture</a></li>
+{% if level_2 == 'bootstack' and level_3 == 'contact-us' %}
+		<li{% if level_3 == 'contact-us' %} class="active"{% endif %}>Contact us</li>
+{% endif %}
+{% if level_2 == 'jumpstart-training' and level_3 == 'order' %}
+		<li{% if level_3 == 'order' %} class="active"{% endif %}>Order</li>
+{% endif %}
+{% if level_2 == 'jumpstart-training' and level_3 == 'order-thank-you' %}
+		<li{% if level_3 == 'order-thank-you' %} class="active"{% endif %}>Thank you</li>
+{% endif %}
+{% if level_2 == 'jumpstart-training' and level_3 == 'contact-us' %}
+		<li{% if level_3 == 'contact-us' %} class="active"{% endif %}>Contact us</li>
+{% endif %}
+{% if level_2 == 'openstack' %}
+		<li{% if level_3 == 'reference-architecture' %} class="active single-link"{% endif %} {% if level_3 != 'reference-architecture' %} class="single-link"{% endif %}><a href="/cloud/openstack/reference-architecture">Reference architecture</a></li>
 {% endif %}
 {% if level_2 == 'use-a-cloud' %}
-		<li{% if level_3 == 'use-a-cloud' %} class="active"{% endif %}><a href="/cloud/use-a-cloud/guest">Cloud guest</a></li>
+		<li{% if level_3 == 'use-a-cloud' %} class="active"{% endif %}><a href="/cloud/public-cloud/guest">Cloud guest</a></li>
 {% endif %}
 {% if level_2 == 'tools' %}
 		<li{% if level_3 == 'juju' %} class="active"{% endif %}><a href="/cloud/tools/juju">Juju</a></li>
 		<li{% if level_3 == 'maas' %} class="active"{% endif %}><a href="/cloud/tools/maas">MAAS</a></li>
-		<li{% if level_3 == 'openstack' %} class="active"{% endif %}><a href="/cloud/tools/openstack">OpenStack</a></li>
-		<li{% if level_3 == 'jumpstart' %} class="active"{% endif %}><a href="/cloud/tools/jumpstart">Jumpstart</a></li>
 {% endif %}
 {% if level_2 == 'ecosystem' %}
-		<li{% if level_3 == 'ubuntu-oil' %} class="active"{% endif %}><a href="/cloud/ecosystem/ubuntu-oil">Ubuntu OpenStack interoperability lab</a></li>
+		<li{% if level_3 == 'ubuntu-openstack-interoperability-lab' %} class="active"{% endif %}><a href="/cloud/ecosystem/ubuntu-openstack-interoperability-lab">Ubuntu OpenStack Interoperability Lab</a></li>
+		<li{% if level_3 == 'ubuntu-certified-public-cloud' %} class="active"{% endif %}><a href="/cloud/ecosystem/ubuntu-certified-public-cloud">Ubuntu Certified Public Cloud</a></li>
 {% endif %}
 	</ul>
\ No newline at end of file
diff --git a/templates/cloud/base_cloud.html b/templates/cloud/base_cloud.html
old mode 100644
new mode 100755
diff --git a/templates/cloud/bootstack/contact-us.html b/templates/cloud/bootstack/contact-us.html
new file mode 100644
index 00000000000..081f5aa05dc
--- /dev/null
+++ b/templates/cloud/bootstack/contact-us.html
@@ -0,0 +1,762 @@
+{% extends "cloud/base_cloud.html" %}
+
+{% block title %}BootStack | Cloud{% endblock %}
+
+{% block meta_description %}With BootStack, Canonical will build, support and manage your cloud for only $15 per host per day.{% endblock meta_description %}
+
+{% block meta_keywords %}Ubuntu BootStack, BootStack, private cloud, support, Ubuntu OpenStack, consulting, build a cloud, Ubuntu, Canonical{% endblock meta_keywords %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" subsection_title="BootStack" page_title="Order" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row row-hero no-border">
+	<div class="eight-col">
+		<h2>Talk to us about BootStack</h2>
+		<p class="intro">Fill in your details below and a member of our cloud sales team will be in touch.</p>
+	</div>
+	<div class="eight-col">
+		<form class='mktoForm mktoNoJS' action='https://pages.canonical.com/index.php/leadCapture/save' method='post'>
+		    <fieldset>
+		        <h3>1. About you</h3>
+
+		        <ul class="mktLblLeft">
+								<li class='mktFormReq mktField'><label>First name:</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>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></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' required /> </span></li>
+
+		            <li class='mktFormReq mktField'><label>Job title: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormString mktFReq' name="Title" id="Title" type='text' value="" maxlength='255' tabindex='3' required /></span></li>
+
+		            <li class='mktFormReq mktField'><label>Email address: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormEmail mktFReq' name="Email" id="Email" type='text' value="" maxlength='255' tabindex='3' required /></span></li>
+
+		            <li class='mktFormReq mktField'><label>Phone number: <span>*</span></label><span class='mktInput'><input class='mktFormText mktFormPhone mktFReq' name="Phone" id="Phone" type='text' value="" maxlength='255' tabindex='4' required /></span></li>
+
+		            <li class='mktFormReq mktField'><label>Country: <span>*</span></label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Country" id="Country" size='1' tabindex='5' required />
+		                <option value='Select country:' selected='selected'>Select country:</option>
+
+		                <option value='AF'>Afghanistan</option>
+
+		                <option value='AX'>&Aring;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&ocirc;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&#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&#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&eacute;union</option>
+
+		                <option value='RO'>Romania</option>
+
+		                <option value='RU'>Russian Federation</option>
+
+		                <option value='RW'>Rwanda</option>
+
+		                <option value='BL'>Saint Barth&eacute;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>
+		            </select></span></li>
+
+		            <li class='mktFormReq mktField'><label>State:</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="State" id="State" size='1' tabindex='6'>
+		                <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>
+		            </select> </span></li>
+		        </ul>
+		    </fieldset>
+
+		    <fieldset>
+        	<h3>2. Scale</h3>
+        	<p>Please tell us your anticipated scale for this project - how many machines you expect to deploy, or how many virtual machines you expect to support on the cloud and what sort of storage capacity you believe you require.</p>
+					<label class="mktoLabel off-left" for='cloudscale'>Scale</label>
+        	<span class='mktInput'>
+					<textarea class='mktFormTextarea mktFormTextarea' name='cloudscale' id='cloudscale' cols='20' rows='4' tabindex='15'></textarea>
+					</span>
+		    </fieldset>
+
+		    <fieldset>
+        	<h3>3. Timing</h3>
+        	<p>Please indicate the timeline on which you expect to see this cloud brought into production. We are in private beta for BootStack at present, but will be able to deliver a cloud of moderate scale within 5 working days as soon as we wrap the beta.</p>
+					<label class="mktoLabel off-left" for='cloudtiming'>Timing</label>
+        	<span class='mktInput'>
+					<textarea class='mktFormTextarea mktFormTextarea' name='cloudtiming' id='cloudtiming' cols='20' rows='4' tabindex='16'></textarea>
+					</span>
+		    </fieldset>
+
+		    <fieldset>
+        	<h3>4. Purpose</h3>
+        	<p>Please indicate the nature of your intended use of the cloud. Will it be for general production use, or to host a single suite of related applications? Will it be for development or test purposes?</p>
+					<label class="mktoLabel off-left" for='Why_Cloud__c'>Purpose</label>
+        	<span class='mktInput'>
+					<textarea class='mktFormTextarea mktFormTextarea' name='Why_Cloud__c' id='Why_Cloud__c' cols='20' rows='4' tabindex='17'></textarea>
+					</span>
+		    </fieldset>
+
+		    <fieldset>
+		    	<h3>5. Additional questions and comments</h3>
+					<label class="mktoLabel off-left" for='Comments_from_lead__c'>Additional questions and comments</label>
+	      	<span class='mktInput'>
+						<textarea class='mktFormTextarea mktFormTextarea' name="Comments_from_lead__c" id="Comments_from_Contact__c" cols='20' rows='6' tabindex='18'></textarea>
+					</span>
+		    </fieldset>
+
+		    <fieldset class="fieldset-submit">
+		    	<h3>6. Submit</h3>
+		        <ul class="mktLblLeft">
+		            <li class="mktField mktLblRight"><span class="mktInput mktLblRight"><input class="mktFormCheckbox" name="NewsletterOpt-In" id="NewsletterOpt-In" type="checkbox" value="1" tabindex="16"><label for="NewsletterOpt-In">I would like to receive occasional news from Canonical by email.</label>&nbsp;</span></li>
+
+		            <li>All information provided will be handled in accordance with the Canonical <a href="http://www.ubuntu.com/legal" target="_blank">privacy policy</a>.</li>
+
+		            <li id="mktFrmButtons"><!--<label>&nbsp;</label>--><button type='submit' class='mktoButton'>Submit</button></li>
+		        </ul>
+		    </fieldset>
+
+    <span style="display:none;"> <input type="text" name="_marketo_comments" value=""></span>
+    <input type="hidden" name="lpId" value="1646" />
+    <input type="hidden" name="subId" value="30" />
+    <input type="hidden" name="lpurl" value="https://pages.canonical.com/contact-us-bootstack.html?cr={creative}&kw={keyword}" />
+    <input type="hidden" name="formid" value="1128" />
+    <input type="hidden" name="ret" value="" />
+    <input type="hidden" name="munchkinId" value="066-EOV-335"/>
+    <input type="hidden" name="kw" value=""/>
+		<input type="hidden" name="returnURL" value="http://www.ubuntu.com/cloud/bootstack/thank-you">
+		<input type="hidden" name="retURL" value="http://www.ubuntu.com/cloud/bootstack/thank-you">
+    <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=""/>
+    </form>
+
+<script type="text/javascript" src="https://app.marketo.com/js/public/jquery-latest.min.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);
+			}
+		</script>
+	</div><!-- /.eight-col -->
+</div><!-- /.row -->
+
+{% include "shared/_live_chat.html" %}
+{% endblock content %}
+{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/cloud/bootstack/index.html b/templates/cloud/bootstack/index.html
new file mode 100755
index 00000000000..63a654b2a25
--- /dev/null
+++ b/templates/cloud/bootstack/index.html
@@ -0,0 +1,120 @@
+{% extends "cloud/base_cloud.html" %}
+
+{% block title %}BootStack | Cloud{% endblock %}
+
+{% block meta_description %}With BootStack, Canonical will build, support and manage your cloud for only $15 per host per day.{% endblock meta_description %}
+
+{% block meta_keywords %}Ubuntu BootStack, BootStack, private cloud, support, Ubuntu OpenStack, consulting, build a cloud, Ubuntu, Canonical{% endblock meta_keywords %}
+
+{% block head_extra %}
+{% comment %}Needed for the form{% endcomment %}
+	<script>
+		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 second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" page_title="Your cloud" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row row-hero equal-height no-border">
+	<div class="eight-col">
+		<h1>BootStack</h1>
+		<p class="intro">Let Canonical build, support and manage your cloud for only &dollar;15 per host per day</p>
+		<p>Now you can have an operational OpenStack cloud of any size, without the learning curve involved in creating it yourself. Let Canonical&rsquo;s OpenStack experts build and manage a cloud to your exact specification for just $15 per host, per day.</p>
+	</div><!-- /.eight-col -->
+	<div class="four-col align-vertically last-col text-center">
+		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-startfirst-midaubergine.svg" alt="" class="priority-0" width="200" />
+	</div>
+</div><!-- /.row -->
+
+<div class="row no-border strip-dark">
+		<h2 class="eight-col">The easiest route to an OpenStack cloud</h2>
+	<div class="six-col">
+		<ul class="list-ubuntu">
+			<li>A cloud to your specification</li>
+			<li>On hardware of your choice</li>
+			<li class="last-item">In your datacentre or on your premises</li>
+		</ul>
+	</div><!-- /.six-col -->
+	<div class="six-col last-col">
+		<ul class="list-ubuntu">
+			<li>Or hosted with IBM’s Softlayer</li>
+			<li>Managed and supported by Canonical</li>
+			<li id="fnref1">$15 per host per day <a href="#fn1" rel="footnote">*</a></li>
+		</ul>
+	</div>
+	<p id="fn1" class="twelve-col smaller note"><a href="#fnref1" rev="footnote">*Excludes cost of hardware and hosting</a></p>
+</div><!-- /.row -->
+
+<div class="row equal-height">
+	<div class="eight-col">
+		<div>
+			<h2>Enterprise-grade service</h2>
+			<p>Based on Canonical’s long experience in designing OpenStack clouds for enterprise customers, BootStack is designed to relieve you of all management headaches. It features a comprehensive SLA to guarantee availability, whatever your demands. In short, Canonical takes complete responsibility for the uptime and responsiveness of your cloud.</p>
+		</div>
+	</div><!-- /.eight-col -->
+	<div class="four-col align-vertically align-center last-col">
+		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-support-midaubergine.svg" alt="" class="priority-0" width="200" />
+	</div>
+</div><!-- /.row -->
+
+<div class="row equal-height">
+	<div class="four-col align-vertically align-center">
+		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-growondemand-midaubergine.svg" alt="" class="priority-0" width="200" />
+	</div>
+	<div class="eight-col last-col">
+		<div>
+			<h2>From five machines to five million</h2>
+			<p>BootStack can deliver a test cloud on as few as five hosts – useful, if you’re considering it for prototyping, proof-of-concept or as a training platform. But it can also be a fast and foolproof way to deliver an enterprise-scale, production cloud, with the peace of mind you only get from 24/7 management and support. Whatever you need your OpenStack cloud for, BootStack is the fastest way to get it. </p>
+		</div>
+	</div><!-- /.eight-col -->
+</div><!-- /.row -->
+
+<div class="row row-grey">
+	<div class="eight-col">
+		<h2>A true best-of-breed cloud</h2>
+		<p>The BootStack service gives you an unbeatable combination:</p>
+	</div>
+	<div class="twelve-col">
+		<ul class="list-canonical">
+			<li class="six-col">OpenStack, the world’s leading open cloud platform</li>
+			<li class="six-col last-col">Ubuntu, the number one operating system for OpenStack</li>
+			<li class="six-col">Your choice of hardware, certified by Canonical for Ubuntu and OpenStack</li>
+			<li class="six-col last-col">Hosting from IBM Softlayer if you prefer</li>
+			<li class="six-col">24/7 support and management from the OpenStack experts at Canonical</li>
+		</ul>
+	</div>
+</div><!-- /.row -->
+
+<div class="row equal-height no-border">
+	<div class="four-col align-vertically align-center">
+		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-training-midaubergine.svg" alt="" class="priority-0" width="200" />
+	</div>
+
+	<div class="eight-col last-col">
+		<div>
+			<h2>Take control when it suits you</h2>
+			<p>Canonical will continue to provide 24/7 management and support for your cloud for as long as you need it. But if there comes a point when you’re ready to take it in-house, our engineers will hand over operational responsibility smoothly and without disruption. </p>
+			<p><a class="link-cta-ubuntu" href="/cloud/bootstack/contact-us">Contact us about BootStack</a></p>
+		</div>
+	</div><!-- /.eight-col -->
+</div><!-- /.row -->
+
+{% include "shared/_live_chat.html" %}
+{% endblock content %}
+{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/cloud/bootstack/thank-you.html b/templates/cloud/bootstack/thank-you.html
new file mode 100755
index 00000000000..ba2b008b7a9
--- /dev/null
+++ b/templates/cloud/bootstack/thank-you.html
@@ -0,0 +1,34 @@
+{% extends "cloud/base_cloud.html" %}
+
+{% block title %}Thank you{% endblock %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" subsection_title="BootStack" page_title="Thank you"  %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+{% include "shared/_thank_you.html" with thanks_context="enquiring about BootStack" %}
+{% include "shared/_live_chat.html" %}
+
+{% 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/cloud/build-a-cloud.html b/templates/cloud/build-a-cloud.html
deleted file mode 100644
index a7a7ee3de16..00000000000
--- a/templates/cloud/build-a-cloud.html
+++ /dev/null
@@ -1,159 +0,0 @@
-{% extends "cloud/base_cloud.html" %}
-
-{% block title %}Build a cloud | Cloud{% endblock %}
-
-{% block meta_description %}Ubuntu OpenStack is the fastest, easiest and most robust way to build your cloud - with a suite of tools to help you build and manage your cloud.{% endblock meta_description %}
-
-{% block meta_keywords %}Ubuntu OpenStack, OpenStack, cloud, Juju, Maas, Ubuntu Guest, private cloud, public cloud{% endblock meta_keywords %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" page_title="Build a cloud" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-border no-padding-bottom">
-	<div class="four-col">
-		<h1>Build a cloud</h1>
-		<h2>Everything you need for an OpenStack cloud</h2>
-	</div><!-- /.six-col -->
-	<div class="eight-col last-col">
-		<img src="{{ STATIC_URL }}img/cloud/image-hero-build-infographic.png" alt="" />
-	</div><!-- /.six-col -->
-</div>
-<div class="row tight-section">
-	<div class="vertical-divider">
-		<div class="three-col ubuntu-column">
-			<img src="{{ STATIC_URL }}img/pictograms/image-picto-ubuntu.png" width="77" height="77" alt="" />
-			<img src="{{ STATIC_URL }}img/pictograms/image-picto-openstack.png" width="77" height="77" alt="" />
-			<h3>Ubuntu Server with OpenStack</h3>
-			<p class="offer">Free software</p>
-			<p>The core of Ubuntu OpenStack. Includes the latest OpenStack release, tested, packaged, and fully integrated. Available through the &lsquo;Cloud Archive&rsquo;, ready to install. </p>
-			<p><a href="/cloud/tools/openstack">Learn more about OpenStack&nbsp;&rsaquo;</a></p>
-			<p><a href="/download/cloud/install-ubuntu-cloud">Read the full installation instructions&nbsp;&rsaquo;</a></p>
-		</div>
-		<div class="three-col">
-			<h3>Landscape</h3>
-			<p class="offer">Free for 30 days</p>
-			<p>The ultimate cloud management tool for Ubuntu OpenStack. Makes managing thousands of nodes in your Ubuntu cloud as easy as managing one. Included in Ubuntu Advantage. </p>
-			<p><a href="/cloud/management">Learn more about Landscape&nbsp;&rsaquo;</a></p>
-		</div>
-		<div class="three-col">
-			<h3>MAAS</h3>
-			<p class="offer">Free software</p>
-			<p>Turns your hardware into a cloud in minutes. No need to worry about arduous provisioning and configuration. MAAS will do all that and more, on virtually any hardware!</p>
-			<p><a href="/cloud/tools/maas">Learn more about MAAS&nbsp;&rsaquo;</a></p>
-		</div>
-		<div class="three-col last-col">
-			<h3>Juju</h3>
-			<p class="offer">Free software</p>
-			<p>A revolution in service orchestration. Deploy OpenStack in minutes and spin up and manage services in a few clicks from within your browser. High-availability included!</p>
-			<p><a href="/cloud/tools/juju">Learn more about Juju&nbsp;&rsaquo;</a></p>
-		</div>
-	</div>
-</div><!-- /.row row-hero -->
-
-<div class="row row-cloud-get-started row-grey">
-	<div class="eight-col">
-		<h2>Getting started</h2>
-		<p>Setting up an Ubuntu OpenStack cloud is straightforward.</p>
-		<ol class="no-bullets">
-			<li><span>1</span>Download Ubuntu Server for cloud</li>
-			<li><span>2</span>Use MAAS to provision your hardware</li>
-			<li><span>3</span>Use Juju to install OpenStack and deploy your services</li>
-			<li><span>4</span>Try Landscape to manage your servers and get support from Canonical</li>
-		</ol>
-		<p><a class="link-cta-ubuntu" href="/download/cloud">Download Ubuntu OpenStack</a></p>
-		<p><a href="/cloud/tools/jumpstart">Let Canonical build you a test cloud&nbsp;&rsaquo;</a></p>
-	</div><!-- /.six-col -->
-	<div class="four-col box box-highlight resource resource-white-paper last-col">
-		<h2><a href="http://insights.ubuntu.com/resources/factsheet/ubuntu-openstack-factsheet/">Ubuntu OpenStack&nbsp;&rsaquo;</a></h2>
-		<p>What makes up Ubuntu OpenStack? And how do all the parts fit together? Learn all about Ubuntu Server, MAAS, Juju and Landscape, as well as available support from Canonical  in this quick guide.</p>
-		<p class="content-cat content-cat-factsheet">Factsheet</p>
-	</div><!-- /.four-col -->
-</div><!-- /.row -->
-
-<div class="row row-public-cloud-providers">
-	<div class="twelve-col box-image-centered">
-		<div class="eight-col">
-			<h2>Thinking big?</h2>
-			<h3>Becoming a public cloud provider</h3>
-			<p>Telcos and service providers face specific challenges when building public clouds.  You need to think hard about minimising risks to your cloud deployment, and have an estimate of your time to market. Ideally, you should learn from other companies&rsquo; experience with building public clouds. </p>
-			<p>Need help? <a href="/cloud/contact-us/">Contact us today &rsaquo;</a></p>
-		</div><!-- /.eight-col -->
-		<span><img src="{{ STATIC_URL }}img/pictograms/pictogram-public-cloud-350x350.png" width="200" height="200" alt="" /></span>
-	</div>
-	<div class="twelve-col equal-height">
-		<div class="six-col box box-highlight resource resource-white-paper">
-			<h2><a href="http://insights.ubuntu.com/whitepaper/entering-the-cloud-fray/">Entering the cloud fray&nbsp;&rsaquo;</a></h2>
-			<p>Read about the challenges facing new cloud operators and how to overcome them.</p>
-			<p class="content-cat content-cat-whitepaper">White paper</p>
-		</div>
-		<div class="six-col box box-highlight resource resource-webinar last-col">
-			<h2><a href="https://www.brighttalk.com/webcast/6793/80469" onclick="_gaq.push(['_trackEvent', 'External Link', 'Webinar', 'Best practices in OpenStack clouds']);">Best practices in OpenStack clouds&nbsp;&rsaquo;</a></h2>
-			<p>Hear our stories of building Ubuntu OpenStack clouds for some of the world’s largest telcos.</p>
-		<p class="content-cat content-cat-webinar">Webinar</p>
-		</div>
-	</div>
-</div><!-- /.row -->
-
-<div class="row row-grey">
-	<h2>Already in production?</h2>
-	<div class="eight-col">
-		<p>Are you already running an Ubuntu OpenStack cloud? Or are you looking to move from proof of concept to production? Choosing your cloud technology is only the first step. Getting the most out of your resources is essential to running a successful cloud operation. We have compiled some tips and tricks from our experts to help you optimise your Ubuntu OpenStack deployment, cope with growth and increasing demand, and offer your internal and external customers a safe, reliable, and overall excellent cloud experience.</p>
-	</div><!-- /.eight-col -->
-	<div class="four-col last-col text-center">
-		<img src="{{ STATIC_URL }}img/pictograms/picto-partner-grey-180x180.png" width="180" height="180" alt="" />
-	</div><!-- /.four-col -->
-	<div class="equal-height">
-
-		<div class="four-col box box-highlight resource resource-white-paper">
-			<h2><a href="http://insights.ubuntu.com/resources/brochure/make-it-rain-public-cloud-on-ubuntu-openstack/">Powering the public cloud&nbsp;&rsaquo;</a></h2>
-			<p>How does Ubuntu OpenStack enable new revenue streams through your public cloud deployment? How do you delight your customers and exceed SLAs while managing risks and costs? Your guide to production public clouds.</p>
-			<p class="content-cat content-cat-white-paper">White paper</p>
-		</div><!-- /.four-col -->
-		<div class="four-col box box-highlight resource resource-datasheet">
-			<h2><a href="http://insights.ubuntu.com/resources/factsheet/ubuntu-certified-public-cloud-programme/">Certify your Ubuntu images&nbsp;&rsaquo;</a></h2>
-			<p>Canonical&rsquo;s Certified Public Cloud Programme is the only way to ensure your customers get the best and fullest Ubuntu experience.</p>
-			<p class="content-cat content-cat-datasheet">Datasheet</p>
-		</div><!-- /.four-col -->
-		<div class="four-col last-col box box-highlight resource resource-white-paper">
-			<h2><a href="http://insights.ubuntu.com/whitepaper/building-a-private-cloud-taking-the-leap/">Building a private cloud?&nbsp;&rsaquo;</a></h2>
-			<p>Integrating Ubuntu OpenStack into your existing environment; the best scale-out, management, monitoring, and reporting strategies; customising OpenStack to your needs, and much more.</p>
-			<p class="content-cat content-cat-white-paper">White paper</p>
-		</div><!-- /.four-col -->
-	</div>
-</div><!-- /.row -->
-
-<div class="row row-management">
-	<div class="eight-col">
-		<h2>Management and support</h2>
-		<p>With stringent SLAs you can&rsquo;t afford to take any chances. Having access to comprehensive support is just as important as choosing the right cloud infrastructure. Ubuntu Advantage gives you professional management and support, including access to cloud experts as and when you need them.</p>
-		<p><a href="/cloud/management">Learn more about Ubuntu Advantage &rsaquo;</a></p>
-	</div><!-- /.six-col -->
-</div><!-- /.row -->
-
-<div class="row row-interoperability">
-	<div class="five-col">
-		<img src="{{ STATIC_URL }}img/cloud/image-interoperability.png" alt="" />
-	</div><!-- /.six-col -->
-	<div class="seven-col last-col">
-		<h2>Powerful ecosystem</h2>
-		<p>The days of one-size-fits-all IT and cloud infrastructure are gone, so it&rsquo;s vital yours gives you options. Whether it&rsquo;s substituting parts of OpenStack or adding plugins to popular tools, every component must be fully certified and supported. The Ubuntu Cloud ecosystem complements industry-leading cloud solutions with the support and consulting expertise you need.</p>
-		<p><a href="/cloud/ecosystem">Explore the Ubuntu cloud ecosystem &rsaquo;</a></p>
-	</div><!-- /.six-col -->
-</div><!-- /.row -->
-
-<div class="row no-border row-grey start-today">
-	<div class="three-col text-center">
-		<img src="{{ STATIC_URL }}img/pictograms/picto-jumpstart-orange-180x180.png" width="180" height="180" alt="" />
-	</div>
-	<div class="seven-col last-col">
-		<h2>Start today</h2>
-		<p>For a fixed price and with minimal risk, Jumpstart will get a cloud up and running in just five days.</p>
-		<p><a href="/cloud/tools/jumpstart">Learn about Jumpstart &rsaquo;</a></p>
-	</div>
-</div><!-- /.row -->
-
-{% include "shared/_live_chat.html" %}
-
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/cloud/contact-us.html b/templates/cloud/contact-us.html
old mode 100644
new mode 100755
index 6312f301275..8cb2bcd76b4
--- a/templates/cloud/contact-us.html
+++ b/templates/cloud/contact-us.html
@@ -33,20 +33,20 @@ <h1>Contact us</h1>
 
 {% block content %}
 <div class="row no-border">
-	<div class="eight-col">
+	<div class="seven-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_1069" name="mktForm_1069">
 			<fieldset class="fieldset-1">
 				<h3>About you</h3>
 				<ul class="mktLblLeft">
-					<li class='mktFormReq mktField'><label>First name: <span>*</span></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>Last name: <span>*</span></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>Email address: <span>*</span></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>Phone number: <span>*</span></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>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>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>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>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>
 					<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">
-					<option value="Select Country:" selected="selected">Select Country:</option>
+				<select class="mktFormSelect mktFReq" name="Country" id="Country" size="1" tabindex="5" required>
+					<option value="Select country:" selected="selected">Select country:</option>
 					<option value="AF">Afghanistan</option>
 					<option value="AX">&Aring;land Islands</option>
 					<option value="AL">Albania</option>
@@ -300,7 +300,7 @@ <h3>About you</h3>
 			<li class="mktField">
 				<label for="State">State:</label>
 				<span class="mktInput">
-				<select class="mktFormSelect mktFReq" name="State" id="State" size="1" tabindex="6">
+				<select class="mktFormSelect mktFReq" name="State" id="State" size="1" tabindex="6" required>
 					<option value="SelectProvince" selected="selected">Select Province</option>
 					<option value="AB">Alberta</option>
 					<option value="BC">British Columbia</option>
@@ -377,24 +377,24 @@ <h3>About you</h3>
 			<fieldset class="fieldset-2">
 				<h3>About your role</h3>
 				<ul class="mktLblLeft">
-					<li class='mktFormReq mktField'><label>Job role: <span>*</span></label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Job_Role__c" id="Job_Role__c" size='1'  tabIndex='7'><option value='' 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>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='' 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>
 				</ul>
 			</fieldset>
 			<fieldset class="fieldset-3">
 				<h3>About your company</h3>
 				<ul class="mktLblLeft">
-					<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='8' /><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='8' required /><span class='mktFormMsg'></span></span></li>
 					<li class='mktField'><label>Industry:</label><span class='mktInput'><select class='mktFormSelect' name="Industry" id="Industry" size='1'  tabIndex='9'><option value='' 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 &mdash; media/music/broadcast'>Entertainment &mdash; 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 &mdash; Computer Hardware'>Manufacturer &mdash; Computer Hardware</option><option value='Manufacturer &mdash; Device/ Handset'>Manufacturer &mdash; Device/ Handset</option><option value='Manufacturer &mdash; Other'>Manufacturer &mdash; Other</option><option value='Marketing, PR &amp; Advertising'>Marketing, PR &amp; Advertising</option><option value='Media &mdash; publishing or news'>Media &mdash; publishing or news</option><option value='Oil &amp; Gas'>Oil &amp; Gas</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='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>
 				</ul>
-			</fieldset>	
-			<fieldset class="fieldset-4">				
-				<h3>IT and your organisation</h3>			
+			</fieldset>
+			<fieldset class="fieldset-4">
+				<h3>IT and your organisation</h3>
 				<ul class="mktLblLeft">
-					<li class='mktFormReq mktField'><label>How do you currently use Ubuntu? <span>*</span></label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Ubuntu_User__c" id="Ubuntu_User__c" size='1'  tabIndex='10'><option value='' 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>How many employees does your organisation have? <span>*</span></label><span class='mktInput'><select class='mktFormSelect mktFReq' name="num_employees__c" id="num_employees__c" size='1'  tabIndex='11'><option value='' selected='selected'>Please select:</option><option value='None'>None</option><option value='&lt;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>
-					<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'><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>
-					<li class='mktFormReq mktField'><label>Why are you interested in cloud? <span>*</span></label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Why_Cloud__c" id="Why_Cloud__c" size='1' tabIndex='13'><option value='' selected='selected'>Please select:</option><option value='Increasing revenues'>Increasing revenues</option><option value='Minimising operational expenditure'>Minimising operational expenditure</option><option value='Optimising efficiency'>Optimising efficiency</option><option value='Handling spikes in traffic'>Handling spikes in traffic</option><option value='Technical'>Technical</option><option value='Other'>Other</option></select><span class='mktFormMsg'></span></span></li>
-					<li class='mktFormReq mktField'><label>How soon do you plan to deploy your cloud solution? <span>*</span></label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Project_Timeframe__c" id="Project_Timeframe__c" size='1' tabIndex='14'><option value='' selected='selected'>Please select:</option><option value='Less than 3 months'>Less than 3 months</option><option value='3-6 months'>3-6 months</option><option value='6-12 months'>6-12 months</option><option value='No specific dates'>No specific dates</option></select><span class='mktFormMsg'></span></span></li>
+					<li class='mktFormReq mktField'><label>How do you currently use Ubuntu? <span>*</span></label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Ubuntu_User__c" id="Ubuntu_User__c" size='1'  tabIndex='10' required ><option value='' 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>How many employees does your organisation have? <span>*</span></label><span class='mktInput'><select class='mktFormSelect mktFReq' name="num_employees__c" id="num_employees__c" size='1'  tabIndex='11' required><option value='' selected='selected'>Please select:</option><option value='None'>None</option><option value='&lt;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>
+					<li  class='mktFormReq mktField' ><label>Number of Ubuntu servers currently deployed: <span>*</span></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></li>
+					<li class='mktFormReq mktField'><label>Why are you interested in cloud? <span>*</span></label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Why_Cloud__c" id="Why_Cloud__c" size='1' tabIndex='13' required><option value='' selected='selected'>Please select:</option><option value='Increasing revenues'>Increasing revenues</option><option value='Minimising operational expenditure'>Minimising operational expenditure</option><option value='Optimising efficiency'>Optimising efficiency</option><option value='Handling spikes in traffic'>Handling spikes in traffic</option><option value='Technical'>Technical</option><option value='Other'>Other</option></select><span class='mktFormMsg'></span></span></li>
+					<li class='mktFormReq mktField'><label>How soon do you plan to deploy your cloud solution? <span>*</span></label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Project_Timeframe__c" id="Project_Timeframe__c" size='1' tabIndex='14' required><option value='' selected='selected'>Please select:</option><option value='Less than 3 months'>Less than 3 months</option><option value='3-6 months'>3-6 months</option><option value='6-12 months'>6-12 months</option><option value='No specific dates'>No specific dates</option></select><span class='mktFormMsg'></span></span></li>
 				</ul>
 			</fieldset>
 			<fieldset class="fieldset-5">
@@ -403,7 +403,7 @@ <h3>Your comments</h3>
 					<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='15'></textarea><span class='mktFormMsg'>
+							<textarea class='mktFormTextarea mktFormTextarea mktFReq' name="Comments_from_lead__c" id="Comments_from_lead__c" cols='20' rows='4' tabIndex='15' required></textarea><span class='mktFormMsg'>
 							</span>
 						</span>
 					</li>
@@ -413,7 +413,7 @@ <h3>Your comments</h3>
 				<ul class="mktLblLeft">
 					<li class="mktField mktLblRight"><span class="mktInput mktLblRight"><input class="mktFormCheckbox" name="NewsletterOpt-In" id="NewsletterOpt-In" type="checkbox" value="1" tabindex="16"><label for="NewsletterOpt-In">I would like to receive occasional news from Canonical by email.</label>&nbsp;<span class="mktFormMsg"></span></span></li>
 					<li>All information provided will be handled in accordance with the Canonical <a href="http://www.ubuntu.com/legal" target="_blank">privacy policy</a>.</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>     
+					<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>
@@ -429,7 +429,12 @@ <h3>Your comments</h3>
 			<input type="hidden" name="_mkt_disp" value="return" />
 			<input type="hidden" name="_mkt_trk" value="id:066-EOV-335&amp;token:_mch-canonical.com-1328112704280-30256" />
 		</form>
-	</div><!-- /.eight-col -->
+	</div><!-- /.seven-col -->
+	<div class="four-col last-col">
+		<h3>Keep up with the cloud</h3>
+		<p>If you want to keep up to date with everything happening around Ubuntu OpenStack, Juju, MAAS, Landscape, partners and more.</p>
+		<p><a href="https://pages.ubuntu.com/canonical-optin.html">Sign-up for our fortnightly newsletter&nbsp;&rsaquo;</a></p>
+	</div>	
 </div><!-- /.row -->
 
 <script type="text/javascript" src="http://www.ubuntu.com/misc/jquery.js"></script>
@@ -458,6 +463,6 @@ <h3>Your comments</h3>
 		</script>
 
 {% include "shared/_live_chat.html" %}
-		
+
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/cloud/ecosystem/index.html b/templates/cloud/ecosystem/index.html
old mode 100644
new mode 100755
index a137f7a1217..da406ec0fd6
--- a/templates/cloud/ecosystem/index.html
+++ b/templates/cloud/ecosystem/index.html
@@ -7,95 +7,120 @@
 {% block meta_keywords %}Ubuntu OpenStack, cloud ecosystem, cloud partners, cloud consulting, cloud tools, Canonical{% endblock meta_keywords %}
 
 {% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" subsection_title="Cloud tools" page_title="Ecosystem" %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" page_title="Ecosystem" tertiary="true" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
-<div class="row row-hero row-image-centered">
+<div class="row row-hero">
 	<div class="seven-col">
 		<h1>Ecosystem</h1>
 		<p class="intro">Ubuntu: the centre of the cloud ecosystem</p>
-		<p>Wherever you look in the cloud, you&rsquo;ll see Ubuntu. It&rsquo;s integral to public clouds, Platform as a Service,  OpenStack and much more, so it&rsquo;s no surprise that the community, developers and <abbr  title="Independent Software Vendor">ISV</abbr>s all default to Ubuntu. To help you navigate the cloud ecosystem, Canonical has partnered with the very best software and solutions companies.</p>
-	</div><!-- /.eight-col -->
-	<span>
-		<img src="{{ STATIC_URL }}img/cloud/hero-ecosystem-cloud.png" width="288" height="186" alt="" />
-	</span>
+		<p>Wherever you look in the cloud, you&rsquo;ll see Ubuntu. It&rsquo;s integral to public clouds, Platform as a Service,  OpenStack and much more, so it&rsquo;s no surprise that the community, developers and <abbr title="Independent Software Vendor">ISV</abbr>s all default to Ubuntu. To help you navigate the cloud ecosystem, Canonical has partnered with the very best software and solutions companies.</p>
+	</div><!-- /.seven-col -->
+	<div class="five-col text-center last-col">
+		<img src="{{ STATIC_URL }}img/cloud/image-ecosystem.svg" width="288" height="186" alt="" />
+	</div>
 </div><!-- /.row row-hero -->
 
 <div class="row">
-	<div class="eight-col">
-		<h2>Ubuntu and OpenStack</h2>
-		<p>Ubuntu has been involved in OpenStack since the beginning, and it&rsquo;s the most popular choice for production OpenStack clouds around the world. Since OpenStack became part of Ubuntu in October 2010, the two have evolved into a fully manageable and supportable OpenStack platform. To deploy, manage and scale Ubuntu OpenStack, we have a set of tools:</p>
-		<ul class="list-ubuntu">
-			<li>MAAS &mdash; bare-metal provisioning, quickly turns your hardware environment into a cloud</li>
-			<li>Juju &mdash; service orchestration, the fastest way to deploy OpenStack on Ubuntu</li>
-			<li>Landscape &mdash; systems management, for sophisticated security, audit and compliance control</li>
-		</ul>
-	</div><!-- /.eight-col -->
-	
-	<div class="four-col last-col box box-highlight resource resource-factsheet">
-		<h2><a href="http://insights.ubuntu.com/resources/factsheet/ubuntu-openstack-factsheet/">Ubuntu OpenStack&nbsp;&rsaquo;</a></h2>
-		<p>What makes up Ubuntu OpenStack? And how do all the parts fit together?</p>
+	<div class="four-col box box-highlight resource resource-factsheet">
+		<h2><a href="">Ubuntu OpenStack factsheet&nbsp;&rsaquo;</a></h2>
+		<p>What makes up Ubuntu OpenStack? And how do all the parts fit together?&nbsp;&rsaquo;</p>
 		<p class="content-cat content-cat-factsheet">Factsheet</p>
-	</div><!-- /.four-col -->
-</div>
-
-<div class="row row-image-centered row-ubuntu-oil">
-	<div class="eight-col">
+	</div>
+	<div class="eight-col last-col">
 		<h2>Ubuntu OpenStack interoperability lab</h2>
-		<p>The Ubuntu Openstack ecosystem is growing fast.  But as the options grow so does the task of ensuring interoperability between all the components. At Canonical we developed a sophisticated test and integration process to ensure we could offer each release of OpenStack integrated with Ubuntu Server.  We&rsquo;ve now opened it into a lab dedicated to integrating components and testing their interoperability.</p>
-		<p><a href="/cloud/ecosystem/ubuntu-oil">Find out more&nbsp;&rsaquo;</a></p>
+			<p>Ubuntu is the world&rsquo;s most popular choice for OpenStack clouds with 55% of OpenStack users choosing Ubuntu as their preferred platform. As more new solutions are developed for Ubuntu OpenStack, interoperability between components becomes increasingly important. In the Ubuntu OpenStack Interoperability Lab, we test and integrate our partners&rsquo; hardware and software rigorously, to ensure all components can be combined reliably in real-world deployments.</p>
+			<p><a href="/cloud/ecosystem/ubuntu-openstack-interoperability-lab">Learn more about the Interoperability Lab&nbsp;&rsaquo;</a></p>
 	</div><!-- /.eight-col -->
 </div><!-- /.row row-hero -->
 
 <div class="row">
 	<div class="twelve-col">
-		<h2>Ubuntu OpenStack partners</h2>
-		<p>Canonical works with partners to develop and extend key Ubuntu OpenStack components.</p>
+		<h2>Some of our key partnerships</h2>
 	</div>
-	<div class="twelve-col vertical-divider">
-		<div class="six-col">
-			<a href="http://www.inktank.com/"><img src="{{ STATIC_URL }}img/logos/logo-inktank-grey.png" width="180" height="50" alt="Inktank's logo" class="partner-logo" /></a>
-			<p>Inktank is committed to supporting the adoption of Ceph, an open-source project with the potential to transform the storage industry. The technology was created to help organisations decrease storage costs and increase operational flexibility by freeing them from restrictive and expensive proprietary systems. Ceph Storage is supported within Ubuntu Advantage.</p>
-			<p><a href="http://www.inktank.com/">Find out more about Ceph at inktank.com&nbsp;&rsaquo;</a></p>
+
+	<div class="equal-height">
+		<div class="six-col box">
+			<img src="{{ STATIC_URL }}img/logos/logo-inktank-grey.png" width="180" height="50" alt="Inktank's logo" class="partner-logo" />
+			<p>Inktank supports  the adoption of Ceph, a revolutionary open-source storage project that helps cut costs and boost operational flexibility. Ceph is supported in Ubuntu Advantage.</p>
+			<p><a href="http://www.inktank.com/">Learn more about Ceph at inktank.com&nbsp;&rsaquo;</a></p>
 		</div>
-		<div class="six-col last-col">
-			<a href="http://www.vmware.com/solutions/cloud-computing/"><img src="{{ STATIC_URL }}img/logos/logo-vmware-grey.png" width="199" height="50" alt="VMware's logo" class="partner-logo" /></a>
-			<p>VMware is the global leader in virtualisation and cloud infrastructure, delivering customer-proven solutions that accelerate IT by reducing complexity. Through close collaboration with Canonical, VMware has contributed plugins to the OpenStack project that guarantee the Ubuntu distribution of Openstack will recognise and work with virtual machines running under VMware&rsquo;s vSphere management environment and Nicira Network Virtualisation Platform.</p>
+		
+		<div class="six-col last-col box">
+			<img src="{{ STATIC_URL }}img/logos/logo-vmware-grey.png" width="199" height="50" alt="VMware's logo" class="partner-logo" />
+			<p>VMware, the world leader in virtualisation, works with Canonical on OpenStack plugins that ensure Ubuntu Openstack will work with VMware's vSphere and Nicira platforms.</p>
 			<p><a href="http://www.vmware.com/solutions/cloud-computing/">Find out more about VMware at vmware.com &nbsp;&rsaquo;</a></p>
 		</div>
-	</div>
-</div>
+		
+		<div class="six-col box">
+			<img src="{{ STATIC_URL }}img/logos/logo-hp-cloud.png" width="150" height="50" alt="HP cloud's logo" class="partner-logo" />
+			<p>Ubuntu is the scale-out platform for HP’s ProLiant and Moonshot Systems, the foundation for HP Cloud Services and a certified, pre-loaded OS on many HP retail PCs.</p>
+			<p><a href="http://www8.hp.com/us/en/products/oas/product-detail.html?oid=5399624&jumpid=reg_r1002_usen_c-002_title_r0002">Learn more about HP and Ubuntu at hp.com&nbsp;&rsaquo;</a></p>
+		</div>
+		
+		<div class="six-col box last-col">
+			<img src="{{ STATIC_URL }}img/logos/logo-cisco.png" width="95" height="50" alt="Cisco logo" class="partner-logo" />
+			<p>As well as certifying Ubuntu with its UCS hardware, Cisco works with Canonical to produce Cisco Validated Designs for Ubuntu OpenStack and solutions like the Nexus 1000KV as well as collaborating around the leading SDN policy solutions pFlex.</p>
+			<p><a href="http://www.cisco.com/c/en/us/index.html">Learn more about Cisco at cisco.com&nbsp;&rsaquo;</a></p>
+		</div>
+		
+		<div class="six-col box">
+			<img src="{{ STATIC_URL }}img/logos/logo-ibm-50.png" width="111" height="50" alt="IBM logo" class="partner-logo" />
+			<p>Canonical and the Ubuntu community collaborate closely with IBM on many projects, including Ubuntu OpenStack, KVM, VDI and the availability of Ubuntu on IBM OpenPOWER.</p>
+			<p><a href="http://www.ibm.com/us/en/">Learn more about IBM at ibm.com&nbsp;&rsaquo;</a></p>
+		</div>
+	</div><!-- /.equal-height -->
+</div><!-- /.row -->
 
 <div class="row">
 	<div class="twelve-col">
-		<h2>Ubuntu Certified Public Cloud partners</h2>
-	</div>
-	<div class="six-col">
-		<a href="http://www.ibm.com/smartcloud"><img src="{{ STATIC_URL }}img/logos/logo-ibm-50.png" width="111" height="50" alt="Inktank's logo" class="partner-logo" /></a>
-		<p>IBM has helped thousands of clients adopt cloud models and manages millions of cloud-based transactions every day. IBM assists clients in areas as diverse as banking, communications, healthcare and government to build their own clouds or securely tap into IBM cloud-based business and infrastructure services. IBM is unique in bringing together key cloud technologies, deep process knowledge, a broad portfolio of cloud solutions, and a network of global delivery centers.</p>
-		<p><a href="http://www.ibm.com/smartcloud">Find out more about IBM at ibm.com&nbsp;&rsaquo;</a></p>
-	</div>
-	<div class="six-col last-col">
-		<a href="http://www.joyent.com/free-trial"><img src="{{ STATIC_URL }}img/logos/logo-joyent-50.png" width="184" height="50" alt="joyent's logo" class="partner-logo" /></a>
-		<p>Joyent is the high-performance cloud infrastructure and data analytics company. The Joyent Cloud is built from the ground up to meet the requirements of today&rsquo;s demanding real-time web and mobile applications. The Joyent Manta Storage Service is the first compute-on-storage innovation that eliminates data movement and enables inexpensive, lightning fast big data analysis in-place, transforming the economics and utility of object storage and real-time big data.</p>
-		<p><a href="http://www.joyent.com/free-trial">Find out more about Joyent at joyent.com&nbsp;&rsaquo;</a></p>
+		<h2>World leading public cloud partners</h2>
+		<p>If you’re a public cloud provider, The Ubuntu Public Cloud Program lets you make certified Ubuntu Server images available to your users, along with the option of commercial support from Canonical.</p>
 	</div>
-	<div class="six-col">
-		<a href="http://www.windowsazure.com/en-us/"><img src="{{ STATIC_URL }}img/logos/logo-windows-azure-50.png" width="245" height="50" alt="VMware's logo" class="partner-logo" /></a>
-		<p>Windows Azure enables customers to quickly build, deploy and manage applications across a global network of Microsoft-managed datacenters. As a result of a close technical partnership between Microsoft and Canonical, Ubuntu on Windows Azure has been fully certified, tested and optimised for excellent performance and reliability.</p>
-		<p><a href="http://www.windowsazure.com/en-us/">Find out more about Windows Azure at windowsazure.com&nbsp;&rsaquo;</a></p>
-	</div>
-	<div class="six-col last-col">
-		<a href="https://www.hpcloud.com/"><img src="{{ STATIC_URL }}img/logos/logo-hp-cloud.png" width="150" height="50" alt="hp cloud's logo" class="partner-logo" /></a>
-		<p>HP Cloud Application <abbr title="Platform as a Service">PaaS</abbr> is a public cloud compute and storage solution that delivers secure, scalable, and reliable capacity on demand. HP Cloud Application PaaS provides scalability and failover management capabilities to scale your application in the HP Cloud.</p>
-		<p><a href="https://www.hpcloud.com/">Find out more about HP Cloud at hpcloud.com&nbsp;&rsaquo;</a></p>
-	</div>
-</div>
+	
+	<div class="equal-height">
+		<div class="six-col box">
+			<img src="{{ STATIC_URL }}img/logos/logo-ibm-50.png" width="111" height="50" alt="Inktank's logo" class="partner-logo" />
+			<p>IBM manages millions of cloud-based transactions every day, in areas as diverse as banking, communications, healthcare and government.</p>
+			<p><a href="http://www.ibm.com/smartcloud">Learn more at ibm.com&nbsp;&rsaquo;</a></p>
+		</div>
+		
+		<div class="six-col last-col box">
+			<img src="{{ STATIC_URL }}img/logos/logo-windowsazure.png" width="259" height="38" alt="Microsoft Azure logo" class="partner-logo" />
+			<p>As a result of close technical collaboration between Microsoft and Canonical, Ubuntu is both optimised and certified for use on Microsoft Azure.</p>
+			<p><a href="http://azure.microsoft.com/en-us/">Learn more at azure.microsoft.com&nbsp;&rsaquo;</a></p>
+		</div>
+		
+		<div class="six-col box">
+			<img src="{{ STATIC_URL }}img/logos/logo-joyent-50.png" width="184" height="50" alt="joyent's logo" class="partner-logo" />
+			<p>The Joyent Manta Storage Service is the first compute-on-storage innovation to eliminate data movement, enabling fast,inexpensive big data analysis in-place.</p>
+			<p><a href="http://www.joyent.com/free-trial">Learn more at joyent.com&nbsp;&rsaquo;</a></p>
+		</div>
+		
+		<div class="six-col last-col box">
+			<img src="{{ STATIC_URL }}img/logos/logo-hp-cloud.png" width="150" height="50" alt="hp cloud's logo" class="partner-logo" />
+			<p>HP Cloud Application <abbr title="Platform as a Service">PaaS</abbr> is a public cloud compute and storage solution that delivers secure, scalable, and reliable capacity on demand.</p>
+			<p><a href="https://www.hpcloud.com/">Learn more at hpcloud.com&nbsp;&rsaquo;</a></p>
+		</div>
+		
+		<div class="six-col box">
+			<img src="{{ STATIC_URL }}img/logos/logo-amazon-web-services.png" width="130" height="50" alt="Cisco logo" class="partner-logo" />
+			<p>Amazon Web Services provides a reliable, scalable, low-cost cloud infrastructure platform that powers thousands of businesses, in 190 countries around the world.</p>
+			<p><a href="http://aws.amazon.com">Learn more at amazon.com&nbsp;&rsaquo;</a></p>
+		</div>
+		
+		<div class="six-col last-col box">
+			<img src="{{ STATIC_URL }}img/logos/logo-cloudsigma.png" width="159" height="50" alt="CloudSigma logo" class="partner-logo" />
+			<p>Canonical helps IaaS provider CloudSigma give its users an automated, Juju-based system for delivering applications into its environment quickly and easily.</p>
+			<p><a href="">Learn more about CloudSigma at cloudsigma.com&nbsp;&rsaquo;</a></p>
+		</div>
+	</div><!-- /.equal-height -->
+</div><!-- /.row -->
 
 <div class="row row-grey row-image-centered no-border">
 	<span>
-		<img src="{{ STATIC_URL }}img/pictograms/picto-partner-purple-160x160.png" width="160" height="160" alt="" />
+		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-partner-midaubergine.svg" width="160" height="160" alt="" />
 	</span>
 	<div class="eight-col last-col">
 		<h2>Become a cloud ecosystem partner</h2>
diff --git a/templates/cloud/ecosystem/ubuntu-certified-public-cloud.html b/templates/cloud/ecosystem/ubuntu-certified-public-cloud.html
new file mode 100755
index 00000000000..78c4ff3eec0
--- /dev/null
+++ b/templates/cloud/ecosystem/ubuntu-certified-public-cloud.html
@@ -0,0 +1,72 @@
+{% extends "cloud/base_cloud.html" %}
+
+{% block title %}Ubuntu Public Cloud Programme (PCP) | Ecosystem | Cloud{% endblock %}
+
+{% block meta_description %}Canonical has partnered with the leading public public cloud providers to deliver a seamless Ubuntu experience to our joint customers.{% endblock meta_description %}
+
+{% block meta_keywords %}Ubuntu, OpenStack, cloud ecosystem, cloud partners, cloud consulting, cloud tools, Canonical{% endblock meta_keywords %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" subsection_title="Ecosystem" page_title="Ubuntu OpenStack interoperability lab" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row row-hero row-image-centered no-border">
+		<div class="seven-col">
+			<h1>Ubuntu Certified Public Cloud</h1>
+			<p>Ubuntu is enormously popular with providers delivering public cloud services today. Its significant developer mindshare, favourable licensing model and policy of regular updates have made it the platform of choice for cloud guests the world over. </p>
+			<p>If you operate a public cloud or you&rsquo;re considering launching one, the Ubuntu Certified Public Cloud programme lets you make certified Ubuntu Server images available to these users, along with management, monitoring and commercial support from Canonical &mdash; all of which represent additional revenue opportunities.</p>
+		</div><!-- /.seven-col -->
+		<span><img src="{{ STATIC_URL }}img/cloud/ecosystem/ubuntu-public-cloud-programme/image-ubuntupubliccloudprogram.svg" width="320" height="320" class="" alt="" /></span>
+</div><!-- /.row row-hero -->
+
+<div class="row strip-dark">
+	<div class="eight-col">
+		<h2>What&rsquo;s included?</h2>
+		<p>As a partner in the Ubuntu Certified Public Cloud programme you can expect:</p>
+	</div>
+	<div class="six-col">
+		<ul class="list-ubuntu">
+			<li>Be featured as a certified partner on the Ubuntu website, including the ability to use Ubuntu Public Cloud certification logos</li>
+			<li>Joint marketing, including entry into our list of public clouds partners</li>
+			<li>Revenue-sharing upsells of <a href="/management">management tooling</a> and Ubuntu support offerings</li>
+		</ul>
+	</div>
+	<div class="six-col last-col">
+		<ul class="list-ubuntu">
+			<li>Certified Ubuntu cloud images, tuned and tested to your environment</li>
+			<li>Regular refresh of Ubuntu images increases security</li>
+			<li>Automated publication across all cloud availability zones facilitates operations</li>
+			<li>Local  Ubuntu archive mirrors deliver a fast maintenance and software installation experience</li>
+		</ul>
+	</div>
+</div>
+
+<div class="row">
+	<div class="eight-col">
+		<h2>A selection of our cloud partners</h2>
+		<p>We already work with the world&rsquo;s leading public cloud providers, our Premier Certified Public Cloud partners, collaborating with them on the technological developments that are driving cloud computing forward. These include <a href="https://juju.ubuntu.com">Juju</a>, a groundbreaking service orchestration tool bringing rapid deployment of complex applications to any cloud.</p>
+	</div>
+	<ul class="inline-logos no-bullets clear">
+		<li class="first-item"><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-amazonwebservices.svg" alt="AWS" /></li>
+		<li><img src="{{ STATIC_URL }}img/cloud/partners/logo-brightbox-160.png" alt="Brightbox" /></li>
+		<li><img src="{{ STATIC_URL }}img/cloud/logo-hpcloud.png" alt="HP cloud" /></li>
+		<li class="last-item clear-row"><img src="{{ STATIC_URL }}img/cloud/logo-ibm.png" alt="IBM" /></li>
+		<li><img src="{{ STATIC_URL }}img/cloud/logo-joyent.png" alt="Joyent" /></li>
+		<li class="last-item"><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-windowsazure.svg" alt="Azure" /></li>
+	</ul>
+</div><!-- /.row -->
+
+<div class="row row-grey row-image-centered no-border">
+	<span>
+		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-partner-midaubergine.svg" width="160" height="160" alt="" />
+	</span>
+	<div class="eight-col last-col">
+		<h2>Becoming a public cloud partner</h2>
+		<p>To learn more about joining the Ubuntu Public Cloud Programme, please contact Canonical today.</p>
+		<p><a href="/partners/contact-us" class="link-cta-ubuntu">Get in touch</a></p>
+	</div>
+</div>
+
+
+{% endblock content %}
diff --git a/templates/cloud/ecosystem/ubuntu-oil.html b/templates/cloud/ecosystem/ubuntu-oil.html
deleted file mode 100644
index bd13e47fcfb..00000000000
--- a/templates/cloud/ecosystem/ubuntu-oil.html
+++ /dev/null
@@ -1,83 +0,0 @@
-{% extends "cloud/base_cloud.html" %}
-
-{% block title %}Ubuntu OIL | Ecosystem | Cloud{% endblock %}
-
-{% block meta_description %}Engage with the Ubuntu OpenStack Interoperability Lab (Ubuntu OIL) to develop and test your technologies’ interoperability with Ubuntu OpenStack and a range of software and hardware{% endblock meta_description %}
-
-{% block meta_keywords %}Cloud, OpenStack, Ubuntu, Server, Interoperability, testing, integration, ecosystem, UOIL, development, validation, affiliate, supporter, Technical Partner Progamme, lab, laboratory{% endblock meta_keywords %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" subsection_title="Ecosystem" page_title="Ubuntu OpenStack interoperability lab" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero">
-	<div class="eight-col">
-		<h1>The Ubuntu OpenStack interoperability lab</h1>
-		<h2>Proven integration testing</h2>
-		<p>The Ubuntu Openstack ecosystem is growing fast.  This is good news.  But as the options in cloud building grow, so does the task of ensuring interoperability between all the components.</p>
-		<p>At Canonical we have deep experience of conformity and interoperability testing between OpenStack and Ubuntu.  To bring this to the wider ecosystem we&rsquo;ve opened a lab dedicated to testing components&rsquo; interoperability.  We want to be <br />able to present a wide a range of validated and supportable technical solutions.</p>
-	</div><!-- /.eight-col -->
-</div><!-- /.row row-hero -->
-<div class="row">
-	<div class="seven-col">
-		<h2>A sophisticated testing and integration process</h2>
-		<p>Our process tests current and future developments of OpenStack against current and future developments of Ubuntu Server and Server LTS. As the ecosystem has grown we&rsquo;ve expanded it to include different guest OSs, hypervisors and software-defined networking (SDN) stacks. We&rsquo;ve also worked with partners familiar with Ubuntu and OpenStack but unfamiliar with Juju, MAAS and charms, to help them more fully integrate their solution with Ubuntu.</p>
-		<p>The need for tested, integrated components has never been greater.  So how do you get involved?</p>
-	</div><!-- /.eight-col -->
-</div><!-- /.row -->
-<div class="row row-involved row-grey">
-	<div class="four-col">
-		<img src="{{ STATIC_URL }}img/cloud/image-charms.png" width="" height="" alt="" />
-	</div>
-	<div class="eight-col last-col">
-		<h2>Get involved</h2>
-		<p>Involvement in the lab is through our Technical Partner Programme, which gives you all the benefits of ensuring your components are compatible with the latest release of Ubuntu OpenStack enabling you to get to market faster, with less cost.</p>
-		<p>Through the interoperability lab we can classify your solution as &lsquo;Fully integrated&rsquo;, give it prime positioning on our website, and prime positioning in the Juju Charm Store.  </p>
-	</div><!-- /.eight-col -->
-</div><!-- /.row -->
-<div class="row row-included">
-	<h2>What&rsquo;s included?</h2>
-	<p>As a partner involved in the interoperability lab you can expect:</p>
-	<div class="six-col">
-		
-		<ul class="list-ubuntu">
-			<li>Ongoing maintenance</li>
-			<li>Test development</li>
-			<li>Comprehensive interoperability testing </li>
-			<li>Charm School</li>
-			<li>A continuous cadence of testing and reporting</li>
-		</ul>
-	</div>
-	<div class="six-col last-col">
-		<ul class="list-ubuntu">
-			<li>Technical alignment to synchronise development timelines</li>
-			<li>Marketing assistance including entry into our list of compatible solutions, joint revenue opportunities and support for joint solutions</li>
-			<li>Training in maximising returns in your strategic relationship with Canonical</li>
-		</ul>
-	</div>
-</div><!-- /.row -->
-<div class="row row-hero row-partners">
-	<div class="twelve-col">
-		<h2>Partners in the lab</h2>
-		<ul class="inline">
-			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-dell-160.png" width="160" height="80" alt="" /></li>
-			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-emc-160.png" width="160" height="80" alt="" /></li>
-			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-emulex-160.png" width="160" height="80" alt="" /></li>
-			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-fusion-io-160.png" width="160" height="80" alt="" /></li>
-			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-hp-160.png" width="160" height="80" alt="" /></li>
-			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-ibm-160.png" width="160" height="80" alt="" /></li>
-			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-inktank-160.png" width="160" height="80" alt="" /></li>
-			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-intel-160.png" width="160" height="80" alt="" /></li>
-			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-lsi-160.png" width="160" height="80" alt="" /></li>
-			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-open-compute-160.png" width="160" height="80" alt="" /></li>
-			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-seamicro-160.png" width="160" height="80" alt="" /></li>
-			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-vmware-160.png" width="160" height="80" alt="" /></li>
-		</ul>
-	</div>
-	<div class="eight-col">
-		<h3>Interested in joining the lab?</h3>
-		<p>To contact a Canonical representative about becoming involved in the lab as a technical programme partner, <a href="/partners/contact-us">please fill out this short form</a>, and we’ll be in touch.</p>
-	</div><!-- /.eight-col -->
-</div><!-- /.row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/cloud/ecosystem/ubuntu-openstack-interoperability-lab.html b/templates/cloud/ecosystem/ubuntu-openstack-interoperability-lab.html
new file mode 100755
index 00000000000..9f38884fb58
--- /dev/null
+++ b/templates/cloud/ecosystem/ubuntu-openstack-interoperability-lab.html
@@ -0,0 +1,90 @@
+{% extends "cloud/base_cloud.html" %}
+
+{% block title %}Ubuntu OpenStack Interoperability Lab (OIL) | Ecosystem | Cloud{% endblock %}
+
+{% block meta_description %}Engage with the Ubuntu OpenStack Interoperability Lab (Ubuntu OIL) to develop and test your technologies’ interoperability with Ubuntu OpenStack and a range of software and hardware{% endblock meta_description %}
+
+{% block meta_keywords %}Cloud, OpenStack, Ubuntu, Server, Interoperability, testing, integration, ecosystem, UOIL, development, validation, affiliate, supporter, Technical Partner Progamme, lab, laboratory{% endblock meta_keywords %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" subsection_title="Ecosystem" page_title="Ubuntu OpenStack interoperability lab" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row row-hero">
+	<div class="eight-col">
+		<h1>Ubuntu OpenStack Interoperability Lab (OIL)</h1>
+		<p class="intro">OIL is an integration lab in which we test our cloud partners&rsquo; products in countless Ubuntu OpenStack configurations. Currently we are working with over 3,000 combinations per month.</p>
+	</div>
+	<div class="twelve-col">
+		<ul class="inline">
+			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-dell-160.png" width="160" height="80" alt="" /></li>
+			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-emc-160.png" width="160" height="80" alt="" /></li>
+			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-fusion-io-160.png" width="160" height="80" alt="" /></li>
+			<li class="box last-item"><img src="{{ STATIC_URL }}img/cloud/partners/logo-hp-160.png" width="160" height="80" alt="" /></li>
+			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-ibm-160.png" width="160" height="80" alt="" /></li>
+			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-ceph-160.png" width="160" height="80" alt="" /></li>
+			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-intel-160.png" width="160" height="80" alt="" /></li>
+			<li class="box last-item"><img src="{{ STATIC_URL }}img/cloud/partners/logo-mellanox-160.png" width="160" height="80" alt="" /></li>
+			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-open-compute-160.png" width="160" height="80" alt="" /></li>
+			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-seamicro-160.png" width="160" height="80" alt="" /></li>
+			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-vmware-160.png" width="160" height="80" alt="" /></li>
+			<li class="box last-item"><img src="{{ STATIC_URL }}img/cloud/partners/logo-apm-160.png" width="160" height="80" alt="" /></li>
+			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-amd-160.png" width="160" alt="" /></li>
+			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-cisco-160.png" width="160" alt="" /></li>
+			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-juniper-160.png" width="160" alt="" /></li>
+			<li class="box last-item"><img src="{{ STATIC_URL }}img/cloud/partners/logo-lsi-160.png" width="160" alt="" /></li>
+			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-flextronics-160.png" width="160" alt="" /></li>
+			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-microsoft-160.png" width="160" alt="" /></li>
+			<li class="box"><img src="{{ STATIC_URL }}img/cloud/partners/logo-cplane-160.png" width="160" alt="" /></li>
+		</ul>
+	</div>
+</div><!-- /.row -->
+
+<div class="row row-hero no-border row-testing-integration">
+	<div class="seven-col">
+		<h2>Proven integration testing</h2>
+		<p>The Ubuntu Openstack ecosystem is growing fast.  This is good news.  But as the options in cloud building grow, so does the task of ensuring interoperability between all the components.</p>
+		<p>Canonical has a long history of interoperability testing between OpenStack and Ubuntu.  To bring the benefits of our work to the rest of the ecosystem, we&rsquo;ve launched the Ubuntu OpenStack Interoperability Lab, making it easier for you to QA the compatibility of your products with the world&rsquo;s leading open cloud platform.</p>
+		<img src="{{ STATIC_URL }}img/cloud/ecosystem/ubuntu-oil/image-interoperabilitylab-small.svg" alt="" width="320" height="320" class="for-mobile" />
+	</div><!-- /.eight-col -->
+	<div class="seven-col">
+		<h2>A sophisticated testing and integration process</h2>
+		<p>Our process tests current and future developments of OpenStack against current and future developments of Ubuntu Server and Server LTS. As the ecosystem has grown we&rsquo;ve expanded it to include different guest OSs, hypervisors and software-defined networking (SDN) stacks. We&rsquo;ve also worked with partners familiar with Ubuntu and OpenStack but unfamiliar with Juju, MAAS and charms, to help them more fully integrate their solution with Ubuntu.</p>
+		<p>The need for tested, integrated components has never been greater.  So how do you get involved?</p>
+	</div><!-- /.seven-col -->
+</div><!-- /.row row-hero -->
+
+<div class="row strip-dark no-border">
+	<h2>What&rsquo;s included?</h2>
+	<p>As a partner involved in the interoperability lab you can expect:</p>
+	<div class="combined-list">
+		<div class="six-col">
+			<ul class="list-ubuntu">
+				<li>Comprehensive interoperability testing of your products</li>
+				<li>Continuous, regular reporting on the results of the tests</li>
+				<li>Assistance in the development of the tests themselves</li>
+				<li>Ongoing maintenance and tuning of Ubuntu OpenStack</li>
+				<li>Technical alignment to synchronise development timelines</li>
+			</ul>
+		</div>
+		<div class="six-col last-col">
+			<ul class="list-ubuntu">
+				<li>Training on the creation, adaptation and real-world use of Ubuntu Charms</li>
+				<li>Marketing assistance, including entry into our list of compatible solutions, joint revenue opportunities and support for joint solutions</li>
+				<li>Training in maximising returns on your relationship with Canonical</li>
+			</ul>
+		</div>
+	</div>
+</div><!-- /.row -->
+
+<div class="row row-grey row-get-involved row-image-centered no-border">
+	<span><img src="{{ STATIC_URL }}img/cloud/ecosystem/ubuntu-oil/image-charms-medium.png" /></span>
+	<div class="eight-col last-col">
+		<h2>Get involved</h2>
+		<p>Involvement in the lab gives you all the benefits of compatibility with the latest release of Ubuntu OpenStack, enabling you to get to market faster and with less cost.</p>
+		<p>Through the Interoperability Lab, we can classify your solution as ‘fully integrated’ and give your brand prime positioning, both on our website and in the Juju Charm Store. </p>
+		<p><a class="link-cta-ubuntu" href="/partners/contact-us">Get in touch</a></p>
+	</div><!-- /.eight-col -->
+</div><!-- /.row -->
+{% endblock content %}
\ No newline at end of file
diff --git a/templates/cloud/index.html b/templates/cloud/index.html
old mode 100644
new mode 100755
index a06de345d36..4253d963822
--- a/templates/cloud/index.html
+++ b/templates/cloud/index.html
@@ -1,114 +1,185 @@
 {% extends "cloud/base_cloud.html" %}
 
-{% block title %}Cloud computing with Ubuntu | Cloud{% endblock %}
+{% block title %}Cloud overview | Cloud{% endblock %}
 
 {% block meta_description %}Building an OpenStack cloud with Ubuntu OpenStack is the best way to get the most out of any public or private cloud deployment.{% endblock meta_description %}
 
-{% block meta_keywords %}OpenStack, Cloud, Ubuntu OpenStack, private cloud, public cloud, open-source,  IAAS, infrastructure, service, Ubuntu, Ubuntu cloud Infrastructure, Ubuntu cloud Guest, Juju, Maas, orchestration, deployment, provisioning, Jumpstart{% endblock meta_keywords %}
+{% block meta_keywords %}OpenStack, Cloud, Ubuntu OpenStack, private cloud, public cloud, open-source,  IAAS, infrastructure, service, Ubuntu, Ubuntu Cloud Infrastructure, Ubuntu Cloud Guest, Juju, Maas, orchestration, deployment, provisioning, Jumpstart{% endblock meta_keywords %}
 
 {% block extra_body_class %}cloud-home{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" page_title="Overview"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" page_title="Overview" %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
-<div class="row row-hero">
-	<div class="hero clearfix">
-		<div itemscope itemtype="http://schema.org/Product">
-			<h1 itemprop="name">Ubuntu OpenStack</h1>
-			<p itemprop="description" class="tagline">Whether you are building a cloud or using Ubuntu in a public cloud, we have the software, tools and services that will help your business make the most of your infrastructure.</p>
-		</div>
+<div class="row row-hero no-border strip-dark">
+	<div class="three-col align-center not-for-small">
+		<img src="{{ STATIC_URL }}img/pictograms/picto-startfirst-white.svg" width="165" height="165" alt="cloud" />
 	</div>
-</div><!-- /.row -->
+	<div class="nine-col last-col">
+		<h1><span>Announcing:</span> BootStack</h1>
+		<p class="intro">Build, operate and optionally transfer.</p>
+		<p>A hosted or on-premise Ubuntu OpenStack cloud, built and operated by us until you&rsquo;re ready to take the keys.</p>
+		<p><a href="/cloud/bootstack">Learn more&nbsp;&rsaquo;</a></p>
+	</div>
+</div>
 
-<div class="row no-border">
-		<h2>The Ubuntu OpenStack solution</h2>
-		<p class="eight-col">Ubuntu Server 12.04 LTS and 13.10 with OpenStack&rsquo;s Havana release provide the most robust foundation for your cloud.  Complemented by a powerful set of tools and services to make the difference to your business.</p>
-</div><!-- /.row -->
+<div class="row row-build-your-cloud">
+	<div class="eight-col">
+		<h2>Build your own cloud with Ubuntu OpenStack</h2>
+		<p>Ubuntu OpenStack is a fully integrated and optimised combination of the latest release of Ubuntu Server and the latest release of OpenStack. The main OpenStack releases are supported for a full five years on LTS releases of Ubuntu, giving you peace of mind combined with the latest OpenStack features.<p>
+		<p>Ubuntu OpenStack is the platform of choice for OpenStack users, with 55% of OpenStack deployments taking place on Ubuntu, and 7 out of 8 OpenStack &lsdquo;super-users&rsdquo; choosing Ubuntu</p>
+		<p><a href="/cloud/openstack">Read more about Ubuntu OpenStack&nbsp;&rsaquo;</a></p>
+	</div>
 
-<div class="row tight-section row-openstack-solution">
-	<div class="vertical-divider">
-		<div class="four-col maas-col">
-			<h3><a href="/cloud/tools/maas">MAAS &rsaquo;</a></h3>
-			<p class="offer">Free software</p>
-			<p>Provision your hardware into a cloud in minutes. MAAS makes it easy to set up your hardware and turn your servers into a cloud.</p>
-		</div>
-		<div class="four-col juju-col">
-			<h3><a href="/cloud/tools/juju">Juju &rsaquo;</a></h3>
-			<p class="offer">Free software</p>
-			<p>Juju is a revolution in service orchestration. Set up and deploy services, like MySQL and Hadoop, in seconds, to any cloud running Ubuntu &mdash; public or private.</p>
+	<div class="four-col last-col">
+		<blockquote class="pull-quote">
+			<p><span>&ldquo;</span>Ubuntu remains the most popular operating system for&nbsp;OpenStack deployments&nbsp;<span>&rdquo;</span></p>
+			<p><cite>OpenStack User Survey, November 2013</cite></p>
+		</blockquote>
+	</div>
+
+	<div class="twelve-col build-your-own no-margin-bottom">
+		<div class="four-col">
+			<img src="{{ STATIC_URL }}img/cloud/orange-box/image-orangebox.png" alt="Image of the orange box from an angle" />
 		</div>
-		<div class="four-col landscape-col last-col">
-			<h3><a href="/cloud/management">Landscape &rsaquo;</a></h3>
-			<p class="offer">Free for 30 days</p>
-			<p>Landscape is the ultimate cloud management tool. It makes sure the software is up-to-date, monitors the system&rsquo;s health and keeps your servers running perfectly.</p>
+		<div class="prepend-one seven-col last-col">
+			<h2>Train and experiment before you invest</h2>
+			<p>With Jumpstart Training, Canonical engineers will deliver a self-contained Ubuntu OpenStack cloud-in-a-box to your office. You will get two days of training and 2 weeks to experiment with the box. Build and destroy clouds, test your workloads, and bring your staff up to speed at your leisure.</p>
+			<p><a href="/cloud/jumpstart-training">Read more about Jumpstart Training&nbsp;&rsaquo;</a></p>
 		</div>
 	</div>
-</div><!-- /.row -->
+</div>
 
-<div class="row row-grey row-image-centered">
-	<span><img src="{{ STATIC_URL }}img/pictograms/image-picto-grow-on-demand-180.png" alt="" width="180" height="180" /></span>
-	<div class="eight-col">
-		<h2>Building your own cloud?</h2>
-		<p>Ubuntu OpenStack is the  fastest, easiest and most robust way to build an open cloud.  As the reference operating system for OpenStack, Ubuntu includes everything you need for making a feature-rich OpenStack deployment. And we guide you through it all with our enterprise class support for both Ubuntu and OpenStack.</p>
-		<p><a href="/cloud/build-a-cloud">Learn how to build a cloud&nbsp;&rsaquo;</a></p>
+<div class="row row-grey">
+	<div class="seven-col">
+		<h2>What Ubuntu offers you</h2>
+		<p>Whether you&rsquo;re building your own cloud or you want to use a public cloud, Ubuntu offers all the software infrastructure, tools and services you need.</p>
+		<ul class="list-ubuntu">
+			<li>Everything you need to efficiently build and integrate an OpenStack cloud</li>
+			<li>Certified Ubuntu Server images for use on the leading public clouds</li>
+			<li>Sophisticated tools to help you provision, build, manage and support your cloud at scale</li>
+			<li>Enterprise-grade commercial services available in the form of bespoke consulting engagements and ongoing Ubuntu Advantage support subscriptions</li>
+			<li>The option to have Canonical build and operate your cloud on your hardware, until your team is ready to take over responsibility, with the new BootStack service</li>
+		</ul>
 	</div>
-</div><!-- /.row -->
-<div class="row row-use-a-cloud">
+	<div class="four-col push-one last-col box box-highlight resource resource-e-book">
+		<h2>
+			<a href="http://insights.ubuntu.com/resources/factsheets/whats-new-in-ubuntu-server-14-04-lts">What&rsquo;s new in Ubuntu 14.04 LTS&nbsp;&rsaquo;</a>
+		</h2>
+		<p>Learn what makes Ubuntu 14.04 LTS the ultimate enterprise cloud platform, both for building OpenStack clouds and for running on public clouds.</p>
+		<p class="content-cat content-cat-e-book">Factsheet</p>
+	</div>
+</div>
+
+<div class="row row-public-cloud">
 	<div class="eight-col">
-		<h2>Using Ubuntu in the cloud?</h2>
-		<p>Ubuntu is the most popular guest operating system on public clouds and the fastest growing scale-out platform. The following public clouds provide official, certified Ubuntu images.</p>
-		<p><a href="/cloud/use-a-cloud">Find out why Ubuntu Server is the best guest in your cloud &nbsp;&rsaquo;</a></p>
-		<ul class="inline-icons">
-			<li><img src="{{ STATIC_URL }}img/logos/logo-ibm-large.png" alt="IBM" width="110" height="50" /></li>
-			<li><img src="{{ STATIC_URL }}img/logos/logo-window-azure-large.png" alt="Windows Azure" width="245" height="50" /></li>
-			<li class="last-item"><img src="{{ STATIC_URL }}img/logos/logo-hp-cloud.png" alt="" width="150" height="50" /></li>
+		<h2>Using Ubuntu in the public cloud</h2>
+		<p>Ubuntu is the most popular operating system on the leading public clouds and the fastest growing scale-out platform in the world. The following is a selection of public clouds offering certified Ubuntu Server images, created by Canonical.<p>
+		<p><a href="/cloud/use-a-cloud">Read more about using Ubuntu in the cloud&nbsp;&rsaquo;</a></p>
+		<ul class="inline-logos no-bullets no-margin">
+			<li class="first-item"><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-amazonwebservices.svg" alt="AWS" /></li>
+			<li><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-hpcloud.svg" alt="HP cloud" /></li>
+			<li class="last-item"><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-joyent.svg" alt="Joyent" /></li>
+			<li class="first-item"><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-ibm.svg" alt="IBM" /></li>
+			<li class="last-item"><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-windowsazure.svg" alt="Azure" /></li>
 		</ul>
 	</div>
 	<div class="four-col last-col box box-highlight resource resource-e-book">
-		<h2><a href="http://insights.ubuntu.com/checklist/cloud-model-checklist/">Public or private cloud?&nbsp;&rsaquo;</a></h2>
+		<h2>
+			<a href="http://insights.ubuntu.com/checklist/cloud-model-checklist/">Public or private cloud?&nbsp;&rsaquo;</a>
+		</h2>
 		<p>Is your organisation better off using a public cloud or building its own private cloud? What factors and trade-offs should you consider?</p>
 		<p class="content-cat content-cat-e-book">E-book</p>
-	</div><!-- /.four-col -->
-</div><!-- /.row -->
+	</div>
+</div>
 
-<div class="row row-grey no-padding-bottom">
-	<div class="ten-col">
-		<h2>Complete set of cloud tools for your cloud</h2>
-		<p>Whether you use Ubuntu in a public, private or hybrid cloud, we have tools to help you build, scale, manage and support your cloud.</p>
-		<p><a href="/cloud/tools/">Learn more about the Ubuntu OpenStack cloud toolset&nbsp;&rsaquo;</a></p>
+<div class="row row-cloud-tools">
+	<div class="eight-col">
+		<h2>A complete set of cloud tools</h2>
+		<p>Ubuntu gives you the tools you need to create, scale and manage your cloud for the long term.</p>
+		<p><a href="/cloud/tools">Learn more about the Ubuntu cloud toolset&nbsp;&rsaquo;</a></p>
+	</div><!-- /.eight-col -->
+	<div class="twelve-col">
+		<div class="vertical-divider">
+			<div class="four-col">
+				<p class="text-center"><img src="{{ STATIC_URL }}img/cloud/image-maascharts.png" alt="MAAS" /></p>
+				<h3><a href="/cloud/tools/maas">MAAS&nbsp;&rsaquo;</a></h3>
+				<h4 class="note">Free software</h4>
+				<p>MAAS takes care of the initial setup and configuration of your servers, integrating them into your network.</p>
+			</div><!-- /.four-col -->
+			<div class="four-col">
+				<p class="text-center"><img src="{{ STATIC_URL }}img/cloud/image-jujucharms.png" alt="Juju" /></p>
+				<h3><a href="/cloud/tools/juju">Juju&nbsp;&rsaquo;</a></h3>
+				<h4 class="note">Free software</h4>
+				<p>Juju is a  revolution in service orchestration. Deploy services  like MySQL and Hadoop in seconds, to any  cloud running Ubuntu.</p>
+			</div><!-- /.four-col -->
+			<div class="four-col last-col landscape">
+				<p class="text-center"><img src="{{ STATIC_URL }}img/cloud/image-landscapegraph.png" alt="Landscape" /></p>
+				<h3><a href="/management/working-with-landscape">Landscape&nbsp;&rsaquo;</a></h3>
+				<h4 class="note">Free for 30 days</h4>
+				<p>Landscape  makes sure the software is up-to-date, monitors the system&rsquo;s health and keeps your servers running perfectly.</p>
+			</div><!-- /.four-col -->
+		</div><!-- /.vertical-divider -->
+	</div><!-- /.twelve-col -->
+</div><!-- /.row-cloud-tools -->
+
+<div class="row row-cloud-jobs-promo row-grey">
+	<div class="seven-col">
+		<h2>Building a team to shape the cloud</h2>
+		<p>Canonical needs even more cloud experts for its growing development teams. If you&rsquo;ve got the skills and you want to help shape the cloud&rsquo;s future, apply today.</p>
+		<p><a href="http://www.canonical.com/careers/cloud-vacancies">Learn more and apply&nbsp;&rsaquo;</a></p>
 	</div>
-	<div class="twelve-col no-margin-bottom">
-		<img class="left" src="{{ STATIC_URL }}img/cloud/image-juju-window.png" alt="The Juju GUI in a web browser" width="904" height="453" />
+	<div class="five-col text-center last-col">
+		<img src="{{ STATIC_URL }}img/cloud/image-buildingateam.png" alt="" />
 	</div>
-</div>
+</div><!-- /.row -->
 
-<!--
-<div class="row row-image-centered no-border">
+<div class="row row-diverse-ecosystem">
 	<div class="five-col">
-		<h2>Planning the Ubuntu OpenStack roadmap</h2>
-		<p>Your organisation relies on OpenStack. Shouldn&rsquo;t you have a say in its future?</p>
-		<p>
-			<a onclick="_gaq.push(['_trackEvent', 'External Link', 'Cloud openstack survey', 'Survey Monkey Link');" href="https://www.surveymonkey.com/s/L5B6MLB">Please take our quick survey &rsaquo;</a>
-		</p>
+		<img src="{{ STATIC_URL }}img/cloud/image-diversecloudecosystem.svg" alt="" />
 	</div>
-	<span><img src="{{ STATIC_URL }}img/homepage/cloud-survey.png" alt="" width="260" /></span>
-</div>
--->
+	<div class="seven-col last-col">
+		<h2>A diverse cloud ecosystem</h2>
+		<p>From silicon manufacturers to enterprise software vendors and public cloud providers, Canonical works with partners throughout the cloud industry to ensure Ubuntu remains the best choice for OpenStack. The result is an established, growing ecosystem of third party components, all tried and tested at enterprise scale.</p>
+		<a href="http://www.ubuntu.com/cloud/ecosystem">Explore the Ubuntu Cloud ecosystem&nbsp;&rsaquo;</a>
+	</div>
+</div><!-- /.row -->
+
+<div class="row">
+	<div class="eight-col">
+		<h2>Number one for telcos</h2>
+		<p>If you&rsquo;re a telco or service provider and you want to offer cloud services to your customers, there&rsquo;s no more reliable or more popular choice of infrastructure than Ubuntu OpenStack. We have helped most of the world&rsquo;s largest telcos and service providers take their OpenStack clouds from concept all the way to production. Read some of our insights on the most important considerations when building a telco cloud.</p>
+	</div>
+	<div class="four-col last-col box box-highlight resource resource-whitepaper">
+		<h2><a href="https://insights.ubuntu.com/2014/08/18/ubuntu-openstack-the-natural-choice-for-telcos-and-service-providers/">Get the facts&nbsp;&rsaquo;</a></h2>
+		<p>Ubuntu OpenStack for service providers</p>
+		<p class="content-cat content-cat-article">Article</p>
+	</div>
+</div><!-- /.row -->
 
-<div class="row row-image-centered no-border">
+<div class="row row-services no-border">
 	<div class="six-col">
-		<h2>13.10 and Havana are here</h2>
-		<p>Ubuntu OpenStack built with the Havana release is the fastest, easiest and most cost-effective way to build and support the most up to date OpenStack cloud.</p>
-		<p>
-			<a href="/download/cloud">Download now &rsaquo;</a>
-		</p>
+		<h2>Need services or support?</h2>
+		<p>Canonical, the company behind Ubuntu, provides on-site consulting services and training, direct from engineers involved in developing Ubuntu and OpenStack. For ongoing support once your cloud is up and running, you can subscribe to Ubuntu Advantage, the service package that includes Landscape, Canonical&rsquo;s enterprise cloud management software.</p>
+		<p><a href="http://www.ubuntu.com/management/ubuntu-advantage">Learn more about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
 	</div>
-	<span><img src="{{ STATIC_URL }}img/cloud/image-havana-promo.png" alt="" /></span>
+	<img src="{{ STATIC_URL }}img/cloud/image-landscape.jpg" alt="Landscape" />
 </div><!-- /.row -->
 
+<style>
+@-webkit-keyframes slidedown {
+	from { -webkit-transform: (0,0); }
+	to { -webkit-transform: translate(0, 185px); }
+}
+@keyframes slidedown {
+	from { transform: (0,0); }
+	to { transform: translate(0, 185px); }
+}
+</style>
+
 {% include "shared/_live_chat.html" %}
 
 {% endblock content %}
-{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
+{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
diff --git a/templates/cloud/jumpstart-training/_thank-you.html b/templates/cloud/jumpstart-training/_thank-you.html
new file mode 100644
index 00000000000..9f04a0e258f
--- /dev/null
+++ b/templates/cloud/jumpstart-training/_thank-you.html
@@ -0,0 +1,30 @@
+<div class="row row-hero no-border row-image-centered">
+	<div class="eight-col">
+		<h1>Thank you for {{ context }}</h1>
+		<p class="intro">A member of our team will be in touch {% if level_4 == 'order-thank-you' %}to confirm details {% endif %}within <strong>one working day</strong></p>
+	</div>
+	<span>
+		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-thankyou-midaubergine.svg" alt=":-)" width="200" height="200" />
+	</span>
+</div><!-- /.row-hero -->
+
+<div class="row equal-height no-border">
+	<h2 class="twelve-col">More about our enterprise services</h2>
+	<ul id="thank-you-extra" class="no-bullets">
+		<li class="advantage four-col first">
+			<h4>Ubuntu Advantage</h4>
+			<p>Purchase our desktop support and access Ubuntu experts whenever you need.</p>
+			<p><a href="/cloud/management">Learn about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
+		</li>
+		<li class="cloud four-col">
+			<h4>OpenStack</h4>
+			<p>Our private cloud infrastructure platform based on Openstack.</p>
+			<p><a href="/cloud">Learn about Ubuntu OpenStack&nbsp;&rsaquo;</a></p>
+		</li>
+		<li class="jumpstart four-col last-col">
+			<h4>Landscape</h4>
+			<p>Manage Ubuntu in the enterprise with our private cloud infrastructure platform based on OpenStack.</p>
+			<p><a href="/business/landscape">Learn about Landscape&nbsp;&rsaquo;</a></p>
+		</li>
+	</ul>
+</div><!-- end row-->
\ No newline at end of file
diff --git a/templates/cloud/jumpstart-training/contact-us.html b/templates/cloud/jumpstart-training/contact-us.html
new file mode 100755
index 00000000000..d63f84cff5d
--- /dev/null
+++ b/templates/cloud/jumpstart-training/contact-us.html
@@ -0,0 +1,124 @@
+{% extends "cloud/base_cloud.html" %}
+
+{% block title %}Contact us | Ubuntu Cloud Jumpstart{% endblock %}
+{% 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 second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" subsection_title="Jumpstart Training" page_title="Contact us" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row row-hero no-border">
+	<div class="eight-col">
+		<h1>Contact us about Jumpstart&nbsp;Training</h1>
+		<p class="intro">Fill in your details below and a member of our cloud sales 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_1032" name="mktForm_1032">
+				<fieldset class="fieldset-1">
+					<h3>About you</h3>
+					<ul class="mktLblLeft">
+						<li class='mktFormReq mktField'><label>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>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>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>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>Country:</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Country" id="Country" size='1'  tabIndex='5'><option value='Select country:' 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&#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&#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>State:</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="State" id="State" size='1'  tabIndex='6'><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>
+					</ul>
+				</fieldset>
+				<fieldset class="fieldset-2">
+					<h3>About your role</h3>
+					<ul class="mktLblLeft">
+						<li class='mktFormReq mktField'><label>Job role:</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Job_Role__c" id="Job_Role__c" size='1'  tabIndex='7'><option value='' 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>
+					</ul>
+				</fieldset>
+				<fieldset class="fieldset-3">
+					<h3>About your company</h3>
+					<ul class="mktLblLeft">
+						<li class='mktFormReq mktField'><label>Company name:</label><span class='mktInput'><input class='mktFormText mktFormString mktFReq' name="Company" id="Company" type='text' value=""  maxlength='255' tabIndex='8' /><span class='mktFormMsg'></span></span></li>
+						<li class='mktField'><label>Industry:</label><span class='mktInput'><select class='mktFormSelect' name="Industry" id="Industry" size='1'  tabIndex='9'><option value='' 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 &mdash; media/music/broadcast'>Entertainment &mdash; 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 &mdash; Computer Hardware'>Manufacturer &mdash; Computer Hardware</option><option value='Manufacturer &mdash; Device/ Handset'>Manufacturer &mdash; Device/ Handset</option><option value='Manufacturer &mdash; Other'>Manufacturer &mdash; Other</option><option value='Marketing, PR &amp; Advertising'>Marketing, PR &amp; Advertising</option><option value='Media &mdash; publishing or news'>Media &mdash; publishing or news</option><option value='Oil &amp; Gas'>Oil &amp; Gas</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='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>
+					</ul>
+				</fieldset>
+				<fieldset class="fieldset-4">
+					<h3>IT and your organisation</h3>
+					<ul class="mktLblLeft">
+						<li class='mktFormReq mktField'><label>How do you currently use Ubuntu?</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Ubuntu_User__c" id="Ubuntu_User__c" size='1'  tabIndex='10'><option value='' 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>Why are you interested in cloud?</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Why_Cloud__c" id="Why_Cloud__c" size='1'  tabIndex='11'><option value='' selected='selected'>Please select:</option><option value='Increasing revenues'>Increasing revenues</option><option value='Minimising operational expenditure'>Minimising operational expenditure</option><option value='Optimising efficiency'>Optimising efficiency</option><option value='Handling spikes in traffic'>Handling spikes in traffic</option><option value='Technical'>Technical</option><option value='Other'>Other</option></select><span class='mktFormMsg'></span></span></li>
+						<li class='mktFormReq mktField'><label>How soon do you plan to deploy your cloud solution?</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Project_Timeframe__c" id="Project_Timeframe__c" size='1'  tabIndex='12'><option value='' selected='selected'>Please select:</option><option value='Less than 3 months'>Less than 3 months</option><option value='3-6 months'>3-6 months</option><option value='6-12 months'>6-12 months</option><option value='No specific dates'>No specific dates</option></select><span class='mktFormMsg'></span></span></li>
+						<li class='mktFormReq mktField'><label>Do you currently use a public cloud or have a private cloud?</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Has_Cloud__c" id="Has_Cloud__c" size='1'  tabIndex='13'><option value='' selected='selected'>Please select:</option><option value='I have a public cloud (e.g. Amazon Web Service (AWS) or Rackspace)'>I have a public cloud (e.g. Amazon Web Service (AWS) or Rackspace)</option><option value='I have a private cloud'>I have a private cloud</option><option value='I have a public and private cloud'>I have a public and private cloud</option><option value='I have none of the above'>I have none of the above</option></select><span class='mktFormMsg'></span></span></li>
+					</ul>
+				</fieldset>
+				<fieldset class="fieldset-5">
+					<h3>Additional comments or questions</h3>
+					<ul class="mktLblLeft">
+						<li class='mktField'><span class='mktInput'><textarea class='mktFormTextarea mktFormTextarea' name="Comments_from_lead__c" id="Comments_from_lead__c" cols='20' rows='6' tabIndex='15'></textarea><span class='mktFormMsg'></span></span></li>
+					</ul>
+				</fieldset>
+				<fieldset class="fieldset-submit">
+					<ul class="mktLblLeft">
+						<li class="mktField mktLblRight"><span class="mktInput mktLblRight"><input class="mktFormCheckbox" name="NewsletterOpt-In" id="NewsletterOpt-In" type="checkbox" value="1" tabindex="16"><label for="NewsletterOpt-In">I would like to receive occasional news from Canonical by email.</label>&nbsp;<span class="mktFormMsg"></span></span></li>
+						<li>All information provided will be handled in accordance with the Canonical <a href="http://www.ubuntu.com/legal" target="_blank">privacy policy</a>.</li>
+						<li id="mktFrmButtons"><!--<label>&nbsp;</label>--><input id="mktFrmSubmit" type="submit" value="Submit" name="submitButton" onclick="formSubmit(document.getElementById(&quot;mktForm_1032&quot;)); return false;">&nbsp;<input style="display: none;" id="mktFrmReset" type="reset" value="Clear" name="resetButton" onclick="formReset(document.getElementById(&quot;mktForm_1032&quot;)); return false;"></li>
+					</ul>
+				</fieldset>
+				<span style="display: none;"><input type="text" name="_marketo_comments" value="" /></span>
+				<input type="hidden" name="lpId" value="863" />
+				<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/ubuntu-cloud-jumpstart.html?cr={creative}&amp;kw={keyword}" />
+				<input type="hidden" name="formid" value="1032" />
+				<input type="hidden" name="returnURL" value="http://www.ubuntu.com/cloud/jumpstart-training/thank-you" />
+				<input type="hidden" name="retURL" value="http://www.ubuntu.com/cloud/jumpstart-training/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-1318249842357-32221" />
+			</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);
+			}
+		</script>
+
+
+			</div><!-- /.eight-col -->
+</div><!-- /row .row -->
+{% endblock content %}
+{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/cloud/jumpstart-training/index.html b/templates/cloud/jumpstart-training/index.html
new file mode 100755
index 00000000000..4c4c900d386
--- /dev/null
+++ b/templates/cloud/jumpstart-training/index.html
@@ -0,0 +1,133 @@
+{% extends "cloud/base_cloud.html" %}
+
+{% block title %}Ubuntu Cloud Jumpstart | Cloud{% endblock %}
+
+{% block meta_description %}Canonical engineers will deliver an Orange Box to your office and provide two full days of technical training, covering Ubuntu, MAAS, Juju, Landscape, and OpenStack all for &dollar;10K.{% endblock meta_description %}
+
+{% block meta_keywords %}Jumpstart Training, consulting, Ubuntu OpenStack, private cloud{% endblock meta_keywords %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" page_title="Jumpstart" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row row-hero no-border row-jumpstart-training">
+	<h1>Jumpstart Training</h1>
+	<div class="seven-col">
+		<p class="intro">Two full days of technical training, covering Ubuntu, MAAS, Juju, Landscape and OpenStack.</p>
+		<p>Canonical engineers will deliver an Orange Box to your office, that is yours for two weeks for $9,995 plus travel and accommodation (fixed at &dollar;2,500 in the US and &euro;2,500 worldwide), as you safely experiment with the industry leading Ubuntu ecosystem of cloud technologies at your own pace and with your own workloads. We will join you again, a couple of weeks later, to review what you learned and discuss scaling these tools into your own data center, onto your own enterprise hardware.</p>
+		<p><a class="link-cta-ubuntu" href="/cloud/jumpstart-training/order" onclick="_gaq.push(['_trackEvent', 'order', 'button', 'jumpstart']);">Order Jumpstart Training</a> or <a href="/cloud/jumpstart-training/contact-us">contact us for more details&nbsp;&rsaquo;</a></p>
+
+	</div><!-- /.seven-col -->
+	<div class="five-col last-col text-center">
+		<img alt="The Orange Box" src="{{ STATIC_URL }}img/cloud/orange-box/image-orangebox.png" />
+	</div>
+</div><!-- /.row .row-hero -->
+
+
+
+<div class="row no-border strip-dark">
+	<div class="eight-col last-col ">
+		<h2>What are the benefits?</h2>
+		<p>Pack your conference room with curious sysadmins and devops engineers for two full days of in depth training by Ubuntu cloud experts.</p>
+	</div><!-- /.eight-col -->
+	<div class="combined-list">
+		<div class="six-col">
+			<ul class="list-ubuntu smaller">
+				<li>Without disrupting your core network or production data center workloads,  prototype your OpenStack experience in a private sandbox environment within an Orange Box</li>
+				<li>Experiment with various storage alternatives, practice scaling services, destroy and rebuild the environment repeatedly</li>
+			</ul>
+		</div><!-- /.six-col -->
+		<div class="six-col last-col">
+			<ul class="list-ubuntu smaller">
+				<li>Deploy OpenStack, Hadoop, CloudFoundry, and hundreds of other workloads in minutes</li>
+				<li>After the two weeks, review your experience with a  Canonical engineer and discuss how your environment maps to these tools</li>
+			</ul>
+		</div>
+	</div>
+</div><!-- /.row -->
+
+<div class="row row-orange-box">
+	<div class="six-col text-center">
+		<img alt="The Orange Box" src="{{ STATIC_URL }}img/cloud/orange-box/image-whatsincluded.jpg" />
+	</div><!-- /.six-col -->
+	<div class="six-col last-col">
+		<h2>What is the Orange Box?</h2>
+		<p>The Orange Box is a complete mobile cluster and an easy, low-risk way to deploy OpenStack cloud infrastructure on your premises, for testing or proof of concept. There&rsquo;s no safer way to create your first cloud than with Canonical engineers by your side.  Each Orange Box contains 10 nodes, each with 4 cores, 16GB of RAM, and generous SSD storage.  The box is pre-loaded with Ubuntu 14.04 LTS, MAAS, and Juju.</p>
+		<div class="box box-highlight resource resource-data-sheet">
+			<h2><a href="https://insights.ubuntu.com/2014/05/13/jumpstart-training-with-the-orange-box/">Jumpstart Training&nbsp;datasheet&nbsp;&rsaquo;</a></h2>
+			<p>Learn what&rsquo;s inside the Orange Box &mdash; a complete mobile cluster with Metal as a Service (MAAS) and Juju.</p>
+			<p class="content-cat content-cat-webinar">Datasheet</p>
+			<div class='curl'></div>
+		</div>
+	</div><!-- /.six-col -->
+</div><!-- /.row -->
+
+<div class="row">
+	<h2>What the engineer will do</h2>
+	<div class="combined-list">
+		<div class="six-col">
+			<ul class="list-canonical smaller">
+				<li>Work with your ops team to design and deploy Ubuntu cloud Infrastructure on Orange Box</li>
+				<li>Share knowledge on the use of Ubuntu cloud guest (a version specifically designed for public or private clouds)</li>
+				<li>Deliver the required core build for Ubuntu Server</li>
+				<li>Plan and implement user and group requirements</li>
+				<li>Develop and integrate baseline security policies</li>
+			</ul>
+		</div><!-- /.six-col -->
+		<div class="six-col last-col">
+			<ul class="list-canonical smaller">
+				<li>Help with the deployment of Ubuntu cloud Infrastructure compute and/or storage services</li>
+				<li>Configure automated deployment tools</li>
+				<li>Help you develop a strategy for managing cloud capacity</li>
+				<li>Introduce your team to Juju and use it in your cloud environment</li>
+			</ul>
+		</div><!-- /.six-col -->
+	</div>
+</div><!-- /.row -->
+
+<div class="row row-grey">
+	<div class="three-col text-center">
+		<img src="{{ STATIC_URL }}img/logos/logo-pack/logo-openstack.svg" width="120" height="122" alt="Openstack logo" />
+	</div><!-- /.three-col -->
+	<div class="nine-col last-col">
+		<h2>OpenStack loves Ubuntu</h2>
+		<p>The reference architecture for OpenStack is based on Ubuntu. Jumpstart gives you a private cloud compatible with that architecture, on a pre-assembled fully tested mobile cluster.</p>
+        <p><a href="/cloud/openstack/reference-architecture">Learn more about the OpenStack reference architecture&nbsp;&rsaquo;</a></p>
+	</div><!-- /.nine-col -->
+</div><!-- /.row -->
+
+<div class="row">
+	<div class="eight-col">
+		<h2>Jumpstart is just the start</h2>
+		<p>Our standard Jumpstart Training engagement is limited to two days training from an Canonical engineer for Ubuntu OpenStack, MAAS and Juju deployments on our Orange Box, which you can use for a two week period for $10K &mdash; excluding expenses, travel and accommodation.  Additional support, assurance, consulting, integration and professional services are available on an individual basis.</p>
+		<p><a href="/cloud/jumpstart-training/order">Order Jumpstart Training today&nbsp;&rsaquo;</a></p>
+	</div><!-- /.eight-col -->
+	<div class="four-col last-col text-center">
+		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-training-midaubergine.svg" width="200" alt="Training Pictogram" />
+	</div>
+</div><!-- /.row -->
+
+<div class="row row-grey no-border">
+	<div class="four-col text-center priority-0">
+		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-shop-warmgrey.svg" width="200" alt="Shopping Pictogram" />
+	</div><!-- /.three-col -->
+	<div class="eight-col last-col">
+		<h2>Just need the hardware?</h2>
+		<p>If you already have experience of using Ubuntu, MAAS, Juju and OpenStack, you might prefer to buy the hardware alone, so you can build your own cloud. In which case, please contact our partner, <a href="mailto:cluster@tranquilpc.co.uk">TranquilPC</a>.</p>
+        <p><a class="external" href="http://www.tranquilpcshop.co.uk/ubuntu-orange-box">Build your Orange Box at TranquilPC</a></p>
+	</div><!-- /.nine-col -->
+</div><!-- /.row -->
+
+
+{% include "shared/_live_chat.html" %}
+{% endblock content %}
+{% block footer_extra %}
+<!-- twitter tracking code -->
+<script src="//platform.twitter.com/oct.js"></script>
+<script>twttr.conversion.trackPid('l4pwm');</script>
+<noscript>
+	<img height="1" width="1" style="display:none;" alt="" src="https://analytics.twitter.com/i/adsct?txn_id=l4pwm&p_id=Twitter" />
+	<img height="1" width="1" style="display:none;" alt="" src="//t.co/i/adsct?txn_id=l4pwm&p_id=Twitter" />
+</noscript>
+{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/cloud/jumpstart-training/order-thank-you.html b/templates/cloud/jumpstart-training/order-thank-you.html
new file mode 100644
index 00000000000..3b86e04a654
--- /dev/null
+++ b/templates/cloud/jumpstart-training/order-thank-you.html
@@ -0,0 +1,32 @@
+{% extends "cloud/base_cloud.html" %}
+
+{% block title %}Thank you{% endblock %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" subsection_title="Jumpstart Training" page_title="Thank you" tertiary="true" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+{% include "shared/_thank_you.html" with thanks_context="ordering Ubuntu&nbsp;Jumpstart" details="to confirm details " %}
+{% 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/cloud/jumpstart-training/order.html b/templates/cloud/jumpstart-training/order.html
new file mode 100644
index 00000000000..69b9d1dee9a
--- /dev/null
+++ b/templates/cloud/jumpstart-training/order.html
@@ -0,0 +1,187 @@
+{% extends "cloud/base_cloud.html" %}
+
+{% block title %}Order form | Ubuntu Cloud Jumpstart Training{% endblock %}
+{% block head_extra %}
+	<script>
+		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 second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" subsection_title="Jumpstart Training" page_title="Order" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row row-hero no-border">
+
+	<h1>Jumpstart Training order form</h1>
+
+	<div class="eight-col">
+
+		<p>Jumpstart Training is the best way to accelerate your understanding of OpenStack. The service includes two days of on-site training using an Ubuntu Orange Box &mdash; a self-contained cluster of 10 servers provided by Canonical. After the first day of training, you can keep the Orange Box for up to two weeks, for experimentation and evaluation.</p>
+
+		<p>For a complete statement on the services offered, <a href="{{ STATIC_URL }}files/cloud/Jumpstart_Training_Short_Form_Services_Agreement_21_Jul_2014.pdf">please see the detailed Terms of Service</a>.</p>
+
+		<p>To complete this order form you will need a PO for $10,000 plus travel and accommodation for the consultant (fixed at $2,500 in the US and EU).</p>
+
+    </div>
+
+    <div class="eight-col">
+<script> function mktoGetForm() {return document.getElementById('mktForm_1132'); }</script>
+<form class="lpeRegForm formNotEmpty" method="post" enctype="application/x-www-form-urlencoded" action="https://pages.canonical.com/index.php/leadCapture/save" id="mktForm_1132" name="mktForm_1132">
+
+	<fieldset  class="fieldset-1">
+		<h3>1. Company details</h3>
+					<ul class="mktLblLeft">
+						<li class='mktFormReq mktField'>
+							<label>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>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>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>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>Country:</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Country" id="Country" size='1'  tabIndex='5'><option value='Select country:' selected='selected'>Select country:</option><option value='AF'>Afghanistan</option><option value='AX'>&Aring;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&ocirc;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&#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&#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&eacute;union</option><option value='RO'>Romania</option><option value='RU'>Russian Federation</option><option value='RW'>Rwanda</option><option value='BL'>Saint Barth&eacute;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>State:</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="State" id="State" size='1'  tabIndex='6'><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>
+					</ul>
+	</fieldset>
+
+	<fieldset class="fieldset-2">
+
+		<h3>2. Scheduling</h3>
+
+		<p>Please select the week in which you would like your Jumpstart Training to commence. We will confirm in writing after you complete this order. Depending on the availability of training staff and hardware, we may need to arrange a different week with you.</p>
+
+		<ul class='mktLblLeft'>
+
+			<li  class='mktFormReq mktField' ><label>Requested start date:</label><span class='mktInput'><input class='mktFormText mktFormDate mktFReq' name="requestedstartdate" id="requestedstartdate" type='text' value=""  tabIndex='11' /><span class='mktFormMsg'></span></span></li>
+
+		</ul>
+	</fieldset>
+
+	<fieldset class="fieldset-3">
+
+		<h3>3. Additional comments or questions</h3>
+
+		<ul class='mktLblLeft'>
+
+			<li  class='mktField' ><span class='mktInput'><textarea class='mktFormTextarea mktFormTextarea' name="Comments_from_lead__c" id="Comments_from_lead__c" cols='20' rows='2'  tabIndex='12'></textarea><span class='mktFormMsg'></span></span></li>
+
+		</ul>
+
+	</fieldset>
+
+	<fieldset class="fieldset-4">
+
+		<h3>4. Terms of service</h3>
+
+		<p><a href="{{ STATIC_URL }}files/cloud/Jumpstart_Training_Short_Form_Services_Agreement_21_Jul_2014.pdf">Please see the detailed Terms of Service</a> for a complete statement on the services offered. In order to complete this order form you will need a PO for the $10,000 fee.</p>
+
+		<ul class="mktLblLeft">
+			<li class='mktField mktLblRight mktFormReq'>
+				<span class='mktInput mktLblRight'>
+					<input class='mktFReq mktFormCheckbox' name="accept_term_of_service__c" id="accept_term_of_service__c" type='checkbox' tabIndex='13' value="" required />
+					<label> I accept the Terms of Service</label>&nbsp;
+					<span class='mktFormMsg'></span>
+				</span>
+			</li>
+		</ul>
+	</fieldset>
+
+	<fieldset class="fieldset-submit">
+
+			<h3>5. Payment</h3>
+
+			<p>POs will be accepted in this form. Settlement is expected in advance of training. Additional costs of travel and accommodation may be incurred depending on your location. In the  US and Europe these are fixed at $2,500.</p>
+
+			<ul class="eight-col mktLblLeft">
+
+				<li  class='mktFormReq mktField' >
+					<label>Purchase order number:</label>
+					<span class='mktInput'>
+						<input class='mktFormText mktFormString mktFReq' name="purchaseordernumber" id="purchaseordernumber" type='text' value=""  maxlength='255' tabIndex='12' />
+						<span class='mktFormMsg'></span>
+					</span>
+				</li>
+
+				<li id='mktFrmButtons'>
+					<input id='mktFrmSubmit' type='submit' value='Purchase' name='submitButton' onclick='formSubmit(document.getElementById("mktForm_1132")); return false;' />
+					<input style='display: none;' id='mktFrmReset' type='reset'  value='Clear' name='resetButton' onclick='formReset(document.getElementById("mktForm_1132")); return false;' />
+				</li>
+				<li class="eight-col"><p>You will receive an order confirmation upon completion of this form. A sales representative will contact you within the next business day to confirm details of travel and timing. We look forward to helping you embrace OpenStack and are delighted that you are interested in the world&#39;s leading OpenStack distribution: Ubuntu from Canonical.</p></li>
+       </ul>
+
+    </fieldset>
+
+  <span style="display:none;"><input type="text" name="_marketo_comments" value="" /></span>
+  <input type="hidden" name="lpId" value="1661" />
+  <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/Form--Jumpstart-Training-PO_form.html?cr={creative}&kw={keyword}" />
+  <input type="hidden" name="formid" value="1132" />
+  <input type="hidden" name="returnURL" value="http://www.ubuntu.com/cloud/jumpstart-training/order-thank-you" />
+  <input type="hidden" name="retURL" value="http://www.ubuntu.com/cloud/jumpstart-training/order-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-1405935445103-82660" />
+  </form>
+
+	<script src="http://www.ubuntu.com/misc/jquery.js"></script>
+	<script src="https://pages.canonical.com/js/mktFormSupport.js"></script>
+	<script src="https://pages.canonical.com/js/public/stateCountry.js"></script>
+	<script>
+		// 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>
+		function formSubmit(elt) {
+			return Mkto.formSubmit(elt);
+		}
+		function formReset(elt) {
+			return Mkto.formReset(elt);
+		}
+	</script>
+
+	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+	<link rel="stylesheet" type="text/css" media="screen" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.0/themes/ui-lightness/jquery-ui.css"/>
+ 	<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.0/jquery-ui.min.js"></script>
+
+	<script>
+	  $(function() {
+	  	$.datepicker.setDefaults({dateFormat:'d M yy',altFormat:'d M yy'});
+	    $( "#requestedstartdate" ).datepicker();
+	  });
+
+	</script>
+
+</div><!-- /.eight-col -->
+</div><!-- /row .row -->
+{% endblock content %}
+{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/cloud/jumpstart-training/thank-you.html b/templates/cloud/jumpstart-training/thank-you.html
new file mode 100755
index 00000000000..034c944a409
--- /dev/null
+++ b/templates/cloud/jumpstart-training/thank-you.html
@@ -0,0 +1,34 @@
+{% extends "cloud/base_cloud.html" %}
+
+{% block extra_body_class %}cloud-thank-you{% endblock %}
+
+{% block title %}Thank you{% endblock %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" subsection_title="Jumpstart Training" page_title="Thank you" tertiary="true" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+{% include "shared/_thank_you.html" with thanks_context="enquiring about Ubuntu&nbsp;Jumpstart" %}
+{% 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/cloud/labs.html b/templates/cloud/labs.html
old mode 100644
new mode 100755
index 4c613bbf791..d64130523d8
--- a/templates/cloud/labs.html
+++ b/templates/cloud/labs.html
@@ -11,11 +11,14 @@
 {% endblock second_level_nav_items %}
 
 {% block content %}
-<div class="row row-hero no-border no-padding-bottom">
-	<div class="seven-col no-margin-bottom">
-		<h1>Cloud labs</h1>
-		<p class="no-margin-bottom">There is so much goodness going on in the cloud on Ubuntu! Super-complex deployments turned into a breeze by Juju, ideas for new charms to write, great insights on cloud security, and beautiful new designs for GUI icons! This is the place where we post all this interesting content from the Ubuntu cloud team. </p>
-	</div><!-- /.eight-col -->
+<div class="row row-hero no-border row-image-centered">
+	<div class="seven-col">
+		<h1>Labs</h1>
+		<p>There is so much goodness going on in the cloud on Ubuntu! Super-complex deployments turned into a breeze by Juju, ideas for new charms to write, great insights on cloud security, and beautiful new designs for GUI icons! This is the place where we post all this interesting content from the Ubuntu cloud team. </p>
+	</div>
+	<span>
+		<img src="{{ STATIC_URL }}img/cloud/labs/image-cloudlabs.svg" alt="" width="288" height="186" />
+	</span>
 </div><!-- /.row row-hero -->
 
 <div class="row no-border">
@@ -36,28 +39,28 @@ <h3><a href="http://ubuntuone.com/0PJFauDH7sZGmRfZrOkOMa">Overcoming Cloud Secur
 		<div class="box">
 			<h3><a href="http://ubuntuone.com/6fDDb4dq240auPL1qphq1p">Juju GUI walk-through&nbsp;&rsaquo;</a></h3>
 			<p>Check out the latest version of cloud magic! We&rsquo;ve just unveiled the new, and very fabulous Juju GUI, and you get a walk-through.</p>
-			<p class="note">Video</p>		
+			<p class="note">Video</p>
 		</div>
 	</div>
 	<div class="eight-col last-col">
 		<div class="box">
 			<h3><a href="https://www.youtube.com/watch?v=yRcqSjOGweo">Charm School: Charm overview&nbsp;&rsaquo;</a></h3>
-			<p><iframe width="554" height="312" src="//www.youtube.com/embed/yRcqSjOGweo?rel=0&showinfo=0" frameborder="0" allowfullscreen></iframe></p>
+			<p class="video-container"><iframe width="554" height="312" src="//www.youtube.com/embed/yRcqSjOGweo?rel=0&showinfo=0" frameborder="0" allowfullscreen></iframe></p>
 			<p>If you&rsquo;re itching to write your first charm, here is how to do it.
 		</div>
 		<div class="box">
-			<h3><a href="http://www.youtube.com/watch?v=HUtR3_YlKXU">Ubuntu Juju - migrate your infrastructure from ec2 to hpcloud&nbsp;&rsaquo;</a></h3>
-			<p><iframe width="554" height="312" src="//www.youtube.com/embed/HUtR3_YlKXU?rel=0&showinfo=0" frameborder="0" allowfullscreen></iframe></p>
+			<h3><a href="http://www.youtube.com/watch?v=HUtR3_YlKXU">Ubuntu Juju - migrate your infrastructure from EC2 to HP Cloud&nbsp;&rsaquo;</a></h3>
+			<p class="video-container"><iframe width="554" height="312" src="//www.youtube.com/embed/HUtR3_YlKXU?rel=0&showinfo=0" frameborder="0" allowfullscreen></iframe></p>
 			<p>Looking to migrate your infrastructure from ec2 to HP Cloud? Here is the magical way to do it using Juju.</p>
 		</div>
 		<div class="box">
 			<h3><a href="https://www.youtube.com/watch?v=kKQLhGZVN4A">Google I/O 2012 - Go in Production&nbsp;&rsaquo;</a></h3>
-			<p><iframe width="554" height="312" src="http://www.youtube.com/embed/kKQLhGZVN4A?version=3&rel=1&start=85&showinfo=0" frameborder="0" allowfullscreen></iframe></p>
+			<p class="video-container"><iframe width="554" height="312" src="http://www.youtube.com/embed/kKQLhGZVN4A?version=3&rel=1&start=85&showinfo=0" frameborder="0" allowfullscreen></iframe></p>
 			<p>Canonical&rsquo;s Gustavo Niemeyer gave a fantastic talk at Google I/O on Go in production.
 		</div>
 	</div>
 	<div class="eight-col">
-		<p class="note" id="fn1">* By sending us content you consent to Canonical&rsquo;s use of such content in its absolute discretion and that the content will not infringe the rights of any third party. The use and collection of the content will be in accordance with <a href="http://www.canonical.com/aboutus/privacypolicy">Canonical&rsquo;s privacy policy</a>.</p>
+		<p class="note" id="fn1">* By sending us content you consent to Canonical&rsquo;s use of such content in its absolute discretion and that the content will not infringe the rights of any third party. The use and collection of the content will be in accordance with <a href="http://www.vmware.com/cloud-computing">Canonical&rsquo;s privacy policy</a>.</p>
 	</div><!-- /.eight-col -->
 </div><!-- /.row -->
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/cloud/management.html b/templates/cloud/management.html
old mode 100644
new mode 100755
index f1880347193..8c783ec60b2
--- a/templates/cloud/management.html
+++ b/templates/cloud/management.html
@@ -14,20 +14,17 @@
 {% block content %}
 <div class="row row-hero">
 	<h1>Cloud management</h1>
-		<div class="twelve-col">
-			<div class="six-col">
-				<p class="intro">Ubuntu OpenStack is fully supported through Ubuntu Advantage from Canonical, the company behind Ubuntu.</p>
-			</div>
-		</div><!-- /.twelve-col -->
-		<div class="twelve-col">
-			<div class="six-col no-margin-bottom">
-				<p>Ubuntu Advantage provides efficient systems administration, fast problem resolution and access to the Ubuntu and OpenStack experts as and when you need them. You can choose the level of support you need based on your workloads and cloud setup.</p>
-				<p><a href="/management">Find out more about Landscape &rsaquo;</a></p>
-			</div>
-			<div class="six-col no-margin-bottom last-col">
-				<p>Landscape is the systems management tool for Ubuntu OpenStack included with Ubuntu Advantage. It allows you to manage, audit and report on your  Ubuntu OpenStack cloud and services running within its easily as one, making your entire environment more cost-effective.</p>
-			</div>
-		</div><!-- /.twelve-col -->
+	<div class="six-col">
+		<p class="intro">Ubuntu OpenStack is fully supported through Ubuntu Advantage from Canonical, the company behind Ubuntu.</p>
+		<p>Ubuntu Advantage provides efficient systems administration, fast problem resolution and access to the Ubuntu and OpenStack experts as and when you need them. You can choose the level of support you need based on your workloads and cloud setup.</p>
+		<p><a href="/management">Find out more about Landscape&nbsp;&rsaquo;</a></p>
+	</div>
+	<div class="six-col last-col">
+		<div class="text-center">
+			<img src="{{ STATIC_URL }}img/cloud/management/image-cloudmanagement.svg" width="389" height="114" alt="" />
+		</div>
+		<p>Landscape is the systems management tool for Ubuntu OpenStack included with Ubuntu Advantage. It allows you to manage, audit and report on your  Ubuntu OpenStack cloud and services running within its easily as one, making your entire environment more cost-effective.</p>
+	</div>
 </div><!-- /.row -->
 
 <div class="row">
@@ -61,21 +58,21 @@ <h3>Choose the right level of cover for your needs</h3>
 				</tr>
 				<tr>
 					<th>Infrastructure 24/7 support</th>
-					<td><img src="/static/u/img/patterns/purpletick.gif" alt="Yes"></td>
-					<td><img src="/static/u/img/patterns/purpletick.gif" alt="Yes"></td>
-					<td><img src="/static/u/img/patterns/purpletick.gif" 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>
+					<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes"></td>
 				</tr>
 				<tr>
 					<th>Landscape Dedicated Server</th>
-					<td><img src="/static/u/img/patterns/purpletick.gif" alt="Yes"></td>
-					<td><img src="/static/u/img/patterns/purpletick.gif" alt="Yes"></td>
-					<td><img src="/static/u/img/patterns/purpletick.gif" 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>
+					<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/u/img/patterns/purpletick.gif" alt="Yes"></td>
-					<td><img src="/static/u/img/patterns/purpletick.gif" alt="Yes"></td>
-					<td><img src="/static/u/img/patterns/purpletick.gif" 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>
+					<td><img src="{{ STATIC_URL }}img/patterns/tick-darkaubergine.svg" alt="Yes"></td>
 				</tr>
 			</tbody>
 			<tfoot>
@@ -87,9 +84,9 @@ <h3>Choose the right level of cover for your needs</h3>
 				</tr>
 				<tr>
 					<th>Price per year per availability zone</th>
-					<td>&dollar;75,000</td>
-					<td>&dollar;180,000</td>
-					<td>&dollar;350,000</td>
+					<td>&dollar;75<span class="full">,000</span><span class="truncated">k</span></td>
+					<td>&dollar;180<span class="full">,000</span><span class="truncated">k</span></td>
+					<td>&dollar;350<span class="full">,000</span><span class="truncated">k</span></td>
 				</tr>
 			</tfoot>
 		</table>
@@ -138,7 +135,7 @@ <h3>Service-level agreement for all cloud plans</h3>
 		</table>
 
 		<p id="fn1" class="right clearfix smaller">* Support for guests is limited to office hours, but can be upgraded to 24/7</p>
-		<p><a href="/management/contact-us">Contact us about Ubuntu Advantage &rsaquo;</a></p>
+		<p><a href="/management/contact-us">Contact us about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
 	</div>
 </div><!-- /.row -->
 
diff --git a/templates/cloud/openstack/index.html b/templates/cloud/openstack/index.html
new file mode 100755
index 00000000000..b06f3f0619e
--- /dev/null
+++ b/templates/cloud/openstack/index.html
@@ -0,0 +1,113 @@
+{% extends "cloud/base_cloud.html" %}
+
+{% block title %}OpenStack with Ubuntu | Cloud{% endblock %}
+
+{% block meta_description %}Ubuntu OpenStack is the fastest and best-supported route to creating an OpenStack cloud.{% endblock meta_description %}
+{% block meta_keywords %}IAAS, OpenStack, Ubuntu, Ubuntu Cloud Infrastructure, private cloud infrastructure, infrastructure as a service, open cloud, opencloud, open source cloud, open private cloud, open public cloud, open hybrid cloud, OpenStack private cloud, OpenStack public cloud, cloud architecture, cloud deployment, cloud in business, cloud in enterprise, cloud in finance, cloud in public sector, cloud in government{% endblock meta_keywords %}
+
+{% block extra_body_class %}cloud-tools-openstack-home{% endblock %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" page_title="OpenStack" tertiary="true" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row row-hero no-border">
+	<img src="{{ STATIC_URL }}img/cloud/ubuntu-openstack/image-ubuntuopenstack.svg" alt="" />
+	<div class="seven-col">
+		<h1>OpenStack</h1>
+		<p class="intro">Ubuntu is the world&rsquo;s most popular operating system for OpenStack. There’s no faster or more reliable way to build an enterprise&dash;scale cloud, from provisioning to deployment and management.</p>
+	</div>
+</div>
+
+<div class="row no-border strip-dark">
+	<div class="seven-col">
+		<h2>Why build your cloud on Ubuntu?</h2>
+		<ul class="list-ubuntu">
+			<li>A long history of integration and testing with OpenStack &dash; no other combination works as reliably at enterprise scale</li>
+			<li>A range of commercial support and management packages available</li>
+			<li>A thriving ecosystem of third party components</li>
+			<li>Full support for OpenStack for the duration of Ubuntu LTS support</li>
+		</ul>
+	</div>
+	<div class="five-col last-col box box-highlight resource resource-factsheet">
+		<h2>
+			<a href="http://insights.ubuntu.com/resources/factsheet/ubuntu-openstack-factsheet/">Ubuntu OpenStack&nbsp;&rsaquo;</a>
+		</h2>
+		<p>What makes up Ubuntu OpenStack? And how do all the parts fit together? Learn all about Ubuntu Server, MAAS, Juju and Landscape, as well as available support from Canonical in this quick guide.</p>
+		<p class="content-cat content-cat-factsheet">Factsheet</p>
+	</div>
+</div>
+
+<div class="row row-step step-one">
+	<div class="six-col prepend-one">
+		<h2><span class="step">1</span> Start with Ubuntu Server</h2>
+		<p>The first step in building a cloud with Ubuntu OpenStack is to download the latest LTS version of Ubuntu Server. LTS stands for long-term support and guarantees security and maintenance updates from Canonical for five years. It also includes all the latest kernel features, support for the latest hardware and the most up-to-date packages.</p>
+		<p>Once you have downloaded Ubuntu Server, you are ready to use MAAS to provision the hardware that will become your cloud.</p>
+		<p><a href="/download/server" class="">Download Ubuntu Server LTS&nbsp;&rsaquo;</a></p>
+	</div>
+	<div class="five-col last-col">
+		<img src="{{ STATIC_URL }}img/cloud/ubuntu-openstack/image-ubuntuserver.jpg" alt="" class="for-tablet" />
+	</div>
+</div>
+
+<div class="row row-step step-two">
+	<div class="six-col prepend-one">
+		<h2><span class="step">2</span> Provision your machines with MAAS</h2>
+		<p>Free with Ubuntu Server, MAAS (Metal-as-a-Service) transforms your machines into a cloud in minutes. No need to worry about arduous, time consuming configuration and provisioning. MAAS automates it all, eliminating the risk of human error – and it works with almost all conventional hardware.</p>
+		<p><a href="/cloud/tools/maas">Learn more about MAAS&nbsp;&rsaquo;</a></p>
+	</div>
+	<div class="five-col last-col">
+		<img src="{{ STATIC_URL }}img/cloud/ubuntu-openstack/image-maas.jpg" alt="" class="for-tablet" />
+	</div>
+</div>
+
+<div class="row row-step step-three">
+	<div class="six-col prepend-one">
+		<h2><span class="step">3</span> Configure OpenStack </h2>
+		<p>Once your hardware has been provisioned with the base Ubuntu OS, you can use Juju to deploy the latest version of OpenStack. The release schedules for Ubuntu and OpenStack are synchronised, so you always have access to the latest versions of both: currently Ubuntu 14.04 LTS and OpenStack Icehouse. The Ubuntu Cloud Archive provides links to current and older OpenStack releases, tested for compatibility with Ubuntu 14.04 LTS and Ubuntu 12.04 LTS. </p>
+		<p><a href="/cloud/tools/openstack/reference-architecture">See the Ubuntu OpenStack reference architecture&nbsp;&rsaquo;</a></p>
+	</div>
+	<div class="five-col last-col">
+		<img src="{{ STATIC_URL }}img/cloud/ubuntu-openstack/image-openstack.jpg" alt="" class="for-tablet" />
+	</div>
+</div>
+
+<div class="row row-step step-four">
+	<div class="six-col prepend-one">
+		<h2><span class="step">4</span> Deploy your workloads</h2>
+		<p>Once OpenStack is up and running, Juju can then be used to spin up practically any cloud service you need in just a few minutes &dash; either from your browser or the command line, whichever you prefer. You can even use it to deploy bundles of commonly-combined services in a single action. Nothing gets vital cloud services up and running faster. </p>
+		<p><a href="/cloud/tools/juju">Learn more about Juju&nbsp;&rsaquo;</a></p>
+	</div>
+	<div class="five-col last-col">
+		<img src="{{ STATIC_URL }}img/cloud/ubuntu-openstack/image-juju.jpg" alt="" class="for-tablet" />
+	</div>
+</div>
+
+<div class="row row-step step-five">
+	<div class="six-col prepend-one">
+		<h2><span class="step">5</span> Manage your cloud with Ubuntu Advantage</h2>
+		<p>The final stage before you go into production is to ensure you have adequate management and support in place. Canonical provides the ultimate cloud management package in the form of Ubuntu Advantage &dash; a subscription service that includes Landscape, the cloud admin system that makes managing thousands of nodes as easy as one. This is backed up with direct access to Canonical&rsquo;s cloud engineers and hands-on training for your cloud admin team.</p>
+		<p><a href="/cloud/management">Learn more about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
+	</div>
+	<div class="five-col last-col">
+		<img src="{{ STATIC_URL }}img/cloud/ubuntu-openstack/image-landscape.jpg" alt="" class="for-tablet" />
+	</div>
+</div>
+
+<div class="row no-border">
+	<h2>Build a test cloud with Canonical</h2>
+	<div class="eight-col">
+		<p>If you&rsquo;re considering a pilot of Ubuntu OpenStack, Canonical can help you plan and execute it, on your premises or in your data centre.</p>
+		<p>With Jumpstart Training, a Canonical engineer will deliver a preconfigured micro-cluster of servers to your office and provide two full days of technical training, covering Ubuntu, MAAS, Juju, Landscape, and OpenStack. They leave the micro-cluster with you for two weeks allowing your team time to:</p>
+		<ul class="list-canonical">
+			<li>Prototype your OpenStack experience in a private sandbox environment</li>
+			<li>Experiment with various storage alternatives, practice scaling services, and destroy and rebuild the environment repeatedly</li>
+			<li>Review your experience with a  Canonical engineer and discuss how your environment maps to these tools</li>
+		</ul>
+		<p><a href="/cloud/jumpstart-training">Learn more about Jumpstart Training&nbsp;&rsaquo;</a></p>
+	</div>
+	<div class="text-center four-col last-col"><img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-startfirst-midaubergine.svg" alt="" width="211" height="211" /></div>
+</div>
+
+{% endblock content %}
\ No newline at end of file
diff --git a/templates/cloud/openstack/reference-architecture.html b/templates/cloud/openstack/reference-architecture.html
new file mode 100755
index 00000000000..c0b45226459
--- /dev/null
+++ b/templates/cloud/openstack/reference-architecture.html
@@ -0,0 +1,195 @@
+{% extends "cloud/base_cloud.html" %}
+
+{% block title %}Cloud reference architecture | Cloud {% endblock %}
+{% block meta_description %}Ubuntu provides the reference architecture for the OpenStack project, the world’s leading open source cloud platform. Here is an overview of the architecture and outline of virtualisation options.{% endblock meta_description %}
+{% block meta_keywords %}Reference architecture, OpenStack, Ubuntu, Ubuntu Cloud Infrastructure, private cloud infrastructure, infrastructure as a service, open source, open cloud, open standards, virtualisation, hypervisor, KVM, Xen, LXC{% endblock meta_keywords %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" subsection_title="OpenStack" page_title="Reference architecture"  %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row row-hero">
+	<div class="eight-col">
+		<h1>Cloud reference architecture</h1>
+		<p>OpenStack is the leading open cloud platform. Ubuntu is the reference operating system for the OpenStack project, which is why deploying OpenStack with Ubuntu is the best way to ensure a straightforward implementation.</p>
+	</div><!-- /.eight-col -->
+</div>
+
+<div class="row">
+<div class="twelve-col">
+	<h2>OpenStack logical architecture</h2>
+</div>
+
+<div class="twelve-col">
+	<div class="tabbed-menu">
+		<ul class="no-bullets">
+			<li><a class="active slideless" href="#virtual-machines">Services virtualised <span class="clearfix">High availability</span></a></li>
+			<li><a class="slideless" href="#services-virtualised">Services virtualised <span class="clearfix">No high availability</span></a></li>
+			<li><a class="slideless" href="#physical-nodes-high">Services in physical nodes <span class="clearfix">High availability</span></a></li>
+			<li><a class="slideless" href="#physical-nodes">Services in physical nodes <span class="clearfix">No high availability</span></a></li>
+		</ul>
+	</div><!-- /.tabbed-menu -->
+
+	<div id="virtual-machines" class="tabbed-content box-grey twelve-col">
+		<a class="accordion-button slideless" href="/cloud/openstack/reference-architecture#virtual-machines" data-hash="virtual-machines">Services in virtual machines &mdash; high availability</a>
+		<div class="twelve-col no-margin-bottom">
+			<div class="virtual-machines-image-load" data-width="918" data-src="{{ STATIC_URL }}img/cloud/ubuntu-openstack/reference-architecture/image-servicesvmhigh{width}.png" data-alt=""></div>
+			<script>
+				new Imager('.virtual-machines-image-load', {
+					availableWidths: {
+						360: '-small',
+						918: '-medium'
+					}
+				});
+			</script>
+			<a class="for-mobile" href="{{ STATIC_URL }}img/cloud/ubuntu-openstack/reference-architecture/image-servicesvmhigh-medium.png" ><span>View a large 'Services in virtual machines' image</span></a>
+		</div><!-- /.twelve-col -->
+	</div><!-- /#virtual-machines -->
+
+	<div id="services-virtualised" class="tabbed-content services-virtualised box-grey hide twelve-col">
+		<a class="accordion-button slideless" href="/cloud/openstack/reference-architecture#services-virtualised" data-hash="services-virtualised">Services in virtual machines &mdash; no high availability</a>
+		<div class="twelve-col no-margin-bottom">
+			<div class="services-virtualised-image-load" data-width="918" data-src="{{ STATIC_URL }}img/cloud/ubuntu-openstack/reference-architecture/image-servicesvmnohigh{width}.png" data-alt=""></div>
+			<script>
+				new Imager('.services-virtualised-image-load', {
+					availableWidths: {
+						360: '-small',
+						918: '-medium'
+					}
+				});
+			</script>
+			<a class="for-mobile" href="{{ STATIC_URL }}img/cloud/ubuntu-openstack/reference-architecture/image-servicesvmnohigh-medium.png" ><span>View a large 'Services in virtual machines' image</span></a>
+		</div><!-- /.twelve-col -->
+	</div><!-- /#services-virtualised -->
+
+	<div id="physical-nodes" class="tabbed-content box-grey hide twelve-col">
+		<a class="accordion-button slideless" href="/cloud/openstack/reference-architecture#physical-nodes" data-hash="physical-nodes">Services in physical nodes &mdash; no high availability</a>
+		<div class="twelve-col no-margin-bottom">
+			<div class="physical-nodes-image-load" data-width="918" data-src="{{ STATIC_URL }}img/cloud/ubuntu-openstack/reference-architecture/image-servicespnnohigh{width}.png" data-alt=""></div>
+			<script>
+				new Imager('.physical-nodes-image-load', {
+					availableWidths: {
+						360: '-small',
+						918: '-medium'
+					}
+				});
+			</script>
+			<a class="for-mobile" href="{{ STATIC_URL }}img/cloud/ubuntu-openstack/reference-architecture/image-servicespnnohigh-medium.png" ><span>View a large 'Services in physical nodes' image</span></a>
+		</div><!-- /.twelve-col -->
+	</div><!-- /#physical-nodes -->
+
+	<div id="physical-nodes-high" class="tabbed-content box-grey hide twelve-col">
+		<a class="accordion-button slideless" href="/cloud/openstack/reference-architecture#physical-nodes-high" data-hash="physical-nodes-high">Services in physical nodes &mdash; high availability</a>
+		<div class="twelve-col no-margin-bottom">
+			<div class="physical-nodes-high-image-load" data-width="918" data-src="{{ STATIC_URL }}img/cloud/ubuntu-openstack/reference-architecture/image-servicespnhigh{width}.png" data-alt=""></div>
+			<script>
+				new Imager('.physical-nodes-high-image-load', {
+					availableWidths: {
+						360: '-small',
+						918: '-medium'
+					}
+				});
+			</script>
+			<a class="for-mobile" href="{{ STATIC_URL }}img/cloud/ubuntu-openstack/reference-architecture/image-servicespnhigh-medium.png" ><span>View a large 'Services in physical nodes' image</span></a>
+		</div><!-- /.twelve-col -->
+	</div><!-- /#physical-nodes-high -->
+</div><!-- /.twelve-col -->
+</div><!-- /row -->
+
+<div class="row">
+	<div class="four-col text-center">
+		<img src="{{ STATIC_URL }}img/cloud/ubuntu-openstack/reference-architecture/image-nova.svg" width="205" height="205" class="" alt="" />
+	</div>
+	<div class="eight-col last-col">
+		<h2>Compute</h2>
+		<p>The OpenStack Compute component (codenamed Nova) enables you to provision and manage large networks of virtual machines, creating a redundant and scalable cloud-computing platform. It gives you everything you need to run instances, manage networks and control access through users and projects. Like the rest of the Ubuntu operating system, it supports most standard hardware configurations and well-known hypervisors.</p>
+	</div><!-- /.eight-col -->
+</div><!-- /.row -->
+
+<div class="row">
+	<div class="eight-col">
+		<h2>Storage</h2>
+		<p>OpenStack Object Storage (codenamed Swift) creates redundant, scalable object storage using clusters of standardised storage servers. Rather than a file system or real-time data storage system, it provides a long-term storage system for more permanent, static data. Examples include virtual machine images, photo storage, email storage and backup archiving. Canonical’s recommended alternative to Swift is Ceph, which provides a more feature-rich experience, and covers both object and block storage (block storage is the component that provides “disks” to the virtual machine).</p>
+	</div><!-- /.eight-col -->
+	<div class="four-col text-center last-col"><img src="{{ STATIC_URL }}img/cloud/ubuntu-openstack/reference-architecture/image-swift.svg" width="205" height="205" class="" alt="" /></div>
+</div><!-- /.row -->
+
+<div class="row">
+	<div class="four-col text-center">
+		<img src="{{ STATIC_URL }}img/cloud/ubuntu-openstack/reference-architecture/image-glance.svg" width="205" height="205" class="" alt="" />
+	</div>
+	<div class="eight-col last-col">
+		<h2>Image service</h2>
+		<p>The OpenStack Image Service (codenamed Glance) provides discovery, registration and delivery services for virtual disk images. It includes a standard REST interface for identifying them in back-end stores such as OpenStack Object Storage, with new virtual disk images being registered via the Image Service. Administrators can also access information on publicly available disk images and use the client library for streaming virtual disk images.</p>
+
+		<p>A multi-format registry, the OpenStack Image Service allows uploads of private and public images in the following formats:</p>
+
+			<ul class="eight-col list-canonical smaller">
+				<li class="four-col">Raw</li>
+				<li class="four-col last-col">VHD (Hyper-V)</li>
+				<li class="four-col">VDI (VirtualBox)</li>
+				<li class="four-col last-col">qcow2 (Qemu/KVM)</li>
+				<li class="four-col">Machine (kernel/ramdisk outside of image, also known as AMI)</li>
+		</ul>
+	</div><!-- /.eight-col -->
+</div><!-- /.row -->
+
+<div class="row">
+	<div class="eight-col">
+		<h2>Authentication</h2>
+		<p>The OpenStack Authentication service (codenamed Keystone) provides identity, token, catalogue and policy services for use by OpenStack components. It provides a pluggable back-end that has been designed to support various protocols (e.g. Basic Auth, OAuth, OpenID, PKI) for authentication and authorisation, allowing clients to obtain security tokens to access different cloud services.</p>
+	</div><!-- /.eight-col -->
+	<div class="four-col text-center last-col">
+		<img src="{{ STATIC_URL }}img/cloud/ubuntu-openstack/reference-architecture/image-keystone.svg" width="205" height="205" class="" alt="" />
+	</div>
+</div><!-- /.row -->
+
+<div class="row">
+	<div class="four-col text-center">
+		<img src="{{ STATIC_URL }}img/cloud/ubuntu-openstack/reference-architecture/image-horizon.svg" width="205" height="205" class="" alt="" />
+	</div>
+	<div class="eight-col last-col">
+		<h2>Management</h2>
+		<p>The OpenStack management service or dashboard (codenamed Horizon) provides OpenStack users with a web-based user interface with which to control OpenStack’s component services (Nova, Swift, Keystone, Glance) and a single API with which to access them.</p>
+		<p>There are three central dashboards, covering the core OpenStack applications:</p>
+
+		<ul class="twelve-col list-canonical smaller">
+			<li class="four-col">A user dashboard</li>
+			<li class="four-col last-col">A system dashboard</li>
+			<li class="four-col">A settings dashboard</li>
+		</ul>
+
+		<p>The Horizon application also ships with a set of API abstractions for the core OpenStack projects, enabling developers to work on OpenStack without intimate knowledge of the APIs of every component.</p>
+	</div><!-- /.eight-col -->
+</div><!-- /.row -->
+
+<div class="row">
+	<h2>Virtualisation</h2>
+	<div class="eight-col">
+		<p>Ubuntu Server includes open-source hypervisors LXC and Xen, alongside its default option, KVM. All are supported as virtualisation options for Ubuntu OpenStack deployments.</p>
+		<p>Alternative hypervisors are compatible with OpenStack, however, allowing Ubuntu OpenStack to be deployed in custom configurations with almost any virtualisation technology. Supported options include:</p>
+		<ul class="eight-col list-canonical smaller clear">
+			<li class="four-col">KVM (Kernel-based Virtual Machine)</li>
+			<li class="four-col last-col">LXC (Linux Containers)</li>
+			<li class="four-col last-item">Xen*</li>
+			<li class="four-col last-col">VMWare ESX</li>
+		</ul>
+		<p>A complete list of the features that can be controlled through OpenStack, by hypervisor, is available on the <a href="http://wiki.openstack.org/HypervisorSupportMatrix">OpenStack Wiki</a>.</p>
+		<p class="smaller">* Requires the nova-compute service to be installed on DomU</p>
+	</div><!-- /.eight-col -->
+	<div class="four-col text-center last-col">
+		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-virtualisation-warmgrey.svg" width="205" height="205" alt="" />
+	</div>
+</div><!-- /.row -->
+
+<div class="row row-community row-image-centered no-border">
+	<span><img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-help-orange.svg" width="135" height="135" alt="" /></span>
+	<div class="eight-col">
+		<h2>Documentation and help</h2>
+		<p>The fastest and most accurate source of assistance on Ubuntu Cloud is the developer community responsible for the software. <a href="https://help.ubuntu.com/community/UbuntuCloudInfrastructure">You can get help from the Ubuntu community here</a>.</p>
+		<p>For technical documentation and further information on OpenStack, <a href="http://docs.openstack.org/">please visit the OpenStack documentation pages</a>.</p>
+	</div><!-- /.eight-col -->
+</div><!-- /.row -->
+{% endblock content %}
+{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/cloud/public-cloud.html b/templates/cloud/public-cloud.html
new file mode 100755
index 00000000000..58113f0d8ca
--- /dev/null
+++ b/templates/cloud/public-cloud.html
@@ -0,0 +1,146 @@
+{% extends "cloud/base_cloud.html" %}
+
+{% block title %}Public cloud | Cloud{% endblock %}
+
+{% block meta_description %}Ubuntu is the most popular guest OS on both public and private clouds, thanks to its security, versatility and continually updated features.{% endblock meta_description %}
+
+{% block meta_keywords %}Ubuntu OpenStack, Ubuntu, public cloud, Ubuntu guest OS, Ubuntu server,Amazon cloud, AWS, Rackspace cloud, HP cloud, Joyent cloud , IBM cloud, cloud workloads, guest certification, OpenStack{% endblock meta_keywords %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" subsection_title="Cloud tools" page_title="Use a cloud" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row-hero row-image-centered">
+	<div class="six-col">
+		<h1>Using Ubuntu in the public cloud</h1>
+		<p>Ubuntu Server is the world&rsquo;s most popular cloud operating system. On each of the leading public clouds, at least 85% of workloads run on Ubuntu, thanks to its security, versatility and policy of regular updates. With certified images available on clouds from partners like AWS, Microsoft Azure, HP Cloud, Joyent and IBM Smart Cloud, it is the only free cloud operating system with the option of enterprise-grade commercial support.</p>
+	</div>
+	<span>
+		<img src="{{ STATIC_URL }}img/cloud/public-cloud/image-publiccloud.svg" alt="Public Cloud" />
+	</span>
+</div>
+
+<div class="row strip-dark no-border">
+	<div class="seven-col">
+		<h2>Why use Ubuntu Server in the cloud?</h2>
+		<ul class="list-ubuntu">
+			<li>Proven for enterprise-scale workloads on all leading public clouds</li>
+			<li>Free from licence fees, regardless of how many images you run</li>
+			<li>Enterprise-grade support and management tools available direct from Canonical</li>
+			<li>Maintenance and security updates guaranteed for five years with Ubuntu LTS</li>
+		</ul>
+	</div>
+	<div class="five-col last-col box box-highlight resource resource-white-peper">
+		<h2>
+			<a href="http://insights.ubuntu.com/whitepaper/ubuntu-cloud-guest/">Ubuntu cloud guest&nbsp;&rsaquo;</a>
+		</h2>
+		<p>Answers to your most frequently asked questions about using Ubuntu as a cloud guest.</p>
+		<p class="content-cat content-cat-white-paper">White paper</p>
+	</div>
+</div>
+
+<div class="row">
+	<h2>Ubuntu Server on certified public clouds</h2>
+	<p>Using an Ubuntu partner cloud ensures access to the latest certified Ubuntu Server images.</p>
+	<p><a href="/cloud/ecosystem/ubuntu-public-cloud-programme">Learn more about Ubuntu’s cloud partners&nbsp;&rsaquo;</a></p>
+	<div class="ten-col push-one">
+		<ul class="inline-logos no-bullets">
+			<li><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-amazonwebservices.svg" alt="AWS" /></li>
+			<li><img src="{{ STATIC_URL }}img/cloud/partners/logo-brightbox-160.png" alt="Brightbox" /></li>
+			<li class="last-item"><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-hpcloud.svg" alt="HP cloud" /></li>
+			<li><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-joyent.svg" alt="Joyent" /></li>
+			<li><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-ibm.svg" alt="IBM" /></li>
+			<li class="last-item"><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-windowsazure.svg" alt="Azure" /></li>
+		</ul>
+	</div><!-- .ten-col -->
+</div><!-- /.row -->
+
+<div class="row row-grey row-services equal-height row-juju-advantage">
+	<div class="six-col">
+		<h2>Fast service deployment with&nbsp;Juju</h2>
+		<p>Juju is the fastest way to deploy and scale out your workloads. With Juju charm bundles, you can launch an entire cloud environment with one click - and with Quickstart you can spin up your Juju environment with just one command. Use them together and you can deploy your entire application infrastructure, all in one. </p>
+		<p><a href="/cloud/tools/juju">Learn more about Juju&nbsp;&rsaquo;</a></p>
+		<p><img class="pull-left-40" src="{{ STATIC_URL }}img/cloud/public-cloud/image-juju.jpg" alt="Grid of juju charm icons including wordpress, hadoop, django, MySQL, MongoDB and OpenStack" width="452" height="211" /></p>
+	</div><!-- /.six-col -->
+	<div class="six-col last-col">
+		<h2>The best management and&nbsp;support</h2>
+		<p>The Ubuntu Advantage support service has flexible Ubuntu cloud guest options. If you build your cloud on Ubuntu, a number of guest instances are supported for free, and this can be upgraded to cover more instances, more hours and higher entitlements. Thanks to Landscape, efficient management of those instances is only a few clicks away.</p>
+		<p><a href="/cloud/management">Learn more about support&nbsp;&rsaquo;</a></p>
+		<p><img class="pull-left-20" src="{{ STATIC_URL }}img/cloud/public-cloud/image-landscape.jpg" alt="Landscape managing 913 machines screenshot" width="502" height="266" /></p>
+	</div><!-- /.six-col -->
+</div><!-- /.row -->
+
+<div class="row">
+	<div class="five-col">
+		<h2>Developers&rsquo; favourite</h2>
+		<p>Ubuntu is the most popular Linux distribution for development and deployment. If your developers already use Ubuntu, moving to the cloud is even easier. </p>
+		<p><a href="/desktop/developers">Learn more about Ubuntu for developers&nbsp;&rsaquo;</a></p>
+	</div><!-- /.five-col -->
+	<div class="seven-col text-center last-col">
+		<img src="{{ STATIC_URL }}img/cloud/public-cloud/image-developersfavourite.jpg" alt="" />
+	</div>
+</div><!-- /.row -->
+
+<div class="row row-get-started no-border">
+	<div class="eight-col">
+		<h2>Ready to get started?</h2>
+		<p>Ubuntu Server 14.04 LTS is a free download that includes five years&rsquo; worth of  security and maintenance updates, guaranteed. To run Ubuntu cloud guest on participating public clouds, the simplest way is to use the image maintained on their server.</p>
+	</div><!-- /.eight-col -->
+	<ul class="equal-height no-bullets">
+		<li class="box four-col">
+			<a href="https://help.ubuntu.com/community/EC2StartersGuide">
+				<div>
+					<img class="logo-amazonwebservices" src="{{ STATIC_URL }}img/cloud/public-cloud/logo-amazonwebservices.png" alt="Amazon Web Services (EC2)" />
+				</div>
+				<p>The Ubuntu guide to EC2&nbsp;&rsaquo;</p>
+			</a>
+		</li>
+		<li class="box four-col">
+			<a href="http://brightbox.com">
+				<div>
+					<img src="{{ STATIC_URL }}img/cloud/partners/logo-brightbox-160.png" alt="Brightbox" />
+				</div>
+				<p>Get started on Brightbox&nbsp;&rsaquo;</p>
+			</a>
+		</li>
+		
+		
+		<li class="box four-col last-col">
+			<a href="https://community.hpcloud.com/article/getting-started-guide">
+			<div>
+				<img class="logo-hpcloud" src="{{ STATIC_URL }}img/cloud/public-cloud/logo-hpcloud.png" alt="HP Cloud" />
+			</div>
+			<p>Get started on HP Cloud&nbsp;&rsaquo;</p>
+			</a>
+		</li>
+		<li class="box four-col">
+			<a href="http://www.ibm.com/cloud-computing/social/us/en/startatrial/">
+			<div>
+				<img class="logo-rackspace" src="{{ STATIC_URL }}img/cloud/public-cloud/logo-ibm.png" alt="IBM SmartCloud" />
+			</div>
+			<p>Get started on IBM SmartCloud&nbsp;&rsaquo;</p>
+			</a>
+		</li>
+		<li class="box four-col">
+			<a href="http://www.windowsazure.com/en-us/documentation/services/virtual-machines/">
+				<div>
+					<img class="logo-windowsazure" src="{{ STATIC_URL }}img/cloud/public-cloud/logo-windowsazure.png" alt="Windows Azure" />
+				</div>
+			<p>Get started on Windows Azure&nbsp;&rsaquo;</p>
+			</a>
+		</li>
+		<li class="box four-col last-col">
+			<a href="http://www.joyent.com/free-trial">
+					<div>
+						<img class="logo-joyent" src="{{ STATIC_URL }}img/cloud/public-cloud/logo-joyent.png" alt="Joyent" />
+					</div>
+					<p>Get started on Joyent&nbsp;&rsaquo;</p>
+			</a>
+		</li>
+	</ul>
+	<div class="eight-col">
+	<p>If you want to modify the standard images, or if you want to use an image on your private cloud, you can also get a detailed list of images and <a href="http://cloud-images.ubuntu.com/">download a specific image</a>.</p>
+	</div>
+</div><!-- /.row -->
+{% endblock content %}
\ No newline at end of file
diff --git a/templates/cloud/shared/_contact-box.html b/templates/cloud/shared/_contact-box.html
old mode 100644
new mode 100755
index 2cbf560761e..9c8dbe079f5
--- a/templates/cloud/shared/_contact-box.html
+++ b/templates/cloud/shared/_contact-box.html
@@ -4,6 +4,6 @@
 			{% if title %}<h3>{{ title }}</h3>{% endif %}
 			{% if desc %}<p>{{ desc }}</p>{% endif %}
 			{% if desc_extra %}<p>{{ desc_extra }}</p>{% endif %}
-			{% if link %}<p><a href="{{ link }}" class="link-cta-canonical">{{ link_text }}</a></p>{% endif %}
+			{% if link %}<p><a href="{{ link }}" class="link-cta-ubuntu">{{ link_text }}</a></p>{% endif %}
 		</div>
 	</div>
\ No newline at end of file
diff --git a/templates/cloud/shared/_contextual_footer.html b/templates/cloud/shared/_contextual_footer.html
old mode 100644
new mode 100755
index d121110e230..7c324993d61
--- a/templates/cloud/shared/_contextual_footer.html
+++ b/templates/cloud/shared/_contextual_footer.html
@@ -1,64 +1,62 @@
 {% if level_2 == 'tools' and not level_3 %}
-	<div class="feature-two three-col">
+	<div class="feature-two four-col">
         <h3>Experience Juju</h3>
         <p>Access the demo to experience how easy it is to manage services in the cloud.</p>
 		<p><a href="https://jujucharms.com/sidebar/">Try the Juju demo&nbsp;&rsaquo;</a></p>
-{% endif %}{% if level_3 == 'juju' %}
-	<div class="feature-two three-col">
+{% endif %}{% if level_3 == 'juju' or level_3 == 'jumpstart-training' or level_3 == 'bootstack' %}
+	<div class="feature-two four-col">
         <h3>Experience Juju</h3>
         <p>Access 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://jujucharms.com/sidebar/">Try the Juju demo&nbsp;&rsaquo;</a></p>
 {% endif %}{% if level_3 == 'maas' %}
-	<div class="feature-two three-col picto-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 == 'jumpstart' %}
-	<div class="feature-two three-col">
-		<h3>Ubuntu Openstack Jumpstart</h3>
-		<p>A private cloud in 5 days. With an on-site Canonical engineer to get it done. </p>
-		<p><a class="link-cta-ubuntu" href="/cloud/tools/jumpstart/contact-us">Get in touch</a></p>
-{% endif %}{% if level_2 != 'use-a-cloud' and level_2 != 'tools' and level_3 != 'juju' and level_3 != 'maas' and level_3 != 'jumpstart' or level_3 == 'openstack' %}
-	<div class="feature-two three-col">
+{% endif %}{% if level_2 != 'use-a-cloud' and level_2 != 'tools' and level_3 != 'juju' and level_3 != 'maas' and level_3 != 'jumpstart-training' or level_3 == 'openstack' %}
+	<div class="feature-two four-col">
 		<h3>Download Ubuntu OpenStack</h3>
 	    <p>Ubuntu OpenStack cloud computing puts you in control of your IT infrastructure. It helps you optimise resources and reduce costs while you access computing power as and when you need it.</p>
 		<p><a href="/download/cloud" class="link-cta-ubuntu">Download now</a></p>
 {% endif %}{% if level_2 == 'use-a-cloud'  %}
-	<div class="feature-two three-col">
+	<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 %}
 	</div><!-- /.feature-two -->
-	
+
 {% if level_2 == 'use-a-cloud' or level_3 == 'maas' %}
-	<div class="feature-three three-col">
+	<div class="feature-three four-col">
 		<h3>Download Ubuntu Openstack</h3>
 	    <p>Ubuntu Openstack cloud computing puts you in control of your IT infrastructure. It helps you optimise resources and reduce costs while you access computing power as and when you need it.</p>
 		<p><a href="/download/cloud" class="link-cta-ubuntu">Download now</a></p>
-{% endif %}{% if level_2 == 'tools' and not level_3 %}
-	<div class="feature-three three-col picto-maas">
+{% endif %}{% if level_3 == 'jumpstart-training' or level_3 == 'bootstack' or level_2 == 'tools' and  level_3 != 'maas' and level_3 != 'juju' %}
+	<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 three-col picto">
+	<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' or level_3 == 'jumpstart' %}
-	<div class="feature-three three-col">
+{% 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_3 == 'openstack' or level_3 == 'ubuntu-oil' %}
-	<div class="feature-three three-col picto">	
-		<h3>Talk to us about your cloud plans today</h3>
-		<p>Whatever stage your cloud plans are at right now, the cloud experts at Canonical can help you take the next steps.</p>
-		<p><a href="/cloud/contact-us">Contact us today&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' %}
+	<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 three-col last-col">
+	<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/cloud/shared/_further_reading_links.html b/templates/cloud/shared/_further_reading_links.html
old mode 100644
new mode 100755
index 7814348098a..a06558ed665
--- a/templates/cloud/shared/_further_reading_links.html
+++ b/templates/cloud/shared/_further_reading_links.html
@@ -5,7 +5,7 @@
 	<div id="insights-footer-feed"></div>
 	<script>
 		var feedcontainer2=document.getElementById("insights-footer-feed")
-		var feedurl2=document.location.protocol+"//insights.ubuntu.com/products-and-services/cloud/feed/"
+		var feedurl2=document.location.protocol+"//insights.ubuntu.com/topic/cloud/feed/"
 		var feedlimit2=4
 		var rssoutput="<ul class='no-bullets smaller'>"
 			function rssfeedsetup2(){
@@ -23,10 +23,10 @@
 						feedcontainer2.innerHTML=rssoutput
 				}
 				else
-					alert("")
+					alert("oops")
 				}
 				
 				window.onload=function(){
 				rssfeedsetup2()
 				}
-	</script>
+	</script>
\ No newline at end of file
diff --git a/templates/cloud/shared/_juju-promo.html b/templates/cloud/shared/_juju-promo.html
old mode 100644
new mode 100755
index 92f7047f503..3b29b829e37
--- a/templates/cloud/shared/_juju-promo.html
+++ b/templates/cloud/shared/_juju-promo.html
@@ -4,7 +4,7 @@ <h2>Instant cloud solutions</h2>
 		<p>Build, integrate and scale services on any cloud in seconds. Try it, use it, share your work and enter our $10,000 contest.</p>
 		<p>
 			<a href="https://juju.ubuntu.com/charm-championship/" class="link-cta-ubuntu" onclick="_gaq.push(['_trackEvent', 'External Link', 'Charm Championships takeover', 'From Cloud homepage Enter the contest link']);">Enter the contest<span class="accessibility-aid"> about the Charm championships</span></a>
-			<a onclick="_gaq.push(['_trackEvent', 'External Link', 'Charm Championships takeover', 'From Cloud homepage Try Juju today link']);" href="http://www.ubuntu.com/cloud/tools/juju">Try Juju today &rsaquo;</a>
+			<a onclick="_gaq.push(['_trackEvent', 'External Link', 'Charm Championships takeover', 'From Cloud homepage Try Juju today link']);" href="http://www.ubuntu.com/cloud/tools/juju">Try Juju today&nbsp;&rsaquo;</a>
 		</p>
 	</div>
 </div><!-- /.row -->
diff --git a/templates/cloud/shared/_jumpstart-contact.html b/templates/cloud/shared/_jumpstart-contact.html
old mode 100644
new mode 100755
index 1f17f48626f..59f746e13ea
--- a/templates/cloud/shared/_jumpstart-contact.html
+++ b/templates/cloud/shared/_jumpstart-contact.html
@@ -7,6 +7,6 @@ <h2>Ubuntu Cloud Jumpstart</h2>
 			</div><!-- /.box-cloud-contact-header -->
 			{% if desc_extra %}<p>{{ desc_extra }}</p>{% endif %}
 			<p>Compatible with the Rackspace, HP and Amazon public clouds, Jumpstart <strong>costs only $9,000</strong> and is guaranteed to take just five days.</p>
-			<p class="three-col"><a class="link-cta-canonical" href="/cloud/solutions/jumpstart">Go to Jumpstart</a></p>
+			<p class="three-col"><a class="link-cta-ubuntu" href="/cloud/solutions/jumpstart">Go to Jumpstart</a></p>
 		</div>
 	</div><!-- /.row -->
diff --git a/templates/cloud/shared/_try-cloud.html b/templates/cloud/shared/_try-cloud.html
old mode 100644
new mode 100755
index fa4d77982ff..5cb1662f046
--- a/templates/cloud/shared/_try-cloud.html
+++ b/templates/cloud/shared/_try-cloud.html
@@ -1,8 +1,8 @@
 		<div class="box box-grey box-cloud-contact box-try-cloud-guest clearfix">
 			<div class="two-col"><img src="{{ STATIC_URL }}img/pictograms/pictogram-virtualise-135x135.png" alt="HP logo" width="127" height="127" /></div>
 			<div class="ten-col last-col">
-				<h3>Try Ubuntu Cloud Guest on Amazon EC2, for free</h3>
+				<h3>Try Ubuntu cloud guest on Amazon EC2, for free</h3>
 				<p>Right now, you can try the latest Ubuntu Cloud Guest images on Amazon EC2, free for one hour. Canonical will take care of the registration, set up your Cloud Guest and provide some pre-configured applications to choose from. All you need to do is find an hour to spare.</p>
-				<p class="last"><a class="link-cta-canonical" href="https://try.cloud.ubuntu.com/" title="Try Ubuntu Cloud Guest">Try it now</a></p>
+				<p class="last"><a class="link-cta-ubuntu" href="https://try.cloud.ubuntu.com/" title="Try Ubuntu Cloud Guest">Try it now</a></p>
 			</div>
 		</div><!-- /.box box-cloud-contact -->
\ No newline at end of file
diff --git a/templates/cloud/thank-you.html b/templates/cloud/thank-you.html
old mode 100644
new mode 100755
index 3fe651b4760..0e431c0ffc8
--- a/templates/cloud/thank-you.html
+++ b/templates/cloud/thank-you.html
@@ -7,32 +7,7 @@
 {% endblock second_level_nav_items %}
 
 {% block content %}
-<div class="row row-hero">
-	<h1>Thank you for enquiring about Cloud</h1>
-	<h2>A member of our team will be in touch within <br><strong>one working day</strong></h2>
-</div><!-- /.row-hero -->
-	
-<div class="row equal-height no-border">
-	<h3>More about our enterprise services</h3>
-	<ul id="thank-you-extra" class="no-bullets">
-		<li class="advantage four-col first">
-			<h4>Ubuntu Advantage</h4>
-			<p>Purchase our desktop support and access Ubuntu experts whenever you need.</p>
-			<p><a href="/cloud/management">Learn about Ubuntu Advantage &rsaquo;</a></p>
-		</li>
-		<li class="cloud four-col">
-			<h4>Cloud Jumpstart</h4>
-			<p>Let a Canonical engineer build a seed cloud on your premises in just five days.</p>
-			<p><a href="/cloud/private-cloud/jumpstart">Learn about Cloud Jumpstart &rsaquo;</a></p>
-		</li>
-		<li class="jumpstart four-col last-col">
-			<h4>Landscape</h4>
-			<p>Manage Ubuntu in the enterprise with our private cloud infrastructure platform based on OpenStack.</p>
-			<p><a href="/management">Learn about Landscape &rsaquo;</a></p>
-		</li>
-	</ul>
-</div><!-- end row-->
-
+{% include "shared/_thank_you.html" with thanks_context="enquiring about Cloud" %}
 {% include "shared/_live_chat.html" %}
 	
 {% endblock content %}
diff --git a/templates/cloud/tools/cloud-installer.html b/templates/cloud/tools/cloud-installer.html
old mode 100644
new mode 100755
diff --git a/templates/cloud/tools/index.html b/templates/cloud/tools/index.html
old mode 100644
new mode 100755
index 08e541ff0e3..6402d5423cf
--- a/templates/cloud/tools/index.html
+++ b/templates/cloud/tools/index.html
@@ -11,54 +11,59 @@
 {% endblock second_level_nav_items %}
 
 {% block content %}
-<div class="row row-image-centered">
+<div class="row row-hero">
 	<div class="seven-col">
 		<h1>Cloud tools</h1>
-		<p class="intro">You want to minimise the time to get your cloud infrastructure up and running and start offering your services to customers. We have the tools to get you there.</p>
+		<p class="intro">Want to minimise the time to get your cloud infrastructure up and running and start offering your services to customers? We have the tools to get you there.</p>
 	</div><!-- /.seven-col -->
-	<span><img src="{{ STATIC_URL }}img/pictograms/pictogram-cloud-tools-288x187.png" alt="pictogram-cloud-tools-288x187" width="288" height="187" /></span>
+	<div class="text-center five-col last-col">
+		<img src="{{ STATIC_URL }}img/cloud/tools/image-cloudtools.svg" alt="" width="288" height="186" />
+	</div>
 </div><!-- /.row -->
 
 <div class="row row-juju">
-	<span><img src="{{ STATIC_URL }}img/cloud/image-juju.png" alt="image-juju" width="984" height="323" /></span>
-
+	<span>
+		<div class="orchestration-image-load" data-width="984" data-src="{{ STATIC_URL }}img/cloud/tools/image-jujucharms{width}.png" data-alt=""></div>
+		<script>
+		    new Imager('.orchestration-image-load', {
+		        availableWidths: {
+		        	360: '-small',
+		            767: '-medium',
+		            900: '-large'
+		        }
+		    });
+		</script>
+	</span>
 	<div class="six-col prepend-six last-col">
 		<h2>Orchestration with Juju</h2>
 		<p>Juju is the game-changing service orchestration tool that&rsquo;s the fastest way to deploy OpenStack on Ubuntu. Its libraries of &lsquo;charms&rsquo; make it simple to deploy, configure and scale out cloud services with only a few simple commands.</p>
-		<p><a href="/cloud/tools/juju">Read more about Juju &rsaquo;</a></p>
+		<p><a href="/cloud/tools/juju">Read more about Juju&nbsp;&rsaquo;</a></p>
 	</div><!-- /.six-col -->
 </div><!-- /.row -->
 
-<div class="row row-image-centered">
+<div class="row">
 	<div class="six-col">
 		<h2>Provisioning with MAAS</h2>
 		<p>MAAS is the bare-metal provisioning tool that turns your hardware environment into a cloud in minutes. It takes the pain out of detection and configuration and gets your servers ready for Juju.</p>
 		<p><a href="/cloud/tools/maas">Read more about MAAS&nbsp;&rsaquo;</a></p>
 	</div><!-- /.six-col -->
-	<span><img src="{{ STATIC_URL }}img/cloud/image-maas.png" alt="image-maas" width="426" height="211" /></span>
+	<div class="six-col last-col text-center">
+		<img src="{{ STATIC_URL }}img/cloud/image-maas.png" alt="image-maas" width="426" height="211" />
+	</div>
 </div><!-- /.row -->
 
-<div class="row row-image-centered row-grey">
-	<span><img src="{{ STATIC_URL }}img/cloud/image-openstack.png" alt="image-openstack" width="200" height="202" /></span>
-	<div class="eight-col last-col">
-		<h2>OpenStack</h2>
-		<p>OpenStack is the world&rsquo;s leading open-source cloud platform, developed by NASA using Ubuntu. It provides everything from compute, storage and network components to a management dashboard and a fully integrated usage-metering engine.</p>
-		<p><a href="/cloud/tools/openstack">Read more about OpenStack &rsaquo;</a></p>
-	</div><!-- /.six-col -->
-</div><!-- /.row -->
 
-<div class="row row-computers-selected">
+<div class="row row-computers-selected no-border">
+	<div class="six-col last-col priority-0 computers-selected">
+		<p>25<span>computers selected</span></p>
+	</div>
 	<div class="six-col">
-		<h2>Landscape</h2>
-		<p>Landscape is where the power of Ubuntu OpenStack really comes together. It allows you to monitor your cloud environment, manage updates, and produce timely and accurate compliance reports. The rich, web-based GUI gives you an instant overview of everything going on in your cloud, from hardware to workloads.</p>
-		<p><a href="/cloud/management">Read more about Landscape &rsaquo;</a></p>
+		<h2>Deploy, monitor and manage your cloud with Landscape</h2>
+		<p>Landscape is where the power of Ubuntu OpenStack really comes together. It allows you to build your cloud in minutes, then monitor it, manage it and produce timely and accurate compliance reports. The rich, web-based GUI gives you an instant overview of everything going on in your cloud, from hardware to workloads. </p>
+		<p><a href="/cloud/management">Read more about Landscape&nbsp;&rsaquo;</a></p>
 	</div><!-- /.six-col -->
-	<div class="six-col last-col computers-selected">
-		<p>25 <span>computers selected</span></p>
-	</div>
 </div><!-- /.row -->
 
-
 {% comment %}
 <div class="row">
 	<div class="six-col">
@@ -68,13 +73,5 @@ <h2>Cloud installer</h2>
 	</div><!-- /.six-col -->
 </div><!-- /.row -->
 {% endcomment %}
-<div class="row row-image-centered no-border">
-	<div class="eight-col">
-		<h2>Jumpstart</h2>
-		<p>Jumpstart is a fast, low-risk way to plan and build a public or private cloud. For only $9,000, an on-site Canonical engineer will get your cloud fully up and running in five days. Let us do the hard work for you.
-</p>
-		<p><a href="/cloud/tools/jumpstart">Read more about Jumpstart&nbsp;&rsaquo;</a></p>
-	</div><!-- /.six-col -->
-	<span><img src="{{ STATIC_URL }}img/cloud/image-jumpstart.png" alt="image-jumpstart" width="211" height="211" /></span>
-</div><!-- /.row -->
+
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/cloud/tools/juju.html b/templates/cloud/tools/juju.html
old mode 100644
new mode 100755
index 2fa703b27e9..1cbe6f6137e
--- a/templates/cloud/tools/juju.html
+++ b/templates/cloud/tools/juju.html
@@ -13,7 +13,7 @@
 <div class="row row-hero">
 	<div class="five-col">
 		<h1 class="accessibility-aid">Juju</h1>
-		<img src="{{ STATIC_URL }}img/logos/logo-juju-130.png" width="130" height="54" alt="Juju" />
+		<img src="{{ STATIC_URL }}img/cloud/tools/juju/logo-juju.svg" width="131" height="54" alt="Juju" />
 		<h2>Service orchestration made simple</h2>
 		<p>Juju is the game-changing service orchestration tool that lets you build entire cloud environments with only a few commands. Whether you want to deploy OpenStack itself, a workload on public or private clouds, or even directly on bare metal using <a href="/cloud/tools/maas">MAAS</a>, Juju is the fastest and simplest solution.</p>
 		<p><a href="https://jujucharms.com/sidebar/" class="link-cta-ubuntu">Test-drive the Juju GUI</a></p>
@@ -22,11 +22,13 @@ <h2>Service orchestration made simple</h2>
 
 <div class="row">
 	<div class="eight-col">
-		<iframe width="560" height="315" src="//www.youtube.com/embed/Lt9-a6pDxsA?list=UUJ65UG_WgFa_O_odbiBWZoA" frameborder="0" allowfullscreen></iframe>	
+		<div class="video-container">
+			<iframe width="560" height="315" src="//www.youtube.com/embed/Lt9-a6pDxsA?list=UUJ65UG_WgFa_O_odbiBWZoA" frameborder="0" allowfullscreen></iframe>
+		</div>
 	</div>
 	<div class="four-col last-col">
 		<h2>Inside Juju</h2>
-		<p>Juju encapsulates all the goodness of an application in a charm. So you get the best practice in deploying that service, right at your fingertips.</p>	
+		<p>Juju encapsulates all the goodness of an application in a charm. So you get the best practice in deploying that service, right at your fingertips.</p>
 	</div>
 </div><!-- /.row -->
 
@@ -43,17 +45,21 @@ <h2><a href="http://insights.ubuntu.com/resources/factsheet/top-12-questions-abo
 	</div>
 </div><!-- /.row -->
 
-<div class="row row-one-stop-shop vertical-divider">
+<div class="row row-one-stop-shop">
+	<div class="one-stop-shop-image-load" data-width="900" data-src="{{ STATIC_URL }}img/cloud/tools/juju/image-jujucharms{width}.jpg" data-alt=""></div>
+	<script>
+	    new Imager('.one-stop-shop-image-load', {
+	        availableWidths: {
+	            900: '-medium',
+	            320: '-small'
+	        }
+	    });
+	</script>
 	<div class="seven-col">
 		<h2>A one-stop shop</h2>
 		<p>With 100 charms and growing, the Juju charm store is your future destination for cloud-based enterprise applications. From back-end services such as Hadoop or MongoDB to enterprise applications such as OpenERP, whatever you need, there&rsquo;s a charm for that.</p>
 		<p><a href="https://jujucharms.com">Browse charms&nbsp;&rsaquo;</a></p>
 	</div>
-	<div class="five-col last-col">
-		<h2>Charm Championship</h2>
-		<p>You can save money with Juju, and now make money too. The most innovative charms will win $10,000.</p>
-		<p><a href="https://github.com/juju/charm-championship">How to enter&nbsp;&rsaquo;</a></p>
-	</div>
 </div>
 
 <div class="row no-border no-margin-bottom row-image-centered">
@@ -68,7 +74,8 @@ <h2>Connect</h2>
 
 <div class="row no-padding-bottom row-config-scale">
 	<div class="four-col no-margin-bottom touch-border">
-		<img src="{{ STATIC_URL }}img/cloud/cloud-juju-inspector.jpg" width="290" height="618" class="left pull-left-40" alt="Juju GUI inspector" />
+		<img src="{{ STATIC_URL }}img/cloud/tools/juju/image-jujuinspector-small.jpg" width="290" height="274" class="for-mobile" alt="Juju GUI inspector" />
+		<img src="{{ STATIC_URL }}img/cloud/tools/juju/image-jujuinspector-medium.jpg" width="290" height="618" class="priority-0 left" alt="Juju GUI inspector" />
 	</div><!-- /.four-col -->
 	<div class="eight-col last-col">
 		<h2>Configure</h2>
@@ -83,12 +90,14 @@ <h2>Scale out</h2>
 	</div><!-- /.four-col -->
 </div><!-- /.row -->
 
-<div class="row row-image-centered no-border row-join-the-fun">
-	<span><img src="{{ STATIC_URL }}img/cloud/cloud-juju-make-a-charm.png" width="180" height="180" alt="" /></span>
+<div class="row no-border row-join-the-fun">
+	<div class="three-col text-center">
+		<img src="{{ STATIC_URL }}img/cloud/cloud-juju-make-a-charm.png" width="180" height="180" alt="" />
+	</div>
 	<div class="nine-col last-col">
 		<h2>Can&rsquo;t get enough Juju?</h2>
 		<p>Juju is so amazing, we have a whole website dedicated to it. Whether you&rsquo;re interested in learning more about Juju, downloading and using it, or writing your own charms, this is the place for you!</p>
-		<p><a href="https://juju.ubuntu.com/">Learn more about Juju at juju.ubuntu.com &rsaquo;</a></p>
+		<p><a href="https://juju.ubuntu.com/">Learn more about Juju at juju.ubuntu.com&nbsp;&rsaquo;</a></p>
 	</div>
 </div><!-- /.row -->
 {% endblock content %}
diff --git a/templates/cloud/tools/jumpstart/contact-us.html b/templates/cloud/tools/jumpstart/contact-us.html
deleted file mode 100644
index a647552461a..00000000000
--- a/templates/cloud/tools/jumpstart/contact-us.html
+++ /dev/null
@@ -1,160 +0,0 @@
-{% extends "cloud/base_cloud.html" %}
-
-{% block title %}Contact us | Ubuntu Jumpstart{% endblock %}
-{% 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 second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" subsection_title="Cloud tools" subsubsection_title="Jumpstart" page_title="Contact us" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero">
-	<div class="twelve-col clearfix">
-		<h1>Ubuntu Jumpstart</h1>
-		<h2>Get started immediately with Ubuntu OpenStack for $9,000</h2>
-		<p class="eight-col">Ubuntu Jumpstart comprises five days of on-site Professional Services, delivered by an experienced Canonical Services Engineer, during which you will:</p>
-	</div>
-	<ul class="twelve-col no-bullets list-jumpstart vertical-divider equal-height">
-		<li class="three-col">
-			<h3>
-				<img src="{{ STATIC_URL }}img/cloud/jumpstart-plan.png" width="32" height="32" alt="" /> 
-				Plan and install
-			</h3>
-			<p>Deploy Ubuntu cloud infrastructure on your hardware with support from our engineers; make all the critical choices.</p>
-		</li>
-		<li class="three-col">
-			<h3>
-				<img src="{{ STATIC_URL }}img/cloud/jumpstart-train.png" width="32" height="32" alt="" />
-				Train
-			</h3>
-			<p>Transfer knowledge on making best use of Ubuntu Cloud Guest, the Ubuntu offering tuned specifically to run in public or private clouds.</p>
-		</li>
-		<li class="three-col">
-			<h3>
-				<img src="{{ STATIC_URL }}img/cloud/jumpstart-deploy.png" width="32" height="32" alt="" />
-				Deploy
-			</h3>
-			<p>Learn about Juju, our ground-breaking service management tool, and conjure up charms for your key demonstration and prototype services.</p>
-		</li>
-		<li class="three-col last-col">
-			<h3>
-				<img src="{{ STATIC_URL }}img/cloud/jumpstart-manage.png" width="32" height="32" alt="" />
-				Manage
-			</h3>
-			<p>Understand the Landscape systems monitoring and management tool to keep your cloud infrastructure running smoothly.</p>
-		</li>
-	</ul>
-</div><!-- /.row -->
-	
-<div class="row no-border">
-	<div class="eight-col">
-		<p>Your cloud will run industry-standard software and be compatible with the major public clouds from HP, Rackspace and Amazon. You provide the hardware, we guarantee your cloud result.</p>
-		
-<form class="lpeRegForm formNotEmpty" method="post" enctype="application/x-www-form-urlencoded" action="https://app-g.marketo.com/index.php/leadCapture/save" id="mktForm_1032" name="mktForm_1032">
-				<fieldset class="fieldset-1">
-					<h3>About you</h3>
-					<ul class="mktLblLeft">
-						<li class='mktFormReq mktField'><label>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>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>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>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>Country:</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Country" id="Country" size='1'  tabIndex='5'><option value='Select country:' 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&#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&#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>State:</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="State" id="State" size='1'  tabIndex='6'><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>
-					</ul>
-				</fieldset>
-				<fieldset class="fieldset-2">
-					<h3>About your role</h3>
-					<ul class="mktLblLeft">
-						<li class='mktFormReq mktField'><label>Job role:</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Job_Role__c" id="Job_Role__c" size='1'  tabIndex='7'><option value='' 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>
-					</ul>
-				</fieldset>
-				<fieldset class="fieldset-3">				
-					<h3>About your company</h3>
-					<ul class="mktLblLeft">
-						<li class='mktFormReq mktField'><label>Company name:</label><span class='mktInput'><input class='mktFormText mktFormString mktFReq' name="Company" id="Company" type='text' value=""  maxlength='255' tabIndex='8' /><span class='mktFormMsg'></span></span></li>
-						<li class='mktField'><label>Industry:</label><span class='mktInput'><select class='mktFormSelect' name="Industry" id="Industry" size='1'  tabIndex='9'><option value='' 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 &mdash; media/music/broadcast'>Entertainment &mdash; 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 &mdash; Computer Hardware'>Manufacturer &mdash; Computer Hardware</option><option value='Manufacturer &mdash; Device/ Handset'>Manufacturer &mdash; Device/ Handset</option><option value='Manufacturer &mdash; Other'>Manufacturer &mdash; Other</option><option value='Marketing, PR &amp; Advertising'>Marketing, PR &amp; Advertising</option><option value='Media &mdash; publishing or news'>Media &mdash; publishing or news</option><option value='Oil &amp; Gas'>Oil &amp; Gas</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='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>
-					</ul>
-				</fieldset>	
-				<fieldset class="fieldset-4">				
-					<h3>IT and your organisation</h3>
-					<ul class="mktLblLeft">
-						<li class='mktFormReq mktField'><label>How do you currently use Ubuntu?</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Ubuntu_User__c" id="Ubuntu_User__c" size='1'  tabIndex='10'><option value='' 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>Why are you interested in cloud?</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Why_Cloud__c" id="Why_Cloud__c" size='1'  tabIndex='11'><option value='' selected='selected'>Please select:</option><option value='Increasing revenues'>Increasing revenues</option><option value='Minimising operational expenditure'>Minimising operational expenditure</option><option value='Optimising efficiency'>Optimising efficiency</option><option value='Handling spikes in traffic'>Handling spikes in traffic</option><option value='Technical'>Technical</option><option value='Other'>Other</option></select><span class='mktFormMsg'></span></span></li>
-						<li class='mktFormReq mktField'><label>How soon do you plan to deploy your cloud solution?</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Project_Timeframe__c" id="Project_Timeframe__c" size='1'  tabIndex='12'><option value='' selected='selected'>Please select:</option><option value='Less than 3 months'>Less than 3 months</option><option value='3-6 months'>3-6 months</option><option value='6-12 months'>6-12 months</option><option value='No specific dates'>No specific dates</option></select><span class='mktFormMsg'></span></span></li>
-						<li class='mktFormReq mktField'><label>Do you currently use a public cloud or have a private cloud?</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Has_Cloud__c" id="Has_Cloud__c" size='1'  tabIndex='13'><option value='' selected='selected'>Please select:</option><option value='I have a public cloud (e.g. Amazon Web Service (AWS) or Rackspace)'>I have a public cloud (e.g. Amazon Web Service (AWS) or Rackspace)</option><option value='I have a private cloud'>I have a private cloud</option><option value='I have a public and private cloud'>I have a public and private cloud</option><option value='I have none of the above'>I have none of the above</option></select><span class='mktFormMsg'></span></span></li>
-						<li class='mktFormReq mktField'><label>Do you intend to allocate at least five servers for this Jumpstart project?</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Allocate_Project_Resources__c" id="Allocate_Project_Resources__c" size='1'  tabIndex='14'><option value='' selected='selected'>Please select:</option><option value='Yes'>Yes</option><option value='No'>No</option></select><span class='mktFormMsg'></span></span></li>
-					</ul>
-				</fieldset>
-				<fieldset class="fieldset-5">				
-					<h3>Additional comments or questions</h3>
-					<ul class="mktLblLeft">
-						<li class='mktField'><span class='mktInput'><textarea class='mktFormTextarea mktFormTextarea' name="Comments_from_lead__c" id="Comments_from_lead__c" cols='20' rows='6' tabIndex='15'></textarea><span class='mktFormMsg'></span></span></li>
-					</ul>
-				</fieldset>
-				<fieldset class="fieldset-submit">
-					<ul class="mktLblLeft">
-						<li class="mktField mktLblRight"><span class="mktInput mktLblRight"><input class="mktFormCheckbox" name="NewsletterOpt-In" id="NewsletterOpt-In" type="checkbox" value="1" tabindex="16"><label for="NewsletterOpt-In">I would like to receive occasional news from Canonical by email.</label>&nbsp;<span class="mktFormMsg"></span></span></li>
-						<li>All information provided will be handled in accordance with the Canonical <a href="http://www.ubuntu.com/legal" target="_blank">privacy policy</a>.</li>
-						<li id="mktFrmButtons"><!--<label>&nbsp;</label>--><input id="mktFrmSubmit" type="submit" value="Submit" name="submitButton" onclick="formSubmit(document.getElementById(&quot;mktForm_1032&quot;)); return false;">&nbsp;<input style="display: none;" id="mktFrmReset" type="reset" value="Clear" name="resetButton" onclick="formReset(document.getElementById(&quot;mktForm_1032&quot;)); return false;"></li>     
-					</ul>
-				</fieldset>
-				<span style="display: none;"><input type="text" name="_marketo_comments" value="" /></span>
-				<input type="hidden" name="lpId" value="863" />
-				<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/ubuntu-cloud-jumpstart.html?cr={creative}&amp;kw={keyword}" />
-				<input type="hidden" name="formid" value="1032" />
-				<input type="hidden" name="returnURL" value="http://www.ubuntu.com/cloud/tools/jumpstart/thank-you" />
-				<input type="hidden" name="retURL" value="http://www.ubuntu.com/cloud/tools/jumpstart/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-1318249842357-32221" />
-			</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);
-			}
-		</script>
-		
-		
-			</div><!-- /.seven-col -->
-</div><!-- /row .row -->
-{% endblock content %}
-{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/cloud/tools/jumpstart/index.html b/templates/cloud/tools/jumpstart/index.html
deleted file mode 100644
index b56843e234a..00000000000
--- a/templates/cloud/tools/jumpstart/index.html
+++ /dev/null
@@ -1,91 +0,0 @@
-{% extends "cloud/base_cloud.html" %}
-
-{% block title %}Ubuntu cloud Jumpstart | Cloud{% endblock %}
-
-{% block meta_description %}Jumpstart is a fast, low-risk way to deploy private cloud infrastructure on your premises, it costs just $9,000 and it's guaranteed to take just five days.{% endblock meta_description %}
-
-{% block meta_keywords %}Jumpstart, consulting, Ubuntu OpenStack, private cloud{% endblock meta_keywords %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" subsection_title="Cloud tools" page_title="Jumpstart" tertiary="true" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero">
-	<div class="eight-col">
-		<h1>Jumpstart</h1>
-		<h2>A private cloud in 5 days. With an on-site Canonical engineer to get it done.</h2>
-		<p>Jumpstart is a fast, low-risk way to deploy private cloud infrastructure on your premises. Compatible with the Rackspace, HP and Amazon public clouds, it costs just &#36;9,000 and it&rsquo;s guaranteed to take just five days.</p>
-		<p><a class="link-cta-canonical" href="/cloud/tools/jumpstart/contact-us" onclick="_gaq.push(['_trackEvent', 'information', 'button', 'jumpstart']);">Get started with Jumpstart</a></p>
-	</div><!-- /.seven-col -->
-	<div class="four-col last-col">
-		<img src="{{ STATIC_URL }}img/pictograms/picto-jumpstart-purple-288x288.png" width="288" height="288" alt="" />
-	</div>
-</div><!-- /.row .row-hero -->
-		
-<div class="row">
-	<div class="four-col box box-highlight resource resource-brochure">
-		<h2><a href="http://insights.ubuntu.com/resources/brochure/ubuntu-openstack-jumpstart/">Ubuntu OpenStack Jumpstart&nbsp;&rsaquo;</a></h2>
-		<p>The best way to minimise risk in cloud deployments is to start small. And Jumpstart is the perfect way to that.</p>
-		<p class="content-cat content-cat-brochure">Brochure</p>
-	</div><!-- /.four-col -->
-	<div class="eight-col last-col">
-		<h2>How it works</h2>
-		<p>Jumpstart builds a private cloud on your hardware over the course of five days, delivered by an on-site Canonical services engineer and managed by a Canonical engagement manager. The engagement includes:</p>
-		<ul>
-			<li>A planning framework in which to make essential, core architecture decisions</li>
-			<li>A seed Ubuntu cloud deployment on up to 20 of your servers</li>
-			<li>Training in tools and processes to support your cloud</li>
-		</ul>
-	</div>
-</div><!-- /.row -->	
-
-<div class="row">
-	<h2>What the engineer will do</h2>
-	<div class="six-col">
-		<ul class="list-canonical smaller">
-			<li>Work with your ops team to design and deploy Ubuntu cloud Infrastructure on your hardware</li>
-			<li>Share knowledge on the use of Ubuntu cloud Guest (a version specifically designed for public or private clouds)</li>
-			<li>Deliver the required core build for Ubuntu Server</li>
-			<li>Plan and implement user and group requirements</li>
-			<li>Develop and integrate baseline security policies</li>
-			<li>Assess your physical storage and integrate it with your cloud infrastructure</li>
-		</ul>
-	</div><!-- /.six-col -->
-	<div class="six-col last-col">
-		<ul class="list-canonical smaller">
-			<li>Help with the deployment of Ubuntu cloud Infrastructure compute and/or storage services</li>
-			<li>Configure automated deployment tools</li>
-			<li>Help you develop a strategy for managing cloud capacity</li>
-			<li>Configure the Ubuntu cloud to use hosted <a href="https://landscape.canonical.com/">Landscape</a>, the Ubuntu systems management tool, for update and patch management</li>
-			<li>Introduce your team to Juju and use it in your cloud environment</li>
-		</ul>
-	</div><!-- /.six-col -->
-</div><!-- /.row -->	
-
-<div class="row row-grey row-image-centered">
-	<span><img src="{{ STATIC_URL }}img/third-party-logos/logo-openstack-grey-120x122.png" width="120" height="122" alt="Openstack logo" /></span>
-	<div class="nine-col">
-		<h2>OpenStack loves Ubuntu</h2>
-		<p>The reference architecture for OpenStack is based on Ubuntu. Jumpstart gives you a private cloud compatible with that architecture, on the hardware of your choice. The resulting cloud will be adapted to your preference for storage, network and compute &mdash; and will remain compatible with our reference cloud for all workloads.</p>
-	</div><!-- /.eight-col -->
-</div><!-- /.row -->	
-	
-<div class="row equal-height vertical-divider no-border">
-	<div class="four-col">
-		<h4>Jumpstart is just the start</h4>
-		<p>The scope of our standard Jumpstart engagement is limited to cloud deployment and training. Additional support, assurance, consulting, integration and professional services are available on a bespoke basis, both from <a href="http://www.canonical.com">Canonical</a> and third-party providers.</p>
-		<p>A complimentary 30-day subscription to <a href="/management/ubuntu-advantage">Ubuntu Advantage</a> is included with Jumpstart to provide support after deployment, and it can be extended to cover any pieces of your Ubuntu deployment.</p>
-	</div><!-- /.four-col -->
-	
-	<div class="four-col">
-		<h4>Canonical helps your <br/>cloud grow</h4>
-		<p>Ubuntu is the OS of choice for new clouds, both as host and guest. Canonical, the company behind Ubuntu, has unparalleled experience deploying cloud infrastructure solutions; we can help you take the core design decisions needed to ensure your cloud will grow smoothly in years to come.</p>
-	</div><!-- /.four-col -->
-		
-	<div class="four-col last-col">
-		<h4>Planning for the hybrid cloud</h4>
-		<p>Ubuntu offers native support for all major private and public cloud platforms. It&rsquo;s the most heavily used OS on both Amazon AWS and Rackspace, and hosts new public clouds from multiple industry players. Building your private cloud with Ubuntu cloud Infrastructure gives you the unmatched ability to burst workloads from your private cloud to the major public clouds.</p>
-	</div><!-- /.four-col -->
-</div><!-- /.row -->	
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/cloud/tools/jumpstart/thank-you.html b/templates/cloud/tools/jumpstart/thank-you.html
deleted file mode 100644
index 131011b31c6..00000000000
--- a/templates/cloud/tools/jumpstart/thank-you.html
+++ /dev/null
@@ -1,57 +0,0 @@
-{% extends "cloud/base_cloud.html" %}
-
-{% block title %}Thank you{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" subsection_title="Private cloud" subsubsection_title="Jumpstart" page_title="Thank you" tertiary="true" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-border">
-	<h1>Thank you for enquiring about <br />Ubuntu Jumpstart</h1>
-	<h2>A member of our team will be in touch within <br><strong>five working days</strong></h2>
-</div><!-- /.row-hero -->
-	
-<div class="row equal-height no-border">
-	<h3>More about our enterprise services</h3>
-	<ul id="thank-you-extra" class="no-bullets">
-		<li class="advantage four-col first">
-			<h4>Ubuntu Advantage</h4>
-			<p>Purchase our desktop support and access Ubuntu experts whenever you need.</p>
-			<p><a href="/cloud/management">Learn about Ubuntu Advantage &rsaquo;</a></p>
-		</li>
-		<li class="cloud four-col">
-			<h4>Ubuntu OpenStack</h4>
-			<p>Our private cloud infrastructure platform based on Openstack.</p>
-			<p><a href="/cloud">Learn about Ubuntu OpenStack &rsaquo;</a></p>
-		</li>
-		<li class="jumpstart four-col last-col">
-			<h4>Landscape</h4>
-			<p>Manage Ubuntu in the enterprise with our private cloud infrastructure platform based on OpenStack.</p>
-			<p><a href="/business/landscape">Learn about Landscape &rsaquo;</a></p>
-		</li>
-	</ul>
-</div><!-- end row-->
-	
-{% 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/cloud/tools/maas.html b/templates/cloud/tools/maas.html
old mode 100644
new mode 100755
index 3381a842beb..df00fc87ff6
--- a/templates/cloud/tools/maas.html
+++ b/templates/cloud/tools/maas.html
@@ -20,7 +20,9 @@ <h2>Introducing Metal as <br />a Service</h2>
 
 <div class="row">
 	<div class="eight-col">
-		<iframe width="560" height="315" src="//www.youtube.com/embed/J1XH0SQARgo?showinfo=0" frameborder="0" allowfullscreen></iframe>
+		<div class="video-container">
+			<iframe width="560" height="315" src="//www.youtube.com/embed/J1XH0SQARgo?showinfo=0" frameborder="0" allowfullscreen></iframe>
+		</div>
 	</div>
 	<div class="four-col last-col">
 		<h2>Inside MAAS</h2>
@@ -47,7 +49,7 @@ <h2>Dynamic provisioning and scaling</h2>
 		<p>Hardware provisioned through MAAS can be provisioned dynamically, just like cloud instances &mdash; except that we&rsquo;re talking about the whole physical node. Through a simple web interface or API you can add, commission, update, deploy and recycle physical servers at will. As your needs change, you can respond rapidly, by adding new nodes and dynamically re-deploying them between services. When the time comes, nodes can be retired for use outside MAAS.</p>
 		<p><a href="http://maas.ubuntu.com/docs/install.html">Learn how to install MAAS&nbsp;&rsaquo;</a></p>
 	</div><!-- /.eight-col -->
-	
+
 	<div class="four-col last-col box box-highlight resource resource-data-sheet">
 		<h2><a href="http://insights.ubuntu.com/resources/factsheet/top-10-questions-about-maas/">MAAS FAQ&nbsp;&rsaquo;</a></h2>
 		<p>Top 10 Questions about MAAS. Your guide to MAAS, bare-metal provisioning, and more.</p>
@@ -57,7 +59,7 @@ <h2><a href="http://insights.ubuntu.com/resources/factsheet/top-10-questions-abo
 </div><!-- /.row -->
 
 <div class="row row-image-centered no-border">
-	<span><img src="{{ STATIC_URL }}img/cloud/logo-juju-171x174.png" alt="" /></span>
+	<span><img src="{{ STATIC_URL }}img/cloud/tools/maas/logo-juju.svg" alt="" width="172" height="176" /></span>
 	<div class="eight-col">
 		<h2>Deploy services in seconds using Juju</h2>
 		<p>With Juju you can deploy, orchestrate and scale services in your MAAS cluster in seconds. Don&rsquo;t spend hours planning and implementing a service deployment; just choose how many nodes your new service needs, then apply a pre-written charm. When your needs change, you can monitor, scale and adjust deployment parameters in real time, and when you're finished with a service, Juju can remove it without a trace. It's as easy as apt-get.</p>
diff --git a/templates/cloud/tools/openstack/index.html b/templates/cloud/tools/openstack/index.html
deleted file mode 100644
index f4405245fd3..00000000000
--- a/templates/cloud/tools/openstack/index.html
+++ /dev/null
@@ -1,102 +0,0 @@
-{% extends "cloud/base_cloud.html" %}
-
-{% block title %}OpenStack with Ubuntu | Cloud{% endblock %}
-
-{% block meta_description %}Ubuntu OpenStack is the fastest and best-supported route to creating an OpenStack cloud.{% endblock meta_description %}
-{% block meta_keywords %}IAAS, OpenStack, Ubuntu, Ubuntu Cloud Infrastructure, private cloud infrastructure, infrastructure as a service, open cloud, opencloud, open source cloud, open private cloud, open public cloud, open hybrid cloud, OpenStack private cloud, OpenStack public cloud, cloud architecture, cloud deployment, cloud in business, cloud in enterprise, cloud in finance, cloud in public sector, cloud in government{% endblock meta_keywords %}
-
-{% block extra_body_class %}cloud-tools-openstack-home{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" subsection_title="Cloud tools" page_title="OpenStack" tertiary="true" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero">
-	<div class="five-col">
-		<h1>OpenStack</h1>
-		<p class="intro">Ubuntu OpenStack is the fastest route to creating a fully supported OpenStack cloud.</p>
-		<p><a href="/cloud/management" onclick="_gaq.push(['_trackEvent', 'information', 'button', 'openstack']);">Learn more about Ubuntu Advantage &nbsp;&rsaquo;</a></p>
-	</div><!-- /.seven-col -->
-</div><!-- /.row -->
-
-<div class="row">
-	<h2>The world&rsquo;s leading open cloud platform</h2>
-	<div class="seven-col append-one">
-		<p>As an open-source project under the guidance of the OpenStack Foundation, OpenStack provides its users with a cloud architecture technology that&rsquo;s free from vendor lock-in and always will be. In addition, it aims to provide the following benefits:</p>
-		<ul class="list-canonical">
-			<li>The most modular and horizontally scalable platform</li>
-			<li>The broadest functionality</li>
-			<li>The fastest deployment process</li>
-			<li>The best development and management tools</li>
-			<li>Suitability for private and public clouds</li>
-			<li class="last-item">Low cost of ownership</li>
-		</ul>
-		<p>OpenStack is used by some of the world&rsquo;s largest public cloud providers, including HP and Rackspace, as well as many more commercial enterprises for high-volume private clouds. The easiest way to join them is to build your OpenStack cloud on Ubuntu.</p>
-	</div>
-
-	<div class="four-col box box-highlight resource resource-data-sheet last-col">
-		<h2><a href="http://insights.ubuntu.com/resources/factsheet/openstack-primer/" title="OpenStack Primer Datasheet">OpenStack Primer&nbsp;&rsaquo;</a></h2>
-		<p>New to OpenStack? Our OpenStack Primer tells you all you need to know to get started. Read it now.</p>
-		<p class="content-cat content-cat-data-sheet">Datasheet</p>
-	</div><!-- /.four-col -->
-</div><!-- /.row -->
-
-<div class="row">
-	<h2>Creating your cloud with Canonical</h2>
-	<div class="six-col">
-		<p>Canonical was the first company to commercially distribute and support OpenStack and Ubuntu remains the reference operating system for the project. Canonical provides mission critical and enterprise support to OpenStack users around the world through Ubuntu Advantage. Since 2011, we&rsquo;ve included the latest version of OpenStack in every Ubuntu release, as well as making it available for the latest long-term support Ubuntu release (LTS) in our unique Cloud Archive. Once you&rsquo;ve deployed Ubuntu OpenStack you can move to newer OpenStack versions and benefit from all their new features quickly and easily.</p>
-	</div>
-	<div class="six-col last-col">
-		<p>Ubuntu OpenStack is fully compatible and tested with many technologies organisations already run, such as VMware ESX, Solidfire Storage or Microsoft Windows so you can connect to your infrastructure. Canonical offers a range of products and services to ease your OpenStack cloud journey, from everyday support to bespoke consulting for complex cloud deployments. The Ubuntu Advantage service package includes tiered support options for your cloud infrastructure, instances and services, and access to Landscape, the world’s leading Ubuntu systems management tool.</p>
-		<p><a href="/cloud/management">Learn more about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
-	</div>
-</div><!-- /.row -->
-
-<div class="row">
-	<h2>Ubuntu: the foundation of OpenStack</h2>
-	<div class="seven-col">
-		<p>Ubuntu and OpenStack share a unique relationship. Their release schedules are synchronised, ensuring that OpenStack updates and releases are immediately available on Ubuntu. And Ubuntu’s status as the reference operating system for OpenStack means Ubuntu is the preferred development platform &mdash; the one the developers of OpenStack use every day. No other operating system is as tightly integrated with OpenStack &mdash; or as stringently tested. If you want to run OpenStack (and if you&rsquo;re interested in open cloud infrastructure, you definitely should), the best advice is to do so on Ubuntu.</p>
-	</div>
-	<div class="five-col last-col">
-		<p><iframe src="http://www.youtube.com/embed/0hhdaPf30Xc?rel=0" height="205" width="365"></iframe></p>
-	</div>
-</div><!-- /.row -->
-
-<div class="row">
-	<h2>Learning more about OpenStack</h2>
-	<div class="seven-col">
-		<p>OpenStack is a free software platform on which anyone can develop, test and deploy cloud applications and services. This layer of the cloud stack, known generically as Infrastructure as a Service (IAAS), forms the base for doing so.</p>
-		<p>OpenStack has quickly become the standard for open cloud infrastructure. OpenStack code is freely available under the Apache 2.0 licence, so anyone can install it, run it or contribute to the project. It&rsquo;s a development model that has fostered an enormous community, supported by a large and growing ecosystem of tools, solutions and service providers.</p>
-		<p><a href="http://www.openstack.org">Learn more at the OpenStack website&nbsp;&rsaquo;</a></p>
-	</div>
-	<div class="four-col prepend-one last-col">
-		<blockquote>
-			<p class="pull-quote no-indent">An enormous community, supported by a large and <strong>growing ecosystem</strong> of tools</p>
-		</blockquote>
-	</div>
-</div><!-- /.row -->
-   
-<div class="row row-grey">
-	<div class="twelve-col box box-highlight resource resource-case-study box-image-centered">
-		<div class="eight-col">
-			<h2><a href="http://insights.ubuntu.com/case-study/mercadolibre-builds-1000-node-ubuntu-cloud-for-it-on-demand/">Case study: Mercado Libre &rsaquo;</a></h2>
-			<p>International auction site Mercado Libre is Latin America&rsquo;s answer to eBay and the fourth largest online retailer in the world. When Mercado Libre needed to build a fully-featured, reliable and open cloud capable of handling its huge volumes of customer activity, it chose OpenStack running on Ubuntu.</p>
-			<p class="content-cat content-cat-case-study">Case study</p>
-		</div>
-		<span>
-			<img src="{{ STATIC_URL }}img/pictograms/pictogram-mercadolibre-220x142.png" height="142" width="220" alt="">
-		</span>
-	</div><!-- /.resource -->
-</div><!-- /.row -->
-
-<div class="row row-image-centered no-border">
-	<span><img src="{{ STATIC_URL }}img/pictograms/pictogram-server-143x143.png" height="143" width="143" alt=""></span>
-	<div class="eight-col">
-		<h2>Ubuntu&nbsp;OpenStack&nbsp;reference&nbsp;architecture</h2>
-		<p>Ubuntu is the reference operating system for OpenStack and therefore provides unrivalled compatibility with the leading open cloud platform. We&rsquo;ve put together a reference architecture for Ubuntu OpenStack that we recommend to our customers. It&rsquo;s continually evolving as we add new third-party components, high-availability (HA) options, and different configurations, so check back often for the latest insights.</p>
-		<p><a href="/cloud/tools/openstack/reference-architecture">See the Ubuntu OpenStack reference architecture&nbsp;&rsaquo;</a></p>
-
-	</div><!-- /.eight-col -->
-</div><!-- /.row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/cloud/tools/openstack/reference-architecture.html b/templates/cloud/tools/openstack/reference-architecture.html
deleted file mode 100644
index 58d40a1ac48..00000000000
--- a/templates/cloud/tools/openstack/reference-architecture.html
+++ /dev/null
@@ -1,107 +0,0 @@
-{% extends "cloud/base_cloud.html" %}
-
-{% block title %}Cloud reference architecture | Cloud {% endblock %}
-{% block meta_description %}Ubuntu provides the reference architecture for the OpenStack project, the world’s leading open source cloud platform. Here is an overview of the architecture and outline of virtualisation options.{% endblock meta_description %}
-{% block meta_keywords %}Reference architecture, OpenStack, Ubuntu, Ubuntu Cloud Infrastructure, private cloud infrastructure, infrastructure as a service, open source, open cloud, open standards, virtualisation, hypervisor, KVM, Xen, LXC{% endblock meta_keywords %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" subsection_title=" Cloud tools" page_title="Reference architecture"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero">
-	<div class="eight-col">
-		<h1>Cloud reference architecture</h1>
-		<p>OpenStack is the leading open cloud platform. Ubuntu is the reference operating system for the OpenStack project, which is why deploying OpenStack with Ubuntu is the best way to ensure a straightforward implementation.</p>
-	</div>
-</div><!-- /row -->
-
-<div class="row">
-	<h2>OpenStack logical architecture</h2>
-	<p><img src="{{ STATIC_URL }}img/cloud/openstack-logical-architecture.png" width="867" height="658" alt="OpenStack logical architecture" /></p>
-
-	<div class="tabbed-menu">
-		<ul class="no-bullets">
-			<li><a class="active slideless" href="#compute">Compute</a></li>
-			<li><a class="slideless" href="#storage">Storage</a></li>
-			<li><a class="slideless" href="#image-service">Image service</a></li>
-			<li><a class="slideless" href="#authentication-service">Authentication</a></li>
-			<li><a class="slideless" href="#management-service">Management</a></li>
-		</ul>
-		<img src="{{ STATIC_URL }}img/patterns/tabbed-nav-arrow.png" class="arrow" height="6" width="12" alt="">
-	</div>
-	<div id="compute" class="tabbed-content compute box-grey twelve-col">
-		<div class="eight-col">
-			<p>The OpenStack Compute component (codenamed Nova) enables you to provision and manage large networks of virtual machines, creating a redundant and scalable cloud-computing platform. It gives you everything you need to run instances, manage networks and control access through users and projects. Like the rest of the Ubuntu operating system, it supports most standard hardware configurations and well-known hypervisors.</p>
-		</div>
-	</div>
-	<div id="storage" class="tabbed-content box-grey hide twelve-col">
-		<div class="eight-col">
-			<p>OpenStack Object Storage (codenamed Swift) creates redundant, scalable object storage using clusters of standardised storage servers. Rather than a file system or real-time data storage system, it provides a long-term storage system for more permanent, static data. Examples include virtual machine images, photo storage, email storage and backup archiving. Canonical’s recommended alternative is Swift is Ceph, which provides a more feature-rich experience, and covers both object and block storage (block storage is the component that provides “disks” to the virtual machine).</p>
-		</div>
-	</div>
-	<div id="image-service" class="tabbed-content box-grey hide twelve-col">
-		<div class="six-col">
-			<p>The OpenStack Image Service (codenamed Glance) provides discovery, registration and delivery services for virtual disk images. It includes a standard REST interface for identifying them in back-end stores such as OpenStack Object Storage, with new virtual disk images being registered via the Image Service.</p>
-			<p>Administrators can also access information on publicly available disk images and use the client library for streaming virtual disk images.</p>
-		</div>
-		<div class="six-col last-col">
-			<p>A multi-format registry, the OpenStack Image Service allows uploads of private and public images in the following formats:</p>
-			<ul class="list-canonical smaller">
-				<li class="three-col">Raw</li>
-				<li class="three-col last-col">VHD (Hyper-V)</li>
-				<li class="three-col">VDI (VirtualBox)</li>
-				<li class="three-col last-col">qcow2 (Qemu/KVM)</li>
-				<li class="three-col last-item">Machine (kernel/ramdisk outside of image, also known as AMI)</li>
-			</ul>
-		</div>
-	</div>
-	<div id="authentication-service" class="tabbed-content box-grey hide twelve-col">
-		<div class="eight-col">
-			<p>The OpenStack Authentication service (codenamed Keystone) provides identity, token, catalogue and policy services for use by OpenStack components. It provides a pluggable back-end that has been designed to support various protocols (e.g. Basic Auth, OAuth, OpenID, PKI) for authentication and authorisation, allowing clients to obtain security tokens to access different cloud services.</p>
-		</div>
-	</div>
-	<div id="management-service" class="tabbed-content box-grey hide twelve-col">
-		<div class="six-col">
-			<p>The OpenStack management service or dashboard (codenamed Horizon) provides OpenStack users with a web-based user interface with which to control OpenStack&rsquo;s component services (Nova, Swift, Keystone, Glance) and a single API with which to access them.</p>
-			<p>The Horizon application also ships with a set of API abstractions for the core OpenStack projects, enabling developers to work on OpenStack without intimate knowledge of the APIs of every component.</p>
-		</div>
-		<div class="six-col last-col">
-			<p>There are three central dashboards, covering the core OpenStack applications:</p>
-			<ul class="list-canonical smaller">
-				<li>A user dashboard</li>
-				<li>A system dashboard</li>
-				<li class="last-item">A settings dashboard</li>
-			</ul>
-		</div>
-	</div>
-</div>
-
-<div class="row row-image-centered">
-	<div class="eight-col">
-		<h2>Virtualisation</h2>
-		<p>Ubuntu Server includes open-source hypervisors LXC and Xen, alongside its default option, KVM. All are supported as virtualisation options for Ubuntu OpenStack deployments.</p>
-		<p>Alternative hypervisors are compatible with OpenStack, however, allowing Ubuntu OpenStack to be deployed in custom configurations with almost any virtualisation technology. Supported options include:</p>
-		<ul class="list-canonical smaller clear">
-			<li>KVM (Kernel-based Virtual Machine)</li>
-			<li>LXC (Linux Containers)</li>
-			<li>Xen*</li>
-			<li>VMWare ESX</li>
-		</ul>
-		<p>A complete list of the features that can be controlled through OpenStack, by hypervisor, is available on the <a href="http://wiki.openstack.org/HypervisorSupportMatrix">OpenStack Wiki</a>.</p>
-		<p class="smaller">* Requires the nova-compute service to be installed on DomU</p>	
-	</div><!-- /.eight-col -->
-	<span><img src="{{ STATIC_URL }}img/pictograms/pictogram-virtualise-205x205.png" width="205" height="205" alt="" /></span>
-</div>
-
-<div class="row row-community row-image-centered no-border">
-	<span><img src="{{ STATIC_URL }}img/pictograms/pictogram-help-135.png" alt="" /></span>
-	<div class="eight-col">
-		<h2>Documentation and help</h2>
-		<p>The fastest and most accurate source of assistance on Ubuntu Cloud is the developer community responsible for the software. <a href="https://help.ubuntu.com/community/UbuntuCloudInfrastructure">You can get help from the Ubuntu community here</a>.</p>
-		<p>For technical documentation and further information on OpenStack, <a href="http://docs.openstack.org/">please visit the OpenStack documentation pages</a>.</p>
-	</div>
-</div><!-- /.row -->
-
-{% endblock content %}
-{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/cloud/use-a-cloud.html b/templates/cloud/use-a-cloud.html
deleted file mode 100644
index f01ab3523f5..00000000000
--- a/templates/cloud/use-a-cloud.html
+++ /dev/null
@@ -1,77 +0,0 @@
-{% extends "cloud/base_cloud.html" %}
-
-{% block title %}Use a cloud | Cloud{% endblock %}
-
-{% block meta_description %}Ubuntu is the most popular guest OS on both public and private clouds, thanks to its security, versatility and continually updated features.{% endblock meta_description %}
-
-{% block meta_keywords %}Ubuntu OpenStack, Ubuntu, public cloud, Ubuntu guest OS, Ubuntu server,Amazon cloud, AWS, Rackspace cloud, HP cloud, Joyent cloud , IBM cloud, cloud workloads, guest certification, OpenStack{% endblock meta_keywords %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Cloud" subsection_title="Cloud tools" page_title="Use a cloud" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-image-centered">
-	<div class="seven-col">
-		<h1>Use a cloud</h1>
-		<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>
-	</div><!-- /.six-col -->
-	<span><img src="{{ STATIC_URL }}img/pictograms/pictogram-use-a-cloud.png" alt="pictogram-use-a-cloud" width="288" height="186" /></span>
-</div><!-- /.row row-hero -->
-
-<div class="row certified-public-clouds">
-	<div class="eight-col">
-		<h2>Certified public clouds</h2>
-		<p>Ubuntu is certified on a range of popular public clouds, with more being added every day. This ensures that you have the latest, official, secure, and reliable Ubuntu Server image.</p>
-		<ul class="inline-icons">
-			<li><img src="{{ STATIC_URL }}img/logos/logo-ibm-large.png" alt="IBM" width="110" height="50" /></li>
-			<li><img src="{{ STATIC_URL }}img/logos/logo-window-azure-large.png" alt="Windows Azure" width="245" height="50" /></li>
-			<li><img src="{{ STATIC_URL }}img/logos/logo-joyent-50.png" alt="Joyent" width="184" height="50" /></li>
-			<li class="last-item"><img src="{{ STATIC_URL }}img/logos/logo-hp-cloud.png" alt="" width="150" height="50" /></li>
-		</ul>
-	</div>
-	<div class="four-col box box-highlight resource resource-e-book last-col">
-		<h2><a href=" http://insights.ubuntu.com/whitepaper/ubuntu-cloud-guest/" title="Download Ubuntu Guest Factsheet">Running <br />Ubuntu Guest&nbsp;&rsaquo;</a></h2>
-		<p>We&rsquo;ve put together answers to your most frequently asked questions about using Ubuntu as a cloud guest.</p>
-		<p class="content-cat content-cat-factsheet">Factsheet</p>
-	</div><!-- /.four-col -->
-</div><!-- /.row -->
-
-<div class="row row-grey row-image-centered">
-	<span><img src="{{ STATIC_URL }}img/cloud/picto-workloads.png" alt="" height="211" /></span>
-	<div class="eight-col">
-		<h2>Your workloads on Ubuntu</h2>
-		<p>The efficiency of a workload is largely determined by the underlying platform and architecture. Ubuntu is the platform of choice for scale-out workloads, but it also offers workload-specific features to boost performance. This blog series gives you valuable insights on workload deployment best practices, important features, moving workloads, scaling in and out, rolling updates and more.</p>
-		<p><a href="http://insights.ubuntu.com/resources/when-it-comes-to-scale-size-doesnt-matter/" title="Blog: When it comes to scale size doesnt matter">Read the Ubuntu workloads blog&nbsp;&rsaquo;</a></p>
-	</div><!-- /.eight-col -->
-</div><!-- /.row -->
-
-<div class="row row-juju-man vertical-divider">
-	<div class="six-col box-juju">
-		<h2>Juju is everywhere Ubuntu is</h2>
-		<p>Juju is the best and quickest way to deploy and scale out your workloads. Whether it's Hadoop, Wordpress, or OpenERP, Juju allows you to get an entire cloud environment up and running in just a few commands, or mouse clicks.</p>
-		<p><a href="/cloud/tools/juju" title="">Learn more about Juju&nbsp;&rsaquo;</a></p>
-		<img src="{{ STATIC_URL }}img/cloud/image-juju-charms.png" alt="" width="482" height="211" />
-	</div><!-- /.six-col -->
-
-	<div class="six-col box-management last-col">
-		<h2>Management and support</h2>
-		<p>The Ubuntu Advantage support service has flexible Ubuntu Guest options. If you build your cloud on Ubuntu, a number of guest instances are supported for free, and this can be upgraded to cover more instances, more hours and higher entitlements. Thanks to Landscape, efficient management of those instances is only a few clicks away. </p>
-		<p><a href="/cloud/management">Find out all about support&nbsp;&rsaquo;</a></p>
-		<img src="{{ STATIC_URL }}img/cloud/image-landscape-cloud.png" alt="" width="923" height="516" />
-	</div><!-- /.seven-col -->
-</div><!-- /.row -->
-
-
-<div class="row developers-favourite no-border">
-	<div class="six-col">
-		<img src="{{ STATIC_URL }}img/desktop/meet-ubuntu.jpg" alt="Ubuntu running on XPS laptop" width="460" height="278" />
-	</div>
-	<div class="six-col push-down last-col">
-		<h2>Developers&rsquo; favourite</h2>
-		<p>Ubuntu is the most popular Linux distribution for development and deployment. If your developers already use Ubuntu, moving to the cloud is even easier.</p>
-		<p><a href="/desktop/developers">Read more about Ubuntu for developer workstations&nbsp;&rsaquo;</a></p>
-	</div>
-</div><!-- /.row -->
-
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/desktop/_nav_secondary.html b/templates/desktop/_nav_secondary.html
old mode 100644
new mode 100755
index fc652fa76ee..355b68c5363
--- a/templates/desktop/_nav_secondary.html
+++ b/templates/desktop/_nav_secondary.html
@@ -1,10 +1,9 @@
-	<ul{% if list_class %} class="{{ list_class }}"{% endif %}>
-		{% if arrow %} <li class="arrow-up"></li> {% endif %}
+	<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 == '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-chinese" %} class="active"{% endif %}><a href="/desktop/{% if level_2 == "ubuntu-kylin-chinese" %}ubuntu-kylin-chinese{% else %}ubuntu-kylin{% endif %}">Ubuntu Kylin</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>
 	</ul>
\ No newline at end of file
diff --git a/templates/desktop/_nav_tertiary.html b/templates/desktop/_nav_tertiary.html
old mode 100644
new mode 100755
index 21e7d4f35c4..9b3c4fd7ebb
--- a/templates/desktop/_nav_tertiary.html
+++ b/templates/desktop/_nav_tertiary.html
@@ -1,19 +1,9 @@
-	<ul>
+	<ul class="third-level-nav">
 {% if level_2 == 'features' %}
 		<li{% if level_3 == 'web-browsing' %} class="active"{% endif %}><a href="/desktop/features/web-browsing">Web browsing</a></li>
 		<li{% if level_3 == 'office-applications' %} class="active"{% endif %}><a href="/desktop/features/office-applications">Office apps</a></li>
 		<li{% if level_3 == 'social-and-email' %} class="active"{% endif %}><a href="/desktop/features/social-and-email">Social and email</a></li>
-		<li{% if level_3 == 'music-and-mobile' %} class="active"{% endif %}><a href="/desktop/features/music-and-mobile">Music and mobile</a></li>
 		<li{% if level_3 == 'photos-and-videos' %} class="active"{% endif %}><a href="/desktop/features/photos-and-videos">Photos and videos</a></li>
 		<li{% if level_3 == 'games-apps' %} class="active"{% endif %}><a href="/desktop/features/games-apps">Games and apps</a></li>
-		<li{% if level_3 == 'personal-cloud' %} class="active"{% endif %}><a href="/desktop/features/personal-cloud">Personal cloud</a></li>
 {% endif %}
-{% comment %}
-Removing as per todo 22/03/2013 https://canonical.basecamphq.com/projects/10185805-project-belfast/todo_items/160518782/comments
-{% if level_2 == 'for-developers' %}
-	<ul>
-		<li{% if level_3 == 'thin-client' %} class="active"{% endif %}><a href="/desktop/for-developers/thin-client" >Thin client</a></li>
-	</ul>
-{% endif %}
-{% endcomment %}
 	</ul>
\ No newline at end of file
diff --git a/templates/desktop/base_desktop.html b/templates/desktop/base_desktop.html
old mode 100644
new mode 100755
diff --git a/templates/desktop/business/index.html b/templates/desktop/business/index.html
old mode 100644
new mode 100755
index c041d6a505b..424c9101293
--- a/templates/desktop/business/index.html
+++ b/templates/desktop/business/index.html
@@ -13,8 +13,8 @@
 <div class="row row-hero">
 	<div class="seven-col">
 		<h1>Business as usual</h1>
-		<h2>Robust, beautiful and future-proof: There has never been a better time to use Ubuntu</h2>
-		<p>Why spend money on licences, 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 ending in April 2014, now is the perfect time to explore Ubuntu.</p>
+		<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">
@@ -27,25 +27,28 @@ <h2>Robust, beautiful and future-proof: There has never been a better time to us
 
 <div class="row row-support-systems-management">
 	<div class="six-col">
-		<h2>Easy to manage, <br />enterprise-wide</h2>
+		<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 "shared/_enterprise_blog.html" %}		
+{% include "shared/_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, antivirus software and file and disk encryption tools.</p>
+		<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  &rsaquo;</a></p>
+		<p><a href="/download/desktop">Download now for free&nbsp;&rsaquo;</a></p>
 	</div>
 </div>
 
@@ -54,7 +57,7 @@ <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 class="vertical-divider">
+		<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>
@@ -62,7 +65,7 @@ <h3 id="works-with-your-hardware-and-software">Works with all your hardware and
 					<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 &rsaquo;</a></p>
+				<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">
@@ -71,21 +74,43 @@ <h3 id="works-with-your-hardware-and-software">Works with all your hardware and
 					<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 &rsaquo;</a></p>
+				<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><!-- /.box-padded-feature -->
 </div>
 
 <div class="row row-thin-client">
-	<div class="six-col no-margin-bottom">
+	<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><a href="/desktop/management">Find out more about Ubuntu Advantage &rsaquo;</a></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 "shared/_ubuntu_advantage_community.html" %}
 </div><!-- /.row -->
diff --git a/templates/desktop/contact-us.html b/templates/desktop/contact-us.html
old mode 100644
new mode 100755
index 5f4def05005..4fcb9461340
--- a/templates/desktop/contact-us.html
+++ b/templates/desktop/contact-us.html
@@ -63,11 +63,11 @@ <h2>Considering Ubuntu for your business?</h2>
 	<div class="eight-col">
 
 	<p>Just fill in the form below and a member of our team will be in touch within two working days.</p>
-	
-	<p>If you just need support for yourself, you can; <a href="http://askubuntu.com/">Ask Ubuntu</a>, <a href="/support/community">get help from the community</a>, <a href="http://ubuntuforums.org/">join a forum</a>, or <a href="https://help.ubuntu.com/">take a look at our official documentation</a>.</p>
-	
+
+	<p>If you just need support for yourself, you can; <a href="http://askubuntu.com/">Ask Ubuntu</a>, <a href="http://community.ubuntu.com/help-information/" class="external">get help from the community</a>, <a href="http://ubuntuforums.org/">join a forum</a>, or <a href="https://help.ubuntu.com/">take a look at our official documentation</a>.</p>
+
 	<p>All fields are required.</p>
-	
+
 
 <script type="text/javascript"> function mktoGetForm() {return document.getElementById('mktForm_1089'); }</script>
 <form class="lpeRegForm formNotEmpty" method="post" enctype="application/x-www-form-urlencoded" action="https://pages.canonical.com/index.php/leadCapture/save" id="mktForm_1089" name="mktForm_1089">
@@ -89,291 +89,20 @@ <h3>Contact information</h3>
 			  return "Please enter a valid email address";
 			}
 		</script>
-		<ul class="mktLblLeft">
 
-			<li class="mktFormReq mktField">
-				<label for="FirstName">First name: <span>*</span></label>
-				<span class="mktInput"><input class="mktFormText mktFormString mktFReq" tabindex="1" name="FirstName" id="FirstName" type="text" value="" maxlength="255" tabindex="2"><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" tabindex="2" name="LastName" id="LastName" 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" tabindex="3" name="Email" id="Email" type="text" value="" maxlength="255" tabindex="5"><span class="mktFormMsg"></span></span>
-			</li>
-			
-			<li class="mktFormReq mktField">
-				<label for="Phone">Phone: <span>*</span></label>
-				<span class="mktInput">
-					<input class="mktFormText mktFormPhone mktFReq" tabindex="4" name="Phone" id="Phone" type="text" value="" maxlength="255" tabindex="11">
-					<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">
-					<option value="Select Country:" selected="selected">Select Country:</option>
-					<option value="AF">Afghanistan</option>
-					<option value="AX">&Aring;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&ocirc;te D'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'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'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&eacute;union</option>
-					<option value="RO">Romania</option>
-					<option value="RU">Russian Federation</option>
-					<option value="RW">Rwanda</option>
-					<option value="BL">Saint Barth&eacute;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="&trade;">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 mktFReq" name="State" id="State" size="1" tabindex="6">
-					<option value="SelectProvince" selected="selected">Select Province</option>
+
+	<ul class='mktLblLeft'>
+		<li  class='mktFormReq mktField' ><label>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>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>Work email:</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>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>Country:</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Country" id="Country" size='1'   tabIndex='5'><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>State:</label><span class='mktInput'><select class='mktFormSelect' name="State" id="State" size='1'   tabIndex='6'><option value="SelectProvince" selected="selected">Select Province</option>
 					<option value="AB">Alberta</option>
 					<option value="BC">British Columbia</option>
 					<option value="MB">Manitoba</option>
@@ -440,109 +169,41 @@ <h3>Contact information</h3>
 					<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>
-		</ul>
-	</fieldset>
+					<option value=""></option></select><span class='mktFormMsg'></span></span></li>
 
-	<fieldset class="fieldset-2">
-	<h3>Your organisation</h3>
+		<li  class='mktFormReq mktField' ><label>Job Role:</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Job_Role__c" id="Job_Role__c" size='1'   tabIndex='7'><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>
 
-	<ul class="mktLblLeft">
-		<li class="mktFormReq mktField">
-			<label for="Job_Role__c">Job Role: <span>*</span></label>
-			<span class="mktInput">
-				<select class="mktFormSelect mktFReq" tabindex="7" name="Job_Role__c" id="Job_Role__c" size="1"><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'><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>Industry:</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Industry" id="Industry" size='1'   tabIndex='8'><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' tabindex="9" name="Ubuntu_User__c" id="Ubuntu_User__c" size='1'><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="num_employees__c">Number of employees in your organisation: <span>*</span></label>
-			<span class='mktInput'>
-				<select class='mktFormSelect mktFReq' name="num_employees__c" id="num_employees__c" size='1'   tabIndex='10'><option value='Please select' selected='selected'>Please select</option><option value='None'>None</option><option value='&lt;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>
-		<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='11'><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 for="Use_Case__c">Are you interested in Ubuntu desktop for: <span>*</span></label>
-			<span class='mktInput'>
-				<select class='mktFormSelect mktFReq' name="Use_Case__c" id="Use_Case__c" size='1'   tabIndex='12'><option value='' selected='selected'>Please select</option><option value='Thin Client'>Thin client</option><option value='Desktop - developer'>Developer desktop</option><option value='Desktop'>Traditional desktop</option></select>
-				<span class='mktFormMsg'></span>
-			</span>
-		</li>
-	</ul>
-	</fieldset>
+		<li  class='mktFormReq mktField' ><label>How do you use Ubuntu:</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Ubuntu_User__c" id="Ubuntu_User__c" size='1'   tabIndex='9'><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>
 
-	<fieldset class="fieldset-3">
-	<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='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 for="NewsletterOpt-In">I would like to receive occasional news from Canonical by email.</label>
-				<span class="mktFormMsg"></span>
-			</span>
-		</li>
-	</ul>
-	</fieldset>
-	
-	<fieldset class="fieldset-submit">
-	<ul class="mktLblLeft">
-		<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">
-			<input id="mktFrmSubmit" tabindex="15" type="submit" value="Submit" name="submitButton" onclick="formSubmit(document.getElementById('mktForm_1089')); return false;" />
-			<input id="mktFrmReset" type="reset" value="Clear" name="resetButton" />
-		</li>     
+		<li  class='mktFormReq mktField' ><label>Number of employees in your organisation:</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="num_employees__c" id="num_employees__c" size='1'   tabIndex='10'><option value='Please select' selected='selected'>Please select</option><option value='None'>None</option><option value='&lt;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>
-	<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_contact-us.html?cr={creative}&kw={keyword}" />
-	<input type="hidden" name="formid" value="1089" />
-	<input type="hidden" name="returnURL" value="http://www.ubuntu.com/desktop/thank-you" />
-	<input type="hidden" name="retURL" value="http://www.ubuntu.com/desktop/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-1347307364220-59927" />
-</form>
+		<li  class='mktFormReq mktField' ><label>Number of Ubuntu desktops currently deployed/planned:</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="NumUbuntuDesktops__c" id="NumUbuntuDesktops__c" size='1'   tabIndex='11'><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>Are you interested in Ubuntu desktop for:</label><span class='mktInput'><select class='mktFormSelect mktFReq' name="Use_Case__c" id="Use_Case__c" size='1'   tabIndex='12'><option value='' selected='selected'>Please select</option><option value='Thin Client'>Thin client</option><option value='Desktop'>Desktop</option></select><span class='mktFormMsg'></span></span></li>
 
+		<li  class='mktFormReq mktField' ><label>What would you like to talk to us about?</label><span class='mktInput'><textarea class='mktFormTextarea mktFormTextarea mktFReq' name="Comments_from_lead__c" id="Comments_from_lead__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 id='mktFrmButtons'><label>&nbsp;</label><input id='mktFrmSubmit' type='submit' value='Submit' name='submitButton' onclick='formSubmit(document.getElementById("mktForm_1089")); return false;' />&nbsp;<input style='display: none;' id='mktFrmReset' type='reset'
+              value='Clear' name='resetButton' onclick='formReset(document.getElementById("mktForm_1089")); 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_contact-us.html?cr={creative}&kw={keyword}" />
+  <input type="hidden" name="formid" value="1089" />
+  <input type="hidden" name="returnURL" value="http://www.ubuntu.com/desktop/thank-you" />
+  <input type="hidden" name="retURL" value="http://www.ubuntu.com/desktop/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>
diff --git a/templates/desktop/developers/index.html b/templates/desktop/developers/index.html
old mode 100644
new mode 100755
index 3fdf6c4180d..ba81a001525
--- a/templates/desktop/developers/index.html
+++ b/templates/desktop/developers/index.html
@@ -9,69 +9,88 @@
 
 {% block content %}
 <div class="row row-hero">
+	<h1>Ubuntu Desktop for developers</h1>
 	<div class="six-col">
-		<h1>Ubuntu Desktop for 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&dash;scale models to run, in fact, anyone in need of a powerful machine for your work, Ubuntu is the ideal platform.</p>
+		<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">
+<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><!-- /.six-col -->
+	</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">Ideal for any resource-intensive environment, from data mining to large-scale financial modeling</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">
-		<h4>Preferred development platform</h4>
-		<p class="smaller">Source: Eclipse Community Survey, 2012</p>
-		<p><img class="" src="{{ STATIC_URL }}img/desktop/graph-eclipse-preferred-platform.png" width="442" height="440" alt="" /></p>
+			<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 &mdash; and it'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 class="link-arrow" href="/cloud">Learn more about Ubuntu&rsquo;s cloud offering</a></p>
+		<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">
+
+<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 &rsaquo;</a></p>
+		<p><a href="http://developer.ubuntu.com">Learn more about developing for Ubuntu&nbsp;&rsaquo;</a></p>
 	</div><!-- /.six-col -->
-	<img class="pull-bottom-right" src="{{ STATIC_URL }}img/business/desktop-software-centre.png" width="473" height="323" alt="" />
+	<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>
-			<p>&ldquo;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 brainer.&rdquo;<cite>Barton George, Director, Web Vertical, Dell</cite></p>
+		<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&rsquo;s why it&rsquo;s used by some of the world&rsquo;s most exciting technology companies, like Instagram and Twitpic. And it&rsquo;s why Valve has decided to port its hugely popular Steam virtual games store to Ubuntu. Ubuntu&rsquo;s ability to run on any computing architecture and hardware platform makes it the ideal choice for companies with a &ldquo;bring your own device&rdquo; (BYOD) environment, or a diverse hardware infrastructure.</p>
-		<p><a href="http://ubuntu.com/certification/desktop">See the full list of desktops and laptops certified to <br />run Ubuntu &rsaquo;</a></p>
+		<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 -->
 
@@ -79,31 +98,30 @@ <h3>By developers, for developers</h3>
 	<div class="six-col">
 		<h3>Deployment made easy</h3>
 		<p>When it comes to speed and simplicity of deployment, nothing touches Ubuntu.</p>
-		<p>The time-consuming and often cumbersome handover process between development and deployment teams is greatly simplified with Ubuntu. With Juju for service orchestration, you can write deployment charms that enable ops colleagues to deploy your code anywhere, in minutes. Juju deployments can grow and shrink on demand, adding layers or substituting components on the fly. With hundreds of existing charms and counting, Juju covers the most popular developer and enterprise applications. Whatever you need, there is a charm for that!</p>
-		<p>Juju is free to download. To learn more about how to get started, <a href="https://juju.ubuntu.com">go to the Juju website</a>.</p>
-		<p><a href="/cloud/orchestration">Read more about Juju &rsaquo;</a></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 row-reliable-release">
+<div class="row">
 	<div class="six-col">
-		<img src="{{ STATIC_URL }}img/business/desktop-landscape-screen.png" width="462" height="324" alt="" />
+		<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 &rsaquo;</a></p>
+		<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 &mdash; 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 &rsaquo;</a></p>
+		<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 %}
diff --git a/templates/desktop/developers/thin-client.html b/templates/desktop/developers/thin-client.html
old mode 100644
new mode 100755
diff --git a/templates/desktop/features/_features_header.html b/templates/desktop/features/_features_header.html
old mode 100644
new mode 100755
index cb5c38460c9..84b153791c6
--- a/templates/desktop/features/_features_header.html
+++ b/templates/desktop/features/_features_header.html
@@ -2,7 +2,7 @@
 	<div class="five-col">
 		<h1>{{ page_title }}</h1>
 	</div>
-	<div class="seven-col last-col">
+	<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
old mode 100644
new mode 100755
index 5e004cd127c..659c6336af3
--- a/templates/desktop/features/games-apps.html
+++ b/templates/desktop/features/games-apps.html
@@ -16,12 +16,12 @@
 		<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 "shared/_share_this.html" %}
 	</div>
-	<div class="seven-col last-col no-margin">
+	<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">
+<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>
@@ -37,9 +37,9 @@ <h3>Ratings and reviews</h3>
 		<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><!-- /.row -->
 
-<div class="row row-humble-indie-bundle">
+<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>
@@ -48,23 +48,25 @@ <h2>Humble Indie Bundle</h2>
 </div><!-- /.row -->
 
 <div class="row">
-	<div class="five-col">
-		<p class="five-col"><img src="{{ STATIC_URL }}img/third-party-logos/logo-steam-365.png" width="365" height="90" alt="" /></p>
+	<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">
-		<img class="touch-border" src="{{ STATIC_URL }}img/desktop/features/image-steam.jpg" alt="Steam screenshot" width="545" height="400"  />
+	<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 row-image-centered">
-		<span><img class="" src="{{ STATIC_URL }}img/desktop/features/image-developer.png" alt="" width="442" height="135" /></span>
+
+<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 class="link-arrow" href="http://developer.ubuntu.com">Get started today</a></p>
+			<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 -->		
+</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
old mode 100644
new mode 100755
index 549223fb078..7a1874c5e50
--- a/templates/desktop/features/index.html
+++ b/templates/desktop/features/index.html
@@ -1,30 +1,49 @@
 {% extends "desktop/base_desktop.html" %}
 {% block extra_body_class %}desktop-features-home{% endblock %}
-{% block title %}Features{% 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" tertiary="true"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
-<div class="row row-hero row-your-ubuntu">
+<div class="row row-hero no-border">
 	<div class="four-col">
-		<h1>Your Ubuntu, your way</h1>
-		<p>Enjoy the simplicity of Ubuntu's stylish, intuitive interface. Fast, secure and with thousands of apps to choose from, Ubuntu gives you a clean and streamlined experience that you can really make your own.</p>
+		<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><!-- /.six-col -->
-	<div class="clear">{% include "shared/_share_this.html" %}</div>
+	</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 "shared/_share_this.html" %}</div>
 </div><!-- /.row -->
 
 <div class="row row-what-is-new">
-		<h2>The new smart scopes</h2>
-		<p>Ubuntu 13.10 brings ‘smart scopes’ into the Dash.  They revolutionise how you find and filter the content on your computer and the internet.</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 and return only the best results. The smart scopes server constantly improves its results by learning which categories and results are most useful to you over time.</p>
+	<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 row-explore-ubuntu no-border">
+<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" %}
-</div>
 {% endblock content %}
 {% block footer_extra %}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/desktop/features/music-and-mobile.html b/templates/desktop/features/music-and-mobile.html
deleted file mode 100644
index 2bf50340df8..00000000000
--- a/templates/desktop/features/music-and-mobile.html
+++ /dev/null
@@ -1,83 +0,0 @@
-{% extends "desktop/base_desktop.html" %}
-
-{% block title %}Music and mobile | Features{% endblock %}
-
-{% block body_classes %}audience-consumer{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Desktop" subsection_title="Features" page_title="Music and mobile"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-{% include "desktop/features/_features_header.html" with page_title="Music and mobile" %}
-
-<div class="row intro">
-	<div class="four-col">
-		<p>Ubuntu works with all common portable music players, as well as Android phones and the iPhone. And you&rsquo;ll find all the tunes you&rsquo;ll ever need in the Ubuntu One Music Store.</p>
-		<ul class="no-bullets inline inline-icons">
-			<li><img src="{{ STATIC_URL }}img/icons/icon-rythmbox-reflex-48x88.png" width="50" height="88" title="Rhythmbox" alt="Rhythmbox icon" /></li>
-			<li><img src="{{ STATIC_URL }}img/icons/icon-banshee-reflex-38x88.png" width="48" height="88" title="Banshee" alt="Banshee icon" /></li>
-		</ul>
-		{% include "shared/_share_this.html" %}
-	</div>
-	<div class="eight-col last-col no-margin">
-		<img class="touch-border" src="{{ STATIC_URL }}img/desktop/features/screenshot-features-music-main.png" width="636" height="327" alt="" />
-	</div>
-</div><!-- /.row -->
-
-<div class="row row-feats-intro equal-height no-margin-bottom">	
-	<div class="four-col box">
-		<h3>Find your tunes anywhere</h3>
-		<p>Ubuntu will find the music you want in an instant, whether it&rsquo;s already on your computer or available in an online store like Amazon. Just type a few letters, hit return and view the results.</p>
-		<img src="{{ STATIC_URL }}img/desktop/features/screenshot-features-music-anywhere.png" alt="" width="287" height="177" />
-	</div><!-- /.four-col -->
-	<div class="four-col box box-new-music">
-		<h3>New music is never far away</h3>
-		<p>Enjoy one-click access to the Ubuntu One Music Store, direct from your desktop. The Ubuntu One Music Store is just one of many web apps you can add to the Launcher.</p>
-		<img src="{{ STATIC_URL }}img/desktop/features/screenshot-ubuntu-one.png" alt="" width="287" height="177" />
-	</div><!-- /.four-col -->
-	<div class="four-col last-col box">
-		<h3>Preview before you buy</h3>
-		<p>Right-click on an album to see a full-size shot of the artwork, complete with track listings. Then just click to hear any of the tracks, before you buy.</p>
-		<img src="{{ STATIC_URL }}img/desktop/features/screenshot-features-music-preview.png" alt="" width="287" height="177">
-	</div><!-- /.four-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 class="equal-height">
-			<ul class="vertical-divider ">
-				<li class="four-col">
-					<div class="one-col">
-						<img src="{{ STATIC_URL }}img/icons/icon-audacity-48.png" width="48" height="48" alt="Audacity icon" />
-					</div>
-					<div class="three-col last-col">
-						<h4>Audacity</h4>
-						<p>Audacity is a multi-track audio editor featuring digital effects and spectrum analysis tools.</p>
-					</div>
-				</li>
-				<li class="four-col">
-					<div class="one-col">
-						<img src="{{ STATIC_URL }}img/icons/icon-jokosher-48.png" width="48" height="48" alt="Jokosher icon" />
-					</div>
-					<div class="three-col last-col">
-						<h4>Jokosher</h4>
-						<p>Jokosher is a simple and powerful multi-track studio specifically designed with usability in mind.</p>
-					</div>
-				</li>
-				<li class="four-col last-col">
-					<div class="one-col">
-						<img src="{{ STATIC_URL }}img/icons/icon-clementine-48.png" width="48" height="48" alt="Clementine icon" />
-					</div>
-					<div class="three-col last-col">
-						<h4>Clementine</h4>
-						<p>Clementine is a multiplatform music player focusing on a fast and easy-to-use interface for searching and playing your music.</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/nav/_explore_ubuntu.html b/templates/desktop/features/nav/_explore_ubuntu.html
old mode 100644
new mode 100755
index f4d7561585d..ef293954bf4
--- a/templates/desktop/features/nav/_explore_ubuntu.html
+++ b/templates/desktop/features/nav/_explore_ubuntu.html
@@ -1,6 +1,7 @@
-	<nav class="box box-grey box-explore-ubuntu clearfix">
+<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">
+		<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="" />
@@ -19,12 +20,6 @@ <h2>Explore Ubuntu's features and apps</h2>
 					<p>Social and email</p>
 				</a>
 			</li>
-			<li{% if level_3 == 'music-and-mobile' %} class="current"{% endif %}>
-				<a href="/desktop/features/music-and-mobile">
-					<img src="{{ STATIC_URL }}img/ubuntu/features/icon-music-and-mobile-64x64.png" width="64" height="64" alt="" />
-					<p>Music and mobile</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="" />
@@ -37,11 +32,6 @@ <h2>Explore Ubuntu's features and apps</h2>
 					<p>Games and apps</p>
 				</a>
 			</li>
-			<li{% if level_3 == 'personal-cloud' %} class="current"{% endif %}>
-				<a href="/desktop/features/personal-cloud">
-					<img src="{{ STATIC_URL }}img/ubuntu/features/icon-personal-cloud-64x64.png" width="64" height="64" alt="" />
-					<p>Personal cloud</p>
-				</a>
-			</li>
 		</ul>
-	</nav><!-- /.row -->
+	</nav>
+</div>
diff --git a/templates/desktop/features/office-applications.html b/templates/desktop/features/office-applications.html
old mode 100644
new mode 100755
index 8bf307d94e1..0fcb136fbc8
--- a/templates/desktop/features/office-applications.html
+++ b/templates/desktop/features/office-applications.html
@@ -21,17 +21,17 @@
 		</ul>
 		{% include "shared/_share_this.html" %}
 	</div>
-	<div class="eight-col last-col no-margin">
-		<img class="touch-border" width="636" height="327" alt="LibreOffice on Ubuntu" src="{{ STATIC_URL }}img/desktop/features/screenshot-features-office-main.png">
+	<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="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 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>
@@ -40,10 +40,10 @@ <h3>Open your Office documents</h3>
 	<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="right pull-bottom-right" src="{{ STATIC_URL }}img/desktop/features/screenshot-features-office-gtd.png" width="287" height="283" alt="" />
+			<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>
diff --git a/templates/desktop/features/personal-cloud.html b/templates/desktop/features/personal-cloud.html
deleted file mode 100644
index 9bda6182767..00000000000
--- a/templates/desktop/features/personal-cloud.html
+++ /dev/null
@@ -1,63 +0,0 @@
-{% extends "desktop/base_desktop.html" %}
-
-{% block title %}Ubuntu One is your personal cloud | Features{% endblock %}
-
-{% block body_classes %}audience-consumer{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Desktop" subsection_title="Features" page_title="Personal cloud"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-{% include "desktop/features/_features_header.html" with page_title="Personal cloud" %}
-
-<div class="row vertical-divider">
-	<h2 class="accessibility-aid">Ubuntu One</h2>	  
-	<p><img src="{{ STATIC_URL }}img/ubuntu/features/features-u1-banner-900x346.png" width="900" height="346" alt="" /></p>     	        
-	<div class="one-intro four-col">
-		<h2>Ubuntu One is your personal cloud.</h2>
-	</div>
-	<div class="one-picto-list seven-col last-col">
-		<div>
-			<p>Ubuntu One works on Windows, OS X, iOS, Android, the web and Ubuntu!</p>
-			<ul class="inline-icons no-bullets">
-				<li><img src="{{ STATIC_URL }}img/pictograms/pictogram-windows-36x36.png" width="36" height="36" title="Windows" alt="Windows pictogram" /></li>
-				<li><img src="{{ STATIC_URL }}img/pictograms/pictogram-osx-36x36.png" width="36" height="36" title="OS X" alt="OS X pictogram" /></li>
-				<li><img src="{{ STATIC_URL }}img/pictograms/pictogram-ios-36x36.png" width="36" height="36" title="iOS" alt="iOS pictogram" /></li>
-				<li><img src="{{ STATIC_URL }}img/pictograms/pictogram-android-36x36.png" width="36" height="36" title="Android" alt="Android pictogram" /></li>
-				<li><img src="{{ STATIC_URL }}img/pictograms/pictogram-web-36x36.png" width="36" height="36" title="Web" alt="Web pictogram" /></li>
-				<li><img src="{{ STATIC_URL }}img/pictograms/pictogram-ubuntu-36x36.png" width="36" height="36" title="Ubuntu" alt="Ubuntu pictogram" /></li>
-			</ul>
-		</div>
-	</div><!-- /.one-picto-list -->
-</div><!-- /.row -->
-
-<div class="row row-one-features">
-<div class="twelve-col">
-	<ul class="no-bullets vertical-divider equal-height twelve-col">
-		<li class="three-col">
-			<img src="{{ STATIC_URL }}img/pictograms/pictogram-your-cloud-80x80.png" width="80" height="80" alt="5GB of cloud storage" />
-			<h3>Your cloud</h3>
-			<p>Store your files on Ubuntu One and access them on all your devices. Instantly. 5GB free.</p>
-		</li>
-		<li class="three-col">
-			<img src="{{ STATIC_URL }}img/pictograms/pictogram-your-music-80x80.png" width="80" height="80" alt="Music pictogram" />
-			<h3>Your music</h3>
-			<p>Your music can be shared between your devices, too. Listen to any song, anywhere, any time.</p>
-		</li>
-		<li class="three-col">
-			<img src="{{ STATIC_URL }}img/pictograms/pictogram-your-network-80x80.png" width="80" height="80" alt="Network pictogram" />
-			<h3>Your network</h3>
-			<p>Share files with colleagues, photos with friends or link them to your social networks.</p>
-		</li>
-		<li class="three-col last-col last-item">
-			<img src="{{ STATIC_URL }}img/pictograms/pictogram-your-photos-80x80.png" width="80" height="80" alt="Snaptastic pictogram" />
-			<h3>Snaptastic!</h3>
-			<p>On iOS and Android, any photo can appear online and on any device, the instant you take it.</p>
-		</li>
-	</ul>
-	</div>
-	<p class="twelve-col"><a class="link-arrow" href="https://one.ubuntu.com">Learn more about Ubuntu One</a></p>
-</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
old mode 100644
new mode 100755
index 6959f2b1dae..dd4be96d2b1
--- a/templates/desktop/features/photos-and-videos.html
+++ b/templates/desktop/features/photos-and-videos.html
@@ -20,18 +20,18 @@
 			</ul>
 		{% include "shared/_share_this.html" %}
 	</div>
-	<div class="eight-col last-col no-margin">
-		<img class="touch-border right" src="{{ STATIC_URL }}img/desktop/features/screenshot-feartures-photos-main.jpg" width="636" height="327" alt="VLC media player on Ubuntu" />
+	<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="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="right" src="{{ STATIC_URL }}img/desktop/features/screenshots-photos-organise.png" alt="Shotwell on Ubuntu" width="287px" height="257px" />
+			<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>
@@ -42,14 +42,14 @@ <h3>Photo and illustration tools</h3>
 		</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="right" src="{{ STATIC_URL }}img/desktop/features/screenshot-photos-watch.png" width="288" height="253" alt="YouTube" />
+			<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>
@@ -63,12 +63,15 @@ <h3>Edit your movies</h3>
 	</div><!-- /.row -->
 
 	<div class="row">
-		<div class="compatible-device twelve-col">
-			<div class="article">
+		<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><!-- /.article -->
-		</div><!-- /.compatible-device -->
+			</div>
+		</div>
 	</div><!-- /.row -->
 
 	<div class="row no-border">
diff --git a/templates/desktop/features/social-and-email.html b/templates/desktop/features/social-and-email.html
old mode 100644
new mode 100755
index b465ab01498..fc29008494a
--- a/templates/desktop/features/social-and-email.html
+++ b/templates/desktop/features/social-and-email.html
@@ -16,7 +16,7 @@
 		<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/icons/icon-thunderbird-reflex-44x88.png" width="47" height="88" title="Thunderbird" alt="Thunderbird icon" />
+				<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" />
@@ -24,12 +24,12 @@
 		</ul>
 		{% include "shared/_share_this.html" %}
 	</div>
-	<div class="eight-col last-col no-margin">
-		<img class="touch-border" src="{{ STATIC_URL }}img/desktop/features/screenshot-social-main.png" width="636" height="327" alt="Evolution on Ubuntu" />
+	<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="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>
@@ -48,10 +48,10 @@ <h3>Dash message lens</h3>
 	<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="right pull-bottom-right" src="{{ STATIC_URL }}img/desktop/features/screenshot-social-skype.jpg" width="363" height="308" alt="Skype video call on Ubuntu" />
+		<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>
@@ -84,7 +84,7 @@ <h4>Pidgin</h4>
 						<p>Pidgin is an easy-to-use and free chat client used by millions.</p>
 					</div>
 				</li>
-				
+
 			</ul>
 		</div>
 	</div>
diff --git a/templates/desktop/features/web-browsing.html b/templates/desktop/features/web-browsing.html
old mode 100644
new mode 100755
index 96f8081073d..94678ea4c55
--- a/templates/desktop/features/web-browsing.html
+++ b/templates/desktop/features/web-browsing.html
@@ -13,20 +13,20 @@
 
 <div class="row intro">
 	<div class="four-col">
-		<p>With Firefox already installed, Ubuntu has everything you need to browse the web. You can choose more browsers, like Google Chrome, from the Ubuntu Software Centre.</p>
+		<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/logo-firefox-reflex-48x88.png" width="48" height="100" title="Firefox" alt="Firefox icon" /></li>
+			<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 "shared/_share_this.html" %}
 	</div><!-- /.four-col -->
-	<div class="eight-col last-col no-margin">
-		<img class="touch-border" src="{{ STATIC_URL }}img/desktop/features/screenshot-features-web-616x326.png" width="636" height="327" alt="BBC Weather in Firefox on Ubuntu, the outlook looks good" />
-	</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="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>
@@ -34,7 +34,7 @@ <h3>Speedy surfing</h3>
 	<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="right pull-bottom-right" src="{{ STATIC_URL }}img/desktop/features/screenshot-web-secure.png" width="288" height="218" alt="Lloyds TSB in Firebox on Ubuntu" />
+		<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 -->
 
@@ -58,7 +58,7 @@ <h4>Adobe Flash Player</h4>
 					</div>
 					<div class="three-col last-col">
 						<h4>Chromium</h4>
-						<p>Chromium is Google&rsquo;s open-source version of their Chrome browser. It&rsquo;s fast, easy to use and, just like Firefox, it&rsquo;s free.</p>
+						<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">
diff --git a/templates/desktop/index.html b/templates/desktop/index.html
old mode 100644
new mode 100755
index 00f6e6dc74e..59cc021f2aa
--- a/templates/desktop/index.html
+++ b/templates/desktop/index.html
@@ -1,6 +1,6 @@
 {% extends "desktop/base_desktop.html" %}
 
-{% block title %}Meet Ubuntu{% endblock %}
+{% block title %}Ubuntu PC operating system{% endblock %}
 {% block meta_description %}Fast, secure and stylishly simple, the Ubuntu operating system is used by 20 million people worldwide every day.{% endblock %}
 {% block meta_keywords %}Ubuntu, Ubuntu operating system, OS, Linux, Windows alternative, Mac alternative, thin client{% endblock %}
 
@@ -11,51 +11,59 @@
 {% endblock second_level_nav_items %}
 
 {% block content %}
-<div class="row row-hero">
-	<div class="five-col">
+<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 "shared/_share_this.html" %}
 	</div><!-- / .five-col -->
 </div><!-- / .row -->
 
-<div class="row tabbed-menu-hover">
-	<div class="six-col">
-	</div><!-- /.six-col -->
-	<ul class="six-col last-col no-bullets">
-		<li id="feature-for-you">
-			<h3><a href="/desktop/features">For you &rsaquo;</a></h3>
-			<p>Enjoy the simplicity of Ubuntu&rsquo;s stylish, intuitive interface. Fast, secure and with thousands of apps to choose.</p>
-			<img src="{{ STATIC_URL }}img/desktop/image-for-you.jpg" class="" alt="">
-		</li>
-		<li id="feature-for-business">
-			<h3><a href="/desktop/business">For business &rsaquo;</a></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.</p>
-			<img src="{{ STATIC_URL }}img/desktop/image-for-business.png" class="" alt="">
-		</li>
-		<li id="feature-for-developers">
-			<h3><a href="/desktop/developers">For developers &rsaquo;</a></h3>
-			<p>Ubuntu provides the largest selection of development tools and the fastest path to cloud deployment.</p>
-			<img src="{{ STATIC_URL }}img/desktop/image-for-developers.png" class="" alt="">
-		</li>
-	</ul>
+<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>
+	</div>
+</div><!-- / .row -->
+
 <div class="row row-beautiful">
-	<div class="five-col">
+	<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. You&rsquo;ll be captivated by its elegance.</p>
+		<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>
-	<div class="seven-col last-col no-margin">
-		<img class="right" src="{{ STATIC_URL }}img/desktop/image-beautiful.jpg" alt="" width="514" height="284" />
+	<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>
 </div><!-- / .row -->
 
 <div class="row vertical-divider equal-height">
 	<div class="four-col">
 		<h2>Secure</h2>
-		<p>You can surf in safety with Ubuntu — confident that your files and data will stay protected —  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>
+		<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>
 
 	<div class="four-col">
@@ -74,6 +82,9 @@ <h2>Compatible</h2>
 		<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>
 	</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>
 </div><!-- / .row -->
 
 <div class="row row-grey loaded">
@@ -83,34 +94,39 @@ <h2>Complete</h2>
 	</div>
 </div>
 
-<div class="row row-image-centered">
-	<span><img src="{{ STATIC_URL }}img/logos/logo-kylin-160.png" alt="Ubuntu Kylin logo" width="160" height="160" /></span>
-	<div class="eight-col">
+<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>
+	<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 &rsaquo;</a></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 equal-height">
+<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 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="four-col">
-			<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 &rsaquo;</a></p>
-		</div>
+	<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>
+	</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 -->
 
 {% include "shared/_community.html" %}
diff --git a/templates/desktop/management.html b/templates/desktop/management.html
old mode 100644
new mode 100755
index a32a24360af..40cd366bd6f
--- a/templates/desktop/management.html
+++ b/templates/desktop/management.html
@@ -14,6 +14,9 @@ <h1>Desktop management</h1>
 			<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">
@@ -22,7 +25,7 @@ <h1>Desktop management</h1>
 			<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 &rsaquo;</a></p>
+			<p><a href="/management">Find out more about Landscape&nbsp;&rsaquo;</a></p>
 		</div><!-- /.twelve-col -->
 </div><!-- /.row -->
 
diff --git a/templates/desktop/shared/_contextual_footer.html b/templates/desktop/shared/_contextual_footer.html
old mode 100644
new mode 100755
index 5fb7e0d238b..690b84ab58a
--- a/templates/desktop/shared/_contextual_footer.html
+++ b/templates/desktop/shared/_contextual_footer.html
@@ -1,14 +1,34 @@
-	<div class="feature-two three-col">
+{% 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>
-		<p><a class="link-cta-ubuntu" href="/download/desktop{% if level_2 == 'ubuntu-kylin' %}/zh-CN{% endif %}">Download now</a></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 three-col">
+	<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 three-col last-col">
+	<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>
@@ -16,3 +36,4 @@ <h3>Further reading</h3>
 			<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/take-the-tour-gallery.html b/templates/desktop/take-the-tour-gallery.html
old mode 100644
new mode 100755
index 34620347fa8..0731f5cb8e0
--- a/templates/desktop/take-the-tour-gallery.html
+++ b/templates/desktop/take-the-tour-gallery.html
@@ -16,48 +16,48 @@ <h1>Ubuntu online tour</h1>
 	 		{% 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/ubuntu/tour-shots/screenshot-folders-900X503.png"><img src="{{ STATIC_URL }}img/ubuntu/tour-shots/screenshot-folders-460X257.jpg" alt="Browse files" width="442" height="246" /></a></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>
 			<h2>Browse files</h2>
 			<p>It&rsquo;s quick and easy to access your folders and files from Ubuntu&rsquo;s home folder.</p>
 		</li>
 		<li class="six-col last-col">
-			<p><a href="{{ STATIC_URL }}img/ubuntu/tour-shots/screenshot-email-900X503.png"><img src="{{ STATIC_URL }}img/ubuntu/tour-shots/screenshot-email-460X257.jpg" alt="Check email" width="442" height="246" /></a>
+			<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>
 		</li>
 		<li class="six-col">
-			<p><a href="{{ STATIC_URL }}img/ubuntu/tour-shots/screenshot-internet-900X503.png"><img src="{{ STATIC_URL }}img/ubuntu/tour-shots/screenshot-internet-460x257.jpg" alt="Surf the web" width="442" height="246" /></a></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>
 			<h2>Surf the web</h2>
 			<p>Browsing the web is fast and secure with Ubuntu and Firefox.</p>
 		</li>
 		<li class="six-col last-col">
-			<p><a href="{{ STATIC_URL }}img/ubuntu/tour-shots/screenshot-writer-900X503.png"><img src="{{ STATIC_URL }}img/ubuntu/tour-shots/screenshot-writer-460x257.jpg" alt="Create documents" width="442" height="246" /></a></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>
 			<h2>Create documents</h2>
 			<p>LibreOffice Writer makes it easy to draft professional documents.</p>
-		</li>	
+		</li>
 		<li class="six-col">
-			<p><a href="{{ STATIC_URL }}img/ubuntu/tour-shots/screenshot-impress-900X503.png"><img src="{{ STATIC_URL }}img/ubuntu/tour-shots/screenshot-impress-460x257.jpg" alt="Create presentations" width="442" height="246" /></a></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>
 			<h2>Create presentations</h2>
 			<p>Make a good impression with the intuitive LibreOffice Impress presentation tool.</p>
 		</li>
 		<li class="six-col last-col">
-			<p><a href="{{ STATIC_URL }}img/ubuntu/tour-shots/screenshot-calc-900X503.png"><img src="{{ STATIC_URL }}img/ubuntu/tour-shots/screenshot-calc-460X257.jpg" alt="Create spreadsheets" width="442" height="246" /></a></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>
 			<h2>Create spreadsheets</h2>
 			<p>LibreOffice Calc has everything you need to create clear and accurate spreadsheets.</p>
 		</li>
 		<li class="six-col">
-			<p><a href="{{ STATIC_URL }}img/ubuntu/tour-shots/screenshot-software-centre-900X503.png"><img src="{{ STATIC_URL }}img/ubuntu/tour-shots/screenshot-software-centre-460x257.jpg" alt="Find apps" width="442" height="246" /></a></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>
 			<h2>Find apps</h2>
 			<p>Search and download apps fast from the Ubuntu Software Centre.</p>
 		</li>
 		<li class="six-col last-col">
-			<p><a href="{{ STATIC_URL }}img/ubuntu/tour-shots/screenshot-photos-900X503.png"><img src="{{ STATIC_URL }}img/ubuntu/tour-shots/screenshot-photos-460-257.jpg" alt="View photos" width="442" height="246" /></a></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>
 			<h2>View photos</h2>
 			<p>You can upload, organise, edit and share your photos with Shotwell.</p>
 		</li>
 	</ul>
-</div><!-- /.row -->    
+</div><!-- /.row -->
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/desktop/take-the-tour.html b/templates/desktop/take-the-tour.html
old mode 100644
new mode 100755
diff --git a/templates/desktop/thank-you.html b/templates/desktop/thank-you.html
old mode 100644
new mode 100755
index 9edc13daefe..29cb5fec0a8
--- a/templates/desktop/thank-you.html
+++ b/templates/desktop/thank-you.html
@@ -7,14 +7,5 @@
 {% endblock second_level_nav_items %}
 
 {% block content %}
-<div class="row row-image-centered row-hero no-border">
-	<div class="seven-col">
-		<h1>Thank you</h1>
-		<h2>We&rsquo;re really excited about your interest in Ubuntu.</h2>
-	  <p>A member of our team will contact you shortly.</p>
-	</div>
-	<span>
-		<img src="{{ STATIC_URL }}img/devices/pictogram-smile-purple.png" width="164" height="162" alt="Smile pictogram" />
-	</span>
-</div><!-- /.row -->
+{% 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-chinese.html b/templates/desktop/ubuntu-kylin-chinese.html
deleted file mode 100644
index ebbd85d25b5..00000000000
--- a/templates/desktop/ubuntu-kylin-chinese.html
+++ /dev/null
@@ -1,102 +0,0 @@
-{% extends "desktop/base_desktop.html" %}
-
-{% block title %}中国的Ubuntu{% endblock %}
-{% block meta_description %}Ubuntu Kylin is a Chinese flavour of Ubuntu. Canonical partnered with CSIP and NUDT to produce a fully localised and customised version of 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 "templates/_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 &rsaquo;</a>
-	<div class="six-col no-margin-bottom">
-		<h1 lang="zh">中国的Ubuntu</h1>
-		<p lang="zh">Ubuntu Kylin桌面项目从13.04开始正式成为Ubuntu的一部分，Ubuntu中国版本从此诞生。Ubuntu Kylin拥有标准Ubuntu的所有特性和功能，同时具有专为中文用户开发的本地化界面和定制体验&#12290;</p>
-		<p><a lang="zh" href="/download/desktop/zh-CN" class="link-cta-ubuntu">下载Ubuntu Kylin</a></p>
-		{% include "shared/_share_this.html" %}
-	</div><!-- / .five-col -->
-</div><!-- / .row -->
-
-<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 lang="zh">全球伙伴关系</h2>
-	<p lang="zh" class="six-col">T为了创建Ubuntu Kylin，Canonial公司、中国软件与集成电路促进中心（CSIP）和国防科学技术大学（NUDT）共同成立了开源软件联合创新实验室，旨在提供一个高度本地化和定制化的Ubuntu版本</p>
-	<p lang="zh" class="six-col last-col">Ubuntu Kylin团队以开源社区模式运作，采用Ubuntu核心功能以更好的适应中文用户。除了本地化的Ubuntu软件中心、Ubuntu One和大部分Unity界面等，Ubuntu Kylin还包含许多常用的中文应用&#12290;</p>
-</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/image-youker-assistant.png" alt="" width="469" height="308" />
-	</div>
-	<div class="six-col last-col">
-		<h2 lang="zh">优客助手</h2>
-		<p lang="zh">优客助手是一个简单但强大的系统工具，用于帮助Windows用户尽可能快速、平滑的切换到Ubuntu平台。该集成工具可辅助用户完成日常的系统维护任务，如硬件检测和界面定制等。通过优客助手，用户无需担心如何学习使用Ubuntu系统&#12290;</p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row">
-	<div class="six-col">
-		<h2 lang="zh">智能Scope</h2>
-		<p lang="zh">Ubuntu Kylin Dash面板为中文用户提供特定的、本地化的智能Scope，使中文在线资源搜索更加便捷、准确。图片搜索来自搜狗、视频搜索来自优酷、音乐搜索来自百度——所有这些结果都取自本地资源&#12290;</p>
-	</div>
-	<div class="six-col  no-margin-bottom last-col">
-		<img class="touch-border" src="{{ STATIC_URL }}img/desktop/image-smart-scopes.png" 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 lang="zh">中国农历软件</h2>
-		<p lang="zh">除了西方公历以外，Ubuntu Kylin内置提供中国传统的农历功能，中国用户能够方便地根据国家假日和传统习俗安排他们的日常生活计划&#12290;</p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row row-grey">
-	<div class="six-col">
-		<h2 lang="zh">金山WPS办公套件</h2>
-		<p lang="zh">中国最受欢迎的办公套件为Ubuntu Kylin上提供定制版。通过与金山公司的密切合作，用户现在可以充分使用WPS办公套件提供的字处理、电子表格和演示软件等强大功能&#12290;</p>
-	</div>
-	<div class="six-col no-margin-bottom last-col">
-		<img class="touch-border screenshot-shadowed" src="{{ STATIC_URL }}img/desktop/image-kingsoft-wps-office.png" alt="" width="488" height="260" />
-	</div>
-</div><!-- / .row -->
-
-<div class="row row-grey row-image-centered">
-	<span><img src="{{ STATIC_URL }}img/desktop/image-instant-messaging.png" alt="" width="289" height="211" /></span>
-	<div class="seven-col">
-		<h2 lang="zh">“莲”即时通信软件</h2>
-		<p lang="zh">“莲”即时通信软件由NUDT团队设计开发，用户不仅可以与朋友、家人保持联系，也可以作为企业级通信工具与同事进行沟通和协作&#12290;</p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row row-image-centered">
-	<div class="eight-col">
-		<h2 lang="zh">其它重要特色</h2>
-		<ul class="list-ubuntu clear">
-			<li lang="zh">通过定制的Fcitx（小企鹅）输入法提供更加有效和智能的中文输入</li>
-			<li lang="zh">Ubuntu Kylin主题图标和壁纸</li>
-			<li lang="zh">即将推出——金山快盘云存储服务，为每位用户提供100GB免费存储空间&#12290;</li>
-		</ul>
-	</div>
-	<span><img src="{{ STATIC_URL }}img/desktop/image-kylin-icons.png" alt="" width="260" height="190" /></span>
-</div><!-- / .row -->
-
-<div class="row row-ubuntu-kylin-more row-image-centered no-border">
-	<span><img src="{{ STATIC_URL }}img/desktop/image-kylin.png" alt="image-kylin" width="320" height="320" /></span>
-	<div class="seven-col last-col">
-		<h2 lang="zh">找到更多</h2>
-		<p lang="zh">如果您希望进一步了解Ubuntu Kylin，加入社区&#65292;<br />或者获取更多其他信息，请访问官方网站&#12290;</p>
-		<p><a href="http://www.ubuntukylin.com" lang="zh">访问Ubuntu Kylin.com &rsaquo;</a></p>
-	</div>
-</div>
-
-{% 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
new file mode 100755
index 00000000000..dbe0ade4e90
--- /dev/null
+++ b/templates/desktop/ubuntu-kylin-zh-CN.html
@@ -0,0 +1,111 @@
+{% 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 "templates/_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 "shared/_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
old mode 100644
new mode 100755
index fd6b032867f..9831c8e4b38
--- a/templates/desktop/ubuntu-kylin.html
+++ b/templates/desktop/ubuntu-kylin.html
@@ -1,8 +1,8 @@
 {% extends "desktop/base_desktop.html" %}
 
-{% block title %}China's own Ubuntu{% endblock %}
+{% block title %}Ubuntu Kylin{% endblock %}
 {% block meta_description %}Ubuntu Kylin is a Chinese flavour of Ubuntu. Canonical partnered with CSIP and NUDT to produce a fully localised and customised version of 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 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 "templates/_nav_breadcrumb.html" with section_title="Desktop" page_title="Ubuntu Kylin" %}
@@ -10,11 +10,13 @@
 
 {% block content %}
 <div class="row row-hero">
-	<a class="lang-switch" href="/desktop/ubuntu-kylin-chinese" lang="zh">中国版 &rsaquo;</a>
+	<a class="lang-switch" href="/desktop/ubuntu-kylin-chinese" lang="zh">中国版&nbsp;&rsaquo;</a>
 	<div class="six-col no-margin-bottom">
 		<h1>China&rsquo;s own Ubuntu</h1>
-		<p>The Ubuntu Kylin Desktop Project, a formal part of Ubuntu since 13.04, is bringing Ubuntu to China. Ubuntu Kylin has all the features and functions of standard Ubuntu, but with fully localised interfaces and a customised experience built specifically for Chinese users.</p>
-		<p><a href="/download/desktop/zh-CN" class="link-cta-ubuntu">Download Ubuntu Kylin</a></p>
+		<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 "shared/_share_this.html" %}
 	</div><!-- / .five-col -->
 </div><!-- / .row -->
@@ -26,13 +28,23 @@ <h1>China&rsquo;s own Ubuntu</h1>
 		<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 Circuit Promotions Centre (CSIP) and the National University of Defense 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 One and much of the Unity interface, Ubuntu Kylin also features some of the most commonly used Chinese applications.</p>
+	<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 -->
 
-<div class="row row-grey">
-	<div class="six-col no-margin-bottom">
-		<img  class="touch-border pull-left-40" src="{{ STATIC_URL }}img/desktop/image-youker-assistant.png" alt="" width="469" height="308" />
+<div class="row row-sogou">
+	<h2>Sogou Input Method</h2>
+	<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>
+	</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 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>
@@ -41,17 +53,17 @@ <h2>Youker Assistant</h2>
 </div><!-- / .row -->
 
 <div class="row">
+	<h2>Smart Scopes</h2>
 	<div class="six-col">
-		<h2>Smart Scopes</h2>
 		<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>
 	</div>
 	<div class="six-col  no-margin-bottom last-col">
-		<img class="touch-border" src="{{ STATIC_URL }}img/desktop/image-smart-scopes.png" alt="" width="482" height="302"/>
+		<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">
+	<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">
@@ -66,36 +78,45 @@ <h2>Kingsoft WPS Office</h2>
 		<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 screenshot-shadowed" src="{{ STATIC_URL }}img/desktop/image-kingsoft-wps-office.png" alt="" width="488" height="260" />
+		<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-grey row-image-centered">
-	<span><img src="{{ STATIC_URL }}img/desktop/image-instant-messaging.png" alt="" width="289" height="211" /></span>
+<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>
 </div><!-- / .row -->
 
+<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>
+	</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 class="row row-image-centered">
-	<div class="eight-col">
-		<h2>Other key features</h2>
-		<ul class="list-ubuntu clear">
-			<li>Efficient and intelligent Chinese keyboard input.</li>
-			<li>Ubuntu Kylin themed icons and wallpapers.</li>
-			<li>Coming soon &mdash; Kingsoft Kuaipan cloud storage service, complete with 100GB of free storage for every user.</li>
-		</ul>
+	<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>
-	<span><img src="{{ STATIC_URL }}img/desktop/image-kylin-icons.png" alt="" width="260" height="190" /></span>
+	<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/image-kylin.png" alt="image-kylin" width="320" height="320" /></span>
+	<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 &rsaquo;</a></p>
+		<p><a href="http://www.ubuntukylin.com">Visit UbuntuKylin.com&nbsp;&rsaquo;</a></p>
 	</div>
 </div>
 
diff --git a/templates/download/_base_download.html b/templates/download/_base_download.html
old mode 100644
new mode 100755
diff --git a/templates/download/_nav_secondary.html b/templates/download/_nav_secondary.html
old mode 100644
new mode 100755
index a29b0232ac6..8808e414066
--- a/templates/download/_nav_secondary.html
+++ b/templates/download/_nav_secondary.html
@@ -1,8 +1,8 @@
-	<ul{% if list_class %} class="{{ list_class }}"{% endif %}>
-		{% if arrow %} <li class="arrow-up"></li> {% endif %}
+	<ul{% if list_class %} class="{{ list_class }}"{% endif %} class="second-level-nav">
 		<li class="first{% if level_1 == 'download' and not level_2 %} active{% endif %}"><a href="/download">Overview</a></li>
 		<li{% if level_2 == 'cloud' %} class="active"{% endif %}><a href="/download/cloud">Cloud</a></li>
 		<li{% if level_2 == 'server' %} class="active"{% endif %}><a href="/download/server">Server</a></li>
 		<li{% if level_2 == 'desktop' %} class="active"{% endif %}><a href="/download/desktop">Desktop</a></li>
-		<li{% if level_2 == 'zh-CN' %} class="active"{% endif %}><a href="/download/zh-CN">Ubuntu <span lang="zh">桌面版</span></a></li>
+		<li{% if level_2 == 'ubuntu-kylin' or level_2 == 'ubuntu-kylin-zh-CN' %} class="active"{% endif %}><a href="/download/ubuntu-kylin">Ubuntu Kylin</a></li>
+		<li{% if level_2 == 'alternative-downloads' %} class="active"{% endif %}><a href="/download/alternative-downloads">Alternative downloads</a></li>
 	</ul>
\ No newline at end of file
diff --git a/templates/download/_nav_tertiary.html b/templates/download/_nav_tertiary.html
old mode 100644
new mode 100755
index 331585f070c..08188918889
--- a/templates/download/_nav_tertiary.html
+++ b/templates/download/_nav_tertiary.html
@@ -1,62 +1,60 @@
-	<ul>
+	<ul class="third-level-nav">
+{% if level_2 == 'server' and not level_3 == 'install-ubuntu-server' and not level_3 == 'thank-you' %}
+		<li{% if level_3 == 'arm' %} class="active"{% endif %}><a href="/download/server/arm">ARM</a></li>
+		<li{% if level_3 == 'power8' %} class="active"{% endif %}><a href="/download/server/power8">POWER8</a></li>
+{% endif %}
 {% if level_3 == 'burn-a-dvd-on-mac-osx' %}
-		<li class="active">How to burn a DVD on OS X</li>
+		<li class="active"><a href="/download/desktop/burn-a-dvd-on-mac-osx">How to burn a DVD on OS X</a></li>
 {% endif %}
 {% if level_3 == 'burn-a-dvd-on-ubuntu' %}
-		<li class="active">How to burn a DVD on Ubuntu</li>
+		<li class="active"><a href="/download/desktop/burn-a-dvd-on-ubuntu">How to burn a DVD on Ubuntu</a></li>
 {% endif %}
 {% if level_3 == 'burn-a-dvd-on-windows' %}
-		<li class="active">How to burn a DVD on Windows</li>
+		<li class="active"><a href="/download/desktop/burn-a-dvd-on-windows">How to burn a DVD on Windows</a></li>
 {% endif %}
 {% if level_3 == 'create-a-usb-stick-on-mac-osx' %}
-		<li class="active">Create a bootable USB stick on OS X</li>
+		<li class="active"><a href="/download/desktop/create-a-usb-stick-on-mac-osx">Create a bootable USB stick on OS X</a></li>
 {% endif %}
 {% if level_3 == 'create-a-usb-stick-on-ubuntu' %}
-		<li class="active">Create a bootable USB stick on Ubuntu</li>
+		<li class="active"><a href="/download/desktop/create-a-usb-stick-on-ubuntu">Create a bootable USB stick on Ubuntu</a></li>
 {% endif %}
 {% if level_3 == 'create-a-usb-stick-on-windows' %}
-		<li class="active">Create a bootable USB stick on Windows</li>
+		<li class="active"><a href="/download/desktop/create-a-usb-stick-on-windows">Create a bootable USB stick on Windows</a></li>
 {% endif %}
 {% if level_3 == 'install-desktop-latest' %}
-		<li class="active">Install Ubuntu 13.10</li>
+		<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">Install Ubuntu 12.04.4 LTS</li>
+		<li class="active"><a href="/download/desktop/install-desktop-long-term-support">Install Ubuntu 12.04.4 LTS</a></li>
 {% endif %}
 {% if level_3 == 'install-ubuntu-desktop' %}
-		<li class="active">Installing Ubuntu Desktop</li>
-{% endif %}
-{% if level_3 == 'install-ubuntu-with-windows' %}
-		<li class="active">Installing Ubuntu with the Windows installer</li>
+		<li class="active"><a href="/download/desktop/install-ubuntu-desktop">Installing Ubuntu Desktop</a></li>
 {% endif %}
 {% if level_3 == 'try-ubuntu-before-you-install' %}
-		<li class="active">Try Ubuntu before you install</li>
+		<li class="active"><a href="/download/desktop/try-ubuntu-before-you-install">Try Ubuntu before you install</a></li>
 {% endif %}
 {% if level_3 == 'install-ubuntu-server' %}
-		<li class="active">Installing Ubuntu Server</li>
+		<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">Installing Ubuntu OpenStack</li>
+		<li class="active"><a href="/download/cloud/install-ubuntu-cloud">Installing Ubuntu OpenStack</a></li>
 {% endif %}
 {% if level_3 == 'cloud-archive-instructions' %}
-		<li class="active">Cloud archive instructions</li>
+		<li class="active"><a href="/download/cloud/cloud-archive-instructions">Cloud archive instructions</a></li>
 {% endif %}
 {% if level_3 == 'upgrade' %}
-		<li class="active">Upgrade</li>
-{% endif %}
-{% if level_3 == 'windows-installer' %}
-		<li class="active">Windows installer</li>
+		<li class="active"><a href="/download/desktop/upgrade">Upgrade</a></li>
 {% endif %}
 {% if level_3 == 'thank-you' %}
-		<li class="active">Thank you</li>
+		<li class="active"><a href="/download/desktop/thank-you">Thank you</a></li>
 {% endif %}
 {% if level_2 == 'alternative-downloads' %}
-		<li class="active">Alternative Downloads</li>
+		<li class="active"><a href="/download/alternative-downloads">Alternative Downloads</a></li>
 {% endif %}
-{% if level_3 == 'zh-CN' %}
-		<li class="active">Ubuntu <span lang="zh">桌面版</span> 12.04 LTS</li>
+{% if level_3 == 'ubuntu-kylin' or level_3 == 'ubuntu-kylin-zh-CN' %}
+		<li class="active"><a href="/download/desktop/ubuntu-kylin">Ubuntu Kylin</a></li>
 {% endif %}
 {% if level_3 == 'contribute' %}
-		<li class="active">Contribute</li>
+		<li class="active"><a href="/download/desktop/contribute">Contribute</a></li>
 {% endif %}
 	</ul>
\ No newline at end of file
diff --git a/templates/download/alternative-downloads.html b/templates/download/alternative-downloads.html
old mode 100644
new mode 100755
index 2802e3eeb68..06b29029d31
--- a/templates/download/alternative-downloads.html
+++ b/templates/download/alternative-downloads.html
@@ -8,80 +8,82 @@
 	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="Alternative downloads"  %}
 {% endblock second_level_nav_items %}
 
-{% block content %}	
-<div class="row row-hero no-border">
-	<div class="twelve-col clearfix">
+{% block content %}
+<div class="row row-hero row-image-centered">
+	<div class="seven-col">
 		<h1>Alternative downloads</h1>
-	</div>
-	<div class="box box-grey no-border clear">
-		<div class="clearfix">
-			<p class="eight-col">These options include torrents, which can potentially mean a quicker download, our network installer for older systems and special configurations and links to our regional DVD image mirrors. If you don&rsquo;t specifically require any of these installers, we recommend using our <a href="/download">default installers</a>.</p>
-		</div><!-- /.clearfix -->
-		<div class="box box-highlight clearfix">
-			<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 class="link-arrow" href="http://cdimage.ubuntu.com/netboot/12.04/">Download the network installer for 12.04.4 LTS</a></li>
-				<li><a class="link-arrow" href="http://cdimage.ubuntu.com/netboot/13.10/">Download the network installer for 13.10</a></li>
-			</ul>	
-			</div>
-		</div><!-- /.box -->
-		<div class="box box-highlight">
-			<h2>BitTorrent</h2>
-			<p class="eleven-col append-four">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>
+		<p>These options include torrents, which can potentially mean a quicker download, our network installer for older systems and special configurations and links to our regional DVD image mirrors. If you don&rsquo;t specifically require any of these installers, we recommend using our <a href="/download">default installers</a>.</p>
+	</div><!-- /.eight-col -->
+    <span>
+        <img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-download-warmgrey.svg" width="200" height="200" alt="" class="priority-0" />
+    </span>
+</div>
+<div class="row">
+    <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>
+        </ul>
+    </div><!-- /.eight-col -->
+</div><!-- /.row -->
 
-			<h3>Ubuntu 13.10 torrents</h3>
-			<ul>
-				<li><a href="http://releases.ubuntu.com/13.10/ubuntu-13.10-desktop-amd64.iso.torrent">Ubuntu 13.10 Desktop (64-bit)</a></li>
-				<li><a href="http://releases.ubuntu.com/13.10/ubuntu-13.10-desktop-i386.iso.torrent">Ubuntu 13.10 Desktop (32-bit)</a></li>
-				<li><a href="http://releases.ubuntu.com/13.10/ubuntu-13.10-server-amd64.iso.torrent">Ubuntu 13.10 Server (64-bit)</a></li>
-				<li><a href="http://releases.ubuntu.com/13.10/ubuntu-13.10-server-i386.iso.torrent">Ubuntu 13.10 Server (32-bit)</a></li>
-			</ul>
-			<h3>Ubuntu 12.04.4 LTS torrents</h3>
-			<ul>
-				<li><a href="http://releases.ubuntu.com/12.04/ubuntu-12.04.4-alternate-amd64.iso.torrent">Ubuntu 12.04.4 alternate (64-bit)</a></li>
-				<li><a href="http://releases.ubuntu.com/12.04/ubuntu-12.04.4-alternate-i386.iso.torrent">Ubuntu 12.04.4 alternate (32-bit)</a></li>
-				<li><a href="http://releases.ubuntu.com/12.04/ubuntu-12.04.4-desktop-amd64.iso.torrent">Ubuntu 12.04.4 Desktop (64-bit)</a></li>
-				<li><a href="http://releases.ubuntu.com/12.04/ubuntu-12.04.4-desktop-i386.iso.torrent">Ubuntu 12.04.4 Desktop (32-bit)</a></li>
-				<li><a href="http://releases.ubuntu.com/12.04/ubuntu-12.04.4-server-amd64.iso.torrent">Ubuntu 12.04.4 Server (64-bit)</a></li>
-				<li><a href="http://releases.ubuntu.com/12.04/ubuntu-12.04.4-server-i386.iso.torrent">Ubuntu 12.04.4 Server (32-bit)</a></li>		
-			</ul>
-		</div><!-- /.box -->
-		<div class="box box-highlight clearfix">
-			<h2>Other images</h2>
-			<p class="eleven-col append-four">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 class="row">
+    <div class="eight-col append-four">
+        <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>Ubuntu 12.04.4 LTS torrents</h3>
+        <ul>
+            <li><a href="http://releases.ubuntu.com/12.04/ubuntu-12.04.4-alternate-amd64.iso.torrent">Ubuntu 12.04.4 alternate (64-bit)&nbsp;&rsaquo;</a></li>
+            <li><a href="http://releases.ubuntu.com/12.04/ubuntu-12.04.4-alternate-i386.iso.torrent">Ubuntu 12.04.4 alternate (32-bit)&nbsp;&rsaquo;</a></li>
+            <li><a href="http://releases.ubuntu.com/12.04/ubuntu-12.04.4-desktop-amd64.iso.torrent">Ubuntu 12.04.4 Desktop (64-bit)&nbsp;&rsaquo;</a></li>
+            <li><a href="http://releases.ubuntu.com/12.04/ubuntu-12.04.4-desktop-i386.iso.torrent">Ubuntu 12.04.4 Desktop (32-bit)&nbsp;&rsaquo;</a></li>
+            <li><a href="http://releases.ubuntu.com/12.04/ubuntu-12.04.4-server-amd64.iso.torrent">Ubuntu 12.04.4 Server (64-bit)&nbsp;&rsaquo;</a></li>
+            <li><a href="http://releases.ubuntu.com/12.04/ubuntu-12.04.4-server-i386.iso.torrent">Ubuntu 12.04.4 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 -->
 
-			<h3>Select the nearest mirror</h3>
-			<div class="four-col">
-				<ul>
-					<li><a href="http://mirror.eftel.com/ubuntu-dvd">Australia</a></li>
-					<li><a href="http://ftp.funet.fi/pub/Linux/INSTALL/Ubuntu/dvd-releases/releases">Finland</a></li>
-					<li><a href="ftp://ftp.free.fr/mirrors/ftp.ubuntu.com/dvd/current">France</a></li>
-					<li><a href="http://swtsrv.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu-dvd-release">Germany</a></li>
-					<li><a href="http://ftp.ntua.gr/pub/linux/ubuntu-releases-dvd">Greece</a></li>
-					<li><a href="http://ftp.heanet.ie/pub/ubuntu-cdimage/releases">Ireland</a></li>
-					<li><a href="http://nl.archive.ubuntu.com/ubuntu-cdimages">Netherlands (1)</a></li>
-				</ul>	
-			</div><!-- /.four-col -->		
-			<div class="four-col last-col">
-				<ul>
-					<li><a href="http://nginyang.uvt.nl">Netherlands (2)</a></li>
-					<li><a href="http://mirror.yandex.ru/ubuntu-cdimage/releases">Russian Federation</a></li>
-					<li><a href="http://es.archive.ubuntu.com/cdimage/releases">Spain</a></li>
-					<li><a href="http://ftp.acc.umu.se/mirror/cdimage.ubuntu.com/releases">Sweden</a></li>
-					<li><a href="http://tw.archive.ubuntu.com/ubuntu-dvd-releases/releases">Taiwan</a></li>
-					<li><a href="http://www.mirrorservice.org/sites/cdimage.ubuntu.com/cdimage/releases">United Kingdom</a></li>
-					<li><a href="http://mirror.anl.gov/pub/ubuntu-iso/DVDs/ubuntu">United States</a></li>
-				</ul>
-			</div><!-- /.four-col -->		
-		</div><!-- /.box -->
-		<div class="box box-highlight clearfix">
-			<h2>Past releases and other flavours</h2>
-			<p class="eleven-col append-four">Looking for an older release of Ubuntu? Whether its Precise Pangolin 12.04.1 with the Precise stack or Karmic Koala 9.10, you can find them in our past releases.</p>
-			<p><a class="link-arrow" href="http://releases.ubuntu.com/">Past releases</a></p>
-		</div>
-	</div>
+<div class="row">
+    <div class="eight-col append-four">
+        <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>
+    </ul>
 </div><!-- /.row -->
+
+<div class="row no-border">
+    <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>
+    </div><!-- /.eight-col -->
+</div><!-- /.row -->
+
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/download/arm.html b/templates/download/arm.html
deleted file mode 100644
index ab0b52499ea..00000000000
--- a/templates/download/arm.html
+++ /dev/null
@@ -1,77 +0,0 @@
-{% extends "download/_base_download.html" %}
-
-{% block title %}Download Ubuntu Server for ARM{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Download" page_title="ARM"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-margin-bottom">
-	<h1>Ubuntu for ARM</h1>
-	<div class="box box-grey no-border">
-		<div class="box box-highlight clearfix no-margin-bottom vertical-divider">
-			<div class="eight-col">
-				<h2>Server</h2>
-				<p>Ubuntu Server for ARM is an ARM-compatible implementation of our well-known <a href="/server">Ubuntu Server</a>. Built for scale-out and deployed on leading Hyperscale-class products, including <a href="/partners/hp/moonshot">HP Moonshot</a>, Ubuntu Server for ARM includes the full set of workloads end-users expect from a general-purpose Operating System, including a LAMP stack, Ceph storage and Hadoop-based analytics.</p>
-				<p>Ubuntu Server for ARM is available for selected SoCs as an over-the-network installer. Network boot infrastructure is required.</p>
-				<p><a href="https://wiki.ubuntu.com/ARM/Server/Install">Read the full installation instructions &rsaquo;</a></p>
-			</div>
-			<div class="four-col last-col no-margin-bottom">
-				<h3>Certified SoCs</h3>
-					<h4>Calxeda ECX-1000 (Highbank)</h4>
-					<ul>
-						<li><a href="http://ports.ubuntu.com/ubuntu-ports/dists/precise-updates/main/installer-armhf/current/images/highbank/netboot/">12.04 LTS &rsaquo;</a></li>
-						<li><a href="http://ports.ubuntu.com/ubuntu-ports/dists/saucy/main/installer-armhf/current/images/generic/netboot/">13.10 &rsaquo;</a>  </li>
-					</ul>
-					<h4>Calxeda ECX-2000 (Midway) <br/><span class="note">featuring LPAE support</span></h4>
-					<ul>
-						<li><a href="http://ports.ubuntu.com/ubuntu-ports/dists/saucy/main/installer-armhf/current/images/generic-lpae/netboot/">13.10 &rsaquo;</a></li>
-					</ul>
-					
-					<h4>Marvell Armada XP</h4>
-						<ul>
-							<li><a href="http://ports.ubuntu.com/ubuntu-ports/dists/precise-updates/main/installer-armhf/current/images/armadaxp/netboot">12.04 LTS &rsaquo;</a> </li>
-						</ul>
-
-				<h3>Preview releases</h3>
-				
-				<h4>Cavium Thunder ARMv8 Developer Platform <br/><span class="note">registration required</span></h4>
-				
-				<ul>
-					<li><a href="http://www.cavium.com/thundersdk_access_application.html">13.10 &rsaquo;</a></li>
-				</ul>
-			</div>
-		</div><!-- /.box-highlight -->
-	</div><!-- /.box -->
-	
-	<div class="box box-grey no-border">
-		<div class="box box-highlight clearfix no-margin-bottom vertical-divider">
-			<div class="eight-col">
-				<h2>Desktop and client</h2>
-				<p>The ARM implementation of Ubuntu also supports popular mobile-focused platforms like the TI Pandaboard.</p>
-				<p>Installation of these images is device-dependent.</p>
-				<p><a href="https://wiki.ubuntu.com/ARM/OmapDesktopInstall">Read the full installation instructions for OMAP desktop &rsaquo;</a></p>
-			</div>
-			<div class="four-col last-col no-margin-bottom">
-				<h3>Community supported</h3>
-				<h4>TI OMAP4 (Pandaboard)</h4>
-				<ul>
-					<li><a href="http://cdimage.ubuntu.com/releases/12.04.4/release/ubuntu-12.04-preinstalled-desktop-armhf+omap4.img.gz">12.04 &rsaquo;</a> </li>
-				</ul>
-				
-				<h4>TI OMAP3 (Beagleboard)</h4>
-				<ul>
-					<li><a href="http://cdimage.ubuntu.com/releases/12.04.4/release/ubuntu-12.04-preinstalled-desktop-armhf+omap.img.gz">12.04 &rsaquo;</a> </li>
-				</ul>
-			</div>
-		</div><!-- /.box-highlight -->
-	</div><!-- /.box-grey -->
-
-	<div class="eight-col">
-		<h3>Looking for the x86 version?</h3>
-		<p>Visit the download page for fully supported versions of <a href="/download/">Ubuntu for x86 chipsets</a> including Intel Avoton and AMD Kabini.</p>
-	</div><!-- /.twelve-col -->
-</div><!-- /.row -->
-{% endblock content %}
-{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
diff --git a/templates/download/cloud/cloud-archive-instructions.html b/templates/download/cloud/cloud-archive-instructions.html
deleted file mode 100644
index 9b05fc6f67e..00000000000
--- a/templates/download/cloud/cloud-archive-instructions.html
+++ /dev/null
@@ -1,40 +0,0 @@
-{% extends "download/_base_download.html" %}
-
-{% block title %}Cloud Archive instruction{% endblock %}
-
-{% block extra_body_class %}download-help{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Cloud" page_title="Cloud Archive instruction"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-border">
-	<div class="eight-col append-four">
-		<h1>Cloud Archive instructions</h1>
-		<p>Canonical&rsquo;s Ubuntu Cloud archive provides support for newer releases of OpenStack on Ubuntu Server 12.04 LTS</p>
-	</div>
-	<div id="download-help" class="eight-col box box-grey no-border">
-		<div class="box box-highlight">
-			<ol class="no-bullets no-margin-bottom">
-				<li>
-					<p>To access OpenStack Havana  from the Ubuntu Cloud archive, please run the following command:</p>
-					<pre>sudo add-apt-repository cloud-archive:havana</pre>
-				</li>
-				<li>
-					<p>You can also work with new versions that are being verified for release if you want to help us testing:</p>
-					<pre>sudo add-apt-repository cloud-archive:havana-proposed</pre>
-				</li>
-			</ol>
-		</div><!-- /.box -->
-</div><!-- /.eight-col -->
-<div class="sidebar aside four-col last-col">
-		<h2>Links</h2>
-		<ul>
-			<li><a class="link-arrow" href="https://wiki.ubuntu.com/ServerTeam/CloudArchive">More info about the cloud archive</a></li>
-			<li><a class="link-arrow" href="/download/help/install-ubuntu-cloud#cloud-infra">Deployment instructions</a></li>
-		</ul>
-</div><!-- /.sidebar -->
-</div><!-- /.row -->
-{% endblock content %}
-{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/download/cloud/index.html b/templates/download/cloud/index.html
old mode 100644
new mode 100755
index 1597a953e77..979175e6cd6
--- a/templates/download/cloud/index.html
+++ b/templates/download/cloud/index.html
@@ -10,92 +10,54 @@
 {% endblock second_level_nav_items %}
 
 {% block content %}
-{% with ubuntu_release="13.10" openstack_version="Havana" %}
-<div class="row row-hero no-border">
-	<h1>Download Ubuntu Server for cloud</h1>
-		<div class="eight-col">
-			<p>Download Ubuntu Server {{ ubuntu_release }} to get the latest features (including the {{ openstack_version }} release of OpenStack) or stay with Ubuntu 12.04.4 for extended support. If you&rsquo;re a technical user and you&rsquo;re looking for specific version downloads, go to <a href="http://releases.ubuntu.com">releases.ubuntu.com</a>.</p>
-		</div><!-- /.eight-col -->
-		<div class="four-col last-col text-center">
-			<ul class="inline-icons">
-				<li><img src="{{ STATIC_URL }}img/pictograms/image-picto-ubuntu.png" width="77" height="77" alt="" /></li>
-				<li><img src="{{ STATIC_URL }}img/pictograms/image-picto-openstack.png" width="77" height="77" alt="" /></li>
-			</ul>
-		</div>
-	<div class="box-grey twelve-col no-margin-bottom">
-		<div class="box box-highlight clearfix">
-			<h3><strong>For extended support,</strong><br />choose Ubuntu Server 12.04.4 LTS</h3>
-			<div class="download-description eight-col">
-				<p>Ubuntu 12.04 LTS is a long-term support release, and has support guaranteed until April 2017. The OpenStack {{ openstack_version }} release is available via <br/>the <a href="/download/cloud/cloud-archive-instructions">Ubuntu Cloud Archive</a>.</p>
-				<p><a href="/download/cloud/install-ubuntu-cloud">Read the full installation instructions &rsaquo;</a></p>
+{% with ubuntu_release="14.04.1" openstack_version="Icehouse" %}
+<div class="row row-hero row-background no-border">
+	<div class="twelve-col append-four">
+		<h1>Download Ubuntu Server for cloud</h1>
+	</div>
+	<div class="twelve-col">
+		<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>
 			</div>
 			<div class="four-col last-col">
+				<p class="gap-from-top">64-bit only</p>
 				<form class="form-download" action="/download/cloud/thank-you/" method="get">
 					<fieldset>
-						<input name="version" value="12.04.4" type="hidden">
-						<label for="input-bits">Choose your flavour</label>
-						<select id="input-bits" name="architecture">
-							<option value="i386">32-bit</option>
-							<option value="amd64" selected="selected">64-bit (recommended)</option>
-						</select>
-					</fieldset>
-					<div>
-						<button class="cta-large" type="submit">Get Ubuntu 12.04 LTS</button>
-					</div>
-				</form>
-			</div><!-- /.four-col -->
-		</div><!-- /.box -->
-		
-		<div class="box box-highlight clearfix">
-			<h3><strong>For the latest features,</strong><br />choose Ubuntu Server {{ ubuntu_release }}</strong></h3>
-			<div class="download-description eight-col">
-				<p>Ubuntu {{ ubuntu_release }} will be supported for 9 months and includes cutting-edge new features such as the {{ openstack_version }} release of OpenStack.</p>
-				<p><a href="/download/cloud/install-ubuntu-cloud">Read the full installation instructions &rsaquo;</a></p>
-			</div>
-			<div class="four-col last-col">
-				<form class="form-download single-download" action="/download/cloud/thank-you/" method="get">
-					<fieldset>
-						<input type="hidden" name="version" value="13.10" />
+						<input name="version" value="{{ubuntu_release}}" type="hidden">
 						<input name="architecture" value="amd64" type="hidden">
 					</fieldset>
 					<div>
-						<button class="cta-large" type="submit">Get Ubuntu {{ ubuntu_release }}</button>
-					<span class="small">Ubuntu Server {{ ubuntu_release }} 64-bit version</span>
+						<button type="submit">Download</button>
 					</div>
 				</form>
 			</div><!-- /.four-col -->
 		</div><!-- /.box -->
-	</div><!-- /.box -->
+	</div>
 </div><!-- /.row -->
 
-<div class="row no-border">
-	<h2>More tools and options</h2>
-	<div class="four-col box">
-		<h3><a href="/cloud/orchestration/juju">Service orchestration with Juju &rsaquo;</a></h3>
-		<p>With Juju, the service orchestration tool from the Ubuntu project, deployment instructions for cloud services can be stored in charms that can be used, stored and shared. We call it Devops Distilled.</p>
-	</div>
-	<div class="four-col box">
-		<h3><a href="/download/arm">Ubuntu for ARM &rsaquo;</a></h3>
-		<p>Ubuntu Server and Ubuntu Desktop for ARM are a general purpose OS for ARM-based systems. Please note that currently only Marvell Armada-XP (server only) and TI Panda development boards are supported.</p>
-	</div>
-	<div class="four-col sidebar last-col">
-		<h4>More options</h4>
-		<ul>
-			<li><a href="/download/desktop">Ubuntu Desktop</a></li>
-			<li><a href="http://shop.canonical.com/index.php?cPath=17">Buy DVDs from the shop</a></li>
-		</ul>
-		<h4>Release notes</h4>
-		<ul>
-			<li><a href="https://wiki.ubuntu.com/PrecisePangolin/ReleaseNotes/UbuntuServer">Ubuntu Server 12.04.4 LTS release notes</a></li>
-			<li><a href="https://wiki.ubuntu.com/SaucySalamander/ReleaseNotes">Ubuntu Server {{ ubuntu_release }} release notes</a></li>
-		</ul>
+<div class="row row-grey">
+	<div class="twelve-col">
+		<h2>How you can use Ubuntu Server on the cloud</h2>
 	</div>
-	<div class="eight-col box-grey">
-		<h4>Alternative options</h4>
-		<p>Want to download via BitTorrent links, find regional mirrors to get DVD images, use the network installer or find previous versions of Ubuntu?</p>
-		<p><a class="link-arrow" href="/download/alternative-downloads">Take a look at a full list of our previous versions and alternative downloads</a></p>
+	<div class="equal-height">
+		<div class="six-col box box-highlight">
+			<h3>Setting up your own OpenStack cloud</h3>
+			<p>Ubuntu Server {{ubuntu_release}} LTS includes the OpenStack release of {{openstack_version}} plus MAAS and Juju, making it easy to deploy, manage and scale your cloud.</p>
+			<p><a href="/cloud/openstack">More about Ubuntu OpenStack&nbsp;&rsaquo;</a></p>
+		</div>
+		<div class="six-col last-col box box-highlight">
+			<h3>Running Ubuntu Server on a public cloud</h3>
+			<p>Ubuntu is the most popular guest operating system in the cloud, with optimised images available on all leading platforms, from AWS and Azure to Joyent and HP Cloud.</p>
+			<p><a href="/cloud/public-cloud">Learn more and start today&nbsp;&rsaquo;</a></p>
+		</div>
 	</div>
 </div>
+
+{% include "download/server/_other-ways.html" %}
+
 {% endwith %}
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
diff --git a/templates/download/cloud/install-ubuntu-cloud.html b/templates/download/cloud/install-ubuntu-cloud.html
old mode 100644
new mode 100755
index 13d389cfe48..8526cf0be82
--- a/templates/download/cloud/install-ubuntu-cloud.html
+++ b/templates/download/cloud/install-ubuntu-cloud.html
@@ -1,6 +1,6 @@
 {% extends "download/_base_download.html" %}
 
-{% block title %}Installing Ubuntu Cloud{% endblock %}
+{% block title %}Installing Ubuntu OpenStack | Download{% endblock %}
 
 {% block extra_body_class %}download-help{% endblock %}
 
@@ -10,173 +10,80 @@
 
 {% block content %}
 <div class="row row-hero no-border">
-	<div class="twelve-col">
+	<div class="eight-col">
 		<h1>Installing Ubuntu OpenStack</h1>
-		<p class="eight-col">There are three different Ubuntu OpenStack installation options, depending on whether you plan to build your own infrastructure, run Ubuntu as a guest on existing infrastructure (be it public or private) or you want to deploy services on a working cloud with Juju Charms.</p>
+		<p>The best way to deploy Ubuntu OpenStack is with MAAS and Juju.  Here is the recommended way to do it.</p>
+		<p>Ubuntu OpenStack is one of the many workloads you can deploy using Ubuntu Server.  A full deployment will require a minimum of 10 servers.  Please note, you will need to install Juju twice, first on top of MAAS to deploy Ubuntu OpenStack and then again on Ubuntu OpenStack to deploy your workloads.  Here is a summary of the steps you will need to follow:</p>
 	</div>
 	<div id="download-help" class="eight-col box box-grey no-border">
-    <h2 id="cloud-guest">Ubuntu Cloud Guest</h2>
-			<p>To run Ubuntu Cloud Guest on participating public clouds, the simplest way is to use the image that is maintained on their server. You can specialise the instances you create by passing a configuration script via user-data with <a href="https://help.ubuntu.com/community/CloudInit">cloud-init</a>.</p>
-		<div class="box box-highlight">
-			<dl class="clearfix">
-				<dt>Amazon Web Services (EC2)</dt>
-				<dd><a href="http://console.aws.amazon.com/ec2/home">Launch directly using Amazon EC2 console  &rsaquo;</a></dd>
-				<dd><a href="http://cloud-images.ubuntu.com/locator/ec2/">Locate a particular Ubuntu Cloud Guest AMI &rsaquo;</a></dd>
-				<dd><a href="https://help.ubuntu.com/community/EC2StartersGuide">The Ubuntu guide to getting started on EC2 &rsaquo;</a></dd>
-			</dl>
-			<dl class="clearfix last-item">
-				<dt>HP Cloud</dt>
-				<dd><a href="http://www.hpcloud.com/products-services/compute">Launch an Ubuntu virtual machine on HP Cloud &rsaquo;</a></dd>
-				<dd><a href="https://community.hpcloud.com/article/getting-started-guide">Guide to getting started on HP Cloud &rsaquo;</a></dd>
-			</dl>
-			<dl class="clearfix">
-				<dt>Windows Azure</dt>
-				<dd><a href="http://www.windowsazure.com/en-us/pricing/free-trial/">Windows Azure &rsaquo;</a></dd>
-				<dd><a href="http://www.windowsazure.com/en-us/documentation/services/virtual-machines/">Guide to getting started on Windows Azure &rsaquo;</a></dd>
-			</dl>
-			<dl class="clearfix">
-				<dt>Rackspace Cloud</dt>
-				<dd><a href="https://cart.rackspace.com/cloud/?cp_id=cloud_servers">Rackspace Cloud Servers &rsaquo;</a></dd>
-				<dd><a href="http://www.rackspace.com/knowledge_center/index.php/Ubuntu_-_Setup">Documentation &rsaquo;</a></dd>
-			</dl>
-	
-			<p>If you want to modify the standard images, or if you want to use an image on your private cloud, you can also get a detailed list of images and <a href="http://cloud-images.ubuntu.com/precise/current">download your own image</a>.</p>
-		</div><!-- /.box-highlight -->
-
-		<h2 id="cloud-infra">Ubuntu OpenStack</h2>
-		<h4>Live USB stick trial - 12.04.4 only</h4>
-		<p>The easiest way to try Ubuntu OpenStack is to create a bootable USB stick that will let you try OpenStack.</p>
-		
-		<div class="box box-highlight clearfix">
-			<ol class="no-bullets">
-				<li class="clearfix">
-					<span>1</span>
-					<div>
-						<p><a href="/download/cloud">Download Ubuntu Server for Cloud &rsaquo;</a></p>
-					</div>
-				</li>
-				<li class="clearfix">
-					<span>2</span>
-					<div>
-						<p>Create a startup disk USB Stick from the downloaded image, using Startup Disk Creator, pre-installed in Ubuntu 12.04.</p>
-					</div>
-				</li>
-				<li class="clearfix">
-					<span>3</span>
-					<div>
-						<p>When your USB stick is ready, insert it in your computer and reboot, selecting the stick as your startup device when prompted.</p>
-					</div>
-				</li>
-				<li class="clearfix">
-					<span>4</span>
-					<div>
-						<p>Start using your local private cloud.</p>
-					</div>
-				</li>
-			</ol>
-		</div><!-- /.box-highlight -->
-	
-		<p>See the <a href="https://help.ubuntu.com/community/UbuntuCloudInfrastructure#Ubuntu_Cloud_Live_Image">Ubuntu OpenStack documentation</a> for details.</p>
-	
-		<h4>Real-world deployment</h4>
-		<p>Ubuntu OpenStack is one of the many workloads you can deploy using Ubuntu Server.  A full deployment will require a minimum of 10 servers.</p>
-		<p>Here is a summary of the steps you will need to follow to deploy it:</p>
-	
-		<div class="box box-highlight">
+		<div class="box box-highlight no-margin-bottom">
 			<ol>
 				<li class="clearfix">
 					<span>1</span>
 					<div>
-						<p><a href="/download/cloud">Download Ubuntu Server for Cloud &rsaquo;</a></p>
+						<p><a href="/download/cloud">Download Ubuntu Server for Cloud&nbsp;&rsaquo;</a></p>
 					</div>
 				</li>
 				<li class="clearfix">
 					<span>2</span>
 					<div>
-						<p>Burn your CD or create a bootable USB stick.</p>
+						<p>Burn a DVD or create a bootable USB stick.</p>
 					</div>
 				</li>
 				<li class="clearfix">
 					<span>3</span>
 					<div>
-						<p>Install it and select &lsquo;MAAS&rsquo; when asked which workload to deploy details.</p>
-						<p><a class="link-arrow" href="https://wiki.ubuntu.com/ServerTeam/MAAS">More details on the Ubuntu wiki</a></p>
+						<p>Install it and select &lsquo;MAAS&rsquo; when asked which workload to deploy.</p>
+						<p><a href="http://maas.ubuntu.com/docs/install.html#disc-install">More information&nbsp;&rsaquo;</a></p>
 					</div>
 				</li>
 				<li class="clearfix">
 					<span>4</span>
 					<div>
 						<p>Add six or more nodes to MAAS.</p>
-						<p><a class="link-arrow" href="https://wiki.ubuntu.com/ServerTeam/MAAS/AddNodes">More details on the Ubuntu wiki</a></p>
+						<p><a href="http://maas.ubuntu.com/docs/nodes.html">More information&nbsp;&rsaquo;</a></p>
 					</div>
 				</li>
 				<li class="clearfix">
 					<span>5</span>
 					<div>
 						<p>Deploy Juju on MAAS.</p>
-						<p><a class="link-arrow" href="https://wiki.ubuntu.com/ServerTeam/MAAS/Juju">More details on the Ubuntu wiki</a></p>
+						<p><a href="http://maas.ubuntu.com/docs/juju-quick-start.html">More information&nbsp;&rsaquo;</a></p>
 					</div>
 				</li>
-				<li class="clearfix">
+					<li class="clearfix">
 					<span>6</span>
 					<div>
-						<p>Deploy Ubuntu OpenStack&rsquo;s OpenStack component using Juju.</p>
-						<p><a class="link-arrow" href="https://help.ubuntu.com/community/UbuntuCloudInfrastructure#Deploying_Ubuntu_Cloud_Infrastructure_with_Juju">More details on the Ubuntu wiki</a></p>
+						<p>Get the latest Ubuntu OpenStack release from the Ubuntu Cloud Archive.</p>
+						<pre><code>sudo add-apt-repository cloud-archive:icehouse</code></pre>
+						<p><a href="https://wiki.ubuntu.com/ServerTeam/CloudArchive">More information&nbsp;&rsaquo;</a></p>
 					</div>
 				</li>
-			</ol>
-		</div>
-
-		<p>For more details on the deployment process, please <a href="https://help.ubuntu.com/community/UbuntuCloudInfrastructure">read the documentation</a> wiki pages.</p>
-
-	<div class="row-version-break row-hero">
-		<h2 id="juju-charms">Juju Charms</h2>
-		<p>You can deploy services onto bare metal or any OpenStack/Amazon EC2 compatible cloud, with Juju Charms. In summary, you simply need to:</p>
-	</div><!-- /.row -->
-	
-		<div class="box box-highlight">
-			<ol>
 				<li class="clearfix">
-					<span>1</span>
+					<span>7</span>
 					<div>
-						<p><a href="https://juju.ubuntu.com/docs/getting-started.html">Install Juju (bootstrap) &rsaquo;</a></p>
+						<p>Deploy Ubuntu OpenStack using Juju.</p>
+						<p><a href="https://juju.ubuntu.com/docs/charms-deploying.html">More information&nbsp;&rsaquo;</a></p>
 					</div>
 				</li>
 				<li class="clearfix">
-					<span>2</span>
+					<span>8</span>
 					<div>
-						<p>Set up the credentials for your target cloud.</p>
+						<p>Configure Juju for OpenStack.</p>
+						<p><a href="https://juju.ubuntu.com/docs/config-openstack.html">More information&nbsp;&rsaquo;</a></p>
 					</div>
 				</li>
 				<li class="clearfix">
-					<span>3</span>
+					<span>9</span>
 					<div>
-						<p>Start deploying services.</p>
+						<p>Start deploying services to your cloud with Juju.</p>
+						<p><a href="https://juju.ubuntu.com/docs/charms-deploying.html">More information&nbsp;&rsaquo;</a></p>
 					</div>
 				</li>
 			</ol>
 		</div>
-	{% include "download/shared/_wiki_link.html" %}
-	{% include "download/shared/_ask_ubuntu.html" %}
-	</div><!-- /#download-help -->
-
-<div class="sidebar aside four-col last-col">
-	<ul class="no-bullets">
-		<li class="cloud">
-			<h3><a href="#cloud-guest">Ubuntu Cloud Guest</a></h3>
-			<p>You want to run Ubuntu Server on a public or private cloud</p>
-		</li>
-		<li class="server">
-			<h3><a href="#cloud-infra">Ubuntu OpenStack</a></h3>
-			<p>You want to deploy your own OpenStack-based IAAS public or private cloud</p>
-		</li>
-		<li class="juju">
-			<h3><a href="#juju-charms">Juju Charms</a></h3>
-			<p>You want to deploy services on a cloud using Juju Charms</p>
-		</li>
-	</ul>
-</div><!-- /.sidebar -->
 
+	</div><!-- /#download-help -->
 </div><!-- /.row -->
 
 
diff --git a/templates/download/cloud/thank-you.html b/templates/download/cloud/thank-you.html
old mode 100644
new mode 100755
index c636717a609..eb811c920d7
--- a/templates/download/cloud/thank-you.html
+++ b/templates/download/cloud/thank-you.html
@@ -1,16 +1,10 @@
 {% extends "download/_base_download.html" %}
 
-{% block title %}
-{% if GET.version and GET.architecture %}
-Thanks for downloading Ubuntu Server for Cloud
-{% else %}
-Thank you for your contribution
-{% endif %}
-{% endblock %}
+{% block title %}Thank you | Download{% endblock %}
 {% block extra_body_class %}download-thankyou{% endblock %}
 
 {% block second_level_nav_items %}
-{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Server for Cloud" page_title="Thank you"  %}
+{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Server for cloud" page_title="Thank you"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
@@ -18,51 +12,41 @@
         <meta http-equiv="refresh" content="3;url=http://releases.ubuntu.com/{{ request.GET.version }}/ubuntu-{{ request.GET.version }}-server-{{ request.GET.architecture.split|join:"+" }}.iso">
     </noscript>
 
-    <div class="row no-border">
-        <h1>Thanks for downloading Ubuntu Server</h1>
-        <h2>For Cloud</h2>
-        <p>Your download should start automatically. If it doesn't, <a href="http://releases.ubuntu.com/{{ request.GET.version }}/ubuntu-{{ request.GET.version }}-server-{{ request.GET.architecture.split|join:"+" }}.iso">download now</a>.</p>
-
-        <p><a href="/download/cloud/install-ubuntu-cloud">Read the installation instructions</a></p>
-
-        <div class="box-grey twelve-col no-margin-bottom download-cross-sells">
+    <div class="row row-hero no-border">
+        <div class="eight-col">
+            <h1>Thank you for downloading Ubuntu Server for cloud</h1>
+            <p>Your download should start automatically. If it doesn&rsquo;t, <a href="http://releases.ubuntu.com/{{ request.GET.version }}/ubuntu-{{ request.GET.version }}-server-{{ request.GET.architecture.split|join:"+" }}.iso">download now</a>.</p>
+        </div>
+    </div>
+    <div class="row row-grey">
+        <div class="twelve-col no-margin-bottom equal-height">
             <div class="four-col one box box-highlight">
-                <img alt="ubuntu one" src="{{ STATIC_URL }}img/download/cloud-jumpstart.png" />
-                <h3>Ubuntu Cloud Jumpstart</h3>
-                <p>A private cloud in five days, with a Canonical engineer on site to get it done.</p>
-                <p><a class="link-arrow" href="/cloud/private-cloud/jumpstart">Learn more about Cloud Jumpstart</a></p>
+                <div class="four-col text-center">
+                    <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>
             </div><!-- /.four-col -->
             <div class="four-col support box box-highlight">
-                <img alt="ubuntu advantage" src="{{ STATIC_URL }}img/download/ubuntu-advantage.png" />
-                <h3>Ubuntu Advantage 
-for Cloud</h3>
+                <div class="four-col text-center">
+                    <img alt="ubuntu advantage" src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-business-warmgrey.svg" width="113" height="113" />
+                </div>
+                <h3>Ubuntu Advantage for Cloud</h3>
                 <p>All the commercial support your cloud deployment needs.</p>
-                <p><a class="link-arrow" href="/cloud/management">Learn more about Ubuntu Cloud Advantage</a></p>
+                <p><a href="/management/ubuntu-advantage">Learn more about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
             </div><!-- /.four-col -->
             <div class="four-col ask last-col box box-highlight">
-                <img alt="ubuntu advantage" src="{{ STATIC_URL }}img/download/ask-ubuntu.png" />
+                <div class="four-col text-center">
+                    <img alt="ubuntu advantage" src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-forum-warmgrey.svg" width="113" height="113" />
+                </div>
                 <h3>Ask Ubuntu</h3>
                 <p>Need help? Ask your questions here.</p>
-                <p><a class="link-arrow" href="http://askubuntu.com/questions/tagged/cloud">Get help</a></p>
+                <p><a href="http://askubuntu.com/questions/tagged/cloud" class="external">Get help</a></p>
             </div><!-- /.four-col -->
         </div><!-- /.row .row-box -->
 
     </div><!-- /.row .row-download -->
-    <div class="row row-next-steps equal-height vertical-divider no-border">
-        <h2>Useful next steps</h2>
-        <div class="four-col">
-            <h4><a href="https://help.ubuntu.com">Access documentation</a></h4>
-            <p>If you&rsquo;re stuck with a problem, take a look at the official documentation developed and maintained by the Ubuntu Documentation Team.</p>
-        </div>
-        <div class="four-col">
-            <h4><a href="https://help.ubuntu.com/community/InternetRelayChat">Live support chat</a></h4>
-            <p>If you would rather ask questions directly to the Ubuntu community, you can access our Internet relay chat (IRC) channel. Simply join the #ubuntu channel on irc.freenode.net.</p>
-        </div>
-        <div class="four-col last-col">
-            <h4><a href="http://www.ubuntu.com/community">Join the Ubuntu community</a></h4>
-            <p>Whether you're an experienced Linux user or you're just getting started with open-source software, there are lots of ways you can contribute to the Ubuntu project.</p>
-        </div>
-    </div>
 {% endblock content %}
 
 {% block footer_extra %}
@@ -78,6 +62,13 @@ <h4><a href="http://www.ubuntu.com/community">Join the Ubuntu community</a></h4>
 var mirrors = {{ mirror_list|safe }};
 
 if (version && architecture) {
+    // Report to Google Analytics
+    YUI().use('event-base', function (Y) {
+        Y.on('domready', function () {
+            _gaq.push(['_trackEvent', 'Download', 'Downloaded', 'User downloaded Ubuntu (' + version + '-server-' + architecture + ')']);
+        });
+    });
+
     startDownload(mirrors, version, architecture, defaultLocation);
 }
 
@@ -141,4 +132,4 @@ <h4><a href="http://www.ubuntu.com/community">Join the Ubuntu community</a></h4>
 }
 </script>
 
-{% endblock footer_extra %}
\ No newline at end of file
+{% endblock footer_extra %}
diff --git a/templates/download/desktop/_chinese-download.html b/templates/download/desktop/_chinese-download.html
old mode 100644
new mode 100755
index b7cab4bfe97..0019b26525e
--- a/templates/download/desktop/_chinese-download.html
+++ b/templates/download/desktop/_chinese-download.html
@@ -1,9 +1,11 @@
 <div class="row no-border chinese-download last-row">
-	<div class="box box-image-centered twelve-col">
-		<span><img src="{{ STATIC_URL }}img/pictograms/ubuntu-kylin-chinese.png" alt="Chinese Ubuntu logo" height="112" width="112"></span>
-		<div class="nine-col">
-			<h3><a href="/download/desktop/zh-CN">Ubuntu中文版本 &rsaquo;</a></h3>
-			<p lang="zh">只需一张空白光盘或U盘，即可下载并安装 Ubuntu Kylin 13.10/Ubuntu 12.04 LTS 桌面操作系统 。无论当前的操作系统是 Windows 还是 Mac OS，您都可以用 Ubuntu Kylin/Ubuntu取代它，或让 Ubuntu Kylin/Ubuntu与它共存。</p>
+	<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/_other-ways-chinese.html b/templates/download/desktop/_other-ways-chinese.html
new file mode 100755
index 00000000000..f3fb133da1b
--- /dev/null
+++ b/templates/download/desktop/_other-ways-chinese.html
@@ -0,0 +1,34 @@
+<div id="row-download-other" class="row no-border">
+	<h2>其它获取Ubuntu 的途径</h2>
+		<div id="download-other" class="eight-col">
+{% if level_3 != 'zh-CN' %}
+			<div class="chinese four-col box box-highlight">
+				<h3>Ubuntu中文版本</h3>
+				<p>只需一张空白光盘或U盘，即可下载并安装 Ubuntu Kylin 13.10/Ubuntu 12.04 LTS 桌面操作系统 。无论当前的操作系统是 Windows 还是 Mac OS，您都可以用 Ubuntu Kylin/Ubuntu取代它</p>
+				<p><a href="/download/zh-CN">Ubuntu中文版本&nbsp;&rsaquo;</a></p>
+			</div><!-- /.four-col -->
+{% endif %}
+{% if level_3 != 'zh-CN' %}
+			<div class="cd four-col last-col box box-highlight">
+				<h3>购买 12.04 长期支持版 CD</h3>
+				<p>如果您想订购一张 Ubuntu 12.04 官方长期支持版 CD 并用它来安装，您可以从 Ubuntu 商店购买。每 10 张光盘仅售 8.50 欧元，包括邮寄及包装费用。</p>
+				<p><a href="http://shop.canonical.com/index.php?cPath=17">从商店购买 Ubuntu CD&nbsp;&rsaquo;</a></p>
+			</div><!-- /.four-col -->
+{% else %}
+			<div class="cd eight-col last-col box box-highlight">
+				<h3>购买 12.04 长期支持版 CD</h3>
+				<p>如果您想订购一张 Ubuntu 12.04 官方长期支持版 CD 并用它来安装，您可以从 Ubuntu 商店购买。每 10 张光盘仅售 8.50 欧元，包括邮寄及包装费用。</p>
+				<p><a href="http://shop.canonical.com/index.php?cPath=17">从商店购买 Ubuntu CD&nbsp;&rsaquo;</a></p>
+			</div><!-- /.four-col -->
+{% endif %}
+
+			<p class="ubuntu-upgrade clear">您需要升级吗？ <a href="/download/desktop/upgrade">Follow our simple guide&nbsp;&rsaquo;</a></p>
+			<div class="alternative-options">
+				<h4>其他下载选项</h4>
+				<p>您想通过 BitTorrent 链接下载吗？想获得包含更多语言包的 DVD 镜像吗？想使用基于文本模式的安装程序吗？还是想寻找 Ubuntu 的老版本？</p>
+				<p><a href="/download/alternative-downloads">Take a look at a full list of our previous versions and alternative downloads&nbsp;&rsaquo;</a></p>
+			</div><!-- /.alternative-options -->
+	</div><!-- /#download-other -->
+
+{% include "download/shared/_instalation_help_chinese.html" %}
+</div><!-- /#row-other-ways -->
\ No newline at end of file
diff --git a/templates/download/desktop/_other-ways.html b/templates/download/desktop/_other-ways.html
old mode 100644
new mode 100755
index 073d224b938..298a25bafa5
--- a/templates/download/desktop/_other-ways.html
+++ b/templates/download/desktop/_other-ways.html
@@ -1,47 +1,24 @@
-<div id="row-download-other" class="row no-border">
-	<h2>Other ways to get Ubuntu</h2>
-		<div id="download-other" class="eight-col">
-{% if level_3 == 'windows-installer' %}
-			<div class="desktop four-col box box-highlight">
-				<h3>Download Ubuntu</h3>
-				<p>Download Ubuntu directly. You will need to create a DVD or USB stick to install it this way. You can replace your current operating system, whether it’s Windows or Mac OS, or run Ubuntu alongside&nbsp;it.</p>
-				<p><a class="link-arrow" href="/download/desktop/">Get Ubuntu Desktop &rsaquo;</a></p>
+<div class="row no-border">
+	<div class="twelve-col">
+		<h2>Get the version you need</h2>
+	</div>
+	<div class="twelve-col">
+		<div class="equal-height vertical-divider">
+			<div class="four-col">
+				<h3 class="header--dvd">Buy a DVD from the Ubuntu shop</h3>
+				<p>Ubuntu 14.04 LTS is available for purchase on DVD, from the online Ubuntu Store.</p>
+				<p><a href="http://shop.canonical.com/index.php?cPath=17">Go to the store&nbsp;&rsaquo;</a></p>
 			</div><!-- /.desktop -->
-{% else %}
-{% if level_3 != 'zh-CN' %}
-			<div class="chinese four-col box box-highlight">
-				<h3>Ubuntu中文版本</h3>
-				<p>只需一张空白光盘或U盘，即可下载并安装 Ubuntu Kylin 13.10/Ubuntu 12.04 LTS 桌面操作系统 。无论当前的操作系统是 Windows 还是 Mac OS，您都可以用 Ubuntu Kylin/Ubuntu取代它</p>
-				<p><a href="/download/zh-CN">Ubuntu中文版本 &rsaquo;</a></p>
+			<div class="four-col">
+				<h3 class="header--download">Find alternative downloads</h3>
+				<p>Ubuntu is available via torrent and with more languages. You can also select from a list of older versions.</p>
+				<p><a href="/download/alternative-downloads">Alternative downloads&nbsp;&rsaquo;</a></p>
 			</div><!-- /.four-col -->
-{% endif %}
-{% endif %}
-{% if level_3 != 'zh-CN' %}
-			<div class="cd four-col last-col box box-highlight">
-				<h3>Buy 12.04 LTS CD</h3>
-				<p>If you&rsquo;d rather order an official Ubuntu 12.04 LTS CD and install it that way, they are available from the Ubuntu shop, at just &pound;8.50 for a pack of 10, plus postage and packing.</p>
-				<p><a class="link-arrow" href="http://shop.canonical.com/product_info.php?products_id=976">Buy Ubuntu CDs from the shop</a></p>
-			</div><!-- /.four-col -->
-{% else %}
-			<div class="cd eight-col last-col box box-highlight">
-				<h3>Buy 12.04 LTS CD</h3>
-				<p>If you&rsquo;d rather order an official Ubuntu 12.04 LTS CD and install it that way, they are available from the Ubuntu shop, at just &pound;8.50 for a pack of 10, plus postage and packing.</p>
-				<p><a class="link-arrow" href="http://shop.canonical.com/product_info.php?products_id=976">Buy Ubuntu CDs from the shop</a></p>
-			</div><!-- /.four-col -->
-{% endif %}
-
-			<p class="ubuntu-upgrade clear">Do you want to upgrade? <a class="link-arrow" href="/download/desktop/upgrade">Follow our simple guide</a></p>
-			<div class="alternative-options">
-				<h4>Alternative download options</h4>
-{% if level_3 == 'windows-installer' %}
-				<p>Want to download via BitTorrent links, find regional mirrors to get DVD images, use the network installer or find previous versions of Ubuntu?</p>
-				<p><a class="link-arrow" href="/download/alternative-downloads">Download alternative versions</a></p>
-{% else %}
-				<p>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?</p>
-				<p><a class="link-arrow" href="/download/alternative-downloads">Take a look at a full list of our previous versions and alternative downloads</a></p>
-{% endif %}
-			</div><!-- /.alternative-options -->
-	</div><!-- /#download-other -->
-
-{% include "download/shared/_instalation_help.html" %}
-</div><!-- /#row-other-ways -->
\ No newline at end of file
+			<div class="four-col last-col">
+				<h3 class="header--kylin">Choose Ubuntu Kylin for China</h3>
+				<p>Ubuntu Kylin is a redesigned version of Ubuntu, created in China with the needs of Chinese users in mind</p>
+				<p><a href="/download/ubuntu-kylin">Download Ubuntu Kylin&nbsp;&rsaquo;</a></p>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/download/desktop/burn-a-dvd-on-mac-osx.html b/templates/download/desktop/burn-a-dvd-on-mac-osx.html
old mode 100644
new mode 100755
index 3cc573f5e49..39dfdddf3a7
--- a/templates/download/desktop/burn-a-dvd-on-mac-osx.html
+++ b/templates/download/desktop/burn-a-dvd-on-mac-osx.html
@@ -15,7 +15,7 @@ <h1>How to burn a DVD on OS X</h1>
 <div class="row no-border">
 	<div id="download-help" class="eight-col box box-grey no-border">
 	<p>The easiest way to burn an ISO, the file you need to install Ubuntu from a DVD, is by using <strong>Disk Utility</strong>. If you&rsquo;re using an older version of Mac OS X, you might not have the Disk Utility application. In this case, use Disk Copy.</p>
-		<div class="box box-highlight">
+		<div class="box box-highlight no-margin-bottom">
 			<ol class="no-bullets">
 				<li>
 					<span>1</span>
@@ -28,7 +28,7 @@ <h1>How to burn a DVD on OS X</h1>
 					<div>
 						<p>Insert your blank DVD.</p>
 					</div>
-				</li>					
+				</li>
 				<li>
 					<span>3</span>
 					<div>
@@ -39,14 +39,20 @@ <h1>How to burn a DVD on OS X</h1>
 					<span>4</span>
 					<div>
 						<p>Select the .iso file, and click on the <strong>'Burn'</strong> button in the toolbar.</p>
-						<img src="{{ STATIC_URL }}img/download/burn-cd-mac-1-12.10.png" alt="" height="377" width="444">
+						<div class="help-image">
+							<img src="{{ STATIC_URL }}img/download/desktop/burn-a-dvd-on-mac-osx/image-burnadvdonmacosx-1.jpg" alt="" height="388" width="444">
+							<a href="{{ STATIC_URL }}img/download/desktop/burn-a-dvd-on-mac-osx/image-burnadvdonmacosx-1.jpg">Click to enlarge</a>
+						</div>
 					</div>
 				</li>
 				<li>
 					<span>5</span>
 					<div>
 						<p>Ensure that the <strong>'Verify burned data'</strong> checkbox is ticked (you may need to click on the disclosure triangle to see the checkbox).</p>
-						<img src="{{ STATIC_URL }}img/download/burn-cd-mac-2-12.10.png" alt="" height="377" width="444">
+						<div class="help-image">
+							<img src="{{ STATIC_URL }}img/download/desktop/burn-a-dvd-on-mac-osx/image-burnadvdonmacosx-2.jpg" alt="" height="388" width="444">
+							<a href="{{ STATIC_URL }}img/download/desktop/burn-a-dvd-on-mac-osx/image-burnadvdonmacosx-2.jpg">Click to enlarge</a>
+						</div>
 					</div>
 				</li>
 				<li>
@@ -57,10 +63,7 @@ <h1>How to burn a DVD on OS X</h1>
 				</li>
 			</ol>
 		</div><!-- /.box -->
-{% include "download/shared/_wiki_link.html" %}
-{% include "download/shared/_ask_ubuntu.html" %}
 </div><!-- /.eight-col -->
-{% include "download/shared/_instalation_help.html" %}
 </div><!-- /.row -->
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/download/desktop/burn-a-dvd-on-ubuntu.html b/templates/download/desktop/burn-a-dvd-on-ubuntu.html
old mode 100644
new mode 100755
index c70012e4a05..e1b6fa905f6
--- a/templates/download/desktop/burn-a-dvd-on-ubuntu.html
+++ b/templates/download/desktop/burn-a-dvd-on-ubuntu.html
@@ -16,13 +16,16 @@ <h1>How to burn a DVD on Ubuntu</h1>
 <div class="row no-border">
 	<div id="download-help" class="eight-col box box-grey no-border">
 	<p>To create a DVD from which to install an up-to-date copy of Ubuntu, you first need to <a href="/download">download a copy of the latest version</a>. Once you&rsquo;ve done so, you can create your installation DVD. The procedure may differ slightly depending on which version of Ubuntu you are currently using.</p>
-		<div class="box box-highlight">
+		<div class="box box-highlight no-margin-bottom">
 			<ol class="no-bullets">
 				<li>
 					<span>1</span>
 					<div>
 						<p>Insert a blank CD into your burner. A 'CD/DVD Creator', 'Choose Disc Type' or 'Blank Disc' window might pop up. Close this, because we will not be using it.</p>
-						<img src="{{ STATIC_URL }}img/download/burn-cd-ubuntu-1.png" alt="" height="258" width="444">
+						<div class="help-image">
+							<img src="{{ STATIC_URL }}img/download/desktop/burn-a-dvd-on-ubuntu/image-burnadvdonubuntu-1.jpg" alt="" height="258" width="444">
+							<a href="{{ STATIC_URL }}img/download/desktop/burn-a-dvd-on-ubuntu/image-burnadvdonubuntu-1.jpg">Click to enlarge</a>
+						</div>
 					</div>
 				</li>
 				<li>
@@ -35,14 +38,20 @@ <h1>How to burn a DVD on Ubuntu</h1>
 					<span>3</span>
 					<div>
 						<p>Right click on the ISO file and choose <strong>'Write to Disc'</strong>.</p>
-						<img src="{{ STATIC_URL }}img/download/burn-cd-ubuntu-2-12.10.png" alt="" height="602" width="444">
+						<div class="help-image">
+							<img src="{{ STATIC_URL }}img/download/desktop/burn-a-dvd-on-ubuntu/image-burnadvdonubuntu-2.jpg" alt="" height="539" width="444">
+							<a href="{{ STATIC_URL }}img/download/desktop/burn-a-dvd-on-ubuntu/image-burnadvdonubuntu-2.jpg">Click to enlarge</a>
+						</div>
 					</div>
 				</li>
 				<li>
 					<span>4</span>
 					<div>
 						<p>Where it says 'Write disc to', you might have options such as 'File image' as well as your CD drive. Choose your CD drive. Your CD drive might show as something like 'BD-MLT UJ-210S'.</p>
-						<img src="{{ STATIC_URL }}img/download/burn-cd-ubuntu-3-12.10.png" alt="" height="225" width="444">
+						<div class="help-image">
+							<img src="{{ STATIC_URL }}img/download/desktop/burn-a-dvd-on-ubuntu/image-burnadvdonubuntu-3.jpg" alt="" height="230" width="444">
+							<a href="{{ STATIC_URL }}img/download/desktop/burn-a-dvd-on-ubuntu/image-burnadvdonubuntu-3.jpg">Click to enlarge</a>
+						</div>
 					</div>
 				</li>
 				<li>
@@ -65,10 +74,7 @@ <h1>How to burn a DVD on Ubuntu</h1>
 				</li>
 			</ol>
 		</div><!-- /.box -->
-{% include "download/shared/_wiki_link.html" %}
-{% include "download/shared/_ask_ubuntu.html" %}
 </div><!-- /.eight-col -->
-{% include "download/shared/_instalation_help.html" %}
 </div><!-- /.row -->
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/download/desktop/burn-a-dvd-on-windows.html b/templates/download/desktop/burn-a-dvd-on-windows.html
old mode 100644
new mode 100755
index 97b5fee0406..8c4977e0153
--- a/templates/download/desktop/burn-a-dvd-on-windows.html
+++ b/templates/download/desktop/burn-a-dvd-on-windows.html
@@ -15,21 +15,27 @@ <h1>How to burn a DVD on Windows</h1>
 <div class="row no-border">
 	<div id="download-help" class="eight-col box box-grey no-border">
 		<p>To install Ubuntu on a computer that currently runs Windows, you need to <a href="/download">download the installation file</a> and burn it onto the DVD, which you can then use to install Ubuntu. Once you&rsquo;ve downloaded the file, follow the instructions below to burn your DVD, depending on which version of Windows you are currently using.</p>
-		<h3>Windows 7</h3>
-			<div class="box box-highlight">
+		<h3>Windows 7 / 8</h3>
+			<div class="box box-highlight no-margin-bottom">
 				<ol class="no-bullets">
 					<li class="clearfix">
 						<span>1</span>
 						<div>
 							<p>Right-click on an ISO image and choose <strong>'Open with &gt; Windows Disc Image Burner'</strong>.</p>
-							<img src="{{ STATIC_URL }}img/download/burn-cd-windows-1-12.10.png" alt="" height="450" width="444">
+							<div class="help-image">
+								<img src="{{ STATIC_URL }}img/download/desktop/burn-a-dvd-on-windows/image-burnadvdonwindows-1.jpg" alt="" height="443" width="444">
+								<a href="{{ STATIC_URL }}img/download/desktop/burn-a-dvd-on-windows/image-burnadvdonwindows-1.jpg">Click to enlarge</a>
+							</div>
 						</div>
 					</li>
 					<li class="clearfix">
 						<span>2</span>
 						<div>
 							<p>Select a disc burner (drive) and choose <strong>'Burn'</strong>. If you check <strong>'Verify disc after burning'</strong>, it will confirm that the ISO image has been burned correctly.</p>
-							<img src="{{ STATIC_URL }}img/download/burn-cd-windows-2-12.10.png" alt="" height="427" width="444">
+							<div class="help-image">
+								<img src="{{ STATIC_URL }}img/download/desktop/burn-a-dvd-on-windows/image-burnadvdonwindows-2.jpg" alt="" height="444" width="443">
+								<a href="{{ STATIC_URL }}img/download/desktop/burn-a-dvd-on-windows/image-burnadvdonwindows-2.jpg">Click to enlarge</a>
+							</div>
 						</div>
 					</li>
 				</ol>
@@ -46,20 +52,23 @@ <h3>Windows 95 / 98 / ME / 2000 / XP / Server 2003 / Vista7</h3>
 					<li class="clearfix">
 						<span>2</span>
 						<div>
-							<p>Insert a blank CD in the drive and select <strong>&lsquo;Do nothing&rsquo;</strong> or <strong>&lsquo;Cancel&rsquo;</strong> if an autorun dialog box pops up.</p>
+							<p>Insert a blank DVD in the drive and select <strong>&lsquo;Do nothing&rsquo;</strong> or <strong>&lsquo;Cancel&rsquo;</strong> if an autorun dialog box pops up.</p>
 						</div>
 					</li>
 					<li class="clearfix">
 						<span>3</span>
 						<div>
 							<p>Open Infra Recorder and click the <strong>'Write Image'</strong> button in the main screen. Alternatively you can select the <strong>'Actions'</strong> menu, then <strong>'Burn image'</strong>.</p>
-							<img src="{{ STATIC_URL }}img/download/cd_windows_01_medium.jpg" alt="" height="408" width="448">
+							<div class="help-image">
+								<img src="{{ STATIC_URL }}img/download/cd_windows_01_medium.jpg" alt="" height="408" width="448">
+								<a href="{{ STATIC_URL }}img/download/cd_windows_01_medium.jpg">Click to enlarge</a>
+							</div>
 						</div>
 					</li>
 					<li class="clearfix">
 						<span>4</span>
 						<div>
-							<p>Select the Ubuntu CD image file you want to use, then click <strong>'Open'</strong>.</p>
+							<p>Select the Ubuntu DVD image file you want to use, then click <strong>'Open'</strong>.</p>
 						</div>
 					</li>
 					<li class="clearfix">
@@ -70,10 +79,7 @@ <h3>Windows 95 / 98 / ME / 2000 / XP / Server 2003 / Vista7</h3>
 					</li>
 				</ol>
 			</div><!-- /.box -->
-	{% include "download/shared/_wiki_link.html" %}
-	{% include "download/shared/_ask_ubuntu.html" %}
 </div><!-- /.eight-col -->
-{% include "download/shared/_instalation_help.html" %}
 </div><!-- /.row -->
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/download/desktop/contribute.html b/templates/download/desktop/contribute.html
old mode 100644
new mode 100755
index f3506c3988b..c8551e4897a
--- a/templates/download/desktop/contribute.html
+++ b/templates/download/desktop/contribute.html
@@ -1,6 +1,6 @@
 {% extends "download/_base_download.html" %}
 
-{% block title %}Contribute to Ubuntu{% endblock %}
+{% block title %}Contribute to Ubuntu | Ubuntu{% endblock %}
 {% block extra_body_class %}contribute-to-ubuntu{% endblock %}
 
 {% block second_level_nav_items %}
@@ -15,12 +15,8 @@ <h1>Tell us what we should do more&hellip;</h1>
         <p>&hellip;and put your money where your mouth is ;)</p>
     </div>
     <div class="contribution-intro">
-        <h1>Pay what you think it&rsquo;s worth</h1>
-        <p>Millions agree that Ubuntu is a great piece of software. But how much do you really think it&rsquo;s worth?</p>
-    </div>
-    <div class="contribution-intro">
-        <h1>Show Ubuntu some love</h1>
-        <p>Or, alternatively, help out in the bug tracker ;)</p>
+        <h1>Help shape the future of Ubuntu...</h1>
+        <p>...tell us what to do more of!</p>
     </div>
 </div>
 
@@ -28,48 +24,47 @@ <h1>Show Ubuntu some love</h1>
     <form class="main-form" id="contributions-form" action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
         <div class="row no-border">
             <div class="sliders-container noscript">
-                <div class="slider-area" id="desktop">
-                    <p>Make the desktop more amazing</p>
+                <div class="slider-area" id="ubuntu-desktop">
+                    <p class="title">Ubuntu Desktop</p>
 
                     <fieldset class="contribution-value">
                         <label for="amount-desktop">&#36; </label>
-                        <input type="number" max="125" id="amount-desktop" name="amount_1" value="2" class="amount-input" tabindex="1">
+                        <input type="number" min="0" max="125" id="amount-desktop" name="amount_1" value="2" class="amount-input" tabindex="1">
                     </fieldset>
                     
                     <div class="contribution-slider"></div>
 
                     <!--  Hidden fields -->
-                    <input type="hidden" name="item_name_1" value="Make the desktop more amazing">
-
+                    <input type="hidden" name="item_name_1" value="Ubuntu Desktop">
                 </div>
-                <div class="slider-area" id="performance">
-                    <p>Performance optimisation for games and apps</p>
+                <div class="slider-area" id="ubuntu-for-phone">
+                    <p class="title">Ubuntu for phone</p>
 
                     <fieldset class="contribution-value">
-                        <label for="amount_performance">&#36; </label>
-                        <input type="number" max="125" id="amount_performance" name="amount_2" value="2" class="amount-input"  tabindex="2">
+                        <label for="amount_phone">&#36; </label>
+                        <input type="number" max="125" id="amount_phone" name="amount_2" value="2" class="amount-input" tabindex="4">
                     </fieldset>
 
                     <div class="contribution-slider"></div>
-
+                    
                     <!-- hidden fields -->
-                    <input type="hidden" name="item_name_2" value="Performance optimisation for games and apps">
+                    <input type="hidden" name="item_name_2" value="Ubuntu for phone">
                 </div>
-                <div class="slider-area" id="hardware">
-                    <p>Improve hardware support on more PCs</p> 
+                <div class="slider-area" id="ubuntu-for-tablet">
+                    <p class="title">Ubuntu for tablet</p>
 
                     <fieldset class="contribution-value">
-                        <label for="amount_hardware">&#36; </label>
-                        <input type="number" max="125" id="amount_hardware" name="amount_3" value="2" class="amount-input" tabindex="3">
+                        <label for="amount_phone">&#36; </label>
+                        <input type="number" max="125" id="amount_phone" name="amount_3" value="2" class="amount-input" tabindex="4">
                     </fieldset>
 
                     <div class="contribution-slider"></div>
-
+                    
                     <!-- hidden fields -->
-                    <input type="hidden" name="item_name_3" value="Improve hardware support on more PCs">
+                    <input type="hidden" name="item_name_3" value="Ubuntu for tablet">
                 </div>
-                <div class="slider-area" id="phone">
-                    <p>Phone and tablet versions of Ubuntu</p>
+                <div class="slider-area" id="ubuntu-on-public-clouds">
+                    <p class="title">Ubuntu on public clouds</p>
 
                     <fieldset class="contribution-value">
                         <label for="amount_phone">&#36; </label>
@@ -79,53 +74,53 @@ <h1>Show Ubuntu some love</h1>
                     <div class="contribution-slider"></div>
                     
                     <!-- hidden fields -->
-                    <input type="hidden" name="item_name_4" value="Phone and tablet versions of Ubuntu">
+                    <input type="hidden" name="item_name_4" value="Ubuntu on public clouds">
                 </div>
-                <div class="slider-area" id="community">
-                    <p>Community participation in Ubuntu development</p>
+                <div class="slider-area" id="cloud-tools">
+                    <p class="title">Cloud tools  (e.g. Juju, MAAS)</p>
 
                     <fieldset class="contribution-value">
-                        <label for="amount_community">&#36; </label>
-                        <input type="number" max="125" id="amount_community" name="amount_5" value="2" class="amount-input" tabindex="5">
+                        <label for="amount_phone">&#36; </label>
+                        <input type="number" max="125" id="amount_phone" name="amount_5" value="2" class="amount-input" tabindex="4">
                     </fieldset>
-                    
+
                     <div class="contribution-slider"></div>
                     
                     <!-- hidden fields -->
-                    <input type="hidden" name="item_name_5" value="Community participation in Ubuntu development">
+                    <input type="hidden" name="item_name_5" value="Cloud tools  (e.g. Juju, MAAS)">
                 </div>
-                <div class="slider-area" id="upstream">
-                    <p>Better coordination with Debian and upstreams</p>
+                <div class="slider-area" id="ubuntu-server-with-openstack">
+                    <p class="title">Ubuntu Server with OpenStack</p>
 
                     <fieldset class="contribution-value">
-                        <label for="amount_upstream">&#36; </label>
-                        <input type="number" max="125" id="amount_upstream" name="amount_6" value="2" class="amount-input" tabindex="6">
+                        <label for="amount_phone">&#36; </label>
+                        <input type="number" max="125" id="amount_phone" name="amount_6" value="2" class="amount-input" tabindex="4">
                     </fieldset>
 
                     <div class="contribution-slider"></div>
-
+                    
                     <!-- hidden fields -->
-                    <input type="hidden" name="item_name_6" value="Better coordination with Debian and upstreams">
+                    <input type="hidden" name="item_name_6" value="Ubuntu Server with OpenStack">
                 </div>
-                <div class="slider-area" id="flavours">
-                    <p>Better support for flavours like Kubuntu, Xubuntu, Lubuntu</p>
+                <div class="slider-area" id="community-projects">
+                    <p class="title">Community projects</p>
 
                     <fieldset class="contribution-value">
-                        <label for="amount_flavours">&#36; </label>
-                        <input type="number" max="125" id="amount_flavours" name="amount_7" value="2" class="amount-input" tabindex="7">
+                        <label for="amount_performance">&#36; </label>
+                        <input type="number" max="125" id="amount_performance" name="amount_7" value="2" class="amount-input"  tabindex="2">
                     </fieldset>
 
                     <div class="contribution-slider"></div>
 
                     <!-- hidden fields -->
-                    <input type="hidden" name="item_name_7" value="Better support for flavours">
+                    <input type="hidden" name="item_name_7" value="Community projects">
                 </div>
-                <div class="slider-area" id="canonical">
-                    <p>Tip to Canonical &ndash; they help make it happen</p>
+                <div class="slider-area" id="tip-to-canonical">
+                    <p class="title">Tip to Canonical</p> 
 
                     <fieldset class="contribution-value">
-                        <label for="amount_canonical">&#36; </label>
-                        <input type="number" max="125" id="amount_canonical" name="amount_8" value="2" class="amount-input" tabindex="8">
+                        <label for="amount_hardware">&#36; </label>
+                        <input type="number" max="125" id="amount_hardware" name="amount_8" value="2" class="amount-input" tabindex="3">
                     </fieldset>
 
                     <div class="contribution-slider"></div>
@@ -166,14 +161,14 @@ <h1>Show Ubuntu some love</h1>
                 <input type="hidden" name="no_shipping" value="1">
                 <input type="hidden" name="rm" value="1">
 
-                <input type="hidden" name="return" value="/download/desktop/thank-you/?version={{ request.GET.version }}&architecture={{ request.GET.architecture }}">
-                <input type="hidden" name="cancel_return" value="/download/desktop/thank-you/?version={{ request.GET.version }}&architecture={{ request.GET.architecture }}">
+                <input type="hidden" name="return" value="http://{{ request.META.HTTP_HOST }}/download/desktop/thank-you/?version={{ request.GET.version }}&architecture={{ request.GET.architecture }}">
+                <input type="hidden" name="cancel_return" value="http://{{ request.META.HTTP_HOST }}/download/desktop/thank-you/?version={{ request.GET.version }}&architecture={{ request.GET.architecture }}">
 
                 <input type="hidden" name="bn" value="PP-BuyNowBF:btn_buynowCC_LG.gif:NonHosted">
                 <button type="submit" class="link-cta-ubuntu pay-with-paypal" tabindex="9">Pay with PayPal</button>
 
                 {% if request.GET.version and request.GET.architecture %}
-                <a href="/download/desktop/thank-you/?version={{ request.GET.version }}&architecture={{ request.GET.architecture.split|join:"+" }}" class="skip" tabindex="11">Not now, take me to the download &rsaquo;</a>
+                <a href="/download/desktop/thank-you/?version={{ request.GET.version }}&architecture={{ request.GET.architecture.split|join:"+" }}" class="skip" tabindex="11">Not now, take me to the download&nbsp;&rsaquo;</a>
                 {% endif %}
             </div>
         </div>
@@ -212,7 +207,7 @@ <h1>Show Ubuntu some love</h1>
         { imageFile: 'happy-meal.png',      price: 7,    description: 'A Royale with Cheese '},
         { imageFile: 'cinema-ticket.png',   price: 10,   description: 'a night at the movies. By yourself.'},
         { imageFile: 'king-kong.png',       price: 15,   description: 'King Kong versus Godzilla on DVD'},
-        { imageFile: 't-shirt.png',         price: 20,   description: 'Peace, Love and Linux t-shirt'},
+        { imageFile: 't-shirt.png',         price: 20,   description: 'Peace, Love and Linux t-shirt (shirt not included)'},
         { imageFile: 'frying-pan.png',      price: 30,   description: 'stainless steel copper-bottom frying pan'},
         { imageFile: 'sega-controller.png', price: 50,   description: 'vintage SNES game bundle'},
         { imageFile: 'levi-501.png',        price: 60,   description: 'pair of vintage acid wash Levi 501s'},
@@ -293,10 +288,15 @@ <h1>Show Ubuntu some love</h1>
 
 function updateSliderFromInput(event) {
     var input = event.target;
+    // Input can't be more than 125
     if (input.get('value') > 125) {
         input.set('value', 125);
     }
-    var value = parseInt(input.get('value')) || 2;
+    // Or less than zero
+    if (input.get('value') < 0) {
+        input.set('value', 0);
+    }
+    var value = parseInt(input.get('value')) || 0;
     var slider = input.getData('slider');
     slider.setValue(value);
 }
@@ -392,15 +392,20 @@ <h1>Show Ubuntu some love</h1>
     }
 
     if (skipLink) {
+        var zeroText = 'Download';
+        var currentText = submitButton.getHTML()
+        var originalText = submitButton.getData('originalContent');
+
         // Change the button text to download if total is zero
         if (finalAmount > 0) {
-            var originalContent = submitButton.getData('originalContent');
-            if (originalContent && submitButton.getHTML() != originalContent) {
-                submitButton.setHTML(originalContent);
+            if (originalText && currentText == zeroText) {
+                submitButton.setHTML(originalText);
             }
         } else {
-            submitButton.setData('originalContent', submitButton.getHTML());
-            submitButton.setHTML('Download');
+            if (currentText != zeroText) {
+                submitButton.setData('originalContent', currentText);
+            }
+            submitButton.setHTML(zeroText);
         }
     }
 }
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
old mode 100644
new mode 100755
index 2d3c6536ba9..ad5438bd86c
--- a/templates/download/desktop/create-a-usb-stick-on-mac-osx.html
+++ b/templates/download/desktop/create-a-usb-stick-on-mac-osx.html
@@ -16,8 +16,8 @@ <h1>How to create a bootable USB stick on OS X</h1>
 	<div id="download-help" class="eight-col box box-grey no-border">
 	<p>We would encourage Mac users to download Ubuntu Desktop Edition by burning a CD. But if you prefer to use a USB stick, please follow the instructions below.</p>
 	<p><strong>Note:</strong> this procedure requires that you create an .img file from the .iso file you download.  It will also change the filesystem that is on the USB stick to make it bootable, so backup all data before continuing.</p>
-	
-		<div class="box box-tip">
+
+		<div class="box box-tip no-margin-bottom">
 			<p><strong>Tip:</strong> Drag and drop a file from Finder to Terminal to 'paste' the full path without risking typing errors.</p>
 		</div>
 
@@ -38,14 +38,14 @@ <h1>How to create a bootable USB stick on OS X</h1>
 				<li class="clearfix">
 					<span>3</span>
 					<div>
-						<p>Convert the .iso file to .img using the convert option of hdiutil (e.g.,hdiutil convert -format UDRW -o ~/path/to/target.img ~/path/to/ubuntu.iso)</p>
+						<p>Convert the .iso file to .img using the convert option of hdiutil e.g., <pre>hdiutil convert -format UDRW -o ~/path/to/target.img ~/path/to/ubuntu.iso</pre></p>
 						<p><strong>Note:</strong> OS X tends to put the .dmg ending on the output file automatically.</p>
 					</div>
 				</li>
 				<li class="clearfix">
 					<span>4</span>
 					<div>
-						<p>Run diskutil list to get the current list of devices.</p>
+						<p>Run <pre>diskutil list</pre> to get the current list of devices.</p>
 					</div>
 				</li>
 				<li class="clearfix">
@@ -57,19 +57,19 @@ <h1>How to create a bootable USB stick on OS X</h1>
 				<li class="clearfix">
 					<span>6</span>
 					<div>
-						<p>Run diskutil list again and determine the device node assigned to your flash media (e.g. /dev/disk2).</p>
+						<p>Run <pre>diskutil list</pre> again and determine the device node assigned to your flash media (e.g. /dev/disk2).</p>
 					</div>
 				</li>
 				<li class="clearfix">
 					<span>7</span>
 					<div>
-						<p>Run diskutil unmountDisk /dev/diskN (replace N with the disk number from the last command; in the previous example, N would be 2).</p>
+						<p>Run <pre>diskutil unmountDisk /dev/diskN</pre> (replace N with the disk number from the last command; in the previous example, N would be 2).</p>
 					</div>
 				</li>
 				<li class="clearfix">
 					<span>8</span>
 					<div>
-						<p>Execute sudo dd if=/path/to/downloaded.img of=/dev/rdiskN bs=1m (replace /path/to/downloaded.img with the path where the image file is located; for example, ./ubuntu.imgor ./ubuntu.dmg).</p>
+						<p>Execute <pre>sudo dd if=/path/to/downloaded.img of=/dev/rdiskN bs=1m</pre> (replace /path/to/downloaded.img with the path where the image file is located; for example, ./ubuntu.img or ./ubuntu.dmg).</p>
 						<ul>
 							<li>Using /dev/rdisk instead of /dev/disk may be faster</li>
 							<li>If you see the error dd: Invalid number '1m', you are using GNU dd. Use the same command but replace bs=1m with bs=1M</li>
@@ -80,7 +80,7 @@ <h1>How to create a bootable USB stick on OS X</h1>
 				<li class="clearfix">
 					<span>9</span>
 					<div>
-						<p>Run diskutil eject /dev/diskN and remove your flash media when the command completes.</p>
+						<p>Run <pre>diskutil eject /dev/diskN</pre> and remove your flash media when the command completes.</p>
 					</div>
 				</li>
 				<li class="clearfix">
@@ -91,10 +91,7 @@ <h1>How to create a bootable USB stick on OS X</h1>
 				</li>
 			</ol>
 		</div><!-- /.box -->
-	{% include "download/shared/_wiki_link.html" %}
-	{% include "download/shared/_ask_ubuntu.html" %}
 </div><!-- /.eight-col -->
-{% include "download/shared/_instalation_help.html" %}
 </div><!-- /.row -->
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/download/desktop/create-a-usb-stick-on-ubuntu.html b/templates/download/desktop/create-a-usb-stick-on-ubuntu.html
old mode 100644
new mode 100755
index 9742267e6c5..627a97d95ed
--- a/templates/download/desktop/create-a-usb-stick-on-ubuntu.html
+++ b/templates/download/desktop/create-a-usb-stick-on-ubuntu.html
@@ -15,7 +15,7 @@ <h1>How to create a bootable USB stick <br/>on Ubuntu</h1>
 <div class="row no-border">
 	<div id="download-help" class="eight-col box box-grey no-border">
 	<p>To create a USB stick from which you can install Ubuntu, you must first <a href="/download">download Ubuntu</a>. Then, follow these instructions:</p>
-		<div class="box box-highlight">
+		<div class="box box-highlight no-margin-bottom">
 			<ol class="no-bullets">
 				<li>
 					<span>1</span>
@@ -33,42 +33,47 @@ <h1>How to create a bootable USB stick <br/>on Ubuntu</h1>
 					<span>3</span>
 					<div>
 						<p>Select the <strong>Startup Disk Creator</strong> to launch the app.</p>
-						<img src="{{ STATIC_URL }}img/download/create-usb-ubuntu-1.png" alt="" height="244" width="444">
+						<div class="help-image">
+							<img src="{{ STATIC_URL }}img/download/desktop/create-a-usb-stick-on-ubuntu/image-createausbstickonubuntu-1.jpg" alt="" height="280" width="444">
+							<a href="{{ STATIC_URL }}img/download/desktop/create-a-usb-stick-on-ubuntu/image-createausbstickonubuntu-1.jpg">Click to enlarge</a>
+						</div>
 					</div>
 				</li>
 				<li>
 					<span>4</span>
 					<div>
 						<p>Click <strong>'Other'</strong> to choose the downloaded ISO file.</p>
-						<img src="{{ STATIC_URL }}img/download/create-usb-stick-on-ubuntu-2-12.10.png" alt="" height="149" width="444">
 					</div>
 				</li>
 				<li>
 					<span>5</span>
 					<div>
 						<p>Select the file and click <strong>'Open'</strong>.</p>
-						<img src="{{ STATIC_URL }}img/download/create-usb-stick-on-ubuntu-3-12.10.png" alt="" height="375" width="444">
+						<div class="help-image">
+							<img src="{{ STATIC_URL }}img/download/desktop/create-a-usb-stick-on-ubuntu/image-createausbstickonubuntu-2.jpg" alt="" height="388" width="444">
+							<a href="{{ STATIC_URL }}img/download/desktop/create-a-usb-stick-on-ubuntu/image-createausbstickonubuntu-2.jpg">Click to enlarge</a>
+						</div>
 					</div>
 				</li>
 				<li>
 					<span>6</span>
 					<div>
 						<p>Select the USB stick in the bottom box and click <strong>'Make Startup Disk'</strong>.</p>
-						<img src="{{ STATIC_URL }}img/download/create-usb-stick-on-ubuntu-4-12.10.png" alt="" height="377" width="444">
+						<div class="help-image">
+							<img src="{{ STATIC_URL }}img/download/desktop/create-a-usb-stick-on-ubuntu/image-createausbstickonubuntu-3.jpg" alt="" height="375" width="450">
+							<a href="{{ STATIC_URL }}img/download/desktop/create-a-usb-stick-on-ubuntu/image-createausbstickonubuntu-3.jpg">Click to enlarge</a>
+						</div>
 					</div>
 				</li>
 				<li>
 					<span>7</span>
 					<div>
-						<p>That's it! When the process completes, you'll be ready to restart your computer and begin installing Ubuntu.</p>
+						<p>That&rsquo;s it! When the process completes, you&rsquo;ll be ready to restart your computer and begin installing Ubuntu.</p>
 					</div>
 				</li>
 			</ol>
 		</div><!-- /.box -->
-{% include "download/shared/_wiki_link.html" %}
-{% include "download/shared/_ask_ubuntu.html" %}
 </div><!-- /.eight-col -->
-{% include "download/shared/_instalation_help.html" %}
 </div><!-- /.row -->
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/download/desktop/create-a-usb-stick-on-windows.html b/templates/download/desktop/create-a-usb-stick-on-windows.html
old mode 100644
new mode 100755
index 07cc3848bff..8d5db1b85d5
--- a/templates/download/desktop/create-a-usb-stick-on-windows.html
+++ b/templates/download/desktop/create-a-usb-stick-on-windows.html
@@ -16,37 +16,42 @@ <h1>How to create a bootable USB <br />stick on Windows</h1>
 	<div id="download-help" class="eight-col box box-grey no-border">
 	<p>To run Ubuntu from a USB stick, the first thing you need to do is insert a USB stick with at least 2GB of free space into your PC.</p>
 	<p>The easiest way to put Ubuntu onto your stick is to use the USB installer provided at <a href="http://www.pendrivelinux.com">pendrivelinux.com</a>. You&rsquo;ll need to <a href="http://www.pendrivelinux.com/universal-usb-installer-easy-as-1-2-3/#button">download and install</a> and follow the instructions.</p>
-	<p><a class="link-arrow" href="http://www.pendrivelinux.com/universal-usb-installer-easy-as-1-2-3/#button">Download Pen Drive Linux's USB Installer</a></p>
-		<div class="box box-highlight">
+	<p><a href="http://www.pendrivelinux.com/universal-usb-installer-easy-as-1-2-3/#button">Download Pen Drive Linux's USB Installer&nbsp;&rsaquo;</a></p>
+		<div class="box box-highlight no-margin-bottom">
 			<ol class="no-bullets">
 				<li class="clearfix">
 					<span>1</span>
 					<div>
-						<p>Select Ubuntu Desktop Edition from the dropdown list.</p>
-						<img src="{{ STATIC_URL }}img/download/create-usb-windows-1-12.10.png" alt="" height="450" width="444">
+						<p>Select 'Ubuntu' from the dropdown list.</p>
+						<div class="help-image">
+							<img src="{{ STATIC_URL }}img/download/desktop/create-a-usb-stick-on-windows/image-createausbstickonwindows-1.jpg" alt="" height="451" width="444">
+							<a href="{{ STATIC_URL }}img/download/desktop/create-a-usb-stick-on-windows/image-createausbstickonwindows-1.jpg">Click to enlarge</a>
+						</div>
 					</div>
 				</li>
 				<li class="clearfix">
 					<span>2</span>
 					<div>
 						<p>Click <strong>'Browse'</strong> and open the downloaded ISO file.</p>
-						<img src="{{ STATIC_URL }}img/download/create-usb-windows-2-12.10.png" alt="" height="353" width="444">
-						<img src="{{ STATIC_URL }}img/download/create-usb-windows-3.png" alt="" height="333" width="444">
+						<div class="help-image">
+							<img src="{{ STATIC_URL }}img/download/desktop/create-a-usb-stick-on-windows/image-createausbstickonwindows-2.jpg" alt="" height="326" width="444">
+							<a href="{{ STATIC_URL }}img/download/desktop/create-a-usb-stick-on-windows/image-createausbstickonwindows-2.jpg">Click to enlarge</a>
+						</div>
 					</div>
 				</li>
 				<li class="clearfix">
 					<span>3</span>
 					<div>
 						<p>Choose the USB drive and click <strong>'Create'</strong>.</p>
-						<img src="{{ STATIC_URL }}img/download/create-usb-windows-4.png" alt="" height="356" width="444">
+						<div class="help-image">
+							<img src="{{ STATIC_URL }}img/download/desktop/create-a-usb-stick-on-windows/image-createausbstickonwindows-3.jpg" alt="" height="360" width="444">
+							<a href="{{ STATIC_URL }}img/download/desktop/create-a-usb-stick-on-windows/image-createausbstickonwindows-3.jpg">Click to enlarge</a>
+						</div>
 					</div>
 				</li>
 			</ol>
 		</div><!-- /.box -->
-{% include "download/shared/_wiki_link.html" %}
-{% include "download/shared/_ask_ubuntu.html" %}
 </div><!-- /.eight-col -->
-{% include "download/shared/_instalation_help.html" %}
 </div><!-- /.row -->
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/download/desktop/index.html b/templates/download/desktop/index.html
old mode 100644
new mode 100755
index 1f6481c0b9c..6190e1687cb
--- a/templates/download/desktop/index.html
+++ b/templates/download/desktop/index.html
@@ -1,6 +1,6 @@
 {% extends "download/_base_download.html" %}
 
-{% block title %}Download Ubuntu Desktop{% endblock %}
+{% block title %}Download Ubuntu Desktop | Download{% endblock %}
 
 {% block extra_body_class %}download-desktop-home{% endblock %}
 
@@ -8,56 +8,32 @@
 	{% include "templates/_nav_breadcrumb.html" with section_title="Download" page_title="Desktop"  %}
 {% endblock second_level_nav_items %}
 
-{% block content %}	
-<div class="row row-hero no-border">
+{% block content %}
+{% with ubuntu_release="14.04.1" openstack_version="Icehouse" %}
+<div class="row row-hero row-background no-border">
 	<div class="eight-col append-four">
 		<h1>Download Ubuntu Desktop</h1>
-		<p>You can choose between two options when you download Ubuntu for a desktop PC. Ubuntu 13.10 gives you all the latest features, while Ubuntu 12.04 <abbr title="Long Term Support">LTS</abbr> comes with extended support.</p>
 	</div><!-- /.eight-col -->
-	<div class="box-grey twelve-col no-margin-bottom">
-		<div class="box box-highlight clearfix">
-			<h3><strong>For extended support,</strong><br/>choose Ubuntu 12.04 LTS</h3>
-			<div class="download-description eight-col no-margin-bottom">
-				<p>Ubuntu 12.04.4 LTS is a long-term support release. It has continuous hardware support improvements as well as guaranteed security and support updates until April 2017.</p>
-				<p><a class="link-arrow" href="/download/desktop/install-desktop-long-term-support">Read the full installation instructions</a></p>
+	<div class="twelve-col">
+		<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>
 			</div>
 			<div class="four-col last-col no-margin-bottom download-button">
-				<form class="form-download" action="/download/desktop/contribute/" method="get">
+				<form class="form-download gap-from-top" action="/download/desktop/contribute/" method="get">
 					<fieldset>
-						<input type="hidden" name="version" value="12.04.4" />
-						<p class="smaller">If you have an older PC with less than 2GB of memory, choose the 32-bit download.</p>
+						<input type="hidden" name="version" value="{{ubuntu_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>
 						</select>
 					</fieldset>
 					<div>
-						<button type="submit">Ubuntu 12.04 LTS</button>
-					</div>
-				</form>
-			</div><!-- /.four-col -->
-		</div><!-- /.box -->
-		
-		<div class="box box-highlight clearfix no-margin-bottom">
-			<h3><strong>For the latest features,</strong><br/>choose Ubuntu 13.10</h3>
-			<div class="download-description eight-col no-margin-bottom ">
-				<p>Ubuntu 13.10 will be supported for 9 months and includes cutting-edge new features that make your music, videos, documents and apps much easier to access.</p>
-				<p><a class="link-arrow" href="/download/desktop/install-desktop-latest">Read the full installation instructions</a></p>
-			</div>
-			<div class="four-col last-col no-margin-bottom download-button">
-				<form class="form-download" action="/download/desktop/contribute/" method="get">
-					<fieldset>
-						<input type="hidden" name="version" value="13.10" />
-						<p class="smaller">If you have an older PC with less than 2GB of memory, choose the 32-bit download.</p>
-						<label for="input-bits-latest">Choose your flavour</label>
-						<select id="input-bits-latest" name="architecture">
-							<option value="amd64" selected="selected">64-bit</option>
-							<option value="i386">32-bit (for machines with less than 2GB RAM)</option>
-						</select>
-					</fieldset>
-					<div>
-						<button type="submit">Ubuntu 13.10</button>
+						<button type="submit">Download</button>
 					</div>
 				</form>
 			</div><!-- /.four-col -->
@@ -65,6 +41,39 @@ <h3><strong>For the latest features,</strong><br/>choose Ubuntu 13.10</h3>
 	</div>
 </div><!-- /.row -->
 
+<div class="row row-grey row-easy-ways">
+	<div class="twelve-col">
+		<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>
+			<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">
+			<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">
+				<li><a href="/download/desktop/burn-a-dvd-on-windows">How to burn a DVD on Windows&nbsp;&rsaquo;</a></li>
+				<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">
+			<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">
+				<li><a href="/download/desktop/burn-a-dvd-on-mac-osx">How to burn a DVD on OS X&nbsp;&rsaquo;</a></li>
+				<li><a href="/download/desktop/create-a-usb-stick-on-mac-osx">How to create a bootable USB stick on OS X&nbsp;&rsaquo;</a></li>
+			</ul>
+		</div>
+	</div>
+</div>
+
 {% include "download/desktop/_other-ways.html" %}
+{% endwith %}
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
diff --git a/templates/download/desktop/install-desktop-latest.html b/templates/download/desktop/install-desktop-latest.html
deleted file mode 100644
index 38a54704b88..00000000000
--- a/templates/download/desktop/install-desktop-latest.html
+++ /dev/null
@@ -1,134 +0,0 @@
-{% extends "download/_base_download.html" %}
-
-{% block title %}Install Ubuntu 13.10{% endblock %}
-
-{% block extra_body_class %}download-help{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="Install Ubuntu 13.10"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-padding-bottom">
-	<h1>Install Ubuntu 13.10</h1>
-</div><!-- /.row row-hero -->
-<div class="row no-border">
-	<div id="download-help" class="eight-col box box-grey no-border">
-			<div class="box box-highlight">
-{% comment %}Change this to the current release, the images names need to match this{% endcomment %}
-{% with version="1310" %}
-				<ol class="no-bullets">
-					<li>
-						<span>1</span>
-						<div>
-							<h3>Using a DVD?</h3>
-							<p>It&rsquo;s easy to install Ubuntu from a DVD. Here&rsquo;s what you need to do:</p>
-							<p>Put the Ubuntu DVD into the DVD-drive</p>
-							<p>Restart your computer. You should see a welcome screen prompting you to choose your language and giving you the option to install Ubuntu or try it from the DVD.</p>
-							<p>If you don&rsquo;t get this menu, <a href="https://help.ubuntu.com/community/BootFromCD">read the booting from the DVD</a> guide for more information.</p>
-					
-							<h3>Using a USB drive?</h3>
-							<p>Most newer computers can boot from USB. You should see a welcome screen prompting you to choose your language and giving you the option to install Ubuntu or try it from the CD.</p>
-							<p>If your computer doesn&rsquo;t automatically do so, you might need to press the <strong>F12 key</strong> to bring up the boot menu, but be careful not to hold it down - that can cause an error message.</p>
-							
-							<img src="{{ STATIC_URL }}img/download/desktop-install-1.png" alt="" height="340" width="444">
-						</div>
-					</li>
-					<li>
-						<span>2</span>
-						<div>
-							<h3>Prepare to install Ubuntu</h3>
-							<ul class="bullets">
-								<li>We recommend you plug your computer into a power source</li>
-								<li>You should also make sure you have enough space on your computer to install Ubuntu</li>
-								<li>We advise you to select Download updates while installing and Install this third-party software now</li>
-								<li>You should also stay connected to the internet so you can get the latest updates while you install Ubuntu</li>
-								<li>If you&rsquo;re not connected to the internet, we&rsquo;ll help you set up wireless at the next step</li>
-							</ul>
-							<img src="{{ STATIC_URL }}img/download/desktop-install-2.png" alt="" height="330" width="444">
-						</div>
-					</li>
-					<li>
-						<span>3</span>
-						<div>
-							<h3>Set up wireless</h3>
-							<p>If you are not connected to the internet, you will be asked to select a wireless network, if available. We advise you to connect during the installation so we can ensure your machine is up to date. So, if you set up your wireless network at this point, it&rsquo;s worth then clicking the Back button to go back to the last screen (Preparing to install Ubuntu) and ticking the box marked <strong>&rsquo;Download updates while installing&rsquo;</strong>.</p>
-							<img src="{{ STATIC_URL }}img/download/desktop-{{ version }}-install-3.jpg" alt="" height="334" width="447">
-						</div>
-					</li>
-					<li>
-						<span>4</span>
-						<div>
-							<h3>Allocate drive space</h3>
-							<p>Use the checkboxes to choose whether you&rsquo;d like to Install Ubuntu alongside another operating system, delete your existing operating system and replace it with Ubuntu, or &mdash; if you&rsquo;re an advanced user &mdash; choose the <strong>&rsquo;Something else&rsquo;</strong> option</p>
-							<img src="{{ STATIC_URL }}img/download/desktop-{{ version }}-install-4.jpg" alt="" height="287" width="447">
-						</div>
-					</li>
-					<li>
-						<span>5</span>
-						<div>
-							<h3>Begin the installation</h3>
-							<p>Depending on your previous selections, you can now verify that you have chosen the way in which you would like to install Ubuntu. The installation process will begin when you click the Install Now button.</p>
-							<p>Ubuntu needs about 4.5 GB to install, so add a few extra GB to allow for your files.</p>
-							<p>Not sure about this step? Windows users can <a href="/download/desktop/windows-installer">use the Windows installer</a>, which will install and uninstall Ubuntu in the same way as any other Windows application. It&rsquo;s simpler and completely safe.</p>
-							<img src="{{ STATIC_URL }}img/download/desktop-{{ version }}-install-5.jpg" alt="" height="287" width="447">
-						</div>
-					</li>
-					<li>
-						<span>6</span>
-						<div>
-							<h3>Select your location</h3>
-							<p>If you are connected to the internet, this should be done automatically. Check your location is correct and click <strong>&rsquo;Forward&rsquo;</strong> to proceed. If you&rsquo;re unsure of your time zone, type the name of the town you&rsquo;re in or click on the map and we&rsquo;ll help you find it.</p>
-							
-							<div class="box box-tip">
-								<p><strong>TIP:</strong> If you&rsquo;re having problems connecting to the Internet, use the menu in the top-right-hand corner to select a network.</p>
-							</div>
-							<img src="{{ STATIC_URL }}img/download/desktop-{{ version }}-install-where.jpg" alt="" height="327" width="447">
-						</div>
-					</li>
-					<li>
-						<span>7</span>
-						<div>
-							<h3>Select your preferred keyboard layout</h3>
-							<p>Click on the language option you need. If you&rsquo;re not sure, click the <strong>&rsquo;Detect Keyboard Layout&rsquo;</strong> button for help.</p>
-							<img src="{{ STATIC_URL }}img/download/desktop-{{ version }}-install-keyboa.jpg" alt="" height="326" width="447">
-						</div>
-					</li>
-					<li>
-						<span>8</span>
-						<div>
-							<h3>Enter your login and password details</h3>
-							<img src="{{ STATIC_URL }}img/download/desktop-{{ version }}-install-who.jpg" alt="" height="325" width="444">
-						</div>
-					</li>
-					<li>
-						<span>9</span>
-						<h3>Ubuntu One</h3>
-						<img src="{{ STATIC_URL }}img/download/desktop-{{ version }}-install-ubuntu-one.jpg" alt="" width="444" height="325" />
-					</li>
-					<li>
-						<span class="double">10</span>
-						<div>
-							<h3>Learn more about Ubuntu while <br />the system installs&hellip;</h3>
-							<p>&hellip;or make a cup of tea!</p>
-							<img src="{{ STATIC_URL }}img/download/desktop-{{ version }}-install-tea.png" alt="" height="331" width="444">
-						</div>
-					</li>
-					<li>
-						<span class="double">11</span>
-						<div>
-							<h3>That&rsquo;s it.</h3>
-							<p>All that&rsquo;s left is to restart your computer and start enjoying Ubuntu!</p>
-							<img src="{{ STATIC_URL }}img/download/desktop-{{ version }}-install-10.jpg" alt="" height="119" width="444">
-						</div>
-					</li>
-				</ol>
-{% endwith %}
-			</div><!-- /.box -->
-	{% include "download/shared/_wiki_link_latest.html" %}
-	{% include "download/shared/_ask_ubuntu.html" %}
-</div><!-- /.eight-col -->
-{% include "download/shared/_instalation_help.html" %}
-</div><!-- /.row -->
-{% endblock content %}
-{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/download/desktop/install-desktop-long-term-support.html b/templates/download/desktop/install-desktop-long-term-support.html
deleted file mode 100644
index 8ebd4b87c99..00000000000
--- a/templates/download/desktop/install-desktop-long-term-support.html
+++ /dev/null
@@ -1,125 +0,0 @@
-{% extends "download/_base_download.html" %}
-
-{% block title %}Install Ubuntu 12.04.4 LTS{% endblock %}
-
-{% block extra_body_class %}download-help{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="Install Ubuntu 12.04.4 LTS"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-padding-bottom">
-	<h1>Install Ubuntu 12.04.4 LTS</h1>
-</div><!-- /.row row-hero -->
-<div class="row no-border">
-	<div id="download-help" class="eight-col box box-grey no-border">
-		<div class="box box-highlight">
-			<ol class="no-bullets">
-				<li>
-					<span>1</span>
-					<div>
-						<h3>Using a CD?</h3>
-						<p>It&rsquo;s easy to install Ubuntu from a CD. Here&rsquo;s what you need to do:</p>
-						<p>Put the Ubuntu CD into the CD/DVD-drive.</p>
-						<p>Restart your computer. You should see a welcome screen prompting you to choose your language and giving you the option to install Ubuntu or try it from the CD.</p>
-						<p>If you don't get this menu, <a href="https://help.ubuntu.com/community/BootFromCD">read the booting from the CD guide</a> for more information.</p>
-				
-						<h3>Using a USB drive?</h3>
-						<p>Most newer computers can boot from USB. You should see a welcome screen prompting you to choose your language and giving you the option to install Ubuntu or try it from the CD.</p>
-						<p>If your computer doesn&rsquo;t automatically do so, you might need to press <strong>the F12 key</strong> to bring up the boot menu, but be careful not to hold it down - that can cause an error message. </p>						
-						<img src="{{ STATIC_URL }}img/download/desktop-install-1.png" alt="" height="340" width="444">
-					</div>
-				</li>
-				<li>
-					<span>2</span>
-					<div>
-						<h3>Prepare to install Ubuntu</h3>
-						<ul class="bullets">
-							<li>We recommend you plug your computer into a power source</li>
-							<li>You should also make sure you have enough space on your computer to install Ubuntu</li>
-							<li>We advise you to select Download updates while installing and Install this third-party software now</li>
-							<li>You should also stay connected to the internet so you can get the latest updates while you install Ubuntu</li>
-							<li>If you're not connected to the internet, we'll help you set up wireless at the next step</li>
-						</ul>
-						<img src="{{ STATIC_URL }}img/download/desktop-install-2.png" alt="" height="330" width="444">
-					</div>
-				</li>
-				<li>
-					<span>3</span>
-					<div>
-						<h3>Set up wireless</h3>
-						<p>If you are not connected to the internet, you will be asked to select a wireless network, if available. We advise you to connect during the installation so we can ensure your machine is up to date. So, if you set up your wireless network at this point, it&rsquo;s worth then clicking the Back button to go back to the last screen (Preparing to install Ubuntu) and ticking the box marked <strong>&lsquo;Download updates while installing&rsquo;</strong>.</p>
-						<img src="{{ STATIC_URL }}img/download/desktop-1204-install-3.jpg" alt="" height="334" width="447">
-					</div>
-				</li>
-				<li>
-					<span>4</span>
-					<div>
-						<h3>Allocate drive space</h3>
-						<p>Use the checkboxes to choose whether you'd like to Install Ubuntu alongside another operating system, delete your existing operating system and replace it with Ubuntu, or &mdash; if you're an advanced user &mdash; choose the <strong>'Something else'</strong> option</p>
-						<img src="{{ STATIC_URL }}img/download/desktop-1204-install-4.jpg" alt="" height="287" width="447">
-					</div>
-				</li>
-				<li>
-					<span>5</span>
-					<div>
-						<h3>Begin the installation</h3>
-						<p>Depending on your previous selections, you can now verify that you have chosen the way in which you would like to install Ubuntu. The installation process will begin when you click the Install Now button.</p>
-						<p>Ubuntu needs about 4.5 GB to install, so add a few extra GB to allow for your files.</p>
-						<p>Not sure about this step? Windows users can <a href="/download/desktop/windows-installer">use the Windows installer</a>, which will install and uninstall Ubuntu in the same way as any other Windows application. It's simpler and completely safe.</p>
-						<img src="{{ STATIC_URL }}img/download/desktop-1204-install-5.jpg" alt="" height="287" width="447">
-					</div>
-				</li>
-				<li>
-					<span>6</span>
-					<div>
-						<h3>Select your location</h3>
-						<p>If you are connected to the internet, this should be done automatically. Check your location is correct and click <strong>'Forward'</strong> to proceed. If you're unsure of your time zone, type the name of the town you're in or click on the map and we'll help you find it.</p>
-						
-						<div class="box box-tip">
-							<p><strong>TIP:</strong> If you&rsquo;re having problems connecting to the Internet, use the menu in the top-right-hand corner to select a network.</p>
-						</div>
-						<img src="{{ STATIC_URL }}img/download/desktop-install-5.png" alt="" height="327" width="447">
-					</div>
-				</li>
-				<li>
-					<span>7</span>
-					<div>
-						<h3>Select your preferred keyboard layout</h3>
-						<p>Click on the language option you need. If you&rsquo;re not sure, click the <strong>&rsquo;Detect Keyboard Layout&rsquo;</strong> button for help.</p>
-						<img src="{{ STATIC_URL }}img/download/desktop-install-6.png" alt="" height="326" width="447">
-					</div>
-				</li>
-				<li>
-					<span>8</span>
-					<div>
-						<h3>Enter your login and password details</h3>
-						<img src="{{ STATIC_URL }}img/download/desktop-install-7.png" alt="" height="328" width="447">
-					</div>
-				</li>
-				<li>
-					<span>9</span>
-					<div>
-						<h3>Learn more about Ubuntu while <br />the system installs&hellip;</h3>
-						<p>&hellip;or make a cup of tea!</p>
-						<img src="{{ STATIC_URL }}img/download/desktop-install-8.png" alt="" height="323" width="444">
-					</div>
-				</li>
-				<li>
-					<span class="double">10</span>
-					<div>
-						<h3>That&rsquo;s it.</h3>
-						<p>All that&rsquo;s left is to restart your computer and start enjoying Ubuntu!</p>
-						<img src="{{ STATIC_URL }}img/download/desktop-install-9.png" alt="" height="119" width="444">
-					</div>
-				</li>
-			</ol>
-		</div><!-- /.box -->
-	{% include "download/shared/_wiki_link.html" %}
-	{% include "download/shared/_ask_ubuntu.html" %}
-</div><!-- /.eight-col -->
-{% include "download/shared/_instalation_help.html" %}
-</div><!-- /.row -->
-{% endblock content %}
-{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
diff --git a/templates/download/desktop/install-ubuntu-desktop.html b/templates/download/desktop/install-ubuntu-desktop.html
old mode 100644
new mode 100755
index ec6f8f52878..7de5a853c88
--- a/templates/download/desktop/install-ubuntu-desktop.html
+++ b/templates/download/desktop/install-ubuntu-desktop.html
@@ -1,123 +1,157 @@
 {% extends "download/_base_download.html" %}
 
-{% block title %}Installing Ubuntu Desktop{% endblock %}
+{% block title %}Install Ubuntu 14.04.1 LTS{% endblock %}
 
 {% block extra_body_class %}download-help{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="Installing Ubuntu Desktop"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="Install Ubuntu 14.04.1 LTS"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
 <div class="row row-hero no-padding-bottom">
-	<h1>Installing Ubuntu Desktop</h1>
-</div>
+	<h1>Install Ubuntu 14.04.1 LTS</h1>
+</div><!-- /.row row-hero -->
 <div class="row no-border">
 	<div id="download-help" class="eight-col box box-grey no-border">
-	<div class="box box-highlight">
-		<ol class="no-bullets">
-			<li>
-				<span>1</span>
-				<div>
-					<h3>Using a CD?</h3>
-					<p>It&rsquo;s easy to install Ubuntu from a CD. Here&rsquo;s what you need to do:</p>
-					<p>Put the Ubuntu CD into the CD/DVD-drive.</p>
-					<p>Restart your computer. You should see a welcome screen prompting you to choose your language and giving you the option to install Ubuntu or try it from the CD.</p>
-					<p>If you don't get this menu, <a href="https://help.ubuntu.com/community/BootFromCD">read the booting from the CD guide</a> for more information.</p>
+			<div class="box box-highlight no-margin-bottom">
+{% comment %}Change this to the current release, the images names need to match this{% endcomment %}
+{% with version="1310" %}
+				<ol class="no-bullets">
+					<li>
+						<span>1</span>
+						<div>
+							<h3>Using a DVD?</h3>
+							<p>It&rsquo;s easy to install Ubuntu from a DVD. Here&rsquo;s what you need to do:</p>
+							<p>Put the Ubuntu DVD into the DVD-drive</p>
+							<p>Restart your computer. You should see a welcome screen prompting you to choose your language and giving you the option to install Ubuntu or try it from the DVD.</p>
+							<p>If you don&rsquo;t get this menu, <a href="https://help.ubuntu.com/community/BootFromCD">read the booting from the DVD</a> guide for more information.</p>
 
-					<h3>Using a USB drive?</h3>
-					<p>Most newer computers can boot from USB. You should see a welcome screen prompting you to choose your language and giving you the option to install Ubuntu or try it from the CD.</p>
-					<p>If your computer doesn&rsquo;t automatically do so, you might need to press <strong>the F12 key</strong> to bring up the boot menu, but be careful not to hold it down - that can cause an error message. </p>
-				</div>
-			</li>
-			<li class="clearfix">
-				<span>2</span>
-				<div>
-					<h3>Prepare to install Ubuntu</h3>
-					<ul class="bullets">
-						<li>We recommend you plug your computer into a power source</li>
-						<li>You should also make sure you have enough space on your computer to install Ubuntu</li>
-						<li>We advise you to select Download updates while installing and Install this third-party software now</li>
-						<li>You should also stay connected to the internet so you can get the latest updates while you install Ubuntu</li>
-						<li>If you're not connected to the internet, we'll help you set up wireless at the next step</li>
-					</ul>
-					<img src="{{ STATIC_URL }}img/download/desktop-install-1.png" width="444" height="340" alt="" />
-					</div>
-			</li>
-			<li class="clearfix">
-				<span>3</span>
-				<div>
-					<h3>Set up wireless</h3>
-					<p>If you are not connected to the internet, you will be asked to select a wireless network, if available. We advise you to connect during the installation so we can ensure your machine is up to date. So, if you set up your wireless network at this point, it&rsquo;s worth then clicking the Back button to go back to the last screen (Preparing to install Ubuntu) and ticking the box marked <strong>&lsquo;Download updates while installing&rsquo;</strong>.</p>
-					<img src="{{ STATIC_URL }}img/download/desktop-install-2.png" width="444" height="330" alt="" />
-				</div>
-			</li>
-			<li class="clearfix">
-				<span>4</span>
-				<div>
-					<h3>Allocate drive space</h3>
-					<p>Use the checkboxes to choose whether you'd like to Install Ubuntu alongside another operating system, delete your existing operating system and replace it with Ubuntu, or &mdash; if you're an advanced user &mdash; choose the <strong>'Something else'</strong> option</p>
-					<img src="{{ STATIC_URL }}img/download/desktop-install-3.png" width="444" height="283" alt="" />
-				</div>
-			</li>
-			<li class="clearfix">
-				<span>5</span>
-				<div>
-					<h3>Begin the installation</h3>
-					<p>Depending on your previous selections, you can now verify that you have chosen the way in which you would like to install Ubuntu. The installation process will begin when you click the Install Now button.</p>
-					<p>Ubuntu needs about 4.5 GB to install, so add a few extra GB to allow for your files.</p>
-					<p>Not sure about this step? Windows users can <a href="/download/desktop/windows-installer">use the Windows installer</a>, which will install and uninstall Ubuntu in the same way as any other Windows application. It's simpler and completely safe.</p>
-					<img src="{{ STATIC_URL }}img/download/desktop-install-4.png" width="444" height="281" alt="" />
-				</div>
-			</li>
-			<li class="clearfix">
-				<span>6</span>
-				<div>
-					<h3>Select your location</h3>
-					<p>If you are connected to the internet, this should be done automatically. Check your location is correct and click <strong>'Forward'</strong> to proceed. If you're unsure of your time zone, type the name of the town you're in or click on the map and we'll help you find it.</p>
-					<div class="box box-tip">
-						<p class="clearfix"><strong>TIP:</strong> If you're having problems connecting to the Internet, use the menu in the top-right-hand corner to select a network.</p>
-					</div>
-					<img src="{{ STATIC_URL }}img/download/desktop-install-5.png" width="444" height="322" alt="" />
-				</div>
-			</li>
-			<li class="clearfix">
-				<span>7</span>
-				<div>
-					<h3>Select your preferred keyboard layout</h3>
-					<p>Click on the language option you need. If you&rsquo;re not sure, click the <strong>&lsquo;Detect Keyboard Layout&rsquo;</strong> button for help.</p>
-					<img src="{{ STATIC_URL }}img/download/desktop-install-6.png" width="444" height="323" alt="" />
-				</div>
-			</li>
-			<li class="clearfix">
-				<span>8</span>
-				<div>
-					<h3>Enter your login and password details</h3>
-					<img src="{{ STATIC_URL }}img/download/desktop-install-7.png" width="444" height="324" alt="" />
-				</div>
-			</li>
-			<li class="clearfix">
-				<span>9</span>
-				<div>
-					<h3>Learn more about Ubuntu while the system installs&hellip;</h3>
-					<p>&hellip;or make a cup of tea!</p>
-					<img src="{{ STATIC_URL }}img/download/desktop-install-8.png" width="444" height="323" alt="" />
-				</div>
-			</li>
-			<li class="clearfix">
-				<span class="double">10</span>
-				<div>
-					<h3>That's it.</h3>
-					<p>All that&rsquo;s left is to restart your computer and start enjoying Ubuntu!</p>
-					<img src="{{ STATIC_URL }}img/download/desktop-install-9.png" width="444" height="119" alt="" />
-				</div>
-			</li>
-		</ol>
-	</div><!-- /.box-highlight -->
-	{% include "download/shared/_wiki_link.html" %}
-	{% include "download/shared/_ask_ubuntu.html" %}
-</div><!-- /.eight-col -->
-{% include "download/shared/_instalation_help.html" %}
+							<h3>Using a USB drive?</h3>
+							<p>Most newer computers can boot from USB. You should see a welcome screen prompting you to choose your language and giving you the option to install Ubuntu or try it from the CD.</p>
+							<p>If your computer doesn&rsquo;t automatically do so, you might need to press the <strong>F12 key</strong> to bring up the boot menu, but be careful not to hold it down - that can cause an error message.</p>
+
+                            <div class="help-image">
+                                <img src="{{ STATIC_URL }}img/download/desktop/install-ubuntu-desktop/image-installdesktoplongtermsupport-1.jpg" alt="" height="340" width="444">
+                                <a href="{{ STATIC_URL }}img/download/desktop/install-ubuntu-desktop/image-installdesktoplongtermsupport-1.jpg">Click to enlarge</a>
+                            </div>
+						</div>
+					</li>
+					<li>
+						<span>2</span>
+						<div>
+							<h3>Prepare to install Ubuntu</h3>
+							<ul class="bullets">
+								<li>We recommend you plug your computer into a power source</li>
+								<li>You should also make sure you have enough space on your computer to install Ubuntu</li>
+								<li>We advise you to select Download updates while installing and Install this third-party software now</li>
+								<li>You should also stay connected to the internet so you can get the latest updates while you install Ubuntu</li>
+								<li>If you&rsquo;re not connected to the internet, we&rsquo;ll help you set up wireless at the next step</li>
+							</ul>
+
+                            <div class="help-image">
+                                <img src="{{ STATIC_URL }}img/download/desktop/install-ubuntu-desktop/image-installdesktoplongtermsupport-2.jpg" alt="" height="268" width="444">
+                                <a href="{{ STATIC_URL }}img/download/desktop/install-ubuntu-desktop/image-installdesktoplongtermsupport-2.jpg">Click to enlarge</a>
+                            </div>
+						</div>
+					</li>
+					<li>
+						<span>3</span>
+						<div>
+							<h3>Set up wireless</h3>
+							<p>If you are not connected to the internet, you will be asked to select a wireless network, if available. We advise you to connect during the installation so we can ensure your machine is up to date. So, if you set up your wireless network at this point, it&rsquo;s worth then clicking the Back button to go back to the last screen (Preparing to install Ubuntu) and ticking the box marked <strong>&rsquo;Download updates while installing&rsquo;</strong>.</p>
+
+                            <div class="help-image">
+                                <img src="{{ STATIC_URL }}img/download/desktop/install-ubuntu-desktop/image-installdesktoplongtermsupport-3.jpg" alt="" height="334" width="447">
+                                <a href="{{ STATIC_URL }}img/download/desktop/install-ubuntu-desktop/image-installdesktoplongtermsupport-3.jpg">Click to enlarge</a>
+                            </div>
+						</div>
+					</li>
+					<li>
+						<span>4</span>
+						<div>
+							<h3>Allocate drive space</h3>
+							<p>Use the checkboxes to choose whether you&rsquo;d like to Install Ubuntu alongside another operating system, delete your existing operating system and replace it with Ubuntu, or &mdash; if you&rsquo;re an advanced user &mdash; choose the <strong>&rsquo;Something else&rsquo;</strong> option</p>
+                            <div class="help-image">
+                                <img src="{{ STATIC_URL }}img/download/desktop/install-ubuntu-desktop/image-installdesktoplongtermsupport-4.jpg" alt="" height="287" width="447">
+                                <a href="{{ STATIC_URL }}img/download/desktop/install-ubuntu-desktop/image-installdesktoplongtermsupport-4.jpg">Click to enlarge</a>
+                            </div>
+						</div>
+					</li>
+					<li>
+						<span>5</span>
+						<div>
+							<h3>Begin the installation</h3>
+							<p>Depending on your previous selections, you can now verify that you have chosen the way in which you would like to install Ubuntu. The installation process will begin when you click the Install Now button.</p>
+							<p>Ubuntu needs about 4.5 GB to install, so add a few extra GB to allow for your files.</p>
+                            <div class="help-image">
+                                <img src="{{ STATIC_URL }}img/download/desktop/install-ubuntu-desktop/image-installdesktoplongtermsupport-5.jpg" alt="" height="287" width="447">
+                                <a href="{{ STATIC_URL }}img/download/desktop/install-ubuntu-desktop/image-installdesktoplongtermsupport-5.jpg">Click to enlarge</a>
+                            </div>
+						</div>
+					</li>
+					<li>
+						<span>6</span>
+						<div>
+							<h3>Select your location</h3>
+							<p>If you are connected to the internet, this should be done automatically. Check your location is correct and click <strong>&rsquo;Forward&rsquo;</strong> to proceed. If you&rsquo;re unsure of your time zone, type the name of the town you&rsquo;re in or click on the map and we&rsquo;ll help you find it.</p>
+
+							<div class="box box-tip">
+								<p><strong>TIP:</strong> If you&rsquo;re having problems connecting to the Internet, use the menu in the top-right-hand corner to select a network.</p>
+							</div>
+                            <div class="help-image">
+                                <img src="{{ STATIC_URL }}img/download/desktop/install-ubuntu-desktop/image-installdesktoplongtermsupport-6.jpg" alt="" height="271" width="447">
+                                <a href="{{ STATIC_URL }}img/download/desktop/install-ubuntu-desktop/image-installdesktoplongtermsupport-6.jpg">Click to enlarge</a>
+                            </div>
+						</div>
+					</li>
+					<li>
+						<span>7</span>
+						<div>
+							<h3>Select your preferred keyboard layout</h3>
+							<p>Click on the language option you need. If you&rsquo;re not sure, click the <strong>&rsquo;Detect Keyboard Layout&rsquo;</strong> button for help.</p>
+                            <div class="help-image">
+                                <img src="{{ STATIC_URL }}img/download/desktop/install-ubuntu-desktop/image-installdesktoplongtermsupport-7.jpg" alt="" height="266" width="447">
+                                <a href="{{ STATIC_URL }}img/download/desktop/install-ubuntu-desktop/image-installdesktoplongtermsupport-7.jpg">Click to enlarge</a>
+                            </div>
+						</div>
+					</li>
+					<li>
+						<span>8</span>
+						<div>
+							<h3>Enter your login and password details</h3>
+                            <div class="help-image">
+                                <img src="{{ STATIC_URL }}img/download/desktop/install-ubuntu-desktop/image-installdesktoplongtermsupport-8.jpg" alt="" height="268" width="444">
+                                <a href="{{ STATIC_URL }}img/download/desktop/install-ubuntu-desktop/image-installdesktoplongtermsupport-8.jpg">Click to enlarge</a>
+                            </div>
+						</div>
+					</li>
+					<li>
+						<span>9</span>
+						<div>
+							<h3>Learn more about Ubuntu while <br />the system installs&hellip;</h3>
+							<p>&hellip;or make a cup of tea!</p>
+                            <div class="help-image">
+                                <img src="{{ STATIC_URL }}img/download/desktop/install-ubuntu-desktop/image-installdesktoplongtermsupport-9.jpg" alt="" height="331" width="444">
+                                <a href="{{ STATIC_URL }}img/download/desktop/install-ubuntu-desktop/image-installdesktoplongtermsupport-9.jpg">Click to enlarge</a>
+                            </div>
+						</div>
+					</li>
+					<li>
+						<span class="double">10</span>
+						<div>
+							<h3>That&rsquo;s it.</h3>
+							<p>All that&rsquo;s left is to restart your computer and start enjoying Ubuntu!</p>
+                            <div class="help-image">
+                                <img src="{{ STATIC_URL }}img/download/desktop/install-ubuntu-desktop/image-installdesktoplongtermsupport-10.jpg" alt="" height="123" width="447">
+                                <a href="{{ STATIC_URL }}img/download/desktop/install-ubuntu-desktop/image-installdesktoplongtermsupport-10.jpg">Click to enlarge</a>
+                            </div>
+						</div>
+					</li>
+				</ol>
+{% endwith %}
+			</div><!-- /.box -->
+	</div><!-- /.eight-col -->
 </div><!-- /.row -->
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/download/desktop/install-ubuntu-with-windows.html b/templates/download/desktop/install-ubuntu-with-windows.html
deleted file mode 100644
index b4a601f2b45..00000000000
--- a/templates/download/desktop/install-ubuntu-with-windows.html
+++ /dev/null
@@ -1,82 +0,0 @@
-{% extends "download/_base_download.html" %}
-
-{% block title %}Installing Ubuntu with the Windows installer{% endblock %}
-
-{% block extra_body_class %}download-help{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="Installing Ubuntu with the Windows installer"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-border">
-	<h1>Install Ubuntu with the Windows installer</h1>
-
-	<div class="warning box no-border">
-		<h4>Windows installer is not compatible with Windows 8 or UEFI firmware, and is not available for Ubuntu 13.10.</h4>
-		<p>Please <a href="/download/desktop">download</a> a 64-bit flavour of Ubuntu Desktop.<br/>
-		<a href="https://help.ubuntu.com/community/UEFI">Learn more&nbsp;&rsaquo;</a></p>
-	</div>
-
-	<div id="download-help" class="eight-col box box-grey no-border">
-	<p>Once the <a href="/download/desktop/windows-installer">Windows installer</a> has been downloaded, you need to open it to install Ubuntu. You'll find detailed instructions below. If you need further help, support options are listed at the bottom of this page.</p>
-	<div class="box box-highlight">
-		<ol class="no-bullets">
-			<li>
-				<span>1</span>
-				<div>
-					<p>If you are using <strong>Internet Explorer</strong>, you'll be asked whether you want to run or save the file. Choose <strong>'Run'</strong> to launch the installer.</p>
-					<img src="{{ STATIC_URL }}img/download/ie.jpg" alt="" height="46" width="447">
-					<p>Most other web browsers (like <strong>Firefox</strong>, for example) will only ask you to save the file. To start the installation, click <strong>'Save'</strong> and then double-click the downloaded file.</p>
-					<img src="{{ STATIC_URL }}img/download/firefox.jpg" alt="" height="187" width="439">
-				</div>
-			</li>
-			<li>
-				<span>2</span>
-				<div>
-					<p>If a security message like this appears, click <strong>'Continue'</strong> to proceed.</p>
-					<img src="{{ STATIC_URL }}img/download/U2.2.2_03_medium.jpg" alt="" height="241" width="439">
-				</div>
-			</li>
-			<li>
-				<span>3</span>
-				<div>
-					<p>To install Ubuntu, all you need to do is choose your user name and password. Do note that you need to enter your password twice to make sure you typed it correctly.</p>
-					<img src="{{ STATIC_URL }}img/download/windows-installer-4-12.10.png" alt="" height="351" width="444">
-				</div>
-			</li>
-			<li>
-				<span>4</span>
-				<div>
-					<p>After choosing your password, click <strong>'Install'</strong>. The files will be downloaded and installed automatically.</p>
-				</div>
-			</li>
-			<li>
-				<span>5</span>
-				<div>
-					<p>Wait until Ubuntu is downloaded and installed. <strong>This can take quite a while &mdash; the downloaded file size is around 500MB - but you can keep using your computer throughout.</strong></p>
-					<img src="{{ STATIC_URL }}img/download/windows-installer-5-12.10.png" alt="" height="345" width="447">
-				</div>
-			</li>
-			<li>
-				<span>6</span>
-				<div>
-					<p>When the installation is complete, you&rsquo;ll be prompted to restart your computer. Click <strong>'Finish'</strong> to restart.</p>
-					<img src="{{ STATIC_URL }}img/download/complete.jpg" alt="" height="345" width="447">
-				</div>
-			</li>
-			<li>
-				<span>7</span>
-				<div>
-					<p>After your computer restarts, choose <strong>'Ubuntu'</strong> from the boot menu.</p>
-					<img src="{{ STATIC_URL }}img/download/U2.2.2_07_medium.jpg" alt="" height="187" width="440">
-				</div>
-			</li>
-		</ol>
-	<!-- /.box --></div>	
-{% include "download/shared/_ask_ubuntu.html" %}
-</div><!-- /.eight-col -->
-{% include "download/shared/_instalation_help.html" %}
-</div><!-- /.row -->
-{% endblock content %}
-{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/download/desktop/thank-you.html b/templates/download/desktop/thank-you.html
old mode 100644
new mode 100755
index a8b66b42970..816bb58228e
--- a/templates/download/desktop/thank-you.html
+++ b/templates/download/desktop/thank-you.html
@@ -1,7 +1,7 @@
 {% extends "download/_base_download.html" %}
 
 {% block title %}
-{% if GET.version and GET.architecture %}
+{% if request.GET.version and request.GET.architecture %}
 Thanks for downloading Ubuntu Desktop
 {% else %}
 Thank you for your contribution
@@ -16,57 +16,63 @@
 {% block content %}
 
     {% if request.GET.version and request.GET.architecture %}
+        {% if request.GET.architecture.split|join:"+" == 'amd64+mac' %}
+    <meta http-equiv="refresh" content="3;url=http://cdimage.ubuntu.com/releases/14.04/release/ubuntu-14.04-desktop-amd64+mac.iso">
+        {% 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 %}
 
-    <div class="row no-border">
-    {% if request.GET.version and request.GET.architecture %}
-        <h1>Thanks for downloading Ubuntu Desktop</h1>
-        <p>Your download should start automatically. If it doesn't, <a href="http://releases.ubuntu.com/{{ request.GET.version }}/ubuntu-{{ request.GET.version }}-desktop-{{ request.GET.architecture.split|join:"+" }}.iso">download now</a>.</p>
-    {% else %}
-        <h1>Thank you for your contribution</h1>
-        <p>Thanks for contributing to the Ubuntu project.</p>
-    {% endif %}
-
-        <div class="box-grey twelve-col no-margin-bottom download-cross-sells">
-            <div class="four-col one box box-highlight">
-                <img alt="ubuntu one" src="{{ STATIC_URL }}img/download/ubuntu-one.png" />
-                <h3>Ubuntu One</h3>
-                <p>Your personal cloud for all your music, photos and files. Get your free 5GB account today.</p>
-                <p><a class="link-arrow" href="https://one.ubuntu.com">Learn more about Ubuntu One</a></p>
+    <div class="row row-hero no-border">
+        <div class="eight-col">
+            {% if request.GET.version and request.GET.architecture %}
+                <h1>Thank you for downloading Ubuntu Desktop</h1>
+                <p>
+                    Your download should start automatically. If it doesn&rsquo;t,
+                {% if request.GET.architecture.split|join:"+" == 'amd64+mac' %}
+                    <a href="http://cdimage.ubuntu.com/releases/14.04/release/ubuntu-14.04-desktop-amd64+mac.iso">download now</a>.
+                {% else %}
+                    <a href="http://releases.ubuntu.com/{{ request.GET.version }}/ubuntu-{{ request.GET.version }}-desktop-{{ request.GET.architecture.split|join:"+" }}.iso">download now</a>.
+                {% endif %}
+                </p>
+            {% else %}
+                <h1>Thank you for your contribution</h1>
+                <p>Thanks for contributing to the Ubuntu project.</p>
+            {% endif %}
+        </div>
+    </div>
+    <div class="row row-grey no-border">
+        <div class="box-grey twelve-col no-margin-bottom equal-height">
+            <div class="four-col one box box-highlight no-margin-bottom">
+                <div class="text-center four-col">
+                    <img alt="ubuntu one" src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-discussion-warmgrey.svg" width="113" height="113" />
+                </div>
+                <h3>Talk Ubuntu</h3>
+                <p>Debate the latest developments in the Ubuntu world at Ubuntu Discourse, our community forum.</p>
+                <p><a href="http://discourse.ubuntu.com" class="external">Get involved at Ubuntu Discourse</a></p>
             </div><!-- /.four-col -->
-            <div class="four-col support box box-highlight">
-                <img alt="ubuntu advantage" src="{{ STATIC_URL }}img/download/ubuntu-advantage.png" />
+            <div class="four-col support box box-highlight no-margin-bottom">
+                <div class="text-center four-col">
+                    <img alt="ubuntu advantage" src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-business-warmgrey.svg" width="113" height="113" />
+                </div>
                 <h3>Ubuntu Advantage</h3>
                 <p>Purchase our desktop support and access Ubuntu experts whenever you need.</p>
-                <p><a class="link-arrow" href="http://shop.canonical.com/index.php?cPath=31">Learn more</a></p>
+                <p><a href="http://shop.canonical.com/index.php?cPath=41" class="external">Learn more</a></p>
             </div><!-- /.four-col -->
-            <div class="four-col ask last-col box box-highlight">
-                <img alt="ubuntu advantage" src="{{ STATIC_URL }}img/download/ask-ubuntu.png" />
+            <div class="four-col ask last-col box box-highlight no-margin-bottom">
+                <div class="text-center four-col">
+                    <img alt="ubuntu advantage" src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-forum-warmgrey.svg" width="113" height="113" />
+                </div>
                 <h3>Ask Ubuntu</h3>
                 <p>Need help? Ask your questions here.</p>
-                <p><a class="link-arrow" href="http://askubuntu.com">Get help</a></p>
+                <p><a href="http://askubuntu.com" class="external">Get help</a></p>
             </div><!-- /.four-col -->
         </div><!-- /.row .row-box -->
 
     </div><!-- /.row .row-download -->
-    <div class="row row-next-steps equal-height vertical-divider no-border">
-        <h2>Useful next steps</h2>
-        <div class="four-col">
-            <h4><a href="https://help.ubuntu.com">Access documentation</a></h4>
-            <p>If you&rsquo;re stuck with a problem, take a look at the official documentation developed and maintained by the Ubuntu Documentation Team.</p>
-        </div>
-        <div class="four-col">
-            <h4><a href="https://help.ubuntu.com/community/InternetRelayChat">Live support chat</a></h4>
-            <p>If you would rather ask questions directly to the Ubuntu community, you can access our Internet relay chat (IRC) channel. Simply join the #ubuntu channel on irc.freenode.net.</p>
-        </div>
-        <div class="four-col last-col">
-            <h4><a href="http://www.ubuntu.com/community">Join the Ubuntu community</a></h4>
-            <p>Whether you're an experienced Linux user or you're just getting started with open-source software, there are lots of ways you can contribute to the Ubuntu project.</p>
-        </div>
-    </div>
 {% endblock content %}
 
 {% block footer_extra %}
@@ -81,7 +87,14 @@ <h4><a href="http://www.ubuntu.com/community">Join the Ubuntu community</a></h4>
 // Mirrors for this country
 var mirrors = {{ mirror_list|safe }};
 
-if (version && architecture) {
+if (version && architecture && architecture != 'amd64+mac') {
+    // Report to Google Analytics
+    YUI().use('event-base', function (Y) {
+        Y.on('domready', function () {
+            _gaq.push(['_trackEvent', 'Download', 'Downloaded', 'User downloaded Ubuntu (' + version + '-desktop-' + architecture + ')']);
+        });
+    });
+
     startDownload(mirrors, version, architecture, defaultLocation);
 }
 
@@ -145,4 +158,4 @@ <h4><a href="http://www.ubuntu.com/community">Join the Ubuntu community</a></h4>
 }
 </script>
 
-{% endblock footer_extra %}
\ No newline at end of file
+{% endblock footer_extra %}
diff --git a/templates/download/desktop/try-ubuntu-before-you-install.html b/templates/download/desktop/try-ubuntu-before-you-install.html
old mode 100644
new mode 100755
index cafad0d03c9..ed1cd89fdc8
--- a/templates/download/desktop/try-ubuntu-before-you-install.html
+++ b/templates/download/desktop/try-ubuntu-before-you-install.html
@@ -8,7 +8,7 @@
 	{% 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 %}	
+{% block content %}
 <div class="row row-hero">
 	<h1>Try Ubuntu before you install it</h1>
 </div><!-- /.row row-hero -->
@@ -16,22 +16,22 @@ <h1>Try Ubuntu before you install it</h1>
 <div class="row no-border">
 	<div id="download-help" class="eight-col box box-grey no-border">
 		<p>You can try Ubuntu without actually installing it on your computer&rsquo;s hard drive. You can do this by starting up your computer with either an Ubuntu DVD in the drive or a USB stick with Ubuntu on it in a USB port. Here&rsquo;s how:</p>
-		<div class="box box-highlight clearfix">
+		<div class="box box-highlight clearfix no-margin-bottom">
 			<ol class="no-bullets">
 				<li class="clearfix">
 					<span>1</span>
 					<div>
 						<h3>Using a DVD?</h3>
 						<p>Put the Ubuntu DVD into the DVD-drive and restart the computer. You should see a welcome screen prompting you to choose your language and giving you the option to install Ubuntu or try it from the DVD. If you don&rsquo;t get this menu, please <a href="https://help.ubuntu.com/community/BootFromCD">read the booting from the DVD guide</a> for more information.</p>
-				
+
 						<h4>Using a USB drive?</h4>
 						<p>Most newer computers can start up from a USB stick. You should see a welcome screen prompting you to choose your language and giving you the option to either install Ubuntu or try it from the USB.</p>
 						<p>If your computer does not automatically do this, you might need to change the device from which the computer starts up to the USB. You can usually do this by watching for a message appearing before Windows starts. You should be invited to change the boot device. Once you&rsquo;ve selected that option, follow the instructions on screen.</p>
-				
+
 						<div class="box box-tip">
 							<p><strong>Tip:</strong> You might be able to press <strong>&lsquo;F12&rsquo;</strong> or <strong>&lsquo;Escape&rsquo;</strong> while your computer is starting up to change your boot device order.</p>
-						</div>	
-				
+						</div>
+
 						<p>Depending on your computer and how your USB key was formatted, you should see an entry for &lsquo;removable drive&rsquo; or &lsquo;USB media&rsquo;. Move this to the top of the list to force the computer to start from USB rather than the hard disk. Save your changes and continue.</p>
 					</div>
 				</li>
@@ -39,28 +39,31 @@ <h4>Using a USB drive?</h4>
 					<span>2</span>
 					<div>
 						<p>Choose your preferred language and click on <strong>&lsquo;Try Ubuntu&rsquo;</strong>.</p>
-						<img src="{{ STATIC_URL }}img/download/desktop-install-1.png" alt="desktop-install-1" width="444" height="340" />
+						<div class="help-image">
+							<img src="{{ STATIC_URL }}img/download/desktop/try-ubuntu-before-you-install/image-tryubuntubeforeyouinstall-1.jpg" alt="desktop-install-1" width="444" height="340" />
+							<a href="{{ STATIC_URL }}img/download/desktop/try-ubuntu-before-you-install/image-tryubuntubeforeyouinstall-1.jpg">Click to enlarge</a>
+						</div>
 					</div>
 				</li>
 				<li class="clearfix">
 					<span>3</span>
 					<div>
 						<p>Your live desktop should appear. Have a look around!</p>
-						<img src="{{ STATIC_URL }}img/download/screenshot-desktop-trail-2.png" alt="desktop-trial-2" width="444" height="263" />
+						<div class="help-image">
+							<img src="{{ STATIC_URL }}img/download/desktop/try-ubuntu-before-you-install/image-tryubuntubeforeyouinstall-2.jpg" alt="desktop-trial-2" width="444" height="263" />
+							<a href="{{ STATIC_URL }}img/download/desktop/try-ubuntu-before-you-install/image-tryubuntubeforeyouinstall-2.jpg">Click to enlarge</a>
+						</div>
 					</div>
 				</li>
 				<li class="clearfix">
 					<span>4</span>
 					<div>
-						<p>When you&rsquo;re ready to install Ubuntu, double-click on the icon on your desktop: <strong>&rsquo;Install Ubuntu 13.10&rsquo;</strong>.</p>
+						<p>When you&rsquo;re ready to install Ubuntu, double-click on the icon on your desktop: <strong>&rsquo;Install Ubuntu 14.04 LTS&rsquo;</strong>.</p>
 					</div>
 				</li>
-			</ol>			
+			</ol>
 		</div>
-	{% include "download/shared/_wiki_link.html" %}
-	{% include "download/shared/_ask_ubuntu.html" %}
 </div><!-- /.eight-col -->
-{% include "download/shared/_instalation_help.html" %}
 </div><!-- /.row -->
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/download/desktop/upgrade.html b/templates/download/desktop/upgrade.html
old mode 100644
new mode 100755
index cef92a656c0..3560ea36ab3
--- a/templates/download/desktop/upgrade.html
+++ b/templates/download/desktop/upgrade.html
@@ -6,66 +6,56 @@
 	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="Upgrade" tertiary="true" %}
 {% endblock second_level_nav_items %}
 
-{% block content %}	
+{% block content %}
 <div class="row row-hero">
-	<div class="twelve-col">
-		<h1>Upgrade from Ubuntu 13.04 to 13.10</h1>
-	</div>
-	
-	<div class="warning box no-border twelve-col">
+	<h1>Upgrade from Ubuntu 13.10 to 14.04 LTS</h1>
+	<div class="box no-border warning">
 		<p>We recommend you backup your existing Ubuntu installation before updating.</p>
 	</div>
-	
-	<div class="box box-image-centered box-grey no-border no-margin-bottom">
-		<span><img src="{{ STATIC_URL }}img/pictograms/pictogram-upgrade-grey-113x113.png" alt="" width="124" height="124"></span>
+	<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.04, 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="/getubuntu/releasenotes">read the release notes</a> for Ubuntu 13.10, which which include workarounds for any problems you might encounter.</p>
+			<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>
 		</div><!-- /.ten-col -->
 	</div><!-- /.box -->
-
-<div id="ubuntu-help" class="box box-grey no-border">
-<ol class="no-bullets">
-	<li class="box box-highlight clearfix">
-		<div class="one-col">
-			<span>1</span>
-		</div>
-		<div class="four-col">
-		<div>
-			<h2>Launch the update manager</h2>
-			<p>Press the <strong>Superkey (Windows key)</strong> to launch the Dash and search for <strong>Update Manager</strong></p>
-		</div>
-		</div>
-		<div class="six-col right">
-			<img src="{{ STATIC_URL }}img/download/desktop-update-1-20.10.png" width="444" height="465" alt="" />
-		</div>
-	</li>
-	<li class="box box-highlight clearfix">
-		<div class="one-col">
-			<span>2</span>
-		</div>
-		<div class="four-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>
-		</div>
-		<div class="six-col right">
-			<img class="" src="{{ STATIC_URL }}img/download/desktop-update-2-20.10.png" width="444" height="463" alt="" />
-		</div>
-	</li>
-	<li class="box box-highlight clearfix">
-		<div class="one-col">
-			<span>3</span>
-		</div>
-		<div class="four-col">
-			<h2>Install the upgrade</h2>
-			<p>A message will appear informing you of the availability of the new release. Click <strong>Upgrade</strong> and follow the on-screen instructions.</p>
-		</div>
-		<div class="six-col right">
-			<img src="{{ STATIC_URL }}img/download/desktop-update-3-20.10.png" width="444" height="461" alt="" />
-		</div>
-	</li>
-</ol>
-{% include "download/shared/_ask_ubuntu.html" %}
-</div><!-- /.box -->
+</div>
+<div class="row no-border">
+	<div id="download-help" class="box box-grey no-border">
+		<ol class="no-bullets no-margin-bottom">
+			<li class="box box-highlight clearfix">
+				<span>1</span>
+				<div class="five-col">
+				<div>
+					<h2>Launch the Software Updater</h2>
+					<p>Press the <strong>Superkey (Windows key)</strong> to launch the Dash and search for <strong>Update Manager</strong></p>
+				</div>
+				</div>
+				<div class="six-col right">
+					<img src="{{ STATIC_URL }}img/download/desktop/upgrade/image-upgrade-1.jpg" width="444" height="250" alt="" />
+				</div>
+			</li>
+			<li class="box box-highlight clearfix">
+				<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>
+				</div>
+				<div class="six-col right">
+					<img class="" src="{{ STATIC_URL }}img/download/desktop/upgrade/image-upgrade-2.jpg" width="444" height="300" alt="" />
+				</div>
+			</li>
+			<li class="box box-highlight clearfix">
+				<span>3</span>
+				<div class="five-col">
+					<h2>Install the upgrade</h2>
+					<p>A message will appear informing you of the availability of the new release. Click <strong>Upgrade</strong> and follow the on-screen instructions.</p>
+				</div>
+				<div class="six-col right">
+					<img src="{{ STATIC_URL }}img/download/desktop/upgrade/image-upgrade-3.jpg" width="444" height="400" alt="" />
+				</div>
+			</li>
+		</ol>
+	</div><!-- /.box -->
 </div><!-- /.row -->
 {% endblock content %}
diff --git a/templates/download/desktop/windows-installer.html b/templates/download/desktop/windows-installer.html
deleted file mode 100644
index bea776d6aa5..00000000000
--- a/templates/download/desktop/windows-installer.html
+++ /dev/null
@@ -1,51 +0,0 @@
-{% extends "download/_base_download.html" %}
-
-{% block title %}Download Ubuntu Desktop{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="Windows installer"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}	
-<div class="row row-hero no-padding-bottom">
-	<div class="twelve-col">
-		<h1>Download the Windows installer <br />for Ubuntu Desktop</h1>
-	</div>
-
-	<div class="warning box box-image-centered no-border no-margin-bottom">
-		<span><img src="{{ STATIC_URL }}img/logos/windows-8-logo-grey.png" width="146" height="29" /></span>
-		<div class="nine-col last-col">
-			<h4>Have a new PC with the Windows 8 logo or using UEFI firmware?</h4>
-			<p>Please use a <a href="/download/desktop">64-bit flavour</a> of Ubuntu, installed directly to its own partition <br/>rather than using the Windows installer.<br/>
-			<a href="https://help.ubuntu.com/community/UEFI">Learn more&nbsp;&rsaquo;</a></p>
-		</div><!-- /.nine-col -->
-	</div><!-- /.warning -->
-</div><!-- /.row -->
-   
-<div class="row row-windows-installer no-border no-margin-bottom">
-<div class="box box-grey no-border">
-	<div class="box box-highlight clearfix">
-		<h3>Windows installer for Ubuntu Desktop</h3>
-		<div class="download-description eight-col">
-			<p>With Wubi, our officially supported Ubuntu installer for Windows, you can install and uninstall Ubuntu easily and safely. For 12.04 LTS only.</p>
-			<p><a class="link-arrow" href="/download/desktop/install-ubuntu-with-windows">Read the installation instructions</a></p>
-		</div>
-		<div class="four-col last-col">
-		<form class="form-download" action="http://www.ubuntu.com/pre-download" method="get">
-			<fieldset>
-				<input name="destination" value="desktop" type="hidden">
-				<input name="distro" value="wubi" type="hidden">
-				<input name="bits" value="" type="hidden">
-				<input name="release" value="lts" type="hidden">
-			</fieldset>
-			<div>
-				<button type="submit">Get the installer</button>
-			</div>
-		</form>
-		</div>
-	</div>
-</div>
-</div>
-{% include "download/desktop/_other-ways.html" %}
-{% endblock content %}
-{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
diff --git a/templates/download/index.html b/templates/download/index.html
old mode 100644
new mode 100755
index 3b36157051c..e67949ca5b0
--- a/templates/download/index.html
+++ b/templates/download/index.html
@@ -1,6 +1,6 @@
 {% extends "download/_base_download.html" %}
 
-{% block title %}Download Ubuntu{% endblock %}
+{% block title %}Get Ubuntu | Download{% endblock %}
 {% block extra_body_class %}download-home{% endblock %}
 
 {% block second_level_nav_items %}
@@ -16,22 +16,37 @@ <h1>Get Ubuntu</h1>
 </div><!-- / .row -->
 
 <div class="row row-list-download no-border">
-	<div class="twelve-col desktop box box-highlight">
-		<div id="download-desktop">
-			<h2><a class="link-arrow" href="/download/desktop">Ubuntu Desktop</a></h2>
+	<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>
-		<p class="ubuntu-upgrade">Do you want to upgrade? <a class="link-arrow" href="/download/desktop/upgrade">Follow our simple guide</a></p>
-	</div><!-- /.four-col -->
-	
+	</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 equal-height">
-		<div class="six-col server box">
-			<h2><a class="link-arrow" href="/download/server">Ubuntu Server</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 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">
+				<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><!-- /.four-col -->
-		<div class="six-col cloud last-col box">
-			<h2><a class="link-arrow" href="/download/cloud">Ubuntu Cloud</a></h2>
-			<p>Ubuntu Cloud comprises installation options for the OpenStack-based Ubuntu Cloud Infrastructure and Ubuntu Cloud Guest, all from within the Ubuntu Server download.</p>
+		<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">
+				<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><!-- /.four-col -->
 	</div><!-- /.twelve-col -->
 </div><!-- /.row -->
diff --git a/templates/download/server/_other-ways.html b/templates/download/server/_other-ways.html
new file mode 100755
index 00000000000..96cb2a0975c
--- /dev/null
+++ b/templates/download/server/_other-ways.html
@@ -0,0 +1,24 @@
+<div class="row no-border">
+	<div class="twelve-col">
+		<h2>Get the version you need</h2>
+	</div>
+	<div class="twelve-col">
+		<div class="equal-height vertical-divider">
+			<div class="four-col">
+				<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 -->
+			<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>
+			</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>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/download/server/arm.html b/templates/download/server/arm.html
new file mode 100755
index 00000000000..615b6619d08
--- /dev/null
+++ b/templates/download/server/arm.html
@@ -0,0 +1,52 @@
+{% extends "download/_base_download.html" %}
+
+{% block title %}Ubuntu for ARM | Download{% endblock %}
+
+{% block second_level_nav_items %}
+	{% 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="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>
+				</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>
+				</ul>
+			</div>
+		</div>
+	</div><!-- /.box -->
+</div>
+
+<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>
+	</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">
+		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-server-warmgrey.svg" alt="" width="200" height="200" />
+	</div>
+</div><!-- /.row -->
+{% endblock content %}
+{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
diff --git a/templates/download/server/cds.html b/templates/download/server/cds.html
deleted file mode 100644
index 64cb58689cd..00000000000
--- a/templates/download/server/cds.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "download/_base_download.html" %}
-
-{% block title %}Get Ubuntu Server CDs{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Server" page_title="CDs"  %}
-{% endblock second_level_nav_items %}
-
-{% block header %}
-<div class="row">
-	<h1>Get Ubuntu Server CDs</h1>
-</div><!-- / .row -->
-{% endblock %}
-
-{% block content %}
-<div class="row">
-</div><!-- / .row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/download/server/download.html b/templates/download/server/download.html
deleted file mode 100644
index 6f2627b58c8..00000000000
--- a/templates/download/server/download.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% extends "download/_base_download.html" %}
-
-{% block title %}Download Ubuntu Server{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Server" page_title="Download"  %}
-{% endblock second_level_nav_items %}
-
-{% block header %}
-<div class="row">
-	<div class="seven-col">
-		<h1>Download Ubuntu Server</h1>
-		<p>You can download Ubuntu Server now – it's completely free.</p>
-	</div><!-- / .seven-col -->
-</div><!-- / .row -->
-{% endblock %}
-
-{% block content %}
-<div class="row">
-</div><!-- / .row -->
-{% endblock content %}
-{% block footer_extra %}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/download/server/index.html b/templates/download/server/index.html
old mode 100644
new mode 100755
index 89e64beeb8c..ee3884d56e2
--- a/templates/download/server/index.html
+++ b/templates/download/server/index.html
@@ -1,94 +1,89 @@
 {% extends "download/_base_download.html" %}
 
-{% block title %}Download Ubuntu Server{% endblock %}
+{% block title %}Download Ubuntu Server | Download{% endblock %}
 
 {% block extra_body_class %}download-server-home{% endblock %}
 
 {% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Download" page_title="Server"  %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Download" page_title="Server" tertiary="true"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
-<div class="row row-hero no-border">
-	<h1>Download Ubuntu Server</h1>
-		<div class="eight-col">
-			<p>Download Ubuntu Server 13.10 to get the latest features (including the Havana release of OpenStack) or stay with Ubuntu 12.04 for extended support. If you&rsquo;re a technical user and you&rsquo;re looking for specific version downloads, go to <a href="http://releases.ubuntu.com">releases.ubuntu.com</a>.</p>
-		</div><!-- /.eight-col -->
-	<div class="box-grey twelve-col no-margin-bottom ">
-		<div class="box box-highlight clearfix">
-			<h3><strong>For extended support,</strong><br />choose Ubuntu Server 12.04.4 LTS</h3>
-			<div class="download-description eight-col">
-				<p>Ubuntu 12.04.4 LTS is a long-term support release, with support guaranteed until April 2017. Havana is available via <br/>the <a href="/download/cloud/cloud-archive-instructions">Ubuntu Cloud Archive</a>.</p>
-				<p><a class="link-arrow" href="/download/server/install-ubuntu-server">Read the full installation instructions</a></p>
+{% with ubuntu_release="14.04.1" openstack_version="Icehouse" %}
+<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="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>
 			</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">
 					<fieldset>
-						<input name="version" value="12.04.4" type="hidden">
-						<label for="input-bits">Choose your flavour</label>
-						<select id="input-bits" name="architecture">
-							<option value="i386">32-bit</option>
-							<option value="amd64" selected="selected">64-bit (recommended)</option>
-						</select>
-					</fieldset>
-					<div>
-						<button type="submit">Get Ubuntu 12.04 LTS</button>
-					</div>
-				</form>
-			</div><!-- /.four-col -->
-		</div><!-- /.box -->
-		<div class="box box-highlight clearfix">
-			<h3><strong>For the latest features,</strong><br />choose Ubuntu Server 13.10</h3>
-			<div class="download-description eight-col">
-				<p>Ubuntu 13.10 will be supported for 9 months and includes cutting-edge new features such as the Havana release of OpenStack.</p>
-				<p><a class="link-arrow" href="/download/server/install-ubuntu-server">Read the full installation instructions</a></p>
-			</div>
-			<div class="four-col last-col">
-				<form class="form-download single-download" action="/download/server/thank-you/" method="get">
-					<fieldset>
-						<input name="version" value="13.10" type="hidden">
+						<input name="version" value="{{ubuntu_release}}" type="hidden">
 						<input name="architecture" value="amd64" type="hidden">
 					</fieldset>
 					<div>
-						<button class="cta-large" type="submit">Get Ubuntu 13.10</button>
-						<span class="small">Ubuntu Server 13.10 64-bit version</span>
+						<button type="submit">Download</button>
 					</div>
 				</form>
 			</div><!-- /.four-col -->
 		</div><!-- /.box -->
-	</div><!-- /.box -->
+	</div>
 </div><!-- /.row -->
 
-<div class="row no-border">
-	<h2>More tools and options</h2>
+<div class="row row-grey">
+	<div class="twelve-col">
+		<h2>How you can use Ubuntu Server</h2>
+	</div>
 	<div class="equal-height">
-		<div class="four-col box">
-			<h3><a href="/cloud/orchestration/juju">Service orchestration with Juju &rsaquo;</a></h3>
-			<p>With Juju, the service orchestration tool from the Ubuntu project, deployment instructions for cloud services can be stored in charms that can be used, stored and shared. We call it Devops Distilled.</p>
+		<div class="four-col box box-highlight">
+			<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>
 		</div>
-		<div class="four-col box">
-			<h3><a href="/download/arm">Ubuntu for ARM &rsaquo;</a></h3>
-			<p>Ubuntu Server and Ubuntu Desktop for ARM are a general purpose OS for ARM-based systems. A variety of SoC platforms are certified. Please note that currently only Calxeda ECX-1000 (Server only), Marvell Armada-XP (Server only) and TI Panda development boards are supported.</p>
+		<div class="four-col box box-highlight">
+			<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>
 		</div>
-		<div class="four-col sidebar last-col">
-			<h4>More options</h4>
-			<ul>
-				<li><a href="/download/desktop">Ubuntu Desktop</a></li>
-				<li><a href="http://shop.canonical.com/index.php?cPath=17">Buy DVDs from the shop</a></li>
-			</ul>
-			<h4>Release notes</h4>
-			<ul>
-				<li><a href="https://wiki.ubuntu.com/SaucySalamander/ReleaseNotes">Ubuntu Server 13.10 release notes</a></li>
-				<li><a href="https://wiki.ubuntu.com/PrecisePangolin/ReleaseNotes/UbuntuServer">Ubuntu Server 12.04.4 LTS release notes</a></li>
-			</ul>
+		<div class="four-col last-col box box-highlight">
+			<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>
 		</div>
-	</div><!-- /.equal-height -->
-	<div class="eight-col box-grey">
-		<h4>Alternative options</h4>
-		<p>Want to download via BitTorrent links, find regional mirrors to get DVD images, use the network installer or find previous versions of Ubuntu?</p>
-		<p><a class="link-arrow" href="/download/alternative-downloads">Take a look at a full list of our previous versions and alternative downloads</a></p>
 	</div>
 </div>
 
+<div class="row no-border">
+	<div class="twelve-col">
+		<h2>Get the version you need</h2>
+	</div>
+	<div class="twelve-col">
+		<div class="equal-height vertical-divider">
+			<div class="four-col">
+				<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 -->
+			<div class="four-col">
+				<h3 class="header--download">Find alternative downloads</h3>
+				<p>Ubuntu is available via BitTorrent links and  regional mirrors. You can also use the network installer.</p>
+				<p><a href="/download/alternative-downloads">Alternative downloads&nbsp;&rsaquo;</a></p>
+			</div><!-- /.four-col -->
+			<div class="four-col last-col">
+				<h3 class="header--server">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>
+			</div>
+		</div>
+	</div>
+</div>
+{% endwith %}
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
diff --git a/templates/download/server/install-ubuntu-server.html b/templates/download/server/install-ubuntu-server.html
old mode 100644
new mode 100755
index 9deed81b8c3..94185545e13
--- a/templates/download/server/install-ubuntu-server.html
+++ b/templates/download/server/install-ubuntu-server.html
@@ -13,7 +13,7 @@
 	<h1>Installing Ubuntu Server</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>
-	<div class="box box-highlight">
+	<div class="box box-highlight no-margin-bottom">
 		<ol class="no-bullets">
 			<li>
 				<span>1</span>
@@ -59,18 +59,15 @@ <h1>Installing Ubuntu Server</h1>
 			</li>
 		</ol>
 	</div><!-- /.box-highlight -->
-
-	{% include "download/shared/_wiki_link.html" %}
-	{% include "download/shared/_ask_ubuntu.html" %}
 </div><!-- /.eight-col -->
 
 <div class="sidebar aside four-col last-col">
-		<h3>Mass Provisioning of Ubuntu Server</h3>
+		<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>
-			<li><a href="https://wiki.ubuntu.com/ServerTeam/MAAS">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</a></li>
+		<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>
 		</ul>
 </div><!-- /.sidebar -->
 </div><!-- /.row -->
diff --git a/templates/download/server/power8.html b/templates/download/server/power8.html
new file mode 100755
index 00000000000..b31bd6f553a
--- /dev/null
+++ b/templates/download/server/power8.html
@@ -0,0 +1,55 @@
+{% extends "download/_base_download.html" %}
+
+{% block title %}Ubuntu for POWER8 | Download{% endblock %}
+
+{% block meta_description %}Ubuntu for POWER 8 brings the Ubuntu Server and Ubuntu Server for cloud with the OpenStack ecosystem to POWER8.{% endblock meta_description %}
+
+{% block meta_keywords %}Ubuntu Server, OpenStack, Cloud, Ubuntu OpenStack, IBM, POWER8, ppc64el, ppc64, Power Systems{% endblock meta_keywords %}
+
+
+{% block second_level_nav_items %}
+	{% 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="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>
+				</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>
+				</ul>
+			</div>
+		</div>
+	</div><!-- /.box -->
+</div>
+
+<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>
+		</div>
+	</div>
+</div>
+
+<div class="row no-border">
+	<div class="eight-col">
+		<h3>Ready to deploy now</h3>
+		<p>Ubuntu for POWER8 brings the Ubuntu Server and Ubuntu Server for cloud with the OpenStack ecosystem to POWER8 enabling its ease of entry into the scale-out and Cloud markets.  Power is especially optimized for Mobile, Social, Cloud, Big Data and Analytics workloads.  Ubuntu and tooling such as Juju make managing and deploying those workloads trivial.</p>
+	</div><!-- /.twelve-col -->
+	<div class="four-col last-col text-center">
+		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-server-warmgrey.svg" alt="" width="200" height="200" />
+	</div>
+</div><!-- /.row -->
+{% endblock content %}
+{% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
diff --git a/templates/download/server/thank-you.html b/templates/download/server/thank-you.html
old mode 100644
new mode 100755
index 1c0d9d0f2e7..04ab8ac4927
--- a/templates/download/server/thank-you.html
+++ b/templates/download/server/thank-you.html
@@ -1,16 +1,12 @@
 {% extends "download/_base_download.html" %}
 
 {% block title %}
-{% if GET.version and GET.architecture %}
 Thanks for downloading Ubuntu Server
-{% else %}
-Thank you for your contribution
-{% endif %}
 {% endblock %}
 {% block extra_body_class %}download-thankyou{% endblock %}
 
 {% block second_level_nav_items %}
-{% include "templates/_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 %}
@@ -18,49 +14,40 @@
         <meta http-equiv="refresh" content="3;url=http://releases.ubuntu.com/{{ request.GET.version }}/ubuntu-{{ request.GET.version }}-server-{{ request.GET.architecture.split|join:"+" }}.iso">
     </noscript>
 
-    <div class="row no-border">
+    <div class="row row-hero no-border">
         <h1>Thanks for downloading Ubuntu Server</h1>
-        <p>Your download should start automatically. If it doesn't, <a href="http://releases.ubuntu.com/{{ request.GET.version }}/ubuntu-{{ request.GET.version }}-server-{{ request.GET.architecture.split|join:"+" }}.iso">download now</a>.</p>
-
-        <div class="box-grey twelve-col no-margin-bottom download-cross-sells">
+        <p>Your download should start automatically. If it doesn&rsquo;t, <a href="http://releases.ubuntu.com/{{ request.GET.version }}/ubuntu-{{ request.GET.version }}-server-{{ request.GET.architecture.split|join:"+" }}.iso">download now</a>.</p>
+    </div>
+    <div class="row row-grey no-border">
+        <div class="box-grey twelve-col no-margin-bottom equal-height">
             <div class="four-col support box box-highlight">
-                <img alt="ubuntu advantage" src="{{ STATIC_URL }}img/download/ubuntu-advantage.png" />
+                <div class="text-center four-col">
+                    <img alt="ubuntu advantage" src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-business-warmgrey.svg" width="113" height="113" />
+                </div>
                 <h3>Ubuntu Advantage</h3>
                 <p>Commercial support agreements to suit your business needs.</p>
-                <p><a class="link-arrow" href="http://www.ubuntu.com/server/management">Learn more about Ubuntu Advantage</a></p>
+                <p><a href="http://www.ubuntu.com/server/management">Learn more about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
             </div><!-- /.four-col -->
             <div class="four-col one box box-highlight">
-                <img alt="ubuntu one" src="{{ STATIC_URL }}img/download/cloud-jumpstart.png" />
-                <h3>Ubuntu Cloud Jumpstart</h3>
-                <p>A private cloud in five days, with a Canonical engineer on site to get it done.</p>
-                <p><a class="link-arrow" href="/cloud/private-cloud/jumpstart">Learn more about Cloud Jumpstart</a></p>
+                <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>
             </div><!-- /.four-col -->
             <div class="four-col ask last-col box box-highlight">
-                <img alt="ubuntu advantage" src="{{ STATIC_URL }}img/download/ask-ubuntu.png" />
+                <div class="text-center four-col">
+                    <img alt="ubuntu advantage" src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-forum-warmgrey.svg" width="113" height="113" />
+                </div>
                 <h3>Ask Ubuntu</h3>
                 <p>Need help? Ask your questions here.</p>
-                <p><a class="link-arrow" href="http://askubuntu.com/questions/tagged/server">Get help</a></p>
+                <p><a href="http://askubuntu.com/questions/tagged/server" class="external">Get help</a></p>
             </div><!-- /.four-col -->
         </div><!-- /.row .row-box -->
 
     </div><!-- /.row .row-download -->
-    <div class="row row-next-steps equal-height vertical-divider no-border">
-        <h2>Useful next steps</h2>
-        <div class="four-col">
-            <h4><a href="https://help.ubuntu.com">Access documentation</a></h4>
-            <p>If you&rsquo;re stuck with a problem, take a look at the official documentation developed and maintained by the Ubuntu Documentation Team.</p>
-        </div>
-        <div class="four-col">
-            <h4><a href="https://help.ubuntu.com/community/InternetRelayChat">Live support chat</a></h4>
-            <p>If you would rather ask questions directly to the Ubuntu community, you can access our Internet relay chat (IRC) channel. Simply join the #ubuntu channel on irc.freenode.net.</p>
-        </div>
-        <div class="four-col last-col">
-            <h4><a href="http://www.ubuntu.com/community">Join the Ubuntu community</a></h4>
-            <p>Whether you're an experienced Linux user or you're just getting started with open-source software, there are lots of ways you can contribute to the Ubuntu project.</p>
-        </div>
-    </div>
 {% endblock content %}
-
 {% block footer_extra %}
 <script src="{{ STATIC_URL }}js/helpers.js"></script>
 
@@ -74,6 +61,13 @@ <h4><a href="http://www.ubuntu.com/community">Join the Ubuntu community</a></h4>
 var mirrors = {{ mirror_list|safe }};
 
 if (version && architecture) {
+    // Report to Google Analytics
+    YUI().use('event-base', function (Y) {
+        Y.on('domready', function () {
+            _gaq.push(['_trackEvent', 'Download', 'Downloaded', 'User downloaded Ubuntu (' + version + '-server-' + architecture + ')']);
+        });
+    });
+
     startDownload(mirrors, version, architecture, defaultLocation);
 }
 
@@ -98,7 +92,9 @@ <h4><a href="http://www.ubuntu.com/community">Join the Ubuntu community</a></h4>
  */
 function delayStartDownload(downloadLink, delay) {
     window.setTimeout(
-        function () { window.location.href = downloadLink; },
+        function () {
+            window.location.href = downloadLink;
+        },
         delay
     )
 }
diff --git a/templates/download/shared/_ask_ubuntu.html b/templates/download/shared/_ask_ubuntu.html
old mode 100644
new mode 100755
index 0104099295f..096ecc77c93
--- a/templates/download/shared/_ask_ubuntu.html
+++ b/templates/download/shared/_ask_ubuntu.html
@@ -1,6 +1,3 @@
-	<div class="box no-border box-grey box-image-centered clearfix">
-		<span><img src="{{ STATIC_URL }}img/pictograms/pictogram-grey-ask-ubuntu-56x50.png" alt="" width="56" height="60" /></span>
-		<div class="eleven-col">
-			<p>And if you get stuck&hellip; <a class="link-arrow" href="http://askubuntu.com">Ask Ubuntu</a></p>
-		</div>
+	<div class="ask-ubuntu-box">
+		<p>And if you get stuck&hellip; <a href="http://askubuntu.com">Ask Ubuntu&nbsp;&rsaquo;</a></p>
 	</div>
diff --git a/templates/download/shared/_contextual_footer.html b/templates/download/shared/_contextual_footer.html
old mode 100644
new mode 100755
index b8144eceb14..9762b1fdba3
--- a/templates/download/shared/_contextual_footer.html
+++ b/templates/download/shared/_contextual_footer.html
@@ -1,23 +1,93 @@
-{% if level_2 == 'desktop' and not level_3 or level_2 == 'zh-CN' or level_2 == 'windows-installer' or level_2 == 'alternative-downloads' %}	
+{% if not level_2 %}
 	<div class="feature-two four-col">
-		<h3>Interested in Ubuntu Desktop for your enterprise?</h3>
-		<p><a href="/desktop/contact-us">Get in touch&nbsp;&rsaquo;</a></p>
+		<h3>Ubuntu desktop for enterprise</h3>
+		<p>Learn more about management with Landscape.</p>
+		<p><a href="/management">Ubuntu Advantage&nbsp;&rsaquo;</a></p>
+	</div>
+	<div class="feature-three four-col">
+		<h3>Ubuntu Server for cloud</h3>
+		<p>Ubuntu OpenStack is the fastest way to build an enterprise-scale cloud.</p>
+		<p><a href="/cloud/openstack">Ubuntu OpenStack&nbsp;&rsaquo;</a></p>
+	</div>
+{% else %}
+{% if level_2 == 'alternative-downloads' %}
+	<div class="feature-two four-col">
+		<h3>More information</h3>
+		<p>Learn more about management with Landscape.</p>
+		<p><a href="/management">Ubuntu Advantage&nbsp;&rsaquo;</a></p>
+		<p>Ubuntu OpenStack is the fastest way to build an enterprise-scale cloud.</p>
+		<p><a href="/cloud/openstack">Ubuntu OpenStack&nbsp;&rsaquo;</a></p>
+	</div>
+	<div class="feature-three 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/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>
+		</ul>
+	</div>
+{% else %}
+{% if level_2 == 'desktop' and not level_3 or level_2 == 'zh-CN' %}
+	<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 guide.</p>
+		<p><a href="/download/desktop/install-ubuntu-desktop">Read the installation instructions&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>Try before you install</h3>
+		<p>There&rsquo;s no need to replace your operating system to try Ubuntu.</p>
+		<ul class="no-bullets">
+			<li><a href="/download/desktop/try-ubuntu-before-you-install">Run Ubuntu from a USB or CD&nbsp;&rsaquo;</a></li>
+			<li><a href="/desktop/take-the-tour">Take the online tour&nbsp;&rsaquo;</a></li>
+		</ul>
+	</div>
+{% else %}
+{% if level_2 == 'cloud' or level_2 == 'server' and level_3 == 'thank-you' %}
+	<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>
+		</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>
 	</div><!-- /.feature-two -->
 {% else %}
-{% if level_2 == 'cloud' and not level_3 %}
+{% if level_2 == 'desktop' and level_3 == 'thank-you' %}
 	<div class="feature-two four-col">
-		<h3>Contact us about Ubuntu Cloud</h3>
-		<p><a href="/cloud/contact-us">Get in touch&nbsp;&rsaquo;</a></p>
+		<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/desktop/install-ubuntu-desktop">Installation instructions for Ubuntu for desktop&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/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>
 	</div><!-- /.feature-two -->
 {% else %}
 {% if level_2 == 'cloud' and level_3 == 'install-ubuntu-cloud' or level_3 == 'cloud-archive-instructions' %}
-	<div class="feature-two three-col">
-		<h3>Download Ubuntu Server for Cloud</h3>
-		<p><a href="/download/cloud">Download now&nbsp;&rsaquo;</a></p>
-	</div><!-- /.feature-two -->
-	<div class="feature-three three-col">
-		<h3>Contact us about Ubuntu Cloud</h3>
-		<p><a href="/cloud/contact-us">Get in touch&nbsp;&rsaquo;</a></p>
+	<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>
+		</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>
 	</div><!-- /.feature-two -->
 {% else %}
 {% if level_2 == 'cloud' %}
@@ -26,34 +96,115 @@ <h3>Download Ubuntu Server for Cloud</h3>
 		<p><a href="/download/cloud">Download now&nbsp;&rsaquo;</a></p>
 	</div><!-- /.feature-two -->
 {% else %}
-{% if level_2 == 'server' and level_3 %}
-	<div class="feature-two three-col">
-		<h3>Download Ubuntu Server</h3>
-		<p><a href="/download/server">Download now&nbsp;&rsaquo;</a></p>
+{% if level_2 == 'server' and level_3 == 'arm' %}
+	<div class="feature-two four-col">
+		<h3>More info</h3>
+		<ul class="no-bullets">
+			<li><a href="/server/hyperscale">Ubuntu for the hyperscale era&nbsp;&rsaquo;</a></li>
+			<li><a class="external" href="https://wiki.ubuntu.com/ARM">Our step-by-step technical guide</a></li>
+		</ul>
+	</div>
+	<div class="feature-three four-col">
+		<h3>Alternative downloads</h3>
+		<p><a href="/download/server">Download the x86 version&nbsp;&rsaquo;</a></p>
 	</div><!-- /.feature-two -->
-	<div class="feature-three three-col">
-		<h3>Contact us about Ubuntu Server</h3>
-		<p><a href="/server/contact-us">Get in touch&nbsp;&rsaquo;</a></p>
+{% else %}
+{% if level_2 == 'server' and level_3 == 'POWER8' %}
+	<div class="feature-two four-col">
+		<h3>More info</h3>
+		<ul class="no-bullets">
+			<li><a href="http://insights.ubuntu.com/2014/06/13/ubuntu-and-power8-the-best-of-both-worlds/" class="external">Ubuntu and POWER8 - the best of both worlds&nbsp;&rsaquo;</a></li>
+		</ul>
+	</div>
+	<div class="feature-three four-col">
+		<h3>Alternative downloads</h3>
+		<p><a href="/download/server">Download the x86 version&nbsp;&rsaquo;</a></p>
+	</div><!-- /.feature-two -->
+{% else %}
+{% if level_2 == 'server' and level_3 == 'install-ubuntu-server' %}
+	<div class="feature-two four-col">
+		<h3>Download Ubuntu Server for cloud</h3>
+		<p>Ubuntu OpenStack cloud computing puts you in control of your IT infrastructure.</p>
+		<p><a href="/download/server" class="link-cta-ubuntu">Download now</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>
+	</div><!-- /.feature-two -->
+{% else %}
+{% if level_2 == 'server' and level_3 %}
+	<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="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>
 	</div><!-- /.feature-two -->
 {% else %}
 {% if level_2 == 'server' and not level_3 %}
-	<div class="feature-three three-col">
-		<h3>Contact us about Ubuntu Server</h3>
-		<p><a href="/server/contact-us">Get in touch&nbsp;&rsaquo;</a></p>
+	<div class="feature-two four-col">
+		<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="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>
 	</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>
+{% 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>
+{% else %}
 {% if level_2 == null %}
 {% else %}
-	<div class="feature-two three-col">
-		<h3>Download Ubuntu Desktop</h3>
-		<p><a href="/download/desktop">Download now&nbsp;&rsaquo;</a></p>
+	<div class="feature-two four-col">
+		<h3>Download Ubuntu for desktop</h3>
+		<p>To download and install Ubuntu, all you need is a blank DVD or USB stick.</p>
+		<p><a href="/download/desktop" class="link-cta-ubuntu">Download now</a></p>
 	</div><!-- /.feature-two -->
-	<div class="feature-three three-col">
-		<h3>Interested in Ubuntu Desktop for your enterprise?</h3>
-		<p><a href="/desktop/contact-us">Get in touch&nbsp;&rsaquo;</a></p>
+	<div class="feature-three four-col">
+		<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 %}
-	<div class="feature-four three-col last-col">
-		<h3>Further reading</h3>
-		{% include "templates/_further_reading_links.html" %}
-	</div><!-- /.feature-four -->
+{% 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>
+		<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>
+		</ul>
+	</div>
+{% endif %}
\ No newline at end of file
diff --git a/templates/download/shared/_instalation_help.html b/templates/download/shared/_instalation_help.html
old mode 100644
new mode 100755
index 1d9369e0c5b..0a11b1da73b
--- a/templates/download/shared/_instalation_help.html
+++ b/templates/download/shared/_instalation_help.html
@@ -1,21 +1,20 @@
 	<div class="sidebar aside four-col last-col">
-{% if level_2 == 'help' %} 
+{% if level_2 == 'help' %}
 			<h3>Help with installing Ubuntu</h3>
 {% else %}
 			<h3>Try Ubuntu before you install it</h3>
 			<p>If you&rsquo;re not yet sure about installing Ubuntu, you can try it out without affecting your current system. </p>
-			<p><a class="link-arrow" href="/download/desktop/try-ubuntu-before-you-install">How to run Ubuntu from a DVD or USB stick</a></p>
+			<p><a href="/download/desktop/try-ubuntu-before-you-install">How to run Ubuntu from a DVD or USB stick&nbsp;&rsaquo;</a></p>
 
 			<h3>Help with installing Ubuntu</h3>
 {% endif %}
 			<p>Choose the right step-by-step guide, based on your current operating system.</p>
-			
+
 			<ul class="no-bullets">
 				<li><h5>Windows</h5>
 					<ul>
 						<li><a href="/download/desktop/burn-a-dvd-on-windows">How to burn a DVD<span class="accessibility-aid"> on Windows</span></a></li>
 						<li><a href="/download/desktop/create-a-usb-stick-on-windows">How to create a bootable USB stick<span class="accessibility-aid"> on Windows</span></a></li>
-						<li><a href="/download/desktop/install-ubuntu-with-windows">Installing Ubuntu 12.04 LTS  with the Windows installer</a></li>
 					</ul>
 				</li>
 				<li><h5>OS X</h5>
@@ -31,7 +30,7 @@ <h3>Help with installing Ubuntu</h3>
 					</ul>
 				</li>
 			</ul>
-				
+
 			<h3>Release notes</h3>
 				<ul>
 					<li><a href="https://wiki.ubuntu.com/SaucySalamander/ReleaseNotes">13.10 release notes</a></li>
diff --git a/templates/download/shared/_instalation_help_chinese.html b/templates/download/shared/_instalation_help_chinese.html
new file mode 100755
index 00000000000..21e76a35fc4
--- /dev/null
+++ b/templates/download/shared/_instalation_help_chinese.html
@@ -0,0 +1,41 @@
+	<div class="sidebar aside four-col last-col">
+{% if level_2 == 'help' %}
+			<h3>Ubuntu 安装帮助</h3>
+{% else %}
+			<h3>安装前试用 Ubuntu</h3>
+			<p>如果您不确定是否要安装 Ubuntu，您可以先试用，这不会影响您当前的系统。</p>
+			<p><a href="/download/desktop/try-ubuntu-before-you-install">How to run Ubuntu from a DVD or USB stick&nbsp;&rsaquo;</a></p>
+
+			<h3>Ubuntu 安装帮助</h3>
+{% endif %}
+			<p>请根据您当前的操作系统选择适用的逐步指南手册。</p>
+
+			<ul class="no-bullets">
+				<li><h5>Windows</h5>
+					<ul>
+						<li><a href="/download/desktop/burn-a-dvd-on-windows">How to burn a DVD<span class="accessibility-aid"> on Windows</span></a></li>
+						<li><a href="/download/desktop/create-a-usb-stick-on-windows">How to create a bootable USB stick<span class="accessibility-aid"> on Windows</span></a></li>
+					</ul>
+				</li>
+				<li><h5>OS X</h5>
+					<ul>
+						<li><a href="/download/desktop/burn-a-dvd-on-mac-osx">How to burn a DVD<span class="accessibility-aid"> on OS X</span></a></li>
+						<li><a href="/download/desktop/create-a-usb-stick-on-mac-osx">How to create a bootable USB stick<span class="accessibility-aid"> on OS X</span></a></li>
+					</ul>
+				</li>
+				<li><h5>Ubuntu</h5>
+					<ul>
+						<li><a href="/download/desktop/burn-a-dvd-on-ubuntu">How to burn a DVD<span class="accessibility-aid"> on Ubuntu</span></a></li>
+						<li><a href="/download/desktop/create-a-usb-stick-on-ubuntu">How to create a bootable USB stick<span class="accessibility-aid"> on Ubuntu</span></a></li>
+					</ul>
+				</li>
+			</ul>
+
+			<h3>发布说明</h3>
+				<ul>
+					<li><a href="https://wiki.ubuntu.com/SaucySalamander/ReleaseNotes">13.10 release notes</a></li>
+					<li><a href="https://wiki.ubuntu.com/PrecisePangolin/ReleaseNotes/UbuntuDesktop">12.04.4 LTS release notes</a></li>
+					<li><a href="http://releases.ubuntu.com/saucy/">13.10 images and checksums</a></li>
+					<li><a href="http://releases.ubuntu.com/precise/">12.04.4 LTS images and checksums</a></li>
+				</ul>
+	</div><!-- /.sidebar -->
diff --git a/templates/download/shared/_wiki_link.html b/templates/download/shared/_wiki_link.html
old mode 100644
new mode 100755
index d55659710c2..ae25f52773e
--- a/templates/download/shared/_wiki_link.html
+++ b/templates/download/shared/_wiki_link.html
@@ -1,3 +1,3 @@
 	<div class="row-wiki no-margin">
-		<p><a class="link-arrow" href="https://help.ubuntu.com/12.04/installation-guide/index.html">More detailed technical instructions are available on the Ubuntu wiki</a></p>
+		<p><a href="https://help.ubuntu.com/12.04/installation-guide/index.html">More detailed technical instructions are available on the Ubuntu wiki&nbsp;&rsaquo;</a></p>
 	</div>
diff --git a/templates/download/shared/_wiki_link_latest.html b/templates/download/shared/_wiki_link_latest.html
old mode 100644
new mode 100755
index d0148dbd0b4..aa587bae5d0
--- a/templates/download/shared/_wiki_link_latest.html
+++ b/templates/download/shared/_wiki_link_latest.html
@@ -1,3 +1,3 @@
 	<div class="row-wiki no-margin">
-		<p><a href="https://help.ubuntu.com/13.10/installation-guide/index.html">More detailed technical instructions are available on the Ubuntu Installation Guide &rsaquo;</a></p>
+		<p><a href="https://help.ubuntu.com/13.10/installation-guide/index.html">More detailed technical instructions are available on the Ubuntu Installation Guide&nbsp;&rsaquo;</a></p>
 	</div>
diff --git a/templates/download/ubuntu-kylin-zh-CN.html b/templates/download/ubuntu-kylin-zh-CN.html
new file mode 100755
index 00000000000..d2a5682c48b
--- /dev/null
+++ b/templates/download/ubuntu-kylin-zh-CN.html
@@ -0,0 +1,49 @@
+
+{% extends "download/_base_download.html" %}
+
+{% block title %}下载Ubuntu Kylin | Download{% endblock %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_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
new file mode 100755
index 00000000000..37cf0082f7e
--- /dev/null
+++ b/templates/download/ubuntu-kylin.html
@@ -0,0 +1,44 @@
+
+{% extends "download/_base_download.html" %}
+
+{% block title %}Download Ubuntu Kylin | Download{% endblock %}
+
+{% block second_level_nav_items %}
+	{% 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" %}
+<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="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>
+			</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">
+					<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>
+						</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']);">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/download/zh-CN.html b/templates/download/zh-CN.html
deleted file mode 100644
index e25699e5bec..00000000000
--- a/templates/download/zh-CN.html
+++ /dev/null
@@ -1,87 +0,0 @@
-
-{% extends "download/_base_download.html" %}
-
-{% block title %}Ubuntu 桌面版{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Download" subsection_title="Desktop" page_title="zh-CN" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero">
-	<h1>Ubuntu <span lang="zh">桌面版</span></h1>
-	<div class="box-grey nine-col no-margin-bottom">
-		<div class="box box-highlight clearfix">
-			<h2>Ubuntu <span lang="zh">桌面版</span> 12.04 LTS</h2>
-			<div class="download-description six-col no-margin-bottom">
-				<p><span lang="zh">点击右边的橙色按钮可选择下载最新的</span> Ubuntu 12.04 LTS ISO <span lang="zh">镜像文件。你需要把它刻录成光盘或者是创建可启动的U盘来安装</span>Ubuntu。</p>
-				<p><a class="link-arrow" href="/download/desktop/install-ubuntu-desktop">Read the installation instructions</a></p>
-			</div>
-			<div class="three-col last-col no-margin-bottom">
-				<form class="form-download lts" action="http://china-images.ubuntu.com/releases/12.04/ubuntu-12.04-desktop-amd64.iso" method="get">
-					<fieldset>
-						<input type="hidden" name="distro" value="desktop" />
-						<input type="hidden" name="release" value="lts" />
-						<input type="hidden" name="bits" value="64" />
-						<div>
-							<button type="submit" class="link-cta-ubuntu cta-large" onclick="_gaq.push(['_trackEvent', 'Download Link', '12.04 64-bit', 'From Chinese download']);" lang="zh">开始下载 64-bit</button>
-							<span class="small">Ubuntu 12.04 LTS <span class="text-bits">64</span>-bit Chinese</span>
-						</div>
-					</fieldset>
-				</form>
-				<br/>
-				<form class="form-download lts" action="http://china-images.ubuntu.com/releases/12.04/ubuntu-12.04-desktop-i386.iso" method="get">
-					<fieldset>
-						<input type="hidden" name="distro" value="desktop" />
-						<input type="hidden" name="release" value="lts" />
-						<input type="hidden" name="bits" value="32" />
-						<div>
-							<button type="submit" class="link-cta-ubuntu cta-large" onclick="_gaq.push(['_trackEvent', 'Download Link', '12.04 32-bit', 'From Chinese download']);" lang="zh">开始下载 32-bit</button>
-							<span class="small">Ubuntu 12.04 LTS <span class="text-bits">32</span>-bit Chinese</span>
-						</div>
-					</fieldset>
-				</form>
-			</div>
-		</div>
-		<div class="box box-highlight clearfix no-margin-bottom">
-			<h2>Ubuntu Kylin <span lang="zh">桌面版</span> 13.10</h2>
-			<div class="download-description six-col no-margin-bottom">
-				<p><span lang="zh">点击右边的橙色按钮可选择下载最新的</span> Ubuntu Kylin 13.10 ISO <span lang="zh">镜像文件。你需要把它刻录成光盘或者是创建可启动的U盘来安装</span>Ubuntu Kylin。</p>
-				<p><a class="link-arrow" href="/download/desktop/install-ubuntu-desktop">Read the installation instructions</a></p>
-			</div>
-			<div class="three-col last-col no-margin-bottom">
-				<form class="form-download latest" action="http://cdimage.ubuntu.com/ubuntukylin/releases/13.10/release/ubuntukylin-13.10-desktop-amd64.iso" method="get">
-					<fieldset>
-						<input type="hidden" name="distro" value="desktop" />
-						<input type="hidden" name="release" value="latest" />
-						<input type="hidden" name="bits" value="64" />
-						<div>
-							<button type="submit" class="link-cta-ubuntu cta-large" onclick="_gaq.push(['_trackEvent', 'Download Link', '13.10 64-bit', 'From Chinese download']);" lang="zh">开始下载  64-bit</button>
-							<span class="small">Ubuntu Kylin 13.10 <span class="text-bits">64</span>-bit</span>
-						</div>
-					</fieldset>
-				</form>
-				<br/>
-				<form class="form-download latest" action="http://cdimage.ubuntu.com/ubuntukylin/releases/13.10/release/ubuntukylin-13.10-desktop-i386.iso" method="get">
-					<fieldset>
-						<input type="hidden" name="distro" value="desktop" />
-						<input type="hidden" name="release" value="latest" />
-						<input type="hidden" name="bits" value="32" />
-						<div>
-							<button type="submit" class="link-cta-ubuntu cta-large" onclick="_gaq.push(['_trackEvent', 'Download Link', '13.10 32-bit', 'From Chinese download']);" lang="zh">选择版本 32-bit</button>
-							<span class="small">Ubuntu Kylin 13.10 <span class="text-bits">32</span>-bit</span>
-						</div>
-					</fieldset>
-				</form>
-			</div><!-- /.four-col -->
-		</div>
-	</div><!-- /.box -->
-	<div class="three-col last-col windows-8">
-		<h3>如果您的电脑上有Windows 8 标志或者UEFI固件？</h3>
-		<p>如果您的电脑上有Windows 8标志，请下载一个64位的Ubuntu或其衍生版本。</p>
-		<p>如果您的电脑上有UEFI固件，请确认您下载的是64位的Ubuntu Kylin 13.10版本。</p>
-		<p><a href="https://help.ubuntu.com/community/UEFI" onclick="_gaq.push(['_trackEvent', 'External Link', 'Help link', 'From Chinese download']);">更多信息&nbsp;&rsaquo;</a></p>
-	</div>
-</div><!-- /.row -->
-{% include "download/desktop/_other-ways.html" %}
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/fingerprint.txt b/templates/fingerprint.txt
old mode 100644
new mode 100755
index 5bfd6f6e4b6..9967eb0b1db
--- a/templates/fingerprint.txt
+++ b/templates/fingerprint.txt
@@ -1 +1 @@
-464 jenkins@satori-20130614200743-c3sqbjk80fipbqxi
+729 anthony.dillon@canonical.com-20140416135802-jok3g8ljxgtop88u
diff --git a/templates/generate_titles.py b/templates/generate_titles.py
old mode 100644
new mode 100755
diff --git a/templates/global.html b/templates/global.html
new file mode 100755
index 00000000000..2c9058a32a2
--- /dev/null
+++ b/templates/global.html
@@ -0,0 +1,3 @@
+{% with "true" as switcher %}
+	{% include "index.html" %}
+{% endwith %}
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
old mode 100644
new mode 100755
index 324d8321b33..180227a67d0
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,11 +1,10 @@
 {% extends "base_index.html" %}
 
-{% block takeover_body_class %} homepage-vmw1{% endblock takeover_body_class %}
+{% block takeover_body_class %} homepage-jumpstart-takeover{% endblock takeover_body_class %}
 
 {% block takeover_content %}
-	{% include "takeovers/_vmw1_takeover.html" %}
+	{% if switcher %}
+		<a href="/" class="lang-switch" lang="zh">中文主页&nbsp;&rsaquo;</a>
+	{% endif %}
+	{% include "takeovers/_jumpstart_takeover.html" %}
 {% endblock takeover_content %}
-
-{% block footer_content %}
-	{% include "takeovers/_footer_homepage.html" %}
-{% endblock footer_content %}
diff --git a/templates/index_asus.html b/templates/index_asus.html
old mode 100644
new mode 100755
diff --git a/templates/index_kylin.html b/templates/index_kylin.html
new file mode 100755
index 00000000000..b04b194036b
--- /dev/null
+++ b/templates/index_kylin.html
@@ -0,0 +1,12 @@
+{% extends "base_index.html" %}
+
+{% block takeover_body_class %} homepage-kylin{% 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" %}
+{% endblock takeover_content %}
+
+{% block footer_content %}
+	{% include "takeovers/_footer_homepage_kylin.html" %}
+{% endblock footer_content %}
diff --git a/templates/info/release-end-of-life.html b/templates/info/release-end-of-life.html
old mode 100644
new mode 100755
index b083d61d8c3..b2da631e6e3
--- a/templates/info/release-end-of-life.html
+++ b/templates/info/release-end-of-life.html
@@ -9,8 +9,8 @@
 <div class="row row-hero">
 	<h1>Release end of life</h1>
 	<div class="eight-col">
-		<p>When an Ubuntu release reaches its &ldquo;end of life&rdquo; 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.</p> 
-		<p>This command will print the exact status of your system.</p> 
+		<p>When an Ubuntu release reaches its &ldquo;end of life&rdquo; 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.</p>
+		<p>This command will print the exact status of your system.</p>
 		<pre>$ ubuntu-support-status</pre>
 		<p>For information on previous and upcoming releases and please see the <a href="https://wiki.ubuntu.com/Releases">Ubuntu wiki</a> for more details.</p>
 	</div>
@@ -21,7 +21,19 @@ <h2>Nine years and 18 releases &mdash; and all on time</h2>
 		<p>Standard Ubuntu releases are supported for 9 to 18 months. Previous Ubuntu LTS (Long Term Support) releases are now supported for five  years on both the desktop and the server. During that time, there will be security fixes and other critical updates.</p>
 	</div>
 	<div class="eight-col last-col">
-		<img src="{{ STATIC_URL }}img/business/screenshot-server-release.png" width="596" height="549" alt="Ubuntu Desktop release cycle, 5 year long term support" />
+		<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>
+		<noscript>
+			<img src="{{ STATIC_URL }}img/graphs/image-release-cycle-large.png" width="580" height="427" alt="Ubuntu Desktop release cycle, 5 year long term support" />
+		</noscript>
 	</div>
 </div>
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/info/testing.html b/templates/info/testing.html
old mode 100644
new mode 100755
index 72fef5324ef..a9bf73d8aae
--- a/templates/info/testing.html
+++ b/templates/info/testing.html
@@ -4,7 +4,7 @@
 
 {% block content %}
 <div class="row row-hero no-border">
-	<h1>Ubuntu Testing</h1>
+	<h1>Ubuntu testing</h1>
 	<div class="eight-col">
 		<p>In addition to our six-monthly stable releases and our daily development  builds, we also make regular testing releases during the development  cycle. With just a few spare minutes, you can provide valuable feedback  on a test release and help polish and stabilise. Please see the <a href="https://wiki.ubuntu.com/Testing">testing wiki page</a> for more  information on how to test and report back. Links to the test release downloads can be found on the pages listed below.</p>
 		<p>Please test the latest available edition. Thank you!</p>
diff --git a/templates/intellectual-property-policy/_nav_secondary.html b/templates/intellectual-property-policy/_nav_secondary.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/templates/intellectual-property-policy/index.html b/templates/intellectual-property-policy/index.html
deleted file mode 100644
index 248e8ec7571..00000000000
--- a/templates/intellectual-property-policy/index.html
+++ /dev/null
@@ -1,119 +0,0 @@
-{% extends "templates/one-column.html" %}
-
-{% block title %}Trademark policy{% endblock %}
-
-{% block content %}
-<div class="row row-hero no-border">
-		<h1>Intellectual property rights policy</h1>
-		<p><strong>What&rsquo;s new?</strong> On 14th May 2013 we updated our trademark policy and renamed it the &ldquo;intellectual property rights policy&rdquo;.</p>
-		
-		<p><strong>Why?</strong> We want to ensure that anyone using Canonical&rsquo;s intellectual property does so in compliance with Canonical&rsquo;s rights. As such, we have redrafted the existing policy to more clearly identify what intellectual property rights Canonical has and to clarify and simplify the language. In particular, we have clarified Canonical&rsquo;s position with respect to the redistribution of Ubuntu.</p>
-		
-		<p><strong>What&rsquo;s changed?</strong> Essentially nothing. We&rsquo;re just making things clearer.</p>
-		
-		<p>Please read the updated intellectual property rights policy to find out more.</p>
-		
-		<p>Welcome to Canonical&rsquo;s IPRights Policy. This policy is published by Canonical Limited (Canonical, we, us and our) under the Creative Commons CC-BY-SA version 3.0 UK licence. </p>
-		
-		<p>Canonical owns and manages certain intellectual property rights in Ubuntu and other associated intellectual property (Canonical IP) and licenses the use of these rights to enterprises, individuals and members of the Ubuntu community in accordance with this IPRights Policy.</p>
-		
-		<p>Your use of Canonical IP is subject to:</p>
-		
-		<ul>
-			<li>Your acceptance of this IPRights Policy;</li>
-			<li>Your acknowledgement that Canonical IP is the exclusive property of Canonical and can only be used with Canonical&rsquo;s permission (which can be revoked at any time); and</li>
-			<li>You taking all reasonable steps to ensure that Canonical IP is used in a manner that does not affect either the validity of such Canonical IP or Canonical&rsquo;s ownership of  Canonical IP in any way; and that you will transfer any goodwill you derive from them to Canonical, if requested.</li>
-		</ul>
-		
-		<p>Ubuntu is a trusted open source platform. To maintain that trust we need to manage the use of Ubuntu and the components within it very carefully. This way, when people use Ubuntu, or anything bearing the Ubuntu brand, they can be assured that it will meet the standards they expect.  Your continued use of Canonical IP implies your acceptance and acknowledgement of this IPRights Policy. </p>
-		
-		<h3>1. Summary</h3>
-		
-		<ul>
-			<li>You can download, install and receive updates to Ubuntu for free.</li>
-			<li>You can modify Ubuntu for personal or internal commercial use. </li>
-			<li>You can redistribute Ubuntu, but only where there has been no modification to it.</li>
-			<li>You can use our copyright, patent and design materials in accordance with this IPRights Policy.</li>
-			<li>You can be confident and can trust in the consistency of the Ubuntu experience.</li>
-			<li>You can rely on the standard expected of Ubuntu.</li>
-		</ul>
-		
-		<h3>2. Your use of Ubuntu</h3>
-		<ul>
-			<li><strong>You can download, install and receive updates to Ubuntu for free.</strong>
-				<p>Ubuntu is freely available to all users for personal, or in the case of organisations, internal use. It is provided for this use without warranty. All implied warranties are disclaimed to the fullest extent permitted at law.</p>
-			</li>
-			<li><string>You can modify Ubuntu for personal or internal use.</string>
-				<p>You can make changes to Ubuntu for your own personal use or for your organisation&rsquo;s own internal use.</p>
-			</li>
-			<li><strong>You can redistribute Ubuntu, but only where there has been no modification to it. </strong>
-				<p>You can redistribute Ubuntu in its unmodified form, complete with the installer images and packages provided by Canonical (this includes the publication or launch of virtual machine images). </p>
-				<p>Any redistribution of modified versions of Ubuntu must be approved, certified or provided by Canonical if you are going to associate it with the Trademarks. Otherwise you must remove and replace the Trademarks and will need to recompile the source code to create your own binaries. This does not affect your rights under any open source licence applicable to any of the components of Ubuntu. If you need us to approve, certify or provide modified versions for redistribution you will require a licence agreement from Canonical, for which you may be required to pay. For further information, please contact us (as set out below). </p>
-				<p>We do not recommend using modified versions of Ubuntu which are not modified in accordance with this IPRights Policy. Modified versions may be corrupted and users of such modified systems or images may find them to be inconsistent with the updates published by Canonical to its users. If they use the Trademarks, they are in contravention of this IPRights Policy. Canonical cannot guarantee the performance of such modified versions. Canonical&rsquo;s updates will be consistent with every version of Ubuntu approved, certified or provided by Canonical.</p>
-			</li>
-		</ul>
-		
-		<h3>3. Your use of our trademarks</h3>
-		<p>Canonical&rsquo;s Trademarks (registered in word and logo form) include:</p>
-		<table>
-			<tr>
-				<td>UBUNTU</td>
-				<td>KUBUNTU</td>
-				<td>EDUBUNTU</td>
-			</tr>
-			<tr>
-				<td>XUBUNTU</td>
-				<td>JUJU</td>
-				<td>LANDSCAPE</td>
-			</tr>
-		</table>
-		
-		<ul>
-			<li>You can use the Trademarks, in accordance with Canonical&rsquo;s brand guidelines, with Canonical&rsquo;s permission in writing. If you require a Trademark licence, please contact us (as set out below).</li>
-			<li>You will require Canonical&rsquo;s permission to use: (i) any mark ending with the letters UBUNTU or BUNTU which is sufficiently similar to the Trademarks or any other confusingly similar mark, and (ii) any Trademark in a domain name or URL or for merchandising purposes.</li>
-			<li>You cannot use the Trademarks in software titles. If you are producing software for use with or on Ubuntu you may reference Ubuntu, but must avoid: (i) any implication of endorsement, or (ii) any attempt to unfairly or confusingly capitalise on the goodwill of Canonical or Ubuntu. </li>
-			<li>You can use the Trademarks in discussion, commentary, criticism or parody, provided that you do not imply endorsement by Canonical.</li>
-			<li>You can write articles, create websites, blogs or talk about Ubuntu, provided that it is clear that you are in no way speaking for or on behalf of Canonical and that you do not imply endorsement by Canonical.</li>
-		</ul>
-		
-		<p>Canonical reserves the right to review all use of Canonical&rsquo;s Trademarks and to object to any use that appears outside of this IPRights Policy. </p>
-		
-		<h3>4. Your use of our copyright, patent and design materials</h3>
-		<ul>
-			<li>You can only use Canonical&rsquo;s copyright materials in accordance with the copyright licences therein and this IPRights Policy.</li>
-			<li>You cannot use Canonical&rsquo;s patented materials without our permission.</li>
-		</ul>
-		<h4>Copyright</h4>
-		<p>The disk, CD, installer and system images, together with Ubuntu packages and binary files, are in many cases copyright of Canonical (which copyright may be distinct from the copyright in the individual components therein) and can only be used in accordance with the copyright licences therein and this IPRights Policy.</p>
-		
-		<h4>Patents</h4>
-		<p>Canonical has made a significant investment in the Open Invention Network, defending Linux, for the benefit of the open source ecosystem. Additionally, like many open source projects, Canonical also protects its interests from third parties by registering patents. You cannot use Canonical&rsquo;s patented materials without our permission.</p>
-		
-		<h4>Trade dress and look and feel</h4>
-		<p>Canonical owns intellectual property rights in the trade dress and look and feel of Ubuntu (including the Unity interface), along with various themes and components that may include unregistered design rights, registered design rights and design patents, your use of Ubuntu is subject to these rights.</p>
-
-		<h3>5. Logo use guidelines</h3>
-		<p>Canonical&rsquo;s logos are presented in multiple colours and it is important that their visual integrity be maintained. It is therefore preferable that the logos should only be used in their standard form, but if you should feel the need to alter them in any way, you should following the guidelines set out below. </p>
-		<ul>
-			<li><a href="http://design.ubuntu.com/brand/ubuntu-logo">Ubuntu logo guidelines</a></li>
-			<li><a href="http://design.ubuntu.com/brand/canonical-logo">Canonical logo guidelines</a></li>
-		</ul>
-		
-		<h3>6. Use of Canonical IP by the Ubuntu community</h3>
-		<p>Ubuntu is built by Canonical and the Ubuntu community. We share access rights owned by Canonical with the Ubuntu community for the purposes of discussion, development and advocacy. We recognise that most of the open source discussion and development areas are for non-commercial purposes and we therefore allow the use of Canonical IP in this context, as long as there is no commercial use and that the Canonical IP is used in accordance with this IPRights Policy.</p>
-		
-		<h3>7. Contact us</h3>
-		<p>Please <a href="https://forms.canonical.com/trademark/">contact us</a>:</p>
-		
-		<ul>
-			<li>if you have any questions or would like further information on our IPRights Policy, Canonical or Canonical IP;</li>
-			<li>if you would like permission from Canonical to use Canonical IP; </li>
-			<li>if you require a licence agreement; or</li>
-			<li>to report a breach of our IPRights Policy.</li>
-		</ul>
-		<p><i>Please note that due to the volume of mail we receive, it may take up to a week to process your request.</i></p>
-		
-		<h3>8. Changes</h3>
-		<p>We may make changes to this IPRights Policy from time to time. Please check this IPRights Policy from time to time to ensure that you are in compliance.</p>
-</div><!-- / .row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/legal/_base_legal.html b/templates/legal/_base_legal.html
old mode 100644
new mode 100755
diff --git a/templates/legal/_nav_secondary.html b/templates/legal/_nav_secondary.html
old mode 100644
new mode 100755
index e69de29bb2d..3e381bc0a8e
--- a/templates/legal/_nav_secondary.html
+++ b/templates/legal/_nav_secondary.html
@@ -0,0 +1,6 @@
+	<ul{% if list_class %} class="{{ list_class }}"{% endif %} class="second-level-nav">
+		<li class="first{% if level_1 == 'legal' and not level_2 %} active{% endif %}"><a href="/legal">Overview</a></li>
+		<li{% if level_2 == 'terms-and-policies' %} class="active" {% endif %}><a href="/legal/terms-and-policies">Terms and policies</a></li>
+		<li{% if level_2 == 'ubuntu-advantage' %} class="active" {% endif %}><a href="/legal/ubuntu-advantage">Ubuntu Advantage</a></li>
+		<li{% if level_2 == 'contributors' %} class="active" {% endif %}><a href="/legal/contributors">Contributors</a></li>
+	</ul>
\ No newline at end of file
diff --git a/templates/legal/_nav_tertiary.html b/templates/legal/_nav_tertiary.html
new file mode 100755
index 00000000000..c96e114752f
--- /dev/null
+++ b/templates/legal/_nav_tertiary.html
@@ -0,0 +1,20 @@
+	<ul class="third-level-nav">
+
+		{% if level_2 == 'terms-and-policies' %}
+		<li{% if level_3 == 'terms' %} class="active"{% endif %}><a href="/legal/terms-and-policies/terms">Terms and conditions</a></li>
+		<li{% if level_3 == 'privacy-policy' %} class="active"{% endif %}><a href="/legal/terms-and-policies/privacy-policy">Privacy policy</a></li>
+		<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>
+		{% 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>
+		{% endif %}
+
+		{% if level_2 == 'contributors' %}
+		<li{% if level_3 == 'licence-agreement-faq' %} class="active"{% endif %}><a href="/legal/contributors/licence-agreement-faq">Licence agreement FAQ</a></li>
+		<li{% if level_3 == 'submit' %} class="active"{% endif %}><a href="/legal/contributors/submit">Submit</a></li>
+		{% endif %}
+	</ul>
\ No newline at end of file
diff --git a/templates/legal/contributors/index.html b/templates/legal/contributors/index.html
new file mode 100755
index 00000000000..02d665f0a8c
--- /dev/null
+++ b/templates/legal/contributors/index.html
@@ -0,0 +1,32 @@
+{% extends "legal/_base_legal.html" %}
+
+{% block title %}Contributor license agreement{% endblock %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" page_title="Contributors" tertiary="true" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row row-hero no-border">
+	<div class="eight-col">
+		<h1>Canonical contributor licence&nbsp;agreement</h1>
+		<p>At Canonical, we manage a lot of <a class="external" href="http://www.canonical.com/projects/directory">open source projects</a> and we&rsquo;re required to have agreements with everyone who takes part. It&rsquo;s the easiest way for you to give us permission to use your contributions. In effect, you&rsquo;re giving us a licence, but you still own the copyright &mdash; so you retain the right to modify your code and use it in other projects. </p>
+	</div><!-- /.eight-col -->
+	<div class="four-col last-col text-center">
+		<img src="{{ STATIC_URL }}img/legal/image-document-canonical.svg" alt="Canonical contributor license agreement"  class="priority-0" />
+	</div>
+</div><!-- /.row -->
+<div class="row no-border equal-height">
+	<div class="six-col box">
+		<h3>Sign the contributor agreement</h3>
+		<p>When you&rsquo;re ready to contribute to Ubuntu, we have two forms: one for individual contributors and one for companies and other organisations. Before you make your first contribution, please ensure you&rsquo;ve already created a <a href="http://launchpad.net">Launchpad</a> account, then complete the appropriate form.</p>
+		<p><a href="/legal/contributors/submit">Sign the contributor agreement&nbsp;&rsaquo;</a></p>
+	</div>
+
+	<div class="six-col box last-col">
+		<h3>Frequently asked questions</h3>
+		<p>We use the Harmony CLA to protect your rights regarding any contribution you make to our open source projects. Learn more about how it works and what it means for you. </p>
+		<p><a href="/legal/contributors/licence-agreement-faq">Contribution FAQ&nbsp;&rsaquo;</a></p>
+	</div>
+</div>
+{% endblock content %}
\ No newline at end of file
diff --git a/templates/legal/contributors/licence-agreement-faq.html b/templates/legal/contributors/licence-agreement-faq.html
new file mode 100755
index 00000000000..35701963471
--- /dev/null
+++ b/templates/legal/contributors/licence-agreement-faq.html
@@ -0,0 +1,63 @@
+{% extends "legal/_base_legal.html" %}
+
+{% block meta_description %}Canonical Contribution Agreement for work to be included in selected open source software projects.{% endblock %}
+
+{% block title %}Contributor licence agreement FAQ | Contributors{% endblock %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Contributors" page_title="Licence agreement FAQ" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row row-hero no-border">
+	<div class="eight-col">
+		<h1>Frequently asked questions</h1>
+		<p>Here are answers to some common questions about the arrangements for contributing to projects. These FAQs cover the contributor licence agreement in use since July 2011.</p>
+		
+		<h3 id="why">Why do you ask contributors to send in the agreement?</h3>
+		<p>We need to make sure that we &dash; and the users of our software &dash; are legally entitled to distribute your contributed code, anywhere in the world.</p>
+		
+		<h3 id="no-launchpad">Can the Copyright Licence Agreement be signed without a Launchpad account?</h3>
+		<p>Yes. The PDF copies are editable forms. Please fill in your details and return by plain- or digitally&dash;signed email to <a href="mailto:contributor-agreement@canonical.com">contributor-agreement@canonical.com</a></p>
+		
+		<h3 id="new-copies">Do I have to send a new copy of the agreement for each project I contribute to?</h3>
+		<p>No &mdash; you only need to send one signed copy. It covers you for all Canonical projects, now and in the future. After you submit it for one Canonical project, you will not have to worry about it again.</p>
+		
+		<h3 id="why-two">Why are there two separate documents, one for individuals and one for companies?</h3>
+		<p>The two are mostly the same. Individuals may be minors or they might need permission from their employer, while companies need to think about their affiliates.</p> 
+		
+		<h3 id="previous-agreement">Didn&rsquo;t Canonical previously use a different agreement?</h3>
+		<p>Yes, up until July 2011 we used the Canonical Contributor Agreement 2.5. With the launch of the <a class="external" href="http://harmonyagreements.org/">Harmony contributor agreements</a>, we decided to switch to one of their standard templates, a Harmony Contributor licence agreement. The <a href="{{ STATIC_URL }}/files/section/legal/Canonical_Contributor_Agreement_ver_2.5.pdf">old agreement</a> is still available for reference, but we are not asking for anyone new to sign it.</p>
+		
+		<h3 id="re-sign">If I signed the old agreement, do I need to sign the new one too?</h3>
+		<p>No. If you previously accepted the Canonical Contributor Agreement 2.5 (or earlier), your future contributions will continue to be covered by that. However, if you wish, you can sign the new Contributor licence agreement, in which case the terms of the new agreement will cover any new contributions.</p>
+		
+		<h3 id="old-new-difference">What&rsquo;s the difference between the new agreement and the old one?</h3>
+		<p>One difference between the two is that the old agreement was a copyright assignment agreement (where the contributor granted ownership of the contribution to Canonical), while the new one is a copyright licence agreement (where the contributor grants permission for Canonical to distribute the contribution). One new element is a promise back to you to release your contribution under the licence in place when they made the contribution. The new agreement also features some refinements in the language around software patents and how you disclaim warranties.</p>
+
+		<h3 id="who-owns-copyright">Who owns the copyright?</h3>
+		<p>You do. Section 2.1(a) states the following:</p>
+		<p>&ldquo;You retain ownership of the Copyright in Your Contribution and have the same rights to use or license the Contribution which You would have had without entering into the Agreement.&rdquo;</p>
+
+		<h3 id="other-projects">Can I contribute the same code to other projects as well?</h3>
+		<p>Yes. You retain the full rights to redistribute your own code as you wish. The agreement is not exclusive and you may contribute what you write to as many other projects or organisations as you wish to share it with.</p>
+
+		<h3 id="other-questions">What if I have other questions?</h3>
+		<p>The best person to ask is the coordinator for the project you&rsquo;re contributing to. All the coordinators are listed on the main <a href="http://www.canonical.com/projects/directory" class="external">open source projects directory</a>.</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>
+{% endblock content %}
\ No newline at end of file
diff --git a/templates/legal/contributors/submit.html b/templates/legal/contributors/submit.html
new file mode 100755
index 00000000000..7d0b663fc83
--- /dev/null
+++ b/templates/legal/contributors/submit.html
@@ -0,0 +1,707 @@
+{% extends "legal/_base_legal.html" %}
+
+{% block meta_description %}Canonical Contribution Agreement for work to be included in selected open source software projects.{% endblock %}
+
+{% block head_extra %}
+<script type="text/javascript" src="//www.tfaforms.com/wForms/3.4/js/wforms.js"></script>
+<script type="text/javascript" src="//www.tfaforms.com/wForms/3.4/js/wforms_custom_validation.js"></script>
+<script type="text/javascript" src="//www.tfaforms.com/wForms/3.4/js/localization-en_GB.js"></script>
+
+<script type="text/javascript" src="//www.tfaforms.com/wForms/3.4/js/wforms_prefill.js"></script>
+<link href="//www.tfaforms.com/css/form.css" rel="stylesheet" type="text/css" />
+
+
+
+<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>
+<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;
+}
+
+</style>{% endblock %}
+
+{% block title %}Submit contributor agreement | Contributors{% endblock %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Contributors" page_title="How to submit" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row row-hero no-border">
+	<div class="eight-col">
+		<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>
+<fieldset class="fieldset-1">
+<div id="tfa_Agreementtype1-D" class="oneField">
+	<h3>Agreement type</h3>
+	<div id="tfa_Agreementtype1" class="choices required">
+		<p class="oneChoice">
+			<input type="radio" value="tfa_Iamsigningasanin1" class="switch-c" id="tfa_Iamsigningasanin1" name="tfa_Agreementtype1">
+			<label for="tfa_Iamsigningasanin1" class="postField">I am signing as an individual contributor.</label>
+		</p>
+		<p class="oneChoice">
+			<input type="radio" value="tfa_Iamsigningonbeha1" class="switch-d" id="tfa_Iamsigningonbeha1" name="tfa_Agreementtype1">
+			<label for="tfa_Iamsigningonbeha1" class="postField">I am signing on behalf of an organization, foundation, company or other entity, which may have multiple contributors.</label>
+		</p>
+	</div>
+</div>
+</fieldset>
+<fieldset id="tfa_CanonicalIndivid" class="wfSection offstate-c">
+	<h2>Canonical Individual Contributor License Agreement</h2>
+		<div class="htmlsection" id="html-tmp-7480075684173">
+			<p class="text-body-lead-western">Thank you for your interest in contributing to software projects managed by Canonical (&ldquo;We&rdquo; or &ldquo;Us&rdquo;).</p>
+			<p class="text-body-lead-western"><span style="color: #000000;">This contributor agreement (&ldquo;Agreement&rdquo;) documents the rights granted by contributors to Us. To make this document effective, please sign it and send it to Us by email <span style="color: #000000;">or electronic submission</span>, following the instructions at <a href="/legal/contributors" class="external">www.canonical.com/contributors</a>. This is a legally binding document, so please read it carefully before agreeing to it. The Agreement may cover more than one software project managed by Us.</span></p>
+		<h3 class="western">1. Definitions</h3>
+<p>&ldquo;You&rdquo; means the individual who Submits a Contribution to Us.</p>
+<p>&ldquo;Contribution&rdquo; means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in <a href="/legal/contributors" class="external">www.canonical.com/contributors</a>.</p>
+<p>&ldquo;Copyright&rdquo; means all rights protecting works of authorship owned or controlled by You, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence including any extensions by You.</p>
+<p>&ldquo;Material&rdquo; means the work of authorship which is made available by Us to third parties. When this Agreement covers more than one software project, the Material means the work of authorship to which the Contribution was Submitted. After You Submit the Contribution, it may be included in the Material.</p>
+<p>&ldquo;Submit&rdquo; means any form of electronic, verbal, or written communication sent to Us or our representatives, including but not limited to electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Us for the purpose of discussing and improving the Material, but excluding communication that is conspicuously marked or otherwise designated in writing by You as &ldquo;Not a Contribution.&rdquo;</p>
+<p>&ldquo;Submission Date&rdquo; means the date on which You Submit a Contribution to Us.</p>
+<p>&ldquo;Effective Date&rdquo; means the date You execute this Agreement or the date You first Submit a Contribution to Us, whichever is earlier.</p>
+<p>&ldquo;Media&rdquo; means any portion of a Contribution which is not software.</p>
+<h3 class="western">2. Grant of Rights</h3>
+<h4 class="western">2.1 Copyright License</h4>
+<p>(a) You retain ownership of the Copyright in Your Contribution and have the same rights to use or license the Contribution which You would have had without entering into the Agreement.</p>
+<p>(b) To the maximum extent permitted by the relevant law, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable license under the Copyright covering the Contribution, with the right to sublicense such rights through multiple tiers of sublicensees, to reproduce, modify, display, perform and distribute the Contribution as part of the Material; provided that this license is conditioned upon compliance with Section 2.3.</p>
+<h4 class="western">2.2 Patent License</h4>
+<p style="margin-bottom: 0cm;">For patent claims including, without limitation, method, process, and apparatus claims which You own, control or have the right to grant, now or in the future, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable patent license, with the right to sublicense these rights to multiple tiers of sublicensees, to make, have made, use, sell, offer for sale, import and otherwise transfer the Contribution and the Contribution in combination with the Material (and portions of such combination). This license is granted only to the extent that the exercise of the licensed rights infringes such patent claims; and provided that this license is conditioned upon compliance with Section 2.3.</p>
+<h4 class="western">2.3 Outbound License</h4>
+<p>Based on the grant of rights in Sections 2.1 and 2.2, if We include Your Contribution in a Material, We may license the Contribution under any license, including copyleft, permissive, commercial, or proprietary licenses. As a condition on the exercise of this right, We agree to also license the Contribution under the terms of the license or licenses which We are using for the Material on the Submission Date.</p>
+<h4 class="western">2.4 Moral Rights.</h4>
+<p>If moral rights apply to the Contribution, to the maximum extent permitted by law, You waive and agree not to assert such moral rights against Us or our successors in interest, or any of our licensees, either direct or indirect.</p>
+<h4 class="western">2.5 Our Rights.</h4>
+<p>You acknowledge that We are not obligated to use Your Contribution as part of the Material and may decide to include any Contribution We consider appropriate.</p>
+<h4 class="western">2.6 Reservation of Rights.</h4>
+<p>Any rights not expressly licensed under this section are expressly reserved by You.</p>
+<h3 class="western">3. Agreement</h3>
+<p>You confirm that:</p>
+<p>(a) You have the legal authority to enter into this Agreement.</p>
+<p>(b) You own the Copyright and patent claims covering the Contribution which are required to grant the rights under Section 2.</p>
+<p>(c) The grant of rights under Section 2 does not violate any grant of rights which You have made to third parties, including Your employer. If You are an employee, You have had Your employer approve this Agreement or sign the Entity version of this document. If You are less than eighteen years old, please have Your parents or guardian sign the Agreement.</p>
+<p>(d) You have followed the instructions in <a href="/legal/contributors" class="external">www.canonical.com/contributors</a>, if You do not own the Copyright in the entire work of authorship Submitted.</p>
+<h3 class="western">4. Disclaimer</h3>
+<p>EXCEPT FOR THE EXPRESS WARRANTIES IN SECTION 3, THE CONTRIBUTION IS PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION TO THE MINIMUM PERIOD PERMITTED BY LAW.</p>
+<h3 class="western">5. Consequential Damage Waiver</h3>
+<p>TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED.</p>
+<h3 class="western">6. Miscellaneous</h3>
+<p>6.1 This Agreement will be governed by and construed in accordance with the laws of England excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods (&ldquo;UN Convention&rdquo;) and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement.</p>
+<p>6.2 This Agreement sets out the entire agreement between You and Us for Your Contributions to Us and overrides all other agreements or understandings.</p>
+<p>6.3 If You or We assign the rights or obligations received through this Agreement to a third party, as a condition of</p>
+<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>
+</div>
+</fieldset>
+<fieldset id="tfa_CanonicalEntityC" class="wfSection offstate-a offstate-d">
+<h2>Canonical Entity Contributor License Agreement</h2>
+<div class="htmlsection" id="html-tmp-7485358696932">
+<p class="text-body-lead-western">Thank you for your interest in contributing to software projects managed by Canonical (&ldquo;We&rdquo; or &ldquo;Us&rdquo;).</p>
+<p class="text-body-lead-western"><span style="color: #000000;">This contributor agreement (&ldquo;Agreement&rdquo;) documents the rights granted by contributors to Us. To make this document effective, please sign it and send it to Us by email <span style="color: #000000;">or electronic submission</span>, following the instructions at <a href="/legal/contributors" class="external">www.canonical.com/contributors</a>. This is a legally binding document, so please read it carefully before agreeing to it. The Agreement may cover more than one software project managed by Us.</span></p>
+<h3 class="western">1. Definitions</h3>
+<p><span style="font-family: Ubuntu;">&ldquo;You&rdquo; <span style="font-family: Ubuntu;">means any Legal Entity on behalf of whom a Contribution has been received by Us. &ldquo;Legal Entity&rdquo; means an entity which is not a natural person. &ldquo;Affiliates&rdquo; means other Legal Entities that control, are controlled by, or under common control with that Legal Entity. For the purposes of this definition, &ldquo;control&rdquo; means (i) the power, direct or indirect, to cause the direction or management of such Legal Entity, whether by contract or otherwise, (ii) ownership of fifty percent (50%) or more of the outstanding shares or securities which vote to elect the management or other persons who direct such Legal Entity or (iii) beneficial ownership of such entity.</span></span></p>
+<p>&ldquo;Contribution&rdquo; means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in <a href="/legal/contributors" class="external">www.canonical.com/contributors</a>.</p>
+<p>&ldquo;Copyright&rdquo; means all rights protecting works of authorship owned or controlled by You o<span style="font-family: Ubuntu;">r Your Affiliates</span>, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence including any extensions by You.</p>
+<p>&ldquo;Material&rdquo; means the work of authorship which is made available by Us to third parties. When this Agreement covers more than one software project, the Material means the work of authorship to which the Contribution was Submitted. After You Submit the Contribution, it may be included in the Material.</p>
+<p>&ldquo;Submit&rdquo; means any form of electronic, verbal, or written communication sent to Us or our representatives, including but not limited to electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Us for the purpose of discussing and improving the Material, but excluding communication that is conspicuously marked or otherwise designated in writing by You as &ldquo;Not a Contribution.&rdquo;</p>
+<p>&ldquo;Submission Date&rdquo; means the date on which You Submit a Contribution to Us.</p>
+<p>&ldquo;Effective Date&rdquo; means the date You execute this Agreement or the date You first Submit a Contribution to Us, whichever is earlier.</p>
+<p>&ldquo;Media&rdquo; means any portion of a Contribution which is not software.</p>
+<h3 class="western">2. Grant of Rights</h3>
+<h4 class="western">2.1 Copyright License</h4>
+<p>(a) You retain ownership of the Copyright in Your Contribution and have the same rights to use or license the Contribution which You would have had without entering into the Agreement.</p>
+<p>(b) To the maximum extent permitted by the relevant law, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable license under the Copyright covering the Contribution, with the right to sublicense such rights through multiple tiers of sublicensees, to reproduce, modify, display, perform and distribute the Contribution as part of the Material; provided that this license is conditioned upon compliance with Section 2.3.</p>
+<h4 class="western">2.2 Patent License</h4>
+<p>For patent claims including, without limitation, method, process, and apparatus claims which You or Your Affiliates own, control or have the right to grant, now or in the future, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable patent license, with the right to sublicense these rights to multiple tiers of sublicensees, to make, have made, use, sell, offer for sale, import and otherwise transfer the Contribution and the Contribution in combination with the Material (and portions of such combination). This license is granted only to the extent that the exercise of the licensed rights infringes such patent claims; and provided that this license is conditioned upon compliance with Section 2.3.</p>
+<h4 class="western">2.3 Outbound License</h4>
+<p>Based on the grant of rights in Sections 2.1 and 2.2, if We include Your Contribution in a Material, We may license the Contribution under any license, including copyleft, permissive, commercial, or proprietary licenses. As a condition on the exercise of this right, We agree to also license the Contribution under the terms of the license or licenses which We are using for the Material on the Submission Date.</p>
+<h4 class="western">2.4 Moral Rights.</h4>
+<p>If moral rights apply to the Contribution, to the maximum extent permitted by law, You waive and agree not to assert such moral rights against Us or our successors in interest, or any of our licensees, either direct or indirect.</p>
+<h4 class="western">2.5 Our Rights.</h4>
+<p>You acknowledge that We are not obligated to use Your Contribution as part of the Material and may decide to include any Contribution We consider appropriate.</p>
+<h4 class="western">2.6 Reservation of Rights.</h4>
+<p>Any rights not expressly licensed under this section are expressly reserved by You.</p>
+<h3 class="western">3. Agreement</h3>
+<p>You confirm that:</p>
+<p>(a) You have the legal authority to enter into this Agreement.</p>
+<p>(b) You or Your Affiliates own the Copyright and patent claims covering the Contribution which are required to grant the rights under Section 2.</p>
+<p>(c) The grant of rights under Section 2 does not violate any grant of rights which You or Your Affiliates have made to third parties.</p>
+<p>(d) You have followed the instructions in <a href="/legal/contributors" class="external">www.canonical.com/contributors</a>, if You do not own the Copyright in the entire work of authorship Submitted.</p>
+<h3 class="western">4. Disclaimer</h3>
+<p>EXCEPT FOR THE EXPRESS WARRANTIES IN SECTION 3, THE CONTRIBUTION IS PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION TO THE MINIMUM PERIOD PERMITTED BY LAW.</p>
+<h3 class="western">5. Consequential Damage Waiver</h3>
+<p>TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED.</p>
+<h3 class="western">6. Miscellaneous</h3>
+<p>6.1 This Agreement will be governed by and construed in accordance with the laws of England excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods (&ldquo;UN Convention&rdquo;) and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement.</p>
+<p>6.2 This Agreement sets out the entire agreement between You and Us for Your Contributions to Us and overrides all other agreements or understandings.</p>
+<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>
+</div>
+</fieldset>
+<fieldset id="tfa_Yourcontactdetai1" class="wfSection fieldset-2">
+	<h3>Your contact details</h3>
+		<ul class="no-bullets">
+			<li class="inline">
+				<div id="tfa_Firstname1-D" class="oneField">
+					<label class="preField" for="tfa_Firstname1">First name</label> <input type="text" id="tfa_Firstname1" name="tfa_Firstname1" value="" size="40" class="required">
+				</div>
+			</li>
+			<li class="inline">
+				<div id="tfa_Lastname1-D" class="oneField">
+					<label class="preField" for="tfa_Lastname1">Last name</label> <input type="text" id="tfa_Lastname1" name="tfa_Lastname1" value="" size="40" class="required">
+				</div>
+			</li>
+			<li class="inline">
+				<div id="tfa_Email1-D" class="oneField">
+					<label class="preField" for="tfa_Email1">Email</label>
+					<input type="text" id="tfa_Email1" name="tfa_Email1" value="" size="40" class="validate-email required">
+				</div>
+			</li>
+			<li class="inline">
+				<div id="tfa_Phone-D" class="oneField">
+				<label class="preField" for="tfa_Phone">Phone</label> <input type="text" id="tfa_Phone" name="tfa_Phone" value="" size="40" class="required">
+				</div>
+			</li>
+			<li class="inline">
+				<label class="preField" for="tfa_Phone">Launchpad ID</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>
+			</li>
+			<li class="inline">
+				<div id="tfa_Address-D" class="oneField">
+					<label class="preField" for="tfa_Address">Address</label>
+					<textarea cols="40" rows="4" id="tfa_Address" name="tfa_Address" class="required"></textarea>
+				</div>
+			</li>
+			<li class="inline">
+				<div id="tfa_Country-D" class="oneField">
+				<label class="preField" for="tfa_Country">Country</label>
+				<select id="tfa_Country" name="tfa_Country" class="required">
+				<option value="">Please select...</option>
+				<option value="tfa_Afghanistan" class="">Afghanistan</option>
+				<option value="tfa_Albania" class="">Albania</option>
+				<option value="tfa_Algeria" class="">Algeria</option>
+				<option value="tfa_AmericanSamoa" class="">American Samoa</option>
+				<option value="tfa_Andorra" class="">Andorra</option>
+				<option value="tfa_Angola" class="">Angola</option>
+				<option value="tfa_Anguilla" class="">Anguilla</option>
+				<option value="tfa_Antarctica" class="">Antarctica</option>
+				<option value="tfa_AntiguaandBarbud" class="">Antigua and Barbuda</option>
+				<option value="tfa_Argentina" class="">Argentina</option>
+				<option value="tfa_Armenia" class="">Armenia</option>
+				<option value="tfa_Aruba" class="">Aruba</option>
+				<option value="tfa_Australia" class="">Australia</option>
+				<option value="tfa_Austria" class="">Austria</option>
+				<option value="tfa_Azerbaijan" class="">Azerbaijan</option>
+				<option value="tfa_Bahamas" class="">Bahamas</option>
+				<option value="tfa_Bahrain" class="">Bahrain</option>
+				<option value="tfa_Bangladesh" class="">Bangladesh</option>
+				<option value="tfa_Barbados" class="">Barbados</option>
+				<option value="tfa_Belarus" class="">Belarus</option>
+				<option value="tfa_Belgium" class="">Belgium</option>
+				<option value="tfa_Belize" class="">Belize</option>
+				<option value="tfa_Benin" class="">Benin</option>
+				<option value="tfa_Bermuda" class="">Bermuda</option>
+				<option value="tfa_Bhutan" class="">Bhutan</option>
+				<option value="tfa_Bolivia" class="">Bolivia</option>
+				<option value="tfa_BosniaandHerzego" class="">Bosnia and Herzegovina</option>
+				<option value="tfa_Botswana" class="">Botswana</option>
+				<option value="tfa_BouvetIsland" class="">Bouvet Island</option>
+				<option value="tfa_Brazil" class="">Brazil</option>
+				<option value="tfa_BritishIndianOce" class="">British Indian Ocean Territory</option>
+				<option value="tfa_Brunei" class="">Brunei</option>
+				<option value="tfa_Bulgaria" class="">Bulgaria</option>
+				<option value="tfa_BurkinaFaso" class="">Burkina Faso</option>
+				<option value="tfa_Burundi" class="">Burundi</option>
+				<option value="tfa_Cambodia" class="">Cambodia</option>
+				<option value="tfa_Cameroon" class="">Cameroon</option>
+				<option value="tfa_Canada" class="">Canada</option>
+				<option value="tfa_CapeVerde" class="">Cape Verde</option>
+				<option value="tfa_CaymanIslands" class="">Cayman Islands</option>
+				<option value="tfa_CentralAfricanRe" class="">Central African Republic</option>
+				<option value="tfa_Chad" class="">Chad</option>
+				<option value="tfa_Chile" class="">Chile</option>
+				<option value="tfa_China" class="">China</option>
+				<option value="tfa_ChristmasIsland" class="">Christmas Island</option>
+				<option value="tfa_CocosKeelingIsla" class="">Cocos ( Keeling ) Islands</option>
+				<option value="tfa_Colombia" class="">Colombia</option>
+				<option value="tfa_Comoros" class="">Comoros</option>
+				<option value="tfa_Congo" class="">Congo</option>
+				<option value="tfa_CookIslands" class="">Cook Islands</option>
+				<option value="tfa_CostaRica" class="">Costa Rica</option>
+				<option value="tfa_CtedIvoire" class="">Côte d ' Ivoire</option>
+				<option value="tfa_CroatiaHrvatska" class="">Croatia ( Hrvatska )</option>
+				<option value="tfa_Cuba" class="">Cuba</option>
+				<option value="tfa_Cyprus" class="">Cyprus</option>
+				<option value="tfa_CzechRepublic" class="">Czech Republic</option>
+				<option value="tfa_CongoDRC" class="">Congo ( DRC )</option>
+				<option value="tfa_Denmark" class="">Denmark</option>
+				<option value="tfa_Djibouti" class="">Djibouti</option>
+				<option value="tfa_Dominica" class="">Dominica</option>
+				<option value="tfa_DominicanRepubli" class="">Dominican Republic</option>
+				<option value="tfa_EastTimor" class="">East Timor</option>
+				<option value="tfa_Ecuador" class="">Ecuador</option>
+				<option value="tfa_Egypt" class="">Egypt</option>
+				<option value="tfa_ElSalvador" class="">El Salvador</option>
+				<option value="tfa_EquatorialGuinea" class="">Equatorial Guinea</option>
+				<option value="tfa_Eritrea" class="">Eritrea</option>
+				<option value="tfa_Estonia" class="">Estonia</option>
+				<option value="tfa_Ethiopia" class="">Ethiopia</option>
+				<option value="tfa_FalklandIslandsI" class="">Falkland Islands ( Islas Malvinas )</option>
+				<option value="tfa_FaroeIslands" class="">Faroe Islands</option>
+				<option value="tfa_FijiIslands" class="">Fiji Islands</option>
+				<option value="tfa_Finland" class="">Finland</option>
+				<option value="tfa_France" class="">France</option>
+				<option value="tfa_FrenchGuiana" class="">French Guiana</option>
+				<option value="tfa_FrenchPolynesia" class="">French Polynesia</option>
+				<option value="tfa_FrenchSouthernan" class="">French Southern and Antarctic Lands</option>
+				<option value="tfa_Gabon" class="">Gabon</option>
+				<option value="tfa_Gambia" class="">Gambia</option>
+				<option value="tfa_Georgia" class="">Georgia</option>
+				<option value="tfa_Germany" class="">Germany</option>
+				<option value="tfa_Ghana" class="">Ghana</option>
+				<option value="tfa_Gibraltar" class="">Gibraltar</option>
+				<option value="tfa_Greece" class="">Greece</option>
+				<option value="tfa_Greenland" class="">Greenland</option>
+				<option value="tfa_Grenada" class="">Grenada</option>
+				<option value="tfa_Guadeloupe" class="">Guadeloupe</option>
+				<option value="tfa_Guam" class="">Guam</option>
+				<option value="tfa_Guatemala" class="">Guatemala</option>
+				<option value="tfa_Guinea" class="">Guinea</option>
+				<option value="tfa_GuineaBissau" class="">Guinea-Bissau</option>
+				<option value="tfa_Guyana" class="">Guyana</option>
+				<option value="tfa_Haiti" class="">Haiti</option>
+				<option value="tfa_HeardIslandandMc" class="">Heard Island and McDonald Islands</option>
+				<option value="tfa_Honduras" class="">Honduras</option>
+				<option value="tfa_HongKongSAR" class="">Hong Kong SAR</option>
+				<option value="tfa_Hungary" class="">Hungary</option>
+				<option value="tfa_Iceland" class="">Iceland</option>
+				<option value="tfa_India" class="">India</option>
+				<option value="tfa_Indonesia" class="">Indonesia</option>
+				<option value="tfa_Iran" class="">Iran</option>
+				<option value="tfa_Iraq" class="">Iraq</option>
+				<option value="tfa_Ireland" class="">Ireland</option>
+				<option value="tfa_Israel" class="">Israel</option>
+				<option value="tfa_Italy" class="">Italy</option>
+				<option value="tfa_Jamaica" class="">Jamaica</option>
+				<option value="tfa_Japan" class="">Japan</option>
+				<option value="tfa_Jordan" class="">Jordan</option>
+				<option value="tfa_Kazakhstan" class="">Kazakhstan</option>
+				<option value="tfa_Kenya" class="">Kenya</option>
+				<option value="tfa_Kiribati" class="">Kiribati</option>
+				<option value="tfa_Korea" class="">Korea</option>
+				<option value="tfa_Kuwait" class="">Kuwait</option>
+				<option value="tfa_Kyrgyzstan" class="">Kyrgyzstan</option>
+				<option value="tfa_Laos" class="">Laos</option>
+				<option value="tfa_Latvia" class="">Latvia</option>
+				<option value="tfa_Lebanon" class="">Lebanon</option>
+				<option value="tfa_Lesotho" class="">Lesotho</option>
+				<option value="tfa_Liberia" class="">Liberia</option>
+				<option value="tfa_Libya" class="">Libya</option>
+				<option value="tfa_Liechtenstein" class="">Liechtenstein</option>
+				<option value="tfa_Lithuania" class="">Lithuania</option>
+				<option value="tfa_Luxembourg" class="">Luxembourg</option>
+				<option value="tfa_MacaoSAR" class="">Macao SAR</option>
+				<option value="tfa_MacedoniaFormerY" class="">Macedonia, Former Yugoslav Republic of</option>
+				<option value="tfa_Madagascar" class="">Madagascar</option>
+				<option value="tfa_Malawi" class="">Malawi</option>
+				<option value="tfa_Malaysia" class="">Malaysia</option>
+				<option value="tfa_Maldives" class="">Maldives</option>
+				<option value="tfa_Mali" class="">Mali</option>
+				<option value="tfa_Malta" class="">Malta</option>
+				<option value="tfa_MarshallIslands" class="">Marshall Islands</option>
+				<option value="tfa_Martinique" class="">Martinique</option>
+				<option value="tfa_Mauritania" class="">Mauritania</option>
+				<option value="tfa_Mauritius" class="">Mauritius</option>
+				<option value="tfa_Mayotte" class="">Mayotte</option>
+				<option value="tfa_Mexico" class="">Mexico</option>
+				<option value="tfa_Micronesia" class="">Micronesia</option>
+				<option value="tfa_Moldova" class="">Moldova</option>
+				<option value="tfa_Monaco" class="">Monaco</option>
+				<option value="tfa_Mongolia" class="">Mongolia</option>
+				<option value="tfa_Montserrat" class="">Montserrat</option>
+				<option value="tfa_Morocco" class="">Morocco</option>
+				<option value="tfa_Mozambique" class="">Mozambique</option>
+				<option value="tfa_Myanmar" class="">Myanmar</option>
+				<option value="tfa_Namibia" class="">Namibia</option>
+				<option value="tfa_Nauru" class="">Nauru</option>
+				<option value="tfa_Nepal" class="">Nepal</option>
+				<option value="tfa_Netherlands" class="">Netherlands</option>
+				<option value="tfa_NetherlandsAntil" class="">Netherlands Antilles</option>
+				<option value="tfa_NewCaledonia" class="">New Caledonia</option>
+				<option value="tfa_NewZealand" class="">New Zealand</option>
+				<option value="tfa_Nicaragua" class="">Nicaragua</option>
+				<option value="tfa_Niger" class="">Niger</option>
+				<option value="tfa_Nigeria" class="">Nigeria</option>
+				<option value="tfa_Niue" class="">Niue</option>
+				<option value="tfa_NorfolkIsland" class="">Norfolk Island</option>
+				<option value="tfa_NorthKorea" class="">North Korea</option>
+				<option value="tfa_NorthernMarianaI" class="">Northern Mariana Islands</option>
+				<option value="tfa_Norway" class="">Norway</option>
+				<option value="tfa_Oman" class="">Oman</option>
+				<option value="tfa_Pakistan" class="">Pakistan</option>
+				<option value="tfa_Palau" class="">Palau</option>
+				<option value="tfa_Panama" class="">Panama</option>
+				<option value="tfa_PapuaNewGuinea" class="">Papua New Guinea</option>
+				<option value="tfa_Paraguay" class="">Paraguay</option>
+				<option value="tfa_Peru" class="">Peru</option>
+				<option value="tfa_Philippines" class="">Philippines</option>
+				<option value="tfa_PitcairnIslands" class="">Pitcairn Islands</option>
+				<option value="tfa_Poland" class="">Poland</option>
+				<option value="tfa_Portugal" class="">Portugal</option>
+				<option value="tfa_PuertoRico" class="">Puerto Rico</option>
+				<option value="tfa_Qatar" class="">Qatar</option>
+				<option value="tfa_Reunion" class="">Reunion</option>
+				<option value="tfa_Romania" class="">Romania</option>
+				<option value="tfa_Russia" class="">Russia</option>
+				<option value="tfa_Rwanda" class="">Rwanda</option>
+				<option value="tfa_Samoa" class="">Samoa</option>
+				<option value="tfa_SanMarino" class="">San Marino</option>
+				<option value="tfa_SoTomandPrncipe" class="">São Tomé and Prìncipe</option>
+				<option value="tfa_SaudiArabia" class="">Saudi Arabia</option>
+				<option value="tfa_Senegal" class="">Senegal</option>
+				<option value="tfa_SerbiaandMontene" class="">Serbia and Montenegro</option>
+				<option value="tfa_Seychelles" class="">Seychelles</option>
+				<option value="tfa_SierraLeone" class="">Sierra Leone</option>
+				<option value="tfa_Singapore" class="">Singapore</option>
+				<option value="tfa_Slovakia" class="">Slovakia</option>
+				<option value="tfa_Slovenia" class="">Slovenia</option>
+				<option value="tfa_SolomonIslands" class="">Solomon Islands</option>
+				<option value="tfa_Somalia" class="">Somalia</option>
+				<option value="tfa_SouthAfrica" class="">South Africa</option>
+				<option value="tfa_SouthGeorgiaandt" class="">South Georgia and the South Sandwich Islands</option>
+				<option value="tfa_Spain" class="">Spain</option>
+				<option value="tfa_SriLanka" class="">Sri Lanka</option>
+				<option value="tfa_StHelena" class="">St. Helena</option>
+				<option value="tfa_StKittsandNevis" class="">St. Kitts and Nevis</option>
+				<option value="tfa_StLucia" class="">St. Lucia</option>
+				<option value="tfa_StPierreandMique" class="">St. Pierre and Miquelon</option>
+				<option value="tfa_StVincentandtheG" class="">St. Vincent and the Grenadines</option>
+				<option value="tfa_Sudan" class="">Sudan</option>
+				<option value="tfa_Suriname" class="">Suriname</option>
+				<option value="tfa_SvalbardandJanMa" class="">Svalbard and Jan Mayen</option>
+				<option value="tfa_Swaziland" class="">Swaziland</option>
+				<option value="tfa_Sweden" class="">Sweden</option>
+				<option value="tfa_Switzerland" class="">Switzerland</option>
+				<option value="tfa_Syria" class="">Syria</option>
+				<option value="tfa_Taiwan" class="">Taiwan</option>
+				<option value="tfa_Tajikistan" class="">Tajikistan</option>
+				<option value="tfa_Tanzania" class="">Tanzania</option>
+				<option value="tfa_Thailand" class="">Thailand</option>
+				<option value="tfa_Togo" class="">Togo</option>
+				<option value="tfa_Tokelau" class="">Tokelau</option>
+				<option value="tfa_Tonga" class="">Tonga</option>
+				<option value="tfa_TrinidadandTobag" class="">Trinidad and Tobago</option>
+				<option value="tfa_Tunisia" class="">Tunisia</option>
+				<option value="tfa_Turkey" class="">Turkey</option>
+				<option value="tfa_Turkmenistan" class="">Turkmenistan</option>
+				<option value="tfa_TurksandCaicosIs" class="">Turks and Caicos Islands</option>
+				<option value="tfa_Tuvalu" class="">Tuvalu</option>
+				<option value="tfa_Uganda" class="">Uganda</option>
+				<option value="tfa_Ukraine" class="">Ukraine</option>
+				<option value="tfa_UnitedArabEmirat" class="">United Arab Emirates</option>
+				<option value="tfa_UnitedKingdom" class="">United Kingdom</option>
+				<option value="tfa_UnitedStates" class="switch-b">United States</option>
+				<option value="tfa_UnitedStatesMino" class="">United States Minor Outlying Islands</option>
+				<option value="tfa_Uruguay" class="">Uruguay</option>
+				<option value="tfa_Uzbekistan" class="">Uzbekistan</option>
+				<option value="tfa_Vanuatu" class="">Vanuatu</option>
+				<option value="tfa_VaticanCity" class="">Vatican City</option>
+				<option value="tfa_Venezuela" class="">Venezuela</option>
+				<option value="tfa_VietNam" class="">Viet Nam</option>
+				<option value="tfa_VirginIslandsBri" class="">Virgin Islands ( British )</option>
+				<option value="tfa_VirginIslands" class="">Virgin Islands</option>
+				<option value="tfa_WallisandFutuna" class="">Wallis and Futuna</option>
+				<option value="tfa_Yemen" class="">Yemen</option>
+				<option value="tfa_Zambia" class="">Zambia</option>
+				<option value="tfa_Zimbabwe" class="">Zimbabwe</option></select>
+				</div>
+			</li>
+			<li class="inline">
+				<div id="tfa_USState-D" class="oneField offstate-b">
+				<label class="preField" for="tfa_USState">US state</label> <select id="tfa_USState" name="tfa_USState" class="required">
+				<option value="">Please select...</option>
+				<option value="tfa_Alabama" class="">Alabama</option>
+				<option value="tfa_Alaska" class="">Alaska</option>
+				<option value="tfa_Arizona" class="">Arizona</option>
+				<option value="tfa_Arkansas" class="">Arkansas</option>
+				<option value="tfa_California" class="">California</option>
+				<option value="tfa_Colorado" class="">Colorado</option>
+				<option value="tfa_Connecticut" class="">Connecticut</option>
+				<option value="tfa_Delaware" class="">Delaware</option>
+				<option value="tfa_Florida" class="">Florida</option>
+				<option value="tfa_Georgia1" class="">Georgia</option>
+				<option value="tfa_Hawaii" class="">Hawaii</option>
+				<option value="tfa_Idaho" class="">Idaho</option>
+				<option value="tfa_Illinois" class="">Illinois</option>
+				<option value="tfa_Indiana" class="">Indiana</option>
+				<option value="tfa_Iowa" class="">Iowa</option>
+				<option value="tfa_Kansas" class="">Kansas</option>
+				<option value="tfa_Kentucky" class="">Kentucky</option>
+				<option value="tfa_Louisiana" class="">Louisiana</option>
+				<option value="tfa_Maine" class="">Maine</option>
+				<option value="tfa_Maryland" class="">Maryland</option>
+				<option value="tfa_Massachusetts" class="">Massachusetts</option>
+				<option value="tfa_Michigan" class="">Michigan</option>
+				<option value="tfa_Minnesota" class="">Minnesota</option>
+				<option value="tfa_Mississippi" class="">Mississippi</option>
+				<option value="tfa_Missouri" class="">Missouri</option>
+				<option value="tfa_Montana" class="">Montana</option>
+				<option value="tfa_Nebraska" class="">Nebraska</option>
+				<option value="tfa_Nevada" class="">Nevada</option>
+				<option value="tfa_NewHampshire" class="">New Hampshire</option>
+				<option value="tfa_NewJersey" class="">New Jersey</option>
+				<option value="tfa_NewMexico" class="">New Mexico</option>
+				<option value="tfa_NewYork" class="">New York</option>
+				<option value="tfa_NorthCarolina" class="">North Carolina</option>
+				<option value="tfa_NorthDakota" class="">North Dakota</option>
+				<option value="tfa_Ohio" class="">Ohio</option>
+				<option value="tfa_Oklahoma" class="">Oklahoma</option>
+				<option value="tfa_Oregon" class="">Oregon</option>
+				<option value="tfa_Pennsylvania" class="">Pennsylvania</option>
+				<option value="tfa_RhodeIsland" class="">Rhode Island</option>
+				<option value="tfa_SouthCarolina" class="">South Carolina</option>
+				<option value="tfa_SouthDakota" class="">South Dakota</option>
+				<option value="tfa_Tennessee" class="">Tennessee</option>
+				<option value="tfa_Texas" class="">Texas</option>
+				<option value="tfa_Utah" class="">Utah</option>
+				<option value="tfa_Vermont" class="">Vermont</option>
+				<option value="tfa_Virginia" class="">Virginia</option>
+				<option value="tfa_Washington" class="">Washington</option>
+				<option value="tfa_WestVirginia" class="">West Virginia</option>
+				<option value="tfa_Wisconsin" class="">Wisconsin</option>
+				<option value="tfa_Wyoming" class="">Wyoming</option></select>
+				</div>
+			</li>
+		</ul>
+	</fieldset>
+	<fieldset class="fieldset-3">
+		<h3>Project contact</h3>
+		<ul class="no-bullets">
+			<li class="">
+				<div id="tfa_PleaseaddtheCano-D" class="oneField">
+					<label class="preField" for="tfa_PleaseaddtheCano">Please add the Canonical Project Manager or contact</label>
+					<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>
+</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>
+
+</div>
+</div>
+</div>
+</div>
+<script type="text/javascript">
+/* Copyright 2007 Veer West LLC - http://www.formassembly.com
+ * populate a web form with querystring parameters.
+ */
+new function(_) {
+	var populateForms = function() {
+		var params = getParameters();
+		var forms  = document.getElementsByTagName('FORM');
+		for (var i=0;i<forms.length;i++) {
+			populateForm(forms[i],params);
+		}
+	}
+	var populateForm = function(f, values) {
+	    if(!f['tfa_dbFormId']) {
+	    	// skip non-formassembly.com forms
+	    	return;
+	    }
+		if(wFORMS && wFORMS.getBehaviorInstance) {
+			var _bs = wFORMS.getBehaviorInstance(f,'switch');
+			var _bc = wFORMS.getBehaviorInstance(f,'calculation');
+		}
+	    for(var fieldName in values) {
+	    	var fld = f.elements[fieldName];
+	    	if(fld) {
+	    		if(fld.tagName) {
+			    	if((fld.tagName=='INPUT' && (fld.type=='text' || fld.type=='hidden' || fld.type=='password'))
+			    	          ||(fld.tagName=='TEXTAREA'));
+			    		fld.value = unescape(values[fieldName]);
+			    	if(fld.tagName=='INPUT' && fld.type=='checkbox') {
+			    		fld.checked = values[fieldName] ? true : false;
+			    	}
+			    	if(fld.tagName=='SELECT') {
+			    		fld.value = values[fieldName];
+			    	}
+					if(_bs) { // trigger switch behavior if appropriate.
+						_bs.run(null,fld);
+					}
+					if(_bc) { // trigger calculation behavior if appropriate.
+						_bc.run(null,fld);
+					}
+	    		} else {
+	    			// radio group
+		    		for (i=0;i<fld.length;i++) {
+						if (fld[i].value==values[fieldName]) {
+							fld[i].checked = true;
+							if(_bs) { // trigger switch behavior if appropriate.
+								_bs.run(null,fld[i]);
+							}
+							if(_bc) { // trigger calculation behavior if appropriate.
+								_bc.run(null,fld[i]);
+							}
+							break;
+						}
+					}
+		    	}
+	    	}
+	    }
+	}
+	var getParameters = function() {
+		var param = Array();
+		var q = document.location.search;
+		if(q.length==0)
+			return;
+	    var v = q.split('?')[1].split('&');
+	    for(var i=0;i<v.length;i++) {
+	    	param[v[i].split('=')[0]] = v[i].split('=')[1];
+	    }
+	    return param;
+	}
+	var _addEvent = function(obj, type, fn) {
+		if(!obj) { return; }
+		if (obj.attachEvent) {
+			obj['e'+type+fn] = fn;
+			obj[type+fn] = function(){obj['e'+type+fn]( window.event );}
+			obj.attachEvent( 'on'+type, obj[type+fn] );
+		} else if(obj.addEventListener) {
+			obj.addEventListener( type,fn, false );
+		} else {
+			var originalHandler = obj["on" + type];
+			if (originalHandler) {
+			  obj["on" + type] = function(e){originalHandler(e);fn(e);};
+			} else {
+			  obj["on" + type] = fn;
+			}
+		}
+	}
+	_addEvent(window,'load',populateForms);
+}();
+
+</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
new file mode 100755
index 00000000000..3b7bcbbbde0
--- /dev/null
+++ b/templates/legal/contributors/thank-you.html
@@ -0,0 +1,21 @@
+{% extends "legal/_base_legal.html" %}
+
+{% block title %}Thank you for submitting your contributor license agreement | Ubuntu and Canonical legal{% endblock %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Contributors" page_title="How to submit" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row row-hero no-border">
+	<h1>Thanks for agreeing to contribute.</h1>
+	<div class="eight-col">
+		<h2>We&rsquo;re really excited.</h2>
+		<p>Now you have submitted your form and agreed to participate, you can contribute to any of the open source software projects we manage, safe in the knowledge that you retain the copyright for your work.</p>
+		<p>You can find more information on <a href="http://www.canonical.com/projects" class="external">projects</a> and how to contribute on the <a href="http://community.ubuntu.com/" class="external">Ubuntu community site</a>.</p>
+	</div><!-- /.eight-col -->
+	<div class="four-col last-col text-center">
+		<img src="http://assets.ubuntu.com/sites/ubuntu/642/u/img/devices/pictogram-smile-purple.png" alt="Smile">
+	</div><!-- /.four-col -->
+</div><!-- /.row -->
+{% endblock content %}
\ No newline at end of file
diff --git a/templates/legal/index.html b/templates/legal/index.html
old mode 100644
new mode 100755
index a927c6fbabc..41c8b7d23cc
--- a/templates/legal/index.html
+++ b/templates/legal/index.html
@@ -1,61 +1,38 @@
 {% extends "legal/_base_legal.html" %}
 
-{% block title %}Legal{% endblock %}
+{% block title %}Ubuntu legal terms and policies{% endblock %}
+{% block meta_description %}Canonical produces Ubuntu, provides commercial services for Ubuntu’s users, and works with hardware manufacturers, software vendors and cloud partners to certify Ubuntu. {% endblock %}
+{% block meta_keywords %}Canonical, Ubuntu, open source, free, software, FOSS, Linux, operating system, cloud, phone, smartphone, mobile, tablet, convergence, cross-platform, desktop, server, services, commercial, support, certify, certified, certification, consumer, business, enterprise, government, non-profit{% endblock %}
+
+{% block extra_body_class %}legal{% endblock %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" %}
+{% endblock second_level_nav_items %}
 
 {% block content %}
-	<div class="row row-hero no-border">
-		<h1>Legal</h1>
-		<h2>Intellectual property</h2>
-		<p>Canonical&rsquo;s <a href="http://www.canonical.com/intellectual-property-policy">intellectual property rights policy</a> governs your use of Canonical&rsquo;s intellectual property.</p>
-		
-		<h2>Copyright</h2> 
-		
-		<p>The website HTML, text, images audio, video, software or other content that is made available on this website or otherwise hosted by Canonical are the property of someone - the author in the case of content produced elsewhere and reproduced here with permission, or Canonical or its content suppliers. Before you use this content in some way please take care to ensure that you have the relevant rights and permissions from the copyright holder.</p> 
-		
-		<p>You are welcome to display on your computer, download and print pages from this website for personal, education and non-commercial use only. You must retain copyright, trademark and other notices unaltered on any copies or printouts you make. Certain materials available on this site are "open source" materials subject to the GNU General Public Licence ("GPL") or other open-source licence and are so marked. Use of those materials is governed by the individual applicable licence.</p> 
-		
-		<h2>Use of Ubuntu software</h2> 
-		
-		<p>Your use of any software obtained from this site is subject to the terms of any licence or agreement provided with the software. Some of these agreements incorporate the terms of the GPL or other open source licences. Please read these licences and agreements before installing and using the software; by installing and using the software, you will have accepted the terms of the licences and agreements.</p>
-		
-		<h2>Trademarks</h2> 
-		<p>Any trademarks, logos and service marks displayed on this website are the property of their owners, whether Canonical or third parties. For example, Linux is a registered trademark of Linus Torvalds. Debian is a trademark of Software in the Public Interest, Inc. Windows is a trademark of Microsoft Corporation.</p>
-		
-		<p>Canonical owns a number of trademarks, including UBUNTU, KUBUNTU, EDUBUNTU, and XUBUNTU, and use of these is subject to compliance with Canonical&rsquo;s <a href="http://www.canonical.com/intellectual-property-policy">intellectual property rights&rsquo; policy</a>.</p>
-		
-		<h2 id="privacy">Privacy policy</h2> 
-		<p>Our collection and use of your personal information is governed by the Canonical website <a href="/privacy-policy">privacy policy</a>.</p> 
-		
-		<h2>Links and third-party content</h2> 
-		<p>This and any other websites hosted by Canonical may contain links to other websites and resources and third party content, for example, message board posts or blog comments. Canonical is not responsible for such content, or that of any linked websites. You will not remove or alter any third party&rsquo;s copyright or trademark notices or other identifier, except as allowed by the third-party&rsquo;s licence of that content. Should you reasonably believe that any third-party content you access through our websites is in breach of any law, regulation or third party&rsquo;s rights, you should notify Canonical in writing at the address below. In doing so, please:</p>
-		
-		<ul>
-			<li>identify the material which you believe to be infringing;</li>
-			<li>identify what you believe this material infringes and why;</li>
-			<li>provide your name, email address, address and telephone number;</li>
-			<li>confirm that you believe in good faith that this material is infringing a law or third party&rsquo;s rights and that, to the best of your knowledge, the information you are providing is correct;</li>
-			<li>identify if you are acting on behalf of the third party whose rights may have been infringed;</li>
-			<li>provide your physical or electronic signature.</li>
-		</ul>
-		
-		<h2>Package and licence list</h2>
-		<p>Canonical Ltd ("We") have prepared this <a href="{{ STATIC_URL }}files/section/legal/12.04.1_Main_FoundLiceneses_20Aug2012.pdf">package and licence list</a> for your convenience. We have relied on package meta data, license files, and community contributions in creating this list, and we make this list available on an as-is basis. The list is updated periodically, so it does not reflect the constant and rapid update of the packages. We make no representation or warranty as to the accuracy or completeness of this list or the information it represents, and we expressly disclaim any implied warranties to the fullest extent permissible at law. We accept no liability for any damage or loss arising form your use or reliance on the list. All use of the list is subject to these terms.</p>
-		
-		<h2>Disclaimer</h2> 
-		<p>This and any other websites hosted by Canonical and all information, products and services on them are provided on an "as is" basis, without warranty of any kind, either express or implied. Your use of this and any other websites hosted by Canonical is at your own risk. Canonical disclaims all warranties, express or implied, including without limitation, warranties of merchantability and fitness for a particular purpose.</p> 
-		
-		<p>Canonical disclaims liability for any direct, indirect, incidental, special, consequential, exemplary, punitive or other damages, or lost profits, that may result directly or indirectly from the use of this and any other websites hosted by Canonical and any material that is downloaded or obtained through them.</p> 
-		
-		<p>This includes, without limitation, any damage to computer systems, hardware or software, loss of data, or any other performance failures, any errors, bugs, viruses or other defects that result from, or are associated with the use of this and any other websites hosted by Canonical.</p> 
-		
-		<p>Yes, it gives most of us a headache to read all of this, but it&rsquo;s important so thank you for your patience and now, enjoy the site!</p>
-		
-		<h2>Canonical Group Limited</h2>
-		<ul class="no-bullets">
-			<li>Canonical Group Limited</li>
-			<li>Registered in the United Kingdom.</li>
-			<li>Register Office: 5th Floor, Blue Fin Building, 110 Southwark Street, London SE1 0SU</li>
-			<li>Company Number: 6870835</li>
-		</ul>
+<div class="row row-hero no-border ">
+		<div class="eight-col">
+			<h1>Ubuntu legal terms and&nbsp;policies</h1>
+			<p>We take our legal responsibilities very seriously at Canonical &mdash; especially where they concern the protection of your personal data and the contributions you make to the projects we manage &mdash; so we have a number of legal agreements that govern the way we work. They include privacy policies, agreements allowing us to share our intellectual property (which includes trademarks and content as well as code) and descriptions of exactly what our support services cover.</p>
+		</div>
+		<div class="four-col last-col text-center">
+			<img src="{{ STATIC_URL }}img/legal/image-document-ubuntudocs.svg" alt="Ubuntu legal docs" class="priority-0" />
+		</div>
+</div><!-- /.row -->
+
+<div class="row equal-height no-border row-you-will-find">
+	<div class="four-col box">
+		<a href="/legal/terms-and-policies"><h3 class="web-terms">Terms and policies&nbsp;&rsaquo;</h3></a>
+		<p>The main terms governing use of our software and websites, including links to privacy, intellectual property and copyright information. </p>
+	</div>
+	<div class="four-col box">
+		<a href="/legal/ubuntu-advantage"><h3 class="ubuntu-advantage">Ubuntu Advantage terms&nbsp;&rsaquo;</h3></a>
+		<p>A legal description of the services included in the Ubuntu Advantage support package. </p>
+	</div>
+	<div class="four-col box last-col">
+		<a href="/legal/contributors"><h3 class="contributors">Contributors agreement&nbsp;&rsaquo;</h3></a>
+		<p>Details of the agreement you need to send to us before you begin contributing to Ubuntu. </p>
 	</div>
-{% endblock content %}
\ No newline at end of file
+</div><!-- /.row -->
+{% endblock %}
\ No newline at end of file
diff --git a/templates/legal/online-accounts.html b/templates/legal/online-accounts.html
deleted file mode 100644
index 4a460d00a2b..00000000000
--- a/templates/legal/online-accounts.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% extends "templates/one-column.html" %}
-
-{% block title %}Ubuntu online accounts{% endblock %}
-{% block head_extra %}{% endblock %}
-
-{% block content %}
-<div class="row row-hero">
-	<h1>Ubuntu online accounts</h1>
-	<h2>Legal notice</h2>
-	<p>Ubuntu online accounts is provided by Canonical Group Limited (Canonical). This Ubuntu online accounts legal notice applies your use of Ubuntu online accounts and incorporates the terms of Canonical&rsquo;s legal notice (and privacy policy).</p>
-</div><!-- /.row -->
-<div class="row no-border">
-	<h3>Collection and use of credential information</h3>
-	<p>You provide Ubuntu online accounts with your name and password(s) (credentials) for those online services you want Ubuntu online accounts to authenticate while using Ubuntu.</p>
-	<p>Ubuntu online accounts collects and stores your credentials when you enter them in the web authentication dialog and uses them, and authentication cookies, to provide authentication to those online services each time you access them while using Ubuntu.</p>
-	<p>By using Ubuntu online accounts you consent to:</p>
-	<ul>
-		<li>the collection and use of your credentials in this way;</li>
-		<li>the use of authentication cookies; and</li>
-		<li>the storage of your credentials and the authentication cookies on your Ubuntu computer.</li>
-		<li>Canonical will not access or use your credentials or authentication cookies in any other way.</li>
-	</ul>
-
-	<h3>Links and third party content</h3>
-	<p>Ubuntu provides links to online services. Canonical has no affiliation or partnership with the online services you link to from Ubuntu. Any trademarks, logos and service marks displayed on Ubuntu are the property of their owners, whether Canonical or third parties. For further information on links to third party sites and content please see Canonical's legal notice.</p>
-	
-	<h3>Ceasing use</h3>
-	<p>You may cease using Ubuntu online accounts at any time. If you cease using Ubuntu online accounts, or wish to cease using it for certain online services, please ensure that you have removed all of your credentials from the "Accounts" entry of your Ubuntu Control Centre.</p>
-	
-	<h3>Changes</h3>
-	<p>Although most changes are likely to be minor, Canonical may change this legal notice from time to time, and at Canonical's sole discretion. Please check this page from time to time for any changes to this legal notice as we will not be able to notify you directly.</p>
-	
-	<h3>How to contact us</h3>
-	<p>Please submit any questions or comments about Ubuntu online accounts or this legal notice by contacting us at the following address: Canonical Group Ltd, 5<sup>th</sup> Floor, Blue Fin Building, 110 Southwark Street, London, England, <span class="caps">SE1</span> 0SU.</p>
-</div><!-- / .row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/legal/shared/_contextual_footer.html b/templates/legal/shared/_contextual_footer.html
old mode 100644
new mode 100755
diff --git a/templates/legal/terms-and-policies/contact-us.html b/templates/legal/terms-and-policies/contact-us.html
new file mode 100755
index 00000000000..f5d6122bd3c
--- /dev/null
+++ b/templates/legal/terms-and-policies/contact-us.html
@@ -0,0 +1,472 @@
+{% extends "legal/_base_legal.html" %}
+
+{% block title %}Contact us | Intellectual property policy | Terms and policies{% endblock %}
+
+{% block second_level_nav_items %}
+	{% 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 %}
+<div class="row row-hero no-border">
+	<h1>Trademark enquiries</h1>
+	<div class="eight-col">
+		<p>Please contact us using the form below if you&rsquo;d like to request an Ubuntu trademark licence, or have any other trademark enquiry. A member of our trademarks team will be in touch with you shortly.</p>
+		<p>All fields are required.</p>
+		<form method="post" action="https://www.tfaforms.com/responses/processor" class=" labelsLeftAligned" id="tfa_9631608629067" enctype="multipart/form-data">
+			<fieldset class="fieldset-1">
+				<h3>Your contact details</h3>
+				<ul>
+					<li>
+						<label id="tfa_Firstname-L" for="tfa_Firstname">First name</label>
+						<input type="text" id="tfa_Firstname" name="tfa_Firstname" value="" size="60" placeholder="">
+					</li>
+					<li>
+						<label id="tfa_Lastname-L" for="tfa_Lastname">Last name</label>
+						<input type="text" id="tfa_Lastname" name="tfa_Lastname" value="" size="60" placeholder="">
+					</li>
+					<li>
+						<label id="tfa_Email-L" for="tfa_Email">Email</label>
+						<input type="text" id="tfa_Email" name="tfa_Email" value="" size="60" placeholder="" class="validate-email required">
+					</li>
+					<li>
+						<label id="tfa_Phonenumber-L" for="tfa_Phonenumber">Phone number</label>
+						<input type="text" id="tfa_Phonenumber" name="tfa_Phonenumber" value="" size="60" placeholder="">
+					</li>
+				</ul>
+			</fieldset>
+
+			<fieldset class="fieldset-2">
+				<h3>Company information</h3>
+				<ul>
+					<li>
+						<label id="tfa_Areyoumakingther-L" for="tfa_Areyoumakingther">Are you making the request on behalf of a company?</label>
+						<select id="tfa_Areyoumakingther" name="tfa_Areyoumakingther" rel=" wfHandled">
+							<option value="">Please select...</option>
+							<option value="tfa_Yes" class="switch-d">Yes</option>
+							<option value="tfa_No">No</option>
+						</select>
+					</li>
+					<li>
+						<label id="tfa_Companyname1-L" for="tfa_Companyname1">Company name</label>
+						<input type="text" id="tfa_Companyname1" name="tfa_Companyname1" value="" size="40" placeholder="">
+					</li>
+					<li>
+						<label id="tfa_Website1-L" for="tfa_Website1">Website</label>
+						<input type="text" id="tfa_Website1" name="tfa_Website1" value="" size="40" placeholder="">
+					</li>
+					<li>
+						<label id="tfa_Street-L" for="tfa_Street">Street</label>
+						<input type="text" id="tfa_Street" name="tfa_Street" value="" size="40" placeholder="">
+					</li>
+					<li>
+						<label id="tfa_StateProvince-L" for="tfa_StateProvince">State/Province</label>
+						<input type="text" id="tfa_StateProvince" name="tfa_StateProvince" value="" size="40" placeholder="">
+					</li>
+					<li>
+						<label id="tfa_City-L" for="tfa_City">City</label>
+						<input type="text" id="tfa_City" name="tfa_City" value="" size="40" placeholder="">
+					</li>
+					<li>
+						<label id="tfa_ZipPostalcode-L" for="tfa_ZipPostalcode">Zip/Postal code</label>
+						<input type="text" id="tfa_ZipPostalcode" name="tfa_ZipPostalcode" value="" size="40" placeholder="">
+					</li>
+					<li>
+						<label id="tfa_Country-L" for="tfa_Country" class="label preField ">Country</label>
+						<select id="tfa_Country" name="tfa_Country">
+							<option value="">Please select...</option>
+							<option value="tfa_Afghanistan">Afghanistan</option>
+							<option value="tfa_Albania">Albania</option>
+							<option value="tfa_Algeria">Algeria</option>
+							<option value="tfa_AmericanSamoa">American Samoa</option>
+							<option value="tfa_Andorra">Andorra</option>
+							<option value="tfa_Angola">Angola</option>
+							<option value="tfa_Anguilla">Anguilla</option>
+							<option value="tfa_Antarctica">Antarctica</option>
+							<option value="tfa_AntiguaandBarbud">Antigua and Barbuda</option>
+							<option value="tfa_Argentina">Argentina</option>
+							<option value="tfa_Armenia">Armenia</option>
+							<option value="tfa_Aruba">Aruba</option>
+							<option value="tfa_Australia">Australia</option>
+							<option value="tfa_Austria">Austria</option>
+							<option value="tfa_Azerbaijan">Azerbaijan</option>
+							<option value="tfa_Bahamas">Bahamas</option>
+							<option value="tfa_Bahrain">Bahrain</option>
+							<option value="tfa_Bangladesh">Bangladesh</option>
+							<option value="tfa_Barbados">Barbados</option>
+							<option value="tfa_Belarus">Belarus</option>
+							<option value="tfa_Belgium">Belgium</option>
+							<option value="tfa_Belize">Belize</option>
+							<option value="tfa_Benin">Benin</option>
+							<option value="tfa_Bermuda">Bermuda</option>
+							<option value="tfa_Bhutan">Bhutan</option>
+							<option value="tfa_Bolivia">Bolivia</option>
+							<option value="tfa_BosniaandHerzego">Bosnia and Herzegovina</option>
+							<option value="tfa_Botswana">Botswana</option>
+							<option value="tfa_BouvetIsland">Bouvet Island</option>
+							<option value="tfa_Brazil">Brazil</option>
+							<option value="tfa_BritishIndianOce">British Indian Ocean Territory</option>
+							<option value="tfa_Brunei">Brunei</option>
+							<option value="tfa_Bulgaria">Bulgaria</option>
+							<option value="tfa_BurkinaFaso">Burkina Faso</option>
+							<option value="tfa_Burundi">Burundi</option>
+							<option value="tfa_Cambodia">Cambodia</option>
+							<option value="tfa_Cameroon">Cameroon</option>
+							<option value="tfa_Canada">Canada</option>
+							<option value="tfa_CapeVerde">Cape Verde</option>
+							<option value="tfa_CaymanIslands">Cayman Islands</option>
+							<option value="tfa_CentralAfricanRe">Central African Republic</option>
+							<option value="tfa_Chad">Chad</option>
+							<option value="tfa_Chile">Chile</option>
+							<option value="tfa_China">China</option>
+							<option value="tfa_ChristmasIsland">Christmas Island</option>
+							<option value="tfa_CocosKeelingIsla">Cocos ( Keeling ) Islands</option>
+							<option value="tfa_Colombia">Colombia</option>
+							<option value="tfa_Comoros">Comoros</option>
+							<option value="tfa_Congo">Congo</option>
+							<option value="tfa_CookIslands">Cook Islands</option>
+							<option value="tfa_CostaRica">Costa Rica</option>
+							<option value="tfa_CtedIvoire">Côte d ' Ivoire</option>
+							<option value="tfa_CroatiaHrvatska">Croatia ( Hrvatska )</option>
+							<option value="tfa_Cuba">Cuba</option>
+							<option value="tfa_Cyprus">Cyprus</option>
+							<option value="tfa_CzechRepublic">Czech Republic</option>
+							<option value="tfa_CongoDRC">Congo ( DRC )</option>
+							<option value="tfa_Denmark">Denmark</option>
+							<option value="tfa_Djibouti">Djibouti</option>
+							<option value="tfa_Dominica">Dominica</option>
+							<option value="tfa_DominicanRepubli">Dominican Republic</option>
+							<option value="tfa_EastTimor">East Timor</option>
+							<option value="tfa_Ecuador">Ecuador</option>
+							<option value="tfa_Egypt">Egypt</option>
+							<option value="tfa_ElSalvador">El Salvador</option>
+							<option value="tfa_EquatorialGuinea">Equatorial Guinea</option>
+							<option value="tfa_Eritrea">Eritrea</option>
+							<option value="tfa_Estonia">Estonia</option>
+							<option value="tfa_Ethiopia">Ethiopia</option>
+							<option value="tfa_FalklandIslandsI">Falkland Islands ( Islas Malvinas )</option>
+							<option value="tfa_FaroeIslands">Faroe Islands</option>
+							<option value="tfa_FijiIslands">Fiji Islands</option>
+							<option value="tfa_Finland">Finland</option>
+							<option value="tfa_France">France</option>
+							<option value="tfa_FrenchGuiana">French Guiana</option>
+							<option value="tfa_FrenchPolynesia">French Polynesia</option>
+							<option value="tfa_FrenchSouthernan">French Southern and Antarctic Lands</option>
+							<option value="tfa_Gabon">Gabon</option>
+							<option value="tfa_Gambia">Gambia</option>
+							<option value="tfa_Georgia">Georgia</option>
+							<option value="tfa_Germany">Germany</option>
+							<option value="tfa_Ghana">Ghana</option>
+							<option value="tfa_Gibraltar">Gibraltar</option>
+							<option value="tfa_Greece">Greece</option>
+							<option value="tfa_Greenland">Greenland</option>
+							<option value="tfa_Grenada">Grenada</option>
+							<option value="tfa_Guadeloupe">Guadeloupe</option>
+							<option value="tfa_Guam">Guam</option>
+							<option value="tfa_Guatemala">Guatemala</option>
+							<option value="tfa_Guinea">Guinea</option>
+							<option value="tfa_GuineaBissau">Guinea-Bissau</option>
+							<option value="tfa_Guyana">Guyana</option>
+							<option value="tfa_Haiti">Haiti</option>
+							<option value="tfa_HeardIslandandMc">Heard Island and McDonald Islands</option>
+							<option value="tfa_Honduras">Honduras</option>
+							<option value="tfa_HongKongSAR">Hong Kong SAR</option>
+							<option value="tfa_Hungary">Hungary</option>
+							<option value="tfa_Iceland">Iceland</option>
+							<option value="tfa_India">India</option>
+							<option value="tfa_Indonesia">Indonesia</option>
+							<option value="tfa_Iran">Iran</option>
+							<option value="tfa_Iraq">Iraq</option>
+							<option value="tfa_Ireland">Ireland</option>
+							<option value="tfa_Israel">Israel</option>
+							<option value="tfa_Italy">Italy</option>
+							<option value="tfa_Jamaica">Jamaica</option>
+							<option value="tfa_Japan">Japan</option>
+							<option value="tfa_Jordan">Jordan</option>
+							<option value="tfa_Kazakhstan">Kazakhstan</option>
+							<option value="tfa_Kenya">Kenya</option>
+							<option value="tfa_Kiribati">Kiribati</option>
+							<option value="tfa_Korea">Korea</option>
+							<option value="tfa_Kuwait">Kuwait</option>
+							<option value="tfa_Kyrgyzstan">Kyrgyzstan</option>
+							<option value="tfa_Laos">Laos</option>
+							<option value="tfa_Latvia">Latvia</option>
+							<option value="tfa_Lebanon">Lebanon</option>
+							<option value="tfa_Lesotho">Lesotho</option>
+							<option value="tfa_Liberia">Liberia</option>
+							<option value="tfa_Libya">Libya</option>
+							<option value="tfa_Liechtenstein">Liechtenstein</option>
+							<option value="tfa_Lithuania">Lithuania</option>
+							<option value="tfa_Luxembourg">Luxembourg</option>
+							<option value="tfa_MacaoSAR">Macao SAR</option>
+							<option value="tfa_MacedoniaFormerY">Macedonia, Former Yugoslav Republic of</option>
+							<option value="tfa_Madagascar">Madagascar</option>
+							<option value="tfa_Malawi">Malawi</option>
+							<option value="tfa_Malaysia">Malaysia</option>
+							<option value="tfa_Maldives">Maldives</option>
+							<option value="tfa_Mali">Mali</option>
+							<option value="tfa_Malta">Malta</option>
+							<option value="tfa_MarshallIslands">Marshall Islands</option>
+							<option value="tfa_Martinique">Martinique</option>
+							<option value="tfa_Mauritania">Mauritania</option>
+							<option value="tfa_Mauritius">Mauritius</option>
+							<option value="tfa_Mayotte">Mayotte</option>
+							<option value="tfa_Mexico">Mexico</option>
+							<option value="tfa_Micronesia">Micronesia</option>
+							<option value="tfa_Moldova">Moldova</option>
+							<option value="tfa_Monaco">Monaco</option>
+							<option value="tfa_Mongolia">Mongolia</option>
+							<option value="tfa_Montserrat">Montserrat</option>
+							<option value="tfa_Morocco">Morocco</option>
+							<option value="tfa_Mozambique">Mozambique</option>
+							<option value="tfa_Myanmar">Myanmar</option>
+							<option value="tfa_Namibia">Namibia</option>
+							<option value="tfa_Nauru">Nauru</option>
+							<option value="tfa_Nepal">Nepal</option>
+							<option value="tfa_Netherlands">Netherlands</option>
+							<option value="tfa_NetherlandsAntil">Netherlands Antilles</option>
+							<option value="tfa_NewCaledonia">New Caledonia</option>
+							<option value="tfa_NewZealand">New Zealand</option>
+							<option value="tfa_Nicaragua">Nicaragua</option>
+							<option value="tfa_Niger">Niger</option>
+							<option value="tfa_Nigeria">Nigeria</option>
+							<option value="tfa_Niue">Niue</option>
+							<option value="tfa_NorfolkIsland">Norfolk Island</option>
+							<option value="tfa_NorthKorea">North Korea</option>
+							<option value="tfa_NorthernMarianaI">Northern Mariana Islands</option>
+							<option value="tfa_Norway">Norway</option>
+							<option value="tfa_Oman">Oman</option>
+							<option value="tfa_Pakistan">Pakistan</option>
+							<option value="tfa_Palau">Palau</option>
+							<option value="tfa_Panama">Panama</option>
+							<option value="tfa_PapuaNewGuinea">Papua New Guinea</option>
+							<option value="tfa_Paraguay">Paraguay</option>
+							<option value="tfa_Peru">Peru</option>
+							<option value="tfa_Philippines">Philippines</option>
+							<option value="tfa_PitcairnIslands">Pitcairn Islands</option>
+							<option value="tfa_Poland">Poland</option>
+							<option value="tfa_Portugal">Portugal</option>
+							<option value="tfa_PuertoRico">Puerto Rico</option>
+							<option value="tfa_Qatar">Qatar</option>
+							<option value="tfa_Reunion">Reunion</option>
+							<option value="tfa_Romania">Romania</option>
+							<option value="tfa_Russia">Russia</option>
+							<option value="tfa_Rwanda">Rwanda</option>
+							<option value="tfa_Samoa">Samoa</option>
+							<option value="tfa_SanMarino">San Marino</option>
+							<option value="tfa_SoTomandPrncipe">São Tomé and Prìncipe</option>
+							<option value="tfa_SaudiArabia">Saudi Arabia</option>
+							<option value="tfa_Senegal">Senegal</option>
+							<option value="tfa_SerbiaandMontene">Serbia and Montenegro</option>
+							<option value="tfa_Seychelles">Seychelles</option>
+							<option value="tfa_SierraLeone">Sierra Leone</option>
+							<option value="tfa_Singapore">Singapore</option>
+							<option value="tfa_Slovakia">Slovakia</option>
+							<option value="tfa_Slovenia">Slovenia</option>
+							<option value="tfa_SolomonIslands">Solomon Islands</option>
+							<option value="tfa_Somalia">Somalia</option>
+							<option value="tfa_SouthAfrica">South Africa</option>
+							<option value="tfa_SouthGeorgiaandt">South Georgia and the South Sandwich Islands</option>
+							<option value="tfa_Spain">Spain</option>
+							<option value="tfa_SriLanka">Sri Lanka</option>
+							<option value="tfa_StHelena">St. Helena</option>
+							<option value="tfa_StKittsandNevis">St. Kitts and Nevis</option>
+							<option value="tfa_StLucia">St. Lucia</option>
+							<option value="tfa_StPierreandMique">St. Pierre and Miquelon</option>
+							<option value="tfa_StVincentandtheG">St. Vincent and the Grenadines</option>
+							<option value="tfa_Sudan">Sudan</option>
+							<option value="tfa_Suriname">Suriname</option>
+							<option value="tfa_SvalbardandJanMa">Svalbard and Jan Mayen</option>
+							<option value="tfa_Swaziland">Swaziland</option>
+							<option value="tfa_Sweden">Sweden</option>
+							<option value="tfa_Switzerland">Switzerland</option>
+							<option value="tfa_Syria">Syria</option>
+							<option value="tfa_Taiwan">Taiwan</option>
+							<option value="tfa_Tajikistan">Tajikistan</option>
+							<option value="tfa_Tanzania">Tanzania</option>
+							<option value="tfa_Thailand">Thailand</option>
+							<option value="tfa_Togo">Togo</option>
+							<option value="tfa_Tokelau">Tokelau</option>
+							<option value="tfa_Tonga">Tonga</option>
+							<option value="tfa_TrinidadandTobag">Trinidad and Tobago</option>
+							<option value="tfa_Tunisia">Tunisia</option>
+							<option value="tfa_Turkey">Turkey</option>
+							<option value="tfa_Turkmenistan">Turkmenistan</option>
+							<option value="tfa_TurksandCaicosIs">Turks and Caicos Islands</option>
+							<option value="tfa_Tuvalu">Tuvalu</option>
+							<option value="tfa_Uganda">Uganda</option>
+							<option value="tfa_Ukraine">Ukraine</option>
+							<option value="tfa_UnitedArabEmirat">United Arab Emirates</option>
+							<option value="tfa_UnitedKingdom">United Kingdom</option>
+							<option value="tfa_UnitedStates">United States</option>
+							<option value="tfa_UnitedStatesMino">United States Minor Outlying Islands</option>
+							<option value="tfa_Uruguay">Uruguay</option>
+							<option value="tfa_Uzbekistan">Uzbekistan</option>
+							<option value="tfa_Vanuatu">Vanuatu</option>
+							<option value="tfa_VaticanCity">Vatican City</option>
+							<option value="tfa_Venezuela">Venezuela</option>
+							<option value="tfa_VietNam">Viet Nam</option>
+							<option value="tfa_VirginIslandsBri">Virgin Islands ( British )</option>
+							<option value="tfa_VirginIslands">Virgin Islands</option>
+							<option value="tfa_WallisandFutuna">Wallis and Futuna</option>
+							<option value="tfa_Yemen">Yemen</option>
+							<option value="tfa_Zambia">Zambia</option>
+							<option value="tfa_Zimbabwe">Zimbabwe</option>
+						</select>
+					</li>
+				</ul>
+			</fieldset>
+			<fieldset class="fieldset-3">
+				<ul>
+					<li>
+						<label id="tfa_Whataredoyouplan-L" for="tfa_Whataredoyouplan">In what capacity are you requesting to use the trademark?</label>
+						<select id="tfa_Whataredoyouplan" name="tfa_Whataredoyouplan" rel=" wfHandled">
+							<option value="">Please select...</option>
+							<option value="tfa_Commercial">Commercial</option>
+							<option value="tfa_Community" class="switch-c">Community</option>
+						</select>
+					</li>
+					<li>
+						<label id="tfa_Areyouamemberofa-L" for="tfa_Areyouamemberofa">Are you a member of an approved LoCo team?</label>
+						<select id="tfa_Areyouamemberofa" name="tfa_Areyouamemberofa" rel=" wfHandled">
+							<option value="">Please select...</option>
+							<option value="tfa_Yes1" class="switch-b">Yes</option>
+							<option value="tfa_No1">No</option>
+						</select>
+					</li>
+					<li>
+						<label id="tfa_Pleasestatewhich-L" for="tfa_Pleasestatewhich">Please state which LoCo team</label>
+						<input type="text" id="tfa_Pleasestatewhich" name="tfa_Pleasestatewhich" value="" size="40" placeholder="">
+					</li>
+					<li>
+						<label id="tfa_Inwhatcapacitydo-L" for="tfa_Inwhatcapacitydo">In what capacity do you propose to use the Ubuntu trademark? (select all that apply)</label>
+						<select id="tfa_Inwhatcapacitydo" multiple="" name="tfa_Inwhatcapacitydo[]">
+							<option value="">Please select...</option>
+							<option value="tfa_DistributionofUb">Distribution of Ubuntu</option>
+							<option value="tfa_Salesofmerchandi">Sales of merchandise</option>
+							<option value="tfa_Publishing">Publishing</option>
+							<option value="tfa_Websiteblog">Website/blog</option>
+							<option value="tfa_Advertising">Advertising</option>
+							<option value="tfa_DomainnameofUbun">Domain name of Ubuntu</option>
+							<option value="tfa_Derivativedistri">Derivative distribution (remix)</option>
+							<option value="tfa_ProductbuiltonUb">Product built on Ubuntu</option>
+							<option value="tfa_Other">Other</option>
+						</select>
+					</li>
+					<li>
+						<label id="tfa_Pleaseaddanyothe-L" for="tfa_Pleaseaddanyothe">Please describe your request in more detail</label>
+						<textarea cols="90" rows="6" id="tfa_Pleaseaddanyothe" name="tfa_Pleaseaddanyothe"></textarea>
+					</li>
+				</ul>
+			</fieldset>
+			<fieldset>
+				<p>Data collected from this survey will be handled in accordance with the Canonical <a href="/legal/terms-and-policies/privacy-policy">privacy policy</a></p>
+				<ul>
+					<li>
+						<label>If you would like to include an attachment with your request please add it here.</label>
+						<input type="file" id="tfa_Ifyouwouldliketo" name="tfa_Ifyouwouldliketo" size="40">
+					</li>
+					<li>
+						<input type="submit" class="primaryAction" value="Submit">
+					</li>
+				</ul>
+				<input type="hidden" value="36087" name="tfa_dbFormId" id="tfa_dbFormId">
+				<input type="hidden" value="" name="tfa_dbResponseId" id="tfa_dbResponseId">
+				<input type="hidden" value="c004ae4348a8919232a477fa58f8a3bf" name="tfa_dbControl" id="tfa_dbControl"><input type="hidden" value="26" name="tfa_dbVersionId" id="tfa_dbVersionId">
+			</fieldset>
+		</form>
+	</div><!-- /.eight-col -->
+</div><!-- /.row -->
+
+
+<script type="text/javascript">
+/* Copyright 2007 Veer West LLC - http://www.formassembly.com
+ * populate a web form with querystring parameters.
+ */
+new function(_) {
+	var populateForms = function() {
+		var params = getParameters();
+		var forms  = document.getElementsByTagName('FORM');
+		for (var i=0;i<forms.length;i++) {
+			populateForm(forms[i],params);
+		}
+	}
+	var populateForm = function(f, values) {
+	    if(!f['tfa_dbFormId']) {
+	    	// skip non-formassembly.com forms
+	    	return;
+	    }
+		if(wFORMS && wFORMS.getBehaviorInstance) {
+			var _bs = wFORMS.getBehaviorInstance(f,'switch');
+			var _bc = wFORMS.getBehaviorInstance(f,'calculation');
+		}
+	    for(var fieldName in values) {
+	    	var fld = f.elements[fieldName];
+	    	if(fld) {
+	    		if(fld.tagName) {
+			    	if((fld.tagName=='INPUT' && (fld.type=='text' || fld.type=='hidden' || fld.type=='password'))
+			    	          ||(fld.tagName=='TEXTAREA'));
+			    		fld.value = unescape(values[fieldName]);
+			    	if(fld.tagName=='INPUT' && fld.type=='checkbox') {
+			    		fld.checked = values[fieldName] ? true : false;
+			    	}
+			    	if(fld.tagName=='SELECT') {
+			    		fld.value = values[fieldName];
+			    	}
+					if(_bs) { // trigger switch behavior if appropriate.
+						_bs.run(null,fld);
+					}
+					if(_bc) { // trigger calculation behavior if appropriate.
+						_bc.run(null,fld);
+					}
+	    		} else {
+	    			// radio group
+		    		for (i=0;i<fld.length;i++) {
+						if (fld[i].value==values[fieldName]) {
+							fld[i].checked = true;
+							if(_bs) { // trigger switch behavior if appropriate.
+								_bs.run(null,fld[i]);
+							}
+							if(_bc) { // trigger calculation behavior if appropriate.
+								_bc.run(null,fld[i]);
+							}
+							break;
+						}
+					}
+		    	}
+	    	}
+	    }
+	}
+	var getParameters = function() {
+		var param = Array();
+		var q = document.location.search;
+		if(q.length==0)
+			return;
+	    var v = q.split('?')[1].split('&');
+	    for(var i=0;i<v.length;i++) {
+	    	param[v[i].split('=')[0]] = v[i].split('=')[1];
+	    }
+	    return param;
+	}
+	var _addEvent = function(obj, type, fn) {
+		if(!obj) { return; }
+		if (obj.attachEvent) {
+			obj['e'+type+fn] = fn;
+			obj[type+fn] = function(){obj['e'+type+fn]( window.event );}
+			obj.attachEvent( 'on'+type, obj[type+fn] );
+		} else if(obj.addEventListener) {
+			obj.addEventListener( type,fn, false );
+		} else {
+			var originalHandler = obj["on" + type];
+			if (originalHandler) {
+			  obj["on" + type] = function(e){originalHandler(e);fn(e);};
+			} else {
+			  obj["on" + type] = fn;
+			}
+		}
+	}
+	_addEvent(window,'load',populateForms);
+}();
+
+</script>
+
+{% endblock content %}
diff --git a/templates/legal/terms-and-policies/index.html b/templates/legal/terms-and-policies/index.html
new file mode 100755
index 00000000000..7bd8f946a24
--- /dev/null
+++ b/templates/legal/terms-and-policies/index.html
@@ -0,0 +1,51 @@
+{% extends "legal/_base_legal.html" %}
+
+{% block title %}Terms and policies{% endblock %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" page_title="Terms and policies" tertiary="true" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row row-hero no-border">
+	<div class="eight-col">
+		<h1>Terms and&nbsp;policies</h1>
+		<p>We have legal agreements for the production of our software, the way we present it on our websites and the protection of intellectual property &mdash; both yours and ours. In the sections below, you can see all the legal terms and policies for Ubuntu and Canonical.</p>
+	</div><!-- /.eight-col -->
+	<div class="four-col last-col text-center">
+		<img src="{{ STATIC_URL }}img/legal/image-document-ubuntuterms.svg" alt="Ubuntu terms" class="priority-0" />
+	</div>
+</div><!-- /.row -->
+
+<div class="row equal-height no-border">
+	<div class="six-col box">
+		<h3>Terms and conditions</h3>
+		<p>These terms and conditions cover both Ubuntu and Canonical. They govern the content of our websites, including things like the use of images and text.</p>
+		<p><a href="/legal/terms-and-policies/terms">View terms and conditions&nbsp;&rsaquo;</a></p>
+	</div>
+
+	<div class="six-col box last-col">
+		<h3>Privacy</h3>
+		<p>Your privacy is extremely important. Our privacy policy explains what data we collect from you via both our websites and our software &mdash; and what we do with&nbsp;it.</p>
+		<p><a href="/legal/terms-and-policies/privacy-policy">View privacy policy&nbsp;&rsaquo;</a></p>
+	</div>
+
+	<div class="six-col box">
+		<h3>Intellectual property rights</h3>
+		<p>Our intellectual property rights policy lets you use, modify and redistribute Ubuntu. It also outlines how you can use our trademarks, design assets and other copyrighted materials.</p>
+		<p><a href="/legal/terms-and-policies/intellectual-property-policy">View intellectual property policy&nbsp;&rsaquo;</a></p>
+	</div>
+
+	<div class="six-col box last-col">
+		<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><!-- /.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
new file mode 100755
index 00000000000..ae77746b19c
--- /dev/null
+++ b/templates/legal/terms-and-policies/intellectual-property-policy.html
@@ -0,0 +1,126 @@
+{% extends "legal/_base_legal.html" %}
+
+{% block title %}Intellectual property rights policy | Terms and policies{% endblock %}
+
+{% block second_level_nav_items %}
+	{% 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 %}
+<div class="row row-hero no-border">
+	<div class="eight-col">
+		<h1>Intellectual property rights&nbsp;policy</h1>
+		<p class="intro">Valid since 14 May 2013</p>
+
+		<p>Welcome to Canonical&rsquo;s IPRights Policy. This policy is published by Canonical Limited (Canonical, we, us and our) under the Creative Commons CC-BY-SA version 3.0 UK licence.</p>
+
+		<p>Canonical owns and manages certain intellectual property rights in Ubuntu and other associated intellectual property (Canonical IP) and licenses the use of these rights to enterprises, individuals and members of the Ubuntu community in accordance with this IPRights Policy.</p>
+
+		<p>Your use of Canonical IP is subject to:</p>
+
+		<ul class="list-ubuntu">
+			<li>Your acceptance of this IPRights Policy;</li>
+			<li>Your acknowledgement that Canonical IP is the exclusive property of Canonical and can only be used with Canonical&rsquo;s permission (which can be revoked at any time); and</li>
+			<li>You taking all reasonable steps to ensure that Canonical IP is used in a manner that does not affect either the validity of such Canonical IP or Canonical&rsquo;s ownership of Canonical IP in any way; and that you will transfer any goodwill you derive from them to Canonical, if requested.</li>
+		</ul>
+
+		<p>Ubuntu is a trusted open source platform. To maintain that trust we need to manage the use of Ubuntu and the components within it very carefully. This way, when people use Ubuntu, or anything bearing the Ubuntu brand, they can be assured that it will meet the standards they expect. Your continued use of Canonical IP implies your acceptance and acknowledgement of this IPRights Policy.</p>
+	</div><!-- /.eight-col -->
+
+	<div class="four-col box last-col">
+		<h3>Registered office</h3>
+		<p>	5th Floor<br />
+			Blue Fin Building<br />
+			110 Southwark Street<br />
+			London SE1 0SU<br />
+			United Kingdom</p>
+	</div>
+
+	<div class="eight-col">
+		<h2 id="summary">1. Summary</h2>
+			<ul class="list-ubuntu">
+				<li>You can download, install and receive updates to Ubuntu for free.</li>
+				<li>You can modify Ubuntu for personal or internal commercial use.</li>
+				<li>You can redistribute Ubuntu, but only where there has been no modification to it.</li>
+				<li>You can use our copyright, patent and design materials in accordance with this IPRights Policy.</li>
+				<li>You can be confident and can trust in the consistency of the Ubuntu experience.</li>
+				<li>You can rely on the standard expected of Ubuntu.</li>
+			</ul>
+
+			<h2 id="your-use-of-ubuntu">2. Your use of Ubuntu</h2>
+			<ul class="list-ubuntu">
+				<li>You can download, install and receive updates to Ubuntu for free.</li>
+				<li>Ubuntu is freely available to all users for personal, or in the case of organisations, internal use. It is provided for this use without warranty. All implied warranties are disclaimed to the fullest extent permitted at law.</li>
+				<li>You can modify Ubuntu for personal or internal use</li>
+				<li>You can make changes to Ubuntu for your own personal use or for your organisation&rsquo;s own internal use.</li>
+				<li>You can redistribute Ubuntu, but only where there has been no modification to it.</li>
+				<li>You can redistribute Ubuntu in its unmodified form, complete with the installer images and packages provided by Canonical (this includes the publication or launch of virtual machine images).</li>
+				<li>Any redistribution of modified versions of Ubuntu must be approved, certified or provided by Canonical if you are going to associate it with the Trademarks. Otherwise you must remove and replace the Trademarks and will need to recompile the source code to create your own binaries. This does not affect your rights under any open source licence applicable to any of the components of Ubuntu. If you need us to approve, certify or provide modified versions for redistribution you will require a licence agreement from Canonical, for which you may be required to pay. For further information, please contact us (as set out below).</li>
+				<li>We do not recommend using modified versions of Ubuntu which are not modified in accordance with this IPRights Policy. Modified versions may be corrupted and users of such modified systems or images may find them to be inconsistent with the updates published by Canonical to its users. If they use the Trademarks, they are in contravention of this IPRights Policy. Canonical cannot guarantee the performance of such modified versions. Canonical&rsquo;s updates will be consistent with every version of Ubuntu approved, certified or provided by Canonical.</li>
+			</ul>
+
+			<h2 id="your-use-of-our-trademarks">3. Your use of our trademarks</h2>
+			<p>Canonical&rsquo;s Trademarks (registered in word and logo form) include:</p>
+
+			<ul class="eight-col list no-bullets">
+				<li class="four-col">UBUNTU</li>
+				<li class="four-col  last-col">KUBUNTU</li>
+				<li class="four-col">EDUBUNTU</li>
+				<li class="four-col last-col">XUBUNTU</li>
+				<li class="four-col last-item">JUJU</li>
+				<li class="four-col last-col">LANDSCAPE</li>
+			</ul>
+			&nbsp;
+			<ul class="list-ubuntu">
+				<li>You can use the Trademarks, in accordance with Canonical&rsquo;s brand guidelines, with Canonical&rsquo;s permission in writing. If you require a Trademark licence, please contact us (as set out below).</li>
+				<li>You will require Canonical&rsquo;s permission to use: (i) any mark ending with the letters UBUNTU or BUNTU which is sufficiently similar to the Trademarks or any other confusingly similar mark, and (ii) any Trademark in a domain name or URL or for merchandising purposes.</li>
+				<li>You cannot use the Trademarks in software titles. If you are producing software for use with or on Ubuntu you may reference Ubuntu, but must avoid: (i) any implication of endorsement, or (ii) any attempt to unfairly or confusingly capitalise on the goodwill of Canonical or Ubuntu.</li>
+				<li>You can use the Trademarks in discussion, commentary, criticism or parody, provided that you do not imply endorsement by Canonical.</li>
+				<li>You can write articles, create websites, blogs or talk about Ubuntu, provided that it is clear that you are in no way speaking for or on behalf of Canonical and that you do not imply endorsement by Canonical.</li>
+			</ul>
+
+			<p>Canonical reserves the right to review all use of Canonical&rsquo;s Trademarks and to object to any use that appears outside of this IPRights Policy.</p>
+
+			<h2>4. Your use of our copyright, patent and design materials</h2>
+			<ul class="list-ubuntu">
+				<li>You can only use Canonical&rsquo;s copyright materials in accordance with the copyright licences therein and this IPRights Policy.</li>
+				<li>You cannot use Canonical&rsquo;s patented materials without our permission.</li>
+			</ul>
+
+			<h3>Copyright</h3>
+			<p>The disk, CD, installer and system images, together with Ubuntu packages and binary files, are in many cases copyright of Canonical (which copyright may be distinct from the copyright in the individual components therein) and can only be used in accordance with the copyright licences therein and this IPRights Policy.</p>
+
+			<h3>Patents</h3>
+			<p>Canonical has made a significant investment in the Open Invention Network, defending Linux, for the benefit of the open source ecosystem. Additionally, like many open source projects, Canonical also protects its interests from third parties by registering patents. You cannot use Canonical&rsquo;s patented materials without our permission.</p>
+
+			<h3>Trade dress and look and feel</h3>
+			<p>Canonical owns intellectual property rights in the trade dress and look and feel of Ubuntu (including the Unity interface), along with various themes and components that may include unregistered design rights, registered design rights and design patents, your use of Ubuntu is subject to these rights.</p>
+
+			<h2>5. Logo use guidelines</h2>
+			<p>Canonical&rsquo;s logos are presented in multiple colours and it is important that their visual integrity be maintained. It is therefore preferable that the logos should only be used in their standard form, but if you should feel the need to alter them in any way, you should following the guidelines set out below.</p>
+
+			<ul class="no-bullets">
+				<li><a href="http://design.ubuntu.com/brand/ubuntu-logo" class="external">Ubuntu logo guidelines</a	></li>
+				<li><a href="http://design.ubuntu.com/brand/canonical-logo" class="external">Canonical logo guidelines</a></li>
+			</ul>
+
+			<h2 id="use-by-the-community">6. Use of Canonical IP by the Ubuntu community</h2>
+			<p>Ubuntu is built by Canonical and the Ubuntu community. We share access rights owned by Canonical with the Ubuntu community for the purposes of discussion, development and advocacy. We recognise that most of the open source discussion and development areas are for non-commercial purposes and we therefore allow the use of Canonical IP in this context, as long as there is no commercial use and that the Canonical IP is used in accordance with this IPRights Policy.</p>
+
+			<h2 id="contact-us">7. Contact us</h2>
+			<p><a href="/legal/terms-and-policies/contact-us">Please contact us</a>:</p>
+			<ul class="list-ubuntu">
+				<li>if you have any questions or would like further information on our IPRights Policy, Canonical or Canonical IP;</li>
+				<li>if you would like permission from Canonical to use Canonical IP;</li>
+				<li>if you require a licence agreement; or</li>
+				<li>to report a breach of our IPRights Policy.</li>
+			</ul>
+
+			<p>Please note that due to the volume of mail we receive, it may take up to a week to process your request.</p>
+
+			<h2 id="changes">8. Changes</h2>
+			<p>We may make changes to this IPRights Policy from time to time. Please check this IPRights Policy from time to time to ensure that you are in compliance.</p>
+	</div><!-- /.eight-col -->
+
+</div><!-- /.row -->
+{% endblock content %}
diff --git a/templates/legal/terms-and-policies/online-account-terms.html b/templates/legal/terms-and-policies/online-account-terms.html
new file mode 100755
index 00000000000..22f974fd31d
--- /dev/null
+++ b/templates/legal/terms-and-policies/online-account-terms.html
@@ -0,0 +1,40 @@
+{% extends "legal/_base_legal.html" %}
+
+{% block title %}Online account tools{% endblock %}
+{% block head_extra %}{% 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>Online account terms</h1>
+		<h2>Legal notice</h2>
+		<p>Ubuntu online accounts is provided by Canonical Group Limited (Canonical). This Ubuntu online accounts legal notice applies to your use of Ubuntu online accounts and incorporates the terms of Canonical&rsquo;s <a href="/legal/terms-and-policies/terms">legal notice</a> (and <a href="/legal/terms-and-policies/privacy-policy">privacy policy</a>).</p>
+		<h3>Collection and use of credential information</h3>
+		<p>You provide Ubuntu online accounts with your name and password(s) (credentials) for those online services you want Ubuntu online accounts to authenticate while using Ubuntu.</p>
+		<p>Ubuntu online accounts collects and stores your credentials when you enter them in the web authentication dialog and uses them, and authentication cookies, to provide authentication to those online services each time you access them while using Ubuntu.</p>
+		<p>By using Ubuntu online accounts you consent to:</p>
+		<ul class="list-ubuntu">
+			<li>the collection and use of your credentials in this way;</li>
+			<li>the use of authentication cookies; and</li>
+			<li>the storage of your credentials and the authentication cookies on your Ubuntu computer.</li>
+			<li>Canonical will not access or use your credentials or authentication cookies in any other way.</li>
+		</ul>
+
+		<h3>Links and third party content</h3>
+		<p>Ubuntu provides links to online services. Canonical has no affiliation or partnership with the online services you link to from Ubuntu. Any trademarks, logos and service marks displayed on Ubuntu are the property of their owners, whether Canonical or third parties. For further information on links to third party sites and content please see Canonical's <a href="/legal/terms-and-policies/terms#web-terms-third-party-content">legal notice</a>.</p>
+		
+		<h3>Ceasing use</h3>
+		<p>You may cease using Ubuntu online accounts at any time. If you cease using Ubuntu online accounts, or wish to cease using it for certain online services, please ensure that you have removed all of your credentials from the "Accounts" entry of your Ubuntu Control Centre.</p>
+		
+		<h3>Changes</h3>
+		<p>Although most changes are likely to be minor, Canonical may change this legal notice from time to time, and at Canonical's sole discretion. Please check this page from time to time for any changes to this legal notice as we will not be able to notify you directly.</p>
+		
+		<h3>How to contact us</h3>
+		<p>Please submit any questions or comments about Ubuntu online accounts or this legal notice by contacting us at the following address: Canonical Group Ltd, 5<sup>th</sup> Floor, Blue Fin Building, 110 Southwark Street, London, England, <span class="caps">SE1</span> 0SU.</p>
+	</div>
+</div><!-- / .row -->
+{% endblock content %}
\ No newline at end of file
diff --git a/templates/legal/terms-and-policies/privacy-policy/index.html b/templates/legal/terms-and-policies/privacy-policy/index.html
new file mode 100755
index 00000000000..d9a0c209dc5
--- /dev/null
+++ b/templates/legal/terms-and-policies/privacy-policy/index.html
@@ -0,0 +1,155 @@
+{% extends "legal/_base_legal.html" %}
+
+{% block title %}Privacy policy | Terms and policies{% 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">
+	<div class="eight-col">
+		<h1>Privacy policy</h1>
+		<p class="intro">Valid from 25 March 2013</p>
+		<p>Your privacy matters to us. This policy outlines the information we collect from you &mdash; and what we do with it.</p>
+		<p>Canonical collects personal information from you in a number of different ways. For example, when you download one of our products, receive services from us or use one of our websites (including <a href="http://www.canonical.com">www.canonical.com</a> and <a href="http://www.ubuntu.com">www.ubuntu.com</a>).</p>
+		        
+		<p>At Canonical, we consider your privacy to be extremely important to us. These are the fundamental principles that we follow in relation to your personal information:</p>
+		
+		<ul class="list-ubuntu">        
+			<li>We don't ask you for personal information unless we truly need it.</li>	
+			<li>We don't share your personal information with anyone except to provide you with services, products, to comply with the law, or to protect our rights.</li>
+			<li>We don't store personal information unless required for the on-going operation of services to you, to provide you with products, to comply with law or to protect our rights.</li>
+			<li>We will use personal information that you provide to us in accordance with this privacy policy.</li>
+		</ul>
+</div>
+</div>
+
+<div class="row no-border">
+
+<div class="eight-col">
+		<h2 id="what-we-collect">What we collect</h2>
+		<p>We may collect the following types of personal information from you:</p>
+		
+		<h3>Websites</h3>
+		<p>When you register to use certain parts of our websites, such as wikis or message boards, or register for free accounts, we may ask for personal information such as your full name, email address and a password.</p>
+		
+		<h3>Chat rooms, forums and newsgroups</h3>
+		
+		<p>These are available to our community. Any information that you disclose in these areas becomes public information and may be recorded, archived and republished by anyone. Please exercise caution when deciding to disclose any personal information in such areas.</p>            
+	
+		<h3>Canonical products</h3>            
+	
+		<p>When you register for services or purchase any product from Canonical, we may ask for information such as your email address, billing address, and credit card information. Credit card information is only used in processing your transaction. Please note that we may use a third party payment processing merchant to process your payments.</p>
+	            
+		<h3>Non-personally identifying information</h3>
+	
+		<p>Canonical may collect non-personally-identifying information of the sort that web browsers and servers typically make available, such as the browser type, referring site, and the date and time of each visitor's request. Our purpose in collecting non-personally identifying information is to better understand how visitors use our websites and services. For further information about how we use cookies, see the "cookie" section below.</p>            
+	
+		<h3>Error reports</h3>            
+	
+		<p>When you chose to send an error report, it includes a unique identifier for your computer. This identifier does not identify you, unless you (or someone acting on your behalf) discloses it separately. An error report may include personal information such as the state of programs that were running at the time. You can block future error reports from the privacy panel of System Settings.</p> 	
+		<h3>Ubuntu online accounts</h3>      
+		      
+		<p>When you use Ubuntu online accounts, your personal information is stored on your PC and it can be accessed by some applications. <a href="/legal/online-accounts">View the legal notice explaining how we use this personal information</a>.</p>        
+
+		<h3>General</h3>
+
+		<p>If you contact us and provide us with information, we may keep a record of that correspondence and information</p> 
+		           
+		<h3>Searching in the dash</h3>            
+		
+		<p>When you enter a search term into the dash Ubuntu will search your Ubuntu computer and will record the search terms locally. Unless you have opted out (see the &ldquo;Online Search&rdquo; section below), we will also send your keystrokes as a search term to productsearch.ubuntu.com and selected third parties so that we may complement your search results with online search results from such third parties including: Facebook, Twitter, BBC and Amazon. Canonical and these selected third parties will collect your search terms and use them to provide you with search results while using Ubuntu.</p>
+            
+		<h3>By searching in the dash you consent to:</h3>
+		<ol>
+			<li>the collection and use of your search terms and IP address in this way; and</li>
+			<li>the storage of your search terms and IP address by Canonical and such selected third parties (if applicable).</li>
+		</ol>            
+            
+		<p>Canonical will only use your search terms and IP address in accordance with this Privacy Policy. For information on how our selected third parties may use your information, please see their privacy policies.</p>
+            
+		<p>You may restrict your dash so that we don&rsquo;t send searches to third parties and you don't receive online search results. To do this go to the Privacy panel and toggle the &lsquo;Include online search results&rsquo; option to off. The Privacy panel can be found in your System Settings or via a dash search. <a href="http://www.ubuntu.com/privacy-policy/third-parties">For a current list of our selected third parties, please see the third party privacy policies</a>.</p>
+
+		<h2 id="what-we-do">What do we do with the information we collect?</h2>
+		<p>We may use your information in the following ways:</p>
+		<ul class="list-ubuntu">
+			<li>To authenticate access to certain features of our websites.</li>
+			<li>To contact you to respond to enquiries or to provide notices to you regarding your use of our websites or the provision of our services.</li>
+			<li>To provide services, products, process payment, and authenticate access (where required).</li>
+			<li>To analyse the performance or the appropriateness of products or services.</li>
+			<li>To comply with legal and regulatory requirements (including responding to court orders, subpoenas and to prevent crime). These special circumstances may require us to disclose personal information.</li>
+			<li>To contact you if your actions violate your agreement with us (if any).</li>
+			<li>To fix errors and analyse trends.</li>
+			<li>To study how anonymous users interact with our websites and services.</li>
+			<li>To market our products or services to you.</li>
+		</ul>
+		<p>Unless you have notified us otherwise, Canonical may occasionally send you email to tell you about new features, solicit feedback, or just to keep you up to date with what's going on. We may use various community websites (Launchpad Answers, Ubuntu Forums, blogs etc.) to communicate this type of information, so we expect to keep this type of information to a minimum. If you no longer wish to receive such communications from us, please follow the unsubscribe instructions provided in any of the communications, modify the communications preferences in your account or contact us using the contact details provided below.</p>
+
+		<h2 id="access">Access</h2>
+		<p>The information you provide to us will be held on computers and may be accessed by or given to our staff working inside and outside of the UK and to third parties, including contractors and companies within Canonical's group, for the purposes set out in this Privacy Policy, i.e. to provide you with products or services, or as otherwise agreed with you.</p>
+		
+		<p>You acknowledge that it may be necessary for your information to be processed by such parties and that it may be transferred to someone who provides a service to us in another country, including some outside of the European Economic Area, and you consent to such processing and transfer. If it is necessary to transfer your personal information outside of the European Economic Area we will make every effort to ensure that the person to whom we pass the personal information agrees to treat it with the same level of protection as we do.</p>
+    
+		<p>If we are sold or merge with another business entity your personal information may be disclosed to our new business partners or owners.</p>
+    
+		<p>Unless required by law, we will not otherwise share, sell or distribute any personal information you provide to us without your consent.</p>
+
+</div>
+
+<div class="eight-col">
+
+		<h2 id="cookies">Cookies</h2>
+		<p>We use persistent cookies to support a smooth user experience. This cookie remains on your computer after you close your browser and may be used by your browser on subsequent visits to our websites. We also use cookies to better understand how you interact with our websites and services and to improve our websites and services overall.</p>
+		
+		<h3>Cookies we use</h3>
+		
+	</div>
+	<div class="twelve-col">
+		<table>
+			<tr>
+				<th>Cookie</th>
+				<th>Name</th>
+				<th>Purpose</th>
+				<th>More information</th>
+			</tr>
+			<tr>
+				<td>site cookie acceptance</td>
+				<td>_cookies_accepted</td>
+				<td>This cookie is used to record if a user has accepted the use of cookies on our website.</td>
+				<td>To withdraw your consent after accepting this cookie, delete the _cookies_accepted cookie. Find out how at <a href="http://www.aboutcookies.org">www.aboutcookies.org</a></td>
+			</tr>
+			<tr>
+				<td>Google Analytics</td>
+				<td>
+					<ul class="no-bullets">
+						<li>_utma</li>
+						<li>_utmb</li>
+						<li>_utmc</li>
+						<li>_utmz</li>
+					</ul>
+				</td>
+				<td>These cookies are used to collect information about how visitors use our website, which we use to help improve it. The cookies collect information in an anonymous form, including the number of visitors to the site, where visitors have come to the site from and the pages they visited.</td>
+				<td>Find out more about Google Analytics privacy please visit <a href="https://www.google.com/analytics/learn/privacy.html">www.google.com/intl/en_uk/analytics/privacyoverview.html</a></td>
+			</tr>
+			<tr>
+				<td>Crazyegg</td>
+				<td>is_returning</td>
+				<td>Crazyegg tracks javascript on some pages of our site to understand what links our visitors are clicking on. This helps us optimize our content for the best user experience. The Crazyegg script may store a cookie on your computer. This cookie may contain a session ID, a visitor ID and a few other dynamically created parameters that allow Crazyegg to track our site&#39;s traffic accurately. No personal information is stored within the cookie.</td>
+				<td>For Crazy Egg&#39;s complete Privacy Policy please visit <a href="http://www.crazyegg.com/privacy">www.crazyegg.com/privacy</a>.</td>
+			</tr>
+			<tr>
+				<td>Marketo Munchkin</td><td>_mkto_trk</td>
+				<td>Marketo&#39;s cookie allows us to track repeated visits to the website, and link each visit to the information voluntarily provided by the visitor. For example, if the visitor is asked to provide us with their name, company name and email address, we will know the identity of the visitor when they visit the site at a later date, or when we send them email.</td><td>For Marketo&#39;s complete Privacy Policy please visit <a href="http://uk.marketo.com/trust/privacy.php">uk.marketo.com/trust/privacy.php</a></td>
+			</tr>
+		</table>
+	</div>
+	<div class="eight-col">
+		<p>If you do not wish to have cookies placed on your computers, please set your browsers to refuse cookies before visiting our websites and using our services.</p>
+	
+		<h2 id="how-do-we-protect">How do we protect the information we collect</h2>
+		
+		<p>Canonical is very concerned about protecting the confidentiality of your personal information. We have security measures, including administrative, physical and electronic measures, to protect against the loss, exposure, misuse or alteration of information that we have collected from you in the use of the services. These measures include SSL data encryption to transmit your personal information as well as technical architectures and systems to prevent unauthorised third parties from accessing your personal information.</p>
+	</div><!-- /.eight-col -->
+</div><!-- /.row -->
+{% endblock 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
new file mode 100755
index 00000000000..5d699200a65
--- /dev/null
+++ b/templates/legal/terms-and-policies/privacy-policy/third-parties.html
@@ -0,0 +1,73 @@
+{% extends "legal/_base_legal.html" %}
+
+{% block title %}Third parties | Privacy policy | Terms and policies{% 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">
+		<h1>Third-party privacy policies</h1>
+		<p class="eight-col">For information on how our selected third parties may use your information, please see their <a href="/privacy-policy">privacy policies</a>.</p>
+</div><!-- /.row -->
+<div class="row no-border">
+	<ul class="inline-icons">
+		<li><a href="http://www.3sat.de/page/?source=/service/140014/index.html">3sat Mediathek</a></li>
+		<li><a href="http://about.7digital.com/terms-and-conditions-use">7Digital</a></li>
+		<li><a href="http://www.abc.net.au/privacy.htm">ABC iView</a></li>
+		<li><a href="http://www.amazon.co.uk/gp/help/customer/display.html/ref=hp_left_cn?ie=UTF8&nodeId=502584">Amazon</a></li>
+		<li><a href="http://stackexchange.com/legal/privacy-policy">Ask Ubuntu</a></li>
+		<li><a href="http://www.bbc.co.uk/privacy/">BBC iPlayer</a></li>
+		<li><a href="http://privacy.microsoft.com/en-gb/bing.mspx">Bing Video</a></li>
+		<li><a href="http://cleardarksky.com/csk/admin.html#Privacy">Clear Sky Chart</a></li>
+		<li><a href="http://www.colourlovers.com/privacy">COLOURlovers</a></li>
+		<li><a href="http://www.dailymotion.com/us/legal/privacy">Dailymotion</a></li>
+		<li><a href="http://about.deviantart.com/policy/privacy/">deviantArt</a></li>
+		<li><a href="http://dribbble.com/site/privacy">Dribbble</a></li>
+		<li><a href="http://pages.ebay.co.uk/help/policies/privacy-policy.html">eBay</a></li>
+		<li><a href="http://www.encuentro.gov.ar/sitios/encuentro/condiciones/index">Encuentro</a></li>
+		<li><a href="http://www.etsy.com/help/article/480?ref=ft_privacy">Etsy</a></li>
+		<li><a href="http://www.europeana.eu/portal/rights/privacy.html">Europeana</a></li>
+		<li><a href="https://www.facebook.com/about/privacy">Facebook</a></li>
+		<li><a href="http://info.yahoo.com/privacy/uk/yahoo/">Flickr</a></li>
+		<li><a href="https://foursquare.com/legal/privacy">Foursquare</a></li>
+		<li><a href="https://help.github.com/articles/github-privacy-policy">GitHub</a></li>
+		<li><a href="http://www.google.com/intl/en/policies/privacy/">Google docs (Google)</a></li>
+		<li><a href="https://www.google.com/intl/en_uk/policies/privacy/">Google News</a></li>
+		<li><a href="http://www.grooveshark.com/privacy">Grooveshark</a></li>
+		<li><a href="http://www.headweb.com/en/100234/integrity-policy">Headweb</a></li>
+		<li><a href="http://www.imdb.com/privacy">IMDb</a></li>
+		<li><a href="http://is.gd/privacy.php">is.gd</a></li>
+		<li><a href="http://www.jstor.org/page/info/about/policies/privacy.jsp">JSTOR</a></li>
+		<li><a href="https://help.launchpad.net/PrivacyPolicy">Launchpad</a></li>
+		<li><a href="http://openclipart.org/policies">Open Clip Art Library</a></li>
+		<li><a href="http://support.google.com/picasa/bin/answer.py?hl=en&answer=53208&topic=1689812&ctx=topic">Picasa (Google)</a></li>
+		<li><a href="http://www.nlm.nih.gov/privacy.html">PubMed</a></li>
+		<li><a href="http://www.recipepuppy.com/privacy">Recipe Puppy</a></li>
+		<li><a href="http://www.reddit.com/wiki/privacypolicy">reddit</a></li>
+		<li><a href="http://www.rtve.es/comunes/politica_privacidad.html">RTVE</a></li>
+		<li><a href="http://forum.sci-fi-london.com/ucp.php?mode=privacy">SCI-FI-LONDON</a></li>
+		<li><a href="http://www.elsevier.com/legal/privacy-policy">ScienceDirect</a></li>
+		<li><a href="http://www.songkick.com/info/privacy">Songkick</a></li>
+		<li><a href="http://www.songsterr.com/a/wa/privacy">Sonsgterr</a></li>
+		<li><a href="https://soundcloud.com/pages/privacy">SoundCloud</a></li>
+		<li><a href="http://stackexchange.com/legal/privacy-policy">Stack Exchange</a></li>
+		<li><a href="http://www.ted.com/pages/talk_usage_policy">TED Talks</a></li>
+		<li><a href="http://www.themoviedb.org/privacy-policy">TMDb</a></li>
+		<li><a href="https://twitter.com/privacy">Twitter</a></li>
+		<li><a href="http://vimeo.com/privacy">Vimeo</a></li>
+		<li><a href="http://vodo.net/terms">VODO</a></li>
+		<li><a href="http://www.wunderground.com/weather/api/d/terms.html#privacy">Weather Underground</a></li>
+		<li><a href="http://wikimediafoundation.org/wiki/Wikimedia:Privacy_policy">Wikipedia</a></li>
+		<li><a href="http://helloreverb.com/privacy/">Wordnik</a></li>
+		<li><a href="http://info.yahoo.com/privacy/uk/yahoo/details.html">Yahoo! Finance</a></li>
+		<li><a href="http://www.yelp.co.uk/static?p=privacy&country=GB">Yelp</a></li>
+		<li><a href="http://www.google.co.uk/intl/en/policies/privacy/">YouTube Education</a></li>
+		<li><a href="http://www.google.co.uk/intl/en/policies/privacy/">YouTube Movies</a></li>
+		<li><a href="http://www.google.co.uk/intl/en/policies/privacy/">YouTube Shows</a></li>
+	</ul>
+	<h3>How to contact us</h3>
+	<p class="eight-col">Please submit any questions or comments about Ubuntu Online Accounts or this legal notice by contacting us at the following address: Canonical Group Ltd, 5<sup>th</sup> Floor, Blue Fin Building, 110 Southwark Street, London, England, <span class="caps">SE1</span> 0SU.</p>
+</div><!-- / .row -->
+{% endblock content %}
\ No newline at end of file
diff --git a/templates/legal/terms-and-policies/terms-of-service.html b/templates/legal/terms-and-policies/terms-of-service.html
new file mode 100644
index 00000000000..b9d15586db0
--- /dev/null
+++ b/templates/legal/terms-and-policies/terms-of-service.html
@@ -0,0 +1,133 @@
+{% extends "legal/_base_legal.html" %}
+
+{% block title %}U1 and Software Centre - Terms of Service{% endblock %}
+
+{% block second_level_nav_items %}
+	{% 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 %}
+<div id="terms" class="row row-hero no-border">
+<div class="eight-col">
+		<h1>U1 and Software Centre &mdash; Terms of Service</h1>
+		
+    <p>This agreement covers the provision of services (the "<b>services</b>") by Canonical Group Limited ("<b>Canonical</b>", "<b>us</b>", "<b>our</b>" or "<b>we</b>") to you as an individual ("<b>you</b>" or "<b>your</b>"). Your use of the services will be governed by this agreement, along with <a href="/legal/terms-and-policies/privacy-policy">Canonical's privacy policy</a>. Please read this agreement carefully before you either subscribe to Ubuntu One or use the Ubuntu software centre. By using our services (including purchasing or downloading content and applications), you agree to become bound by the terms and conditions of this agreement.</p>
+
+    <p>You must be at least 13 years old to use our services. If you are between age 13 and 18, you confirm that you have your parent's or legal guardian's consent to use the services and that they have read and agreed to this agreement.</p>
+
+	<section class="twelve-col">
+	    <h2 id="content-and-applications">Content and applications</h2>
+	
+	    <p>Please note that Canonical and certain third parties may make content and applications available to you at no charge. In some circumstances, you may download and install such content and applications with or without an Ubuntu One account.</p>
+	
+	    <p>Where content or applications are purchased from us, they will be available for you to download through your Ubuntu One account. You may re-download your content or application from Ubuntu One or the Ubuntu software centre until we stop providing Ubuntu One or the Ubuntu software centre or until the content or application is removed from Ubuntu One or the Ubuntu software centre.</p>
+	
+	    <p>Each content or application you download or purchase is subject to the terms and conditions or license set by the content or application provider or developer, which may be presented to you at the time of download or contained in the application.</p>
+	
+	    <p>Third party content and application providers may offer support for their content and applications. Third party content and applications are not supported by Canonical.</p>
+	
+	    <p>These terms do not limit or restrict your rights under any applicable open source software licenses. If the content or applications you download are licensed under an open source license, only that license applies to such content or applications. With respect to content and applications under open source licences, you may be entitled to download a copy of the content or application source code, which you may download from our servers or from the content or application author&rsquo;s servers.</p>
+	</section>
+	
+	<section class="twelve-col">
+	    <h2 id="accounts">Accounts</h2>
+	
+	    <p>If you are asked to set up an account for using our service you may be asked to create a password. You are responsible for choosing an appropriate password and for keeping it secure. Canonical representatives will not ask you for your password and you should not reveal it to anyone.</p>
+	
+	    <p>You may cancel your account at any time through the Ubuntu One website or Ubuntu software centre. Where you have an Ubuntu One account you must cancel your service before it renews in order to avoid billing of the next period's fees to your credit card. You will not be charged at the next renewal date, but Canonical does not provide refunds for any previous billing periods or partial billing periods. We will not charge a fee for cancelling your Ubuntu One account.</p>
+	</section>
+	
+	<section class="twelve-col">
+	    <h2 id="fees-and-payment">Fees and payment</h2>
+	
+	    <p>The Ubuntu One services consist of a free and paid subscriptions. An Ubuntu One subscription is required for all services and a valid credit card is required for paid subscriptions. If you wish to cease the provision of the paid services, you may do so by cancelling your account. If you cancel prior to the effective date of the increase, you will not be charged the higher fees.</p>
+	
+	    <p>If you purchase content or applications from us, payment for content or applications is due at the time you purchase the content or application. You will be asked to enter your credit card number and we will charge your credit card at the time of purchase. Fees are charged in the currency in which you make your purchase.</p>
+	
+	    <p>Payment for services is handled for Canonical by a third party and your credit card statement may identify Ubuntu One paid subscriptions as &ldquo;Canonical&rdquo; or &ldquo;PayPal&rdquo;. All fees and paid accounts are non-refundable. You are responsible for any foreign transaction fees incurred by your bank.</p>
+	</section>
+	
+	<section class="twelve-col">
+	    <h2 id="termination">Termination</h2>
+	
+	    <p>We look forward to providing you with services for so long as you wish to have them. However, there are some circumstances under which the service may be terminated.</p>
+	
+	    <ol>
+	        <li>In the event that we cannot obtain commercially-practical rates or terms from a supplier, we may cease to offer the services. In this event, we will provide one month's notice via email. We may also cease to offer the services for any other reason, in which case we will provide you with three months' notice (via email). In this event, we will not charge you for services after termination, and will refund any fees paid in advance for services that have not been received.</li>
+	
+	        <li>If a free account is inactive (i.e., there has been no synchronisation of data such as files, contacts or notes) for 90 days, we reserve the right to delete any and all files. We will notify you via email in advance of taking this action.</li>
+	
+	        <li>Canonical may remove any information or suspend or terminate your use of the services at any time if Canonical is made aware that you are in breach of any term of this agreement or you are using the services for any activity that may be illegal or in breach of a third party's rights.</li>
+	
+	        <li>Canonical ceases to make Ubuntu One or the Ubuntu software centre available.</li>
+	    </ol>
+	</section>
+	
+	<section class="twelve-col">
+	    <h2 id="acceptable-use-and-conduct">Acceptable use and conduct</h2>
+	
+	    <p>All usage of the services must be legal and not infringe any third party's rights. You must not take any action or use the services in any way that might bring Canonical into disrepute, affect the ability of Canonical to provide the services, be illegal, or encourage illegal activities. You may not use the services in any manner that might be libellous or defamatory (<a href="https://www.eff.org/issues/bloggers/legal/liability/defamation">more info on what that means</a>), that contains threats or incites violence towards individuals or entities, or that violates the privacy or publicity rights of any third party. We may limit the daily bandwidth and number of downloads/uploads for the services at our discretion where reasonably required from time to time. Some services have usage limitations, and you may not exceed these. As part of the services, you may store data on Canonical's servers or those of Canonical's suppliers. You should ensure that this data is not in breach of any applicable law and does not breach any individual's data protection or privacy rights. You shall indemnify Canonical in full for any loss, cost or damages suffered by it as a result of your use or misuse of the services.</p>
+	</section>
+	
+	<section class="twelve-col">
+	    <h2 id="changes-to-services">Changes to the services or this agreement</h2>
+	
+	    <p>We aim to continually improve the delivery and content of the services and, as a result, will make changes to services from time to time. New features will be continually added, but we also may modify or discontinue (temporarily or permanently) a service, in part or in whole. We may also offer services on a trial basis, in which case your use of those services will be limited to the period of your trial and subject to the terms of the trial. In the event of a material change to the services, we will notify you via email in accordance with our Privacy Policy. What constitutes a material change in this circumstance will be determined by Canonical, in good faith and using common sense and reasonable judgment. Similarly, we may occasionally change the terms of this agreement and will notify you of material changes via email. If Canonical does change the terms of this agreement, all changes will go into effect at the time we post the updated agreement.</p>
+	</section>
+	
+	<section class="twelve-col">
+	    <h2 id="additional-terms">Additional terms and payment</h2>
+	
+	    <p>Some services or content may be subject to additional terms or may require payment of additional fees. In that event, you will be given an opportunity to review and agree to such terms and fees before using those services or accessing such content.</p>
+	</section>
+	
+	<section class="twelve-col">
+	    <h2 id="intellectual-property">Intellectual property and software licence</h2>
+	
+	    <p>The client software of Ubuntu One is released for free public use under several open source licenses, primarily the GPLv3 and Creative Commons licences. See the licence text included with the code for details. Canonical grants you a non-exclusive, personal licence to use the server software while you receive the services from Canonical.</p>
+	
+	    <p>You acknowledge that all intellectual property in the server software provided as part of the services belongs to Canonical or its licensors. You will not acquire any rights to the software or the intellectual property from your use of the services, other than as set out in this agreement and in the software licensing of the distributed client code.</p>
+	</section>
+	
+	<section class="twelve-col">
+	    <h2 id="collection-and-use-of-your-data">Collection and use of your data</h2>
+	
+	    <p>We may collect certain non-personally-identifiable information, which is located on your computer. The information collected may include statistics relating to how often data is transferred, and performance metrics in relation to software and configuration. You agree this information may be retained and used by Canonical. Canonical may disclose any or all personal data and contents you have sent, posted or published if required to comply with applicable law or the order or requirement of a court, administrative agency or other governmental body. All other use of your personal data is subject to <a href="/legal/terms-and-policies/privacy-policy">Canonical's privacy policy</a>.</p>
+	</section>
+	
+	<section class="twelve-col">
+	    <h2 id="third-party-content">Third-party content</h2>
+	
+	    <p>You may access third-party content and applications in your use of the services. You will not remove any third party's copyright notices or other identifier, except as allowed by the third-party's licence of that content or application. Canonical is not responsible for any content or applications provided by any third party. Should you reasonably believe that any third-party content you access through the service is in breach of any law, regulation or third party's rights, you should notify Canonical in writing at the address below. In doing so, please:</p>
+	
+			<ol>
+	        <li>Identify the material which you believe to be infringing;</li>
+	
+	        <li>Identify what you believe this material infringes and why;</li>
+	
+	        <li>Provide your name, email address, address and telephone number;</li>
+	        	
+	        <li>Confirm that you believe in good faith that this material is infringing a law or third party's rights and that, to the best of your knowledge, the information you are providing is correct;</li>	
+	        
+	        <li>Identify if you are acting on behalf of the third party whose rights may have been infringed;</li>	
+	        
+	        <li>Provide your physical or electronic signature.</li>	    
+			</ol>
+	</section>
+	
+	<section class="twelve-col">
+	    <h2 id="limitation-of-liability">Limitation of Liability</h2>
+	
+	    <p>Software and services provided under this agreement are provided to you as is and with no warranties whatsoever. All implied warranties are excluded to the extent legally permissible. Canonical will provide the services and software using reasonable skill and care. Under no circumstances will Canonical or its suppliers be liable to you for any consequential or indirect loss of profits or economic advantage. Canonical cannot guarantee the connection speed between you and the service and Canonical cannot be held liable for any direct or indirect damage or loss caused by connection speed. Canonical will use reasonable efforts to ensure availability of the services, but makes no guarantee that the services will be available without interruption. Canonical is not responsible for the loss of any of your data or any loss of business or financial disadvantage to you as a result of any loss of or damage to your data as a consequence of your use of the services. You should ensure that you have suitable backups of all data. These limitations of liability do not apply with respect to any death or personal injury as a consequence of the negligent act of Canonical, its employees, suppliers or licensors.</p>
+	</section>
+	
+	<section>
+	    <h2 id="general">General</h2>
+	
+	    <p>This agreement is governed by the laws of England and any dispute will be heard by the courts in England. Notwithstanding the immediately preceding sentence, if you are a citizen of the United States of America, Canada or Mexico (and not a citizen of the United Kingdom), and you are not accessing the service from the United Kingdom, then this agreement is governed by the laws of the State of New York (USA) and any dispute will be heard by the Federal and State courts located in the State of New York (USA). You may not assign this agreement, and any attempted assignment will be void from the beginning. Failure by Canonical to enforce any right or provision of this agreement shall not constitute a waiver of such right or provision. If any part of this agreement is held invalid or unenforceable, that part will be construed to reflect the parties original intent, and the remaining portions will remain in full force and effect. The terms of this agreement do not affect your statutory rights. Any notices should be sent by registered post to Canonical Group Limited, 5th Floor, Blue Fin Building, 110 Southwark Street, London, SE1 0SU.</p>
+	
+	    <p>Last updated: January 2014</p>
+	</section>
+</div><!-- /.eight-col -->
+</div><!-- /.row -->
+{% endblock content %}
\ No newline at end of file
diff --git a/templates/legal/terms-and-policies/terms.html b/templates/legal/terms-and-policies/terms.html
new file mode 100755
index 00000000000..6796db075aa
--- /dev/null
+++ b/templates/legal/terms-and-policies/terms.html
@@ -0,0 +1,72 @@
+{% extends "legal/_base_legal.html" %}
+
+{% block title %}Terms and conditions | Ubuntu and Canonical Legal{% endblock %}
+
+{% block second_level_nav_items %}
+	{% 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 %}
+<div class="row row-hero no-border">
+	<div class="eight-col">
+		<h1>Terms and conditions</h1>
+		<p class="intro">Valid since 17 April 2014</p>
+		<h2 id="web-terms-intellectual-property">Intellectual property</h2>
+		<p><a href="/legal/terms-and-policies/intellectual-property-policy">Canonical&rsquo;s intellectual property rights policy</a> governs your use of Canonical&rsquo;s intellectual property.</p>
+
+		<h2 id="terms-copyright">Copyright</h2>
+		<p>The website HTML, text, images audio, video, software or other content that is made available on this website or otherwise hosted by Canonical are the property of someone - the author in the case of content produced elsewhere and reproduced here with permission, or Canonical or its content suppliers. Before you use this content in some way please take care to ensure that you have the relevant rights and permissions from the copyright holder.</p>
+
+		<p>You are welcome to display on your computer, download and print pages from this website for personal, education and non-commercial use only. You must retain copyright, trademark and other notices unaltered on any copies or printouts you make. Certain materials available on this site are "open source" materials subject to the GNU General Public Licence ("GPL") or other open-source licence and are so marked. Use of those materials is governed by the individual applicable licence.</p>
+
+		<h2 id="terms-use-of-software">Use of Ubuntu software</h2>
+		<p>Your use of any software obtained from this site is subject to the terms of any licence or agreement provided with the software. Some of these agreements incorporate the terms of the GPL or other open source licences. Please read these licences and agreements before installing and using the software; by installing and using the software, you will have accepted the terms of the licences and agreements.</p>
+
+		<h2 id="terms-trademarks">Trademarks</h2>
+		<p>Any trademarks, logos and service marks displayed on this website are the property of their owners, whether Canonical or third parties. For example, Linux is a registered trademark of Linus Torvalds. Debian is a trademark of Software in the Public Interest, Inc. Windows is a trademark of Microsoft Corporation.</p>
+
+		<p>Canonical owns a number of trademarks, including UBUNTU, KUBUNTU, EDUBUNTU, and XUBUNTU, and use of these is subject to compliance with <a href="/legal/terms-and-policies/intellectual-property-policy">Canonical&rsquo;s intellectual property rights&rsquo; policy</a>.</p>
+
+		<h2 id="terms-privacy-policy">Privacy policy</h2>
+		<p>Our collection and use of your personal information is governed by the <a href="/legal/terms-and-policies/privacy-policy">Canonical website privacy policy</a>.</p>
+
+		<h2 id="web-terms-third-party-content">Links and third-party content</h2>
+		<p>This and any other websites hosted by Canonical may contain links to other websites and resources and third party content, for example, message board posts or blog comments. Canonical is not responsible for such content, or that of any linked websites. You will not remove or alter any third party&rsquo;s copyright or trademark notices or other identifier, except as allowed by the third-party&rsquo;s licence of that content. Should you reasonably believe that any third-party content you access through our websites is in breach of any law, regulation or third party&rsquo;s rights, you should notify Canonical in writing at the address below. In doing so, please:</p>
+
+		<ul class="list-ubuntu">
+			<li>identify the material which you believe to be infringing;</li>
+			<li>identify what you believe this material infringes and why;</li>
+			<li>provide your name, email address, address and telephone number;</li>
+			<li>confirm that you believe in good faith that this material is infringing a law or third party&rsquo;s rights and that, to the best of your knowledge, the information you are providing is correct;</li>
+			<li>identify if you are acting on behalf of the third party whose rights may have been infringed;</li>
+			<li>provide your physical or electronic signature.</li>
+		</ul>
+
+		<h2 id="terms-package-and-licence">Package and licence list	</h2>
+		<p><a href="{{ STATIC_URL }}files/section/legal/12.04.1_Main_FoundLiceneses_20Aug2012.pdf">Canonical Ltd ("We") have prepared this package and licence list [PDF]</a> for your convenience. We have relied on package meta data, license files, and community contributions in creating this list, and we make this list available on an as-is basis. The list is updated periodically, so it does not reflect the constant and rapid update of the packages. We make no representation or warranty as to the accuracy or completeness of this list or the information it represents, and we expressly disclaim any implied warranties to the fullest extent permissible at law. We accept no liability for any damage or loss arising form your use or reliance on the list. All use of the list is subject to these terms.</p>
+
+		<h2 id="terms-disclaimer">Disclaimer</h2>
+		<p>This and any other websites hosted by Canonical and all information, products and services on them are provided on an "as is" basis, without warranty of any kind, either express or implied. Your use of this and any other websites hosted by Canonical is at your own risk. Canonical disclaims all warranties, express or implied, including without limitation, warranties of merchantability and fitness for a particular purpose.</p>
+
+		<p>Canonical disclaims liability for any direct, indirect, incidental, special, consequential, exemplary, punitive or other damages, or lost profits, that may result directly or indirectly from the use of this and any other websites hosted by Canonical and any material that is downloaded or obtained through them.</p>
+
+		<p>This includes, without limitation, any damage to computer systems, hardware or software, loss of data, or any other performance failures, any errors, bugs, viruses or other defects that result from, or are associated with the use of this and any other websites hosted by Canonical.</p>
+
+		<p>Yes, it gives most of us a headache to read all of this, but it&rsquo;s important so thank you for your patience and now, enjoy the site!</p>
+
+	</div><!-- /.eight-col -->
+
+	<div class="four-col box last-col">
+		<h3>Registered office</h3>
+		<p>	5th Floor<br />
+			Blue Fin Building<br />
+			110 Southwark Street<br />
+			London SE1 0SU<br />
+			United Kingdom</p>
+	</div>
+	<div class="four-col box last-col">
+		<h3>Contact us</h3>
+		<p>Please note Canonical will not provide legal advice. For other queries, please contact us via <a href="mailto:legal@canonical.com">legal@canonical.com</a></p>
+	</div>
+</div>
+{% endblock content %}
\ No newline at end of file
diff --git a/templates/legal/terms-and-policies/thank-you.html b/templates/legal/terms-and-policies/thank-you.html
new file mode 100755
index 00000000000..8eb9092f81f
--- /dev/null
+++ b/templates/legal/terms-and-policies/thank-you.html
@@ -0,0 +1,24 @@
+{% extends "legal/_base_legal.html" %}
+
+{% block title %}Thank you | Intellectual property policy | Terms and policies{% endblock %}
+
+{% block second_level_nav_items %}
+	{% 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 %}
+<div class="row row-hero no-border">
+	<h1>Thank you</h1>
+	<div class="eight-col">
+		<p>Thank you for contacting us. Every email we receive is read and handled by a person from the Canonical Team. We promise to get back to you as soon as possible with a useful response, so please bear with us as this may take an extra day or two.</p>
+		<ul class="list-ubuntu">
+			<li><a href="/legal/terms-and-policies/intellectual-property-policy">Intellectual property policy&nbsp;&rsaquo;</a></li>
+			<li><a href="http://www.canonical.com" class="external">Canonical home page</a></li>
+			<li><a href="/">Ubuntu home page&nbsp;&rsaquo;</a></li>
+		</ul>
+	</div><!-- /.eight-col -->
+	<div class="four-col last-col text-center">
+		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-thankyou-orange.svg" width="200" alt="Smile">
+	</div><!-- /.four-col -->
+</div>
+{% endblock content %}
diff --git a/templates/legal/ubuntu-advantage/assurance.html b/templates/legal/ubuntu-advantage/assurance.html
new file mode 100755
index 00000000000..4e2e67a6158
--- /dev/null
+++ b/templates/legal/ubuntu-advantage/assurance.html
@@ -0,0 +1,38 @@
+{% extends "legal/_base_legal.html" %}
+
+{% block title %}Ubuntu Assurance | Ubuntu Advantage{% endblock %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" subsection_title="Ubuntu Advantage" page_title="Ubuntu Assurance" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+<div class="row row-hero no-border">
+	<div class="eight-col">
+		<h1>Ubuntu Assurance</h1>
+		<p class="intro">Valid since 25 March 2013</p>
+		<h2>Protecting your business from IP infringement</h2>
+		<p>The Ubuntu Assurance Programme covers all our support customers against claims of intellectual property infringements &mdash; and it&rsquo;s included in all our support contracts. It means that, in the unlikely event of an issue arising in Ubuntu, we&rsquo;ll rectify the situation immediately, either modifying the offending component or obtaining the rights for you to keep using it.</p>
+	
+		<h2 id="our-assurances">Our assurances</h2>
+		<p>Should an intellectual property issue arise in Ubuntu, we will replace or modify the infringing portion of the software so that it becomes non-infringing, or obtain the rights for you to to continue using the software.</p>
+		
+		<h2 id="indemnification">Indemnification</h2>
+		<p>As long as you have a valid agreement in place with us, we promise to assume the legal defence, pay the costs and pay any damages for any claim relating to infringement of patents, copyrights, trademarks, or trade secrets due to your use of Ubuntu.</p>
+		<p>Aggregate defence costs and indemnity payments made to or on behalf of customers spending greater than 15,000 USD shall be the lesser of $2.0 million or 200% of the customer's aggregate spending with Canonical in the 12 months preceding the date a claim is first brought against such customer. For customers spending below 15,000 USD the aggregate defense costs and indemnity payments will be capped at 100% of the customer's aggregate spending with Canonical in the 12 months preceding the date a claim is first brought against such customer.</p>
+		<p>If Canonical believes, or it is determined through adjudication, that any part of the software as distributed to a support customer by Canonical violates a third party&rsquo;s intellectual property rights, Canonical will provide such customer with a functionally equivalent non-infringing substitute at no cost, or refund 100% of payments made to Canonical for services and support in the preceding 12 months.</p>
+		<p>Qualification for the Assurance Programme is conditioned on the customer meeting the following eligibility requirements.</p>
+		
+		<h2>Eligibility requirements</h2>        
+		<p>The customer must be a current Canonical support customer with an account in good standing at the time of the claim of infringement.</p>
+        
+		<p>The customer must maintain at least the same level of Canonical services and support as that customer had in place at the time a claim is brought, while that claim is pending. The customer must notify Canonical in writing within five days of receiving notice of a claim, must allow Canonical to assume sole control of the defence and any settlement negotiations, and must provide Canonical all the information, authority, and ongoing assistance it needs to effectively defend or settle the claim.</p>
+        
+		<p>The customer must not already be in litigation with, or have received notice of alleged infringement from, a party against whom indemnification is sought when purchasing a support agreement from Canonical. Indemnification will not cover counter-claims brought against a customer in response to litigation initiated by the customer. Indemnification will not cover punitive damages for willful or intentional acts of the customer.</p>
+        
+		<p>The customer may not modify the software provided by Canonical.</p>
+	        
+		<p>If at any time Canonical offers to provide the customer with an updated version of the software modified to reduce or eliminate the likelihood of infringement of third-party rights (a &ldquo;non-infringing substitute&rdquo;), the customer must implement the new version, and cease all use of previous version(s), within thirty days of receiving notice from Canonical of the new version&rsquo;s availability.</p>			
+	</div>	
+</div>
+{% endblock content %}
\ No newline at end of file
diff --git a/templates/legal/ubuntu-advantage/base_ubuntu_advantage.html b/templates/legal/ubuntu-advantage/base_ubuntu_advantage.html
new file mode 100755
index 00000000000..e23f568bbef
--- /dev/null
+++ b/templates/legal/ubuntu-advantage/base_ubuntu_advantage.html
@@ -0,0 +1,6 @@
+{% extends "templates/base.html" %}
+
+{% block outer_content %}
+    {% block content %}{% endblock %}
+		{% include "templates/_contextual_footer.html" %}
+{% endblock %}
diff --git a/templates/legal/ubuntu-advantage/index.html b/templates/legal/ubuntu-advantage/index.html
new file mode 100755
index 00000000000..7cba8ceb9e5
--- /dev/null
+++ b/templates/legal/ubuntu-advantage/index.html
@@ -0,0 +1,35 @@
+{% extends "legal/_base_legal.html" %}
+
+{% block title %}Ubuntu Advantage{% endblock %}
+
+{% block second_level_nav_items %}
+	{% include "templates/_nav_breadcrumb.html" with section_title="Legal" page_title="Ubuntu Advantage" tertiary="true" %}
+{% endblock second_level_nav_items %}
+
+{% block content %}
+
+<div class="row row-hero no-border">
+	<div class="eight-col">
+		<h1>Ubuntu Advantage</h1>
+		<p><a href="/management/ubuntu-advantage">Ubuntu Advantage</a> is Canonical&rsquo;s service package for Ubuntu. It offers tiered levels of support for desktop, server and cloud deployments. In this section, you can see our service description, but don&rsquo;t forget that there will still be some details in your customer agreement that are specific to your deployment.</p>
+		<p>If you&rsquo;re interested in support for an Ubuntu deployment or you&rsquo;re a reseller and you want to offer it to your customers, you can <a href="http://ubuntu.com/management/ubuntu-advantage">learn more about Ubuntu Advantage here</a>.</p>
+	</div>
+	<div class="four-col last-col text-center">
+		<img src="{{ STATIC_URL }}img/legal/image-document-ubuntuassurance.svg" alt="Ubuntu Advantage" class="priority-0" />
+	</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>
+
+	<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>
+{% 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
new file mode 100755
index 00000000000..7be443ec551
--- /dev/null
+++ b/templates/legal/ubuntu-advantage/service-description.html
@@ -0,0 +1,2068 @@
+{% extends "legal/_base_legal.html" %}
+
+{% block title %}Ubuntu Advantage service description{% 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 row-hero no-border" id="service-description">
+	<div class="eight-col">
+		<h1>Ubuntu Advantage service&nbsp;description</h1>
+		<p class="intro">Valid since 6 June 2014</p>
+		<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>
+	</div>
+
+	<div class="box four-col last-col">
+		<h3>Additional information</h3>
+		<ul class="list">
+			<li><a href="#appendix-1">Appendix 1 - Server support scope details&nbsp;&rsaquo;</a></li>
+			<li><a href="#appendix-2">Appendix 2 - Cloud Availability Zone support scope details&nbsp;&rsaquo;</a></li>
+			<li><a href="#appendix-3">Appendix 3 - Desktop support scope details&nbsp;&rsaquo;</a></li>
+			<li class="last-item"><a href="{{ STATIC_URL }}files/section/legal/20140606-UbuntuAdvantageSD.pdf">Download the UA service description [PDF]&nbsp;&rsaquo;</a></li>
+		</ul>
+	</div>
+
+	<table class="twelve-col">
+		<caption>Table of number of technical contacts</caption>
+		<thead>
+			<tr>
+				<th>Ubuntu Advantage Subscription levels</th>
+				<th>Technical contacts</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<th scope="row">Essential</th>
+				<td>1</td>
+			</tr>
+			<tr>
+				<th scope="row">Standard</th>
+				<td>2</td>
+			</tr>
+			<tr>
+				<th scope="row">Advanced</th>
+				<td>3</td>
+			</tr>
+		</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>
+
+		<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>
+
+		<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>
+
+		<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>
+
+		<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>
+
+		<p>5.3: Canonical will support the installation, applications and system administration of Ubuntu as described in the appendices to this service description.</p>
+
+		<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>
+
+		<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>
+
+		<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>
+
+		<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>
+
+		<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>
+
+		<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>
+
+		<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>
+
+		<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>
+
+		<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>
+
+		<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>
+	</div>
+
+	<table class="twelve-col">
+		<caption>Server and Cloud Availability Zone response levels table</caption>
+		<thead>
+			<tr>
+				<th>Severity Level</th>
+				<th>Effort Period</th>
+				<th>Response method</th>
+				<th>Essential Response Time</th>
+				<th>Standard Response Time</th>
+				<th>Advanced Response Time</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<th scope="row">Level 1</th>
+				<td>Continuous effort</td>
+				<td>Phone</td>
+				<td>4 business hours</td>
+				<td>2 business hours</td>
+				<td>1 hour</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Level 2</th>
+				<td>Local business hours</td>
+				<td>Phone</td>
+				<td>1 business day</td>
+				<td>4 business hours</td>
+				<td>4 hours</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Level 3</th>
+				<td>Local business hours</td>
+				<td>Online or phone</td>
+				<td>2 business days</td>
+				<td>1 business day</td>
+				<td>4 hours</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Level 4</th>
+				<td>Local business hours</td>
+				<td>Online or phone</td>
+				<td>4 business days</td>
+				<td>2 business days</td>
+				<td>1 business day</td>
+			</tr>
+		</tbody>
+	</table>
+
+	<table class="twelve-col">
+		<caption>Desktop response levels table</caption>
+			<thead>
+				<tr>
+					<th>Severity Level</th>
+					<th>Effort Period
+					<th>Response method</th>
+					<th>Standard Response Time</th>
+					<th>Advanced Response Time</th>
+			</thead>
+			<tbody>
+				<tr>
+					<th scope="row">Level 1</th>
+					<td>Continuous effort</td>
+					<td>Phone</td>
+					<td>2 business days</td>
+					<td>4 business hours</td>
+				</tr>
+
+				<tr>
+					<th scope="row">Level 2</th>
+					<td>Local business hours</td>
+					<td>Phone</td>
+					<td>2 business days</td>
+					<td>1 business day</td>
+				</tr>
+
+				<tr>
+					<th scope="row">Level 3</th>
+					<td>Local business hours</td>
+					<td>Online or phone</td>
+					<td>2 business days</td>
+					<td>2 business days</td>
+				</tr>
+			</tbody>
+	</table>
+
+	<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>
+	</div>
+
+	<table class="twelve-col">
+		<caption>Response definitions table</caption>
+		<thead>
+			<tr>
+				<th>Severity</th>
+				<th>Definition</th>
+				<th>Responsibilities</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<th scope="row">Level 1</th>
+				<td>Core functionality not available.</td>
+				<td>Canonical will use continuous effort, through appropriate support engineer(s) and/or development engineer(s), to produce a workaround.As soon as core functionality is available, the severity level will be lowered to level 3.</td>
+			</tr>
+			<tr>
+				<th scope="row">Level 2</th>
+				<td>Core functionality severely degraded.</td>
+				<td>Canonical will use reasonable efforts during coverage hours to produce a work-around.The support engineer will aim to produce a work-around that is sufficient to adjust the priority level to level 3.</td>
+			</tr>
+			<tr>
+				<th scope="row">Level 3</th>
+				<td>Standard support request.</td>
+				<td>Canonical will use reasonable efforts during the coverage hours to provide the customer with a work-around as soon as possible balanced against higher severity level cases.After providing a work-around, Canonical's support engineers will work on developing a permanent resolution to the case.</td>
+			</tr>
+			<tr>
+				<th scope="row">Level 4</th>
+				<td>Non-urgent issues, including cosmetic issues, feature requests or information requests.</td>
+				<td>Canonical will review cosmetic issues and feature requests to determine whether it is a product enhancement for a future release.Canonical will review and respond to information requests with a reasonable level of effort during coverage hours.</td>
+		</tbody>
+	</table>
+	<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>
+	</div>
+	<table class="twelve-col">
+		<caption>Hours of coverage table</caption>
+		<thead>
+			<tr>
+				<th>Ubuntu Advantage Subscription</th>
+				<th>Hours</th>
+				<th>Days of coverage</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<th scope="row">Standard Desktop</th>
+				<td>Customer's selection - see next table</td>
+				<td>Monday - Friday</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Advanced Desktop</th>
+				<td>Customer's selection - see next table</td>
+				<td>Monday - Friday</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Essential Server</th>
+				<td>Customer's selection - see next table</td>
+				<td>Monday - Friday</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Standard Server</th>
+				<td>Customer's selection - see next table</td>
+				<td>Monday - Friday</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Advanced Server</th>
+				<td>24 hours a day</td>
+				<td>Monday - Sunday</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Cloud Availability Zone</th>
+				<td>24 hours a day</td>
+				<td>Monday - Sunday</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Landscape Dedicated Server</th>
+				<td>24 hours a day</td>
+				<td>Monday - Sunday</td>
+			</tr>
+		</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>
+	</div>
+	<table class="twelve-col">
+		<caption>Local business hours table</caption>
+		<thead>
+			<tr>
+				<th>&nbsp;</th>
+				<th>North America</th>
+				<th>UK &amp; Central Europe</th>
+				<th>Eastern Europe, Middle East</th>
+				<th>Asia Pacific</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<th scope="row">Local Hours</th>
+				<td>09:00-21:00 EST</td>
+				<td>08:00-17:00 GMT 09:00-18:00 CET</td>
+				<td>10:00-17:00 MSK 09:00-17:00 EET</td>
+				<td>09:00-18:00 CST</td>
+			</tr>
+			<tr>
+				<th scope="row">UTC Equivalent</th>
+				<td>12:00 - 05:00</td>
+				<td>08:00 - 17:00</td>
+				<td>06:00 - 15:00</td>
+				<td>01:00 - 10:00</td>
+			</tr>
+		</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>
+
+		<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>
+	</div>
+	<table class="twelve-col">
+		<caption>Escalation contact table</caption>
+		<thead>
+			<tr>
+				<th>Escalation level</th>
+				<th>Contact</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<th scope="row">Level 3</th>
+				<td>Support and Services Team +1 514 940 8895</td>
+			</tr>
+			<tr>
+				<th scope="row">Level 2</th>
+				<td>Support manager support-manager@canonical.com +1 514 940 8910</td>
+			</tr>
+			<tr>
+				<th scope="row">Level 1</th>
+				<td>Operations director operations-director@canonical.com</td>
+			</tr>
+		</tbody>
+	</table>
+	<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>
+
+		<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>
+
+		<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>
+
+		<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>
+
+		<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>
+
+
+		<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>
+
+		<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>
+
+		<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>
+			<li>Landscape management agents</li>
+			<li>Up to 64 TB of Ubuntu Advantage Ceph Advanced</li>
+		</ul>
+	</div>
+
+	<table class="twelve-col">
+		<caption>Table of Cloud Availability Zone node number</caption>
+		<thead>
+			<tr>
+				<th>Cloud Availability Zone size</th>
+				<th>Number of nodes</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<th scope="row">Proof of Concept / PoC</th>
+				<td>Up to 20</td>
+			</tr>
+			<tr>
+				<th scope="row">Small</th>
+				<td>Up to 100</td>
+			</tr>
+			<tr>
+				<th scope="row">Medium</th>
+				<td>Up to 500</td>
+			</tr>
+			<tr>
+				<th scope="row">Large</th>
+				<td>More than 500</td>
+			</tr>
+		</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>
+
+		<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>
+
+		<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>
+
+		<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>
+
+		<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>
+
+		<h2 id="service-description-additional-services">16. Additional services</h2>
+
+		<h3 id="service-description-technical-account-manager">16.1 Technical Account Manager</h3>
+
+		<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>
+
+		<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>
+
+		<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>
+
+		<p>16.1.4: The TAM will visit the customer annually for on-site technical reviews.</p>
+
+
+		<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>
+
+	</div>
+	<table class="twelve-col">
+		<caption>TAM response levels table</caption>
+		<thead>
+			<tr>
+				<th>Severity Level</th>
+				<th>Effort Period</th>
+				<th>Response Method</th>
+				<th>Response Time</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<th scope="row">Level 1</th>
+				<td>Business day</td>
+				<td>Phone</td>
+				<td>1 hour</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Level 2</th>
+				<td>Business day</td>
+				<td>Phone</td>
+				<td>4 hours</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Level 3</th>
+				<td>Business day</td>
+				<td>Online or phone</td>
+				<td>4 hours</td>
+			</tr>
+		</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>
+
+		<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>
+
+		<p>16.2.2: The DSE will be available to the customer full time during local business hours.</p>
+
+		<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>
+
+		<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>
+
+		<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>
+
+		<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>
+
+		<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>
+
+		<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>
+
+		<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>
+
+		<p>16.5.5: Canonical will use commercially reasonable efforts to maintain the continuous availability of the test environment infrastructure.</p>
+
+		<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>
+
+
+		<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>
+
+		<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>
+
+		<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>
+
+		<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>
+
+	</div><!-- /.eight-col -->
+</div>
+
+<div class="row no-border" id="appendix-1">
+	<div class="eight-col">
+		<h2>Appendix 1 - Server support scope details</h2>
+		<h3>Installation</h3>
+		<p>This covers all the aspects involved with installing and configuring Ubuntu Server, as well as the hosted Landscape service.</p>
+	</div><!-- /.eight-col -->
+
+	<table class="twelve-col">
+		<thead>
+			<tr>
+				<th>Server installation scope</th>
+				<th>Description</th>
+				<th>Essential</th>
+				<th>Standard</th>
+				<th>Advanced</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<th scope="row">CD installation</th>
+				<td>
+					<ul>
+						<li>Install Ubuntu from a CDROM or USB drive</li>
+					</ul>
+				</td>
+				<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Disk/Volume Management</th>
+				<td>
+					<ul>
+						<li>Set-up RAID and LVM during installation</li>
+						<li>Assistance recovering</li>
+						<li>Debug and troubleshooting RAID issues</li>
+					</ul>
+				</td>
+				<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Hardware set-up</th>
+				<td>
+					<ul>
+						<li>Assessing hardware compatibility with Ubuntu</li>
+						<li>Choosing the 32 or 64 bit versions of Ubuntu</li>
+						<li>Configuring Ubuntu to use appropriate hardware</li>
+						<li>Optimising Ubuntu with certified or compatible hardware</li>
+						<li>Configuration of compatible peripherals</li>
+						</ul></td>
+				<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Landscape installation</th>
+				<td>
+					<ul>
+						<li>Installing Landscape service and set-up</li>
+						<li>Assistance registering systems on the Landscape service</li>
+						<li>Troubleshooting Landscape client or service problems</li>
+					</ul>
+				</td>
+				<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Networking</th>
+				<td>
+					<ul>
+						<li>Setting up wireless or wired network</li>
+						<li>Configuring dynamic or static network configuration</li>
+						<li>Setting up proxy settings in applications</li>
+						<li>Setting up interface aliases</li>
+					</ul>
+				</td>
+				<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Package and task selection</th>
+				<td>
+					<ul>
+						<li>Recommendation on the specific packages to install for a particular use</li>
+						<li>Recommendation on the specific task selection</li>
+					</ul>
+				</td>
+				<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Network and automated</th>
+				<td>
+					<ul>
+						<li>Install Ubuntu using a local NFS server</li>
+						<li>Install Ubuntu using a local FTP server</li>
+					</ul>
+				</td>
+				<td>No</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Windows Integration</th>
+				<td>
+					<ul>
+						<li>Support integration with Microsoft file/print and authentication environments such as Active Directory and Windows NT</li>
+					</ul>
+				</td>
+				<td>No</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+		</tbody>
+	</table>
+
+	<div class="eight-col">
+		<h3>Applications</h3>
+		<p>This covers the various server configurations and included programs that are supported.</p>
+	</div>
+
+	<table class="twelve-col">
+		<thead>
+			<tr>
+				<th>Server applications scope</th>
+				<th>Description</th>
+				<th>Essential</th>
+				<th>Standard</th>
+				<th>Advanced</th>
+			</tr>
+		</thead>
+
+		<tbody>
+			<tr>
+				<th scope="row">Certified applications</th>
+				<td>
+					<ul>
+						<li>Installation applications distributed through the Partner repository</li>
+						<li>Debugging issues that are caused by Ubuntu</li>
+					</ul>
+					<p class="note">Note: The customer must have a valid support contract with the certified application&#39;s vendor for complex debugging</p>
+				</td>
+				<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">FTP server</th>
+				<td>
+					<ul>
+						<li>Installing and configuring FTP server</li>
+						<li>Enabling anonymous access and group permissions</li>
+						<li>Configuring security for the service</li>
+						<li>Optimising the server for performance</li>
+						<li>Debugging and resolving issues that arise</li>
+					</ul>
+				</td>
+				<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">File sharing</th>
+				<td>
+					<ul>
+						<li>Installing file sharing for Windows machines (Samba) or Linux machines (NFS)</li>
+						<li>Help configuring the file sharing service for users and groups</li>
+						<li>Setting up Ubuntu Server to authorise from a Windows Network</li>
+						<li>Assistance setting up entitled desktops to access the file sharing server</li>
+						<li>Troubleshooting and resolving file sharing issues</li>
+					</ul>
+				</td>
+				<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">LAMP</th>
+				<td>
+					<ul>
+						<li>Basic LAMP application support: Linux, Apache, MySQL PHP/Perl/Python</li>
+					</ul>
+				</td>
+				<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Mail server</th>
+				<td>
+					<ul>
+						<li>Installation and configuration of mail server</li>
+						<li>Assistance with anti-spam and anti-virus configuration</li>
+						<li>Setting up client security with SSL/TLS</li>
+						<li>Troubleshooting and resolving mail server issues</li>
+					</ul>
+				</td>
+				<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Network services</th>
+				<td>
+					<ul>
+						<li>Installation and configuration of the DHCP, DNS, and NTP to provide network services</li>
+						<li>Advanced set-up of DHCP options such as fixed IP addresses</li>
+						<li>Advanced set-ups using bonding, network file system</li>
+						<li>Advice on integration with internal name services</li>
+						<li>Troubleshooting issues with the servers</li>
+					</ul>
+				</td>
+				<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Web server</th>
+				<td>
+					<ul>
+						<li>Assistance configuring Apache for site requirements</li>
+						<li>Installation of modules to support dynamic sites such as Perl and PHP</li>
+						<li>Assistance with logging and tuning Apache performance</li>
+						<li>Debugging and resolving issues with the Web Server</li>
+					</ul>
+				</td>
+				<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">X Terminal server</th>
+				<td>
+					<ul>
+						<li>Configuration of the server to perform terminal services</li>
+						<li>Configuration of local client machines to use remote X server</li>
+						<li>Configuration of local client machines to provide sound</li>
+						<li>Configuring appropriate security for the environment</li>
+					</ul>
+				</td>
+				<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Advanced Networking</th>
+				<td>
+					<ul>
+						<li>Configure VPN servers using Ubuntu</li>
+						<li>Assistance with using network bonding for load-balancing or fail-over protection</li>
+						<li>Run routing protocols on Ubuntu</li>
+					</ul>
+				</td>
+				<td>No</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Database</th>
+				<td>
+					<ul>
+						<li>Installing Postgres database server</li>
+						<li>Setting-up databases and basic optimising the servers performance</li>
+						<li>Assistance securing the database server with access security</li>
+						<li>Assistance setting up backup and restore procedures for Databases</li>
+						<li>Debugging and solving problems with the database server</li>
+					</ul>
+				</td>
+				<td>No</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Enterprise Java</th>
+				<td>
+					<ul>
+						<li>Installing and configuring Tomcat and Tomcat applications</li>
+					</ul>
+				</td>
+				<td>No</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Virtualisation</th>
+				<td>
+					<ul>
+						<li>Installing KVM virtualisation and configuring host system</li>
+						<li>Installing and setting up supported guest operating systems</li>
+						<li>Assistance with advanced configuration such as networking</li>
+						<li>Troubleshooting and resolving virtualisation issues</li>
+					</ul>
+				</td>
+				<td>No</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Directory serving and Authentication using OpenLDAP and Kerberos</th>
+				<td>
+					<ul>
+						<li>Installation of OpenLDAP directory server</li>
+						<li>Installation and use of OpenLDAP with Kerberos (optionally) to create a user management solution</li>
+						<li>Assistance integrating the Directory with other services</li>
+						<li>Debugging and solving problems with the service</li>
+						<li>Configuration of the Kerberos server to provide SSO</li>
+						<li>Assistance setting up policies and services to use Kerberos</li>
+						<li>Advice on setting up a reliable and distributed Kerberos system</li>
+						<li>Troubleshooting and resolving issues with Kerberos</li>
+					</ul>
+				</td>
+				<td>No</td>
+				<td>No</td>
+				<td>Yes</td>
+			</tr>
+		</tbody>
+	</table>
+
+	<div class="eight-col">
+		<h3>System administration</h3>
+		<p>System administration covers the general configuration, management and maintenance activities. The major categories of support covered are set out below:</p>
+	</div>
+
+	<table class="twelve-col">
+		<thead>
+			<tr>
+				<th>Server system administration scope</th>
+				<th>Description</th>
+				<th>Essential</th>
+				<th>Standard</th>
+				<th>Advanced</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<th scope="row">Basic Backup</th>
+				<td>
+					<ul>
+						<li>Installation of an appropriate backup application</li>
+						<li>Assistance configuring and deploying backup system</li>
+						<li>Help restoring from back-ups previously taken</li>
+						<li>Troubleshooting and resolving backup or restore problems</li>
+					</ul>
+				</td>
+				<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Cryptography</th>
+				<td>
+					<ul>
+						<li>Assistance with the use of open source software (gnutls, gnupg) for a complete suite of cryptographic and certificate services tools; cryptography, secure communications and digital certificates.</li>
+					</ul>
+				</td>	<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Firewall</th>
+				<td>
+					<ul>
+						<li>Installing the appropriate fire-walling application and kernel support</li>
+						<li>Assistance configuring the firewall to protect and alert against intrusion</li>
+						<li>Configuring the firewall to provide masquerading for a private server service</li>
+					</ul>
+				</td>
+				<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Hardware management</th>
+				<td>
+					<ul>
+						<li>Configuration of Certified and Compatible systems, devices and peripherals</li>
+						<li>Removing configured hardware and reconfiguring Ubuntu</li>
+						<li>Optimising Ubuntu performance with specific hardware</li>
+						<li>Debugging and resolving hardware issues</li>
+					</ul>
+				</td>
+				<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Kernel support</th>
+				<td>
+					<ul>
+						<li>Advice on installing the right Ubuntu kernel</li>
+						<li>Kernel module installation, configuration and optimisation</li>
+						<li>Kernel debugging and issue resolution</li>
+					</ul>
+				</td>
+				<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Landscape</th>
+				<td>
+					<ul>
+						<li>Guidance on using the Landscape service for systems administration</li>
+						<li>Help using the Landscape service to manage security and bug-fix updates</li>
+						<li>Installing and configuring automated updates</li>
+					</ul>
+				</td>
+				<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Network printing</th>
+				<td>
+					<ul>
+						<li>Making a local printer available on the network</li>
+						<li>Configuring networking printing options</li>
+						<li>Configuring entitled systems to print using the network printer</li>
+						<li>Optimising network printing and resolving issues</li>
+					</ul>
+				</td>
+				<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Server networking</th>
+				<td>
+					<ul>
+						<li>Network card detection and installation</li>
+						<li>Driver and security configuration for wireless networks</li>
+						<li>Configuring dynamic and static network settings</li>
+						<li>Advanced configuration such as IP routing and aliasing</li>
+						<li>Setting up the server to act as an Internet gateway</li>
+					</ul>
+				</td>
+				<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">System updates &amp; upgrades</th>
+				<td>
+					<ul>
+						<li>Assistance installing security or critical fix updates</li>
+						<li>Help planning and undertaking upgrades between Ubuntu releases</li>
+						<li>Troubleshooting and resolving update problems</li>
+					</ul>
+				</td>
+				<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Using package tools</th>
+				<td>
+					<ul>
+						<li>Assistance using Ubuntu packaging tools</li>
+					</ul>
+				</td>
+				<td>Yes</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Logging and monitoring</th>
+				<td>
+					<ul>
+						<li>Setting up system logging and monitoring tools: Nagios and Munin</li>
+						<li>Advanced logging configuration such as remote logging and specialised alerting</li>
+						<li>Managing system logging and monitoring with appropriate tools</li>
+					</ul>
+				</td>
+				<td>No</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Network Backup</th>
+				<td>
+					<ul>
+						<li>Installation and configuration of Bacula Server(s)</li>
+						<li>Configuring Bacula to perform automatic network backups/restores</li>
+					</ul>
+				</td>
+				<td>No</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Server security</th>
+				<td>
+					<ul>
+						<li>Assistance configuring the server in a secure fashion</li>
+						<li>Help configuring and setting up group permissions and password policies</li>
+						<li>Assistance using security tools, for example host vulnerability checking</li>
+						<li>Assistance using AppArmor to partition applications and services from each other</li>
+						<li>Advice on checking for compromise and recovering from a security breach</li>
+					</ul>
+				</td>
+				<td>No</td>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Advanced Systems Management</th>
+				<td>
+					<ul>
+						<li>Configuration Management tools: puppet and etckeeper</li>
+						<li>Use of remote management capabilities (IPMI) where machines have that capability</li>
+					</ul>
+				</td>
+				<td>No</td>
+				<td>No</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Clustering</th>
+				<td>
+					<ul>
+						<li>Clustered File Systems, Red Hat Cluster Suite, Heartbeat</li>
+					</ul>
+				</td>
+				<td>No</td>
+				<td>No</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Setting up package repositories</th>
+				<td>
+					<ul>
+						<li>Assisting customers who want to maintain their own repositories</li>
+					</ul>
+				</td>
+				<td>No</td>
+				<td>No</td>
+				<td>Yes</td>
+			</tr>
+		</tbody>
+	</table>
+	<div class="eight-col">
+		<p><a href="#service-description">Back to top</a></p>
+	</div>
+</div><!-- /.row -->
+
+<div class="row no-border no-border" id="appendix-2">
+	<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>
+
+		<h3>Installation</h3>
+
+		<p>This covers all the aspects involved with installing and configuring the Ubuntu Cloud offering.</p>
+	</div>
+
+	<table class="twelve-col">
+		<thead>
+			<tr>
+				<th>Server installation scope</th>
+				<th>Description</th>
+			</tr>
+		</thead>
+
+		<tbody>
+			<tr>
+				<th scope="row">Installation</th>
+				<td>
+					<ul>
+						<li>Install Ubuntu Cloud from Ubuntu media or repositories</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Storage Management for Cloud Servers and Image storage.</th>
+				<td>
+					<ul>
+						<li>Set-up RAID and LVM for Ubuntu Cloud software usage</li>
+						<li>Assistance recovering debugging and troubleshooting of storage issues. Hardware set-up</li>
+						<li>Assessing hardware compatibility with Ubuntu Cloud</li>
+						<li>Choosing the required versions of Ubuntu Server for Ubuntu Cloud</li>
+						<li>Configuring Ubuntu to use appropriate hardware for Ubuntu Cloud usage</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Networking</th>
+				<td>
+					<ul>
+						<li>Setting network requirements for OpenStack</li>
+						<li>Setting up interface aliases, bonding and vlan tagging for Ubuntu Cloud</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Package and task selection</th>
+				<td>
+					<ul>
+						<li>Recommendation on the specific packages to install for Ubuntu Cloud</li>
+					</ul>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+
+	<div class="eight-col">
+		<h3>Applications</h3>
+		<p>This covers the various Ubuntu Cloud software configurations and included applications that are supported.</p>
+	</div>
+
+	<table class="twelve-col">
+		<thead>
+			<tr>
+				<th>Server applications scope</th>
+				<th>Description</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<th scope="row">Ubuntu Cloud Infrastructure</th>
+				<td>
+					<ul>
+						<li>Configuration of Ubuntu Cloud and sub-systems.</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Cloud Portal</th>
+				<td>
+					<ul>
+						<li>Installation and configuration of Cloud portal</li>
+						<li>Debugging and solving problems with Cloud portal.</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Hypervisor</th>
+				<td>
+					<ul>
+						<li>Installation and configuration of system kvm hypervisor support</li>
+						<li>Installing and setting up supported guest machine images.</li>
+						<li>Troubleshooting and resolving hypervisor issues</li>
+					</ul>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+
+	<div class="eight-col">
+		<h3>System administration</h3>
+		<p>System administration of Ubuntu Cloud software. This covers the various system administration and included programs that are supported:</p>
+	</div>
+
+	<table class="clear twelve-col">
+		<thead>
+			<tr>
+				<th>Server system administration scope</th>
+				<th>Description</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<th scope="row">Ubuntu Cloud Infrastructure Backup</th>
+				<td>
+					<ul>
+						<li>Installation of an appropriate backup application</li>
+						<li>Assistance configuring and deploying backup system</li>
+						<li>Help restoring from back-ups previously taken</li>
+						<li>Troubleshooting and resolving backup or restore problems</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Machine Image Backup</th>
+				<td>
+					<ul>
+						<li>Backup of cloud machine image</li>
+						<li>Snapshot cloud machine image</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">System updates &amp; upgrades</th>
+				<td>
+					<ul>
+						<li>Assistance installing security or critical fix updates</li>
+						<li>Help planning and undertaking upgrades between Ubuntu Server and Ubuntu Cloud releases</li>
+						<li>Troubleshooting and resolving update problems</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Logging and monitoring</th>
+				<td>
+					<ul>
+						<li>Setting up supported system logging and monitoring for Ubuntu Cloud Server security</li>
+						<li>Assistance configuring the Ubuntu Cloud servers in a secure fashion</li>
+						<li>Help configuring and setting up of supported OpenStack permissions and password policies Setting up Cloud Machine Images repositories</li>
+						<li>Assist with management and maintenance of Cloud Machine Images</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Cloud Instance sizing</th>
+				<td>
+					<ul>
+						<li>Assist with configuration of Cloud Instance sizing, number of system processors and system memory</li>
+					</ul>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+	<div class="eight-col">
+		<p><a href="#service-description">Back to top</a></p>
+	</div>
+</div><!-- /.row -->
+
+<div class="row row-hero no-border" id="appendix-3">
+	<div class="eight-col">
+		<h2>Appendix 3 - Desktop support scope details</h2>
+		<h3>Desktop Standard and Advanced scope table</h3>
+		<p>The table below lists the included support scope for the Desktop Standard and Advanced levels of Ubuntu Advantage Desktop.</p>
+	</div>
+
+	<table class="clearfix twelve-col">
+		<thead>
+			<tr>
+				<th>Desktop scope</th>
+				<th>Standard</th>
+				<th>Advanced</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<th scope="row">Installation</th>
+				<td></td>
+				<td></td>
+			</tr>
+
+			<tr>
+				<th scope="row">Application selection</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">CD-ROM installation</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Graphical desktop</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Hardware compatibility</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Network installation</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">System booting</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Windows migration</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Advanced file-system set-up</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Automated installation</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Applications</th>
+				<td></td>
+				<td></td>
+			</tr>
+
+			<tr>
+				<th scope="row">Certified applications</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Desktop environment</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Desktop publishing</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Digital art</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Digital pictures</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Education</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">E-mail</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Messaging</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Movies and music</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Office Applications</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Personal accounting</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Web browser</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Advanced productivity</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Advanced applications</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Developer Tools</th>
+				<td>No</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Configuration</th>
+				<td></td>
+				<td></td>
+			</tr>
+
+			<tr>
+				<th scope="row">Backup</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Desktop Security</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Graphics</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Hardware management</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Printers</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Remote desktop</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">System support</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Sound</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Updates &amp; upgrades</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Wireless Internet</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Windows network access</th>
+				<td>Yes</td>
+				<td>Yes</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Desktop virtualization</th>
+				<td>No</td>
+				<td>Yes</td>
+			</tr>
+		</tbody>
+	</table>
+
+	<div class="eight-col">
+		<h3>Installation</h3>
+		<p>This covers all the aspects involved with installing Ubuntu. Canonical will support various installation methods, setting up the hardware and loading Ubuntu correctly. The specific categories are as follows:</p>
+	</div>
+
+	<table class="twelve-col">
+		<thead>
+			<tr>
+				<th>Desktop installation category</th>
+				<th>Description</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<th scope="row">Application selection</th>
+				<td>
+					<ul>
+						<li>Recommendation on the specific packages to install for a particular use.</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">CD-ROM installation</th>
+				<td>
+					<ul>
+						<li>Install Ubuntu from a CDROM.</li>
+						<li>Install of Ubuntu from a USB connected drive.</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Graphical desktop</th>
+				<td>
+					<ul>
+						<li>Installing and configuring X and the graphical desktop.</li>
+						<li>Configuration for new monitors, or peripherals.</li>
+						<li>Optimising X and setting up dual monitors.</li>
+						<li>X server and graphical desktop problem solving.</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Hardware compatibility</th>
+				<td>
+					<ul>
+						<li>Assessing hardware compatibility with Ubuntu.</li>
+						<li>Choosing the 32 or 64 bit versions of Ubuntu.</li>
+						<li>Configuring Ubuntu to use the systems hardware.</li>
+						<li>Optimising Ubuntu for Certified or Compatible hardware.</li>
+						<li>Configuration of supported peripherals.</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Network installation</th>
+				<td>
+					<ul>
+						<li>Booting from the network for network installation.</li>
+						<li>Install Ubuntu using a local NFS server.</li>
+						<li>Install Ubuntu using a local FTP server.</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">System booting</th>
+				<td>
+					<ul>
+						<li>Set-up of system to boot Ubuntu by default.</li>
+						<li>Configuration of Ubuntu to load other operating systems such as Microsoft Windows.</li>
+						<li>Removal of Ubuntu as the boot-loader.</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Windows migration</th>
+				<td>
+					<ul>
+						<li>Partitioning to account for an existing Windows installation.</li>
+						<li>Resizing the file-system to provide free space for the Ubuntu installation.</li>
+						<li>Configuration of Ubuntu to be aware of a legacy operating system.</li>
+						<li>Transfer of settings from the legacy Windows environment using the Migration Assistant.</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Advanced file-system set-up</th>
+				<td>
+					<ul>
+						<li>Recommendation of a specific partitioning scheme depending on the systems tasks.</li>
+						<li>Set-up of Logical Volume Management (LVM) and encryption using the alternative installer.</li>
+						<li>Creation and formatting of file systems so that they can be used by Ubuntu.</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Automated installation</th>
+				<td>
+					<ul>
+						<li>Kickstart and preseed configuration.</li>
+						<li>Network booting and network settings configuration.</li>
+						<li>Troubleshooting and resolving installation issues.</li>
+					</ul>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+
+	<div class="eight-col">
+		<h3>Applications</h3>
+		<p>This covers the various programs that are supported as part of the services. Canonical will help the customer to install, configure and use the various applications. The major categories are:</p>
+	</div>
+
+	<table class="twelve-col">
+		<thead>
+			<tr>
+				<th>Desktop applications category</th>
+				<th>Description</th>
+				<th>Ubuntu</th>
+			</tr>
+		</thead>
+
+		<tbody>
+			<tr>
+				<th scope="row">Certified applications</th>
+				<td>
+					<ul>
+						<li>Installation applications distributed through the Partner repository</li>
+						<li>Debugging issues that are caused by Ubuntu</li>
+					</ul>
+				</td>
+				<td>
+					<ul>
+						<li>Release dependent</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Desktop environment</th>
+				<td>
+					<ul>
+						<li>Configuring desktop preferences</li>
+						<li>Customising desktop look and feel</li>
+						<li>Managing files and folders</li>
+						<li>Adding and removing applications launchers or menu items</li>
+						<li>Browsing network shares</li>
+					</ul>
+				</td>
+				<td>
+					<ul>
+						<li>GNOME Desktop</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Desktop publishing</th>
+				<td>
+					<ul>
+						<li>Installing and configuring desktop publishing</li>
+						<li>Using basic templates and inserting multimedia content</li>
+						<li>Printing created documents</li>
+					</ul>
+				</td>
+				<td>
+					<ul>
+						<li>Scribus</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Digital art</th>
+				<td>
+					<ul>
+						<li>Installing digital art and graphics applications</li>
+						<li>Configuring and using application functionality</li>
+						<li>Debugging issues with graphical applications</li>
+					</ul>
+				</td>
+				<td>
+					<ul>
+						<li>Gimp</li>
+						<li>Inkscape</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Digital pictures</th>
+				<td>
+					<ul>
+						<li>Setting up cameras for use with Ubuntu</li>
+						<li>Configuring applications to import images</li>
+						<li>Creating and editing photo albums</li>
+						<li>Publish albums on the Internet</li>
+						<li>Debugging and resolving issues</li>
+					</ul>
+				</td>
+				<td>
+					<ul>
+						<li>F-Spot</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Education</th>
+				<td>
+					<ul>
+						<li>Installing specific education applications and games</li>
+						<li>Configuring education applications for children&#39;s use</li>
+						<li>Configuring the desktop environment for particular age groups</li>
+					</ul>
+				</td>
+				<td>
+					<ul>
+						<li>Tux Math</li>
+						<li>Tux Paint</li>
+						<li>Tux Type</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">E-mail</th>
+				<td>
+					<ul>
+						<li>Configuring the default e-mail clients</li>
+						<li>Sending and receiving e-mail</li>
+						<li>Setting up e-mail filtering and anti-spam</li>
+					</ul>
+				</td>
+				<td>
+					<ul>
+						<li>Evolution</li>
+						<li>Thunderbird</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Messaging</th>
+				<td>
+					<ul>
+						<li>Installing instant messaging, internet voice and video conferencing</li>
+						<li>Configuring for major service providers</li>
+						<li>Troubleshooting and resolving application issues</li>
+					</ul>
+				</td>
+				<td>
+					<ul>
+						<li>Pidgin</li>
+						<li>Ekiga</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Movies and music</th>
+				<td>
+					<ul>
+						<li>Using and configuring music and video players</li>
+						<li>Installing proprietary commercially supported codecs</li>
+						<li>Troubleshooting and resolving multimedia problems</li>
+					</ul>
+				</td>
+				<td>
+					<ul>
+						<li>Rhythmbox</li>
+						<li>Totem</li>
+						<li>Sound Juicer</li>
+						<li>Cheese</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Office Applications</th>
+				<td>
+					<ul>
+						<li>Creating word processed documents, spreadsheets or presentations.</li>
+						<li>Configuring the office applications</li>
+						<li>Basic templates and inserting multimedia content</li>
+						<li>Troubleshooting and resolving application issues</li>
+						<li>Does not include advanced usage such programming macros</li>
+					</ul>
+				</td>
+				<td>
+					<ul>
+						<li>LIbreOffice Writer</li>
+						<li>Evince</li>
+						<li>LibreOffice Calc</li>
+						<li>LibreOffice Impress</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Personal accounting</th>
+				<td>
+					<ul>
+						<li>Installing and setting up the personal accounting application.</li>
+						<li>Integrating with supported electronic banking accounts</li>
+						<li>Troubleshooting and resolving application issues</li>
+					</ul>
+				</td>
+				<td>
+					<ul>
+						<li>GnuCash</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Web browser</th>
+				<td>
+					<ul>
+						<li>Using and configuring the web browser</li>
+						<li>Installing common plugins from Ubuntu repositories such as Flash</li>
+						<li>Configuring the browser for live bookmarks</li>
+					</ul>
+				</td>
+				<td>
+					<ul>
+						<li>Firefox</li>
+						<li>Pidgin</li>
+						<li>Adobe Flash</li>
+						<li>JVM</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Advanced productivity</th>
+				<td>
+					<ul>
+						<li>Advanced use of LibreOffice applications</li>
+						<li>Setting up desktop database functionality</li>
+						<li>Using the desktop database application</li>
+						<li>Configuring connections to supported server databases</li>
+						<li>Integrating with other LIbreOfficeapplications.</li>
+					</ul>
+				</td>
+				<td>
+					<ul>
+						<li>LibreOffice Database</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Advanced applications</th>
+				<td>
+					<ul>
+						<li>Installing desktop applications from the maintained repository</li>
+						<li>Configuring and using desktop applications</li>
+						<li>Debugging issues with advanced applications</li>
+						<li>Does not include support for development or command line applications</li>
+					</ul>
+				</td>
+				<td>
+					<ul>
+						<li>X or GNOME apps</li>
+					</ul>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+
+	<div class="eight-col">
+		<h3>System administration</h3>
+	</div>
+
+	<table class="twelve-col">
+		<thead>
+			<tr>
+				<th>Desktop system administration category</th>
+				<th>Description</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<th scope="row">Backup</th>
+				<td>
+					<ul>
+						<li>Installation of an appropriate backup application.</li>
+						<li>Configuration and deployment of backup system.</li>
+						<li>Assistance restoring from back-ups previously taken.</li>
+						<li>Troubleshooting and resolving backup or restore problems.</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Desktop Security</th>
+				<td>
+					<ul>
+						<li>Installing the appropriate firewalling application and kernel support.</li>
+						<li>Assistance configuring the firewall to protect and alert against external intrusion.</li>
+						<li>Assistance on checking for compromise and recovering the system from backup following a security breach.</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Desktop virtualization</th>
+				<td>
+					<ul>
+						<li>Installing and setting up desktop virtualization.</li>
+						<li>Assistance configuring networking and local host device access.</li>
+						<li>Assistance installing Microsoft Windows and Ubuntu as a guest.</li>
+						<li>Debugging and resolving issues with desktop virtualization.</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Graphics</th>
+				<td>
+					<ul>
+						<li>Installing software drivers for the graphical Ubuntu desktop.</li>
+						<li>Installing third-party proprietary software drivers for advanced video effects where Ubuntu recommends it.</li>
+						<li>Configuring the graphics or monitor set-up for advanced video effects.</li>
+						<li>Configuring and optimising the graphics set-up for dual-monitors.</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Hardware management</th>
+				<td>
+					<ul>
+						<li>Configuration of Certified systems and &ldquo;Works with Ubuntu&rdquo; labeled peripherals.</li>
+						<li>Removing hardware and reconfiguring Ubuntu.</li>
+						<li>Optimising Ubuntu performance with specific hardware.</li>
+						<li>Debugging and resolving hardware issues.</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Printers</th>
+				<td>
+					<ul>
+						<li>Installing a serial or USB printer.</li>
+						<li>Configuration to print to a network printer.</li>
+						<li>Configuring Ubuntu printing options.</li>
+						<li>Resolving printer problems such as driver configuration.</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Remote desktop</th>
+				<td>
+					<ul>
+						<li>Setting up the default remote desktop capability in Ubuntu Desktop Edition.</li>
+						<li>Configuring advanced desktop sharing features.</li>
+						<li>Troubleshooting and resolving issues using the remote desktop.</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Sound</th>
+				<td>
+					<ul>
+						<li>Configuring sound to work with detected sound card.</li>
+						<li>Sound configuration for specific applications.</li>
+						<li>Debugging and resolving sound issues.</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">System support</th>
+				<td>
+					<ul>
+						<li>Assistance configuring Ubuntu system components.</li>
+						<li>Assistance optimising performance of Ubuntu.</li>
+						<li>Problem identification, assessment and bug reporting.</li>
+						<li>Provision of a work-around or complete resolution.</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Updates &amp; upgrades</th>
+				<td>
+					<ul>
+						<li>Assistance installing security or critical fix updates.</li>
+						<li>Assistance undertaking upgrades between Ubuntu releases.</li>
+						<li>Troubleshooting and resolving update problems.</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Windows network access</th>
+				<td>
+					<ul>
+						<li>Setting up Ubuntu to login to a Microsoft Windows Active Directory.</li>
+						<li>Assistance browsing and accessing network resources such as printers and file shares.</li>
+						<li>Debugging issue either configuring or using the Active Directory authentication functionality (Likewise Open).</li>
+					</ul>
+				</td>
+			</tr>
+
+			<tr>
+				<th scope="row">Wireless Internet</th>
+				<td>
+					<ul>
+						<li>Wireless hardware driver detection and configuration</li>
+						<li>Wireless networking set-up</li>
+						<li>Internet configuration and access</li>
+						<li>Wireless roaming set-up and configuration</li>
+						<li>Troubleshooting and resolving networking or Internet access problems</li>
+					</ul>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+	<div class="eight-col">
+		<p><a href="#service-description">Back to top</a></p>
+	</div>
+</div><!-- /.row -->
+{% endblock content %}
\ No newline at end of file
diff --git a/templates/management/_nav_secondary.html b/templates/management/_nav_secondary.html
old mode 100644
new mode 100755
index e05d47ec1a2..e59867a5187
--- a/templates/management/_nav_secondary.html
+++ b/templates/management/_nav_secondary.html
@@ -1,5 +1,4 @@
-	<ul{% if list_class %} class="{{ list_class }}"{% endif %}>
-		{% if arrow %} <li class="arrow-up"></li> {% endif %}
+	<ul{% if list_class %} class="{{ list_class }}"{% endif %} class="second-level-nav">
 		<li class="first{% if level_1 == 'management' and not level_2 %} active{% endif %}"><a href="/management">Overview</a></li>
 		<li{% if level_2 == 'landscape-features' %} class="active"{% endif %}><a href="/management/landscape-features">Landscape features</a></li>
 		<li{% if level_2 == 'working-with-landscape' %} class="active"{% endif %}><a href="/management/working-with-landscape">Working with Landscape</a></li>
diff --git a/templates/management/_nav_tertiary.html b/templates/management/_nav_tertiary.html
old mode 100644
new mode 100755
diff --git a/templates/management/base_management.html b/templates/management/base_management.html
old mode 100644
new mode 100755
diff --git a/templates/management/cloud-management.html b/templates/management/cloud-management.html
deleted file mode 100644
index 2f55fbca863..00000000000
--- a/templates/management/cloud-management.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "support/base_support.html" %}
-
-{% block title %}Cloud management overview page{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Management" page_title="Cloud management"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-border">
-	<h1>Cloud management landing page</h1>
-</div>
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/management/compliance.html b/templates/management/compliance.html
old mode 100644
new mode 100755
index 3246b6d59f9..846fe5505b3
--- a/templates/management/compliance.html
+++ b/templates/management/compliance.html
@@ -9,19 +9,20 @@
 {% endblock second_level_nav_items %}
 
 {% block content %}
-<div class="row row-hero">
-	<h1>Compliance</h1>
+<div class="row row-hero row-image-centered">
 	<div class="eight-col">
+		<h1>Compliance</h1>
 		<p>All IT departments are subject to compliance requirements &ndash; both industry-wide and market-specific. With an emphasis on automation to save time and eliminate human error, Landscape includes several features that make compliance much easier to achieve and maintain, from role-based access control to extensive reporting and audit logging.</p>
+		<p class="twelve-col"><a class="link-cta-ubuntu" href="https://landscape.canonical.com/trial-registration">Get a free 30-day trial</a> or <a href="/management/contact-us">contact us about Landscape&nbsp;&rsaquo;</a></p>
 	</div><!-- /.eight-col -->
-		<p class="twelve-col"><a class="link-cta-canonical" href="https://landscape.canonical.com/trial-registration">Get a free 30-day trial</a> or <a href="/management/contact-us">contact us about Landscape &rsaquo;</a></p>
+	<span>
+		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-reducecosts-warmgrey.svg" width="200" height="200" alt="" class="priority-0" />
+	</span>
 </div><!-- .row row-hero -->
 
 <div class="row">
 	<div class="six-col">
-		<a href="{{ STATIC_URL }}img/business/screenshot-patch-1200x568.png">
-			<img class="flush-left" src="{{ STATIC_URL }}img/business/screenshot-patch-450x271.png" height="271" width="450" alt="" />
-		</a>
+		<img class="flush-left" src="{{ STATIC_URL }}img/management/compliance/image-patchcompliance.jpg" height="462" width="376" alt="" />
 	</div><!-- /.six-col -->
 	<div class="six-col last-col">
 		<h3>Patch compliance</h3>
@@ -35,20 +36,16 @@ <h3>Patch compliance</h3>
 		<h3>Role-based access control (RBAC)</h3>
 		<p>As any IT manager knows, compliance is about more than reporting. It starts with the implementation of compliance policies and processes.</p>
 		<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 class="link-arrow" href="/management/working-with-landscape">Watch the compliance and reporting video on the Working with Landscape page</a></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">
-		<a href="{{ STATIC_URL }}img/business/screenshot-rbac-1200x756.png">
-			<img class="flush-right" src="{{ STATIC_URL }}img/business/screenshot-rbac-450x271.png" height="271" width="450" alt="" />
-		</a>
+		<img class="flush-right" src="{{ STATIC_URL }}img/management/compliance/image-rolebasedaccesscontrol.jpg" height="582" width="482" alt="" />
 	</div>
 </div><!-- .row -->
 
 <div class="row">
 	<div class="six-col">
-		<a href="{{ STATIC_URL }}img/business/screenshot-audit-1200x647.png">
-			<img class="flush-left" src="{{ STATIC_URL }}img/business/screenshot-audit-450x271.png" height="271" width="450" alt="" />
-		</a>
+		<img class="flush-left" src="{{ STATIC_URL }}img/management/compliance/image-auditlogging.jpg" height="351" width="462" alt="" />
 	</div><!-- /.six-col -->
 	<div class="six-col last-col">
 		<h3>Audit logging</h3>
@@ -63,10 +60,11 @@ <h3>Compliance reporting</h3>
 		<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 class="six-col last-col">
-		<a href="{{ STATIC_URL }}img/business/screenshot-compliance-755x601.png">
-			<img src="{{ STATIC_URL }}img/business/screenshot-compliance-450x271.png" height="271" width="450" alt="" />
-		</a>
+		<img src="{{ STATIC_URL }}img/business/screenshot-compliance-450x271.png" height="271" width="450" alt="" />
 	</div>
 </div><!-- .row -->
+
+{% 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
old mode 100644
new mode 100755
index 5bdf4e3da5d..59357d1d8f8
--- a/templates/management/contact-us.html
+++ b/templates/management/contact-us.html
@@ -59,10 +59,10 @@ <h1>Contact Canonical</h1>
         </tbody>
     </table>
 </div>
-	
+
 	<div class="eight-col">
 	<p>If you just need support for yourself, you can <a href="http://www.ubuntu.com/support">get help from the community</a>, <a href="http://www.ubuntu.com/support">join a forum</a>, or <a href="http://www.ubuntu.com/support">take a look at our official documentation</a>.</p>
-	
+
 	<p>All fields are required.</p>
 
 <form class="lpeRegForm formNotEmpty" method="post" enctype="application/x-www-form-urlencoded" action="https://pages.canonical.com/index.php/leadCapture/save" id="mktForm_1091" name="mktForm_1091">
@@ -88,29 +88,98 @@ <h3>Contact information</h3>
 
 			<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="2"><span class="mktFormMsg"></span></span>
+				<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' /><span class='mktFormMsg'></span></span
+				<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">Work email: <span>*</span></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
+				<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='text' value=""  maxlength='255' tabIndex='4' /><span class='mktFormMsg'></span></span
+				<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>
 			<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'><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='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>
 			</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='' selected='selected'>Please select</option><option value='AK'>AK</option><option value='AL'>AL</option><option value='AR'>AR</option><option value='AZ'>AZ</option><option value='CA'>CA</option><option value='CO'>CO</option><option value='CT'>CT</option><option value='DE'>DE</option><option value='FL'>FL</option><option value='GA'>GA</option><option value='HI'>HI</option><option value='IA'>IA</option><option value='ID'>ID</option><option value='IL'>IL</option><option value='IN'>IN</option><option value='KS'>KS</option><option value='KY'>KY</option><option value='LA'>LA</option><option value='MA'>MA</option><option value='MD'>MD</option><option value='ME'>ME</option><option value='MI'>MI</option><option value='MN'>MN</option><option value='MO'>MO</option><option value='MS'>MS</option><option value='MT'>MT</option><option value='NC'>NC</option><option value='ND'>ND</option><option value='NE'>NE</option><option value='NH'>NH</option><option value='NJ'>NJ</option><option value='NM'>NM</option><option value='NV'>NV</option><option value='NY'>NY</option><option value='OH'>OH</option><option value='OK'>OK</option><option value='OR'>OR</option><option value='PA'>PA</option><option value='RI'>RI</option><option value='SC'>SC</option><option value='SD'>SD</option><option value='TN'>TN</option><option value='TX'>TX</option><option value='UT'>UT</option><option value='VA'>VA</option><option value='VT'>VT</option><option value='WA'>WA</option><option value='WI'>WI</option><option value='WV'>WV</option><option value='WY'>WY</option></select><span class='mktFormMsg'></span></span
+				<span class='mktInput'><select class='mktFormSelect' name="State" id="State" size='1'   tabIndex='6'>					<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>
-			
+
 		</ul>
 	</fieldset>
 
@@ -119,23 +188,23 @@ <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'><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
+			<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>
 		</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'><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='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>
 		</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'><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='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>
 		</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'><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='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>
 		</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'><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='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>
 		</li>
 	</ul>
 	</fieldset>
@@ -145,7 +214,7 @@ <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'></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='12' required></textarea><span class='mktFormMsg'></span></span>
 		</li>
 		<li class="mktField mktLblRight">
 			<span class="mktInput mktLblRight">
@@ -156,14 +225,14 @@ <h3>Your comments</h3>
 		</li>
 	</ul>
 	</fieldset>
-	
+
 	<fieldset class="fieldset-submit">
 	<ul class="mktLblLeft">
 		<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">
 			<input id="mktFrmSubmit" type="submit" value="Submit" name="submitButton" tabindex="14" onclick="formSubmit(document.getElementById('mktForm_1091')); return false;" />
 			<input id="mktFrmReset" type="reset" value="Clear" name="resetButton" />
-		</li>     
+		</li>
 
 	</ul>
 	</fieldset>
@@ -210,5 +279,8 @@ <h3>Your comments</h3>
 <!-- / MARKETO GENERATED FORM -->
 	</div><!-- /.seven-col -->
 </div><!-- /.row -->
+
+{% 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
old mode 100644
new mode 100755
index 312800ab6e3..1187042b6a5
--- a/templates/management/ema-whitepaper.html
+++ b/templates/management/ema-whitepaper.html
@@ -7,8 +7,8 @@
 {% endblock second_level_nav_items %}
 
 {% block content %}
-<div class="row row-hero">
-	<h1>Enterprise Class Ubuntu Management with Canonical Landscape</h1>
+<div class="row row-hero no-border">
+	<h1>Enterprise class Ubuntu management with Canonical Landscape</h1>
 </div>
 
 <div class="row no-border">
@@ -19,7 +19,7 @@ <h2>Download the white paper</h2>
 		<iframe scrolling="no" height="530px" width="464px" src="https://pages.canonical.com/EMFWhitepaper_EMFGateway.html" name="Whitepaper form" style="border: 0;"></iframe>
 	</div>
 	<div class="five-col prepend-one last-col">
-		<img src="{{ STATIC_URL }}img/third-party-logos/logo-ema-300x95.jpg" alt="EMA logo" width="250" />
+		<img src="{{ STATIC_URL }}img/third-party-logos/logo-ema-300x95.jpg" alt="EMA logo" width="250" class="priority-0" />
 	</div><!-- /.six-col -->
 </div><!-- /.row -->
 {% endblock content %}
diff --git a/templates/management/index.html b/templates/management/index.html
old mode 100644
new mode 100755
index 66fc8dea27d..6a2d1493d24
--- a/templates/management/index.html
+++ b/templates/management/index.html
@@ -18,38 +18,36 @@
 	<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-canonical" href="https://landscape.canonical.com/trial-registration">Try Landscape for free for 30 days</a></p>
-		<p><a href="/management/contact-us">Contact us about Ubuntu Advantage &rsaquo;</a></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>
+		<p><a href="/management/contact-us">Contact us about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
 	</div><!-- /.six-col -->
 	<div class="four-col last-col">
-		<img alt="" width="288" height="155" src="{{ STATIC_URL }}img/management/ubuntu-advantage-hero.png" />
+		<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 last-col no-margin-bottom">
+	<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="four-col">
-			<ul class="list-canonical">
-				<li>Management at scale</li>
-				<li>Deploy or rollback security updates</li>
-				<li class="last-item">Compliance reports</li>
-			</ul>
-		</div>
-		<div class="four-col last-col">
-			<ul class="list-canonical">
-				<li>Role-based access</li>
-				<li class="last-item">Informative monitoring</li>
-			</ul>
-		</div>
-		<div class="six-col no-margin-bottom">
-			<p><a href="/management/landscape-features">Learn more about Landscape&nbsp;&rsaquo;</a></p>
-		</div>
-	</div>
-</div>
-
+		<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">
@@ -61,16 +59,16 @@ <h3>24/7 support</h3>
 		<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">
+	<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">
-			<li><a href="https://login.ubuntu.com/+saml/init/salesforce/500/o ">Support portal login &rsaquo;</a></li>
-			<li><a href="https://landscape.canonical.com/">Landscape login &rsaquo;</a></li>
+		<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>
 	</div>
-	<div class="twelve-col last-col margin-top no-margin-bottom">
+	<div class="twelve-col">
 		<p><a href="/management/ubuntu-advantage">Learn more about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
 	</div>
 </div>
@@ -83,14 +81,16 @@ <h2>Watch it in action</h2>
 		<p><a href="/management/working-with-landscape">Learn more about working with Landscape&nbsp;&rsaquo;</a></p>
 	</div>
 	<div class="six-col last-col">
-		<iframe width="442" height="249" src="http://www.youtube.com/embed/6pSslGRi-ew?rel=0&wmode=opaque&modestbranding=0" frameborder="0" allowfullscreen></iframe>
+		<div class="video-container">
+			<iframe width="442" height="249" src="http://www.youtube.com/embed/6pSslGRi-ew?rel=0&wmode=opaque&modestbranding=0" frameborder="0" allowfullscreen></iframe>
+		</div>
 	</div>
 </div>
 
 <div class="row row-quote row-grey">
-	<blockquote>
-		<p>&quot;Auditors love the fact that we have centralised tools for updating servers and reporting on every element of our infrastructure&quot;</p>
-		<cite>Kelly Corbin, Senior Systems Administrator at NA Bancard <br /><a class="link-arrow" href="http://insights.ubuntu.com/case-study/bancard-streamlines-pci-compliance-with-canonicals-landscape/">Read the case study</a></cite>
+	<blockquote class="pull-quote">
+		<p><span>&ldquo;</span>Auditors love the fact that we have centralised tools for updating servers and reporting on every element of our infrastructure<span>&rdquo;</span></p>
+		<p><cite>Kelly Corbin, Senior Systems Administrator at NA Bancard <a href="https://insights.ubuntu.com/2012/09/21/bancard-streamlines-pci-compliance-with-canonicals-landscape/">Read the case study&nbsp;&rsaquo;</a></cite></p>
 	</blockquote>
 </div><!-- /.row quote no-border -->
 
@@ -104,20 +104,20 @@ <h2>Watch it in action</h2>
 	<div class="six-col last-col">
 		<h3>Cut your IT costs with Landscape</h3>
 		<p>Landscape is already used to manage hundreds of thousands of machines around the world, both physical and virtual, saving our customers money every day.</p>
-		<p><a class="link-arrow" href="/management/return-on-investment">Read more about the ROI you can expect with Landscape</a></p>
-		<p><a class="link-arrow" href="/management/ema-whitepaper">Read the TCO analysis from Enterprise <br/>Management Associates</a></p>
+		<p><a href="/management/return-on-investment">Read more about the ROI you can expect with Landscape&nbsp;&rsaquo;</a></p>
+		<p><a href="/management/ema-whitepaper">Read the TCO analysis from Enterprise <br/>Management Associates&nbsp;&rsaquo;</a></p>
 	</div>
 </div><!-- /.row return-investment -->
 
 
 <div class="row row-quote row-grey">
-	<blockquote>
-		<p>&quot;Previously, we needed lots of people to deploy, maintain, upgrade and support infrastructure at our offices around the world&quot;</p>
-		<cite>Pawe&#322; Zi&#281;ba, Senior IT Innovation Consultant, Capgemini <br /><a class="link-arrow" href="http://insights.ubuntu.com/case-study/capgemini-bpo-deploys-hybrid-thin-client-solution-with-ubuntu-advantage/">Read the case study</a></cite>
+	<blockquote class="pull-quote">
+		<p><span>&ldquo;</span>Previously, we needed lots of people to deploy, maintain, upgrade and support infrastructure at our offices around the world<span>&rdquo;</span></p>
+		<p><cite>Pawe&#322; Zi&#281;ba, Senior IT Innovation Consultant, Capgemini <a href="https://insights.ubuntu.com/2012/09/06/capgemini-bpo-deploys-hybrid-thin-client-solution-with-ubuntu-advantage/">Read the case study&nbsp;&rsaquo;</a></cite></p>
 	</blockquote>
 </div><!-- /.row .quote -->
 
-<div class="row vertical-divider">
+<div class="row vertical-divider no-border">
 	<div class="six-col">
 		<h3>Benefits for system administrators</h3>
 		<ul class="list-canonical">
diff --git a/templates/management/landscape-features.html b/templates/management/landscape-features.html
old mode 100644
new mode 100755
index 4f30439fc4a..f8fd83c19dd
--- a/templates/management/landscape-features.html
+++ b/templates/management/landscape-features.html
@@ -8,151 +8,170 @@
 
 {% block content %}
 <div class="row row-hero no-border">
-	<div class="eight-col no-margin-bottom">
+	<div class="eight-col">
 		<h1>Landscape features</h1>
 		<p>Landscape allows you to manage thousands of Ubuntu machines as easily as one, making it far more cost-effective to support large and growing networks of desktops, servers and cloud instances.</p>
 	</div>
 </div><!-- /.landscape-intro -->
 
-<div class="row tabbed-menu no-border">
-	<ul class="no-bullets">
-		<li><a class="slideless active" href="#management">Software management</a></li>
-		<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>
-	</ul>
-	<img src="{{ STATIC_URL }}img/patterns/tabbed-nav-arrow.png" width="12" height="6" class="arrow" alt="">
-</div><!-- /.row .tabbed-menu -->
+<div class="row no-border">
+	<div class="tabbed-menu">
+		<ul class="no-bullets">
+			<li><a class="slideless active" href="#management">Software management</a></li>
+			<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>
+		</ul>
+	</div>
 
-<div id="management" class="tabbed-content management">
+<div id="management" class="tabbed-content management twelve-col">
+	<a class="accordion-button slideless" href="#management" data-hash="management">Software management</a>
 	<div class="no-border">
 		<h3>Making software management simple</h3>
-		<div class="six-col">
-			<ul class="list-canonical">
-				<li>Manage machines in bulk</li>
-				<li>Tag machines to associate them with different profiles</li>
-				<li>Transparent cross-platform support for x86 and ARM binaries</li>
-				<li>Specify update policies and maintenance windows, during which software updates can be performed</li>
-				<li>Ensure managed devices are up-to-date with the latest security fixes</li>
-				<li class="last-item">Hold a specific software package at a designated release, to prevent accidental breakage. Holds can be set using Landscape or the shell tools; both are recognised operationally</li>
-			</ul>
-		</div><!-- /.six-col -->
-		<div class="six-col last-col">
-			<ul class="list-canonical">
-				<li>Support a validation/integration workflow to ensure that updates don&rsquo;t break mission-critical applications</li>
-				<li>Make sure that only applications and updates vetted by your local IS team are installed</li>
-				<li>Install, remove and update packages to managed devices</li>
-				<li>Rollback software to a previously installed version, if a problem is discovered</li>
-				<li class="last-item">Provide custom repositories to internally <br/>provision applications</li>
-			</ul>
-		</div><!-- /.six-col -->
+		<div class="combined-list">
+			<div class="six-col">
+				<ul class="list-canonical">
+					<li>Manage machines in bulk</li>
+					<li>Tag machines to associate them with different profiles</li>
+					<li>Transparent cross-platform support for x86 and ARM binaries</li>
+					<li>Specify update policies and maintenance windows, during which software updates can be performed</li>
+					<li>Ensure managed devices are up-to-date with the latest security fixes</li>
+					<li class="last-item">Hold a specific software package at a designated release, to prevent accidental breakage. Holds can be set using Landscape or the shell tools; both are recognised operationally</li>
+				</ul>
+			</div><!-- /.six-col -->
+			<div class="six-col last-col">
+				<ul class="list-canonical">
+					<li>Support a validation/integration workflow to ensure that updates don&rsquo;t break mission-critical applications</li>
+					<li>Make sure that only applications and updates vetted by your local IS team are installed</li>
+					<li>Install, remove and update packages to managed devices</li>
+					<li>Rollback software to a previously installed version, if a problem is discovered</li>
+					<li class="last-item">Provide custom repositories to internally provision&nbsp;applications</li>
+				</ul>
+			</div><!-- /.six-col -->
+		</div>
 	</div><!-- /#management -->
-	
-	<div class="row main-content no-border">
-		<div class="pattern-gallery">
-			<a class="right" href="{{ STATIC_URL }}img/business/screenshot-rollback-1046x547.png">
-				<img width="430" height="225" alt="Landscape rollback screen" src="{{ STATIC_URL }}img/business/screenshot-rollback-thumb-430x225.png" class="default">
+
+		<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>
 		</div><!-- /.pattern-gallery -->
-		<div class="content-text">
+		<div class="eight-col">
 			<p>Landscape offers a complete software management solution for Ubuntu, including patch management and compliance features. And because it is designed specifically for Ubuntu by Canonical, it offers more features than any platform-agnostic alternative could.</p>
 			<p>Landscape lets you manage machines in bulk, ensuring uniformity of configuration across your network. With tags, you can set up custom subgroups incredibly easily; just choose a tag while preparing a management task, then tag each machine accordingly. Tags remain in place &ndash; and are easy to add to new devices, even at provisioning time.</p>
 			<p>Client machines can be be assigned policies instructing them to automatically update &ndash; either with all available software updates or security patches only. Maintenance windows, new in the latest release, mean you can instruct a device to to update automatically at a specified time, for example, between 2am and 4am on Saturdays. If a device is powered off or not connected to the network (for example, a roving laptop), the update will not be performed until the next maintenance window.</p>
 			<p>By scripting to Landscape&rsquo;s API, administrators can operate custom repositories, which can be created as local repositories behind your firewall and mirrored across geographies. Packages can be even be copied in multiple repositories. Source list management provides control of the repositories configured on client machines, regardless of whether those repositories are managed by Landscape or not.</p>
-			<p><a class="link-arrow" href="/management/working-with-landscape#landscape-rbac-video">Watch the software management video on the working with Landscape page</a></p>
+			<p><a href="/management/working-with-landscape#landscape-rbac-video">Watch the software management video on the working with Landscape page&nbsp;&rsaquo;</a></p>
 		</div><!-- /.content-text -->
-	</div><!-- /.row .main-content -->
 </div><!-- /.tabbed-content .management -->
 
-	<div id="deployment" class="tabbed-content deployment hide">
+	<div id="deployment" class="tabbed-content deployment twelve-col hide">
+		<a class="accordion-button slideless" href="#deployment" data-hash="deployment">Deployment</a>
 		<div class="points no-border">
 			<h3>Deployment &ndash; on the metal or in the cloud</h3>
-			<div class="six-col">
-				<ul class="list-canonical">
-					<li>Provision a new starter&rsquo;s desktop from <br/>standard templates</li>
-					<li>Deploy a new server remotely, from bare metal</li>
-					<li class="last-item">Rapidly deploy new cloud nodes into your private <br/>cloud infrastructure</li>
-				</ul>
-			</div><!-- /.six-col -->
-			<div class="six-col last-col">
-				<ul class="list-canonical">
-					<li>Coordinate deployment at multiple sites, without affecting the WAN&rsquo;s performance</li>
-					<li>Roll out an entire private cloud directly at server unboxing</li>
-					<li class="last-item">Limit the number of cloud instances your administrators can purchase</li>
-				</ul>
-			</div><!-- /.six-col -->
+			<div class="combined-list">
+				<div class="six-col">
+					<ul class="list-canonical">
+						<li>Provision a new starter&rsquo;s desktop from standard&nbsp;templates</li>
+						<li>Deploy a new server remotely, from bare metal</li>
+						<li class="last-item">Rapidly deploy new cloud nodes into your private cloud&nbsp;infrastructure</li>
+					</ul>
+				</div><!-- /.six-col -->
+				<div class="six-col last-col">
+					<ul class="list-canonical">
+						<li>Coordinate deployment at multiple sites, without affecting the WAN&rsquo;s performance</li>
+						<li>Roll out an entire private cloud directly at server unboxing</li>
+						<li class="last-item">Limit the number of cloud instances your administrators can purchase</li>
+					</ul>
+				</div><!-- /.six-col -->
+			</div>
 		</div><!-- /#deployment -->
-		<div class="row main-content no-border">
-			<a class="right" href="{{ STATIC_URL }}img/business/screenshot-provisioning-1200x756.png">
-				<img width="430" height="225" alt="Landscape provisioning screen" src="{{ STATIC_URL }}img/business/screenshot-provisioning-crop-430x225.png" class="screenshot">
-			</a>
-			<div class="content-text">
+		<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>
+			</div>
+			<div class="eight-col">
 				<p>Whether you need to install a fleet of desktop workstations or bring up the infrastructure for an entire OpenStack cloud, Landscape gives you the tools you need to do it quickly. It supports Ubuntu's cloud-init format, enabling the use of the same configuration structures in provisioning cloud and physical infrastructure. Additionally, Landscape's own data abstractions can be used in both the deployment and production phases of the system life-cycle, eliminating the need to keep different configuration files synchronised.</p>
 				<p>Landscape supports multiple deployment endpoints, with geographical mapping transparent to the administrator. This allows remote bare metal deployment to field offices where control is centralised but network load is local, shielding the WAN links from load.</p>
 				<p>In combination with Canonical&rsquo;s Metal as a Service (MAAS) technology, Landscape delivers a centralised console for rapid system provisioning. This gives you a unified view that&rsquo;s centrally controlled, while delivering the bits using the local network, close to their destination</p>
-				<div><a class="link-arrow" href="/management/working-with-landscape#landscape-videos">Watch the bare metal provisioning video on the Working with Landscape page</a></div>
+				<div><a href="/management/working-with-landscape#landscape-videos">Watch the bare metal provisioning video on the Working with Landscape page&nbsp;&rsaquo;</a></div>
 			</div><!-- /.content-text -->
 		</div><!-- /.row .main-content -->
 	</div><!-- /.tabbed-content .deployment -->
 
 	<div id="monitoring" class="tabbed-content monitoring hide">
+		<a class="accordion-button slideless" href="#monitoring" data-hash="monitoring">Monitoring</a>
 		<div class="no-border">
 			<h3>Monitoring</h3>
-			<div class="six-col">
-				<ul class="list-canonical">
-					<li>Helping you identify and troubleshoot user issues</li>
-					<li>Historical data archive of a system&rsquo;s critical variables</li>
-					<li class="last-item">Ready access to a list of all processes running on a system (rogue processes can be killed remotely)</li>
-				</ul>
-			</div><!-- /.six-col -->
-			<div class="six-col last-col">
-				<ul class="list-canonical">
-					<li>A graphical module that makes it easy to plot trends of temperature, disk and memory usage, system load or custom metrics</li>
-					<li class="last-item">Scriptable, custom trend information based on the parameters that matter to you</li>
-				</ul>
-			</div><!-- /.six-col -->
+			<div class="combined-list">
+				<div class="six-col">
+					<ul class="list-canonical">
+						<li>Helping you identify and troubleshoot user issues</li>
+						<li>Historical data archive of a system&rsquo;s critical variables</li>
+						<li class="last-item">Ready access to a list of all processes running on a system (rogue processes can be killed remotely)</li>
+					</ul>
+				</div><!-- /.six-col -->
+				<div class="six-col last-col">
+					<ul class="list-canonical">
+						<li>A graphical module that makes it easy to plot trends of temperature, disk and memory usage, system load or custom metrics</li>
+						<li class="last-item">Scriptable, custom trend information based on the parameters that matter to you</li>
+					</ul>
+				</div><!-- /.six-col -->
+			</div>
 		</div><!-- /#monitoring -->
 		<div class="row main-content no-border">
-			<a class="right" href="{{ STATIC_URL }}img/business/screenshot-monitoring-1200x642.png">
-				<img width="430" height="225" alt="Landscape monitoring screen" src="{{ STATIC_URL }}img/business/screenshot-monitoring-crop-430x225.png" class="screenshot">
-			</a>
-			<div class="content-text">
+			<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>
+			</div>
+			<div class="eight-col">
 				<p>When it comes to monitoring the performance of Ubuntu desktops, there is no more rapidly deployed or cost-effective tool than Landscape.</p>
 				<p>Landscape monitors systems through a management agent installed on each machine. The agent communicates with Landscape to update an automatically selected set of essential health metrics. Data is securely collected and stored in the Landscape database.</p>
 				<p>Collection of custom metrics can also be easily configured, in addition to those that are conveniently pre-configured and are collected out of the box. Access to load, bandwidth and other historical monitoring data can prove useful when troubleshooting intermittent system issues.</p>
-				<div><a class="link-arrow" href="/management/working-with-landscape">Watch the asset management video on the working with Landscape page</a></div>
+				<div><a href="/management/working-with-landscape">Watch the asset management video on the working with Landscape page&nbsp;&rsaquo;</a></div>
 			</div><!-- /.content-text -->
 		</div><!-- /.row main-content -->
 	</div><!-- /.tabbed-content .monitoring -->
 
 	<div id="inventory" class="tabbed-content inventory hide">
+		<a class="accordion-button slideless" href="#inventory" data-hash="inventory">Inventory management</a>
 		<div class="points no-border">
 			<h3>Inventory management</h3>
-			<div class="six-col">
-				<ul class="list-canonical">
-					<li class="last-item">Access full package information for all registered machines, including security notices applicable to the selected device.</li>
-				</ul>
-			</div><!-- /.six-col -->
-			<div class="six-col last-col">
-				<ul class="list-canonical">
-					<li class="last-item">Enjoy rapid access to a system&rsquo;s hardware properties to track hardware-specific issues</li>
-				</ul>
-			</div><!-- /.six-col -->
+			<div class="combined-list">
+				<div class="six-col">
+					<ul class="list-canonical">
+						<li class="last-item">Access full package information for all registered machines, including security notices applicable to the selected device.</li>
+					</ul>
+				</div><!-- /.six-col -->
+				<div class="six-col last-col">
+					<ul class="list-canonical">
+						<li class="last-item">Enjoy rapid access to a system&rsquo;s hardware properties to track hardware-specific issues</li>
+					</ul>
+				</div><!-- /.six-col -->
+			</div>
 		</div><!-- /#inventory -->
 		<div class="row main-content no-border">
 			<div class="pattern-gallery">
-				<a class="right" href="{{ STATIC_URL }}img/business/screenshot-1-hardware-inventory-1200x754.png">
-					<img width="430" height="225" alt="Landscape hardware inventory screen" src="{{ STATIC_URL }}img/business/screenshot-1-hardware-inventory-thumb-430x225.png" class="default">
-				</a>
+				<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>
+				</div>
       </div><!-- /.pattern-gallery -->
-			<div class="content-text">
+			<div class="eight-col">
 				<p>Landscape&rsquo;s new inventory management features integrate seamlessly with its deployment functionality, making it possible to specify server hardware requirements when provisioning bare metal instances &ndash; and to keep track of the hardware capabilities of the asset fleet.</p>
 				<p>Landscape makes it easy to monitor the packages installed on any managed machine &ndash; essential in industry sectors with specific compliance overheads, for example, healthcare or financial services.</p>
 				<p>Data in the hardware inventory is now searchable, based on properties such as the MAC address of a given card or the version of Ubuntu installed on a specific machine. Dynamic search groups can be created, that repopulate with current data whenever the saved search is executed. Hardware-based criteria can be used as well as software; for example, you could create a group of &lsquo;all machines with more than 8GB of RAM&rsquo; or desktops with Intel video adapters&rsquo;.</p>
 				<p>Administrators will be pleased to note that the inventory is now Lshw-based, ensuring absolute consistency between the data stored locally in each Ubuntu installation and the data stored for that device remotely in Landscape.</p>
-				<div><a class="link-arrow" href="/management/working-with-landscape">Learn more about working with Landscape</a></div>
+				<div><a href="/management/working-with-landscape">Learn more about working with Landscape&nbsp;&rsaquo;</a></div>
 			</div><!-- /.content-text -->
 		</div><!-- /.row main-content -->
 	</div><!-- /.tabbed-content .inventory -->
+</div>
+{% 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
old mode 100644
new mode 100755
index 419bf71f572..e514368b3dd
--- a/templates/management/return-on-investment.html
+++ b/templates/management/return-on-investment.html
@@ -8,18 +8,21 @@
 {% endblock second_level_nav_items %}
 
 {% block content %}
-<div class="row row-hero">
+<div class="row row-hero row-image-centered">
 	<div class="eight-col">
-	<h1>Return on investment</h1>
-	<p class="intro">According to new data from EMA, Landscape could save a thousand-desktop firm over &#36;200,000 in just three years.</p>
+		<h1>Return on investment</h1>
+		<p class="intro">According to new data from EMA, Landscape could save a thousand-desktop firm over &#36;200,000 in just three years.</p>
 		<h2>Fact: Landscape saves you money</h2>
 		<p>Thousands of organisations around the world have already seen the ROI Landscape delivers, when used in conjunction with their Ubuntu deployments. And, following research undertaken this year by Enterprise Management Associates, it&rsquo;s now official: if you&rsquo;re using Ubuntu at scale, Landscape will save you money.</p>
+		<p class="twelve-col"><a class="link-cta-ubuntu" href="https://landscape.canonical.com/trial-registration">Get a free 30-day trial</a> or <a href="/management/contact-us">contact us about Landscape&nbsp;&rsaquo;</a></p>
 	</div><!-- /.seven-col -->
-		<p class="twelve-col"><a class="link-cta-canonical" href="https://landscape.canonical.com/trial-registration">Get a free 30-day trial</a> or <a class="link-arrow" href="/management/contact-us">contact us about Landscape</a></p>
+	<span>
+		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-reducecosts-warmgrey.svg" width="200" height="200" alt="" class="priority-0" />
+	</span>
 </div><!-- /.row .row-hero -->
-	
+
 <div class="row stats-panel">
-	<p class="first">According to new data from EMA, Landscape could save a thousand-desktop firm over &#36;200,000 in just three years. <a class="link-arrow" href="/management/ema-whitepaper">Read the TCO analysis from Enterprise Management Associates</a></p>
+	<p class="first">According to new data from EMA, Landscape could save a thousand-desktop firm over &#36;200,000 in just three years. <a href="/management/ema-whitepaper">Read the TCO analysis from Enterprise Management Associates&nbsp;&rsaquo;</a></p>
 	<dl class="four-col">
 		<dt>1,121%</dt>
 		<dd>ROI over five years</dd>
@@ -34,7 +37,7 @@ <h2>Fact: Landscape saves you money</h2>
 	</dl>
 	<p>Figures based on a deployment of 1000 desktops</p>
 </div><!-- /.row -->
-	
+
 <div class="row">
 	<h3>It&rsquo;s all about automation</h3>
 	<div class="six-col">
@@ -43,7 +46,7 @@ <h3>It&rsquo;s all about automation</h3>
 	<div class="six-col last-col">
 		<p>Landscape allows administrators to do everything they can do manually in the terminal with established Linux administration tools, but for thousands of machines at once. And the learning curve for experienced team members is effectively flat, alleviating the need for costly and time-consuming training.</p>
 	</div><!-- /.six-col -->
-	<p><a href="/management/landscape-features">Read more about Landscape&rsquo;s features &rsaquo;</a></p>
+	<p><a href="/management/landscape-features">Read more about Landscape&rsquo;s features&nbsp;&rsaquo;</a></p>
 </div><!-- /.row -->
 
 <div class="row">
@@ -77,5 +80,8 @@ <h3>Already using Puppet or Nagios?</h3>
 		<img src="{{ STATIC_URL }}img/third-party-logos/logo-puppet.png" alt="Puppet" width="150" height="47" />
 	</div><!-- /.six-col -->
 </div><!-- /.row -->
+
+{% 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/shared/_contextual_footer.html b/templates/management/shared/_contextual_footer.html
old mode 100644
new mode 100755
index 63c0d669d90..f2ffd8b8f63
--- a/templates/management/shared/_contextual_footer.html
+++ b/templates/management/shared/_contextual_footer.html
@@ -1,14 +1,14 @@
-	<div class="feature-two three-col">
+	<div class="feature-two four-col">
 		<h3>Try Landscape for free for 30 days</h3>
 		<p>For a limited period, you can try Landscape without subscribing to Ubuntu Advantage. Register for your 30 day free trial, to see the features for yourself.</p>
 		<p><a href="https://landscape.canonical.com/trial-registration">Try Landscape for free for 30 days&nbsp;&rsaquo;</a></p>
 	</div>
-	<div class="feature-three three-col">
+	<div class="feature-three four-col">
 		<h3>Contact us today</h3>
 		<p>Landscape is part of the Ubuntu Advantage service package, delivered by Canonical. To talk to a member of our team about the benefits it could bring to your organisation.</p>
 		<p><a href="/management/contact-us" class="link-cta-ubuntu">Contact us today</a></p>
 	</div>
-	<div class="feature-four three-col last-col">
+	<div class="feature-four four-col last-col">
 		<h3>Further reading</h3>
 		{% include "templates/_further_reading_links.html" %}
 	</div>
diff --git a/templates/management/shared/_landscape_trial.html b/templates/management/shared/_landscape_trial.html
old mode 100644
new mode 100755
index 315bdc79343..d8799eacfe2
--- a/templates/management/shared/_landscape_trial.html
+++ b/templates/management/shared/_landscape_trial.html
@@ -3,6 +3,6 @@
 		<div class="eight-col">
 			<h3>Try Landscape for free for 30 days</h3>
 			<p>For a limited period, you can try Landscape without subscribing to Ubuntu Advantage. Register for your 30 day free trial, to see the features for yourself.</p>
-			<p><a class="link-cta-canonical" href="https://landscape.canonical.com/trial-registration">Try Landscape for free for 30 days</a> or <a class="link-arrow" href="/management/contact-us">contact us about Landscape</a></p>
+			<p><a class="link-cta-ubuntu" href="https://landscape.canonical.com/trial-registration">Try Landscape for free for 30 days</a> or <a href="/management/contact-us">contact us about Landscape&nbsp;&rsaquo;</a></p>
 		</div><!-- /.seven-col -->
 	</div><!-- /.row .landscape-trial -->
\ No newline at end of file
diff --git a/templates/management/thank-you.html b/templates/management/thank-you.html
old mode 100644
new mode 100755
index e90bd08bf30..36b326425a8
--- a/templates/management/thank-you.html
+++ b/templates/management/thank-you.html
@@ -7,35 +7,8 @@
 {% endblock second_level_nav_items %}
 
 {% block content %}
-<div class="row row-hero no-border">	
-	<h1>Thanks for getting in touch</h1>
-</div>
-
-<div class="row row-hero">
-	<h2>A member of our team will be in touch within <br/><strong>two working days</strong>.</h2>
-</div><!-- /.row-hero -->
-	
-<div class="row equal-height no-border">
-	<ul id="thank-you-extra" class="no-bullets">
-		<h3>More about our enterprise services</h3>
-		<li class="advantage four-col first">
-			<h4>Ubuntu Advantage</h4>
-			<p>Purchase our desktop support and access Ubuntu experts whenever you need.</p>
-			<p><a href="/cloud/management">Learn about Ubuntu Advantage &rsaquo;</a></p>
-		</li>
-		<li class="cloud four-col">
-			<h4>Ubuntu Cloud</h4>
-			<p>Our OpenStack-based public and private cloud platform.<br/><br/></p>
-			<p><a href="/cloud">Learn about Ubuntu Cloud &rsaquo;</a></p>
-		</li>
-		<li class="jumpstart four-col last-col">
-			<h4>Cloud Jumpstart</h4>
-			<p>Let a Canonical engineer build a seed cloud on your premises in just five days.</p>
-			<p><a href="/cloud/private-cloud/jumpstart">Learn about Cloud Jumpstart &rsaquo;</a></p>
-		</li>
-	</ul>
-</div><!-- end row-->
-	
+{% 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
old mode 100644
new mode 100755
index 88535d316a1..37a2b123c0c
--- a/templates/management/ubuntu-advantage.html
+++ b/templates/management/ubuntu-advantage.html
@@ -16,26 +16,33 @@ <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>
 
-		<p class="twelve-col"><a class="link-cta-canonical" href="http://shop.canonical.com/index.php?cPath=41" onclick="_gaq.push(['_trackEvent', 'Shop', 'Ubuntu Advantage', 'From management/ubuntu-advantage Buy now button']);">Buy now</a> <span>or <a href="/management/contact-us">contact us about Ubuntu Advantage &rsaquo;</a></span></p>
+		<p class="twelve-col"><a class="link-cta-ubuntu" href="http://shop.canonical.com/index.php?cPath=41" onclick="_gaq.push(['_trackEvent', 'Shop', 'Ubuntu Advantage', 'From management/ubuntu-advantage Buy now button']);">Buy now</a> <span>or <a href="/management/contact-us">contact us about Ubuntu Advantage&nbsp;&rsaquo;</a></span></p>
 	</div><!-- /.eight-col -->
-		
+	<div class="four-col last-col">
+		<img src="{{ STATIC_URL }}img/management/ubuntu-advantage/image-ubuntuadvantage.svg" alt="" width="378" height="180" class="for-tablet" />
+	</div>
+
 </div><!-- .row row-hero -->
 
 <div class="row row-quote">
-	<blockquote cite="http://www.guardian.co.uk/technology/blog/2009/oct/27/ubuntu-koala-windows7-review">
-			<p>&ldquo;We worked very closely with Canonical. Their support has been invaluable in the development, deployment and support phases <br />of the project.&rdquo;</p>
-			<p><cite>Antonio Jos&eacute; S&aacute;enz Alban&eacute;s, Chief Technology Officer, Isotrol</cite></p>
-		</blockquote>
+	<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>
+
 </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>
 		<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 &rsaquo;</a></p>
+		<p><a href="/desktop/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">
+		<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>
@@ -43,14 +50,14 @@ <h3>Stateless</h3>
 					<p><span>$20</span> per desktop</p>
 				</div>
 			</li>-->
-			<li class="col">
+			<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="col last-col">
+			<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">
@@ -63,12 +70,15 @@ <h3>Advanced</h3>
 
 <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>
 		<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 &rsaquo;</a></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">
+		<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>
@@ -96,31 +106,34 @@ <h3>Advanced</h3>
 
 <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>
 		<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 &rsaquo;</a></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">
+		<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 <br/>availability zone</p>
+					<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 <br/>availability zone</p>
+					<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 <br/>availability zone</p>
+					<p><span>&dollar;350,000</span> per year per availability zone</p>
 				</div>
 			</li>
 		</ul>
@@ -137,7 +150,10 @@ <h2>Dedicated server available</h2>
 			<p>If you&rsquo;d prefer a dedicated server running behind your firewall, Landscape can be installed on private hardware. This is functionally identical to the hosted service, but you control the hardware.</p>
 			<p>Whether Landscape fits your needs better as a hosted service or dedicated server, it&rsquo;s only available with a subscription to Ubuntu Advantage.</p>
 		</div><!-- /.six-col -->
-	<p class="twelve-col"><a href="/management/working-with-landscape">Find out more about working with Landscape &rsaquo;</a></p>
+	<p class="twelve-col"><a href="/management/working-with-landscape">Find out more about working with Landscape&nbsp;&rsaquo;</a></p>
 </div><!-- /.row -->
+
+{% 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
old mode 100644
new mode 100755
index 65cfb63876c..db2b056c33b
--- a/templates/management/working-with-landscape.html
+++ b/templates/management/working-with-landscape.html
@@ -13,22 +13,26 @@ <h1>Working with Landscape</h1>
 		<div class="eight-col">
 			<p>Landscape provides a single, easy-to-use, browser-based control panel, through which you can manage your machines from anywhere. 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. Most important of all however, is Landscape&rsquo;s ease of use. In fact, for experienced Linux administrators, the learning curve is practically non-existent.</p>
 		</div><!-- /.eight-col -->
-			<p class="twelve-col"><a class="link-cta-canonical" href="https://landscape.canonical.com/trial-registration">Get a free 30-day trial</a> or <a href="/management/contact-us">contact us about Landscape &rsaquo;</a></p>
+			<p class="twelve-col"><a class="link-cta-ubuntu" href="https://landscape.canonical.com/trial-registration">Get a free 30-day trial</a> or <a href="/management/contact-us">contact us about Landscape&nbsp;&rsaquo;</a></p>
 	</div><!-- /.row .row-hero -->
-	
+
 	<div id="landscape-videos" class="row">
 		<div class="six-col">
-			<iframe width="442" height="249" src="http://www.youtube.com/embed/yaFE4g8EcvI?rel=0&amp;showinfo=0" frameborder="0" allowfullscreen></iframe>
+			<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">
-			<iframe width="442" height="249" src="http://www.youtube.com/embed/mSfMn0eWc4A?rel=0&amp;showinfo=0" frameborder="0" allowfullscreen></iframe>
+			<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>
+			</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 -->
-	
+
 	<div class="row">
 		<h3>Serious scalability</h3>
 		<div class="six-col">
@@ -43,17 +47,19 @@ <h3>Serious scalability</h3>
 	</div><!-- /.row .no-border -->
 
 	<div id="landscape-api-video" class="row">
-		<h3>Easier asset management</h3> 
+		<h3>Easier asset management</h3>
 		<div class="six-col">
 			<p>Landscape includes extensive asset tracking capabilities, including a full hardware inventory.  This gives you a high level of detail on managed devices and a complete software inventory spanning all installed, installable and upgradable packages. It also provides a comprehensive search syntax to perform queries on this data, enabling you to find machines with detailed criteria, such as &ldquo;find all laptops and desktops with an NVIDIA video card&rdquo; (&lsquo;tag:laptop OR desktop display.product:NVIDIA), or &ldquo;identify all laptops running Natty that require security updates&rdquo; (&lsquo;tag:laptop distribution:natty alert:security-upgrades&rsquo;).</p>
 		</div><!-- /.six-col -->
 		<div class="six-col last-col">
-			<iframe width="442" height="249" src="http://www.youtube.com/embed/N6iWVBp6gU4?rel=0&amp;showinfo=0" frameborder="0" allowfullscreen></iframe>
+			<div class="video-container">
+				<iframe width="442" height="249" src="http://www.youtube.com/embed/N6iWVBp6gU4?rel=0&amp;showinfo=0" frameborder="0" allowfullscreen></iframe>
+			</div>
 		</div><!-- /.six-col -->
 	</div><!-- /#landscape-api-video -->
 
 	<div class="row">
-		<h3>A powerful, scriptable API</h3> 
+		<h3>A powerful, scriptable API</h3>
 		<div class="six-col">
 			<p>All administrators want customised systems management systems that reflect the exact requirements of their organisation. Landscape delivers this with a central console you can use to automate tasks, whether they&rsquo;re managed directly or through the API.</p>
 			<p>By scripting to Landscape&rsquo;s API, you can use Bash or Python to craft custom workflows (with full tab-expansion hinting support in the shell client) that deliver the best of both worlds: they are highly-customised, yet built on components delivered, QA-tested and maintained by Canonical&rsquo;s engineers &ndash; not you and your overworked colleagues.</p>
@@ -61,17 +67,19 @@ <h3>A powerful, scriptable API</h3>
 		<div class="six-col last-col">
 			<p>API access to Landscape&rsquo;s functionality makes it easy to use Landscape alongside the management and monitoring tools you already use &ndash; whether they&rsquo;re scripts you&rsquo;ve developed in-house, or established open-source products like Nagios or Puppet. For example, via the API, Landscape can easily be integrated with desktop support systems to automatically generate trouble tickets, to export systems to a corporate asset-management system calculating asset depreciation or to provide data feeds for custom reporting or dashboarding. The possibilities are endless.</p>
 		</div><!-- /.six-col -->
-		<p class="container"><a class="link-arrow" href="/management/landscape-features">Learn more about Landscape's features</a></p>
+		<p class="container"><a href="/management/landscape-features">Learn more about Landscape's features&nbsp;&rsaquo;</a></p>
 	</div><!-- /.row -->
 
 	<div id="landscape-rbac-video" class="row">
 		<div class="six-col">
 			<h3>Role-based access control (RBAC)</h3>
 			<p>Landscape makes it easy to assign different levels of administration privileges to different individuals, enabling you to maintain strict controls over which operator does what on your machines. The built in RBAC features give you the flexibility to create custom levels and profiles, with a default configuration included to ensure that these features can be used out-of-the-box.</p>
-			<p><a class="link-arrow" href="/management/compliance">Find out more about compliance with Landscape</a></p>
+			<p><a href="/management/compliance">Find out more about compliance with Landscape&nbsp;&rsaquo;</a></p>
 		</div><!-- /.six-col -->
 		<div class="six-col last-col">
-			<iframe width="442" height="249" src="http://www.youtube.com/embed/OYrI1N6fDNE?rel=0&amp;showinfo=0" frameborder="0" allowfullscreen style="float:right;"></iframe>
+			<div class="video-container">
+				<iframe width="442" height="249" src="http://www.youtube.com/embed/OYrI1N6fDNE?rel=0&amp;showinfo=0" frameborder="0" allowfullscreen style="float:right;"></iframe>
+			</div>
 		</div><!-- /.six-col -->
 	</div><!-- /#landscape-rbac-video -->
 
@@ -89,5 +97,8 @@ <h3>Start using Landscape straight away</h3>
 			<p class="container"><a href="/management/ubuntu-advantage">How to get Landscape&nbsp;&rsaquo;</a></p>
 		</div>
 	</div><!-- /.row -->
+
+{% include "shared/_live_chat.html" %}
+
 {% endblock content %}
 {% block footer_extra %}{{ marketo }}{% endblock footer_extra %}
\ No newline at end of file
diff --git a/templates/mu-b760b7ee-790eb464-8b1bbe62-de00513f.html b/templates/mu-b760b7ee-790eb464-8b1bbe62-de00513f.html
old mode 100644
new mode 100755
diff --git a/templates/partners/_nav_secondary.html b/templates/partners/_nav_secondary.html
old mode 100644
new mode 100755
index 99be4a69a57..0ac7816a450
--- a/templates/partners/_nav_secondary.html
+++ b/templates/partners/_nav_secondary.html
@@ -1,8 +1,9 @@
-	<ul{% if list_class %} class="{{ list_class }}"{% endif %}>
+	<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
old mode 100644
new mode 100755
index 3ac0f571e05..3fabbd7c910
--- a/templates/partners/_nav_tertiary.html
+++ b/templates/partners/_nav_tertiary.html
@@ -1,22 +1,22 @@
 {% if level_2 == 'dell' %}
-	<ul>
+	<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>
+	<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>
+	<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>
+	<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>
diff --git a/templates/partners/arm.html b/templates/partners/arm.html
old mode 100644
new mode 100755
index 51b72ad4cc8..f4d2c08c89b
--- a/templates/partners/arm.html
+++ b/templates/partners/arm.html
@@ -13,17 +13,11 @@ <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/partners-logo-arm.png" alt="ARM logo" /></span>
+	<span><img src="{{ STATIC_URL }}img/partners/arm/logo-arm.png" alt="ARM logo" class="priority-0" /></span>
 </div><!-- / .row -->
-<div class="row row-grey row-image-centered">
-	<span><img src="{{ STATIC_URL }}img/partners/pictos-server-hp-ubuntu.png" width="230" height="215" /></span>
-	<div class="six-col">
-		<h2>Scale out at speed with Ubuntu on HP Moonshot</h2>
-		<p>Ubuntu, the leading OS for x86 and ARM Hyperscale is partnering with HP to disrupt the server marketplace with <br/>HP Moonshot system &mdash; launching April 2013.</p>
-		<p>Ubuntu is the scale out leader and is fully integrated in the <br/>HP Moonshot system.</p>
-		<p><a href="/partners/hp/moonshot">Find out more &rsaquo;</a></p>
-	</div><!-- /.six-col -->
-</div><!-- /.row -->
+
+{% include "shared/_moonshot_promo.html" %}
+
 <div class="row">
 	<h2>ARM architecture</h2>
 	<div>
@@ -60,8 +54,8 @@ <h2>Hyperscale solutions</h2>
 <div class="row">
 	<h2>More information</h2>
 	<ul>
-		<li><a class="link-arrow" 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</a></li>
-		<li><a class="link-arrow" 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</a></li>
+		<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
old mode 100644
new mode 100755
index 6a92a5250ff..5a8075eb4b0
--- a/templates/partners/asus/index.html
+++ b/templates/partners/asus/index.html
@@ -32,16 +32,16 @@ <h2>ASUS 1015E with Ubuntu 12.04 LTS</h2>
 
 
 
-<div class="row no-border">
+<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 -->
-	<div class="six-col last-col">
-		<img src="{{ STATIC_URL }}img/partners/partners-certified-220h.png" alt="" />
-	</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
new file mode 100755
index 00000000000..a86eb483f7a
--- /dev/null
+++ b/templates/partners/backed-by-canonical.html
@@ -0,0 +1,97 @@
+{% 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 "templates/_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
old mode 100644
new mode 100755
diff --git a/templates/partners/contact-us.html b/templates/partners/contact-us.html
old mode 100644
new mode 100755
index b5e0e3f865d..01576f4cb0a
--- a/templates/partners/contact-us.html
+++ b/templates/partners/contact-us.html
@@ -27,35 +27,38 @@
 
 {% block content %}
 <div class="row row-hero no-border">
-	<div class="eight-col no-margin-bottom">
+	<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_1069" name="mktForm_1069">
+		<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' /><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' /><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='text' value=""  maxlength='255' tabIndex='3' /><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='text' value=""  maxlength='255' tabIndex='4' /><span class='mktFormMsg'></span></span></li>
+					<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='6' /><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' /><span class='mktFormMsg'></span></span></li>
+					<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'><option value='Select Country:' 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>
-					<p><span class='mktFormMsg'></span></p></span>
+					<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='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>
-					<p><span class='mktFormMsg'></span></p></span>
+					<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>
@@ -63,12 +66,11 @@ <h3>Your company</h3>
 				<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'>
+					<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>
-					<p><span class='mktFormMsg'></span></p></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_1015&quot;)); return false;">&nbsp;<input style="display: none;" id="mktFrmReset" type="reset" value="Clear" name="resetButton" onclick="formReset(document.getElementById(&quot;mktForm_1015&quot;)); return false;"></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>
@@ -105,12 +107,13 @@ <h3>Partner programme</h3>
 
 		<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
old mode 100644
new mode 100755
index cbb20d860f9..c96b8f2fdfd
--- a/templates/partners/dell/dellxps.html
+++ b/templates/partners/dell/dellxps.html
@@ -7,52 +7,54 @@
 {% endblock second_level_nav_items %}
 
 {% block content %}
-<div class="row row-hero">
-	<h1>Dell XPS 13 Developer Edition, <br />with Ubuntu 12.04 LTS</h1>
-	<div class="twelve-col">
-		<div class="six-col append-six">
-			<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><!-- /.twelve-col -->
-
+<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">
-		  <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 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">
-	<div id="dell-buy-now" class="clearfix">
+<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 &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) &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) &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 &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 &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 &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 &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 &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 &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 &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 &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 &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) &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) &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 &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 &rsaquo;</a></li>
+				<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 -->
diff --git a/templates/partners/dell/index.html b/templates/partners/dell/index.html
old mode 100644
new mode 100755
index 75df6c0ec7e..624348173ae
--- a/templates/partners/dell/index.html
+++ b/templates/partners/dell/index.html
@@ -12,46 +12,47 @@
 		<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 &rsaquo;</a></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/partners/partners-logo-dell.png" alt="Dell" /></span>
+	<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/homepage/dell_servers.png" alt="dell_t420" width="328" height="117" />
-		
-		<blockquote cite="http://www.canonical.com/content/canonical-announces-certification-and-support-latest-dell-poweredge-servers">
-			<p class="pull-quote">&ldquo;Ubuntu is one of the leading enterprise-class Linux distributions and demand for the OS is growing among <br />hyperscale customers&rdquo;</p>
+		<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>		
+		<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/">
-				<p>&ldquo;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&rdquo;</p>
+			<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 &rsaquo;</a></p>
+			<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">
-				<p>&ldquo;With Ubuntu Server, Dell and Canonical, makers of Ubuntu, are in a great position to service hyperscale deployments&rdquo;</p>
+			<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 &rsaquo;</a></p>
+			<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">
-				<p>&ldquo;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.&rdquo;</p>
+			<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 &rsaquo;</a></p>
+			<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 -->
@@ -62,7 +63,7 @@ <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 &rsaquo;</a></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>
@@ -75,18 +76,18 @@ <h2>Professional support offerings</h2>
 	</div><!-- /.six-col -->
 </div><!-- /.row -->
 
-<div class="row no-border">
+<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 class="link-arrow" 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</a></li>
-				<li><a class="link-arrow" href="http://www.ubuntu.com/certification/server/make/Dell/">See all Dell server systems certified by Ubuntu</a></li>
+				<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 -->
-	<div class="six-col last-col">
-		<img src="{{ STATIC_URL }}img/partners/partners-certified-220h.png" alt="" />
-	</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
old mode 100644
new mode 100755
index 66a48523288..41a253c7689
--- a/templates/partners/find-a-partner/hardware.html
+++ b/templates/partners/find-a-partner/hardware.html
@@ -16,11 +16,10 @@
 		<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>
-	<!--a href="http://www.canonical.com/partners/become-a-partner" class="link-cta-ubuntu right">Apply to become a partner</a> -->
 </div><!-- / .row -->
 
 <div class="row row-image-centered">
-	<span><img src="{{ STATIC_URL }}img/pictograms/pictogram-server-grey-124.png" alt="" alt="" width="124" height="124" /></span>
+	<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>
 
@@ -36,18 +35,18 @@ <h2>Get ahead with Ubuntu and Canonical</h2>
 	<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 &rsaquo;</a></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/pictogram-partner-124x124.png" alt="" alt="" width="124" height="124" /></span>
+	<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/pictogram-discussion-124x124.gif" alt="" alt="" width="124" height="124" /></span>
+	<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 &rsaquo;</a></p>
+		<p><a href="/partners/contact-us">Join the Technical Partner Programme&nbsp;&rsaquo;</a></p>
 	</div>
 </div><!-- /.row -->
 
@@ -55,23 +54,39 @@ <h2>Join the Technical Partner Programme</h2>
 <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 class="four-col box">
+		
+		<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 last-col">
+		<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>
@@ -81,12 +96,12 @@ <h2>Technical partners</h2>
 			<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 last-col">
+		<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">
+		<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>
@@ -96,12 +111,12 @@ <h2>Technical partners</h2>
 			<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 last-col">
+		<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">
+		<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>
@@ -110,7 +125,6 @@ <h2>Technical partners</h2>
 			<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 -->
diff --git a/templates/partners/find-a-partner/index.html b/templates/partners/find-a-partner/index.html
old mode 100644
new mode 100755
index b4d0e93ae24..811c8fa43c6
--- a/templates/partners/find-a-partner/index.html
+++ b/templates/partners/find-a-partner/index.html
@@ -12,7 +12,7 @@
 		<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-partner-purple-160x160.png" width="160" height="160" alt="Partner" /></span>
+	<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">
@@ -20,23 +20,23 @@ <h1>Find a partner</h1>
 		<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>
+		<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 &rsaquo;</a></p>
+		<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 &rsaquo;</a></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 &rsaquo;</a></p>
+		<p><a href="/partners/find-a-partner/hardware">View hardware partners&nbsp;&rsaquo;</a></p>
 	</div>
 </div><!-- / .row -->
 
diff --git a/templates/partners/find-a-partner/isv.html b/templates/partners/find-a-partner/isv.html
old mode 100644
new mode 100755
index a616d4d009c..a9f1d8e8d35
--- a/templates/partners/find-a-partner/isv.html
+++ b/templates/partners/find-a-partner/isv.html
@@ -1,11 +1,11 @@
-{% extends "partners/base_partners.html" %} {% block title %}ISV partners{% endblock %} 
+{% extends "partners/base_partners.html" %} {% block title %}ISV partners{% endblock %}
 
-{% block second_level_nav_items %} {% include "templates/_nav_breadcrumb.html" with section_title="Partners" subsection_title="Find a partner" page_title="Find a partner" %} {% endblock second_level_nav_items %} 
+{% block second_level_nav_items %} {% include "templates/_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="http://www.canonical.com/partners/become-a-partner" class="link-cta-ubuntu right">Apply to become a partner</a>
+  <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">
@@ -174,9 +174,9 @@ <h1 class="eight-col">ISV partners</h1>
       </li>
 
       <li class="four-col box">
-          <a href="http://www.fermat-consulting.com"><img src="{{ STATIC_URL }}img/logos/partners/fermat.png" alt="Fermat Consulting"></a>
+          <img src="{{ STATIC_URL }}img/logos/partners/fermat.png" alt="Fermat Consulting">
 
-          <p><a href="http://www.fermat-consulting.com">Fermat Consulting</a> 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>
+          <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>
 
@@ -266,7 +266,7 @@ <h1 class="eight-col">ISV partners</h1>
       </li>
 
       <li class="four-col box">
-          <a href="http://www.beyondtrust.com/"><img src="{{ STATIC_URL }}img/logos/partners/beyondtrustlogo.jpeg" alt="beyondtrust"></a>
+          <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>
@@ -423,9 +423,9 @@ <h1 class="eight-col">ISV partners</h1>
       </li>
 
       <li class="four-col box">
-          <a href="http://www.rightscale.com/lp/default.php?ls=Referral&amp;sd=&lt;http://www.rightscale.com/lp/default.php?ls=Referral&amp;sd=&gt;Partner_Ubuntu_Partnerpage&amp;campaign=70170000000KyOn"><img src="{{ STATIC_URL }}img/logos/partners/rightscale_logo.png" alt="RightScale"></a>
+          <img src="{{ STATIC_URL }}img/logos/partners/rightscale_logo.png" alt="RightScale">
 
-          <p><a href="http://www.rightscale.com/lp/default.php?ls=Referral&amp;sd=&lt;http://www.rightscale.com/lp/default.php?ls=Referral&amp;sd=&gt;Partner_Ubuntu_Partnerpage&amp;campaign=70170000000KyOn">RightScale</a> 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>
+          <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">
@@ -504,9 +504,9 @@ <h1 class="eight-col">ISV partners</h1>
       </li>
 
       <li class="four-col box">
-          <a href="http://www.unoware.com.br"><img src="{{ STATIC_URL }}img/logos/partners/Unoware_logo.scaled.png.jpg" alt="Unoware"></a>
+          <img src="{{ STATIC_URL }}img/logos/partners/Unoware_logo.scaled.png.jpg" alt="Unoware">
 
-          <p><a href="http://www.unoware.com.br">Unoware</a> 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>
+          <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">
@@ -522,15 +522,15 @@ <h1 class="eight-col">ISV partners</h1>
       </li>
 
       <li class="four-col box">
-          <a href="http://www.vipcomag.de/english/aktuell/welcome.asp"><img src="{{ STATIC_URL }}img/logos/partners/VIPcom.png" alt="VIPcom GmbH"></a>
+          <img src="{{ STATIC_URL }}img/logos/partners/VIPcom.png" alt="VIPcom GmbH">
 
-          <p><a href="http://www.vipcomag.de/english/aktuell/welcome.asp">VIPcom GmbH</a> 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>
+          <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">
-          <a href="http://VirtualAppliances.net"><img src="{{ STATIC_URL }}img/logos/partners/virtualappliances.png" alt="Virtual Appliances"></a>
+          <img src="{{ STATIC_URL }}img/logos/partners/virtualappliances.png" alt="Virtual Appliances">
 
-          <p><a href="http://VirtualAppliances.net">Virtual Appliances</a> are nano-sized Linux virtual machines with web user interfaces for deploying instant infrastructure and applications which run on vmware/xen/virtualpc/virtualiron.</p>
+          <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">
@@ -552,9 +552,9 @@ <h1 class="eight-col">ISV partners</h1>
       </li>
 
       <li class="four-col box">
-          <a href="http://w3.widesoft.ch"><img src="{{ STATIC_URL }}img/logos/partners/w3internetsolutions.png" alt="W3 Internet Solutions "></a>
+          <img src="{{ STATIC_URL }}img/logos/partners/w3internetsolutions.png" alt="W3 Internet Solutions ">
 
-          <p><a href="http://w3.widesoft.ch">W3 Internet Solutions</a> 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>
+          <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">
diff --git a/templates/partners/find-a-partner/reseller.html b/templates/partners/find-a-partner/reseller.html
old mode 100644
new mode 100755
index 4bed2566f89..50b4a6874d5
--- a/templates/partners/find-a-partner/reseller.html
+++ b/templates/partners/find-a-partner/reseller.html
@@ -11,44 +11,50 @@
 	<div class="eight-col">
 		<h1>Reseller partners</h1>
 	</div><!-- / .five-col -->
-	<a href="http://www.canonical.com/partners/become-a-partner" class="link-cta-ubuntu right">Apply to become a partner</a>
+	<a href="/partners/contact-us" class="link-cta-ubuntu right">Apply to become a partner</a>
 </div><!-- / .row -->
 
-<div class="row">
+<div class="row equal-height">
 	<h2 id="global">Global</h2>
-	<div class="four-col">
-	    <div class="box">
+	<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>
 
+<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/LSD3.jpg" alt="Linux System Dynamics" /></a>
-	        <p><a href="http://www.lsd.co.za/">Linux System Dynamics</a>  (LSD) is a young, dynamic and energetic company founded in 2002 in Southern Africa. LSD 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 class="four-col">
-	<h2 id="as">Asia</h2>
-	    <div class="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>
-	<div class="four-col last-col">
-	<h2 id="na">North America</h2>
-	    <div class="box">
-			<h3 id="United States of America">United States of America</h3>
-	        <a href="http://www.csscorp.com/"><img src="{{ STATIC_URL }}img/logos/partners/csscorp1.png" alt="CSS Corp" /></a>
-	        <p><a href="http://www.csscorp.com/">CSS Corp</a> Head-quartered in San Jose, CA has global operations centers in Chennai (India), Utah (USA), Poland (Europe) and in the Philippines offering Enterprise and Consumer Technology Support, Application Life Cycle Management, Training, Consulting Services and Remote Infrastructure Management Services. Ubuntu Server/Desktop and UEC are key focus areas.</p>
+	        <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">
@@ -67,8 +73,8 @@ <h3 id="Norway">Norway</h3>
 
 	<div class="four-col last-col box">
 		<h3 id="Russian Federation">Russian Federation</h3>
-        <a href="http://www.ncpr.su/en"><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/en">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>
+        <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">
@@ -89,41 +95,40 @@ <h3 id="Germany">Germany</h3>
         <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>Germany</h3>
+		<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 asmonitoring, system and configuration management. B1 helps turn Open Source innovationinto Enterprise reliability and performance &mdash; nationally and internationally.</p>
+        <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>
+		<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>
+    	<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.neuwald.com.br/"><img src="{{ STATIC_URL }}img/logos/partners/LogoNeuwald_Horizontal_Grande.png" alt="Neuwald IT" /></a>
-	        <p><a href="http://www.neuwald.com.br/">Neuwald IT</a> it&#39;s a company based in Brazil, founded in 2007 with focus on advanced IT solutions. Our products and services help keep the IT environment of our customers up and running with high availability and excellent performance. Our customers include federal government, local governments, small and big private companies. Our team is recognized by excellent technical ...</p>
+    	<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>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, corporative 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 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>
+		<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 -->
 
diff --git a/templates/partners/hp/index.html b/templates/partners/hp/index.html
old mode 100644
new mode 100755
index 54ab5a99701..69f689dd55f
--- a/templates/partners/hp/index.html
+++ b/templates/partners/hp/index.html
@@ -19,30 +19,21 @@ <h1>HP and Ubuntu</h1>
 	</div><!-- /.six-col -->
 	<span><img src="{{ STATIC_URL }}img/partners/partners-logo-hp.png" alt="Dell" /></span>
 </div><!-- / .row -->
-<div class="row row-grey row-image-centered">
-	<span><img src="{{ STATIC_URL }}img/partners/pictos-server-hp-ubuntu.png" width="230" height="215" /></span>
-	<div class="six-col">
-		<h2>Scale out at speed with Ubuntu on HP Moonshot</h2>
-		<p>Ubuntu, the leading OS for x86 and ARM Hyperscale, is partnering with HP to disrupt the server marketplace.</p>
-		<p>Ubuntu, the scale-out leader, is fully integrated in the HP Moonshot System.</p>
-		<p><a href="/partners/hp/moonshot">Find out more &rsaquo;</a></p>
-	</div><!-- /.six-col -->
-</div><!-- /.row -->
-<div class="row">
 
+{% include "shared/_moonshot_promo.html" %}
+
+<div class="row">
 	<div class="six-col">
 		<blockquote class="pull-quote">
-			<p>
-				&ldquo;Enterprises are embracing open-source cloud solutions to increase workload portability and avoid vendor lock-in&rdquo;
-				<cite>Saar Gillai, VP and GM <br />Converged Cloud, HP</cite>
-			</p>
+			<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 &rsaquo;</a></p>
+		<p><a href="/cloud/contact-us">Find out more&nbsp;&rsaquo;</a></p>
 	</div>
 
 </div><!-- /.row -->
@@ -51,7 +42,7 @@ <h2>HP Cloud with Ubuntu</h2>
 		<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 &rsaquo;</a></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>
@@ -60,8 +51,8 @@ <h2>Ubuntu for HP PCs</h2>
 	<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 &rsaquo;</a></p>
-		<!-- <p><a class="" href="#">Contact us &rsaquo;</a></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>
@@ -71,18 +62,18 @@ <h2>Ubuntu and HP in education</h2>
 		<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 data centres 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 &rsaquo;</a></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/pictograms/pictograms-certified.png" width="420" height="120" alt="" />
+		<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 class="link-arrow" href="http://www.ubuntu.com/certification/make/HP/">See the HP Certification and Support matrix</a></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
old mode 100644
new mode 100755
index afa9ef0ad30..94d2d86b37a
--- a/templates/partners/hp/moonshot.html
+++ b/templates/partners/hp/moonshot.html
@@ -9,87 +9,98 @@
 {% block content %}
 <div class="row row-hero">
 	<div class="seven-col">
-		<h1>HP Moonshot launched with Ubuntu</h1>
-		<p>Ubuntu, as the lead operating system platform for x86 and ARM-based HP Moonshot Systems, featured extensively at the launch of the program in April 2013.</p>
+		<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">
-		<iframe width="343" height="193" src="http://www.youtube.com/embed/JmoovOU28UA?rel=0" frameborder="0" allowfullscreen></iframe>
+		<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>HP Moonshot and Ubuntu work together to disrupt the Hyperscale market</h2>
-		<p>Ubuntu Server is the only <abbr title="operating system">OS</abbr> fully operational today across HP Moonshot x86 <br/>and ARM servers, launched in April 2013.</p>
-		<p>Ubuntu is recognised as the leader in scale out and Hyperscale. Together, Canonical and HP are delivering massive reductions in data-center energy, space and costs.</p>
+		<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/moonshot-hero.png" width="200" />
+		<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">
-		
-		<p class="pull-quote">&ldquo;Canonical has been working with HP for the past two years <br/>on HP Moonshot, and with Ubuntu, customers can achieve higher performance with greater manageability across both x86 and ARM chip sets&rdquo;</p>
-		<cite>Paul Santeler, VP &amp; GM, Hyperscale Business Unit, HP</cite>
+		<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>Ubuntu fully certified for <br/>HP Moonshot System</h2>
-		<p>The HP Moonshot Project is dedicated to the development of a new family of software defined servers with extreme low-energy processing technology designed to address surging infrastructure pressures.</p>
-		<p><a href="/server/contact-us">Contact us about Ubuntu and HP Moonshot &nbsp;&rsaquo;</a></p>
+		<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>HP Pathfinder</h2>
+		<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">
-	<span>
+	<div class="six-col text-center">
 		<img src="{{ STATIC_URL }}img/partners/hp-moonshot-server.jpg" width="365" height="305" alt="HP moonshot server" />
-	</span>
+	</div>
 	<div class="six-col last-col">
-		<h2>The world&rsquo;s first platform <br/>for web scale</h2>
-		<p>HP Moonshot system with Ubuntu is designed to deliver breakthrough efficiency  in density, energy, cost and simplicity.  </p>
-		<p>HP Moonshot system is the first solution with a modern architecture engineered for the new style of IT, utilising a revolutionary server designed to help customers significantly reduce physical space, energy use and costs.</p>
-		<p><a href="http://www.hp.com/go/moonshot">Find out more about HP Moonshot &rsaquo;</a></p>
+		<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 row-image-centered">
+<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">
-		<h2>Ubuntu, the Hyperscale OS leader</h2>
-		<p>Ubuntu Server is the premier Hyperscale computing platform for x86 and ARM technologies and is deployed in the majority of Hyperscale systems available today. The massive requirements of scale-out and hyperscale servers have been built into Ubuntu Server, as well the Landscape for systems management and Juju orchestration tools.</p>
-		<p><a href="/server/hyperscale">Ubuntu Server for Hyperscale &rsaquo;</a></p>
+		<p><a href="/server/hyperscale">Find out more about Ubuntu Server for Hyperscale&nbsp;&rsaquo;</a></p>
 	</div>
-	<span>
-		<img src="{{ STATIC_URL }}img/pictograms/pictogram-server-143x143.png" width="143" height="143" alt="" />
-	</span>
 </div><!-- /.row -->
-<div class="row no-border">
+<div class="row">
 	<div class="eight-col no-margin">
-		<h2>Moonlight romance</h2>
-		<p>Ubuntu works hand in hand with HP Project Moonshot:</p>
+		<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="six-col">
-		<ul class="list-ubuntu">
+	<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>Canonical has been working with HP for the past two years on HP Moonshot</li>
+			<li class="last-item">Canonical is a member of HP&rsquo;s Pathfinder Innovation Ecosystem</li>
 		</ul>
-	</div>
-	<div class="six-col last-col">
-		<ul class="list-ubuntu">
+		<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>Canonical is a member of HP&rsquo;s Pathfinder Innovation Ecosystem</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="/server/contact-us">Contact us to discuss how Canonical can enable your HP Moonshot System&nbsp;&rsaquo;</a></p>
+		<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
old mode 100644
new mode 100755
index 6bee0304e83..4a19bd7db8a
--- a/templates/partners/ibm.html
+++ b/templates/partners/ibm.html
@@ -19,15 +19,15 @@ <h2>IBM DB2 9.7 supports Ubuntu LTS</h2>
 		<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">
-	<div class="six-col">
-		<img src="{{ STATIC_URL }}img/partners/partners-certified-220h.png" alt="" />
-	</div><!-- /.six-col -->
+<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 class="link-arrow" href="http://www.ubuntu.com/certification/server/make/IBM/">See all IBM systems certified by Ubuntu</a></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 -->
diff --git a/templates/partners/index.html b/templates/partners/index.html
old mode 100644
new mode 100755
index 494d0682600..2c781d7bc3f
--- a/templates/partners/index.html
+++ b/templates/partners/index.html
@@ -29,7 +29,7 @@ <h2>Find a partner</h2>
 			<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>
@@ -38,16 +38,16 @@ <h2>Certified software</h2>
 			<li><a href="/partners/contact-us">Certify your software&nbsp;&rsaquo;</a></li>
 		</ul>
 	</div><!-- / .four-col -->
- 
-	<div class="four-col last-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">
+		<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">
@@ -59,26 +59,21 @@ <h2>Become a partner</h2>
 		<p><a class="link-cta-ubuntu" href="/partners/contact-us">Contact Canonical</a></p>
 	</div>
 	<div class="six-col last-col">
-		<blockquote class="quote quote-canonical-white"> 
-			<p>&quot;Having Canonical teams working on OpenStack and its integration with Ubuntu is priceless.<br /> It's a very natural fit.&quot;</p>
-			<p>Thierry Carrez, Release Manager, OpenStack</p>
+		<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>
-
-<div class="row">
-	<div class="box-padded-feature">
-		<h3>Featured partners</h3>
-		<div>
-			<ul class="no-bullets inline inline-icons">
-				<li><img src="{{ STATIC_URL }}img/partners/openstack-logo.png" alt="OpenStack Cloud Softwear" /></li>
-				<li><img src="{{ STATIC_URL }}img/partners/ibm-logo.gif" alt="IBM" /></li>
-				<li><img src="{{ STATIC_URL }}img/partners/cloudera-logo.png" alt="Cloudera" /></li>
-				<li><img src="{{ STATIC_URL }}img/partners/dell-logo.jpg" alt="Dell" /></li>
-				<li><img src="{{ STATIC_URL }}img/partners/asus-logo.png" alt="ASUS" /></li>
-				<li><img src="{{ STATIC_URL }}img/partners/lenovo-logo.jpg" alt="Lenovo" /></li>
-			</ul>
-		</div>
-	</div><!-- / .box -->
-</div><!-- / .row -->
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/partners/partner-programmes/index.html b/templates/partners/partner-programmes/index.html
old mode 100644
new mode 100755
index e22e18db449..a82ed517c1e
--- a/templates/partners/partner-programmes/index.html
+++ b/templates/partners/partner-programmes/index.html
@@ -1,5 +1,8 @@
 {% 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 %}
@@ -21,67 +24,38 @@ <h1>Partner programmes</h1>
 </div><!-- / .row -->
 
 <div class="row">
-	<h2 class="twelve-col isv-partner">ISV partner programme</h2>
-	<div class="twelve-col vertical-divider">
-		<div class="six-col">
-		<p>Canonical&rsquo;s ISV partner programme offers a range of tools and resources to ensure that our partners&rsquo; applications work well with Ubuntu. We can also help our partners reach new marketplaces through our worldwide sales and channel partner programmes. It&rsquo;s a great time to partner with Canonical and, by working with our ISV software partners or by becoming one yourself, you can benefit from Ubuntu&rsquo;s growing popularity in companies around the world.</p>
-		<p>The programme includes:</p>
-		<ul class="list-canonical smaller">
-			<li>Priority developer support</li>
-			<li>Certification and packaging assistance</li>
-			<li>Partner directory listing</li>
-			<li>Access to marketing collateral</li>
-			<li>Access to joint marketing and sales planning</li>
-		</ul>
-	</div>
-	<div class="six-col last-col">
-		<h3>How it works</h3>
-		<p>The ISV Partner Programme has been designed to encourage a close working relationship with our partners. Each partner has a dedicated sales and technical contact who can provide advice and help when you need it.</p>
-		<p>On application to become a partner, you will receive a commercial, technical and operational evaluation. If successful, you will gain access to marketing and sales collateral, webinars and onsite visits as required.</p>	
-	</div>
-</div>
-</div>
-
-<div class="row">
-	<h2 class="twelve-col reseller-partner">Reseller partner programme</h2>
-	<div class="twelve-col vertical-divider">
-	<div class="six-col">
-		<p>Canonical&rsquo;s Ubuntu Advantage programme provides enterprise customers with access to the tools and support they need to make the most of Ubuntu in their business. By joining the Ubuntu Advantage Reseller Programme, our partners can officially resell Ubuntu Advantage and expand their services portfolios.</p>
-		<p>The programme includes:</p>
-		<ul class="list-canonical smaller">
-			<li>Pre-sales support</li>
-			<li>Marketing campaign support</li>
-			<li>An assigned account manager</li>
-			<li>Fast access to technical resources</li>
-			<li>Increased exposure to potential customers</li>
-			<li>Partner directory listing</li>
-		</ul>
-	</div>
-	<div class="six-col last-col">
-		<h3>How it works</h3>	
-		<p>The Ubuntu Advantage Reseller Programme has been designed to encourage a close working relationship with our partners. Each partner has a dedicated sales and technical contact who can provide advice and help for any Ubuntu Advantage opportunities.</p>
-		<p>If you apply to become a partner, you will receive a commercial, technical and operational evaluation. If successful, you will gain access to marketing and sales collateral, webinars and onsite visits as required.</p>
-	</div>
-	</div>
-</div>
+	<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 hardware-partner">Hardware partner programme</h2>
-	<div class="twelve-col vertical-divider">
-	<div class="six-col">
-		<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>The programme includes:</p>
-		<ul class="list-canonical smaller">
-			<li>Official hardware testing and val</li>
-			<li>Custom development services</li>
-			<li>A global engineering network and support infrastructure</li>
-		</ul>
-	</div>
-	<div class="six-col last-col">
-		<h3>How it works</h3>
-		<p>The hardware partner programme supports your efforts to certify hardware, and provides access to resources and campaigns to bolster your marketing activities.</p>
-		<p>As a hardware partner you can choose to send hardware to be certified on Ubuntu by Canonical, or you can choose to run the test suite yourself and submit passing test results to Canonical for validation.</p>
-	</div>
-	</div>
-</div>
+	<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
old mode 100644
new mode 100755
index d974faffd47..8dc57b8a0d4
--- a/templates/partners/partner-services.html
+++ b/templates/partners/partner-services.html
@@ -7,9 +7,14 @@
 {% endblock second_level_nav_items %}
 
 {% block content %}
-<div class="row row-hero no-margin-bottom">
-	<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 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">
@@ -37,31 +42,32 @@ <h2>Hardware certification</h2>
 	<div class="twelve-col">
 		<h3>Certification features</h3>
 		<p>Key features of the hardware certification service are:</p>
-		
-		<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>
-				<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 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/shared/_contextual_footer.html b/templates/partners/shared/_contextual_footer.html
old mode 100644
new mode 100755
index 2e5e9c8d85a..b9b86a339ed
--- a/templates/partners/shared/_contextual_footer.html
+++ b/templates/partners/shared/_contextual_footer.html
@@ -1,17 +1,17 @@
 {% if level_2 == 'hp' %}
-		<div class="feature-three three-col">
+		<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 three-col last-col">
+		<div class="feature-four four-col last-col">
 			<h3>Further reading</h3>
 			{% include "templates/_further_reading_links.html" %}
 		</div>
 {% endif %}{% if level_2 != 'hp' %}
-		<div class="feature-four three-col last-col">
+		<div class="feature-four four-col last-col">
 			<h3>Further reading</h3>
 			{% include "templates/_further_reading_links.html" %}
 		</div>
diff --git a/templates/partners/thank-you.html b/templates/partners/thank-you.html
old mode 100644
new mode 100755
index d06340b9eb3..2c6bb1cd859
--- a/templates/partners/thank-you.html
+++ b/templates/partners/thank-you.html
@@ -6,39 +6,7 @@
 {% endblock second_level_nav_items %}
 
 {% block content %}
-
-<div class="row row-image-centered row-hero">
-	<div class="seven-col">
-		<h1>Thank you!</h1>
-		<h2>Thanks for your interest in the Canonical Partner Programme.</h2>
-		<p>We&rsquo;ll be in touch soon!</p>
-	</div>
-	<span>
-		<img src="{{ STATIC_URL }}img/devices/pictogram-smile-purple.png" width="164" height="162" alt="Smile pictogram" />
-	</span>
-</div><!-- /.row -->
-	
-<div class="row equal-height no-border">
-	<h3>More about our enterprise services</h3>
-	<ul id="thank-you-extra" class="no-bullets">
-		<li class="advantage four-col first">
-			<h4>Ubuntu Advantage</h4>
-			<p>Purchase our desktop support and access Ubuntu experts whenever you need.</p>
-			<p><a href="/cloud/management">Learn about Ubuntu Advantage &rsaquo;</a></p>
-		</li>
-		<li class="cloud four-col">
-			<h4>Cloud Jumpstart</h4>
-			<p>Let a Canonical engineer build a seed cloud on your premises in just five days.</p>
-			<p><a href="/cloud/private-cloud/jumpstart">Learn about Cloud Jumpstart &rsaquo;</a></p>
-		</li>
-		<li class="jumpstart four-col last-col">
-			<h4>Landscape</h4>
-			<p>Manage Ubuntu in the enterprise with our private cloud infrastructure platform based on OpenStack.</p>
-			<p><a href="/management">Learn about Landscape &rsaquo;</a></p>
-		</li>
-	</ul>
-</div><!-- end row-->
-	
+{% include "shared/_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 -->
diff --git a/templates/partners/ubuntu-certified/index.html b/templates/partners/ubuntu-certified/index.html
old mode 100644
new mode 100755
index 85232d4d1c8..7dfd3884d59
--- a/templates/partners/ubuntu-certified/index.html
+++ b/templates/partners/ubuntu-certified/index.html
@@ -9,8 +9,13 @@
 
 {% block content %}
 <div class="row row-hero no-border no-margin-bottom">
-	<h1>Ubuntu Certified</h1>
-	<p class="five-col">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 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">
diff --git a/templates/partners/ubuntu-certified/software.html b/templates/partners/ubuntu-certified/software.html
old mode 100644
new mode 100755
index 61d2e6f2522..920c93f48a8
--- a/templates/partners/ubuntu-certified/software.html
+++ b/templates/partners/ubuntu-certified/software.html
@@ -19,17 +19,17 @@ <h1>Certified software</h1>
 	    <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>
@@ -39,477 +39,477 @@ <h1>Certified software</h1>
       <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>
+
 		<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">
-	        <a href="http://www.fermat-consulting.com"><img src="{{ STATIC_URL }}img/logos/partners/fermat.png" alt="Fermat Consulting" /></a>
-	        <p><a href="http://www.fermat-consulting.com">Fermat Consulting</a> 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>
+	        <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">
-	        <a href="http://www.rightscale.com/lp/default.php?ls=Referral&amp;sd=&lt;http://www.rightscale.com/lp/default.php?ls=Referral&amp;sd=&gt;Partner_Ubuntu_Partnerpage&amp;campaign=70170000000KyOn"><img src="{{ STATIC_URL }}img/logos/partners/rightscale_logo.png" alt="RightScale" /></a>
-	        <p><a href="http://www.rightscale.com/lp/default.php?ls=Referral&amp;sd=&lt;http://www.rightscale.com/lp/default.php?ls=Referral&amp;sd=&gt;Partner_Ubuntu_Partnerpage&amp;campaign=70170000000KyOn">RightScale</a> 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>
+	        <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">
-	        <a href="http://www.unoware.com.br"><img src="{{ STATIC_URL }}img/logos/partners/Unoware_logo.scaled.png.jpg" alt="Unoware" /></a>
-	        <p><a href="http://www.unoware.com.br">Unoware</a> 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>
+	        <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">
-	        <a href="http://www.vipcomag.de/english/aktuell/welcome.asp"><img src="{{ STATIC_URL }}img/logos/partners/VIPcom.png" alt="VIPcom GmbH" /></a>
-	        <p><a href="http://www.vipcomag.de/english/aktuell/welcome.asp">VIPcom GmbH</a> 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>
+	        <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">
-	        <a href="http://VirtualAppliances.net"><img src="{{ STATIC_URL }}img/logos/partners/virtualappliances.png" alt="Virtual Appliances" /></a>
-	        <p><a href="http://VirtualAppliances.net">Virtual Appliances</a> are nano-sized Linux virtual machines with web user interfaces for deploying instant infrastructure and applications which run on vmware/xen/virtualpc/virtualiron. </p>
+	        <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">
-	        <a href="http://w3.widesoft.ch"><img src="{{ STATIC_URL }}img/logos/partners/w3internetsolutions.png" alt="W3 Internet Solutions " /></a>
-	        <p><a href="http://w3.widesoft.ch">W3 Internet Solutions </a> 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>
+	        <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>
diff --git a/templates/patterns-assets/css/core-grid.css b/templates/patterns-assets/css/core-grid.css
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/css/core-grid.html b/templates/patterns-assets/css/core-grid.html
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/css/core-grid.png b/templates/patterns-assets/css/core-grid.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/css/core-grid2.css b/templates/patterns-assets/css/core-grid2.css
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/css/core-grid2.html b/templates/patterns-assets/css/core-grid2.html
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/css/core-grid2.png b/templates/patterns-assets/css/core-grid2.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/css/core-reset.css b/templates/patterns-assets/css/core-reset.css
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/css/core-style.css b/templates/patterns-assets/css/core-style.css
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/css/core-style2.css b/templates/patterns-assets/css/core-style2.css
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/css/patterns.css b/templates/patterns-assets/css/patterns.css
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/background-ubuntu-cta.png b/templates/patterns-assets/img/background-ubuntu-cta.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/cta-background-hover.png b/templates/patterns-assets/img/cta-background-hover.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/cta-background.png b/templates/patterns-assets/img/cta-background.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/favicon.ico b/templates/patterns-assets/img/favicon.ico
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/fieldsets-1.png b/templates/patterns-assets/img/fieldsets-1.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/fieldsets-2.png b/templates/patterns-assets/img/fieldsets-2.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/fieldsets-3.png b/templates/patterns-assets/img/fieldsets-3.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/fieldsets-4.png b/templates/patterns-assets/img/fieldsets-4.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/header_bg.png b/templates/patterns-assets/img/header_bg.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/header_bg_active.png b/templates/patterns-assets/img/header_bg_active.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/logo.png b/templates/patterns-assets/img/logo.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/patterns/background-ubuntu-cta.png b/templates/patterns-assets/img/patterns/background-ubuntu-cta.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/patterns/cta-background-hover.png b/templates/patterns-assets/img/patterns/cta-background-hover.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/patterns/cta-background.png b/templates/patterns-assets/img/patterns/cta-background.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/patterns/fieldsets-1.png b/templates/patterns-assets/img/patterns/fieldsets-1.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/patterns/fieldsets-2.png b/templates/patterns-assets/img/patterns/fieldsets-2.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/patterns/fieldsets-3.png b/templates/patterns-assets/img/patterns/fieldsets-3.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/patterns/fieldsets-4.png b/templates/patterns-assets/img/patterns/fieldsets-4.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/patterns/greytick.png b/templates/patterns-assets/img/patterns/greytick.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/patterns/picto-getubuntu-cd.gif b/templates/patterns-assets/img/patterns/picto-getubuntu-cd.gif
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/patterns/picto-getubuntu-download.gif b/templates/patterns-assets/img/patterns/picto-getubuntu-download.gif
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/patterns/picto-getubuntu-windows.gif b/templates/patterns-assets/img/patterns/picto-getubuntu-windows.gif
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/patterns/purpletick.gif b/templates/patterns-assets/img/patterns/purpletick.gif
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/patterns/quote-grey-br-211x211.png b/templates/patterns-assets/img/patterns/quote-grey-br-211x211.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/patterns/quote-orange-bl-287x287.png b/templates/patterns-assets/img/patterns/quote-orange-bl-287x287.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/patterns/quote-orange-br-287x287.png b/templates/patterns-assets/img/patterns/quote-orange-br-287x287.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/img/patterns/quote-white-360x360.png b/templates/patterns-assets/img/patterns/quote-white-360x360.png
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/js/core.js b/templates/patterns-assets/js/core.js
old mode 100644
new mode 100755
diff --git a/templates/patterns-assets/js/patterns.js b/templates/patterns-assets/js/patterns.js
old mode 100644
new mode 100755
diff --git a/templates/phone/_nav_secondary.html b/templates/phone/_nav_secondary.html
old mode 100644
new mode 100755
index b78448786c1..8d1e9ae6aae
--- a/templates/phone/_nav_secondary.html
+++ b/templates/phone/_nav_secondary.html
@@ -1,10 +1,9 @@
-	<ul{% if list_class %} class="{{ list_class }}"{% endif %}>
-		{% if arrow %} <li class="arrow-up"></li> {% endif %}
+	<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 == 'operators-and-oems' %} class="active"{% endif %}><a href="/phone/operators-and-oems" >Operators and OEMs</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 == '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>
+		<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>
-		{% if location != "footer"%}<li{% if level_2 == 'backed-by-canonical' %} class="active"{% endif %}><a href="/phone/backed-by-canonical">Backed by Canonical</a></li>{% endif %}
+		<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>
diff --git a/templates/phone/_nav_tertiary.html b/templates/phone/_nav_tertiary.html
old mode 100644
new mode 100755
index 824c5444efe..b3791ba7e43
--- a/templates/phone/_nav_tertiary.html
+++ b/templates/phone/_nav_tertiary.html
@@ -1,4 +1,4 @@
-<ul>
+<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 %}
diff --git a/templates/phone/app-ecosystem.html b/templates/phone/app-ecosystem.html
old mode 100644
new mode 100755
index ba84299202c..588c22783de
--- a/templates/phone/app-ecosystem.html
+++ b/templates/phone/app-ecosystem.html
@@ -4,29 +4,35 @@
 
 {% 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, Ubuntu One, cloud, U1DB{% 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 "templates/_nav_breadcrumb.html" with section_title="Phone" page_title="App ecosystem"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
-<div class="row row-hero">
+<div class="row row-hero row-image-centered">
 	<div class="six-col">
-		<h1>A fast-evolving <br />app ecosystem</h1>
+		<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 no-margin">
-	<div class="six-col">
-		<img width="510" height="382" src="{{ STATIC_URL }}img/devices/phone-apps-grid-extended.png" alt="Collection of top apps available on Ubuntu Phone" />
+<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">
@@ -35,20 +41,38 @@ <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 &rsaquo;</a></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 &rsaquo;</a></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 no-border">
+<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>
@@ -60,7 +84,16 @@ <h2>Write apps for all Ubuntu devices </h2>
 		<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 &rsaquo;</a></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/backed-by-canonical.html b/templates/phone/backed-by-canonical.html
deleted file mode 100644
index e395cb3ba03..00000000000
--- a/templates/phone/backed-by-canonical.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "phone/base_phone.html" %}
-
-{% block title %}Backed by Canonical | Ubuntu for phones{% 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{% 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 "templates/_nav_breadcrumb.html" with section_title="Phone" page_title="Backed by Canonical"  %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-{% include "shared/_backed_by_canonical.html" %}
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/phone/base_phone.html b/templates/phone/base_phone.html
old mode 100644
new mode 100755
diff --git a/templates/phone/carrier-advisory-group.html b/templates/phone/carrier-advisory-group.html
old mode 100644
new mode 100755
index eeb39b546e0..4b6df2d00c2
--- a/templates/phone/carrier-advisory-group.html
+++ b/templates/phone/carrier-advisory-group.html
@@ -25,73 +25,43 @@ <h1>Carrier Advisory Group</h1>
 	</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 &rsaquo;</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>Founding members</h2>
-	<div class="twelve-col">
-		<p class="eight-col">We expect the final group to include leaders in all major markets. The CAG will close to new members in July 2013, so we can focus our attention on the requirements of those forward-thinking operators with experience in platform transitions and introductions.</p>
-	</div>
-	<div class="three-col">
-		<ul class="list">
-			<li>China Unicom</li>
-			<li>Deutsche Telekom</li>
-			<li>Everything Everywhere</li>
-			<li>Korea Telecom</li>
-		</ul>
-	</div>
-	<div class="three-col">
-		<ul class="list">
-			<li>LG UPlus</li>
-			<li>MTN Group</li>
-			<li>Portugal Telecom</li>
-		</ul>
-	</div>
-	<div class="three-col">
-		<ul class="list">
-			<li>SK Telecom</li>
-			<li>Smartfren</li>
-			<li>Telecom Italia</li>
-		</ul>
-	</div>
-	<div class="three-col last-col">
-		<ul class="list">
-			<li>Telstra</li>
-			<li>T Mobile</li>
-			<li>Verizon Wireless</li>
-		</ul>
-	</div>
-</div><!-- / .row -->
-
-<div class="row benefits-of-joining">
-	<div class="eight-col append-four">
-		<h2>Benefits of joining</h2>
-		<h3>Regular <attr title="Carrier Advisory Group">CAG</attr> meetings</h3>
+	<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>	
-	<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 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">
-		<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 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/pictograms/pictograms-wide-industry-participation.png" alt="" />
+		<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>
@@ -106,7 +76,7 @@ <h3>Launch priority</h3>
 		<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/pictogram-grey-partners.png" width="168" height="169" alt="" />
+		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-partner-warmgrey.png" width="168" height="169" alt="" />
 	</span>
 </div><!-- / .row -->
 
@@ -117,10 +87,10 @@ <h2>Independently chaired</h2>
 	</div>
 </div><!-- / .row -->
 
-<div class="row row-quote no-border">
-	<blockquote>
-		<p>&ldquo;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.&rdquo;</p>
-		<cite>David Wood, CAG Chairman</cite>
+<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
old mode 100644
new mode 100755
index 7fe70191110..3d86d2c7fc5
--- a/templates/phone/contact-us.html
+++ b/templates/phone/contact-us.html
@@ -36,38 +36,38 @@ <h3>Mobile network operator or a handset maker</h3>
 			<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' /><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' /><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' /><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' /><span class='mktFormMsg'></span></span></li>
+					<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='text' value=""  maxlength='255' tabIndex='5' /><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="text"><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"><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='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'><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'><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="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'><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>
+					<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">					
+				<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>
@@ -103,10 +103,10 @@ <h3>Your organisation</h3>
 	<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 &rsaquo;</a></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 &rsaquo;</a></p>
+		<p><a href="/phone/carrier-advisory-group">Learn more&nbsp;&rsaquo;</a></p>
 	</div>
 </div><!-- /.row -->
 {% endblock content %}
diff --git a/templates/phone/features.html b/templates/phone/features.html
old mode 100644
new mode 100755
index 5188ecd868f..18d62173854
--- a/templates/phone/features.html
+++ b/templates/phone/features.html
@@ -1,58 +1,67 @@
 {% extends "phone/base_phone.html" %}
 
-{% block title %}Design and user experience | Ubuntu for phones{% endblock %}
+{% block title %}Features | Ubuntu for phones{% endblock %}
 
-{% block meta_keywords %}Ubuntu, phone, smartphone, cellphone, mobile, user interface, GUI, UI, UX, edge magic, content, focus, app, native, web, HTML5, Unity, gestures, handheld, handset, touch, multitouch, touchscreen, device, form factor{% endblock %}
-{% block meta_description %}Ubuntu brings a stunning, natural new user interface to the mobile phone that's designed to immerse you in your content and applications and improve your flow between them. Edge magic - thumb gestures from all four edges of the screen - deliver a much faster way of finding content and switching between apps. Ubuntu allows the user to focus on their content, rather than on-screen application controls. And the Ubuntu phone fits perfectly into the wider family of Ubuntu interfaces, alongside the PC and TV. It's a uniquely, beautifully converged experience.{% 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 second_level_nav_items %}
 	{% include "templates/_nav_breadcrumb.html" with section_title="Phone" page_title="Design"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
-<div class="row infographic no-margin no-border">
+<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 creating beautiful visualisations of complex data, the welcome screen evolves as you use the phone, to be perfectly unique and personal. This isn&rsquo;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>
-	<div class="six-col last-col no-print">
-		<img width="600" height="442" src="{{ STATIC_URL }}img/devices/infographic-3km-walked.png" class="main-image info-pic-0" alt="Ubuntu Phone infrographic 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 infrographic 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 infrographic 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 infrographic 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 infrographic showing duration of talk" />
-	</div>
+		<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">
 	<div class="eight-col">
-		<h2>Naturally neat and organised</h2>
-		<p>We bring the world to your fingertips, and organise it all beautifully. Edge swipes make navigation effortless and efficient, with multiple scopes for different kinds of content making it easy to browse your home screen, apps, videos and music. Everything is stylish, neat and elegant.</p>
-	</div>
-	<div class="twelve-col">
-		<img width="904" height="408" class="touch-border" src="{{ STATIC_URL }}img/devices/phone-naturally-neat.jpg" alt="Ubuntu phones side by side show the consistancy between different screens"/>
+		<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 no-border">
+<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>
+		<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><!-- /.row -->
 
 <div class="row row-pictures no-border edge-top"><!-- may also need phone-photos -->
-	<div class="five-col pictures-portrait">
+	<div class="five-col pictures-portrait text-center">
 		<div class="feature-image">
-			<img src="{{ STATIC_URL }}img/devices/phone-portrait.png" alt="phone-portrait" width="258" height="447" />
+			<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 Ubuntu One personal cloud account, making it available on all your devices &mdash; even iOS, Android and Windows.</p>
+		<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/devices/phone-landscape.png" alt="phone-landscape" width="500" height="258" />
+			<img src="{{ STATIC_URL }}img/phone/features/image-phone-landscape.jpg" alt="" width="410" height="212" />
 			<div></div>
 		</div>
 	</div>
@@ -75,26 +84,22 @@ <h3>Favourite apps</h3>
 </div><!-- /.row -->
 
 <div class="row no-border edge-magic edge-top">
-	<div class="six-col">
-		<div class="search-animation no-print">
-			<img width="258" height="446" src="{{ STATIC_URL }}img/devices/phone-portrait.png" alt="Ubuntu phone searching Toklien" />
-			<div class="slider-animation search-screen">
-				<div class="search-results">
-					<img width="182" height="1272" src="{{ STATIC_URL }}img/devices/phone-search-results.jpg" alt="Search results srceen on Ubuntu phone" />
-				</div>
-				<div class="search-search">
-					<img width="182" height="30" src="{{ STATIC_URL }}img/devices/phone-search-search-box.png" alt="Search box move up out of sights while scrolling results" />
-				</div>
-				<div class="search-title">
-					<img width="54" height="31" src="{{ STATIC_URL }}img/devices/phone-search-title.png" alt="Search box is replaced with search term during scroll" />
-				</div>
+	<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>
-			<a href="#" class="slideless replay"></a>
 		</div>
+		<a href="#" class="slideless replay"></a>
 	</div>
 	<div class="edge-magic-content six-col last-col">
 		<h3>Find anything, anywhere, instantly</h3>
-		<p>Ubuntu Dash and its &ldquo;smarter searches&rdquo; 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 including Amazon and the Ubuntu One Music Store, so you can fill those gaps in your music collection.</p>
+		<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 -->
@@ -102,7 +107,7 @@ <h3>Find anything, anywhere, instantly</h3>
 <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&rsquo;re ready &mdash; just swipe down from the top edge of the screen. You <br />can reply to Facebook, Twitter, text or picture messages and even return phone calls without leaving the notifications bar. You&rsquo;ll never miss a thing. It also lets you check the status of your phone and access core settings.</p>
+		<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">
@@ -131,21 +136,12 @@ <h3>Always running</h3>
 	</div>
 </div><!-- /.row -->
 
-<div class="row row-hud edge-magic edge-left no-border">
+<div class="row row-notifications edge-magic edge-left">
 	<div class="edge-magic-content six-col">
-		<h3>Your wish is my command</h3>
-		<p>Let Ubuntu be your virtual assistant. Find any command from any menu on the phone &mdash; image manipulation, movie editing, document management &mdash; you name it, the <abbr title="Heads-up display">HUD</abbr> can find it. The Dash helps you search content, and the HUD helps you edit, personalise or modify it. All it needs is your command.</p>
+		<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">
-			<div class="screen">
-			</div>
-		</div>
-	</div>
-</div><!-- /.row -->
-
-<div class="row edge-magic edge-top edge-bottom no-margin">
-	<div class="six-col">
 		<div class="slider-animation content-controls">
 			<div class="screen">
 				<div class="gallery-screen"></div>
@@ -154,21 +150,17 @@ <h3>Your wish is my command</h3>
 		</div>
 		<a href="#" class="slideless replay"></a>
 	</div>
-	<div class="edge-magic-content six-col last-col">
-		<h3>Content, not controls</h3>
-		<p>Swiping up from the bottom edge of the phone reveals app controls. You can hide or reveal them instantly, which means they don&rsquo;t take up room on the screen, leaving you free to focus on the stuff <br/>that matters. Immerse yourself in your photos, web pages, music, messages and apps.</p>
-	</div>
 </div><!-- / .row -->
 
-<div class="row row-app-grid no-margin no-border">
+<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/devices/phone-apps-grid-extended.png" alt="Collection of top apps available on Ubuntu Phone" />
+		<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&rsquo;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">Developing for Ubuntu on smartphones &rsaquo;</a></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 %}
diff --git a/templates/phone/index.html b/templates/phone/index.html
old mode 100644
new mode 100755
index d150a7b1b22..c37dda5fbb8
--- a/templates/phone/index.html
+++ b/templates/phone/index.html
@@ -14,33 +14,41 @@
 {% block content %}
 <div class="row row-hero">
 	<div class="five-col">
-		<h1>We&rsquo;re mobile industry ready</h1>
-		<h2>Ubuntu brings a fast and beautiful experience to any phone.</h2>
-		<p><a class="link-cta-ubuntu" href="https://wiki.ubuntu.com/Touch/Install">Install Ubuntu for phones</a><br />
-		<em class="smaller">for developers and industry partners only</em></p>
+		<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 Dash to search phone and web, and keep your life and content organised with the brilliance of Ubuntu scopes.</p>
-		<p><a href="/phone/design">Learn more about Ubuntu's features&nbsp;&rsaquo;</a></p>
-		<img src="{{ STATIC_URL }}img/devices/phone-home-design-269x185.jpg" width="269" height="185" alt="Ubuntu phone running the gallery app" />
+		<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>
 
 	<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>
-		<img src="{{ STATIC_URL }}img/devices/phone-home-industry-269x192.jpg" width="269" height="192" alt="Two Ubuntu phones side by side" />
+		<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>Everything 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 to one store.</p>
+		<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>
-		<img src="{{ STATIC_URL }}img/devices/phone-home-developers-290x188.jpg" width="290" height="188" alt="Collection of top apps available on Ubuntu phone" />
+		<div class="text-center">
+			<img src="{{ STATIC_URL }}img/devices/image-developers.jpg" alt="Collection of top apps available on Ubuntu phone" />
+		</div>
 	</div>
 </div><!-- /.row -->
 
@@ -48,12 +56,12 @@ <h3>Everything developers need</h3>
 
 <div class="row row-image-centered">
 	<span class="four-col">
-		<img src="{{ STATIC_URL }}img/logos/canonical-symbol-167x167.png" width="167" height="167" alt="Canonical logo" />
+		<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="/phone/backed-by-canonical">Learn more about Canonical &rsaquo;</a></p>
+		<p><a href="/partners/backed-by-canonical">Learn more about Canonical&nbsp;&rsaquo;</a></p>
 	</div>
 </div><!-- /.row -->
 
@@ -62,11 +70,15 @@ <h2>Backed by Canonical</h2>
 	<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 &rsaquo;</a></p>
+		<p><a href="/phone/carrier-advisory-group">Read more about the CAG&nbsp;&rsaquo;</a></p>
 	</div>
-	<div class="twelve-col no-margin-bottom">
-		<ul class="inline inline-icons">
-			{% include "phone/shared/_cag_list.html" with image_width="120" image_height="60" small="true" %}
+	<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>
diff --git a/templates/phone/operators-and-oems.html b/templates/phone/operators-and-oems.html
old mode 100644
new mode 100755
index f29010498f8..e6e472b3751
--- a/templates/phone/operators-and-oems.html
+++ b/templates/phone/operators-and-oems.html
@@ -14,13 +14,18 @@
 	<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 &rsaquo;</a><br />
+		<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 row-image-centered">
-	<span><img src="{{ STATIC_URL }}img/devices/image-open-to-everyone.png" alt="" /></span>
+<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>
@@ -29,14 +34,24 @@ <h2>We&rsquo;re open to everyone</h2>
 </div><!-- /.row -->
 
 <div class="row">
-	<h2>Customise to your needs</h2>
+	<h2>Easy, endless customisation</h2>
 	<div class="six-col">
-		<p>We&rsquo;ve built Ubuntu to embrace operator and OEM content, services and branding from the beginning, in a way that leaves the all-important Ubuntu design and app ecosystem largely untouched. Canonical engages with OEMs and operators to enable them to ship phones with true service-layer differentiation that consumers will appreciate.</p>
+		<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>Content can be surfaced in the home screen and search scopes, featured apps can be pre-installed and the UI has been designed with room for effective co-branding. Many of the core applications will accept back-end services coming through their front-end, so content can be surfaced without ever overwhelming the user.</p>
+		<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>
-	<img width="904" height="408" src="{{ STATIC_URL }}img/devices/phone-make-ubuntu-your-own.jpg" alt="Ubuntu phone customised"/>
 </div><!-- /.row -->
 
 <div class="row">
@@ -47,7 +62,7 @@ <h2>Stunning design on any smartphone</h2>
 	</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 &rsaquo;</a></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>
@@ -96,7 +111,9 @@ <h2>Easier hardware enablement</h2>
 		<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">
-		<p class="pull-quote no-indent">If you already <br />make handsets that run Android, the work needed to adopt Ubuntu will be trivial</p>
+		<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 -->
 
@@ -107,11 +124,11 @@ <h2>The phone with the heart of a PC</h2>
 		<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="267" src="{{ STATIC_URL }}img/devices/converged-device-440x267.jpg" alt="Ubuntu phone docking to become a PC" />
+		<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">
+<div class="row combined-list">
 	<h2>The developer&rsquo;s favourite OS</h2>
 	<div class="six-col">
 		<ul class="list-ubuntu no-margin">
@@ -125,12 +142,15 @@ <h2>The developer&rsquo;s favourite OS</h2>
 			<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>
-		<a class="list-link" href="/phone/app-ecosystem">Learn more about developing apps for Ubuntu &rsaquo;</a>
+
+	</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/devices/phone-global-solutions-pictogram.png" width="229" height="203" alt="Hello written in a number of languages in Ubuntu speak bubbles" /></span>
+		<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>
@@ -142,8 +162,8 @@ <h2>A truly global solution</h2>
 		<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="/phone/backed-by-canonical">Learn more about how we support Ubuntu &rsaquo;</a></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/logos/canonical-symbol-167x167.png" width="167" height="167" alt="Canonical logo" /></span>
+	<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/register/index.html b/templates/phone/register/index.html
old mode 100644
new mode 100755
index 63aaabf4323..799610190ed
--- a/templates/phone/register/index.html
+++ b/templates/phone/register/index.html
@@ -29,11 +29,11 @@ <h1>Find out when it&rsquo;s here</h1>
 		<h2>Your details</h2>
 		<ul class="no-bullets">
 			<li>
-				<label class="preField" for="tfa_Email">Your email <span class="reqMark">*</span></label> 
-				<input id="tfa_Email" name="tfa_Email" value="" size="60" class="validate-email required" type="text">
+				<label class="preField" for="tfa_Email">Your email <span class="reqMark">*</span></label>
+				<input id="tfa_Email" name="tfa_Email" value="" size="60" class="validate-email required" type="email" required>
 			</li>
 			<li>
-		<label class="preField" for="tfa_Country">Your country</label> 
+		<label class="preField" for="tfa_Country">Your country</label>
 			<select id="tfa_Country" name="tfa_Country" class="">
 				<option value="">Please select...</option>
 				<option value="AF" class="">Afghanistan</option>
@@ -274,10 +274,10 @@ <h2>Your details</h2>
 				<option value="ZM" class="">Zambia</option>
 				<option value="ZW" class="">Zimbabwe</option>
 			</select>
-			
+
 			</li>
 		</ul>
-		
+
 		<div class="actions">
 			<button class="primaryAction" id="submit-" name="tfa_submitAction" type="submit">Submit</button>
 			<input value="267214" name="tfa_dbFormId" id="tfa_dbFormId" type="hidden">
diff --git a/templates/phone/register/thank-you.html b/templates/phone/register/thank-you.html
old mode 100644
new mode 100755
index 3d31f70e08a..b330b1c5270
--- a/templates/phone/register/thank-you.html
+++ b/templates/phone/register/thank-you.html
@@ -12,8 +12,8 @@
 		<h1>Thank you for registering your interest.</h1>
 	    <p>Once we have news, we will pass it along.</p>
     </div>
-    <span>
-   		<img src="{{ STATIC_URL }}img/devices/pictogram-smile-purple.png" width="164" height="162" alt="Smile pictogram" />
-    </span>
+	<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/scopes.html b/templates/phone/scopes.html
new file mode 100755
index 00000000000..2d0fed50c1f
--- /dev/null
+++ b/templates/phone/scopes.html
@@ -0,0 +1,134 @@
+{% 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 "templates/_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/shared/_cag_list.html b/templates/phone/shared/_cag_list.html
old mode 100644
new mode 100755
index 95db1bd818a..9b0df876420
--- a/templates/phone/shared/_cag_list.html
+++ b/templates/phone/shared/_cag_list.html
@@ -5,9 +5,10 @@
 			<li class="{% if small %}last {% endif %}{{ item_class }}"><img src="{{ STATIC_URL }}img/logos/logo-korea-telecom.png" width="{{ image_width }}" height="{{ image_height }}" alt="Korea telecom" /></li>
 			<li class="{{ item_class }}"><img src="{{ STATIC_URL }}img/logos/logo-lg-uplus.png" width="{{ image_width }}" height="{{ image_height }}" alt="LG uplus" /></li>
 			<li class="{{ item_class }}"><img src="{{ STATIC_URL }}img/logos/logo-mtn.png" width="{{ image_width }}" height="{{ image_height }}" alt="MTN Group" /></li>
-			<li class="{{ item_class }}"><img src="{{ STATIC_URL }}img/logos/logo-portugal-telecom.png" width="{{ image_width }}" height="{{ image_height }}" alt="Portugal telecom" /></li>		
-			<li class="{{ item_class }}"><img src="{{ STATIC_URL }}img/logos/logo-smartfren.png" width="{{ image_width }}" height="{{ image_height }}" alt="Smartfren" /></li>
-			<li class="{% if small %}last {% endif %}{{ 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-portugal-telecom.png" width="{{ image_width }}" height="{{ image_height }}" alt="Portugal telecom" /></li>
+			<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-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>
diff --git a/templates/phone/shared/_contextual_footer.html b/templates/phone/shared/_contextual_footer.html
old mode 100644
new mode 100755
index eded71e5b36..c7938986615
--- a/templates/phone/shared/_contextual_footer.html
+++ b/templates/phone/shared/_contextual_footer.html
@@ -4,22 +4,38 @@ <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 three-col last-col">
+	<div class="feature-four six-col last-col">
 		<h3>Further reading</h3>
 		{% include "templates/_further_reading_links.html" %}
 	</div>
 {% else %}
-	<div class="feature-two three-col">
+	{% 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/shared/_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 &rsaquo;</a></p>
+		<p><a href="/phone/contact-us">Get in touch today&nbsp;&rsaquo;</a></p>
 	</div>
-	<div class="feature-three three-col">
+	<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 three-col last-col">
+	<div class="feature-four four-col last-col">
 		<h3>Further reading</h3>
 		<ul class="smaller no-bullets">
 			{% if level_2 == 'carrier-advisory-group' %}
@@ -27,12 +43,13 @@ <h3>Further reading</h3>
 			<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&feature=player_embedded#t=0">Watch the Ubuntu phone video</a></li>
-			<li><a href="http://www.ubuntu.com/2013/01/press-pack-ubuntu-phone">Ubuntu phone press release&nbsp;&rsaquo;</a></li>
-			<li><a href="http://insights.ubuntu.com/mobile/ubuntu-for-smartphones-grabs-global-headlines/">Ubuntu for smartphones grabs global headlines&nbsp;&rsaquo;</a></li>
-			<li><a href="http://insights.ubuntu.com/mobile/get-the-faqs-about-ubuntu-on-smartphones/"> Get the FAQs about Ubuntu on smartphones&nbsp;&rsaquo;</a></li>
-			<li><a href="http://insights.ubuntu.com/mobile/developers-get-the-full-support-they-need/">Developers get the full support they need&nbsp;&rsaquo;</a></li>
+			<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/shared/_further_reading_phone.html b/templates/phone/shared/_further_reading_phone.html
new file mode 100755
index 00000000000..38eb162ce25
--- /dev/null
+++ b/templates/phone/shared/_further_reading_phone.html
@@ -0,0 +1,32 @@
+{% block head_extra %}
+<script src="https://www.google.com/jsapi"></script>
+<script>google.load("feeds", "1")</script>
+{% endblock %}
+	<div id="insights-footer-feed"></div>
+	<script>
+		var feedcontainer2=document.getElementById("insights-footer-feed")
+		var feedurl2=document.location.protocol+"//insights.ubuntu.com/products-and-services/phone/feed/"
+		var feedlimit2=4
+		var rssoutput="<ul class='no-bullets smaller'>"
+			function rssfeedsetup2(){
+				var feedpointer2=new google.feeds.Feed(feedurl2) //Google Feed API method
+						feedpointer2.setNumEntries(feedlimit2) //Google Feed API method
+						feedpointer2.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 + "'>" + thefeeds2[i].title + "&nbsp;&rsaquo;</a></li>"}
+						rssoutput+="</ul>"
+						feedcontainer2.innerHTML=rssoutput
+				}
+				else
+					alert("")
+				}
+				
+				window.onload=function(){
+				rssfeedsetup2()
+				}
+	</script>
diff --git a/templates/phone/thank-you.html b/templates/phone/thank-you.html
old mode 100644
new mode 100755
index d31bc0337cb..281db56246e
--- a/templates/phone/thank-you.html
+++ b/templates/phone/thank-you.html
@@ -13,8 +13,8 @@ <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.png" width="164" height="162" alt="Smile pictogram" />
-    </span>
+	<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
old mode 100644
new mode 100755
index b4114bad9c6..c059a6714d6
--- a/templates/phone/ubuntu-for-android/contact-us.html
+++ b/templates/phone/ubuntu-for-android/contact-us.html
@@ -32,38 +32,38 @@ <h3>Mobile network operators and handset makers</h3>
 			<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' /><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' /><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' /><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' /><span class='mktFormMsg'></span></span></li>
+					<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='text' value=""  maxlength='255' tabIndex='5' /><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="text"><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"><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='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'><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'><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="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'><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'><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>
+					<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">					
+				<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>
@@ -100,7 +100,7 @@ <h3>Your organisation</h3>
 	<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 &rsaquo;</a></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
old mode 100644
new mode 100755
index f3dd810f0ef..5678487a289
--- a/templates/phone/ubuntu-for-android/features.html
+++ b/templates/phone/ubuntu-for-android/features.html
@@ -8,14 +8,18 @@
 
 {% block content %}
 
-<div class="row row-hero">
-	<img class="right" src="{{ STATIC_URL }}img/devices/product-android-features-hero-418x325.png" width="418" height="325" alt="Ubuntu running from an Android phone" />
-	<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 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">	
+<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>
@@ -27,10 +31,10 @@ <h3>Secure full-featured web</h3>
 
 
 <div class="row row-image-centered">
-	<span>
-		<img src="{{ STATIC_URL }}img/devices/product-android-contacts-442x249.png" alt="Contacts lense on Ubuntu" width="442" height="249" />
+	<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="six-col">
+	<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>
@@ -47,19 +51,19 @@ <h3>Calendar coordination</h3>
 </div><!-- / .row -->
 
 <div class="row row-image-centered">
-	<div class="six-col">
+	<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/devices/product-android-messaging-442x249.png" alt="Incoming message on Ubuntu" width="442" height="249" />
+		<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>
+		<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>
@@ -73,22 +77,22 @@ <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/devices/icon-android-chromium.png" title="Fast, secure web browsing" alt="Fast, secure web browsing" width="64" height="62" /><p>Chromium web browser</p></li>
-				<li><img src="{{ STATIC_URL }}img/devices/icon-android-calendar.png" title="Online calendar sharing" alt="Online calendar sharing" width="65" height="76" /><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="57" height="65" /><p>Google Docs</p></li>
-				<li><img src="{{ STATIC_URL }}img/devices/icon-android-thunderbird.png" title="Simple, efficient email" alt="Simple, efficient email" width="64" height="67" /><p>Thunderbird email client</p></li>
-				<li class="last-item"><img src="{{ STATIC_URL }}img/devices/icon-android-gwibber.png" title="Facebook and Twitter integration" alt="Facebook and Twitter integration" width="64" height="65" /><p>Gwibber</p></li>
-				<li class="bottom"><img src="{{ STATIC_URL }}img/devices/icon-android-vlc.png" title="Play movies in all common formats" alt="Play movies in all common formats" width="56" height="65" /><p>VLC Player</p></li>
-				<li class="bottom"><img src="{{ STATIC_URL }}img/devices/icon-android-pitivi.png" title="Edit and share your movies" alt="Edit and share your movies" width="65" height="65" /><p>PiTiVi</p></li>
-				<li class="bottom"><img src="{{ STATIC_URL }}img/devices/icon-android-rhythmbox.png" title="Plays all common music files" alt="Plays all common music files" width="72" height="72" /><p>Ubuntu Music Player</p></li>
-				<li class="bottom"><img src="{{ STATIC_URL }}img/devices/icon-android-shotwell.png" title="Save and edit all your photos" alt="Save and edit all your photos" width="63" height="63" /><p>Ubuntu Photo Gallery</p></li>
-				<li class="bottom last-item"><img src="{{ STATIC_URL }}img/devices/icon-android-dialler.png" title="Make calls direct from the desktop" alt="Make calls direct from the desktop" width="69" height="69" /><p>Android dialer</p></li>
+				<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 -->
diff --git a/templates/phone/ubuntu-for-android/index.html b/templates/phone/ubuntu-for-android/index.html
old mode 100644
new mode 100755
index f70f565059c..16b4f6bec79
--- a/templates/phone/ubuntu-for-android/index.html
+++ b/templates/phone/ubuntu-for-android/index.html
@@ -11,11 +11,16 @@
 	<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">
-		<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 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>
@@ -29,7 +34,7 @@ <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">
@@ -39,7 +44,7 @@ <h5>Benefits for network operators</h5>
 			<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">
@@ -58,21 +63,23 @@ <h5>Benefits for handset makers</h5>
 	<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 &rsaquo;</a></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 late-2012 high-end Android phones.</p>
+		<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">
-		<p class="pull-quote">&#8220;Ubuntu is the <strong>killer app</strong> for multi-core phones <br />in 2012&#8221;</p>
+		<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 -->
 
@@ -81,34 +88,36 @@ <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 &rsaquo;</a>{% endcomment %}
+		{% 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 our personal cloud service, Ubuntu One. Pure 21st century goodness.</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">
-	<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 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/pictogram-office-90x90.png" width="90" height="90" alt="Office pictogram" /></li>
-			<li><img class="picto-music" src="{{ STATIC_URL }}img/pictograms/pictogram-music-90x90.png" width="90" height="90" alt="Music pictogram" /></li>
-			<li><img class="picto-contacts" src="{{ STATIC_URL }}img/pictograms/pictogram-contacts-90x90.png" width="90" height="90" alt="Contacts pictogram" /></li>
+			<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 &rsaquo;</a>
+		<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">
@@ -128,9 +137,9 @@ <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/pictogram-headphones-78x78.png" width="78" height="78" alt="Headphones pictogram" /></li>
-				<li><img class="picto-monitor" src="{{ STATIC_URL }}img/pictograms/pictogram-monitor-78x78.png" width="78" height="78" alt="Monitor pictogram" /></li>
-				<li><img class="picto-laptop" src="{{ STATIC_URL }}img/pictograms/pictogram-laptop-78x78.png" width="78" height="78" alt="Laptop pictogram" /></li>
+				<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">
@@ -146,7 +155,7 @@ <h2>Why add anything to Android?</h2>
 			<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/pictogram-android-129x129.png" alt="" /></span>
+			<span><img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-android.svg" width="129" height="129" alt="" /></span>
 		</div>
 </div><!-- /.row -->
 
@@ -154,7 +163,7 @@ <h2>Why add anything to Android?</h2>
 	<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="/phone/backed-by-canonical">Learn more about working with us &rsaquo;</a></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>
diff --git a/templates/phone/ubuntu-for-android/thank-you.html b/templates/phone/ubuntu-for-android/thank-you.html
old mode 100644
new mode 100755
index 17fab7d1996..eff2ee665c1
--- a/templates/phone/ubuntu-for-android/thank-you.html
+++ b/templates/phone/ubuntu-for-android/thank-you.html
@@ -13,8 +13,8 @@ <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.png" width="164" height="162" alt="Smile pictogram" />
-    </span>
+	<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/_nav_secondary.html b/templates/privacy-policy/_nav_secondary.html
old mode 100644
new mode 100755
diff --git a/templates/privacy-policy/index.html b/templates/privacy-policy/index.html
deleted file mode 100644
index 2a091d32fc2..00000000000
--- a/templates/privacy-policy/index.html
+++ /dev/null
@@ -1,167 +0,0 @@
-{% extends "templates/one-column.html" %}
-
-{% block title %}Privacy Policy{% endblock %}
-{% block head_extra %}{% endblock %}
-
-{% block content %}
-<div class="row row-hero">
-		<h1>Canonical&rsquo;s privacy policy</h1>
-		<p>Last update: 25th March 2013</p>
-		
-		<p>Please read the updated privacy policy to find out more.</p>
-</div><!-- /.row -->
-<div class="row no-border">
-		<p>Canonical collects personal information from you in a number of different ways. For example, when you download one of our products, receive services from us or use one of our websites (including <a href="http://www.canonical.com">www.canonical.com</a> and <a href="http://www.ubuntu.com">www.ubuntu.com</a>).</p>
-		<p>At Canonical, we consider your privacy to be extremely important to us. These are the fundamental principles that we follow in relation to your personal information:</p>
-		
-		<ul>
-			<li>We don&#39;t ask you for personal information unless we truly need it.</li>
-			<li>We don&#39;t share your personal information with anyone except to provide you with services, products, to comply with the law, or to protect our rights.</li>
-			<li>We don&#39;t store personal information unless required for the on-going operation of services to you, to provide you with products, to comply with law or to protect our rights.</li>
-			<li>We will use personal information that you provide to us in accordance with this privacy policy.</li>
-		</ul>
-	
-	<h2>What we collect</h2>
-	<p>We may collect the following types of personal information from you:</p>
-	<ul class="no-bullets">
-		<li>
-			<h3>Websites</h3>
-			<p>When you register to use certain parts of our websites, such as wikis or message boards, or register for free accounts, we may ask for personal information such as your full name, email address and a password.</p>
-		</li>
-		<li>
-			<h3>Chat rooms, forums and newsgroups</h3>
-			<p>These are available to our community. Any information that you disclose in these areas becomes public information and may be recorded, archived and republished by anyone. Please exercise caution when deciding to disclose any personal information in such areas.</p>
-		</li>
-		<li>
-			<h3>Canonical products</h3>
-			<p>When you register for services or purchase any product from Canonical, we may ask for information such as your email address, billing address, and credit card information. Credit card information is only used in processing your transaction. Please note that we may use a third party payment processing merchant to process your payments.</p>
-		</li>
-		<li>
-			<h3>Non-personally identifying information</h3>
-			<p>Canonical may collect non-personally-identifying information of the sort that web browsers and servers typically make available, such as the browser type, referring site, and the date and time of each visitor&#39;s request. Our purpose in collecting non-personally identifying information is to better understand how visitors use our websites and services. For further information about how we use cookies, see the "cookie" section below.</p>
-		</li>
-		<li>
-			<h3>Error reports</h3>
-			<p>When you chose to send an error report, it includes a unique identifier for your computer. This identifier does not identify you, unless you (or someone acting on your behalf) discloses it separately. An error report may include personal information such as the state of programs that were running at the time. You can block future error reports from the privacy panel of System Settings.</p>
-		</li>
-		<li>
-			<h3>Ubuntu online accounts</h3>
-			<p>When you use Ubuntu online accounts, your personal information is stored on your PC and it can be accessed by some applications. To see the legal notice explaining how we use this personal information, please <a href="/legal/online-accounts">click here</a>.</p>
-		</li>
-		<li>
-			<h3>General</h3>
-			<p>If you contact us and provide us with information, we may keep a record of that correspondence and information.</p>
-		</li>
-		<li>
-			<h3>Searching in the dash</h3>
-			<p>When you enter a search term into the dash Ubuntu will search your Ubuntu computer and will record the search terms locally. Unless you have opted out (see the &ldquo;Online Search&rdquo; section below), we will also send your keystrokes as a search term to productsearch.ubuntu.com and selected third parties so that we may complement your search results with online search results from such third parties including: Facebook, Twitter, BBC and Amazon. Canonical and these selected third parties will collect your search terms and use them to provide you with search results while using Ubuntu.</p>
-
-			<p>By searching in the dash you consent to:</p>
-
-			<ol>
-				<li>the collection and use of your search terms and IP address in this way; and</li>
-				<li>the storage of your search terms and IP address by Canonical and such selected third parties (if applicable).</li>
-			</ol>
-			<br />
-			<p>Canonical will only use your search terms and IP address in accordance with this Privacy Policy. For information on how our selected third parties may use your information, please see their privacy policies.</p>
-			
-			<p>You may restrict your dash so that we don&rsquo;t send searches to third parties and you don't receive online search results. To do this go to the Privacy panel and toggle the &lsquo;Include online search results&rsquo; option to off. The Privacy panel can be found in your System Settings or via a dash search. For a current list of our selected third parties, please see the <a href="/privacy-policy/third-parties">third party privacy policies</a>.</p>
-		</li>
-	</ul>
-	
-	<h2>What do we do with the information we collect</h2>
-	
-	<p>We may use your information in the following ways:</p>
-	
-	<ul>
-		<li>To authenticate access to certain features of our websites.</li>
-		<li>To contact you to respond to enquiries or to provide notices to you regarding your use of our websites or the provision of our services.</li>
-		<li>To provide services, products, process payment, and authenticate access (where required).</li>
-		<li>To analyse the performance or the appropriateness of products or services.</li>
-		<li>To comply with legal and regulatory requirements (including responding to court orders, subpoenas and to prevent crime). These special circumstances may require us to disclose personal information.</li>
-		<li>To contact you if your actions violate your agreement with us (if any).</li>
-		<li>To fix errors and analyse trends.</li>
-		<li>To study how anonymous users interact with our websites and services.</li>
-		<li>To market our products or services to you.</li>
-	</ul>
-	
-	<p>Unless you have notified us otherwise, Canonical may occasionally send you email to tell you about new features, solicit feedback, or just to keep you up to date with what&#39;s going on. We may use various community websites (Launchpad Answers, Ubuntu Forums, blogs etc.) to communicate this type of information, so we expect to keep this type of information to a minimum. If you no longer wish to receive such communications from us, please follow the unsubscribe instructions provided in any of the communications, modify the communications preferences in your account or contact us using the contact details provided below.</p>
-	
-	<h2>Access</h2>
-	
-	<p>The information you provide to us will be held on computers and may be accessed by or given to our staff working inside and outside of the UK and to third parties, including contractors and companies within Canonical&#39;s group, for the purposes set out in this Privacy Policy, i.e. to provide you with products or services, or as otherwise agreed with you.</p>
-	
-	<p>You acknowledge that it may be necessary for your information to be processed by such parties and that it may be transferred to someone who provides a service to us in another country, including some outside of the European Economic Area, and you consent to such processing and transfer. If it is necessary to transfer your personal information outside of the European Economic Area we will make every effort to ensure that the person to whom we pass the personal information agrees to treat it with the same level of protection as we do.</p>
-	
-	<p>If we are sold or merge with another business entity your personal information may be disclosed to our new business partners or owners.</p>
-	
-	<p>Unless required by law, we will not otherwise share, sell or distribute any personal information you provide to us without your consent.</p>
-	
-	<h2 id="cookies">Cookies</h2>
-	
-	<p>We use persistent cookies to support a smooth user experience. This cookie remains on your computer after you close your browser and may be used by your browser on subsequent visits to our websites. We also use cookies to better understand how you interact with our websites and services and to improve our websites and services overall.</p>
-	
-	<h3>Cookies we use</h3>
-	
-	<table>
-		<tr>
-			<th>Cookie</th>
-			<th>Name</th>
-			<th>Purpose</th>
-			<th>More information</th>
-		</tr>
-		<tr>
-			<td>site cookie acceptance</td>
-			<td>_cookies_accepted</td>
-			<td>This cookie is used to record if a user has accepted the use of cookies on our website.</td>
-			<td>To withdraw your consent after accepting this cookie, delete the _cookies_accepted cookie. Find out how at <a href="http://www.aboutcookies.org">www.aboutcookies.org</a></td>
-		</tr>
-		<tr>
-			<td>Google Analytics</td>
-			<td>
-				<ul class="no-bullets">
-					<li>_utma</li>
-					<li>_utmb</li>
-					<li>_utmc</li>
-					<li>_utmz</li>
-				</ul>
-			</td>
-			<td>These cookies are used to collect information about how visitors use our website, which we use to help improve it. The cookies collect information in an anonymous form, including the number of visitors to the site, where visitors have come to the site from and the pages they visited.</td>
-			<td>Find out more about Google Analytics privacy please visit <a href="http://www.google.com/intl/en_uk/analytics/privacyoverview.html">www.google.com/intl/en_uk/analytics/privacyoverview.html</a></td>
-		</tr>
-		<tr>
-			<td>Crazyegg</td>
-			<td>is_returning</td>
-			<td>Crazyegg tracks javascript on some pages of our site to understand what links our visitors are clicking on. This helps us optimize our content for the best user experience. The Crazyegg script may store a cookie on your computer. This cookie may contain a session ID, a visitor ID and a few other dynamically created parameters that allow Crazyegg to track our site&#39;s traffic accurately. No personal information is stored within the cookie.</td>
-			<td>For Crazy Egg&#39;s complete Privacy Policy please visit <a href="http://www.crazyegg.com/privacy">www.crazyegg.com/privacy</a>.</td>
-		</tr>
-		<tr>
-			<td>Marketo Munchkin</td><td>_mkto_trk</td>
-			<td>Marketo&#39;s cookie allows us to track repeated visits to the website, and link each visit to the information voluntarily provided by the visitor. For example, if the visitor is asked to provide us with their name, company name and email address, we will know the identity of the visitor when they visit the site at a later date, or when we send them email.</td><td>For Marketo&#39;s complete Privacy Policy please visit <a href="http://uk.marketo.com/trust/privacy.php">uk.marketo.com/trust/privacy.php</a></td>
-		</tr>
-	</table>
-	
-	<p>If you do not wish to have cookies placed on your computers, please set your browsers to refuse cookies before visiting our websites and using our services.</p>
-	
-	<h2>How do we protect the information we collect</h2>
-	
-	<p>Canonical is very concerned about protecting the confidentiality of your personal information. We have security measures, including administrative, physical and electronic measures, to protect against the loss, exposure, misuse or alteration of information that we have collected from you in the use of the services. These measures include SSL data encryption to transmit your personal information as well as technical architectures and systems to prevent unauthorised third parties from accessing your personal information.</p>
-	
-	<h2>What happens if these terms change</h2>
-	
-	<p>Although most changes are likely to be minor, Canonical may change this Privacy Policy from time to time, and at Canonical&#39;s sole discretion. If the alterations constitute a material change to the Privacy Policy, we will notify you by email if you have provided your email address to us. What makes up a "material change" will be determined by Canonical, in good faith and using common sense and reasonable judgement. You may also check this page for any changes to this Privacy Policy.</p>
-	
-	<h2>Legal notice</h2>
-	
-	<p>For further information on Canonical&#39;s terms and conditions please see the <a href="/legal">legal notice</a> for our websites and our <a href="https://one.ubuntu.com/terms">terms of service for Ubuntu One</a>.</p>
-	
-	<p>For certain products and services we may also provide you with specific terms and conditions. Please refer to those specific legal notices for further information. This Privacy Policy is incorporated by reference into those legal notices.</p>
-	
-	<h2>How to contact us</h2>
-	
-	<p>You have a right to access the personal information we hold about you or to obtain a copy of it. If you would like to do so please contact us by postal mail to the address below or, if your query is in relation to Ubuntu One, via the <a href="https://one.ubuntu.com/help/contact/">account assistance form</a>.</p>
-	
-	<p>Please submit any questions or comments about this Privacy Policy, or about our use of your personal information by contacting us by postal mail at the following address: Canonical Group Ltd, 5<sup>th</sup> Floor, Blue Fin Building, 110 Southwark Street, London, England, SE1 0SU or by emailing us at <a href="mailto:webmaster@canonical.com">webmaster@canonical.com</a>.</p>
-</div><!-- / .row -->
-
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/privacy-policy/third-parties.html b/templates/privacy-policy/third-parties.html
old mode 100644
new mode 100755
index bc6d05894f7..97493420abf
--- a/templates/privacy-policy/third-parties.html
+++ b/templates/privacy-policy/third-parties.html
@@ -11,7 +11,7 @@ <h1>Third-party privacy policies</h1>
 <div class="row no-border">
 	<ul class="inline-icons">
 		<li><a href="http://www.3sat.de/page/?source=/service/140014/index.html">3sat Mediathek</a></li>
-		<li><a href="http://about.7digital.net/about/terms-and-conditions">7Digital</a></li>
+		<li><a href="http://about.7digital.com/terms-and-conditions-use">7Digital</a></li>
 		<li><a href="http://www.abc.net.au/privacy.htm">ABC iView</a></li>
 		<li><a href="http://www.amazon.co.uk/gp/help/customer/display.html/ref=hp_left_cn?ie=UTF8&nodeId=502584">Amazon</a></li>
 		<li><a href="http://stackexchange.com/legal/privacy-policy">Ask Ubuntu</a></li>
@@ -34,7 +34,6 @@ <h1>Third-party privacy policies</h1>
 		<li><a href="https://www.google.com/intl/en_uk/policies/privacy/">Google News</a></li>
 		<li><a href="http://www.grooveshark.com/privacy">Grooveshark</a></li>
 		<li><a href="http://www.headweb.com/en/100234/integrity-policy">Headweb</a></li>
-		<li><a href="http://identi.ca/doc/privacy">identi.ca</a></li>
 		<li><a href="http://www.imdb.com/privacy">IMDb</a></li>
 		<li><a href="http://is.gd/privacy.php">is.gd</a></li>
 		<li><a href="http://www.jstor.org/page/info/about/policies/privacy.jsp">JSTOR</a></li>
@@ -54,7 +53,6 @@ <h1>Third-party privacy policies</h1>
 		<li><a href="http://www.ted.com/pages/talk_usage_policy">TED Talks</a></li>
 		<li><a href="http://www.themoviedb.org/privacy-policy">TMDb</a></li>
 		<li><a href="https://twitter.com/privacy">Twitter</a></li>
-		<li><a href="https://one.ubuntu.com/privacy/">Ubuntu One</a></li>
 		<li><a href="http://vimeo.com/privacy">Vimeo</a></li>
 		<li><a href="http://vodo.net/terms">VODO</a></li>
 		<li><a href="http://www.wunderground.com/weather/api/d/terms.html#privacy">Weather Underground</a></li>
diff --git a/templates/redirects.txt b/templates/redirects.txt
old mode 100644
new mode 100755
index 4d7544da2ec..46070669921
--- a/templates/redirects.txt
+++ b/templates/redirects.txt
@@ -3,155 +3,477 @@
 # 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
+.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/  #
+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  #
+aboutus  /about  #
+aboutus/contactus  /contact-us  #
+aboutus/faq  /  #
+aboutus/faq  http://www.ubuntu.com/project  #
+aboutus/online-accounts-legal-notice  http://www.ubuntu.com/legal/online-accounts  #
+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  #
+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  #
+business  /management  #
+business/  /management  #
+business/advantage  /management/ubuntu-advantage  #
+business/advantage  /management/ubuntu-advantage/  #
+business/advantage/contact  /desktop/contact-us  #
+business/case-studies  http://insights.ubuntu.com/case-studies/  #
+business/cloud  /business/cloud/overview  #
+business/cloud/cloudcomputing  /business/cloud/overview  #
+business/cloud/deploy-anywhere  /business/cloud/overview  #
+business/cloud/on-demand-computing  /business/cloud/overview  #
+business/cloud/overview  /cloud  #
+business/cloud/reduce-costs  /business/cloud/overview  #
+business/cloud/secure-and-robust  /business/cloud/overview  #
+business/cloud/technical-resources  /cloud/technical-resources  #
+business/cloud/whyubuntu  /business/cloud/overview  #
+business/desktop  /desktop/business  #
+business/desktop/business-as-usual  /desktop/business  #
+business/desktop/easy-to-manage  /desktop/business  #
+business/desktop/long-term-support  /desktop/business  #
+business/desktop/overview  /desktop/business  #
+business/desktop/reduce-costs  /desktop/business  #
+business/desktop/secure-and-robust  /desktop/business  #
+business/desktop/services  /desktop/business  #
+business/desktop/windows-compatible  /desktop/business  #
+business/get-ubuntu/server  /download/server/download  #
+business/get-ubuntu/server/CDs  /download/server/cds  #
+business/get-ubuntu/server/download  /download/server/download  #
+business/landscape  /management  #
+business/landscape/compliance  /management/compliance  #
+business/landscape/contact  /management/contact  #
+business/landscape/ema-whitepaper  /management/ema-whitepaper  #
+business/landscape/how-to-get-landscape  /management/how-to-get-landscape  #
+business/landscape/return-on-investment  /management/return-on-investment  #
+business/landscape/systems-management  /management/features  #
+business/landscape/working-with-landscape  /management/working-with-landscape  #
+business/server  /server  #
+business/server/  /server  #
+business/server/built-in-security  http://www.ubuntu.com/business/server  #
+business/server/cloud  http://www.ubuntu.com/business/server  #
+business/server/hyperscale  /server/hyperscale  #
+business/server/minimise-administration  http://www.ubuntu.com/business/server  #
+business/server/overview  /server  #
+business/server/reduce-costs  http://www.ubuntu.com/business/server  #
+business/server/services  /server/management  #
+business/server/technical-resources  http://www.ubuntu.com/business/server  #
+business/server/virtualisation  http://www.ubuntu.com/business/server  #
+business/services  /management  #
+business/services/cloud  /management/ubuntu-advantage  #
+business/services/contact  /desktop/contact-us  #
+business/services/desktop  /desktop/business  #
+business/services/free-assessment  /desktop/contact-us  #
+business/services/gratis-assessment  /desktop/contact-us  #
+business/services/gratis-assessment/vielen-dank  http://www.ubuntu.com/business/advantage  #
+business/services/overviedesktop  /business/services/cloud  #
+business/services/overview  /business/services  #
+business/services/server  /server/management  #
+business/systems-management  /management  #
+business/systems-management/compliance  /management/compliance  #
+business/systems-management/contact  /management/contact  #
+business/systems-management/ema-whitepaper  /management/ema-whitepaper  #
+business/systems-management/features  /management/features  #
+business/systems-management/how-to-get-landscape  /management/how-to-get-landscape  #
+business/systems-management/return-on-investment  /management/return-on-investment  #
+business/systems-management/systems-management  /management/features  #
+business/systems-management/working-with-landscape  /management/working-with-landscape  #
+business/whats-new  /business  #
+business/whats-new/lvm  http://www.ubuntu.com/business/advantage  #
+business/whats-new/thank-you  http://www.ubuntu.com/business/advantage  #
+careers  http://www.canonical.com/careers  #
+category/audience/community  /  #
+category/audience/consumer  /  #
+category/audience/enterprise  /  #
+category/audience/ihv  /  #
+category/audience/interview-candidates  /  #
+category/audience/isv  /  #
+category/audience/oem  /  #
+category/carousel-position/cloud  /  #
+category/carousel-position/desktop  /  #
+category/carousel-position/enteprise-services  /  #
+category/carousel-position/enterprise-services  /  #
+category/carousel-position/homepage  /  #
+category/carousel-position/landscape  /  #
+category/carousel-position/server  /  #
+category/event-type/live-events  /  #
+category/event-type/live-webinar  /  #
+category/name-city/london  /  #
+category/name-city/name-city  /  #
+category/name-city/testtaxanomy  /  #
+category/product/cloud  /  #
+category/product/desktop  /  #
+category/product/enteprise-services  /  #
+category/product/enterprise-services  /  #
+category/product/landscape  /  #
+category/product/oem-services  /  #
+category/product/server  /  #
+category/product/ubuntu-advantage  /  #
+category/product/ubuntu-light  /  #
+category/product/ubuntu-server-edition  /  #
+cloud/azure  /cloud#azure  #
+cloud/build-a-cloud  /cloud/ubuntu-openstack  #
+cloud/cloud-tools  /cloud/tools  #
+cloud/cloud-tools/juju  /cloud/tools/juju  #
+cloud/cloud-tools/jumpstart  /cloud/tools/jumpstart  #
+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/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/insights  /cloud  #
+cloud/insights/beginners-guide  /cloud  #
+cloud/jumpstart  /cloud/solutions/jumpstart  #
+cloud/jumpstart/contact-us  /cloud/solutions/jumpstart/contact-us  #
+cloud/maas  /cloud/tools/maas  #
+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/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/reference-architecture  /cloud/ubuntu-openstack/reference-architecture  #
+cloud/private-steps  /cloud/private  #
+cloud/private/deploy  /business/cloud/overview  #
 cloud/private/ubuntu-live-cloudinfocus  http://www.ubuntu.com/cloud  #
+cloud/provisioning  /cloud/tools  #
+cloud/provisioning  /cloud/tools/maas  #
+cloud/public  /business/cloud/overview  #
+cloud/public-cloud  /cloud/build-a-cloud  #
+cloud/public-cloud/guest  /cloud/build-a-cloud  #
+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/support  /cloud  #
-cloud/training/  /cloud  #
+cloud/service-providers  /cloud/ecosystem  #
+cloud/service-providers  /cloud/ecosystem  #
 cloud/services  /cloud/management  #
+cloud/services  /management/ubuntu-advantage  #
+cloud/solutions  /cloud/management  #
 cloud/solutions/  /cloud/management  #
-cloud/deployment  /cloud/orchestration/deployment  #
-cloud/orchestration/deployment  /cloud/orchestration/  #
+cloud/solutions/jumpstart  /cloud/private-cloud/jumpstart  #
+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/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/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  #
-cloud/cloud-tools/reference-architecture  /cloud/tools/openstack/reference-architecture  #
-cloud/cloud-tools  /cloud/tools  #
-cloud/cloud-tools/maas  /cloud/tools/maas  #
-cloud/cloud-tools/juju  /cloud/tools/juju  #
-cloud/cloud-tools/jumpstart  /cloud/tools/jumpstart  #
-cloud/cloud-tools/openstack  /cloud/tools/openstack  #
-business/get-ubuntu/server/CDs  /download/server/cds  #
-business/get-ubuntu/server  /download/server/download  #
-business/get-ubuntu/server/download  /download/server/download  #
-download/server  /download/server/download  #
-server/get-ubuntu/download  /download/server/download  #
+cluster  cloud/tools/jumpstart  #
+community  http://community.ubuntu.com  #
+community/  http://community.ubuntu.com  #
+community/conduct  /about/about-ubuntu/conduct  #
+community/developerzone/bounties  http://www.ubuntu.com/community  #
+community/donations  /community/get-involved/donate  #
+community/forums  http://www.ubuntu.com/community  #
+community/get-involved  http://community.ubuntu.com/contribute  #
+community/get-involved/countdown  http://community.ubuntu.com  #
+community/get-involved/developers  http://community.ubuntu.com/contribute/developers  #
+community/get-involved/developers/non-technical-users  http://community.ubuntu.com/contribute  #
+community/get-involved/developers/technical-users  http://community.ubuntu.com/contribute/developers  #
+community/get-involved/developers/wiki  http://community.ubuntu.com/contribute/help-information  #
+community/get-involved/donate  http://www.ubuntu.com/community/get-involved  #
+community/leadership-conduct  /about/about-ubuntu/leadership-conduct  #
+community/participate  http://community.ubuntu.com/contribute  #
+community/participate/  http://community.ubuntu.com/contribute  #
+Community/Participate/Developers  http://www.ubuntu.com/community  #
+community/participate/developerzone  /community/get-involved/developers  #
+community/participate/NonTechnicalUsers  /community/get-involved/non-technical-users  #
+community/participate/TechnicalUsers  http://www.ubuntu.com/community/get-involved/technical-users  #
+community/participate/wiki  http://www.ubuntu.com/community/get-involved/wiki  #
+community/processes  /about  #
+community/processes/council  http://www.ubuntu.com/community  #
+community/processes/governance  /about/about-ubuntu/governance  #
+community/processes/newdev  /project/about-ubuntu/governance  #
+community/processes/newmember  /about/about-ubuntu/governance  #
+community/processes/techboard  /about/about-ubuntu/governance  #
+community/report-problem  http://community.ubuntu.com/help-information  #
+community/ReportProblem  http://www.ubuntu.com/community/report-problem  #
+community/stay-connected  http://community.ubuntu.com/help-information/keeping-up-to-date  #
+community/ubuntu-and-debian  /about/about-ubuntu/ubuntu-and-debian  #
+community/ubuntustory  /about/about-ubuntu  #
+community/ubuntustory/components  http://www.ubuntu.com/community  #
+community/ubuntustory/debian  /about/about-ubuntu  #
+community/ubuntustory/foundation  http://www.ubuntu.com/community  #
+community/ubuntustory/governance  /about/about-ubuntu/governance  #
+community/ubuntustory/licensing  /about/about-ubuntu/licensing  #
+community/ubuntustory/philosophy  /about/about-ubuntu/our-philosophy  #
+community/ubuntuvalues  /project/about-ubuntu/diversity  #
+communitysupport/webforums  http://www.ubuntu.com/support/community/webforums  #
+contact-us  /about/contact-us  #
+Contact-us  /contact-us  #
+contact/amazonerror  http://www.ubuntu.com  #
+contact/CDDistributor  http://www.ubuntu.com/desktop/get-ubuntu/cds  #
+contact/marketplace  /partners  #
+contact/whitepaper  http://www.ubuntu.com/server/whitepapers  #
+contact/whitepaper-thankyou  http://www.ubuntu.com/server/whitepapers  #
+content/contact-canonical  /business/services/contact  #
+content/french-national-police-force-saves-2-million-year-ubuntu  /products/casestudies/french-national-police-force-saves-2-million-year-ubuntu  #
+content/services  /management  #
+content/services-server  /business/services/server  #
+content/ubuntu-values  /community/ubuntuvalues  #
+content/why-use-ubuntu  /desktop/business  #
+db2  http://www.ubuntu.com/partners/ibm  #
+de  http://www.ubuntu.com  #
+dell  /partners/dell  #
+desktop/features/more-apps  /desktop/features/games-apps  #
+desktop/features/music-and-mobile  /desktop/features  #
+desktop/features/personal-cloud  /desktop/features  #
+desktop/for-business  /desktop/business  #
+desktop/for-developers  /desktop/developers  #
+desktop/get-ubuntu  /download/ubuntu/download  #
 desktop/get-ubuntu/alternative-downloads  /download/alternative-downloads  #
-download/desktop/alternative-downloads  /download/alternative-downloads  #
+desktop/get-ubuntu/cd-and-dvd  /desktop/get-ubuntu/cds  #
 desktop/get-ubuntu/cds  /download/ubuntu/cds  #
-desktop/get-ubuntu  /download/ubuntu/download  #
 desktop/get-ubuntu/download  /download/desktop  #
-netbook/get-ubuntu/download  /download/desktop  #
 desktop/get-ubuntu/download-zh  /download/zh-CN  #
-download/desktop/zh-CN  /download/zh-CN  #
 desktop/get-ubuntu/upgrade  /download/ubuntu/upgrade  #
-netbook/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/ubuntukylin  /desktop/ubuntu-kylin  #
 desktop/ubuntukylin-chinese  /desktop/ubuntu-kylin-chinese  #
-download/releasenotes/510  /getubuntu/releasenotes/510  #
-download/releasenotes/606  /getubuntu/releasenotes/606  #
-download/releasenotes/610  /getubuntu/releasenotes/610  #
-download/server/cds  http://shop.canonical.com/index.php?cPath=17  #
-download/ubuntu/cds  http://shop.canonical.com/index.php?cPath=17  #
-download/server/arm  /download/arm  #
-download/ubuntu  /download/desktop  #
-download/ubuntu/download  /download/desktop  #
-download/ubuntu/alternative-download  /download/desktop/alternative-download  #
-download/desktop/alternative-download  /download/desktop/alternative-downloads  #
-download/ubuntu/upgrade  /download/desktop/upgrade  #
-download/ubuntu/windows-installer  /download/desktop/windows-installer  #
-download/ubuntu/download-zh  /download/desktop/zh-CN  #
-download/server/download  /download/server  #
-download/releasenotes  http://www.ubuntu.com/getubuntu/releasenotes  #
-download/releasenotes/610  http://www.ubuntu.com/getubuntu/releasenotes  #
-download/releasenotes/804  http://www.ubuntu.com/getubuntu/releasenotes  #
-download/help/burn-a-cd-on-mac-osx  /download/desktop/burn-a-dvd-on-mac-osx  #
-download/help/burn-a-dvd-on-mac-osx  /download/desktop/burn-a-dvd-on-mac-osx  #
-download/help/burn-a-cd-on-ubuntu  /download/desktop/burn-a-dvd-on-ubuntu  #
-download/help/burn-a-dvd-on-ubuntu  /download/desktop/burn-a-dvd-on-ubuntu  #
-download/help/burn-a-cd-on-windows  /download/desktop/burn-a-dvd-on-windows  #
-download/help/burn-a-dvd-on-windows  /download/desktop/burn-a-dvd-on-windows  #
-download/help/create-a-usb-stick-on-mac-osx  /download/desktop/create-a-usb-stick-on-mac-osx  #
-download/help/create-a-usb-stick-on-ubuntu  /download/desktop/create-a-usb-stick-on-ubuntu  #
-download/help/create-a-usb-stick-on-windows  /download/desktop/create-a-usb-stick-on-windows  #
-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  #
-download/help/install-ubuntu-server  /download/server/install-ubuntu-server  #
-download/help/install-ubuntu-cloud  /download/cloud/install-ubuntu-cloud  #
+desktopedition  http://www.ubuntu.com/desktop  #
+developers  http://www.ubuntu.com/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/eyewear  /devices  #
+devices/phone  /phone  #
+devices/phone/app-ecosystem  /phone/app-ecosystem  #
+devices/phone/contact-us  /phone/contact-us  #
+devices/phone/design  /phone/features  #
+devices/phone/operators-and-oems  /phone/operators-and-oems  #
+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/partner  /tablet/operators-and-oems  #
+devices/tablet/thank-you  /tablet/thank-you  #
+devices/tv  /tv  #
+devices/tv/commercial-info  /tv/commercial-info  #
+devices/tv/commercial-info  http://ubuntu.com/tv/commercial-info  #
+devices/tv/contact-us  /tv/contact-us  #
+devices/tv/contact-us  http://ubuntu.com/tv/contact-us  #
+devices/tv/contributors  /tv/contributors  #
+devices/tv/contributors  /tv/contributors  #
+devices/tv/experience  /tv/experience  #
+devices/tv/experience  /tv/experience  #
+devices/tv/features-and-specs  /tv/features-and-specs  #
+devices/tv/features-and-specs  /tv/features-and-specs  #
+devices/tv/industry  /tv/industry  #
+devices/tv/industry  /tv/industry  #
+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/desktop/alternative-download  /download/desktop/alternative-downloads  #
+download/desktop/alternative-downloads  /download/alternative-downloads  #
+download/desktop/install-desktop-latest  /download/desktop/install-ubuntu-desktop  #
+download/desktop/install-desktop-long-term-support  /download/desktop/install-ubuntu-desktop  #
+download/desktop/install-ubuntu-with-windows  /download/desktop  #
+download/desktop/windows-installer  /download/desktop  #
+download/desktop/zh-CN  /download/zh-CN  #
+download/help/burn-a-cd-on-mac-osx  /download/desktop/burn-a-dvd-on-mac-osx  #
+download/help/burn-a-cd-on-ubuntu  /download/desktop/burn-a-dvd-on-ubuntu  #
+download/help/burn-a-cd-on-windows  /download/desktop/burn-a-dvd-on-windows  #
+download/help/burn-a-dvd-on-mac-osx  /download/desktop/burn-a-dvd-on-mac-osx  #
+download/help/burn-a-dvd-on-ubuntu  /download/desktop/burn-a-dvd-on-ubuntu  #
+download/help/burn-a-dvd-on-windows  /download/desktop/burn-a-dvd-on-windows  #
 download/help/cloud-archive-instructions  /download/cloud/cloud-archive-instructions  #
+download/help/create-a-usb-stick-on-mac-osx  /download/desktop/create-a-usb-stick-on-mac-osx  #
+download/help/create-a-usb-stick-on-ubuntu  /download/desktop/create-a-usb-stick-on-ubuntu  #
+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  #
-getubuntu/download-netbook  /netbook/get-ubuntu/download  #
-GetUbuntu/releasenotes/606/en/ubuntu  https://wiki.ubuntu.com/DapperReleaseNotes  #
-GetUbuntu/releasenotes/610/en/ubuntu  https://wiki.ubuntu.com/EdgyReleaseNotes  #
-getubuntu/releasenotes/710/en/ubuntu  https://wiki.ubuntu.com/GutsyGibbon/ReleaseNotes  #
-getubuntu/releasenotes/804  https://wiki.ubuntu.com/HardyReleaseNotes  #
-getubuntu/releasenotes/810  https://wiki.ubuntu.com/IntrepidReleaseNotes  #
-getubuntu/releasenotes/904  https://wiki.ubuntu.com/JauntyJackalope/ReleaseNotes  #
-getubuntu/releasenotes/910  https://wiki.ubuntu.com/KarmicKoala/ReleaseNotes  #
-getubuntu/releasenotes/1110  https://wiki.ubuntu.com/OneiricOcelot/ReleaseNotes  #
-GetUbuntu/purchase  /desktop/get-ubuntu/cd-and-dvd  #
-getubuntu/purchase/asia  /desktop/get-ubuntu/cd-and-dvd  #
-getubuntu/shipit-faq  /desktop/get-ubuntu/cd-and-dvd  #
-desktop/get-ubuntu/cd-and-dvd  /desktop/get-ubuntu/cds  #
-desktop/for-developers  /desktop/developers  #
-desktop/for-business  /desktop/business  #
-getubuntu/downloadmirrors  /download/ubuntu/alternative-download  #
-GetUbuntu/releasenotes/510/en/ubuntu  /GetUbuntu/releasenotes/510  #
+download/help/install-ubuntu-cloud  /download/cloud/install-ubuntu-cloud  #
+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  #
+download/releasenotes  http://www.ubuntu.com/getubuntu/releasenotes  #
+download/releasenotes/510  /getubuntu/releasenotes/510  #
+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  #
+download/ubuntu  /download/desktop  #
+download/ubuntu/alternative-download  /download/desktop/alternative-download  #
+download/ubuntu/cds  http://shop.canonical.com/index.php?cPath=17  #
+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  #
+downloads  /download  #
+ec2  /cloud/public  #
+EditingInstructions  http://www.ubuntu.com  #
+education  /  #
+education/benefit  http://www.ubuntu.com  #
+education/management  http://www.ubuntu.com  #
+employment  /  #
+employment  http://www.canonical.com/careers  #
+error  http://www.ubuntu.com  #
+es  http://www.ubuntu.com  #
+files/countdown/countdown/countdown.html  http://www.ubuntu.com  #
+files/countdown/display  http://www.ubuntu.com  #
+forum  http://www.ubuntu.com/support/community/webforums  #
+forums  http://www.ubuntu.com/support/community/webforums  #
+FRS  http://pages.ubuntu.com/FRS.html  #
+frs  https://pages.canonical.com/FRS.html  #
 GetUbuntu  /desktop/get-ubuntu/download  #
-getubuntu/download  /desktop/get-ubuntu/download  #
-products/GetUbuntu/download  /desktop/get-ubuntu/download  #
-getubuntu/upgrading  /desktop/get-ubuntu/upgrade  #
-getubuntu/upgrading-8.04  /desktop/get-ubuntu/upgrade  #
-getubuntu/countdown  http://www.ubuntu.com  #
 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/download_static  http://www.ubuntu.com/netbook/get-ubuntu/download  #
-getubuntu/download-netbook  http://www.ubuntu.com/netbook/get-ubuntu/download  #
-getubuntu/download-server  http://www.ubuntu.com/server/get-ubuntu/download  #
-getubuntu/download-wubi  http://www.ubuntu.com/desktop/get-ubuntu/windows-installer  #
+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/netbook/get-ubuntu/download  #
-getubuntu/download/display1.js  http://www.ubuntu.com/netbook/get-ubuntu/download  #
-getubuntu/downloading  http://www.ubuntu.com/netbook/get-ubuntu/download  #
-getubuntu/edubuntu-include  http://www.ubuntu.com  #
-getubuntu/mirror  https://wiki.ubuntu.com/Mirrors  #
-getubuntu/mirror/1  https://wiki.ubuntu.com/Mirrors  #
-getubuntu/mirror/2  https://wiki.ubuntu.com/Mirrors  #
-getubuntu/mirror/3  https://wiki.ubuntu.com/Mirrors  #
-getubuntu/mirror/4  https://wiki.ubuntu.com/Mirrors  #
-getubuntu/mirrorubuntu  https://wiki.ubuntu.com/Mirrors  #
-getubuntu/purchase  http://www.ubuntu.com/desktop/get-ubuntu/cds  #
-getubuntu/purchase/africa  http://www.ubuntu.com/desktop/get-ubuntu/cds  #
-getubuntu/purchase/australia  http://www.ubuntu.com/desktop/get-ubuntu/cds  #
-getubuntu/purchase/europe  http://www.ubuntu.com/desktop/get-ubuntu/cds  #
-getubuntu/purchase/north-america  http://www.ubuntu.com/desktop/get-ubuntu/cds  #
-getubuntu/purchase/south-america  http://www.ubuntu.com/desktop/get-ubuntu/cds  #
-getubuntu/purchase/worldwide  http://www.ubuntu.com/desktop/get-ubuntu/cds  #
-getubuntu/releasenotes/704tour  http://www.ubuntu.com  #
-getubuntu/upgrading  http://www.ubuntu.com/desktop/get-ubuntu/upgrade  #
-getubuntu%20  http://www.ubuntu.com/desktop/get-ubuntu/download  #
-getubuntu/download_static  http://www.ubuntu.com/netbook/get-ubuntu/download  #
+getubuntu/download  http://www.ubuntu.com/desktop/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  #
 getubuntu/download-server  http://www.ubuntu.com/server/get-ubuntu/download  #
+getubuntu/download-server  http://www.ubuntu.com/server/get-ubuntu/download  #
 getubuntu/download-wubi  http://www.ubuntu.com/desktop/get-ubuntu/windows-installer  #
-getubuntu/download  http://www.ubuntu.com/desktop/get-ubuntu/download  #
+getubuntu/download-wubi  http://www.ubuntu.com/desktop/get-ubuntu/windows-installer  #
+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  #
+getubuntu/edubuntu-include  http://www.ubuntu.com  #
 getubuntu/edubuntu-include  http://www.ubuntu.com  #
 getubuntu/mirror  https://wiki.ubuntu.com/Mirrors  #
+getubuntu/mirror  https://wiki.ubuntu.com/Mirrors  #
+getubuntu/mirror/1  https://wiki.ubuntu.com/Mirrors  #
 getubuntu/mirror/1  https://wiki.ubuntu.com/Mirrors  #
 getubuntu/mirror/2  https://wiki.ubuntu.com/Mirrors  #
+getubuntu/mirror/2  https://wiki.ubuntu.com/Mirrors  #
+getubuntu/mirror/3  https://wiki.ubuntu.com/Mirrors  #
 getubuntu/mirror/3  https://wiki.ubuntu.com/Mirrors  #
 getubuntu/mirror/4  https://wiki.ubuntu.com/Mirrors  #
+getubuntu/mirror/4  https://wiki.ubuntu.com/Mirrors  #
+getubuntu/mirrorubuntu  https://wiki.ubuntu.com/Mirrors  #
 getubuntu/mirrorubuntu  https://wiki.ubuntu.com/Mirrors  #
+getubuntu/music-store-lynx  /desktop/features  #
+GetUbuntu/purchase  /desktop/get-ubuntu/cd-and-dvd  #
 getubuntu/purchase  http://www.ubuntu.com/desktop/get-ubuntu/cds  #
+getubuntu/purchase  http://www.ubuntu.com/desktop/get-ubuntu/cds  #
+getubuntu/purchase/africa  http://www.ubuntu.com/desktop/get-ubuntu/cds  #
 getubuntu/purchase/africa  http://www.ubuntu.com/desktop/get-ubuntu/cds  #
+getubuntu/purchase/asia  /desktop/get-ubuntu/cd-and-dvd  #
+getubuntu/purchase/australia  http://www.ubuntu.com/desktop/get-ubuntu/cds  #
 getubuntu/purchase/australia  http://www.ubuntu.com/desktop/get-ubuntu/cds  #
 getubuntu/purchase/europe  http://www.ubuntu.com/desktop/get-ubuntu/cds  #
+getubuntu/purchase/europe  http://www.ubuntu.com/desktop/get-ubuntu/cds  #
+getubuntu/purchase/north-america  http://www.ubuntu.com/desktop/get-ubuntu/cds  #
 getubuntu/purchase/north-america  http://www.ubuntu.com/desktop/get-ubuntu/cds  #
 getubuntu/purchase/south-america  http://www.ubuntu.com/desktop/get-ubuntu/cds  #
+getubuntu/purchase/south-america  http://www.ubuntu.com/desktop/get-ubuntu/cds  #
+getubuntu/purchase/worldwide  http://www.ubuntu.com/desktop/get-ubuntu/cds  #
 getubuntu/purchase/worldwide  http://www.ubuntu.com/desktop/get-ubuntu/cds  #
+getubuntu/releasenotes/1110  https://wiki.ubuntu.com/OneiricOcelot/ReleaseNotes  #
+GetUbuntu/releasenotes/510/en/ubuntu  /GetUbuntu/releasenotes/510  #
+GetUbuntu/releasenotes/606/en/ubuntu  https://wiki.ubuntu.com/DapperReleaseNotes  #
+GetUbuntu/releasenotes/610/en/ubuntu  https://wiki.ubuntu.com/EdgyReleaseNotes  #
+getubuntu/releasenotes/704/en/ubuntu  /getubuntu/releasenotes/704  #
+getubuntu/releasenotes/704tour  http://www.ubuntu.com  #
 getubuntu/releasenotes/704tour  http://www.ubuntu.com  #
+getubuntu/releasenotes/710/en/ubuntu  https://wiki.ubuntu.com/GutsyGibbon/ReleaseNotes  #
+getubuntu/releasenotes/804  https://wiki.ubuntu.com/HardyReleaseNotes  #
+getubuntu/releasenotes/810  https://wiki.ubuntu.com/IntrepidReleaseNotes  #
+getubuntu/releasenotes/904  https://wiki.ubuntu.com/JauntyJackalope/ReleaseNotes  #
+getubuntu/releasenotes/910  https://wiki.ubuntu.com/KarmicKoala/ReleaseNotes  #
+getubuntu/shipit-faq  /desktop/get-ubuntu/cd-and-dvd  #
+getubuntu/upgrading  /desktop/get-ubuntu/upgrade  #
 getubuntu/upgrading  http://www.ubuntu.com/desktop/get-ubuntu/upgrade  #
-getubuntu%20  http://www.ubuntu.com/desktop/get-ubuntu/download  #
+getubuntu/upgrading  http://www.ubuntu.com/desktop/get-ubuntu/upgrade  #
+getubuntu/upgrading-8.04  /desktop/get-ubuntu/upgrade  #
+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  #
+ibm  /partners/ibm  #
+ibm  http://www.ubuntu.com/partners/ibm  #
+icsw2010  http://www.ubuntu.com/partners/ibm  #
+intellectual-property-policy  /legal/terms-and-policies/intellectual-property-policy  #
+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  #
+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  #
+marketplace/jointhanks  /partners  #
+merchandise  http://shop.canonical.com/  #
+netbook  /ubuntu  #
+netbook/features  /desktop/features  #
+netbook/get-ubuntu  /download  #
+netbook/get-ubuntu/download  /download/desktop  #
+netbook/get-ubuntu/undefined.meta.js  http://www.ubuntu.com/netbook  #
+netbook/get-ubuntu/upgrade  /download/ubuntu/upgrade  #
+netbook/how-can-it-be-free  http://www.ubuntu.com/netbook  #
+netbook/undefined.meta.js  http://www.ubuntu.com/netbook  #
+news  http://www.canonical.com/about-canonical/news-and-events  #
 news/archive  http://fridge.ubuntu.com/  #
 news/independent-certified-professional  http://fridge.ubuntu.com/  #
 news/intel_moblin_ubuntu_computex  http://fridge.ubuntu.com/  #
@@ -168,169 +490,110 @@ news/thefridge  http://fridge.ubuntu.com/  #
 news/ubuntu-10.04-desktop-edition  http://fridge.ubuntu.com/  #
 news/ubuntu-10.04-for-software-vendors  http://fridge.ubuntu.com/  #
 news/ubuntu-10.04-server-edition  http://fridge.ubuntu.com/  #
-news/ubuntu-8.04.2-lts-maintenance-release  http://fridge.ubuntu.com/  #
 news/ubuntu-10.10-desktop-edition  http://www.canonical.com/news/ubuntu-10.10-desktop  #
 news/ubuntu-10.10-server-edition  http://www.canonical.com/news/ubuntu-10.10-server  #
+news/ubuntu-8.04.2-lts-maintenance-release  http://fridge.ubuntu.com/  #
 news/unity-ubuntu-light-instant-web  http://fridge.ubuntu.com/  #
-news/usn  http://www.ubuntu.com/usn  #
-support/commercial/marketplace  /support  #
-support/training  /support  #
-support/training/course-descriptions  /support  #
-support/training/course-descriptions/deploying-server  /support  #
-support/training/course-descriptions/desktop-course  /support  #
-support/training/course-types  /support  #
-support/communitysupport  /support/community  #
-support/documentation  /support/community  #
-support/free  /support/community  #
-support/community/chatirc  /support/community/chat  #
-support/marketplace/europe  /support/services  #
-support/paid  /support/services  #
-support/services/advanced  /support/services  #
-support/services/professional  /support/services  #
-support/services/starter  /support/services  #
-support/assurance  http://www.canonical.com/enterprise-services/ubuntu-advantage/assurance  #
-support/commercial/marketplace/africa  /partners  #
-support/commercial/marketplace/Asia  /partners  #
-support/commercial/marketplace/Europe  /partners  #
-support/commercial/marketplace/latinamerica  /partners  #
-support/commercial/marketplace/northernamerica  /partners  #
-support/commercial/marketplace/oceania  /partners  #
-support/community/mailinglists/etiquette  /partners  #
-support/CommunitySupport  http://www.ubuntu.com/support/community  #
-support/documentation/faq/root  http://www.ubuntu.com/support  #
-support/documentation/usn  http://www.ubuntu.com/usn  #
-support/documentation/usn/search_rss  http://www.ubuntu.com/usn  #
-support/faq  http://www.ubuntu.com/support  #
-support/free  http://www.ubuntu.com/support  #
-support/local  http://www.ubuntu.com/support  #
-support/paid/login  http://www.ubuntu.com/support  #
-support/paid/professionalservices/assessments  http://www.ubuntu.com/support  #
-support/paid/professionalservices/deploymentservices  http://www.ubuntu.com/support  #
-support/paid/professionalservices/proofofconcept  http://www.ubuntu.com/support  #
-support/paid/webtolead  http://www.ubuntu.com/support  #
-support/paid/webtoleadthanks  http://www.ubuntu.com/support  #
-support/releasenotes604  http://www.ubuntu.com/support  #
-support/services/advanced/features  http://www.ubuntu.com/support  #
-support/services/assurance  http://www.ubuntu.com/support  #
-support/services/desktopfeatures  http://www.ubuntu.com/support  #
-support/services/enterprise  http://www.ubuntu.com/support  #
-support/services/enterprisedesktop  http://www.ubuntu.com/support  #
-support/services/professional/features  http://www.ubuntu.com/support  #
-support/services/professionalservices  http://www.ubuntu.com/support  #
-support/services/server  http://www.ubuntu.com/support  #
-support/services/starter/features  http://www.ubuntu.com/support  #
-support/supportoptions/local  http://www.ubuntu.com/support  #
-support/supportoptions/paidsupport  http://www.ubuntu.com/support  #
-support/training/course-descriptions/deploying-clouds  http://www.ubuntu.com/training  #
-support/webtocase/sun/thankyou  http://www.ubuntu.com/support  #
-support/services/professional  ../services  #
-support/services/starter  ../services  #
-support/training/course-descriptions/deploying-server  ../../../support  #
-support/training/course-descriptions/desktop-course  ../../../support  #
-support/training/course-descriptions  ../../support  #
-support/training  ../support  #
-support/commercial/marketplace  ../../support  #
-support/community/chatirc  chat  #
-support/community/support  ../community  #
-support/documentation  community  #
-support/marketplace/europe  ../services  #
-support/services/advanced  ../services  #
-support/services/desktopcomparison  http://www.canonical.com/support/services/desktopcomparison  #
-support/services  /business/services  #
-support/paid  services  #
-support/free  community  #
-testing/oneiric/alpha1  https://wiki.ubuntu.com/OneiricOcelot/TechnicalOverview/Alpha1  #
-testing/oneiric/alpha2  https://wiki.ubuntu.com/OneiricOcelot/TechnicalOverview/Alpha2  #
-testing/oneiric/alpha3  https://wiki.ubuntu.com/OneiricOcelot/TechnicalOverview/Alpha3  #
-testing/oneiric/beta1  https://wiki.ubuntu.com/OneiricOcelot/TechnicalOverview/Beta1  #
-release-notes/precise-pangolin  https://wiki.ubuntu.com/PrecisePangolin/ReleaseNotes  #
-testing/precise/alpha1  https://wiki.ubuntu.com/PrecisePangolin/TechnicalOverview/Alpha1  #
-testing/precise/alpha2  https://wiki.ubuntu.com/PrecisePangolin/TechnicalOverview/Alpha2  #
-testing/precise/beta1  https://wiki.ubuntu.com/PrecisePangolin/TechnicalOverview/Beta1  #
-testing/precise/beta2  https://wiki.ubuntu.com/PrecisePangolin/TechnicalOverview/Beta2  #
-testing/quantal/alpha1  https://wiki.ubuntu.com/QuantalQuetzal/TechnicalOverview/Alpha1  #
-testing/quantal/alpha2  https://wiki.ubuntu.com/QuantalQuetzal/TechnicalOverview/Alpha2  #
-testing/810rc  /  #
-testing/feistybeta  /  #
-testing/gutsybeta  /  #
-testing/hardy/alpha1  /  #
-testing/hardy/alpha4  /  #
-testing/hardy/alpha5  /  #
-testing/herd1  /  #
-testing/herd3  /  #
-testing/herd5  /  #
-testing/intrepid/alpha1  /  #
-testing/intrepid/alpha2  /  #
-testing/intrepid/alpha3  /  #
-testing/intrepid/alpha5  /  #
-testing/jaunty/alpha3  /  #
-testing/jaunty/alpha4  /  #
-testing/karmic/alpha2  /  #
-testing/karmic/alpha3  /  #
-testing/karmic/alpha4  /  #
-testing/karmic/alpha5  /  #
-testing/karmic/alpha6  /  #
-testing/karmic/beta  /  #
-testing/lucid/alpha3  /  #
-testing/tribe1  /  #
-testing/tribe2  /  #
-testing/tribe3  /  #
-testing/tribe4  /  #
-testing/tribe5  /  #
-testing/710rc  http://www.ubuntu.com  #
-testing/804rc  http://www.ubuntu.com  #
-testing/dapperrc  http://www.ubuntu.com  #
-testing/hardy/alpha2  http://www.ubuntu.com  #
-testing/hardy/alpha3  http://www.ubuntu.com  #
-testing/hardy/alpha6  http://www.ubuntu.com  #
-testing/hardy/beta  http://www.ubuntu.com  #
-testing/herd2  http://www.ubuntu.com  #
-testing/herd4  http://www.ubuntu.com  #
-testing/intrepid/alpha4  http://www.ubuntu.com  #
-testing/intrepid/alpha6  http://www.ubuntu.com  #
-testing/intrepid/beta  http://www.ubuntu.com  #
-testing/intrepid/temp  http://www.ubuntu.com  #
-testing/jaunty/alpha2  http://www.ubuntu.com  #
-testing/jaunty/alpha5  http://www.ubuntu.com  #
-testing/jaunty/alpha6  http://www.ubuntu.com  #
-testing/jaunty/beta  http://www.ubuntu.com  #
-testing/karmic/alpha1  http://www.ubuntu.com  #
-testing/knot2  http://www.ubuntu.com  #
-testing/lucid/alpha1  http://www.ubuntu.com  #
-testing/lucid/alpha2  http://www.ubuntu.com  #
-testing/lucid/beta1  http://www.ubuntu.com  #
-testing/lucid/beta2  http://www.ubuntu.com  #
-testing/variables  http://www.ubuntu.com  #
+news/usn  http://www.ubuntu.com/usn/  #
+nicolaslevy  http://www.ubuntu.com/  #
+node  /products/whatisubuntu/serveredition/techspecs  #
+occs  http://www.ubuntu.com/partners/ibm  #
+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/faq  /partners  #
+partners/find  /partners  #
+partners/find-a-partner/oem  /partners/find-a-partner/hardware  #
+partners/find-a-partner/oem/  /partners/find-a-partner/hardware  #
+partners/findapartner  /partners  #
+partners/gold  http://www.ubuntu.com/partners  #
+partners/hardware-summit-2009-sept  http://www.ubuntu.com/uhs  #
+partners/hardware-summit-2009-sept-en  http://www.ubuntu.com/uhs  #
+partners/hardwareprogramme  /partners  #
+partners/ibm/db2  http://www.ubuntu.com/partners/ibm  #
+partners/icsw  /partners  #
+partners/IHV  http://www.ubuntu.com/partners  #
+partners/isv  http://www.canonical.com/about-canonical/partnerships  #
+partners/ISV/benefits  http://www.ubuntu.com/partners  #
+partners/marketplace/join  /partners  #
+partners/morepartnerinformation  http://www.ubuntu.com/partners  #
+partners/occs  /partners  #
+partners/partners/training/course_locator  http://www.ubuntu.com/support/training  #
+partners/program  http://www.ubuntu.com/partners  #
+partners/programme  http://www.ubuntu.com/partners  #
+partners/programmetracks  http://www.ubuntu.com/partners  #
+partners/silver  http://www.ubuntu.com/partners  #
+partners/softwareprogramme  http://www.ubuntu.com/partners  #
+partners/SolutionProvider/benefits  http://www.ubuntu.com/partners  #
+partners/systembuilder  http://www.ubuntu.com/partners  #
+partners/systembuilder/benefits  http://www.ubuntu.com/partners  #
+partners/training  /partners  #
+partners/training  http://www.ubuntu.com/support/training  #
+partners/training/certificationcourses  /partners  #
+partners/training/certificationcourses/user  http://www.ubuntu.com/support/training  #
+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  #
+phone/backed-by-canonical  /partners/backed-by-canonical  #
+phone/design  /phone/features  #
+phone/install  https://wiki.ubuntu.com/Touch/Install  #
+planetubuntu  http://planet.ubuntu.com/  #
+privacy-policy  /legal/terms-and-policies/privacy-policy  #
 products  http://www.ubuntu.com/  #
+products/casestudies  http://www.canonical.com/about-canonical/resources/case-studies  #
 products/casestudies/Andalusia%20deploys%20220,000%20Ubuntu%20desktops%20in%20schools%20throughout%20the%20region  http://www.canonical.com/about-ubuntu/case-studies  #
 products/casestudies/emphony-achieves-100-percent-uptime  http://www.canonical.com/about-ubuntu/case-studies  #
 products/casestudies/plus-server-focuses-on-competition  http://www.canonical.com/about-ubuntu/case-studies  #
 products/GetUbuntu  http://www.ubuntu.com/desktop/get-ubuntu/download  #
+products/GetUbuntu/download  /desktop/get-ubuntu/download  #
 products/HardwareCatalgogue  http://www.ubuntu.com/  #
 products/merchandise  https://shop.canonical.com/  #
 products/mobile  http://www.ubuntu.com/  #
 products/mystory  http://www.ubuntu.com/  #
+products/SoftwareCatalogue  /products/softwarecatalogue  #
 products/ubuntu/release-cycle  http://www.ubuntu.com/  #
+products/whatisubuntu  /desktop  #
 products/WhatIsUbuntu  http://www.ubuntu.com  #
 products/whatisubuntu  http://www.ubuntu.com/  #
 products/whatisubuntu/1004features  http://www.ubuntu.com/desktop/features  #
+products/whatisubuntu/804features  /desktop/features  #
+products/whatisubuntu/804features/music  /desktop/features  #
+products/whatisubuntu/804features/office-tools  /desktop/features  #
+products/whatisubuntu/804features/productivity-tools  /desktop/features  #
 products/whatisubuntu/810features  http://www.ubuntu.com/desktop/features  #
+products/whatisubuntu/810features/music  /desktop/features  #
+products/whatisubuntu/810features/office-tools  /desktop/features  #
+products/whatisubuntu/904features  /desktop/features  #
+products/whatisubuntu/904features/accessibility  /desktop/features  #
+products/whatisubuntu/904features/music  /desktop/features  #
+products/whatisubuntu/904features/productivity-tools  /desktop/features  #
+products/whatisubuntu/910features  /desktop/features  #
 products/whatisubuntu/910features  http://www.ubuntu.com/desktop/features  #
+products/whatisubuntu/accessibility  /  #
+products/whatisubuntu/arm  /  #
 products/whatisubuntu/arm  http://www.ubuntu.com/  #
+products/whatisubuntu/derivatives  /about/derivatives  #
 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/kubuntu  http://www.kubuntu.org/  #
+products/whatIsubuntu/releases  /  #
 products/whatisubuntu/screenshots-710  http://www.ubuntu.com/desktop/features  #
+products/WhatIsUbuntu/serveredition  /server  #
 products/WhatIsUbuntu/serveredition  http://www.ubuntu.com/server  #
 products/whatisubuntu/serveredition/benefits  http://www.ubuntu.com/server  #
 products/whatisubuntu/serveredition/benefits/lifecycle  http://www.ubuntu.com/server  #
 products/whatisubuntu/serveredition/benefits/opentools  http://www.ubuntu.com/server  #
 products/whatisubuntu/serveredition/benefits/packagemgmt  http://www.ubuntu.com/server  #
 products/whatisubuntu/serveredition/benefits/simplicity  http://www.ubuntu.com/server  #
-products/whatisubuntu/serveredition/cloud-old  http://www.ubuntu.com/cloud  #
 products/whatisubuntu/serveredition/cloud  http://www.ubuntu.com/cloud  #
+products/whatisubuntu/serveredition/cloud-old  http://www.ubuntu.com/cloud  #
 products/whatisubuntu/serveredition/cloud/faq  http://www.ubuntu.com/cloud  #
 products/whatisubuntu/serveredition/cloud/services/assess  http://www.ubuntu.com/cloud  #
 products/whatisubuntu/serveredition/cloud/services/audit  http://www.ubuntu.com/cloud  #
@@ -340,149 +603,318 @@ products/whatisubuntu/serveredition/cloud/services/manage/landscape  http://www.
 products/whatisubuntu/serveredition/cloud/services/poc  http://www.ubuntu.com/cloud  #
 products/whatisubuntu/serveredition/cloud/services/support  http://www.ubuntu.com/cloud  #
 products/whatisubuntu/serveredition/cloud/services/train  http://www.ubuntu.com/cloud  #
+products/whatisubuntu/serveredition/cloud/UEC  /cloud  #
 products/whatisubuntu/serveredition/cloud/uec-old  http://www.ubuntu.com/cloud  #
 products/whatisubuntu/serveredition/cloud/videos  http://www.ubuntu.com/cloud  #
 products/whatisubuntu/serveredition/documentation  http://www.ubuntu.com/server  #
+products/whatisubuntu/serveredition/features  /server/features/reduce-costs  #
 products/whatisubuntu/serveredition/features/apparmor  http://www.ubuntu.com/server  #
 products/whatisubuntu/serveredition/features/autodeploy  http://www.ubuntu.com/server  #
 products/whatisubuntu/serveredition/features/ec2  http://www.ubuntu.com/cloud/public  #
 products/whatisubuntu/serveredition/features/fileprint  http://www.ubuntu.com/server  #
 products/whatisubuntu/serveredition/features/integration  http://www.ubuntu.com/server  #
 products/whatisubuntu/serveredition/features/kernel  http://www.ubuntu.com/server  #
+products/whatisubuntu/serveredition/features/mailserver  /server/features/reduce-costs  #
 products/whatisubuntu/serveredition/features/powermanagement  http://www.ubuntu.com/server  #
+products/whatisubuntu/serveredition/features/security  /server/features/security  #
 products/whatisubuntu/serveredition/features/security  http://www.ubuntu.com/server  #
+products/whatisubuntu/serveredition/features/webappserver  /server/features/reduce-costs  #
+products/whatisubuntu/serveredition/jeos  /  #
 products/whatisubuntu/serveredition/jeos  http://www.ubuntu.com/server/features/virtualisation  #
 products/whatisubuntu/serveredition/netinfra  http://www.ubuntu.com/server  #
-products/whatisubuntu/serveredition/surveyresults-ty  http://www.ubuntu.com/server  #
 products/whatisubuntu/serveredition/surveyresults  http://www.ubuntu.com/server  #
+products/whatisubuntu/serveredition/surveyresults-ty  http://www.ubuntu.com/server  #
+products/whatisubuntu/serveredition/surveyresults-view  /  #
 products/whatisubuntu/serveredition/technologies  http://www.ubuntu.com/server  #
 products/whatisubuntu/serveredition/technologies/debpackages  http://www.ubuntu.com/server  #
 products/whatisubuntu/serveredition/technologies/hwarchitectures  http://www.ubuntu.com/server  #
 products/whatisubuntu/serveredition/technologies/ltsp  http://www.ubuntu.com/server  #
 products/whatisubuntu/serveredition/technologies/storage  http://www.ubuntu.com/server  #
 products/whatisubuntu/serveredition/technologies/virtualization  /server  #
+products/whatisubuntu/serveredition/techspecs/8.04LTS  /  #
+products/whatisubuntu/serveredition/techspecs/whatsnew  /server/technical-resources  #
 products/whatisubuntu/xubuntu  /about/about-ubuntu  #
+products/whitepapers  /server/whitepapers  #
 products/whitepapers  http://www.ubuntu.com/server  #
-.well-known/host-meta  http://www.ubuntu.com  #
-10.04  http://www.ubuntu.com  #
-10.04/Google  http://www.ubuntu.com  #
-9.10  http://www.ubuntu.com  #
-aboutus/faq  http://www.ubuntu.com/project  #
-blog  http://www.ubuntu.com/community  #
-blog/feed  http://www.canonical.com/rss.xml  #
-community/developerzone/bounties  http://www.ubuntu.com/community  #
-community/forums  http://www.ubuntu.com/community  #
-community/participate/  http://community.ubuntu.com/contribute  #
-community/participate  http://community.ubuntu.com/contribute  #
-Community/Participate/Developers  http://www.ubuntu.com/community  #
-community/participate/TechnicalUsers  http://www.ubuntu.com/community/get-involved/technical-users  #
-community/participate/wiki  http://www.ubuntu.com/community/get-involved/wiki  #
-community/processes/council  http://www.ubuntu.com/community  #
-community/ReportProblem  http://www.ubuntu.com/community/report-problem  #
-community/ubuntustory/components  http://www.ubuntu.com/community  #
-community/ubuntustory/foundation  http://www.ubuntu.com/community  #
-communitysupport/webforums  http://www.ubuntu.com/support/community/webforums  #
-contact/amazonerror  http://www.ubuntu.com  #
-contact/CDDistributor  http://www.ubuntu.com/desktop/get-ubuntu/cds  #
-contact/marketplace  /partners  #
-contact/whitepaper-thankyou  http://www.ubuntu.com/server/whitepapers  #
-contact/whitepaper  http://www.ubuntu.com/server/whitepapers  #
-db2  http://www.ubuntu.com/partners/ibm  #
-de  http://www.ubuntu.com  #
-desktopedition  http://www.ubuntu.com/desktop  #
-developers  http://www.ubuntu.com/community/get-involved/developers  #
-EditingInstructions  http://www.ubuntu.com  #
-education/benefit  http://www.ubuntu.com  #
-education/management  http://www.ubuntu.com  #
-employment  http://www.canonical.com/about-canonical/careers  #
-error  http://www.ubuntu.com  #
-es  http://www.ubuntu.com  #
-files/countdown/countdown/countdown.html  http://www.ubuntu.com  #
-files/countdown/display  http://www.ubuntu.com  #
-forum  http://www.ubuntu.com/support/community/webforums  #
-forums  http://www.ubuntu.com/support/community/webforums  #
-google-analytics.com/ga.js  http://www.ubuntu.com  #
-hardware-summit  http://www.ubuntu.com/uhs2010  #
-hp  http://www.ubuntu.com/partners/hp  #
-ibm  http://www.ubuntu.com/partners/ibm  #
-icsw2010  http://www.ubuntu.com/partners/ibm  #
-landscape  http://www.ubuntu.com/desktop/services  #
-login.jpeg  http://www.ubuntulinux.org/  #
-lotus  http://www.ubuntu.com/partners/ibm  #
-m-rss%20rss%20.html  http://www.ubuntu.com  #
-marketplace/jointhanks  /partners  #
-merchandise  http://shop.canonical.com/  #
-netbook/get-ubuntu/undefined.meta.js  http://www.ubuntu.com/netbook  #
-netbook/how-can-it-be-free  http://www.ubuntu.com/netbook  #
-netbook/undefined.meta.js  http://www.ubuntu.com/netbook  #
-nicolaslevy  http://www.ubuntu.com/  #
-occs  http://www.ubuntu.com/partners/ibm  #
-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/northernmicro  http://www.ubuntu.com/partners  #
-partners/certified-software  /partners/ubuntu-certified/software  #
-partners/certified-software/  /partners/ubuntu-certified/software  #
-partners/gold  http://www.ubuntu.com/partners  #
-partners/hardware-summit-2009-sept-en  http://www.ubuntu.com/uhs  #
-partners/hardware-summit-2009-sept  http://www.ubuntu.com/uhs  #
-partners/ibm/db2  http://www.ubuntu.com/partners/ibm  #
-partners/IHV  http://www.ubuntu.com/partners  #
-partners/ISV/benefits  http://www.ubuntu.com/partners  #
-partners/marketplace/join  /partners  #
-partners/morepartnerinformation  http://www.ubuntu.com/partners  #
-partners/partners/training/course_locator  http://www.ubuntu.com/support/training  #
-partners/program  http://www.ubuntu.com/partners  #
-partners/programme  http://www.ubuntu.com/partners  #
-partners/programmetracks  http://www.ubuntu.com/partners  #
-partners/silver  http://www.ubuntu.com/partners  #
-partners/softwareprogramme  http://www.ubuntu.com/partners  #
-partners/SolutionProvider/benefits  http://www.ubuntu.com/partners  #
-partners/systembuilder  http://www.ubuntu.com/partners  #
-partners/systembuilder/benefits  http://www.ubuntu.com/partners  #
-partners/training  http://www.ubuntu.com/support/training  #
-partners/training/certificationcourses/user  http://www.ubuntu.com/support/training  #
-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/find-a-partner/oem  /partners/find-a-partner/hardware  #
-partners/find-a-partner/oem/  /partners/find-a-partner/hardware  #
-planetubuntu  http://planet.ubuntu.com/  #
-RecentChanges  http://www.ubuntu.com  #
-register/db2  http://www.ubuntu.com/partners/ibm  #
-register/informix-thankyou  http://www.ubuntu.com  #
-register/informix  http://www.ubuntu.com  #
-register/parallels-thankyou  http://www.ubuntu.com  #
-register/parallels  http://www.ubuntu.com  #
+project  /about  #
+project/about-ubuntu  /about/about-ubuntu  #
+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/diversity  /about/about-ubuntu/diversity  #
+project/about-ubuntu/governance  /about/about-ubuntu/governance  #
+project/about-ubuntu/governance  /about/about-ubuntu/governance  #
+project/about-ubuntu/governance  /about/about-ubuntu/governance  #
+project/about-ubuntu/leadership-conduct  /about/about-ubuntu/conduct  #
+project/about-ubuntu/leadership-conduct  /about/about-ubuntu/leadership-conduct  #
+project/about-ubuntu/leadership-conduct  /project/about-ubuntu/conduct  #
+project/about-ubuntu/licensing  /about/about-ubuntu/licensing  #
+project/about-ubuntu/our-philosophy  /about/about-ubuntu/our-philosophy  #
+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/open-source  /about/about-ubuntu/our-philosophy  #
+project/ubuntu-font  /about/ubuntu-font  #
+project/ubuntufont  /about/ubuntu-font  #
+promo/extra-secure  /download  #
+promo/lighter-os  /download  #
+promo/no-viruses  /download  #
+promo/super-fast  /download  #
+RecentChanges  http://www.ubuntu.com  #
+register/db2  http://www.ubuntu.com/partners/ibm  #
+register/informix  http://www.ubuntu.com  #
+register/informix-thankyou  http://www.ubuntu.com  #
+register/parallels  http://www.ubuntu.com  #
+register/parallels-thankyou  http://www.ubuntu.com  #
 register/zimbra  http://www.ubuntu.com  #
+release-end-of-life  /info/release-end-of-life  #
+release-notes/oneiric-ocelot  https://wiki.ubuntu.com/OneiricOcelot/ReleaseNotes  #
+release-notes/precise-pangolin  https://wiki.ubuntu.com/PrecisePangolin/ReleaseNotes  #
+releaseendoflife  /info/release-end-of-life  #
 rss.xmlsubscribe=feed  http://www.ubuntu.com  #
 screenshots  http://www.ubuntu.com/desktop/features  #
 search_rss  http://www.ubuntulinux.org/  #
+server/doc  /server  #
 server/doc  http://www.ubuntu.com/server  #
+server/download  /download/server  #
+server/features/administration  /server/management  #
+server/features/cloud  /server  #
+server/features/reduce-costs  /server  #
+server/features/security  /server  #
+server/features/system-integration  /server  #
+server/features/virtualisation  /server  #
+server/get-ubuntu/cd-and-dvd  /server/get-ubuntu/cds  #
+server/get-ubuntu/download  /download/server/download  #
 server/how-can-it-be-free  http://www.ubuntu.com/server  #
+server/services  /services/server  #
+server/technical-resources  /server  #
 servervirtualization  http://www.ubuntu.com/server/features/virtualisation  #
 service  http://www.ubuntu.com/support  #
 sitemap  http://www.ubuntu.com  #
+support/assurance  http://www.canonical.com/enterprise-services/ubuntu-advantage/assurance  #
+support/commercial/marketplace  ../../support  #
+support/commercial/marketplace  /support  #
+support/commercial/marketplace/africa  /partners  #
+support/commercial/marketplace/Asia  /partners  #
+support/commercial/marketplace/Europe  /partners  #
+support/commercial/marketplace/latinamerica  /partners  #
+support/commercial/marketplace/northernamerica  /partners  #
+support/commercial/marketplace/oceania  /partners  #
+support/community  http://community.ubuntu.com/help-information/  #
+support/community/chat  http://community.ubuntu.com/contribute/support/irc/  #
+support/community/chatirc  /support/community/chat  #
+support/community/chatirc  chat  #
+support/community/launchpad  http://community.ubuntu.com/contribute/support/launchpad-answers/  #
+support/community/local-language  http://community.ubuntu.com/help-information/meeting-other-ubuntu-users/local-communities/  #
+support/community/locallanguage  http://www.ubuntu.com/support/community/local-language  #
+support/community/mailing-lists  http://community.ubuntu.com/contribute/support/mailinglists/  #
+support/community/mailinglists  http://www.ubuntu.com/support/community/mailing-lists  #
+support/community/mailinglists/etiquette  /partners  #
+support/community/support  ../community  #
+support/community/web-forums  http://community.ubuntu.com/contribute/support/ubuntu-forums/  #
+support/community/webforums  http://www.ubuntu.com/support/community/web-forums  #
+support/communitysupport  /support/community  #
+support/CommunitySupport  http://www.ubuntu.com/support/community  #
+support/documentation  /support/community  #
+support/documentation  community  #
+support/documentation/faq/root  http://www.ubuntu.com/support  #
+support/documentation/usn  http://www.ubuntu.com/usn/  #
+support/documentation/usn/search_rss  http://www.ubuntu.com/usn/  #
+support/faq  http://www.ubuntu.com/support  #
+support/free  /support/community  #
+support/free  community  #
+support/free  http://www.ubuntu.com/support  #
+support/local  http://www.ubuntu.com/support  #
+support/marketplace/europe  ../services  #
+support/marketplace/europe  /support/services  #
+support/paid  /support/services  #
+support/paid  services  #
+support/paid/login  http://www.ubuntu.com/support  #
+support/paid/professionalservices/assessments  http://www.ubuntu.com/support  #
+support/paid/professionalservices/deploymentservices  http://www.ubuntu.com/support  #
+support/paid/professionalservices/proofofconcept  http://www.ubuntu.com/support  #
+support/paid/webtolead  http://www.ubuntu.com/support  #
+support/paid/webtoleadthanks  http://www.ubuntu.com/support  #
+support/releasenotes604  http://www.ubuntu.com/support  #
+support/services  /business/services  #
+support/services  /management  #
+support/services/advanced  ../services  #
+support/services/advanced  /support/services  #
+support/services/advanced/features  http://www.ubuntu.com/support  #
+support/services/assurance  http://www.ubuntu.com/support  #
+support/services/desktopcomparison  http://www.canonical.com/support/services/desktopcomparison  #
+support/services/desktopcomparison  http://www.canonical.com/support/services/desktopcomparison  #
+support/services/desktopfeatures  http://www.ubuntu.com/support  #
+support/services/enterprise  http://www.ubuntu.com/support  #
+support/services/enterprisedesktop  http://www.ubuntu.com/support  #
+support/services/professional  ../services  #
+support/services/professional  /support/services  #
+support/services/professional/features  http://www.ubuntu.com/support  #
+support/services/professionalservices  http://www.ubuntu.com/support  #
+support/services/server  http://www.ubuntu.com/support  #
+support/services/starter  ../services  #
+support/services/starter  /support/services  #
+support/services/starter/features  http://www.ubuntu.com/support  #
+support/supportoptions/local  http://www.ubuntu.com/support  #
+support/supportoptions/paidsupport  http://www.ubuntu.com/support  #
+support/training  ../support  #
+support/training  /support  #
+support/training/course-descriptions  ../../support  #
+support/training/course-descriptions  /support  #
+support/training/course-descriptions/deploying-clouds  http://www.ubuntu.com/training  #
+support/training/course-descriptions/deploying-server  ../../../support  #
+support/training/course-descriptions/deploying-server  /support  #
+support/training/course-descriptions/desktop-course  ../../../support  #
+support/training/course-descriptions/desktop-course  /support  #
+support/training/course-types  /support  #
+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  #
+taxonomy/term  /  #
+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  #
+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  #
+testing  /info/testing  #
+testing/710rc  http://www.ubuntu.com  #
+testing/804rc  http://www.ubuntu.com  #
+testing/810rc  /  #
+testing/dapperrc  http://www.ubuntu.com  #
+testing/download  /start-download?test_release=pre  #
+testing/feistybeta  /  #
+testing/gutsybeta  /  #
+testing/hardy/alpha1  /  #
+testing/hardy/alpha2  http://www.ubuntu.com  #
+testing/hardy/alpha3  http://www.ubuntu.com  #
+testing/hardy/alpha4  /  #
+testing/hardy/alpha5  /  #
+testing/hardy/alpha6  http://www.ubuntu.com  #
+testing/hardy/beta  http://www.ubuntu.com  #
+testing/herd1  /  #
+testing/herd2  http://www.ubuntu.com  #
+testing/herd3  /  #
+testing/herd4  http://www.ubuntu.com  #
+testing/herd5  /  #
+testing/intrepid/alpha1  /  #
+testing/intrepid/alpha2  /  #
+testing/intrepid/alpha3  /  #
+testing/intrepid/alpha4  http://www.ubuntu.com  #
+testing/intrepid/alpha5  /  #
+testing/intrepid/alpha6  http://www.ubuntu.com  #
+testing/intrepid/beta  http://www.ubuntu.com  #
+testing/intrepid/temp  http://www.ubuntu.com  #
+testing/jaunty/alpha2  http://www.ubuntu.com  #
+testing/jaunty/alpha3  /  #
+testing/jaunty/alpha4  /  #
+testing/jaunty/alpha5  http://www.ubuntu.com  #
+testing/jaunty/alpha6  http://www.ubuntu.com  #
+testing/jaunty/beta  http://www.ubuntu.com  #
+testing/karmic/alpha1  http://www.ubuntu.com  #
+testing/karmic/alpha2  /  #
+testing/karmic/alpha3  /  #
+testing/karmic/alpha4  /  #
+testing/karmic/alpha5  /  #
+testing/karmic/alpha6  /  #
+testing/karmic/beta  /  #
+testing/knot2  http://www.ubuntu.com  #
+testing/lucid/alpha1  http://www.ubuntu.com  #
+testing/lucid/alpha2  http://www.ubuntu.com  #
+testing/lucid/alpha3  /  #
+testing/lucid/beta1  http://www.ubuntu.com  #
+testing/lucid/beta2  http://www.ubuntu.com  #
+testing/oneiric/alpha1  https://wiki.ubuntu.com/OneiricOcelot/TechnicalOverview/Alpha1  #
+testing/oneiric/alpha2  https://wiki.ubuntu.com/OneiricOcelot/TechnicalOverview/Alpha2  #
+testing/oneiric/alpha3  https://wiki.ubuntu.com/OneiricOcelot/TechnicalOverview/Alpha3  #
+testing/oneiric/beta1  https://wiki.ubuntu.com/OneiricOcelot/TechnicalOverview/Beta1  #
+testing/precise/alpha1  https://wiki.ubuntu.com/PrecisePangolin/TechnicalOverview/Alpha1  #
+testing/precise/alpha2  https://wiki.ubuntu.com/PrecisePangolin/TechnicalOverview/Alpha2  #
+testing/precise/beta1  https://wiki.ubuntu.com/PrecisePangolin/TechnicalOverview/Beta1  #
+testing/precise/beta2  https://wiki.ubuntu.com/PrecisePangolin/TechnicalOverview/Beta2  #
+testing/quantal/alpha1  https://wiki.ubuntu.com/QuantalQuetzal/TechnicalOverview/Alpha1  #
+testing/quantal/alpha2  https://wiki.ubuntu.com/QuantalQuetzal/TechnicalOverview/Alpha2  #
+testing/tribe1  /  #
+testing/tribe2  /  #
+testing/tribe3  /  #
+testing/tribe4  /  #
+testing/tribe5  /  #
+testing/variables  http://www.ubuntu.com  #
+ti  /partners/ti  #
 tools/prototype/prototype-1.6.0.2c.js  http://www.ubuntu.com  #
+Trademark policy  /v  #
+trademark-policy  http://www.canonical.com/intellectual-property-policy  #
+training  /support/training  #
 training/certificationcourses  http://www.ubuntu.com/support/training  #
 training/certificationcourses/accelerated-deploy  http://www.ubuntu.com/support/training  #
 training/certificationcourses/accelerated-deploy/objectives  http://www.ubuntu.com/support/training  #
 training/certificationcourses/atl  http://www.ubuntu.com/support/training  #
+training/certificationcourses/professional  /support/training/course-descriptions/certified-professional  #
 training/certificationcourses/professional/curriculum2  http://www.ubuntu.com/support/training  #
+training/certificationcourses/server  /support/training/course-descriptions  #
 training/certificationcourses/server/objectives  http://www.ubuntu.com/support/training  #
 training/certificationcourses/server/prerequisites  http://www.ubuntu.com/support/training  #
 training/certificationcourses/supporting  http://www.ubuntu.com/support/training  #
 training/certificationcourses/supporting/objectives  http://www.ubuntu.com/support/training  #
+training/certificationcourses/ucp/exam  /support/training/course-descriptions/certified-professional  #
+training/certificationcourses/ucp/objectives  /support/training/course-descriptions/certified-professional  #
 training/certificationcourses/ucp/prerequisites  http://www.ubuntu.com/support/training  #
 training/deployingcloud  http://www.ubuntu.com/support/training  #
+training/desktop  /support/training/course-descriptions/desktop-course  #
+training/e-learning  /support/training  #
 training/e-learning/desktop  http://www.ubuntu.com/support/training  #
 training/e-learning/ucp  http://www.ubuntu.com/support/training  #
 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-servicedescription  /legal/ubuntu-advantage/service-description  #
+ubuntu  /desktop  #
+ubuntu/components  /about/about-ubuntu/components  #
 ubuntu/components  http://www.ubuntu.com/project/about-ubuntu  #
+ubuntu/features  /desktop/features  #
+ubuntu/features/find-more-apps  /desktop/features/games-apps  #
+ubuntu/features/more-apps  /desktop/features/games-apps  #
+ubuntu/features/music-and-mobile  /desktop/features/music-and-mobile  #
+ubuntu/features/office-applications  /desktop/features/office-applications  #
+ubuntu/features/personal-cloud  /desktop/features/personal-cloud  #
+ubuntu/features/photos-and-videos  /desktop/features/photos-and-videos  #
+ubuntu/features/social-and-email  /desktop/features/social-and-email  #
+ubuntu/features/ubuntu-one  /desktop/features/personal-cloud  #
+ubuntu/features/ubuntu-software-centre  /desktop/features/games-apps  #
+ubuntu/features/web-browsing  /desktop/features/web-browsing  #
 ubuntu/licensing  http://www.ubuntu.com/project/about-ubuntu  #
 ubuntu/philosophy  http://www.ubuntu.com/project/about-ubuntu  #
 ubuntu/relationship  http://www.ubuntu.com/project/about-ubuntu  #
+ubuntu/take-the-tour  /desktop/take-the-tour  #
+ubuntu/take-the-tour-gallery  /desktop/take-the-tour-gallery  #
+ubuntu/trademarkpolicy  /trademark-policy  #
+ubuntu/whats-new  /desktop/  #
+ubuntu/why-is-it-free  /desktop  #
+ubuntu/why-is-it-free  /desktop/  #
+ubuntu/why-use-ubuntu  /desktop  #
+ubuntu/why-use-ubuntu  /desktop/  #
+uhs  /uhs2010  #
+uhs2010  http://www.canonical.com/about-canonical/news-and-events/events/2011/12/08/live-events/ubuntu-hardware-summit-2011  #
+uhs2011  http://www.canonical.com/about-canonical/news-and-events/events/2011/12/08/live-events/ubuntu-hardware-summit-2011  #
 undefined.meta.js  http://www.ubuntu.com  #
+users/cmsuser1  /  #
+users/cmsuser2  /  #
+webinar/desktopmigration  https://events.webdialogs.com/register.php?id=616666a83a&l=en-US  #
+welcome  /  #
 Welcome  http://www.ubuntu.com  #
 wiki  http://wiki.ubuntu.com/  #
 wiki/DanishTeam  http://www.ubuntu.com/community  #
@@ -492,390 +924,15 @@ 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/  #
-FRS  http://pages.ubuntu.com/FRS.html  #
-getubuntu/releasenotes/704/en/ubuntu  /getubuntu/releasenotes/704  #
-aboutus/faq  /  #
-education  /  #
-employment  /  #
-products/whatisubuntu/accessibility  /  #
-products/whatisubuntu/arm  /  #
-products/whatIsubuntu/releases  /  #
-products/whatisubuntu/serveredition/jeos  /  #
-products/whatisubuntu/serveredition/surveyresults-view  /  #
-products/whatisubuntu/serveredition/techspecs/8.04LTS  /  #
-welcome  /  #
-Trademark policy  /v  #
-ubuntu/trademarkpolicy  /trademark-policy  #
-aboutus/trademarkpolicy  /trademark-policy  #
-assesment-terms  /assessment-terms  #
-business/whats-new  /business  #
-business/systems-management/systems-management  /management/features  #
-business/advantage  /business/services/  #
-business/advantage/contact  /desktop/contact-us  #
-business/landscape  /management  #
-business/systems-management  /management  #
-business/landscape/systems-management  /management/features  #
-business/systems-management/features  /management/features  #
-business/landscape/compliance  /management/compliance  #
-business/systems-management/compliance  /management/compliance  #
-business/landscape/how-to-get-landscape  /management/how-to-get-landscape  #
-management/how-to-get-landscape  /management/ubuntu-advantage  #
-management/features  /management/landscape-features  #
-management/how-to-get-landscape/contact-us  /management/contact-us  #
-business/systems-management/how-to-get-landscape  /management/how-to-get-landscape  #
-business/landscape/return-on-investment  /management/return-on-investment  #
-business/systems-management/return-on-investment  /management/return-on-investment  #
-business/landscape/working-with-landscape  /management/working-with-landscape  #
-business/systems-management/working-with-landscape  /management/working-with-landscape  #
-business/landscape/ema-whitepaper  /management/ema-whitepaper  #
-business/systems-management/ema-whitepaper  /management/ema-whitepaper  #
-business/landscape/contact  /management/contact  #
-business/systems-management/contact  /management/contact  #
-cloud/why-ubuntu  /business/cloud  #
-business/cloud  /business/cloud/overview  #
-business/cloud/cloudcomputing  /business/cloud/overview  #
-business/cloud/deploy-anywhere  /business/cloud/overview  #
-business/cloud/on-demand-computing  /business/cloud/overview  #
-business/cloud/reduce-costs  /business/cloud/overview  #
-business/cloud/secure-and-robust  /business/cloud/overview  #
-business/cloud/whyubuntu  /business/cloud/overview  #
-business/server/services  /server/management  #
-cloud/private  /business/cloud/overview  #
-cloud/private/deploy  /business/cloud/overview  #
-cloud/public  /business/cloud/overview  #
-cloud/public/deploy  /business/cloud/overview  #
-business/services/cloud  /management/ubuntu-advantage  #
-business/services/overview  /business/services  #
-business/desktop/overview  /business/desktop  #
-business/desktop/services  /business/desktop  #
-business/desktop  /business/desktop/overview  #
-business/advantage  /business/services  #
-business/desktop/business-as-usual  /business/desktop/overview  #
-business/desktop/easy-to-manage  /business/desktop/overview  #
-business/desktop/long-term-support  /business/desktop/overview  #
-business/desktop/reduce-costs  /business/desktop/overview  #
-business/desktop/secure-and-robust  /business/desktop/overview  #
-business/desktop/windows-compatible  /business/desktop/overview  #
-business/services/desktop  /business/desktop/services  #
-content/why-use-ubuntu  /business/desktop/why-use-ubuntu  #
-server/download  /download/server  #
-server/features/administration  /server/management  #
-server/features/cloud  /server  #
-server/features/reduce-costs  /server  #
-server/features/security  /server  #
-business/services/server  /server/management  #
-server/features/system-integration  /server  #
-server/technical-resources  /server  #
-server/features/virtualisation  /server  #
-business/services/overviedesktop  /business/services/cloud  #
-business/services/free-assessment  /desktop/contact-us  #
-business/services/gratis-assessment  /desktop/contact-us  #
-content/contact-canonical  /business/services/contact  #
-business/services/contact  /desktop/contact-us  #
-desktop/services  /desktop/management  #
-business/services  /management  #
-content/services  /management  #
-support/services  /management  #
-content/services-server  /business/services/server  #
-business/cloud/overview  /cloud  #
-products/whatisubuntu/serveredition/cloud/UEC  /cloud  #
-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  #
-cloud/private-steps  /cloud/private  #
-ec2  /cloud/public  #
-I-cloud-services  /cloud/solutions?utm_source=brochure&utm_medium=paper&utm_content=cloudservices&utm_campaign=cloud  #
-cloud/services  /management/ubuntu-advantage  #
-management/ubuntu-advantage  /cloud/management  #
-cloud/jumpstart  /cloud/solutions/jumpstart  #
-cloud/solutions/jumpstart  /cloud/private-cloud/jumpstart  #
-cloud/jumpstart/contact-us  /cloud/solutions/jumpstart/contact-us  #
-cloud/solutions  /cloud/management  #
-business/cloud/technical-resources  /cloud/technical-resources  #
-cloud/azure  /cloud#azure  #
-community/participate/developerzone  /community/get-involved/developers  #
-community/donations  /community/get-involved/donate  #
-community/participate/NonTechnicalUsers  /community/get-involved/non-technical-users  #
-content/ubuntu-values  /community/ubuntuvalues  #
-aboutus/contactus  /contact-us  #
-Contact-us  /contact-us  #
-contact-us  /about/contact-us  #
-products/whatisubuntu  /desktop  #
-products/WhatIsUbuntu/desktopedition  /desktop  #
-getubuntu/music-store-lynx  /desktop/features  #
-products/whatisubuntu/804features  /desktop/features  #
-products/whatisubuntu/804features/music  /desktop/features  #
-products/whatisubuntu/804features/office-tools  /desktop/features  #
-products/whatisubuntu/804features/productivity-tools  /desktop/features  #
-products/whatisubuntu/810features/music  /desktop/features  #
-products/whatisubuntu/810features/office-tools  /desktop/features  #
-products/whatisubuntu/904features  /desktop/features  #
-products/whatisubuntu/904features/accessibility  /desktop/features  #
-products/whatisubuntu/904features/music  /desktop/features  #
-products/whatisubuntu/904features/productivity-tools  /desktop/features  #
-products/whatisubuntu/910features  /desktop/features  #
-download  /desktop/get-ubuntu/download  #
-how-can-it-be-free  /desktop/why-is-it-free  #
-devices  /phone  #
-devices/eyewear  /devices  #
-android  /devices/android  #
-devices/backed-by-canonical  http://ubuntu.com/phone/backed-by-canonical  #
-tv/backed-by-canonical  http://ubuntu.com/phone/backed-by-canonical  #
-devices/tv/commercial-info  http://ubuntu.com/tv/commercial-info  #
-devices/tv/contact-us  http://ubuntu.com/tv/contact-us  #
-devices/tv/contributors  /tv/contributors  #
-devices/tv/experience  /tv/experience  #
-devices/tv/features-and-specs  /tv/features-and-specs  #
-devices/tv/industry  /tv/industry  #
-downloads  /download  #
-netbook/get-ubuntu  /download  #
-promo/extra-secure  /download  #
-promo/lighter-os  /download  #
-promo/no-viruses  /download  #
-promo/super-fast  /download  #
-about-canonical  http://www.canonical.com/about-canonical  #
-careers  http://www.canonical.com/about-canonical/careers  #
-news  http://www.canonical.com/about-canonical/news-and-events  #
-uhs2010  http://www.canonical.com/about-canonical/news-and-events/events/2011/12/08/live-events/ubuntu-hardware-summit-2011  #
-uhs2011  http://www.canonical.com/about-canonical/news-and-events/events/2011/12/08/live-events/ubuntu-hardware-summit-2011  #
-partners/isv  http://www.canonical.com/about-canonical/partnerships  #
-products/casestudies  http://www.canonical.com/about-canonical/resources/case-studies  #
-project/case-studies  http://www.canonical.com/about-canonical/resources/case-studies  #
-support/services/desktopcomparison  http://www.canonical.com/support/services/desktopcomparison  #
-bigdata  http://www.ubuntu.com/business/server/overview#built-for-big-data  #
-webinar/desktopmigration  https://events.webdialogs.com/register.php?id=616666a83a&l=en-US  #
-frs  https://pages.canonical.com/FRS.html  #
-release-notes/oneiric-ocelot  https://wiki.ubuntu.com/OneiricOcelot/ReleaseNotes  #
-partners/faq  /partners  #
-partners/find  /partners  #
-partners/findapartner  /partners  #
-partners/hardwareprogramme  /partners  #
-partners/icsw  /partners  #
-partners/occs  /partners  #
-partners/training  /partners  #
-partners/training/certificationcourses  /partners  #
-dell  /partners/dell  #
-arm  /partners/featured-partners/arm  #
-hp  /partners/hp  #
-ibm  /partners/ibm  #
-ti  /partners/ti  #
-content/french-national-police-force-saves-2-million-year-ubuntu  /products/casestudies/french-national-police-force-saves-2-million-year-ubuntu  #
-products/SoftwareCatalogue  /products/softwarecatalogue  #
-node  /products/whatisubuntu/serveredition/techspecs  #
-aboutus  /about  #
-project  /about  #
-community/processes  /about  #
-community/ubuntustory  /about/about-ubuntu  #
-project/about-ubuntu  /about/about-ubuntu  #
-project/canonical-and-ubuntu  /about/canonical-and-ubuntu  #
-community/ubuntustory/debian  /about/about-ubuntu  #
-project/about-ubuntu  /about/about-ubuntu  #
-ubuntu/components  /about/about-ubuntu/components  #
-project/about-ubuntu/components  /about/about-ubuntu/components  #
-community/conduct  /about/about-ubuntu/conduct  #
-project/about-ubuntu/conduct  /about/about-ubuntu/conduct  #
-project/derivatives  /about/about-ubuntu/derivatives  #
-project/about-ubuntu/derivatives  /about/about-ubuntu/derivatives  #
-project/ubuntufont  /about/ubuntu-font  #
-project/ubuntu-font  /about/ubuntu-font  #
-project/open-source  /about/about-ubuntu/our-philosophy  #
-project/about-ubuntu/our-philosophy  /about/about-ubuntu/our-philosophy  #
-project/about-ubuntu/leadership-conduct  /about/about-ubuntu/conduct  #
-project/about-ubuntu/conduct  /about/about-ubuntu/conduct  #
-community/ubuntuvalues  /project/about-ubuntu/diversity  #
-project/about-ubuntu/diversity  /about/about-ubuntu/diversity  #
-community/processes/governance  /about/about-ubuntu/governance  #
-community/processes/newdev  /project/about-ubuntu/governance  #
-project/about-ubuntu/governance  /about/about-ubuntu/governance  #
-community/processes/newmember  /about/about-ubuntu/governance  #
-project/about-ubuntu/governance  /about/about-ubuntu/governance  #
-community/processes/techboard  /about/about-ubuntu/governance  #
-project/about-ubuntu/governance  /about/about-ubuntu/governance  #
-community/ubuntustory/governance  /about/about-ubuntu/governance  #
-community/leadership-conduct  /about/about-ubuntu/leadership-conduct  #
-project/about-ubuntu/leadership-conduct  /about/about-ubuntu/leadership-conduct  #
-community/ubuntustory/licensing  /about/about-ubuntu/licensing  #
-project/about-ubuntu/licensing  /about/about-ubuntu/licensing  #
-community/ubuntustory/philosophy  /about/about-ubuntu/our-philosophy  #
-project/about-ubuntu/our-philosophy  /about/about-ubuntu/our-philosophy  #
-community/ubuntu-and-debian  /about/about-ubuntu/ubuntu-and-debian  #
-project/about-ubuntu/ubuntu-and-debian  /about/about-ubuntu/ubuntu-and-debian  #
-products/whatisubuntu/derivatives  /about/derivatives  #
-project/derivatives  /about/derivatives  #
-products/WhatIsUbuntu/edubuntu  /about/derivatives  #
-project/derivatives  /about/derivatives  #
-products/WhatIsUbuntu/serveredition  /server  #
-server/doc  /server  #
-products/whatisubuntu/serveredition/features  /server/features/reduce-costs  #
-products/whatisubuntu/serveredition/features/mailserver  /server/features/reduce-costs  #
-products/whatisubuntu/serveredition/features/webappserver  /server/features/reduce-costs  #
-products/whatisubuntu/serveredition/features/security  /server/features/security  #
-server/get-ubuntu/cd-and-dvd  /server/get-ubuntu/cds  #
-products/whatisubuntu/serveredition/techspecs/whatsnew  /server/technical-resources  #
-products/whitepapers  /server/whitepapers  #
-server/services  /services/server  #
-testing/download  /start-download?test_release=pre  #
-cloud/training  /support/training  #
-training  /support/training  #
-training/e-learning  /support/training  #
-training/trainingpartner/locate  /support/training  #
-training/certificationcourses/server  /support/training/course-descriptions  #
-training/certificationcourses/professional  /support/training/course-descriptions/certified-professional  #
-training/certificationcourses/ucp/exam  /support/training/course-descriptions/certified-professional  #
-training/certificationcourses/ucp/objectives  /support/training/course-descriptions/certified-professional  #
-training/desktop  /support/training/course-descriptions/desktop-course  #
-netbook  /ubuntu  #
-ubuntu/features  /desktop/features  #
-netbook/features  /desktop/features  #
-ubuntu/why-is-it-free  /desktop  #
-ubuntu/why-use-ubuntu  /desktop  #
-ubuntu/features/more-apps  /desktop/features/games-apps  #
-hardware-summit  /uhs2010  #
-uhs  /uhs2010  #
-users/cmsuser1  /  #
-users/cmsuser2  /  #
-syndicated/kubuntu-download-demo  http://www.ubuntu.com  #
-syndicated/kubuntu-download  http://www.ubuntu.com  #
-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/2  http://www.ubuntu.com  #
-taxonomy/term/2/0  http://www.ubuntu.com  #
-taxonomy/term/2/0  http://www.ubuntu.com  #
-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  #
-category/audience/community  /  #
-category/audience/consumer  /  #
-category/audience/enterprise  /  #
-category/audience/ihv  /  #
-category/audience/interview-candidates  /  #
-category/audience/isv  /  #
-category/audience/oem  /  #
-category/carousel-position/cloud  /  #
-category/carousel-position/desktop  /  #
-category/carousel-position/enteprise-services  /  #
-category/carousel-position/enterprise-services  /  #
-category/carousel-position/homepage  /  #
-category/carousel-position/landscape  /  #
-category/carousel-position/server  /  #
-category/event-type/live-events  /  #
-category/event-type/live-webinar  /  #
-category/name-city/london  /  #
-category/name-city/name-city  /  #
-category/name-city/testtaxanomy  /  #
-category/product/cloud  /  #
-category/product/desktop  /  #
-category/product/enteprise-services  /  #
-category/product/enterprise-services  /  #
-category/product/landscape  /  #
-category/product/oem-services  /  #
-category/product/server  /  #
-category/product/ubuntu-advantage  /  #
-category/product/ubuntu-light  /  #
-category/product/ubuntu-server-edition  /  #
-taxonomy/term  /  #
-support/community/webforums  http://www.ubuntu.com/support/community/web-forums  #
-support/community/mailinglists  http://www.ubuntu.com/support/community/mailing-lists  #
-support/community/locallanguage  http://www.ubuntu.com/support/community/local-language  #
-business/  /desktop/business  #
-business/server/overview  /server  #
-business/server  /server  #
-business/server/  /server  #
-business/server/technical-resources  http://www.ubuntu.com/business/server  #
-business/server/cloud  http://www.ubuntu.com/business/server  #
-business/server/built-in-security  http://www.ubuntu.com/business/server  #
-business/server/virtualisation  http://www.ubuntu.com/business/server  #
-business/server/reduce-costs  http://www.ubuntu.com/business/server  #
-business/server/minimise-administration  http://www.ubuntu.com/business/server  #
-business/server/hyperscale  /server/hyperscale  #
-business/services/gratis-assessment/vielen-dank  http://www.ubuntu.com/business/advantage  #
-business/whats-new/lvm  http://www.ubuntu.com/business/advantage  #
-business/whats-new/thank-you  http://www.ubuntu.com/business/advantage  #
-aboutus/privacypolicy  http://www.ubuntu.com/privacy-policy  #
-aboutus/online-accounts-legal-notice  http://www.ubuntu.com/legal/online-accounts  #
-community/get-involved/donate  http://www.ubuntu.com/community/get-involved  #
-ubuntu  /desktop  #
-ubuntu/whats-new  /desktop/  #
-ubuntu/why-use-ubuntu  /desktop/  #
-ubuntu/why-is-it-free  /desktop/  #
-ubuntu/features/ubuntu-one  /desktop/features/personal-cloud  #
-ubuntu/features/personal-cloud  /desktop/features/personal-cloud  #
-ubuntu/features/ubuntu-software-centre  /desktop/features/games-apps  #
-desktop/features/more-apps  /desktop/features/games-apps  #
-ubuntu/features/find-more-apps  /desktop/features/games-apps  #
-ubuntu/features/web-browsing  /desktop/features/web-browsing  #
-ubuntu/features/office-applications  /desktop/features/office-applications  #
-ubuntu/features/social-and-email  /desktop/features/social-and-email  #
-ubuntu/features/music-and-mobile  /desktop/features/music-and-mobile  #
-ubuntu/features/photos-and-videos  /desktop/features/photos-and-videos  #
-ubuntu/take-the-tour  /desktop/take-the-tour  #
-ubuntu/take-the-tour-gallery  /desktop/take-the-tour-gallery  #
-project/about-ubuntu/leadership-conduct  /project/about-ubuntu/conduct  #
-devices/tablet  /tablet  #
-devices/tablet/partner  /tablet/operators-and-oems  #
-devices/tablet/app-ecosystem  /tablet/app-ecosystem  #
-devices/tablet/contact-us  /tablet/contact-us  #
-devices/tablet/thank-you  /tablet/thank-you  #
-devices/phone  /phone  #
-devices/phone/design  /phone/features  #
-phone/design  /phone/features  #
-devices/phone/operators-and-oems  /phone/operators-and-oems  #
-devices/phone/app-ecosystem  /phone/app-ecosystem  #
-devices/phone/contact-us  /phone/contact-us  #
-devices/phone/thank-you  /phone/thank-you  #
-devices/android  /phone/ubuntu-for-android  #
-devices/android/features-and-specs  /phone/ubuntu-for-android/features  #
-devices/android/commercial-info  /phone/ubuntu-for-android/commercial-info  #
-devices/android/contact-us  /phone/ubuntu-for-android/contact-us  #
-devices/android/thank-you  /phone/ubuntu-for-android/thank-you  #
-phone/install  https://wiki.ubuntu.com/Touch/Install  #
-devices/tv  /tv  #
-devices/tv/experience  /tv/experience  #
-devices/tv/industry  /tv/industry  #
-devices/tv/contributors  /tv/contributors  #
-devices/tv/features-and-specs  /tv/features-and-specs  #
-devices/tv/commercial-info  /tv/commercial-info  #
-devices/tv/contact-us  /tv/contact-us  #
-devices/tv/thank-you  /tv/thank-you  #
-aboutus/privacypolicy/thirdparties  /privacy-policy/third-parties  #
-releaseendoflife  /info/release-end-of-life  #
-release-end-of-life  /info/release-end-of-life  #
-testing  /info/testing  #
-community  http://community.ubuntu.com  #
-community/  http://community.ubuntu.com  #
-community/get-involved  http://community.ubuntu.com/contribute  #
-community/get-involved/developers  http://community.ubuntu.com/contribute/developers  #
-community/get-involved/developers/non-technical-users  http://community.ubuntu.com/contribute  #
-community/get-involved/developers/technical-users  http://community.ubuntu.com/contribute/developers  #
-community/get-involved/developers/wiki  http://community.ubuntu.com/contribute/help-information  #
-community/get-involved/countdown  http://community.ubuntu.com  #
-community/report-problem  http://community.ubuntu.com/help-information  #
-community/stay-connected  http://community.ubuntu.com/help-information/keeping-up-to-date  #
-trademark-policy  http://www.canonical.com/intellectual-property-policy  #
-cloud/maas  /cloud/tools/maas  #
-cloud/provisioning  /cloud/tools  #
-cloud/service-providers  /cloud/ecosystem  #
-cloud/technical-resources  /cloud/tools  #
-cloud/cool-stuff  /cloud/labs  #
-cloud/insights  /cloud  #
-cloud/insights/beginners-guide  /cloud  #
-cloud/orchestration  /cloud/tools  #
-cloud/orchestration/juju  /cloud/tools/juju  #
-cloud/orchestration/maas  /cloud/tools/maas  #
-cloud/private-cloud  /cloud/build-a-cloud  #
-cloud/private-cloud/jumpstart  /cloud/tools/jumpstart  #
-cloud/private-cloud/build-your-own  /cloud/build-a-cloud  #
-cloud/private-cloud/hybrid-cloud  /cloud/build-a-cloud  #
-cloud/private-cloud/openstack  /cloud/tools/openstack  #
-cloud/private-cloud/reference-architecture  /cloud/tools/openstack/reference-architecture  #
-cloud/public-cloud  /cloud/build-a-cloud  #
-cloud/public-cloud/guest  /cloud/build-a-cloud  #
-cloud/public-cloud/infrastructure  /cloud/build-a-cloud  #
-cloud/public-cloud/strategy  /cloud/build-a-cloud  #
-cloud/partner-ecosystem  /cloud/ecosystem  #
-cloud/provisioning  /cloud/tools/maas  #
-cloud/service-providers  /cloud/ecosystem  #
-cloud/technical-resources  /cloud/tools  #
\ No newline at end of file
+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  #
diff --git a/templates/search.html b/templates/search.html
new file mode 100755
index 00000000000..590e04d6c1f
--- /dev/null
+++ b/templates/search.html
@@ -0,0 +1,95 @@
+{% extends "templates/one-column.html" %} 
+
+{% block title %}Search results{% if query %} for "{{query}}"{% endif %} | Ubuntu{% endblock %}
+{% block extra_body_class %}ubuntu-search{% endblock %}
+
+{% block content %}
+<div class="row row-hero no-border search-container">
+    {% if query %}
+    {% if results %}
+    <h1>We've found {% if total %}{{ total }} {% endif %}results for "{{query}}"</h1>
+    {% else %}
+    <h1>Sorry we couldn't find "{{ query }}"</h1>
+    {% endif %}
+    {% else %}
+    <h1>Search Ubuntu and Canonical sites</h1>
+    {% endif %}
+
+    <form action="/search">
+        <fieldset class="main-search">
+        		<label for="search-input" class="off-left">Search</label>
+            <input name="q" id="search-input" type="search" value="{{ query }}" placeholder="e.g. juju" />
+            <button type="submit"><img src="{{ STATIC_URL }}img/search-black.png" alt="search" /></button>
+        </fieldset>
+    </form>
+
+{% if query %}
+{% if request_succeeded %}
+{% if parse_succeeded %}
+{% if results %}
+    <section id="search-results" class="no-margin-bottom list list-spaced">
+        <p class="result-line results-top">Results{% if start or end %} {{ start }} to {{ end }}{% endif %}</p>
+{% for result in results %}
+        <article class="search-result">
+            <h1>
+                <a href="{{ result.url }}" class="title-main">{{ result.title|safe }}</a>
+                <small class="result-url"><a href="{{ result.url }}">{{ result.url }}</a></small>
+            </h1>
+            <p>{{ result.summary|safe }}</p>
+        </article>
+{% endfor %}
+
+{% if start or end %}
+        <p class="bottom-results-total result-line">Results {{ start }} to {{ end }}</p>
+{% endif %}
+    </section>
+{% else %}
+    <h2>Why not try widening your search? You can do this by:</h2>
+    <ul>
+        <li>Adding alternative words or phrases</li>
+        <li>Using individual words instead of phrases</li>
+        <li>Trying a different spelling</li>
+    </ul>
+    
+    <h2>Still no luck?</h2>
+
+    <ul>
+        <li><a href="/">Visit the Ubuntu homepage</a></li>
+        <li><a href="/contact-us">Contact us</a></li>
+    </ul>
+{% endif %} {# results #}
+
+{% if nav_items %}
+    <nav class="bottom-nav" id="page-nav">
+        <ul class="nav-forward">
+{% for item in nav_items %}
+{% if item.direction == 'forward' %}
+            <li class="{{ item.class }}"><a href="{{ item.url }}">{{ item.name }}</a></li>
+{% endif %}
+{% endfor %}
+        </ul>
+
+        <ul class="nav-back">
+{% for item in nav_items %}
+{% if item.direction == 'back' %}
+            <li class="{{ item.class }}"><a href="{{ item.url }}">{{ item.name }}</a></li>
+{% endif %}
+{% endfor %}
+        </ul>
+    </nav>
+{% endif %} {# nav_items #}
+
+{% else %} {# parse_succeeded false #}
+    <label for="search-input" role="error" class="error-notification">
+        Failed to parse results. If you have time, please <a href="https://bugs.launchpad.net/ubuntu-website-content/+filebug">file a bug</a>.
+    </label>
+{% endif %}
+{% else %} {# request_succeeded false #}
+    <label for="search-input" role="error" class="error-notification">
+        Failed to retrieve search results. If you have time, please <a href="https://bugs.launchpad.net/ubuntu-website-content/+filebug">file a bug</a>.
+    </label>
+{% endif %} {# request_succeeded #}
+
+{% endif %} {# query #}
+</div>
+{% endblock content %}
diff --git a/templates/server/_nav_secondary.html b/templates/server/_nav_secondary.html
old mode 100644
new mode 100755
index 7de0afe280c..0776faf6664
--- a/templates/server/_nav_secondary.html
+++ b/templates/server/_nav_secondary.html
@@ -1,5 +1,4 @@
-	<ul{% if list_class %} class="{{ list_class }}"{% endif %}>
-		{% if arrow %} <li class="arrow-up"></li> {% endif %}
+	<ul{% if list_class %} class="{{ list_class }}"{% endif %} class="second-level-nav">
 		<li class="first{% if level_2 == 'management' %} last-item{% endif %}{% if level_1 == 'server' and not level_2 %}  active{% endif %}"><a href="/server">Overview</a></li>
 		<li{% if level_2 == 'hyperscale' %} class="last-item"{% endif %}{% if level_2 == 'management' %} class="active"{% endif %}><a href="/server/management">Server management</a></li>
 		<li{% if level_2 == 'hyperscale' %} class="active"{% endif %}><a href="/server/hyperscale">Hyperscale</a></li>
diff --git a/templates/server/_nav_tertiary.html b/templates/server/_nav_tertiary.html
old mode 100644
new mode 100755
index c84e9dda9d6..ad89672a67b
--- a/templates/server/_nav_tertiary.html
+++ b/templates/server/_nav_tertiary.html
@@ -1,4 +1,4 @@
-<ul>
+<ul class="third-level-nav">
 {% if level_3 == 'thank-you' and not level_4 %}
 		<li{% if level_3 == 'thank-you' %} class="active"{% endif %}>Thank you</li>
 {% endif %}
diff --git a/templates/server/base_server.html b/templates/server/base_server.html
old mode 100644
new mode 100755
diff --git a/templates/server/contact-us.html b/templates/server/contact-us.html
old mode 100644
new mode 100755
index 0558349f04b..bc60e45f989
--- a/templates/server/contact-us.html
+++ b/templates/server/contact-us.html
@@ -63,11 +63,11 @@ <h2>Considering Ubuntu Server for your business?</h2>
 	<div class="eight-col">
 
 	<p>Just fill in the form below and a member of our team will be in touch within two working days.</p>
-	
-	<p>If you just need support for yourself, you can; <a href="http://askubuntu.com/">Ask Ubuntu</a>, <a href="/support/community">get help from the community</a>, <a href="http://ubuntuforums.org/">join a forum</a>, or <a href="https://help.ubuntu.com/">take a look at our official documentation</a>.</p>
-	
+
+	<p>If you just need support for yourself, you can; <a href="http://askubuntu.com/">Ask Ubuntu</a>, <a href="http://community.ubuntu.com/help-information/" class="external">get help from the community</a>, <a href="http://ubuntuforums.org/">join a forum</a>, or <a href="https://help.ubuntu.com/">take a look at our official documentation</a>.</p>
+
 	<p>All fields are required.</p>
-	
+
 
 <form class="lpeRegForm formNotEmpty" method="post" enctype="application/x-www-form-urlencoded" action="https://pages.canonical.com/index.php/leadCapture/save" id="mktForm_1090" name="mktForm_1090">
 	<fieldset class="fieldset-1">
@@ -91,45 +91,114 @@ <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="2"><span class="mktFormMsg"></span></span>
+				<span class="mktInput"><input class="mktFormText mktFormString mktFReq" name="FirstName" id="FirstName" type="text" value="" maxlength="255" tabindex="2" required><span class="mktFormMsg"></span></span>
 			</li>
 			<li class='mktFormReq mktField' >
-				<label for="LastName">Last Name: <span>*</span></label>
+				<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' />
+					<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">Work email: <span>*</span></label>
 				<span class='mktInput'>
-					<input class='mktFormText mktFormEmail mktFReq' name="Email" id="Email" type='text' value=""  maxlength='255' tabIndex='3' />
+					<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>
+				<label for="Phone">Phone number: <span>*</span></label>
 				<span class='mktInput'>
-					<input class='mktFormText mktFormPhone mktFReq' name="Phone" id="Phone" type='text' value=""  maxlength='255' tabIndex='4' />
+					<input class='mktFormText mktFormPhone mktFReq' name="Phone" id="Phone" type='tel' value=""  maxlength='255' tabIndex='4' 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'><option value='Select Country:' 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>
+					<select class='mktFormSelect mktFReq' name="Country" id="Country" size='1'   tabIndex='5' required><option value='Select Country:' 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='mktField' >
 				<label for="State">State:</label>
 				<span class='mktInput'>
-					<select class='mktFormSelect' name="State" id="State" size='1'   tabIndex='6'><option value='' selected='selected'>Please select</option><option value='AK'>AK</option><option value='AL'>AL</option><option value='AR'>AR</option><option value='AZ'>AZ</option><option value='CA'>CA</option><option value='CO'>CO</option><option value='CT'>CT</option><option value='DE'>DE</option><option value='FL'>FL</option><option value='GA'>GA</option><option value='HI'>HI</option><option value='IA'>IA</option><option value='ID'>ID</option><option value='IL'>IL</option><option value='IN'>IN</option><option value='KS'>KS</option><option value='KY'>KY</option><option value='LA'>LA</option><option value='MA'>MA</option><option value='MD'>MD</option><option value='ME'>ME</option><option value='MI'>MI</option><option value='MN'>MN</option><option value='MO'>MO</option><option value='MS'>MS</option><option value='MT'>MT</option><option value='NC'>NC</option><option value='ND'>ND</option><option value='NE'>NE</option><option value='NH'>NH</option><option value='NJ'>NJ</option><option value='NM'>NM</option><option value='NV'>NV</option><option value='NY'>NY</option><option value='OH'>OH</option><option value='OK'>OK</option><option value='OR'>OR</option><option value='PA'>PA</option><option value='RI'>RI</option><option value='SC'>SC</option><option value='SD'>SD</option><option value='TN'>TN</option><option value='TX'>TX</option><option value='UT'>UT</option><option value='VA'>VA</option><option value='VT'>VT</option><option value='WA'>WA</option><option value='WI'>WI</option><option value='WV'>WV</option><option value='WY'>WY</option></select>
+					<select class='mktFormSelect' name="State" id="State" size='1'   tabIndex='6'>
+					<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>
-			
-			
+
+
 		</ul>
 	</fieldset>
 
@@ -138,36 +207,36 @@ <h3>Your organisation</h3>
 
 	<ul class="mktLblLeft">
 		<li class='mktFormReq mktField' >
-			<label for="Job_Role__c">Job Role: <span>*</span></label>
+			<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'><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>
+				<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>
 		</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'><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>
+				<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>
 		</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'><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>
+				<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>
 		</li>
 		<li class='mktFormReq mktField' >
 			<label for="num_employees__c">Number of employees in your organisation: <span>*</span></label>
 			<span class='mktInput'>
-				<select class='mktFormSelect mktFReq' name="num_employees__c" id="num_employees__c" size='1'   tabIndex='10'><option value='Please select' selected='selected'>Please select</option><option value='None'>None</option><option value='&lt;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>
+				<select class='mktFormSelect mktFReq' name="num_employees__c" id="num_employees__c" size='1'   tabIndex='10' required><option value='Please select' selected='selected'>Please select</option><option value='None'>None</option><option value='&lt;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>
 		<li class='mktFormReq mktField' >
 			<label for="NumUbuntuServers__c">How many servers does your organisation currently have?  <span>*</span></label>
-			<span class='mktInput'><select class='mktFormSelect mktFReq' name="NumUbuntuServers__c" id="NumUbuntuServers__c" size='1'   tabIndex='11'><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>
+			<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>
 		</li>
 	</ul>
 	</fieldset>
@@ -178,7 +247,7 @@ <h3>Your comments</h3>
 		<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'></textarea>
+				<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>
 		</li>
@@ -191,14 +260,14 @@ <h3>Your comments</h3>
 		</li>
 	</ul>
 	</fieldset>
-	
+
 	<fieldset class="fieldset-submit">
 	<ul class="mktLblLeft">
 		<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">
 			<input id="mktFrmSubmit" type="submit" value="Submit" name="submitButton" tabindex="14" onclick="formSubmit(document.getElementById('mktForm_1090')); return false;" />
 			<input id="mktFrmReset" type="reset" value="Clear" name="resetButton" />
-		</li>     
+		</li>
 
 	</ul>
 	</fieldset>
diff --git a/templates/server/hyperscale.html b/templates/server/hyperscale.html
old mode 100644
new mode 100755
index 9652e653cd8..f65ef4aa02b
--- a/templates/server/hyperscale.html
+++ b/templates/server/hyperscale.html
@@ -14,12 +14,12 @@
 		<h1>Ubuntu leads in hyperscale</h1>
 		<p>Ubuntu is the hyperscale OS, natively powering scale-out workloads on a new wave of low-cost, ultra-dense hardware based on x86 and ARM processors.</p>
 		<p><a class="link-cta-ubuntu" href="/download/server">Download Ubuntu Server</a></p>
-		<p class="no-margin"><a href="/download/arm">Download Ubuntu for ARM  &rsaquo;</a></p>
+		<p class="no-margin"><a href="/download/arm">Download Ubuntu for ARM &nbsp;&rsaquo;</a></p>
 	</div>
 </div>
 {% endblock %}
 
-{% block content %}	
+{% block content %}
 <div class="row welcome-hyperscale">
 	<div class="seven-col">
 		<h2>Welcome to hyperscale, the future of the datacentre</h2>
@@ -38,27 +38,31 @@ <h2>Ubuntu Server for hyperscale</h2>
 		<p>Ubuntu works seamlessly across x86 and ARM. And it comes with all the leading open source and commercial workloads built in, including Apache Hadoop, Inktank Ceph, 10gen MongoDB and many others.</p>
 	</div>
 	<h3>Here&rsquo;s why Ubuntu is the best answer to the scale-out challenge:</h3>
-	<ul class="six-col list-canonical">
-		<li><strong>Scale-out at the core</strong>: Ubuntu Server supports the scale-out compute model and provides tools which make it simple to manage the entire cluster.</li>
-		<li><strong>No end-user license fee</strong>: Ubuntu is offered free to end-users. Adding 100 more nodes shouldn&rsquo;t require you to pay another 100 times for the OS!</li>
-		<li><strong>Partners</strong>: Canonical has a global program with SoC vendors and OEMs to ensure that platforms are enabled and certified to run Ubuntu.</li>
-	</ul>
-	<ul class="six-col last-col list-canonical">
-		<li><strong>Seamless platform support</strong>: Ubuntu Server runs exactly the same on every enabled architecture, be it x86, ARM or PowerPC; with the same applications and tools.</li>
-		<li><strong>Commercially supported</strong>: Canonical backs its free OS commitment with Ubuntu Advantage including commercial support, systems management and access to top experts.</li>
-	</ul>
-	<div class="six-col"> 
-		<p><a href="/server/management">Find out more about server management &rsaquo;</a></p>
+	<div class="combined-list">
+		<ul class="six-col list-canonical">
+			<li><strong>Scale-out at the core</strong>: Ubuntu Server supports the scale-out compute model and provides tools which make it simple to manage the entire cluster.</li>
+			<li><strong>No end-user license fee</strong>: Ubuntu is offered free to end-users. Adding 100 more nodes shouldn&rsquo;t require you to pay another 100 times for the OS!</li>
+			<li class="last-item"><strong>Partners</strong>: Canonical has a global program with SoC vendors and OEMs to ensure that platforms are enabled and certified to run Ubuntu.</li>
+		</ul>
+		<ul class="six-col last-col list-canonical">
+			<li><strong>Seamless platform support</strong>: Ubuntu Server runs exactly the same on every enabled architecture, be it x86, ARM or PowerPC; with the same applications and tools.</li>
+			<li><strong>Commercially supported</strong>: Canonical backs its free OS commitment with Ubuntu Advantage including commercial support, systems management and access to top experts.</li>
+		</ul>
+	</div>
+	<div class="six-col">
+		<p><a href="/server/management">Find out more about server management&nbsp;&rsaquo;</a></p>
 	</div>
 </div><!-- /.row -->
 
-<div class="row row-quote">
-	<blockquote>
-		<p>&ldquo;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&rdquo;</p>
-		<cite>Paul Santeler, VP &amp; GM, Hyperscale Business Unit, HP</cite>
-	</blockquote>
+<div class="row">
+	<div class="twelve-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&nbsp;<span>&rdquo;</span></p>
+			<p><cite>Paul Santeler, VP &amp; GM, Hyperscale Business Unit, HP</cite></p>
+		</blockquote>
+	</div>
 </div>
-	
+
 <div class="row row-image-centered">
 	<div class="seven-col">
 		<h2>Canonical&rsquo;s long-term commitment</h2>
@@ -67,10 +71,10 @@ <h2>Canonical&rsquo;s long-term commitment</h2>
 		<p>Ubuntu now runs on every significant ARM platform deployed in the datacentre, including the recently-announced Baidu storage cluster.</p>
 	</div><!-- /.eight-col -->
 	<span>
-		<img src="{{ STATIC_URL }}img/pictograms/pictogram-reduce-costs-199x199.png" width="199" height="199" alt="" />
+		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-reducecosts-warmgrey.svg" width="199" height="199" alt="" />
 	</span>
 </div><!-- /.row -->
-	
+
 <div class="row vertical-divider no-border">
 	<h2 class="twelve-col">The complete solution for hyperscale</h2>
 	<div class="six-col">
@@ -78,13 +82,13 @@ <h3>Workload-level orchestration with Juju</h3>
 		<p>Canonical&rsquo;s Juju framework goes beyond traditional orchestration systems to create a new paradigm in workload deployment.</p>
 		<p>Juju decouples services deployed onto the cluster from the nodes running them, and makes the deployment of the individual service easy.</p>
 		<p>Juju also supports deployment to cloud services like Amazon EC2 and Rackspace Cloud, and includes charms for open source workloads and key server ISV products.</p>
-		<p><a href="/cloud/orchestration/juju">Get more details on Juju here &rsaquo;</a></p>
-	</div>  
+		<p><a href="/cloud/orchestration/juju">Get more details on Juju here&nbsp;&rsaquo;</a></p>
+	</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>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 &rsaquo;</a></p>
+		<p><a href="/cloud/orchestration/maas">Learn more about MAAS&nbsp;&rsaquo;</a></p>
 	</div>
 </div><!-- /.row -->
 <div class="row equal-height">
@@ -102,12 +106,12 @@ <h3>x86 and ARM support</h3>
 	</div>
 </div>
 <div class="row">
-	<div class="eight-col"> 
+	<div class="eight-col">
 		<h2>Your roadmap for hyperscale success</h2>
 		<p>Canonical offers a range of services tailored to the needs of SoC and OEM partners as well as end users deploying hyperscale clusters.</p>
 	</div>
 	<div class="twelve-col vertical-divider equal-height">
-		<div class="four-col"> 
+		<div class="four-col">
 			<h3>SoC partners</h3>
 			<p>Canonical offers hardware enablement services to ensure that new System On Chip (SoC) silicon is tightly integrated and tuned with Ubuntu, and a certification program to give OEMs and end users the highest level of confidence that the complete system, including chip, enclosure and OS work together in the most optimal way. </p>
 		</div>
@@ -120,8 +124,8 @@ <h3>End users</h3>
 			<p>Canonical, together with OEM and ODM partners, delivers critical support and services to ensure customers can realise the full benefits of hyperscale technology.</p>
 		</div>
 	</div>
-	<div class="eight-col append-four"> 
-		<p><a href="/server/contact-us">Contact us about hyperscale &rsaquo;</a></p>
+	<div class="eight-col append-four">
+		<p><a href="/server/contact-us">Contact us about hyperscale&nbsp;&rsaquo;</a></p>
 	</div>
 </div>
 <div class="row equal-height">
@@ -132,21 +136,21 @@ <h2>Hyperscale partners</h2>
 				<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 &rsaquo;</a></p>
+			<p><a href="/partners/hp/moonshot">Learn more&nbsp;&rsaquo;</a></p>
 		</li>
 		<li class="box four-col">
 			<div class="partner-logo text-center">
 				<img src="{{ STATIC_URL }}img/partners/partners-logo-arm.png" width="150" height="45" alt="" />
 			</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 &rsaquo;</a></p>
+			<p><a href="/partners/arm">Learn more&nbsp;&rsaquo;</a></p>
 		</li>
 		<li class="box four-col last-col">
 			<div class="partner-logo text-center">
 				<img src="{{ STATIC_URL }}img/partners/partners-logo-cavium.png" width="150" height="34" alt="" />
 			</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 &rsaquo;</a></p>
+			<p><a href="http://www.cavium.com">Learn more&nbsp;&rsaquo;</a></p>
 		</li>
 	</ul>
 </div>
@@ -157,7 +161,7 @@ <h2>Hyperscale partners</h2>
 	<div class="twelve-col clearfix">
 		<div class="box-padded-feature">
 			<h3>Works with all your hardware and software</h3>
-				<div class="vertical-divider">
+				<div>
 					<div class="six-col">
 						<ul class="inline-icons clearfix">
 							<li><img src="{{ STATIC_URL }}img/third-party-logos/logo-dell-45x45.png" width="45" height="45" alt="Dell" /></li>
@@ -165,7 +169,7 @@ <h3>Works with all your hardware and software</h3>
 							<li><img src="{{ STATIC_URL }}img/third-party-logos/logo-hp-41x45.png" width="41" height="45" alt="HP" /></li>
 							<li><img src="{{ STATIC_URL }}img/third-party-logos/logo-intel-50x45.png" width="50" height="45" alt="Intel" /></li>
 						</ul>
-						<p><a href="/certification">View all certified hardware &rsaquo;</a></p>
+						<p><a href="/certification">View all certified hardware&nbsp;&rsaquo;</a></p>
 					</div><!-- /.six-col -->
 					<div class="six-col last-col">
 						<ul class="inline-icons clearfix">
@@ -174,7 +178,7 @@ <h3>Works with all your hardware and software</h3>
 							<li><img src="{{ STATIC_URL }}img/third-party-logos/logo-openstack-45x45.png" width="45" height="45" alt="OpenStack" /></li>
 							<li><img src="{{ STATIC_URL }}img/third-party-logos/logo-openbravo-112x45.png" width="112" height="45" alt="Openbravo" /></li>
 						</ul>
-						<p><a href="/partners/certified-software">View all certified software &rsaquo;</a></p>
+						<p><a href="/partners/certified-software">View all certified software&nbsp;&rsaquo;</a></p>
 					</div><!-- /.six-col -->
 				</div><!-- /.vertical-divider -->
 		</div><!-- /.box-padded-feature -->
diff --git a/templates/server/index.html b/templates/server/index.html
old mode 100644
new mode 100755
index 89807bc8efe..5cc1601621f
--- a/templates/server/index.html
+++ b/templates/server/index.html
@@ -1,138 +1,165 @@
 {% extends "server/base_server.html" %}
 
 {% block title %}Ubuntu Server - for scale-out computing{% 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 meta_description %}Secure, fast and powerful, Ubuntu helps you make the most of your infrastructure. Whether you want to deploy a cloud or a web farm, Ubuntu Server supports the most popular hardware and software.{% endblock %}
+{% block extra_body_class %}server-home{% endblock %}
 
 {% block second_level_nav_items %}
 	{% include "templates/_nav_breadcrumb.html" with section_title="Server" page_title="Overview"  %}
 {% endblock second_level_nav_items %}
 
 {% block content %}
-<div class="row row-hero">
-	<h1>Ubuntu Server &mdash; for scale-out computing</h1>
-	<div class="row-image-centered">
+<div class="row row-hero row-image-centered">
 	<div class="six-col">
-		<p class="intro">The leading platform for scale-out, Ubuntu helps you make the most of your infrastructure. Whether you want to deploy a cloud, a Hadoop cluster or a web farm, Ubuntu Server delivers the best value scale-out performance available.</p>
-		<p class="button-right right"><a class="link-cta-ubuntu" href="/download/server">Download Ubuntu Server</a></p>
-	</div>
-	<span><img src="{{ STATIC_URL }}img/pictograms/pictogram-server-446x120.png" width="389" height="113" alt="" /></span>
+		<h1>Scale out with Ubuntu Server</h1>
+		<p>The leading platform for scale-out computing, Ubuntu Server helps you make the most of your infrastructure. Whether you want to deploy an OpenStack cloud, a Hadoop cluster or a 50,000-node render farm, Ubuntu Server delivers the best value scale-out performance available.</p>
+		<p><a class="link-cta-ubuntu" href="/download/server">Download Ubuntu Server</a></p>
 	</div>
+	<span>
+		<img src="{{ STATIC_URL }}img/server/image-server.svg" width="400" height="121" alt="" />
+	</span>
 </div><!-- /.row -->
 
 <div class="row">
-	<h2>What&rsquo;s new in 13.10</h2>
+	<h2>What&rsquo;s new in 14.04 LTS</h2>
 	<div class="six-col">
-		<h3>Juju Charms</h3>
+		<h3>Ubuntu Server</h3>
 		<ul class="list-canonical">
-			<li>Local provider:  spin up a full application suite including all  supporting services on your machine</li>
-			<li>Manual provisioning:  you can now use pre-existing machines &mdash; no need for a cloud account</li>
-			<li>Manage Juju environments from Linux, OS X and Windows</li>
-			<li>Automatic provisioning support for Azure</li>
+			<li>Supported for five years by Canonical</li>
+			<li>Certification as a guest on AWS, Microsoft Azure, Joyent, IBM and HP Cloud</li>
+			<li>Updates to Tomcat (v7), Postgresql (v9.3), Docker v(0.9), Puppet (v3.0), Qemu (v2.0), Libvirt (v1.2), LXC (v1.0) and MySQL (v5.5)</li>
+			<li>The first production release of Open vSwitch 2.0 with full kernel integration</li>
+			<li>Runs on x86, x86-64, ARM v7, ARM64 and Power</li>
 		</ul>
 	</div>
 	<div class="six-col last-col">
-		<h3>OpenStack</h3>
+		<h3>Ubuntu OpenStack</h3>
 		<ul class="list-canonical">
-			<li>Havana built for 12.04 LTS, available through Cloud Archive</li>
-			<li>Introducing support for KVM Virtualization in ARM A15, and experimental ARM A15 support in Xen 4.3</li>
-			<li>Fast new installer &mdash; up to five times faster</li>
+			<li>Supported for five years by Canonical</li>
+			<li>Updated to the Icehouse release, including automated installation, queuing/notification and the integration of database-as-a-service </li>
+			<li>Certified by Microsoft to host Windows Server 2012 and Windows Server 2008 R2 as guests, under its Server Virtualisation Validation Program (SVVP)</li>
+			<li>Now compatible with CloudFoundry, the world&rsquo;s leading PaaS platform</li>
 		</ul>
 	</div>
 	<div class="eleven-col">
-		<p><a href="http://ubunt.eu/1310cloud">Read more in our 13.10 press release &rsaquo;</a></p>
+		<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>
 	</div>
 </div>
 
-<div class="row row-grey row-image-centered">
-	<span><img src="{{ STATIC_URL }}img/partners/pictos-server-hp-ubuntu.png" width="230" height="215" alt="" /></span>
-	<div class="six-col">
-		<h2>Scale-out at speed with Ubuntu on HP Moonshot</h2>
-		<p>Ubuntu, the leading OS for x86 and ARM hyperscale is partnering with HP to disrupt the server marketplace with <br/>HP Moonshot system.</p>
-		<p>Ubuntu is the scale-out leader and is fully integrated in the <br/>HP Moonshot system.</p>
-		<p><a href="/partners/hp/moonshot">Find out more &rsaquo;</a></p>
-	</div><!-- /.six-col -->
-</div><!-- /.row -->
+{% include "shared/_moonshot_promo.html" %}
+
+<div class="row row-image-centered">
+	<div class="eight-col">
+		<h2>Ubuntu Server on Power</h2>
+		<p>In addition to x86 and ARM servers, Ubuntu is supported on the Power architecture. For the enterprise datacentre, this means you can now build your infrastructure on any hardware you choose.</p>
+	</div>
+	<span>
+		<img src="{{ STATIC_URL }}img/logos/logo-pack/logo-ibm.svg" alt="IBM logo" width="200" width="80" />
+	</span>
+</div>
 
 <div class="row">
-	<h2 id="performance-and-versatility">Performance and versatility</h2>
-	<h3>Fast, secure, deploy-anywhere technology for fast-moving companies</h3>
-	<div class="six-col">
-		<p>It doesn’t matter whether you want to deploy a NoSQL database, web farm or cloud. Ubuntu has the performance and versatility you need. Certified by leading hardware OEMs and with comprehensive deployment tools, so you can get the most from your infrastructure.</p>
-	</div><!-- /.six-col -->
-	<div class="six-col last-col">
-		<p>Our regular release cycle means that we support most of the latest applications. And our lean initial install and integrated deployment and orchestration technologies makes Ubuntu Server a great solution for simple deployment and management at scale.</p>
-	</div><!-- /.six-col -->
+	<div class="twelve-col">
+		<h2 id="performance-and-versatility">Performance and versatility</h2>
+		<h3>Agile, secure, deploy-anywhere technology for fast-moving companies</h3>
+		<div class="six-col">
+			<p>It doesn&rsquo;t matter whether you want to deploy a NoSQL database, web farm or cloud. Ubuntu has the performance and versatility you need. Certified by leading hardware OEMs and with comprehensive deployment tools, so you can get the most from your infrastructure.</p>
+		</div><!-- /.six-col -->
+		<div class="six-col last-col">
+			<p>Our regular release cycle helps means that we support most of the latest applications. And our lean initial install and integrated deployment and orchestration technologies makes Ubuntu Server a great solution for simple deployment and management at scale.</p>
+		</div><!-- /.six-col -->
+	</div>
 
-	<div class="box-padded-feature clear">
-		<h3>Works with all your hardware and software</h3>
-		<div class="vertical-divider">
-			<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-ibm-46x45.png" width="46" height="45" alt="IBM" /></li>
-					<li><img src="{{ STATIC_URL }}img/third-party-logos/logo-hp-41x45.png" width="41" height="45" alt="HP" /></li>
-					<li><img src="{{ STATIC_URL }}img/third-party-logos/logo-intel-50x45.png" width="50" height="45" alt="Intel" /></li>
-				</ul>
-				<p><a href="/certification">View all certified hardware &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-openstack-45x45.png" width="45" height="45" alt="OpenStack" /></li>
-					<li><img src="{{ STATIC_URL }}img/third-party-logos/logo-openbravo-112x45.png" width="112" height="45" alt="Openbravo" /></li>
-				</ul>
-				<p><a href="/partners/certified-software">View all certified software &rsaquo;</a></p>
-			</div><!-- /.six-col -->
-		</div><!-- /.vertical-divider -->
-	</div><!-- /.box-padded-feature -->
-</div><!-- /.row -->
+	<h3 class="muted-heading">Works with all your hardware and software</h3>
+	<ul class="inline-logos no-bullets">
+		<li><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-lenovo.svg" alt="Lenovo" /></li>
+		<li><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-dell.svg" alt="Dell" /></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-hp.svg" alt="HP" /></li>
+		<li class="last-item"><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-intel.svg" alt="Intel" /></li>
+		<li><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-cisco.svg"alt="Cisco" /></li>
+		<li><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-amd.svg"alt="AMD" /></li>
+		<li class="last-item"><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-arm.svg"alt="Intel" /></li>
+	</ul>
+	<p class="text-center"><a href="/certification">View all certified hardware&nbsp;&rsaquo;</a></p>
+
+	<ul class="inline-logos no-bullets">
+		<li><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-centrify.png" alt="Centrify" /></li>
+		<li><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-openstack.svg" alt="OpenStack" /></li>
+		<li><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-likewise.png" alt="Likewise" /></li>
+		<li class="last-item"><img src="{{ STATIC_URL }}img/logos/logo-pack/logo-openbravo.png" alt="Openbravo" /></li>
+	</ul>
+	<p class="text-center"><a href="/partners/certified-software">View all certified software&nbsp;&rsaquo;</a></p>
+</div>
 
-<div class="row vertical-divider equal-height">
+<div class="row vertical-divider">
 	<div class="six-col">
-		<h2 id="make-your-it-budget-go-further">Scale without restrictions</h2>
-		<p>With no licence fees or subscription costs, Ubuntu Server can help you scale your data centre efficiently. Its streamlined architecture and automated deployment capabilities enables you to deliver more services with less computing power and fewer resources.</p>
+		<h2 id="make-your-it-budget-go-further">Scale without limits</h2>
+		<p>With no licence fees or subscription costs, Ubuntu Server can help you scale your data centre efficiently. Subscriptions to Ubuntu Advantage, Canonical&rsquo;s management programme,  include support for unlimited virtualisation and, unlike other enterprise Linux distributions, the price does not increase with additional CPUs.</p>
 	</div><!-- /.seven-col -->
 	<div class="six-col last-col">
-				<h3>Read our success stories</h3>
-				<ul class="list">
-					<li><a href="http://insights.ubuntu.com/case-study/ubuntu-big-data-environment-provides-new-insight-into-music-industry-trends/">Ubuntu Big Data environment provides new insight into music industry trends &rsaquo;</a></li>
-					<li><a href="http://insights.ubuntu.com/case-study/ubuntu-powers-online-presence-for-heart-fm-capital-fm-and-classic-fm/">Ubuntu powers online presence for Heart FM, Capital FM and Classic FM &rsaquo;</a></li>
-					<li class="last-item"><a href="http://insights.ubuntu.com/case-study/jt-global-standardises-mission-critical-production-system-on-ubuntu/">JT Global standardises mission-critical production system on Ubuntu &rsaquo;</a></li>
-				</ul>
+		<h3>Read our success stories</h3>
+		<ul class="list">
+			<li><a href="http://insights.ubuntu.com/case-study/ubuntu-big-data-environment-provides-new-insight-into-music-industry-trends/">Ubuntu Big Data environment provides new insight into music industry trends&nbsp;&rsaquo;</a></li>
+			<li><a href="http://insights.ubuntu.com/case-study/ubuntu-powers-online-presence-for-heart-fm-capital-fm-and-classic-fm/">Ubuntu powers online presence for Heart FM, Capital FM and Classic FM&nbsp;&rsaquo;</a></li>
+			<li class="last-item"><a href="http://insights.ubuntu.com/case-study/jt-global-standardises-mission-critical-production-system-on-ubuntu/">JT Global standardises mission-critical production system on Ubuntu&nbsp;&rsaquo;</a></li>
+		</ul>
 	</div><!-- /.five-col -->
 </div><!-- /.row -->
 
 <div class="row row-grey row-release-schedule">
 	<div class="eight-col">
-		<img src="{{ STATIC_URL }}img/business/screenshot-server-release.png" width="596" height="549" alt="" />
-	</div><!-- /.eight-col -->
+		<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: {
+		            580: '-large',
+		            431: '-medium',
+		            305: '-small'
+		        }
+		    });
+		</script>
+		<noscript>
+			<img src="{{ STATIC_URL }}img/graphs/image-release-cycle-large.png" width="580" height="427" alt="Ubuntu Desktop release cycle, 5 year long term support" />
+		</noscript>
+	</div>
 	<div class="four-col last-col">
 		<h2 id="a-release-schedule-you-can-depend-on">A release schedule you can depend on</h2>
-		<h3>Stay up-to-date with free and regular updates and upgrades</h3>
-		<p>The Ubuntu Server release schedule fits in with your business needs. Standard releases every six months help you stay up-to-date with the very latest hardware and software changes. Long-term support (LTS) releases, supported for <strong>five years</strong>, are perfect if you're looking for more stability over a longer period of time.</p>
+		<h3>Stay up-to-date with regular updates and upgrades</h3>
+		<p>Long-term support (LTS) releases of Ubuntu Server are supported by Canonical for five years. Every six months, interim releases bring new features, while hardware enablement updates add support for the latest machines to all supported LTS releases.</p>
 	</div><!-- /.four-col -->
 </div><!-- /.row -->
 
-<div class="row row-support-systems-management">
-	<div class="six-col">
-		<h2 id="smarter-systems-management">Support and systems management</h2>
-		<p>The Ubuntu Advantage service offers efficient system administration with Landscape, fast problem resolution and access to Ubuntu experts as and when you need them.</p>
-		<p><a href="/server/management">Learn more about Ubuntu Advantage &rsaquo;</a></p>
+<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>
+		<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>
 	</div><!-- /.six-col -->
+	<span>
+		<img class="priority-0" src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-landscape.svg" alt="Landscape pictogram" width="200" height="200" />
+	</span>
 </div><!-- /.row -->
 
-<div class="row row-juju-maas equal-height vertical-divider">
+<div class="row row-juju-maas vertical-divider">
 	<div class="six-col box-juju">
-		<h2>Juju &mdash; service orchestration</h2>
-		<p>With over 100 services ready to deploy, Juju enables you to build entire environments in the cloud easily with the Juju Designer GUI. Juju works with  public clouds like Amazon Web Services and HP Cloud,  private  clouds built on OpenStack or raw bare metal via MAAS.</p>
-		<p><a href="/cloud/orchestration/juju">Learn more about Juju &rsaquo;</a></p>
+		<div class="six-col text-center">
+			<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-juju.svg" alt="Juju logo" width="100" height="100" />
+		</div>
+		<div class="six-col">
+			<h2>Juju &mdash; service orchestration</h2>
+			<p>With the option of a command line or browser-based interface, Juju enables you to deploy entire workloads in just a few clicks. It works on public clouds like AWS and HP Cloud, private clouds built on OpenStack and even directly on bare metal, via MAAS.</p>
+			<p><a href="/cloud/orchestration/juju">Learn more about Juju&nbsp;&rsaquo;</a></p>
+		</div>
 	</div><!-- /.six-col -->
 	<div class="six-col box-maas last-col">
+		<div class="six-col text-center">
+			<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-maas.svg" alt="Maas logo" width="100" height="100" />
+		</div>
 		<h2>MAAS &mdash; bare metal provisioning</h2>
-		<p>MAAS is a system that makes it quick and easy to set up the physical hardware base on which to deploy complex services that need to scale up and down dynamically, like Ubuntu&rsquo;s OpenStack cloud infrastructure.</p>
-		<p><a href="/cloud/orchestration/maas">Learn more about MAAS &rsaquo;</a></p>
+		<p>MAAS is a time-saving provisioning system that makes it quick and easy to set up the physical hardware on which to deploy complex services, like Ubuntu&rsquo;s OpenStack cloud infrastructure. Just plug in your servers, connect them to the network and let MAAS do the rest. </p>
+		<p><a href="/cloud/orchestration/maas">Learn more about MAAS&nbsp;&rsaquo;</a></p>
 	</div><!-- /.six-col -->
 </div><!-- .row -->
 
@@ -140,10 +167,10 @@ <h2>MAAS &mdash; bare metal provisioning</h2>
 	<h2 id="deploy-anywhere">Deploys anywhere</h2>
 	<div class="eight-col">
 		<h3>Choose from the most popular public clouds</h3>
-		<p>Want the power of Ubuntu Server in the public cloud? Ubuntu Cloud Guest offers all the goodness of Ubuntu Server, specially tailored for public cloud infrastructures and without any licence restrictions.</p>
-		<p>We provide images for more public cloud providers than anyone else and we make sure they&rsquo;re kept up-to-date. That means you can choose the very best software, hardware and services to meet your needs.</p>
+		<p>Want the power of Ubuntu Server in the public cloud? Ubuntu cloud guest offers all the goodness of Ubuntu Server, specially tailored for public cloud infrastructures and without any licence restrictions.</p>
+		<p>We provide images for more public cloud providers than anyone else, and we make sure they&rsquo;re kept up-to-date. That means you can run the very best software on the best public cloud for your needs.</p>
 		<p>Ubuntu is the most widely used developer platform for open&dash;source cloud building, the reference operating system for OpenStack, and the most popular cloud guest operating system on private and public clouds globally.</p>
-		<p><a href="/cloud/public-cloud/guest">Learn more about Ubuntu Cloud Guest &rsaquo;</a></p>
+		<p><a href="/cloud/public-cloud/guest">Learn more about Ubuntu Cloud&nbsp;&rsaquo;</a></p>
 	</div><!-- /.seven-col -->
 	<div class="four-col last-col">
 		<p>Ubuntu Server is available now for:</p>
@@ -151,7 +178,7 @@ <h3>Choose from the most popular public clouds</h3>
 			<li>Amazon Web Services</li>
 			<li>HP Cloud</li>
 			<li>Internap</li>
-			<li>Microsoft Windows Azure</li>
+			<li>Microsoft Azure</li>
 			<li>Joyent</li>
 		</ul>
 	</div><!-- /.five-col -->
@@ -164,7 +191,7 @@ <h3 id="works-with-your-hardware-and-software">Our big data partners</h3>
 			<div>
 				<ul class="inline-icons text-center">
 					<li><img src="{{ STATIC_URL }}img/third-party-logos/logo-couchbase-100x35.png" width="100" height="35" alt="Couchbase" /></li>
-					<li class="last-item"><img src="{{ STATIC_URL }}vimg/third-party-logos/logo-cloudera-100x35.png" width="100" height="35" alt="Cloudera" /></li>
+					<li class="last-item"><img src="{{ STATIC_URL }}img/third-party-logos/logo-cloudera-100x35.png" width="100" height="35" alt="Cloudera" /></li>
 					<li><img src="{{ STATIC_URL }}img/third-party-logos/logo-10gen-75x35.png" width="75" height="35" alt="10gen" /></li>
 					<li><img src="{{ STATIC_URL }}img/third-party-logos/logo-hortonworks-93x35.png" width="93" height="35" alt="Hortonworks" /></li>
 					<li><img src="{{ STATIC_URL }}img/third-party-logos/logo-lexisnexis-135x35.png" width="135" height="35" alt="LexisNexis" /></li>
@@ -177,8 +204,8 @@ <h3 id="works-with-your-hardware-and-software">Our big data partners</h3>
 	<div class="eight-col last-col">
 		<h2 id="built-for-big-data">Built for big data and cloud</h2>
 		<h3>Speed and simplicity, on bare metal or in the cloud</h3>
-		<p>With its new rapid deployment tools, Ubuntu significantly speeds up the installation of server instances on bare metal. And our service orchestration tool, Juju, makes deploying big data services surprisingly simple &mdash; on bare metal or in the cloud. That's why vendors like 10gen, Cloudera, Couchbase, DataStax, Hortonworks, LexisNexis and Map-R partner with us.</p>
-		<p><a href="/cloud">Learn more about Ubuntu Cloud &rsaquo;</a></p>
+		<p>With its new rapid deployment tools, Ubuntu significantly speeds up the installation of server instances on bare metal. And our service orchestration tool, Juju, makes deploying big data services surprisingly simple &mdash; on bare metal or in the cloud. That&rsquo;s why vendors like 10gen, Cloudera, Couchbase, DataStax, Hortonworks, LexisNexis and Map-R partner with us.</p>
+		<p><a href="/cloud">Learn more about Ubuntu Cloud&nbsp;&rsaquo;</a></p>
 	</div><!-- /.six-col -->
 </div><!-- /.row -->
 
@@ -187,7 +214,7 @@ <h3>Speed and simplicity, on bare metal or in the cloud</h3>
 		<h2 id="the-fast-track-to-virtualisation">The fast track to virtualisation</h2>
 		<p>Ready to boost efficiencies and reduce costs? Virtualise your servers with Ubuntu Server and KVM. When you use a secure, lean version of Ubuntu as a guest operating system for your application, you can create virtual machine images in minutes. KVM, Xen, VMware and LXC are all supported.</p>
 	</div><!-- /.six-col -->
-	<span><img src="{{ STATIC_URL }}img/pictograms/pictogram-start-153.png" width="153" height="153" alt="" /></span>
+	<span><img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-startfirst-darkaubergine.svg" width="153" height="153" alt="" /></span>
 </div><!-- /.row -->
 {% include "shared/_enterprise_blog.html" %}
 {% include "shared/_community.html" %}
diff --git a/templates/server/management.html b/templates/server/management.html
old mode 100644
new mode 100755
index afbfe4ddaf8..f58ee6d4841
--- a/templates/server/management.html
+++ b/templates/server/management.html
@@ -10,11 +10,12 @@
 {% block content %}
 <div class="row row-hero">
 	<h1>Server 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><!-- /.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 text-center">
+			<img src="{{ STATIC_URL }}img/server/management/image-server-management.svg" alt="" />
+		</div>
 		<div class="twelve-col">
 			<div class="six-col no-margin-bottom">
 				<p>Ubuntu Advantage is the commercial support package from Canonical, offering efficient systems administration software, fast problem resolution and access to experts when you need them.</p>
@@ -22,7 +23,7 @@ <h1>Server management</h1>
 			<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 &rsaquo;</a></p>
+			<p><a href="/management">Find out more about Landscape&nbsp;&rsaquo;</a></p>
 		</div><!-- /.twelve-col -->
 </div><!-- /.row -->
 
@@ -68,9 +69,9 @@ <h3>Advanced</h3>
 		<tr>
 			<th scope="row" rowspan="2">Landscape systems management</th>
 			<th scope="row">Landscape Hosted</th>
-			<td><img src="/static/u/img/patterns/purpletick.gif" alt="Yes"></td>
-			<td><img src="/static/u/img/patterns/purpletick.gif" alt="Yes"></td>
-			<td><img src="/static/u/img/patterns/purpletick.gif" alt="Yes"></td>
+			<td><img src="{{ STATIC_URL }}img/patterns/tick-midaubergine.svg" alt="Yes"></td>
+			<td><img src="{{ STATIC_URL }}img/patterns/tick-midaubergine.svg" alt="Yes"></td>
+			<td><img src="{{ STATIC_URL }}img/patterns/tick-midaubergine.svg" alt="Yes"></td>
 		</tr>
 		<tr>
 			<th scope="row">Landscape Dedicated Server</th>
@@ -83,42 +84,42 @@ <h3>Advanced</h3>
 		<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/u/img/patterns/purpletick.gif" alt="Yes"></td>
-			<td><img src="/static/u/img/patterns/purpletick.gif" alt="Yes"></td>
-			<td><img src="/static/u/img/patterns/purpletick.gif" alt="Yes"></td>
+			<td><img src="{{ STATIC_URL }}img/patterns/tick-midaubergine.svg" alt="Yes"></td>
+			<td><img src="{{ STATIC_URL }}img/patterns/tick-midaubergine.svg" alt="Yes"></td>
+			<td><img src="{{ STATIC_URL }}img/patterns/tick-midaubergine.svg" 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/u/img/patterns/purpletick.gif" alt="Yes"></td>
-			<td><img src="/static/u/img/patterns/purpletick.gif" alt="Yes"></td>
-			<td><img src="/static/u/img/patterns/purpletick.gif" alt="Yes"></td>
+			<td><img src="{{ STATIC_URL }}img/patterns/tick-midaubergine.svg" alt="Yes"></td>
+			<td><img src="{{ STATIC_URL }}img/patterns/tick-midaubergine.svg" alt="Yes"></td>
+			<td><img src="{{ STATIC_URL }}img/patterns/tick-midaubergine.svg" alt="Yes"></td>
 		</tr>
 		<tr>
 			<th scope="row">Basic installation and applications</th>
-			<td><img src="/static/u/img/patterns/purpletick.gif" alt="Yes"></td>
-			<td><img src="/static/u/img/patterns/purpletick.gif" alt="Yes"></td>
-			<td><img src="/static/u/img/patterns/purpletick.gif" alt="Yes"></td>
+			<td><img src="{{ STATIC_URL }}img/patterns/tick-midaubergine.svg" alt="Yes"></td>
+			<td><img src="{{ STATIC_URL }}img/patterns/tick-midaubergine.svg" alt="Yes"></td>
+			<td><img src="{{ STATIC_URL }}img/patterns/tick-midaubergine.svg" alt="Yes"></td>
 		</tr>
 		<tr>
 			<th scope="row">Windows integration</th>
 			<td> </td>
-			<td><img src="/static/u/img/patterns/purpletick.gif" alt="Yes"></td>
-			<td><img src="/static/u/img/patterns/purpletick.gif" alt="Yes"></td>
+			<td><img src="{{ STATIC_URL }}img/patterns/tick-midaubergine.svg" alt="Yes"></td>
+			<td><img src="{{ STATIC_URL }}img/patterns/tick-midaubergine.svg" alt="Yes"></td>
 		</tr>
 		<tr>
 			<th scope="row">Virtualisation</th>
 			<td> </td>
-			<td><img src="/static/u/img/patterns/purpletick.gif" alt="Yes"></td>
-			<td><img src="/static/u/img/patterns/purpletick.gif" alt="Yes"></td>
+			<td><img src="{{ STATIC_URL }}img/patterns/tick-midaubergine.svg" alt="Yes"></td>
+			<td><img src="{{ STATIC_URL }}img/patterns/tick-midaubergine.svg" alt="Yes"></td>
 		</tr>
 		<tr>
 			<th scope="row">Clustering and high availability failover</th>
 			<td> </td>
 			<td> </td>
-			<td><img src="/static/u/img/patterns/purpletick.gif" alt="Yes"></td>
+			<td><img src="{{ STATIC_URL }}img/patterns/tick-midaubergine.svg" alt="Yes"></td>
 		</tr>
 	</tbody>
 	<tbody>
diff --git a/templates/server/shared/_contextual_footer.html b/templates/server/shared/_contextual_footer.html
old mode 100644
new mode 100755
index ab232cc08ab..585a4c67d5a
--- a/templates/server/shared/_contextual_footer.html
+++ b/templates/server/shared/_contextual_footer.html
@@ -1,14 +1,14 @@
-	<div class="feature-two three-col{% if level_2 == 'contact-us' %} six-col{% endif %}">
+	<div class="feature-two four-col{% if level_2 == 'contact-us' %} six-col{% endif %}">
 		<h3>Download</h3>
 		<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>
 		<p><a href="/download/server" class="link-cta-ubuntu">Download now</a></p>
 	</div>
-	{% if level_2 != 'contact-us' %}<div class="feature-three three-col">
+	{% if level_2 != 'contact-us' %}<div class="feature-three four-col">
 		<h3>Ubuntu for business</h3>
-		<p>Contact us about <br />Ubuntu {% if level_2 == 'management' %}Advantage{% else %}Server{% endif %}.</p>
-		<p><a class="link-cta-ubuntu" href="/server/contact-us">Get in touch</a></p>
+		<p>Contact us about Ubuntu {% if level_2 == 'management' %}Advantage{% else %}Server{% endif %}.</p>
+		<p><a href="/server/contact-us">Get in touch&nbsp;&rsaquo;</a></p>
 	</div>{% endif %}
-	<div class="feature-four three-col last-col">
+	<div class="feature-four four-col last-col">
 		<h3>Further reading</h3>
 		<ul class="no-bullets smaller">
 			<li><a href="https://help.ubuntu.com/">Ubuntu Server guide&nbsp;&rsaquo;</a></li>
diff --git a/templates/server/thank-you.html b/templates/server/thank-you.html
old mode 100644
new mode 100755
index c5054c6179c..82fae67f0c6
--- a/templates/server/thank-you.html
+++ b/templates/server/thank-you.html
@@ -7,14 +7,6 @@
 {% endblock second_level_nav_items %}
 
 {% block content %}
-<div class="row row-image-centered row-hero no-border">
-	<div class="seven-col">
-		<h1>Thank you</h1>
-		<h2>We&rsquo;re really excited about your interest in Ubuntu Server.</h2>
-	    <p>A member of our Server team will contact you shortly.</p>
-    </div>
-    <span>
-   		<img src="{{ STATIC_URL }}img/devices/pictogram-smile-purple.png" width="164" height="162" alt="Smile pictogram" />
-    </span>
-</div><!-- /.row -->
+{% 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/_backed_by_canonical.html b/templates/shared/_backed_by_canonical.html
deleted file mode 100644
index f9d4264cbb9..00000000000
--- a/templates/shared/_backed_by_canonical.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<div class="row row-grey">
-	<h1>Backed by Canonical</h1>
-	<div class="twelve-col append-four intro clearfix">
-		<h2>We help you take Ubuntu to market</h2>
-		<p>Canonical is the company that makes Ubuntu, together with a cast of thousands. We have teams in London, Boston, Montreal, Taipei and Shanghai to help you bring Ubuntu devices to market.</p>
-		<p>Contact us on one of the links below:</p>
-		<ul class="inline">
-			<li><a href="/tablet/contact-us" class="link-cta-ubuntu">Ubuntu on tablets</a></li>
-			<li><a href="/phone/contact-us" class="link-cta-ubuntu">Ubuntu for phones</a></li>
-			<li><a href="/phone/ubuntu-for-android/contact-us" class="link-cta-ubuntu">Ubuntu for Android</a></li>
-		</ul>
-	</div><!-- / .intro -->
-</div><!-- /.box -->
-
-<div class="row no-margin">
-	<h2>Focused on industry needs</h2>
-	<div class="seven-col">
-		<p>Everyday we work with OEMs, ODMs and mobile network operators, delivering the software, content and community to match their industrial design, manufacture and distribution. We also work with content providers to bring their shows to our audience.</p>
-		<p>Whatever the project, we can help you launch products without the cost and complexity of operating system development, software engineering or global content distribution agreements.</p>
-	</div><!-- /.box -->
-	<div class="four-col prepend-one last-col">
-		<p class="pull-quote no-indent">Help you launch products without the cost and complexity</p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row no-margin">
-	<h2>Ubuntu is everywhere</h2>  
-	<div class="seven-col">
-		<p>Ubuntu&rsquo;s distinctive family of interfaces provide a great touch experience on the phone and the tablet, a great lean-back experience on the TV and, of course, a great desktop experience on the PC. Thanks to Canonical&rsquo;s hardware enablement partnerships, Ubuntu is now pre-installed on laptops and desktops from the world&rsquo;s top brands in all major global markets &ndash; in fact, our OEM partners predict that 10% of the world&rsquo;s new branded PCs will ship with Ubuntu in 2014.</p>
-		<p>If you have your own UI, then you can build your own devices using the industry-standard Ubuntu Core, without the Ubuntu UI, and enjoy the most popular Linux toolchain, core system libraries, security updates and huge selection of packages at a very low cost per device. Whatever the architecture, Ubuntu is the fastest route to market.</p>
-	</div>
-	<div class="four-col prepend-one last-col">
-		<p class="pull-quote no-indent">Ubuntu is now pre-installed on laptops and desktops from the world&rsquo;s top brands</p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row no-margin">
-	<h2>Experts in Linux on ARM</h2>
-	<div class="seven-col append-5">
-		<p>We have been engaged by ARM and their SoC partners since 2008 to enable Ubuntu for the ARM architecture. Today we are a world leader in the supply of software for low-energy ARM devices from handhelds to supercomputers. No other enterprise Linux matches our presence on the ARM platform. </p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row no-margin">
-	<h2>Years of hardware experience</h2>
-	<div class="seven-col">
-		<p>Canonical has a large and experienced OEM engagement team that has worked successfully with hardware makers like Dell, HP, and Lenovo for many years. We can provide a complete, end-to-end device delivery solution on Intel, AMD or ARM silicon, helping our partners identify market opportunities, deliver on time and ensure a stunning experience on every device.</p>
-	</div>	
-</div><!-- / .row -->
-
-<div class="row no-margin">
-	<h2>Custom engineering</h2>
-	<div class="seven-col">
-		<p>Engagements cover component and system enablement, certification, and platform customisation. Canonical coordinates with component manufacturers to develop, integrate or update drivers, integrate third-party commercial software and customise Ubuntu to meet customer-specific needs.</p>
-		<p>Canonical engineering capacity is distributed globally for device-oriented engagements, and can be led from the US, Europe or Asia, with local teams accountable for customer needs.</p>
-	</div>	
-	<div class="four-col prepend-one last-col">
-		<p class="pull-quote no-indent">Canonical engineering capacity is distributed globally</p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row">
-	<h2>Upgrades and maintenance</h2>
-	<div class="seven-col">
-		<p>Modern connected device strategies emphasise the ability to update and upgrade software in-place, often automatically. This enables a long-term relationship between the hardware vendor and their customers, with ever-increasing value propositions for customers who want the latest experiences and services on existing hardware.</p>
-		<p>The ability to update your devices is central to your security and long-term competitiveness. Canonical takes care of all security and critical bug fixes to the base platform offering and provides the infrastructure to support your update management strategy. Ubuntu has a world-class track record maintaining a secure and stable operating system in the PC sector, and we bring this expertise to customers&rsquo; products.</p>
-	</div>
-	<div class="four-col prepend-one last-col">
-		<p class="pull-quote no-indent">The ability to update your devices is central to your security and long-term competitiveness</p>
-	</div>
-</div><!-- / .row -->
-
-<div class="row no-margin">
-	<div class="four-col">
-	<h2>Nine years and 19 releases &ndash; and all<br /> on time</h2>
-		<p>Since its launch in 2004, Ubuntu has kept to a strict six-month release cycle. Every fourth release benefits from long-term support (<abbr title="long-term support">LTS</abbr>) with five years&rsquo; worth of hardware, security and maintenance updates, giving business users confidence to commit to Ubuntu at scale.</p>
-	</div>
-	<div class="six-col last-col">
-		<img src="{{ STATIC_URL }}img/business/screenshot-server-release.png" width="596" height="549" alt="Ubuntu Desktop release cycle, 5 year long term support" />
-	</div>
-</div><!-- / .row -->
-
-<div class="row">
-	<div class="seven-col">
-		<h2>Third-party license fees</h2>
-		<p>Canonical has agreements in place with third parties and industry organisations to include codecs for common media formats. In addition, we manage access fees for services that provide channel listings or additional information on the content being viewed. Commercial engagements around Ubuntu devices with Canonical cover these fees and related items, such as subscriptions, royalty collection fees and regulatory broadcast fees.</p>
-	</div><!-- /.seven-col -->
-</div><!-- / .row -->
-	
-<div class="row no-margin no-border">	
-	<h2>Helping you manage change</h2>
-	<div class="seven-col">
-		<p>Today&rsquo;s consumer devices need to be maintained, updated and upgraded throughout their lifetime. Canonical provides a complete infrastructure solution to help you add value to your devices in-market, including OS updates, app updates and Ubuntu One cloud services.</p>
-		<p>As your peripheral ecosystem grows, we work with the manufacturers to ensure that their drivers are incorporated into the Ubuntu platform &ndash; and delivered without any adverse effect on user experience.</p>
-	</div><!-- /.box -->
-	<div class="four-col prepend-one last-col">
-		<p class="pull-quote no-indent">A complete infrastructure solution</p>
-	</div>
-</div><!-- / .row -->
\ No newline at end of file
diff --git a/templates/shared/_community.html b/templates/shared/_community.html
old mode 100644
new mode 100755
index 892f43c8bef..dd825caade0
--- a/templates/shared/_community.html
+++ b/templates/shared/_community.html
@@ -1,5 +1,4 @@
 <div class="row row-community row-image-centered{% if level_1 == 'desktop' and not level_2 %} no-border{% endif %}">
-	<span><img src="{{ STATIC_URL }}img/pictograms/pictogram-community-136.png" alt="" /></span>
 
 	<div class="nine-col">
 {% if level_1 == 'desktop' and not level_2 %}
@@ -10,18 +9,19 @@ <h2 id="a-thriving-community">A thriving community</h2>
 		</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>
+			<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 &rsaquo;</a></p>
-{% endif %}		
-	</div><!-- /.nine-col -->
+		<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/shared/_edge_promo.html b/templates/shared/_edge_promo.html
old mode 100644
new mode 100755
diff --git a/templates/shared/_enterprise_blog.html b/templates/shared/_enterprise_blog.html
old mode 100644
new mode 100755
index d054407eb00..505080699dc
--- a/templates/shared/_enterprise_blog.html
+++ b/templates/shared/_enterprise_blog.html
@@ -1,46 +1,42 @@
 {% block head_extra %}
-<script src="http://www.google.com/jsapi"></script>
+<script src="https://www.google.com/jsapi"></script>
 <script>google.load("feeds", "1")</script>
 {% endblock %}
 	<div id="insights-feed"></div>
 	<script>
        var feedcontainer=document.getElementById("insights-feed")
-			 var feedurl="http://insights.ubuntu.com/products-and-services/{{ level_1 }}/feed/"
-
-        // or if we wanted, for instance all the 'desktop' specific 'case studies', do this http://insights.ubuntu.com/topics/resources/case-studies/?products-and-services=desktop&feed=rss2
-        var feedlimit=4
-        var rssoutput="<div class='row row-grey'><h2 class='twelve-col'>Further reading from the Ubuntu Insights blog</h2><ul class='no-bullets vertical-divider'>"
-        function rssfeedsetup(){
-            var feedpointer=new google.feeds.Feed(feedurl) //Google Feed API method
+       var feedurl=document.location.protocol+"//insights.ubuntu.com/topic/{{ level_1 }}/feed/"       
+       var feedlimit=4
+       var rssoutput="<div class='row row-grey'><h2 class='twelve-col'>Further reading from Ubuntu Insights</h2><ul class='no-bullets vertical-divider med-six-col'>"
+       function rssfeedsetup(){
+       		var feedpointer=new google.feeds.Feed(feedurl) //Google Feed API method
             feedpointer.setNumEntries(feedlimit) //Google Feed API method
-            feedpointer.load(displayfeed) //Google Feed API method
+            feedpointer.load(displayfeed) //Google Feed  API method
         }
 
         function displayfeed(result){
             if (!result.error){
                 var thefeeds=result.feed.entries
                 for (var i=0; i<thefeeds.length; i++){
-                var pubDate = thefeeds[i].publishedDate
-                var date = new Date(pubDate);
-                var months = Array("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec");
-                var thedate = date.getDate() + " " + months[date.getMonth()] + " " + date.getFullYear()
-                
-                rssoutput+="<li class='three-col'><span class='note clearfix'>{{ level_1 }}</span><a href='" + thefeeds[i].link + "'>" + thefeeds[i].title + "&nbsp;&rsaquo;</a><span class='date note clearfix'>" + thedate + "</span></li>"}
-                rssoutput+="</ul></div>"
-                feedcontainer.innerHTML=rssoutput
+              	  var pubDate = thefeeds[i].publishedDate
+              	  var date = new Date(pubDate);
+              	  var months = Array("January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December");
+              	  var thedate = date.getDate() + " " + months[date.getMonth()] + " " + date.getFullYear()
+                	rssoutput+="<li class='three-col'><span class='note clearfix'>" + thefeeds[i].categories[0] + "</span><a href='" + thefeeds[i].link + "'>" + thefeeds[i].title + "&nbsp;&rsaquo;</a><span class='date note clearfix'>" + thedate + "</span></li>"}
+                	rssoutput+='</ul><p><a href="http://insights.ubuntu.com">Read more on Ubuntu Insights&nbsp;&rsaquo;</a></p></div>'
+             	   feedcontainer.innerHTML=rssoutput
 				}
-            else
-            	alert("")
-            }
-				
-				window.onload=function(){
+        	}
+			window.onload=function(){
 				rssfeedsetup()
-				}
+			}
 	</script>
-<div class="row row-enterprise-blog row-image-centered">
-	<span><img src="{{ STATIC_URL }}img/pictograms/pictogram-enterprise-blog-134x94.png" alt="" width="139" height="94" /></span>
-	<div class="nine-col">
-		<h2><a href="http://insights.ubuntu.com">Read the Ubuntu Insights blog &rsaquo;</a></h2>
-		<p>The decision-maker&rsquo;s guide to the cloud and open source enterprise computing.</p>
-	</div>
-</div>
\ No newline at end of file
+	<noscript>
+		<div class="row row-enterprise-blog row-image-centered">
+			<span><img src="{{ STATIC_URL }}img/pictograms/image-enterpriseblog.svg" alt="" width="139" height="94" /></span>
+			<div class="nine-col">
+				<h2><a href="http://insights.ubuntu.com">Read the Ubuntu Insights blog&nbsp;&rsaquo;</a></h2>
+				<p>The decision-maker&rsquo;s guide to the {{ level_1 }} and open source enterprise computing.</p>
+			</div>
+		</div>
+	</noscript>
\ No newline at end of file
diff --git a/templates/shared/_explore_features.html b/templates/shared/_explore_features.html
old mode 100644
new mode 100755
diff --git a/templates/shared/_further_reading.html b/templates/shared/_further_reading.html
old mode 100644
new mode 100755
diff --git a/templates/shared/_live_chat.html b/templates/shared/_live_chat.html
old mode 100644
new mode 100755
diff --git a/templates/shared/_moonshot_promo.html b/templates/shared/_moonshot_promo.html
new file mode 100755
index 00000000000..a5d3c0cd409
--- /dev/null
+++ b/templates/shared/_moonshot_promo.html
@@ -0,0 +1,8 @@
+<div class="row row-grey row-image-centered">
+	<span><img src="{{ STATIC_URL }}img/partners/arm/image-hpmoonshot.svg" width="256" height="240" /></span>
+	<div class="six-col">
+		<h2>Scale-out at speed with Ubuntu on HP Moonshot</h2>
+		<p>As the leading OS for ARM-based hyperscale computing, we’re partnering with HP to disrupt the server marketplace.</p>
+		<p><a href="/partners/hp/moonshot">Find out more&nbsp;&rsaquo;</a></p>
+	</div><!-- /.six-col -->
+</div><!-- /.row -->
\ No newline at end of file
diff --git a/templates/shared/_more_features.html b/templates/shared/_more_features.html
old mode 100644
new mode 100755
index 99c9acc7585..5607ad8d76e
--- a/templates/shared/_more_features.html
+++ b/templates/shared/_more_features.html
@@ -6,7 +6,6 @@ <h3>Get Ubuntu</h3>
 				<ul class="inline smaller">
 					<li class="try"><a href="/tour/en">Try it online</a></li>
 					<li class="cd"><a href="/download/desktop/try-ubuntu-before-you-install">Try it on a DVD <br/>or USB stick</a></li>
-					<li class="windows"><a href="/download/desktop/windows-installer">Run it alongside Windows</a></li>
 					<li class="last-col download"><a href="/download/desktop">Download and install</a></li>
 				</ul>
 			</div>
diff --git a/templates/shared/_newsletter_signup.html b/templates/shared/_newsletter_signup.html
old mode 100644
new mode 100755
diff --git a/templates/shared/_next_steps.html b/templates/shared/_next_steps.html
old mode 100644
new mode 100755
diff --git a/templates/shared/_ready_to_talk.html b/templates/shared/_ready_to_talk.html
old mode 100644
new mode 100755
diff --git a/templates/shared/_share_this.html b/templates/shared/_share_this.html
old mode 100644
new mode 100755
diff --git a/templates/shared/_thank_you.html b/templates/shared/_thank_you.html
new file mode 100644
index 00000000000..f6d8d4e9710
--- /dev/null
+++ b/templates/shared/_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 {{ thanks_context }}</h1>
+		<p class="intro">A member of our team will be in touch {{ details }}within <strong>one working day</strong></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/shared/_thank_you_footer.html b/templates/shared/_thank_you_footer.html
new file mode 100644
index 00000000000..d0f55d3f375
--- /dev/null
+++ b/templates/shared/_thank_you_footer.html
@@ -0,0 +1,20 @@
+<div class="row equal-height no-border">
+	<h2 class="twelve-col">More about our enterprise services</h2>
+	<ul id="thank-you-extra" class="no-bullets">
+		<li class="advantage four-col first">
+			<h4>Ubuntu Advantage</h4>
+			<p>Purchase our desktop support and access Ubuntu experts whenever you need.</p>
+			<p><a href="/cloud/management">Learn about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
+		</li>
+		<li class="cloud four-col">
+			<h4>Ubuntu OpenStack</h4>
+			<p>Our private cloud infrastructure platform based on Openstack.</p>
+			<p><a href="/cloud">Learn about Ubuntu OpenStack&nbsp;&rsaquo;</a></p>
+		</li>
+		<li class="jumpstart four-col last-col">
+			<h4>Landscape</h4>
+			<p>Manage Ubuntu in the enterprise with our private cloud infrastructure platform based on OpenStack.</p>
+			<p><a href="/business/landscape">Learn about Landscape&nbsp;&rsaquo;</a></p>
+		</li>
+	</ul>
+</div><!-- end row-->
\ No newline at end of file
diff --git a/templates/shared/_ubuntu_advantage_community.html b/templates/shared/_ubuntu_advantage_community.html
old mode 100644
new mode 100755
index ed3db97e52d..3fe200fa690
--- a/templates/shared/_ubuntu_advantage_community.html
+++ b/templates/shared/_ubuntu_advantage_community.html
@@ -1,7 +1,7 @@
-		<span><img src="{{ STATIC_URL }}img/pictograms/pictogram-help-135.png" alt="" /></span>
+		<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>Got a question?</h2>
 			<p>Exchange expertise and ideas with thousands of other IT professionals.</p>
 			<p>Want to talk to other Ubuntu users today? Share ideas and get advice from our active community of IT professionals. As a community we set high standards for friendliness and tolerance, and we welcome your questions and contributions!</p>
-			<p><a href="/support/community">Community support &rsaquo;</a></p>
+			<p><a href="http://community.ubuntu.com/help-information/" class="external">Community&nbsp;support</a></p>
 		</div>
\ No newline at end of file
diff --git a/templates/shared/_ubuntu_advantage_whats_inlcuded.html b/templates/shared/_ubuntu_advantage_whats_inlcuded.html
old mode 100644
new mode 100755
index bae403e705a..05e9744a69e
--- a/templates/shared/_ubuntu_advantage_whats_inlcuded.html
+++ b/templates/shared/_ubuntu_advantage_whats_inlcuded.html
@@ -1,24 +1,29 @@
-<div class="row row-grey uawi">
+<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>
-			<ul class="three-col list-canonical smaller">
-				<li class="three-col">Management at scale</li>
-				<li class="three-col">Role-based access</li>
-				<li class="three-col">Compliance reports</li>
+	<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 smaller">
-				<li class="three-col">Deploy or rollback security updates</li>
-				<li class="three-col last-item">Informative monitoring</li>
+			<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>
-		<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 &rsaquo;</a></p>{% endif %}
-		</div><!-- /.six-col -->
+		</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">
+	<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>
@@ -27,10 +32,10 @@ <h3>24/7 support</h3>
 			<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">
+		<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</a></p>
+	<p><a href="/management/ubuntu-advantage">Learn more about Ubuntu Advantage&nbsp;&rsaquo;</a></p>
 </div><!-- /.row -->
diff --git a/templates/shared/_webinar_promo.html b/templates/shared/_webinar_promo.html
old mode 100644
new mode 100755
index a3cb4fc60f7..9684e7a2a3d
--- a/templates/shared/_webinar_promo.html
+++ b/templates/shared/_webinar_promo.html
@@ -2,7 +2,7 @@
 		<div class="seven-col">
 			<h2>Dive deeper with our <br />webinar videos</h2>
 			<p>We understand how busy you are. <br />That's why we record our live webinars so you can always stay up-to-date.</p>
-			<p><a class="link-arrow" href="https://www.brighttalk.com/channel/6793">See all the webinars here</a></p>
+			<p><a href="https://www.brighttalk.com/channel/6793">See all the webinars here&nbsp;&rsaquo;</a></p>
 		</div>
 		<span><img src="{{ STATIC_URL }}img/business/business-promo-webinar.png" alt="" height="210" width="335" /></span>
 </div>
\ No newline at end of file
diff --git a/templates/static/css/core-constants.scss b/templates/static/css/core-constants.scss
deleted file mode 100644
index 60d09641ef8..00000000000
--- a/templates/static/css/core-constants.scss
+++ /dev/null
@@ -1,63 +0,0 @@
-@charset "UTF-8";
-/**
- * Ubuntu Patterns Stylesheet
- *
- * The CSS file required by Ubuntu patterns page
- * 
- * @project		Ubuntu Patterns
- * @author		Web Team at Canonical Ltd
- * @copyright	2012 Canonical Ltd
- *
- * @see 		http://design.ubuntu.com
- */
- 
-/**
- * standard colors
- *
- * @colordef standard colors
- */
-
-$ubuntu_orange:			  #dd4814; /* ubuntu orange (used for text links also on any site except canonical) */
-$light_orange:        #fdf6f2; /* used as background on pre text */
-$canonical_aubergine:	#772953; /* canonical aubergine */
-$light_aubergine:		  #77216f; /* light aubergine (consumer) */
-$mid_aubergine:			  #5e2750; /* mid aubergine (both) */
-$dark_aubergine:		  #2c001e; /* dark aubergine (enterprise) */
-$warm_grey:				    #aea79f; /* warm grey */
-$cool_grey:				    #333333; /* cool grey */
-$light_grey:			    #f7f7f7; /* light grey */
-
-/* notifications */
-$error:					      #df382c; /* red */
-$warning:				      #eca918; /* yellow */
-$success:				      #38b44a; /* green */
-$information:			    #19b6ee; /* cyan */
-
-/* colour coded status - from negative to positive (Icon: canonical circle) */
-$status_red:			    #df382c; /* red, for status that require immediate attention */
-$status_grey:			    #aea79f; /* grey, for disabled status or ones that don’t require attention */
-$status_yellow:			  #efb73e; /* yellow, for status that require attention */
-$status_blue:			    #19b6ee; /* blue, for status that don’t require action */
-$status_green:			  #38b44a; /* green, for positive status */
-
-/* misc colours */
-$box_solid_grey:		  #efefef;
-$link_color:			    $ubuntu_orange; /* This is the global link color, mainly used for links in content */
-
-/* grid variables */
-$base:                16;
-$gutter_width:        20px;
-$grid_gutter:         20px;
-$gutter:              2.12766%;
-
-$one_col:       6.38297%;
-$two_col:       14.89361%;
-$three_col:     23.40425%;
-$four_col:      31.91489%;
-$five_col:      40.42553%;
-$six_col:       48.93617%;
-$seven_col:     57.4468%;
-$eight_col:     65.95744%;
-$nine_col:      74.46808%;
-$ten_col:       82.97872%;
-$eleven-col:    91.48936%;
\ No newline at end of file
diff --git a/templates/static/css/core-grid.scss b/templates/static/css/core-grid.scss
deleted file mode 100644
index 6b51191ce7e..00000000000
--- a/templates/static/css/core-grid.scss
+++ /dev/null
@@ -1,640 +0,0 @@
-@charset "UTF-8";
-/**
- * Ubuntu Core Front-End Framework
- *
- * Grid file part of the Ubuntu Core Front-End Framework
- * 
- * This grid is composed by 14 columns (units) separated by 13 gutters (1/3 unit).
- * The first and last column are for padding purposes only.
- * The content fits in the middle 12 columns.
- * Possible divisions: 1 (12 units + 11 gutters), 2 (6 units + 5 gutters), 
- * 3 ( 4 units + 3 gutters) and 4 (3 units + 2 gutters).
- *
- * When 1 unit = 60px, 1 gutter = 20px
- * 
- * @project		Ubuntu Core Front-End Framework
- * @author		Web Team at Canonical Ltd
- * @copyright	2012 Canonical Ltd
- *
- * @see			http://gridinator.com/
- */
-/**
- * Table of contents
- *
- * Main containers
- * Columns
- * Empty columns
- * Borders
- * Push and pull
- * Verticla gutter
- * Last
- * Clearing
- 
-	one-col			60
-	two-col			140
-	three-col		220
-	four-col		300
-	five-col		380
-	six-col			460
-	seven-col		540
-	eight-col		630
-	nine-col		700
-	ten-col			780
-	eleven-col	860
-	twelve-col	940
-	
-*/
-
-.one-col, .two-col, .three-col, .four-col, .five-col, .six-col, .seven-col, .eight-col, .nine-col, .ten-col, .eleven-col, .twelve-col, .col {
-	@include box_sizing;
-	clear: none;
-	display: inline-block;
-	float: left;
-	margin-right: $gutter;
-	margin-bottom: 20px;
-	padding: 0;
-	position: relative;
-}
-
-
-.one-col 		{ width: 6.38297%; 	}
-.two-col 		{ width: 14.89361%; }
-.three-col 	{ width: 23.40425%; }
-.four-col 	{ width: 31.91489%; }
-.five-col 	{ width: 40.42553%; }
-.six-col 		{ width: 48.93617%; }
-.seven-col 	{ width: 57.4468%; 	}
-.eight-col 	{ width: 65.95744%; }
-.nine-col 	{ width: 74.46808%; }
-.ten-col 		{ width: 82.97872%; }
-.eleven-col { width: 91.48936%; }
-
-.twelve-col {
-	width: 100%;
-	margin-right: 0;
-}
-
- .twelve-col .one-col {
-	width: 6.3053%;
-	margin-right: 2.21238%;
-}
-.twelve-col .two-col {
-	width: 14.823%;
-	margin-right: 2.21238%;
-}
-.twelve-col .three-col {
-	width: 23.3407%;
-	margin-right: 2.21238%;
-}
-.twelve-col .four-col {
-	width: 31.8584%;
-	margin-right: 2.21238%;
-}
-.twelve-col .five-col {
-	width: 40.3761%;
-	margin-right: 2.21238%;
-}
-.twelve-col .six-col {
-	width: 48.8938%;
-	margin-right: 2.21238%;
-}
-.twelve-col .seven-col {
-	width: 57.4115%;
-	margin-right: 2.21238%;
-}
-.twelve-col .eight-col {
-	width: 65.9292%;
-	margin-right: 2.21238%;
-}
-.twelve-col .nine-col {
-	width: 74.4469%;
-	margin-right: 2.21238%;
-}
-.twelve-col .ten-col {
-	width: 82.9646%;
-	margin-right: 2.21238%;
-}
-.twelve-col .eleven-col {
-	width: 91.4823%;
-	margin-right: 2.21238%;
-}
-.twelve-col .twelve-col {
-	width: 100%;
-	margin-right: 0;
-}
-.eleven-col .one-col {
-	width: 6.89238%;
-	margin-right: 2.41837%;
-}
-.eleven-col .two-col {
-	width: 16.20314%;
-	margin-right: 2.41837%;
-}
-.eleven-col .three-col {
-	width: 25.5139%;
-	margin-right: 2.41837%;
-}
-.eleven-col .four-col {
-	width: 34.82466%;
-	margin-right: 2.41837%;
-}
-.eleven-col .five-col {
-	width: 44.13542%;
-	margin-right: 2.41837%;
-}
-.eleven-col .six-col {
-	width: 53.44619%;
-	margin-right: 2.41837%;
-}
-.eleven-col .seven-col {
-	width: 62.75695%;
-	margin-right: 2.41837%;
-}
-.eleven-col .eight-col {
-	width: 72.06771%;
-	margin-right: 2.41837%;
-}
-.eleven-col .nine-col {
-	width: 81.37847%;
-	margin-right: 2.41837%;
-}
-.eleven-col .ten-col {
-	width: 90.68923%;
-	margin-right: 2.41837%;
-}
-.eleven-col .eleven-col {
-	width: 100%;
-	margin-right: 0;
-}
-.ten-col .one-col {
-	width: 7.6%;
-	margin-right: 2.66666%;
-}
-.ten-col .two-col {
-	width: 17.86666%;
-	margin-right: 2.66666%;
-}
-.ten-col .three-col {
-	width: 28.13333%;
-	margin-right: 2.66666%;
-}
-.ten-col .four-col {
-	width: 38.4%;
-	margin-right: 2.66666%;
-}
-.ten-col .five-col {
-	width: 48.66666%;
-	margin-right: 2.66666%;
-}
-.ten-col .six-col {
-	width: 58.93333%;
-	margin-right: 2.66666%;
-}
-.ten-col .seven-col {
-	width: 69.19999%;
-	margin-right: 2.66666%;
-}
-.ten-col .eight-col {
-	width: 79.46666%;
-	margin-right: 2.66666%;
-}
-.ten-col .nine-col {
-	width: 89.73333%;
-	margin-right: 2.66666%;
-}
-.ten-col .ten-col {
-	width: 100%;
-	margin-right: 0;
-}
-.nine-col .one-col {
-	width: 8.46953%;
-	margin-right: 2.97176%;
-}
-.nine-col .two-col {
-	width: 19.91084%;
-	margin-right: 2.97176%;
-}
-.nine-col .three-col {
-	width: 31.35215%;
-	margin-right: 2.97176%;
-}
-.nine-col .four-col {
-	width: 42.79346%;
-	margin-right: 2.97176%;
-}
-.nine-col .five-col {
-	width: 54.23476%;
-	margin-right: 2.97176%;
-}
-.nine-col .six-col {
-	width: 65.67607%;
-	margin-right: 2.97176%;
-}
-.nine-col .seven-col {
-	width: 77.11738%;
-	margin-right: 2.97176%;
-}
-.nine-col .eight-col {
-	width: 88.55869%;
-	margin-right: 2.97176%;
-}
-.nine-col .nine-col {
-	width: 100%;
-	margin-right: 0;
-}
-.eight-col .one-col {
-	width: 9.56375%;
-	margin-right: 3.3557%;
-}
-.eight-col .two-col {
-	width: 22.48322%;
-	margin-right: 3.3557%;
-}
-.eight-col .three-col {
-	width: 35.40268%;
-	margin-right: 3.3557%;
-}
-.eight-col .four-col {
-	width: 48.32214%;
-	margin-right: 3.3557%;
-}
-.eight-col .five-col {
-	width: 61.24161%;
-	margin-right: 3.3557%;
-}
-.eight-col .six-col {
-	width: 74.16107%;
-	margin-right: 3.3557%;
-}
-.eight-col .seven-col {
-	width: 87.08053%;
-	margin-right: 3.3557%;
-}
-.eight-col .eight-col {
-	width: 100%;
-	margin-right: 0;
-}
-.seven-col .one-col {
-	width: 10.98265%;
-	margin-right: 3.85356%;
-}
-.seven-col .two-col {
-	width: 25.81888%;
-	margin-right: 3.85356%;
-}
-.seven-col .three-col {
-	width: 40.6551%;
-	margin-right: 3.85356%;
-}
-.seven-col .four-col {
-	width: 55.49132%;
-	margin-right: 3.85356%;
-}
-.seven-col .five-col {
-	width: 70.32755%;
-	margin-right: 3.85356%;
-}
-.seven-col .six-col {
-	width: 85.16377%;
-	margin-right: 3.85356%;
-}
-.seven-col .seven-col {
-	width: 100%;
-	margin-right: 0;
-}
-.six-col .one-col {
-	width: 12.89592%;
-	margin-right: 4.52488%;
-}
-.six-col .two-col {
-	width: 30.31674%;
-	margin-right: 4.52488%;
-}
-.six-col .three-col {
-	width: 47.73755%;
-	margin-right: 4.52488%;
-}
-.six-col .four-col {
-	width: 65.15837%;
-	margin-right: 4.52488%;
-}
-.six-col .five-col {
-	width: 82.57918%;
-	margin-right: 4.52488%;
-}
-.six-col .six-col {
-	width: 100%;
-	margin-right: 0;
-}
-.five-col .one-col {
-	width: 15.61643%;
-	margin-right: 5.47945%;
-}
-.five-col .two-col {
-	width: 36.71232%;
-	margin-right: 5.47945%;
-}
-.five-col .three-col {
-	width: 57.80821%;
-	margin-right: 5.47945%;
-}
-.five-col .four-col {
-	width: 78.9041%;
-	margin-right: 5.47945%;
-}
-.five-col .five-col {
-	width: 100%;
-	margin-right: 0;
-}
-.four-col .one-col {
-	width: 19.79166%;
-	margin-right: 6.94444%;
-}
-.four-col .two-col {
-	width: 46.52777%;
-	margin-right: 6.94444%;
-}
-.four-col .three-col {
-	width: 73.26388%;
-	margin-right: 6.94444%;
-}
-.four-col .four-col {
-	width: 100%;
-	margin-right: 0;
-}
-.three-col .one-col {
-	width: 27.01421%;
-	margin-right: 9.47867%;
-}
-.three-col .two-col {
-	width: 63.5071%;
-	margin-right: 9.47867%;
-}
-.three-col .three-col {
-	width: 100%;
-	margin-right: 0;
-}
-.two-col .one-col {
-	width: 42.53731%;
-	margin-right: 14.92537%;
-}
-.two-col .two-col {
-	width: 100%;
-	margin-right: 0;
-}
-.one-col .one-col {
-	width: 100%;
-	margin-right: 0;
-}
- .twelve-col .last-col {
-	margin-right: 0;
-}
-.eleven-col .last-col {
-	margin-right: 0;
-}
-.ten-col .last-col {
-	margin-right: 0;
-}
-.nine-col .last-col {
-	margin-right: 0;
-}
-.eight-col .last-col {
-	margin-right: 0;
-}
-.seven-col .last-col {
-	margin-right: 0;
-}
-.six-col .last-col {
-	margin-right: 0;
-}
-.five-col .last-col {
-	margin-right: 0;
-}
-.four-col .last-col {
-	margin-right: 0;
-}
-.three-col .last-col {
-	margin-right: 0;
-}
-.two-col .last-col {
-	margin-right: 0;
-}
-.one-col .last-col {
-	margin-right: 0;
-}
-
- /**
- * Main containers
- *
- * @section containers
- */
-
-.row, #context-footer {
-	@include box_sizing;
-	border-bottom: 1px dotted $warm_grey;
-	clear: both;
-	position: relative;
-}
-
-.row, #context-footer  { /** Clear entire row. */
-	@include rounded_corners(0);
-	margin: 0;
-	padding: 40px 40px 20px;
-}
-
-.row:after { 
-   content: "."; 
-   visibility: hidden; 
-   display: block; 
-   height: 0; 
-   clear: both;
-}
-
-.row-feature {
-	background: none;
-}
-
-/**
- * Columns
- *
- * @section columns
- */
-
-/* inner grid */
-.container {
-	@include box_sizing;
-	margin: $gutter_width $gutter_width 0;
-	width: 100%; 
-}
-
-/**
- * Empty columns
- *
- * Add these to a column to append or prepend 
- * empty columns
- *
- * @section empty-columns
- */
-
-.append-one { margin-right: $one_col + $gutter; }
-.append-two { margin-right: $two_col + $gutter; } 
-.append-three { margin-right: $three_col + $gutter; }
-.append-four { margin-right: $four_col + $gutter; }
-.append-five { margin-right: $five_col + $gutter; } 
-.append-six { margin-right: $six_col + $gutter; } 
-.append-seven { margin-right: $seven_col + $gutter; } 
-.append-eight { margin-right: $eight_col + $gutter; }
-.append-nine { margin-right: $nine_col + $gutter; }
-.append-ten { margin-right: $ten_col + $gutter; } 
-.append-eleven { margin-right: $eleven_col + $gutter; }
-
-.prepend-one { margin-left: $one_col + 2.12766%; } 
-.prepend-two { margin-left: $two_col + 2.12766%; }
-.prepend-three { margin-left: $three_col + 2.12766%; }
-.prepend-four { margin-left: $four_col + 2.12766%; } 
-.prepend-five { margin-left: $five_col + 2.12766%; } 
-.prepend-six { margin-left: $six_col + $gutter; } 
-.prepend-seven { margin-left: $seven_col + $gutter; } 
-.prepend-eight { margin-left: $eight_col + $gutter; }
-.prepend-nine { margin-left: $nine_col + $gutter; }
-.prepend-ten { margin-left: $ten_col + $gutter; }
-.prepend-eleven { margin-left: $eleven_col + $gutter; }
-
-.push-one { margin-left: 57px; }
-
-/**
- * Push and pull
- *
- * Use these classes to push elements into the next 
- * column and pull it into the previous column
- *
- * @section push-pull
- */
-
-.pull-one, .pull-two, .pull-three, .pull-four, .pull-five, .pull-six, .pull-seven, .pull-eight, .pull-nine, .pull-ten, .pull-eleven {
-	float: left;
-	position: relative;
-}
-.pull-one { margin-left: -$one_col; }
-.pull-two { margin-left: -($two_col + $gutter); }
-.pull-three { margin-left: -($three_col + $gutter); }
-.pull-four { margin-left: -($four_col + $gutter); }
-.pull-five { margin-left: -($four_col + $gutter); }
-.pull-six { margin-left: -($six_col + $gutter); }
-.pull-seven { margin-left: -($seven_col + $gutter); }
-.pull-eight { margin-left: -($eight_col + $gutter); }
-.pull-nine { margin-left: -($nine_col + $gutter); }
-.pull-ten { margin-left: -($ten_col + $gutter); }
-.pull-eleven { margin-left: -($eleven_col + $gutter); }
-
-.push-1, .push-two, .push-three, .push-four, .push-five, .push-six, .push-seven, .push-eight, .push-nine, .push-ten, .push-eleven {
-	float: left;
-	position: relative;
-}
-.push-one { margin: 0 (-($one_col + $gutter)) 0 ($one_col + $gutter); }
-.push-two { margin: 0 (-($two_col + ($gutter * 2))) 0 ($two_col + ($gutter * 2)); }
-.push-three { margin: 0 (-($three_col + ($gutter * 2))) 0 ($three_col + ($gutter * 2)); }
-.push-four { margin: 0 (-($four_col + ($gutter * 2))) 0 ($four_col + ($gutter * 2)); }
-.push-five { margin: 0 (-($four_col + ($gutter * 2))) 0 ($four_col + ($gutter * 2)); }
-.push-six { margin: 0 (-($six_col + ($gutter * 2))) 0 ($six_col + ($gutter * 2)); }
-.push-seven { margin: 0 (-($seven_col + ($gutter * 2))) 0 ($seven_col + ($gutter * 2)); }
-.push-eight { margin: 0 (-($eight_col + ($gutter * 2))) 0 ($eight_col + ($gutter * 2)); }
-.push-nine { margin: 0 (-($nine_col + ($gutter * 2))) 0 ($nine_col + ($gutter * 2)); }
-.push-ten { margin: 0 (-($ten_col + ($gutter * 2))) 0 ($ten_col + ($gutter * 2)); }
-.push-eleven { margin: 0 (-($eleven_col + ($gutter * 2))) 0 ($eleven_col + ($gutter * 2)); }
-
-/**
- * Borders
- *
- * @section borders
- */
-
-.border { /** Border on right hand side of a column. */
-	border-right: 1px solid #ddd; 
-	margin-right: $gutter_width / 2;
-	padding-right: .5625em; /* .625 - 1px */
-}
-
-// border
-@mixin border($width: 1px, $style: dotted, $color: #ddd) {
-	border-right: $width $style $color;
-	margin-right: $gutter_width / 2;
-	padding-right: .5625em; /* .625 - 1px */
-}
-
-/**
- * Push and pull
- *
- * Use these classes to push elements into the next 
- * column and pull it into the previous column
- *
- * @section push-pull
- */
-
-/**
- * Vertical gutter
- *
- * Add a gutter above or below and element
- *
- * @section last
- */
- 
-div.prepend-top, .prepend-top { margin-top: $gutter_width; }
-div.append-bottom, .append-bottom { margin-bottom: $gutter_width; }
-
-/**
- * Last
- *
- * Add to last column a row
- *
- * @section last
- */
-
-.last-col, .last { margin-right: 0; }
-
-/**
- * Clearing
- *
- * Hard and soft clearing classes
- *
- * @section clearing
- */
-
-.clearfix:after, .container:after {
-  clear: both;
-  content: "\0020";
-  display: block;
-  height: 0;
-  overflow:hidden;
-  visibility: hidden;
-}
-
-.clear { clear: both; }
-.clearfix { display: block; }
-
-/*@media handheld, only screen and (max-width: 767px) {
-
-	body {
-	font-size: 16px;
-	-webkit-text-size-adjust: none;
-	}
-	
-	.row, body, .container {
-	width: 100%;
-	min-width: 0;
-	margin-left: 0px;
-	margin-right: 0px;
-	padding-left: 0px;
-	padding-right: 0px;
-	}
-	
-	.one-col, .two-col, .three-col, .fourcol, .five-col, .six-col, .seven-col, .eight-col, .nine-col, .ten-col, .eleven-col, .twelve-col {
-	width: auto;
-	float: none;
-	margin-left: 0px;
-	margin-right: 0px;
-	padding-left: 20px;
-	padding-right: 20px;
-	}
-
-}*/
diff --git a/templates/static/css/core-mixins.scss b/templates/static/css/core-mixins.scss
deleted file mode 100644
index e94615d300b..00000000000
--- a/templates/static/css/core-mixins.scss
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * mixins
- *
- * @section mixins
- */
- 
-@mixin font_size ($size: 16) {
-  font-size: ($size / $base)em; 
-  margin-bottom: (12 / $size)em;
-}
-
-@mixin box_sizing ($type: border-box) {
-	-webkit-box-sizing: $type;
-	-moz-box-sizing:    $type;
-	box-sizing:         $type;
-}
-
-@mixin rounded_corners($radius: 4px 4px 4px 4px) { 
-  -webkit-border-radius: $radius;
-  -moz-border-radius: $radius;
-  border-radius: $radius;
-}
-
-@mixin box_shadow($shadow: 0 2px 2px 0 #c2c2c2) { 
-  -moz-box-shadow: $shadow;
-  -webkit-box-shadow: $shadow;
-  box-shadow: $shadow;
-}
-
-@mixin gradient($from, $to) {
-  background-color: $to;
-  background-image: -moz-linear-gradient($from, $to);
-  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from($from), to($to));
-  background-image: -webkit-linear-gradient($from, $to);
-  background-image: -o-linear-gradient($from, $to);
-}
-
-@mixin footer($background) {
-  padding: $gutter_width $two_col $gutter_width $four_col;
-  margin-bottom: 0;
-  background: url($background) no-repeat scroll $one_col center #F7F7F7;
-}
-
-@mixin clearfix() {
-  *zoom:1;
-
-  &:before,
-  &:after {
-      content:"";
-      display:table;
-  }
-  &:after {
-      clear:both;
-  }
-}
-
-// CSS3 colunms
-@mixin columns($num: 3, $gap: 20) {
-  -moz-column-count: $num;
-  -moz-column-gap: ($gap / $base)em;
-  -webkit-column-count: $num;
-  -webkit-column-gap: ($gap / $base)em;
-  column-count: $num;
-  column-gap: ($gap / $base)em;
-}
\ No newline at end of file
diff --git a/templates/static/css/core-pattern.scss b/templates/static/css/core-pattern.scss
deleted file mode 100644
index 3d2ce3446d7..00000000000
--- a/templates/static/css/core-pattern.scss
+++ /dev/null
@@ -1,2155 +0,0 @@
-@charset "UTF-8";
-/**
- * Ubuntu Patterns Stylesheet
- *
- * The CSS file required by Ubuntu patterns page
- * 
- * @project		Ubuntu Patterns
- * @author		Web Team at Canonical Ltd
- * @copyright	2012 Canonical Ltd
- *
- */
-  
-/**
- * Links
- *
- * @section links
- */
-html { /* same colour as the footer background for if there is a short page */
-	background: $light_grey;
-}
-
-p.intro {
-	@include font_size (23);
-	line-height: 1.4;
-}
-
-header.banner {
-  background: $ubuntu_orange;
-  position: relative;
-  z-index: 2;
-  width: 100%;
-  margin-bottom: 20px;
-  display: inline-block;
-	border-top: 0;
-		-moz-box-shadow: 
-			 inset 0  2px 2px -2px #777, 
-			 2px 1px #fff;
-		-webkit-box-shadow: 
-			 inset 0  2px 2px -2px #777, 
-			 2px 1px #fff;
-	box-shadow: 
-		 inset 0  2px 2px -2px #777, 
-		 2px 1px #fff;
-	}
-
-header.banner .nav-primary {
-  border: 0;
-	margin: 0 auto;
-	overflow: hidden;
-	width: 984px; /* 980px / 15px (baseline font); 980px + (60px x 2) = 1100px */
-}
-
-header.banner .nav-primary ul {
-  border-right: 1px solid lighten($ubuntu_orange, 10%);
-  float: left;
-  margin: 0;
-  position: relative;
-}
-
-header.banner .nav-primary li {
-  border-left: 1px solid darken($ubuntu_orange, 5%);
-  float: left;
-  list-style-image: none;
-  margin: 0;
-  text-indent: 0;
-  vertical-align: bottom;
-}
-
-header.banner .nav-primary ul li:last-child {
-  border-right: 1px solid darken($ubuntu_orange, 5%);
-}
-
-header.banner .nav-primary li a:link, 
-header.banner .nav-primary li a:visited{
-  font-size: 14px;
-  border-left: 1px solid lighten($ubuntu_orange, 7%);
-  color: #fff;
-  display: block;
-  margin-bottom: 0;
-  padding: 12px 14px 14px;
-  position: relative;
-  text-align: center;
-  text-decoration: none;
-    -webkit-font-smoothing: subpixel-antialiased;
-    -moz-font-smoothing: subpixel-antialiased;
-    -o-font-smoothing: subpixel-antialiased;
-  font-smoothing: subpixel-antialiased;
-}
-
-header.banner .nav-primary a.active {
-  background: #B83A10;
-  border-left: 1px solid lighten($ubuntu_orange, 7%);
-}
-
-header.banner .nav-primary li a:hover {
-	background: #e1662f;
-	border-top: 0;
-		-moz-box-shadow: inset 0 2px 2px -2px #777;
-		-webkit-box-shadow: inset 0 2px 2px -2px #777;
-	box-shadow: inset 0 2px 2px -2px #777;
-}
-
-/* nav-secondary */
-.nav-secondary {
-  border-bottom: 1px solid #dfdcd9;
-  margin-bottom: 0;
-  
-  ul {
-    float: left;
-    margin-bottom: 10px;
-    margin-left: 2px;
-    
-    li {
-      float: left;
-      margin-top: 16px;
-      font-size: 14px;
-	    margin-right: 15px;
-      
-      a:link,
-      a:visited {
-        color: #333;
-        font-size: 14px;
-        float: left;
-      }
-      
-      a:hover,
-      a:active {
-        color: $ubuntu_orange;
-        text-decoration: none;
-      }
-    }
-    
-    li,
-    li.active a:link,
-    li.active a:visited {
-      color: $ubuntu_orange;
-      text-decoration: none;
-    }
-  }
-  ul.breadcrumb {
-    margin-left: 20px;
-    
-    li,
-    li a:link,
-    li a:visited {
-      color: $warm_grey;
-      margin-right: 8px;
-    }
-    
-    li.active a:link,
-    li.active a:visited {
-      color: $ubuntu_orange;
-    }
-  }
-}
-
-header.banner h2 {
-	@include font_size (25);
-	display: block;
-	left: 4px;
-	margin-bottom:0;
-	position: relative;
-	text-transform: lowercase;
-	top: 14px;
-}
-
-header.banner h2 a:link, header.banner h2 a:visited, header.banner a {
-	color: #fff;
-	float: left;
-	text-decoration:none;
-}
-
-header.banner {
-	.logo {
-	  border-left: 0;
-  	float: left;
-    height: 48px;
-  	overflow: hidden;
-	}
-	
-  .logo-ubuntu {
-  	background: url("/sites/ubuntu/latest/u/img/ubuntu-logo.png") no-repeat scroll 0 10px transparent;
-    font-size: 18px;
-    margin-bottom: 0;
-    position: relative;
-    text-transform: lowercase;
-    float: left;
-    margin: 0;
-    display: inline-block;
-    height: 32px;
-    min-width: 128px;
-    margin-right: -20px;
-    padding: 7px 14px 9px 0;
-
-    img {
-      margin-right: 8px;
-      position: absolute;
-      left: -999em;
-    }
-    
-    span {
-      float: left;
-      font-size: 23px;
-      padding-left: 122px;
-      padding-right: 20px;
-      position: relative;
-      top: 5px;
-    }
-    
-  }
-  .nav-primary.nav-left {
-    .logo-ubuntu {
-      float: right;
-    }
-  }
-  .nav-primary.nav-right {
-    .logo-ubuntu {
-      float: left;
-    }
-  }
-}
-
-/* Footer */
-footer.global {
-		-moz-box-shadow: inset 0 2px 2px -2px #d3d3d3;
-		-webkit-box-shadow: inset 0 2px 2px -2px #d3d3d3;
-	background: $light_grey;
-	border-top: 0;
-	box-shadow: inset 0 2px 2px -1px #d3d3d3;
-	clear: both;
-	display: block;
-	padding: 30px 0 20px;
-	position: relative;
-	width: 100%;
-	
-	.footer-a {
-		border-bottom: 1px solid #d8d8d8;
-		clear: both;
-		padding-bottom: 20px;
-		margin-bottom: 20px;
-	
-		div {
-			padding-bottom: 10px;
-		}
-		
-		ul {
-			border-collapse: collapse;
-			display: table;
-			float: none;
-			margin-left: -15px;
-			padding-bottom: 0;
-			width: 100%;
-		}
-	
-		ul li {
-			border-right: 1px dotted $warm_grey;
-			display: table-cell;
-			float: none;
-			margin-left: 15px;
-			padding-bottom: 5px;
-			padding-left: 15px;
-			padding-right: 5px;
-			width: auto;
-			width: 124px;
-		}
-		
-		ul li.secondary-desktop {
-			width: 128px;
-		}
-		
-		ul li.secondary-server {
-			width: 118px;
-		}
-	
-		ul li.secondary-tablet {
-			width: 123px;
-		}
-	
-		ul li.secondary-cloud {
-			width: 115px;
-		}
-		
-		ul li.secondary-tv {
-			width: 115px;
-		}
-	
-		ul li.secondary-management {
-			width: 143px;
-		}
-		
-		ul li:last-child, ul li.last-item {
-			border: 0;
-			padding-right: 0;
-		}
-		
-		ul ul {
-			margin-left: 0;
-			display: block;
-		}
-			
-		li li {
-			margin-left: 0;
-			float: none;
-			width: auto;
-			display: block;
-			min-height: 0;
-			border: 0;
-			margin-bottom: 2px;
-			padding-left: 0;
-			padding-bottom: inherit;
-			background: none;
-		}
-		
-		li li:last-child {
-			margin-bottom: 0;
-		}
-		
-		li li a {
-			display: block;
-		}	
-	}/* end footer-a */
-	
-	nav div.footer-a div, .inline-lists ul, .legal {
-		margin: 0 auto;
-		width: 984px; /* 980px / 15px (baseline font); 980px + (60px x 2) = 1100px */
-	}
-	
-	.legal {
-		background: url("/sites/ubuntu/latest/u/img/logos/logo-ubuntu-grey.png") 100% 0 no-repeat;
-		position: relative;
-		clear: both;
-		min-height: 40px;
-	}
-	
-	h2 { 
-	  @include font_size (12);
-		line-height: 1.4;
-	  margin-bottom: 0;
-	  padding-bottom: 0.5em;
-	}
-	
-	h2, h2 a:link, h2 a:visited {
-		color: $cool_grey;
-	  font-weight: normal;
-	}
-	
-	nav ul li h2 a:after { content: ""; }
-	
-	ul {	margin: 0; }
-	
-	nav ul li.two-col { 
-		display: inline-block;
-		min-height: 10em;
-		vertical-align: top;
-	}
-	
-	nav ul li li {
-	  @include font_size (12);
-		margin-bottom: 0;
-	}
-	
-	ul li li a:link, ul li li a:visited {
-		color: $cool_grey;
-		margin-bottom: 0;
-	}
-	
-	ul li li a:hover, ul li li a:active, h2 a:hover, h2 a:active {
-		color: $ubuntu_orange;
-		text-decoration: underline;
-	}
-	
-	p, ul.inline li a {
-		color: $cool_grey;
-		font-size: 12px;
-		margin-bottom: 0;
-	}
-	ul.inline li a:hover {
-		color: $ubuntu_orange;
-	}
-	ul.inline li:after {
-		color: $warm_grey;
-		content: "•";
-		vertical-align: middle;
-		margin: 0 5px;
-	}
-	ul.inline li:last-child {
-		width: 120px;
-	}	
-	ul.inline li:last-child:after {
-		content: "";
-	}
-	.footer-b {
-		border-bottom: 1px solid #d8d8d8;
-		padding: 0 0 20px;
-		margin: 0 auto 20px;
-
-		ul ul, ul li, ul ul, h2, h2 a {
-			margin: 0;
-			padding: 0;
-			line-height: 2;
-			width: auto;
-			float: none;
-		}
-		h2 {
-			float: left;
-			margin-right: 6px;
-			display: inline;
-		}
-		li {
-			width: 100%;
-			display: block;
-			clear: both;
-			overflow: hidden;
-		}
-		li li {
-			width: auto;
-			background: 0;
-			float: left;
-			clear: none;
-		}
-		li li:last-child {
-			width: 200px;
-		}
-		li li:after {
-			content: "|";
-			padding-left: 6px;
-			padding-right: 6px;
-			position: relative;
-		}
-		li h2 a:after, 
-		li li:last-child:after  {
-				content: "";
-		}
-	}/* end footer-b */
-} /* End footer.global */
-
-/* contextualised footers */
-#context-footer {
-	@include font_size (14);
-	border-bottom: 0;
-	padding-bottom: 1px;
-	padding-top: 0;
-	width: 100%;
-}
-
-#context-footer hr {
-	background: $ubuntu_orange;
-	height: 14px;
-	margin: 0 -40px 40px;
-	border: 0;
-		-moz-	box-shadow: inset 0 2px 2px -2px #333;
-		-webkit	box-shadow: inset 0 2px 2px -2px #333;
-	box-shadow: inset 0 2px 2px -2px #333; 
-	clear: both;
-}
-
-#context-footer div.twelve-col {
-	display: table;
-	float: none;
-	margin-bottom: 7px;
-}
-
-#context-footer div div {
-	display: table-cell;
-	float: none;
-	padding-left: 20px;
-	margin-bottom: 0;
-}
-
-#context-footer div div div {
-	display: block;
-	padding-left: 0;
-	margin-bottom: 0;
-}
-
-#context-footer div div.feature-one {
-	padding-left: 0;
-}
-
-#context-footer div div.feature-four {
-	margin-right: 0;
-}
-
-
-#context-footer ul {
-	margin-bottom: 5px;
-}
-
-#context-footer li.active {
-	display: none;
-}
-
-#context-footer h3 {
-	@include font_size (16);
-	font-weight: normal;
-}
-
-#context-footer .list a:after {
-	content: "\0000a0›";
-}
-
-/*
- * CTA Buttons
- */
-
-a.link-cta-ubuntu,
-a.link-cta-canonical,
-a.link-cta-inverted,
-button.cta-ubuntu,
-button.cta-canonical,
-form button[type="submit"],
-form input[type="submit"] {
-	@include font_size (16);
-	@include rounded_corners(4px);
-	@include gradient($ubuntu_orange, #c03f11);
-	color: #fff;
-	text-decoration:none;
-	display: inline-block;
-	margin: 0;
-	padding: 8px 14px;
-  font-family: Ubuntu, Arial, "libra sans", sans-serif;
-	font-weight: 300;
-    -webkit-font-smoothing: subpixel-antialiased;
-    -moz-font-smoothing: subpixel-antialiased;
-    -o-font-smoothing: subpixel-antialiased;
-  font-smoothing: subpixel-antialiased;
-  padding: 8px 14px;
-}
-a.cta-large, 
-button.cta-large {
-	@include font_size (18);
-	padding: 10px 20px;
-}
-a.link-cta-canonical, 
-button.cta-canonical,
-form button.cta-canonical[type="submit"],
-form input.cta-canonical[type="submit"] {
-	@include gradient($canonical_aubergine, #5f193e);
-	color: #fff;
-}
-a.link-cta-inverted, 
-button.cta-inverted {
-	background: #fff;
-	color: $cool_grey;
-}
-
-.row-enterprise a.link-cta-canonical,
-.row -enterprise button.link-cta-canonical {
-  background: #fff;
-  color: $canonical_aubergine;
-}
-
-a.link-cta-ubuntu:hover,
-a.link-cta-ubuntu:hover,
-button.cta-ubuntu:hover,
-form button[type="submit"]:hover,
-form input[type="submit"]:hover  {
-	text-decoration: none;
-  background: $ubuntu_orange;
-}
-a.link-cta-canonical:hover,
-button.cta-canonical:hover, {
-  text-decoration: none;
-  background: $canonical_aubergine;
-}
-a.link-cta-inverted:hover,
-.row-enterprise a.link-cta-canonical:hover,
-button.cta-inverted:hover,
-.row-enterprise button.cta-canonical:hover {
-  text-decoration: underline;
-  background: #fff;
-}
-a.cta-deactivated,
-a.cta-deactivated:hover,
-button.cta-deactivated,
-button.cta-deactivated:hover {
-  color: #fff;
-  background: $box_solid_grey;
-  cursor: not-allowed;
-}
-
-/*
- * End CTA Buttons
- */
- 
-.four-col p:last-child {
-  margin-bottom: 0;
-}
-
-/**
- * Forms
- *
- * Global form element styles
- *
- * @section forms
- */
-
-form .fieldset-1 { background-image: url("/sites/ubuntu/latest/u/img/patterns/fieldsets-1.png"); }
-form .fieldset-2 { background-image: url("/sites/ubuntu/latest/u/img/patterns/fieldsets-2.png"); }
-form .fieldset-3 { background-image: url("/sites/ubuntu/latest/u/img/patterns/fieldsets-3.png"); }
-form .fieldset-4 { background-image: url("/sites/ubuntu/latest/u/img/patterns/fieldsets-4.png"); }
-
-form .fieldset-submit ul {
-  margin-bottom: 0px;
-}
-
-form fieldset .mktError, form .errMsg { 
-	color: $error; 
-}
-
-.reqMark {
-	color: $error;
-}
-
-form fieldset .mktFormMsg {
-	clear: both;
-	display: block;
-}
-
-.donation-button {
-  margin-bottom: 1em;
-}
-
-.mktFormText, .mktFormTextarea {
-	width: 83%;
-}
-
-/**
- * Components
- *
- * @section components
- */
- 
-.wrapper {
-	@include box_sizing;
-	background: #fff;
-	margin: 0 auto;
-	text-align: left;
-	width: 984px;
-	position: relative;
-}
-
-.inner-wrapper {
-	@include box_shadow(0 0 3px #c9c9c9);
-	@include box_sizing;
-	@include rounded_corners(4px);
-	background: #fff;
-	clear: both;
-	display: block;
-	float: left;
-	width: 100%;
-	margin: 10px 0 30px;
-	padding-bottom: 20px;
-	position:relative;
-	z-index:1;
-}
-
-#main-content .row-hero {
-	margin-top: 40px;
-	padding-top: 0;
-}
-
-.row-feature {
-	background: none;
-	border: 1px solid #dfdcd9;
-	padding-bottom: 20px;
-}
-
-.row-grey {
-  background: $light_grey;
-}
-
-.box, .box-grey {
-  @include rounded_corners(4px);
-  padding: 1.333em $gutter_width;
-}
-
-.box {
-  background: #fff;
-  border: 1px solid #dfdcd9;
-}
-
-.box-grey {
-  background: $light_grey;
-  color: $cool_grey;
-}
-
-.box-orange {
-  background: $ubuntu_orange;
-  color: #fff;
-}
-
-.box-highlight { 
-	@include box_shadow(0 2px 2px 0 #c2c2c2);
-	border: 1px solid $light_grey;
-}
-
-.box-textured {
-  @include box_shadow(0 2px 2px 0 #c2c2c2);
-  background: url("/sites/ubuntu/latest/u/img/patterns/grey-textured-background.jpg");
-  border: 0;
-}
-
-.box-padded {
-  @include rounded_corners(4px);
-  background: $box_solid_grey;
-  border: 0;
-  margin-bottom: 20px;
-  padding: 6px 5px 6px;
-  
-  h3 {
-    @include font_size(19.5);
-    margin-left: ($gutter_width / 4);
-    margin-top: 5px;
-  }
-  
-  li h3 { /* this happens in 'Further reading' /cloud/insights */
-	  @include font_size(19.5);
-	  margin: 0;
-  }
-
-  div {
-    @include rounded_corners(4px);
-      background: #fff;
-      overflow: hidden;
-      padding: 8px 8px 2px;
-  }
-}
-
-.box-padded-feature {
-  @include rounded_corners(4px);
-  background: url("/sites/ubuntu/latest/u/img/patterns/soft-centre-bkg.gif") repeat scroll 0 0 #A09F9F;
-  border: 0;
-  margin-bottom: 20px;
-  padding: 11px 5px 6px;
-  
-  h3 {
-    color: #fff;
-    margin-left: ($gutter_width / 4);
-    @include font_size(19.5);
-  }
-  
-  h4 {
-    @include font_size(16);
-    font-weight: normal;
-  }
-
-  > div {
-    @include rounded_corners(4px);
-      background: #fff;
-      overflow: hidden;
-      padding: 20px 8px 0;
-  }
-  
-  div div {
-    margin-bottom: 0;
-  }
-  
-	.inline-icons { display: table; width: 100%; margin: 0 0 $gutter_width 0; }
-	.inline-icons li { display: table-cell; text-align: left; float: none; }
-}
-
-/*
- * Arrows for the pointing boxes component
- */
-
-.arrow-right, .arrow-up, .arrow-down, .arrow-left {
-	height: 11px;
-	position: absolute;
-	width: 18px;
-}
-
-.arrow-right{
-	background: url("/sites/ubuntu/latest/u/img/patterns/arrow-right.png") 0 0 no-repeat;
-	height: 18px;
-	right: -11px;
-	top: 20px;
-	width: 11px;
-}
-.arrow-up{
-	background: url("/sites/ubuntu/latest/u/img/patterns/arrow-up.png") 0 0 no-repeat;
-	left: 20px;
-	top: -11px;
-}
-.arrow-down{
-	background: url("/sites/ubuntu/latest/u/img/patterns/arrow-down.png") 0 0 no-repeat;
-	bottom: -11px;
-	right: 20px;
-}
-.arrow-left{
-	background: url("/sites/ubuntu/latest/u/img/patterns/arrow-left.png") 0 0 no-repeat;
-	bottom: 20px;
-	height: 18px;
-	left: -11px;
-	width: 11px;
-}
-
-div > .arrow-left { left: -10px; }
-
-/*
- * Lists
- */
-
-.list, .list-ubuntu, .list-canonical {
-	list-style: none;
-	margin-left: 0;
-		
-	li {
-	  border-bottom: 1px dotted $warm_grey;
-    margin-bottom: 0;
-    padding: 10px 0;
-	}
-	
-	li:last-of-type, li.last-item { 
-	  border: 0;
-    padding-bottom: 0;
-  }
-}
-
-nav .list a {
-	display: block;
-} 
-
-.list-ubuntu li, .list-canonical li {
-		background-repeat: no-repeat;
-		background-position: 0 15px;
-    padding-left: 25px;
-}
-
-.list-ubuntu li { background-image: url("/sites/ubuntu/latest/u/img/patterns/tick-orange.png"); }
-.list-canonical li { background-image: url("/sites/ubuntu/latest/u/img/patterns/tick-aubergine.png"); }
-
-blockquote.pull-quote p {
-	margin-left: 0.4em;
-	text-indent: -0.4em;
-	font-size: 30px;
-	line-height: 1.3;
-	color: #aea79f;
-}
-
-blockquote.pull-quote p cite {
-	margin: 10px 0 0 0.8em;
-	font-size: 16px;
-	font-weight: 300;
-	display: block;
-}
-
-blockquote.quote-canonical,
-blockquote.quote-canonical-white{
-  @include font_size (16);
-    background: url("/sites/ubuntu/latest/u/img/patterns/quote-white-360x360.png") no-repeat 20px -130px;
-    color: $canonical_aubergine;
-    float: right;
-    height: 215px;
-    margin-top: 0;
-    padding: 20px 60px 0 60px;
-    position: relative;
-    width: 236px;
-}
-
-blockquote.quote-canonical-white{
-  background: url("/sites/ubuntu/latest/u/img/patterns/quote-aubergine-345x345.png") no-repeat 0 0;
-  color: #fff;
-  padding: 80px 60px 0 60px;
-  height: 265px;
-}
-
-blockquote.quote p:first-child {
-	@include font_size (18); /* (16) desired value in px, this is divided by the baseline font-size value to reach the em value */
-    line-height: 1.3;
-    text-indent: -7px;
-}
-
-blockquote.quote-right-bottom p { color: #fff; }
-
-blockquote.quote-right-bottom {
-    background: url("/sites/ubuntu/latest/u/img/patterns/quote-orange-br-287x287.png") no-repeat;
-    color: #fff;
-    height: 167px;
-    padding: 60px 40px;
-    position: absolute;
-    right:  -($gutter_width * 2);
-    top: -($gutter_width * 4.5);
-    width: 207px;
-}
-
-blockquote.quote-grey {
-  @include font_size (36);
-  background: url("/sites/ubuntu/latest/u/img/patterns/quote-grey-br-211x211.png") no-repeat scroll 0 0 transparent;
-    color: #FFFFFF;
-    height: 152px;
-    line-height: 40px;
-    margin-left: 20px;
-    padding: 60px 0 0;
-    text-align: center;
-    width: 211px;
-}
-
-blockquote.quote-bottom-left {
-    background: url("/sites/ubuntu/latest/u/img/patterns/quote-orange-bl-287x287.png") no-repeat;
-    color: #fff;
-    height: 167px;
-    padding: 55px 40px 70px 45px;
-    width: 225px;
-}
-
-
-.row-quote {
-  @include rounded_corners(0);
-  
-  blockquote {
-    @include font_size (24); 
-    @include rounded_corners(4px);
-    margin: 0;
-    padding: 0 80px 20px;
-    text-indent: -10px;
-    
-    p {
-      @include font_size (16); 
-      margin-bottom: 0.75em;
-      line-height: 1.3;
-      color: $cool_grey;
-    }
-    
-    cite {
-      @include font_size (12);
-      color: $cool_grey;
-      font-style: normal;
-      margin-bottom: 0;
-    }
-  }
-  .quote-twitter {
-    background: #fcece7 url("/sites/ubuntu/latest/u/img/pictograms/pictogram-twitter-115x139.png") $gutter_width bottom no-repeat;
-    padding: $gutter_width $gutter_width $gutter_width $three_col;
-  }
-  .quote-twitter-small {
-    background: #fcece7 url("/sites/ubuntu/latest/u/img/pictograms/pictogram-twitter-54x63.png") 99% bottom no-repeat;
-    padding: $gutter_width $gutter_width $gutter_width 80px;
-    
-    p {
-      margin: 0;
-      padding: 0;
-    }
-  }
-}
-
-.pull-wrap {
-	padding-right: $five_col;
-	width: $seven_col;
-	margin-bottom: 20px;
-}
-
-.pull-quote {
-	@include font_size (30); 
-	color: $warm_grey;
-	line-height: 1.4;
-	right: 0;
-	text-indent: -0.4em;
-}
-
-.pull-quote.js {
-  padding-left: $gutter_width*3;
-  display: table-cell;
-}
-
-blockquote.pull-quote {
-	text-indent: 0;
-}
-
-.row-box-feature {
-  background: url("/sites/ubuntu/latest/u/img/patterns/grey-textured-background.jpg");
-  padding-top: $gutter_width;
-}
-
-.tabbed-menu {
-  @include box_sizing;
-  @include rounded_corners(4px 4px 0 0);
-  @include box_shadow(0 -1px 10px #cfcfcf inset);
-  background: none repeat scroll 0 0 $light_grey;
-  position: relative; 
-  padding-top: $gutter_width;
-  padding-bottom: $gutter_width;
-  
-  ul {
-	  @include box_sizing;
-    margin-bottom: 0;
-    display: table;
-    width: 100%;
-    table-layout: fixed;
-    position: relative;
-    padding: 0;
-  }
-    
-  li {
-    text-align: center;
-    display: table-cell;
-  }
-
-  a {
-    color: #666;
-    display: block;
-    outline: none;
-  }
-
-  a:hover {
-    text-decoration: none;  
-  }
-
-  a.active {
-    color: $canonical_aubergine;
-    text-decoration: none;
-  }
-
-  .arrow {
-    position: absolute;
-    bottom: 0;
-  }
-}
-.tabbed-content {
-  @include clearfix();
-  padding: $gutter_width $gutter_width*2 0;
-  
-  .row {
-    padding-left: 0;
-    padding-right: 0;
-  }
-}
-
-.tabbed-content .main-content {
-	padding-bottom: 40px;
-}
-
-html.yui3-js-enabled .tabbed-content.hide {
-	display: none;
-	opacity: 0;
-}
-
-.tabbed-content-bg  {
-	@include box_sizing;
-	background: #fff;
-	margin-left: 20px;
-	margin-right: 20px;
-}
-
-.tabbed-content-bg .row-box {
-	padding-left: 0;
-	padding-right: 0;
-}
-
-.slider {
-  @include rounded_corners(4px);
-  background: $light_grey;
-  padding-top: $gutter_width * 2;
-  
-  .slide-window {
-    overflow: hidden;
-    position: relative;
-    height: 450px;
-    -moz-transition: left 1s;
-      -webkit-transition: left 1s;
-      -o-transition: left 1s;
-    transition: left 1s;
-  }
-  
-  .slide-container {
-    position: absolute;
-    width: (700 * 4)px;
-      -moz-transition: left 1s;
-      -webkit-transition: left 1s;
-      -o-transition: left 1s;
-    transition: left 1s;
-    left: 0;
-  }
-  
-  .slider-dots {
-    ul {
-      position: absolute;
-      top: 550px;
-      left: 220px;
-      z-index: 5;
-    }
-    li {
-      background: url("/sites/ubuntu/latest/u/img/patterns/sprite-pager.png") no-repeat;
-      list-style-type: none;
-      float: left;
-      text-indent: -9999em;
-      width: 7px;
-      height: 7px;
-      margin-right: 0.75em;
-      background-position: 0 -8px;
-    }
-    li.active {
-      background-position: 0 0;
-    }
-    a {
-      display:block;
-      outline: 0;
-    }
-  }
-  
-  .slide {
-    float: right;
-    width: 700px;
-    
-    h3{
-      margin-top:65px;
-      display: inline-block;
-    }
-    p {
-      width: 350px;
-    }
-  }
-  
-  .arrow-prev,
-  .arrow-next {
-    font-size: 5em;
-    margin-top: 150px;
-    display: block;
-    color: $warm_grey;
-    outline: 0;
-  }
-  .arrow-prev:hover,
-  .arrow-next:hover {
-    text-decoration: none;
-    color: $cool_grey;
-  }
-  .arrow-prev:active,
-  .arrow-next:active {
-    padding-top:1px;
-    text-decoration: none;
-  }
-  .arrow-prev:focus,
-  .arrow-next:focus {
-    text-decoration: none;
-  }
-}
-
-/**
- * Helper classes
- *
- * @section helper
- */
-
-.no-bullets { 
-  list-style: none; 
-  margin-left:0; 
-}
-
-.inline {
-  margin-left: 0;
-  
-  li {
-    display: inline; 
-    list-style: none; 
-    margin-left: 0;
-    float:left;
-  }
-}
-
-.inline-icons { margin: 0 0 $gutter_width 0; }
-.inline-icons li { margin-right: 20px; margin-bottom: 20px; text-align: left; display: inline-block; }
-.inline-icons.no-margin-bottom li { margin-bottom: 0; }
-.inline-icons li.last-item { margin-right: 0; }
-.inline-icons img { vertical-align: middle; }
-
-.left { float: left; }
-.right { float: right; }
-
-.accessibility-aid, .off-left { position: absolute; left: -999em; }
-
-.text-center { text-align: center; }
-.text-right { text-align: right; }
-.text-left { text-align: left; }
-
-.middle {
-  display: inline-block; 
-  vertical-align: middle;
-  text-align: center;
-}
-
-.no-margin { margin: 0; }
-.no-margin-bottom { margin-bottom: 0; }
-.no-padding-bottom { padding-bottom: 0; }
-
-.note {
-  @include font_size (13);
-  color: $warm_grey;
-}
-.pull-left-20 { margin-left: -20px; }
-.pull-right-20 { margin-right: -20px; }
-.pull-left-40 { margin-left: -40px; }
-.pull-right-40 { margin-right: -41px; }
-.no-border { border: none; }
-.no-indent { text-indent: 0; }
-.extra-gap div.last { padding-left: 1.25em; }
-.boxed {
-  @include rounded_corners(4px);
-  background-color: $light_grey;
-  margin-bottom: 1.538em;
-}
-
-.link-top {
-    @include font_size (14);
-    clear: both;
-    margin-bottom: 40px;
-    margin-top: -40px;
-    
-    a {
-      background: white;
-      margin-right: 10px;
-      margin-top: -17px;
-      padding: 5px;
-      float: right;
-    }
-}
-
-.pull-bottom-right { 
-	position: absolute; 
-	right: 0; 
-	bottom: 0; 
-	left: auto; 
-}
-
-.box .pull-bottom-right { 
-  @include rounded_corners(0 0 4px 0);
-}
-
-.pull-bottom-left { margin-left: -20px; margin-bottom: -21px; }
-.pull-top-right { margin-right: -20px; margin-top: -21px; }
-.pull-top-right { margin-left: -20px; margin-top: -21px; }
-
-.row.vertical-divider {
-	padding-bottom: 40px;
-}
-
-.vertical-divider {
-  > div,
-  > li {
-    border-right: 1px dotted $warm_grey;
-    margin-right: 0;
-    padding-right: 20px;
-    padding-left: 20px;
-    float: none;
-    display: table-cell;
-    vertical-align: top;
-  }
-  > div:last-child,
-  > li:last-child,
-  > div.last-col,
-  > li.last-col,
-  > div:last-of-type,
-  > li:last-of-type {
-    border-right: 0;
-    padding-right: 0;
-  }
-  > div:first-child,
-  > li:first-child,
-  > div.first-col,
-  > li.first-col,
-  > div:first-of-type,
-  > li:first-of-type {
-    padding-left: 0;
-  }
-}
-
-.vertical-divider-full {
-	padding-bottom: 0;
-	
-	> div {
-		padding-bottom: 40px;
-	}
-}
-
-.row.vertical-divider-full {
-	padding-bottom: 0;
-}
-
-div.warning {
-  @include rounded_corners(4px);
-    background-color: #fdffdc;
-    color: #333;
-    
-  p {
-    padding: $gutter_width;
-    margin: 0;
-  }
-}
-
-.row-box.row-image-centered {
-  display: table;
-	padding-top: 20px;
-	padding-bottom: 20px;
-}
-
-.row.row-image-centered {
-  display: table;
-  padding-top: 40px;
-	padding-bottom: 40px;
-}
-
-.row-hero.row-image-centered {
-		padding-top: 0;
-}
-
-div.box-image-centered {
-	width: 100%;
-	clear: both;
-	position: relative;
-}
-
-div.row-image-centered, 
-div.box-image-centered {
-	@include box_sizing;
-	padding-top: 0;
-	display: table;
-	
-	div { 
-		float: none; 
-		display: table-cell; 
-		position: relative;
-		
-		p, h2, h3 {
-			display: block;
-			width: 100%;
-			float: left;
-		}
-	}
-
-	span {
-		display: table-cell;
-		text-align: center;
-		vertical-align: middle;
-		float: none;
-		position: relative;
-		top: 0;
-	}
-	span img {
-		padding-right: 20px; /* if image is on the left hand side */
-	}
-	div + span img { /* if image is on the right hand side */
-		padding-right: 0;
-		margin-right: -20px;
-	}
-}
-
-div.box-image-centered {
-	padding-top: 20px;
-}
-
-.yui3-tooltip-hidden {
-  display: none;
-}
-
-.yui3-tooltip-content {
-  @include box_shadow(0px 2px 8px hsla(0, 0%, 0%, .20));
-  position: relative;
-  max-width: 520px;
-  _width: 520px; /* IE6 */
-  -moz-border-radius: 4px;
-  -webkit-border-radius: 4px;
-  border-radius: 4px;
-  border: 1px solid $box_solid_grey;
-  color: $cool_grey;
-  background: url("/sites/ubuntu/latest/u/img/patterns/grey-textured-background.jpg") repeat scroll 0 0 transparent;
-  margin-top: -30px;
-}
-
-.yui3-tooltip .yui3-widget-bd {
-  padding: 20px;
-  width: 320px;
-}
-
-.yui3-tooltip .yui3-widget-bd * {
-  max-width: 100%;
-}
-
-.yui3-tooltip .yui3-widget-bd h5 {
-  margin-bottom: 10px;
-  font-size: 22px;
-  font-weight: 300;
-}
-.yui3-tooltip .yui3-widget-bd img {
-   float: left;
-   margin-right: 10px;
-}
-.yui3-tooltip .yui3-widget-bd q {
-  margin-top: 20px;
-  margin-bottom: 0;
-  padding: 10px 0;
-  display: block;
-  font-size: 13px;
-  border-top: 1px dotted $warm_grey;
-  border-bottom: 1px dotted $warm_grey;
-  font-style: italic;
-}
-
-.yui3-tooltip .yui3-widget-bd p:last-child {
-  margin-bottom: 0;
-}
-
-.yui3-tooltip .yui3-widget-ft,
-.yui3-tooltip .yui3-widget-ft div {
-  *display: none; /* IE6, IE7 */
-  position: absolute;
-  width: 0;
-  height: 0;
-  border-style: solid;
-  line-height: 0;
-  font-size: 0;
-}
-
-.yui3-tooltip .yui3-tooltip-align-bottom .yui3-widget-ft,
-.yui3-tooltip .yui3-tooltip-align-bottom .yui3-widget-ft div {
-  top: -10px;
-  left: 50%;
-  margin: 0 0 0 -10px;
-  border-width: 0 10px 10px 10px;
-  border-color: $box_solid_grey transparent;
-}
-
-.yui3-tooltip .yui3-tooltip-align-bottom .yui3-widget-ft div {
-  top: 0;
-  border-color: $box_solid_grey transparent;
-}
-
-.tooltip-label {
-  @include rounded_corners(4px);
-  @include box_shadow(3px 3px 6px rgba(0, 0, 0, 0.3));
-  display:none;
-  background: #fff;
-  padding: 6px 5px;
-  border: 1px solid #DFDCD9;
-  position:absolute;
-  top: -20px;
-  z-index: 1000;
-  font-size: 13px;
-  line-height: 1;
-  white-space: nowrap; 
-  margin: 0;
-}
-
-/* share this */
-.share-this {
-  margin-top: 10px;
-  float: left;
-}
-
-#box-search {
-	float: right;
-	margin-bottom: 0;
-	padding-bottom: 5px;
-	padding-top: 7px;
-	border-right: 0;
-  padding-right: 0;
-	
-	form input[type="text"] {
-	  @include rounded_corners(6px);
-	  @include font_size (13);
-    width: 86px;
-    height: 24px;
-    border-bottom: 1px solid #de6532;
-    border-left: 0;
-    border-right: 0;
-    border-top: 0;
-    margin-bottom: 0;
-    background:  #be3d00;
-    background: url("/sites/ubuntu/latest/u/img/icons/icon-search.png") no-repeat scroll 5px center, none repeat scroll 0 0 #BE3D00;
-      -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.4);
-      -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.4);
-    box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.4);
-      -moz-transition: all .5s;
-      -webkit-transition: all .5s;
-    transition: all .5s;
-    -webkit-appearance: none;
-    padding-left: 30px;
-    color: #fff;
-  }
-  
-  form input[type="text"]:focus {
-    width: 160px;
-    background:#a63603;
-    background: url("/sites/ubuntu/latest/u/img/icons/icon-search.png") no-repeat 5px center,#a63603;
-  }
-  
-  form button {
-    display: none;
-  }
-}
-
-.lt-ie8 {
-	#box-search {
-		margin-right: 0;
-		padding-top: 9px;
-	}
-
-	body #box-search form .form-text {
-		width: 158px !important;
-	}
-}
-
-/*
-* 
-* Popover styles
-* 
-* Example:
-* <a tooltip="&lt;h5&gt;Ubuntu&lt;/h5&gt;&lt;p&gt;About Ubuntu.&lt;/p&gt;" tooltip:alignment="bottom" href="#">Ubuntu</a> 
-* 
-*/
-
-.yui3-tooltip-hidden {
-  display: none;
-}
-.yui3-tooltip-content {
-  @include box_shadow(0px 2px 8px hsla(0, 0%, 0%, .20));
-  position: relative;
-  max-width: 520px;
-  _width: 520px; /* IE6 */
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-  border-radius: 4px;
-  border: 1px solid #e3e3e3;
-  color: #333;
-  background: $light_grey; /* Fallback */
-}
-.yui3-tooltip .yui3-widget-bd {
-  padding: 20px;
-}
-.yui3-tooltip .yui3-widget-bd * {
-  max-width: 100%;
-}
-.yui3-tooltip .yui3-widget-bd h5 {
-  margin-bottom: 10px;
-  font-size: 22px;
-  font-weight: 300;
-}
-.yui3-tooltip .yui3-widget-bd q {
-  margin-top: 20px;
-  margin-bottom: 0;
-  padding: 10px 0;
-  display: block;
-  font-size: 16px;
-  border-top: 1px dotted $warm_grey;
-  border-bottom: 1px dotted $warm_grey;
-  font-style: italic;
-}
-.yui3-tooltip .yui3-widget-bd p:last-child {
-  margin-bottom: 0;
-}
-.yui3-tooltip .yui3-widget-ft,
-.yui3-tooltip .yui3-widget-ft div {
-  *display: none; /* IE6, IE7 */
-  position: absolute;
-  width: 0;
-  height: 0;
-  border-style: solid;
-  line-height: 0;
-  font-size: 0;
-}
-.yui3-tooltip .yui3-tooltip-align-bottom .yui3-widget-ft,
-.yui3-tooltip .yui3-tooltip-align-bottom .yui3-widget-ft div {
-  top: -10px;
-  left: 50%;
-  margin: 0 0 0 -10px;
-  border-width: 0 10px 10px 10px;
-  border-color: #e3e3e3 transparent;
-}
-.yui3-tooltip .yui3-tooltip-align-bottom .yui3-widget-ft div {
-  top: 1px;
-  border-color: $light_grey transparent;
-}
-
-
-/*  @section ie7 specific 
--------------------------------------------------------------- */
-html.lt-ie8 {
-  footer.global .footer-a ul li {
-    float: left;
-    min-height: 200px;
-  }
-  footer.global .footer-a ul ul li  {
-    min-height: auto;
-    float: none;
-  }
-}
-
-html.lt-ie8 {
-  .vertical-divider > div,
-  .vertical-divider > li {
-    display: inline;
-    float: left;
-    border: 0;
-    padding-left: 0;
-  }
-
-  * { zoom: 1; }
-  
-  .one-col { width: 6.3053%; }
-  .two-col { width: 14.823%; }
-  .three-col { width: 23.3407%; }
-  .four-col { width: 28%; }
-  .five-col { width: 40.3761%; }
-  .six-col { width: 48.8938%; }
-  .seven-col { width: 57.4115%; }
-  .eight-col { width: 65.9292%; }
-  .nine-col { width: 74.4469%; }
-  .ten-col { width: 82.9646%; }
-  .eleven-col { width: 91.4823%; }
-  
-  .inline-icons {
-    margin-left: -10px;
-  }
-  .inline-icons li { 
-    display: inline; 
-    float: left;
-    text-align: center;
-    margin-left: 10px;
-  }
-  
-  .box-padded-feature .six-col {
-    width: px;
-  }
-  
-  .feature-list-four .six-col {
-    width: 42.8%;
-  }
-  
-  header.banner {
-    margin-bottom: 20px;
-  }
-  
-  .nav-secondary {
-    padding-bottom: 15px;
-    padding-left: 20px;
-    margin-top: -5px;
-  }
-
-  .row-box { overflow: hidden; }
-  
-  a.link-cta-ubuntu { color: #fff; }
-  
-  .wrapper { 
-    overflow: hidden; 
-    border: 1px solid #e9e9e9; /* to make up for the lack of box-shadow */
-    border-width: 0 1px;
-  }
-  
-  .inner-wrapper { 
-    border-bottom: 1px solid #c7c6c5; /* to make up for the lack of box-shadow */
-    padding-bottom: $gutter_width;
-    width: 984px;
-  }
-  
-  header.banner .logo-ubuntu {
-    background: url("/sites/ubuntu/latest/u/img/ie/logo.gif") no-repeat;
-    width: 140px;
-    height: 27px;
-    display: block;
-    text-indent: -999em;
-    top: 8px;
-    left: 20px;
-  }
-  
-  #box-search {
-    float: none;
-    position: relative;
-    right: 0;
-    top: 0;
-  }
-  
-  #box-search input.form-text {
-    background: #f12d00;
-    border: 1px solid #ce2600 !important;
-    width: 140px !important;
-    right: -10px;
-    top: -2px;
-    position: relative;
-  } 
-    
-  footer { 
-    margin-top: 40px;
-  }
-  
-  footer.global .footer-a ul li {
-    width: 120px;
-    display: inline;
-    height: 15em;
-    padding-left: 0;
-  }
-  
-  footer.global .footer-a ul li li {
-    height: auto; 
-  } 
-  
-  footer.global .footer-b ul li li {
-    padding-right: 6px;
-  }
-
-  /* homepage */
-  body.homepage .box a.link-cta-download { color: #fff; }
-  
-  body.homepage header.banner .nav-secondary ul { background: none; }
-  
-  /* ubuntu */
-  .row-do-more { padding-left: 0; }
-  .row-do-more .six-col {
-    display: inline;
-      width: $six_col/* - ($gutter_width / 2)*/;
-  }
-  
-  .quote-right-top { 
-    background: none; 
-    top: 0;
-    padding: 0;
-  }
-    
-  .quote-right-top p { color: $ubuntu_orange; }
-
-  .ubuntu-why-use-ubuntu .quote-right-right {
-    position: absolute;
-    left: -999em;
-  }
-  
-  .ubuntu-why-use-ubuntu .row-free .article  .quote-right-alt {
-      height: 207px;
-      top: -($gutter_width * 3.1);
-      padding-top: 20px;
-  }
-  
-  body.ubuntu-why-is-it-free .quote-right {
-    background: none;
-    top: -($gutter_width * 3);
-    right:  -( 2 * $gutter_width );   
-    width: 220px;
-  }
-  
-  body.ubuntu-why-is-it-free .quote-right p { color: $ubuntu_orange; }
-  
-  /* business */
-  body.business .row-hero p.strip {
-    background: none;
-  }
-  body.business .row-hero-business, body.business-desktop-remix .row-hero {
-      left: 18px;
-  }
-  
-  .row-ubuntu-advantage li {
-    width: 46.6938%;
-  }
-
-  body.business-desktop .row-ubuntu-advantage li.first {
-    height: 32.25em;
-  }
-  
-  body.business-desktop .packages h2 {
-      padding: 50px 47px 50px 140px;
-  }
-
-  body.business-desktop .packages dl {
-    width: 175px;
-  }
-  
-  body.business .row-enterprise .six-col {
-    overflow: hidden;
-  }
-
-  body.business .row-enterprise .quote-canonical {
-      background: #fff;
-    height: auto;
-    margin-top: $gutter_width;
-      padding-bottom: 0;
-  }
-  
-  body.business .row-community {
-    padding-bottom: $gutter_width;
-  }
-    
-  body.business .row-community .nine-col {
-      padding-left: $three_col;
-      width: $nine_col - $four_col;
-  }
-  
-  /* cloud */
-  .row-cloud-guest .eight-col, 
-  .row-consultancy .eight-col {
-    border-right: 1px solid $warm_grey;
-    width: $eight_col/* - ( 4 * $gutter_width)*/;
-  } 
-  
-  .row-providers .six-col {
-    width: $six_col/* - ( 2 * $gutter_width)*/;
-  }
-  
-  /*  @subsection download > desktop/server & cloud
-  -------------------------------------------------------------- */
-  body.download .row-hero {
-    width: 100% - (20/$base);
-  }
-  
-  body.download .row-hero .intro { 
-    padding-right: 0; 
-    width: $six_col/* - (200/$base)/*/; 
-  }
-  
-  body.download .row-hero .intro p { 
-    padding-right: 20px; 
-  }
-  
-  #download-help {
-    background: $light_grey;
-    width: $eight_col/* - ( 8 * $gutter_width )/*/;
-  }
-  
-  #download-help li span {
-      margin-left: -(180/36)em;
-      overflow: hidden;
-      position: absolute;
-  }
-  
-  /* min-height fixes */
-  footer nav ul li.two-col { height: 10em; }
-  body.download .row-hero .intro { height: 10em; }
-  
-  .one-col, .two-col, .three-col, .four-col, .five-col, .six-col, .seven-col, .eight-col, .nine-col, .ten-col, .eleven-col, .twelve-col {
-    display: inline;
-  }
-    
-  body.project .equal-height .box, body.support .equal-height .box { background: #fff; }
-  body.partners .box { border: none; }
-
-  .row {
-    width: 904px;
-    float: left;
-    padding-left: 40px;
-    clear: both;
-    }
-  
-  .row-box {
-    width: 904px;
-    float: left;
-    margin-left: 20px;
-    clear: both;
-  }
-  
-  .row-image-centered span img {
-    position: absolute;
-    left: -999em;
-  }
-  
-  body.devices-phone {
-    .row-interlinks .navigation li a {
-      padding-bottom: 0px;
-    }
-    .edge-magic-content {
-      margin-left: -20px;
-      margin-right: -20px;
-      padding-left: 20px;
-      padding-right: 20px;
-    }
-    .meet-us {
-      border: 0;
-      background: #ececec url("/sites/ubuntu/latest/u/img/patterns/grey-textured-background.jpg");
-    }
-  }
-  
-  .ubuntu .box-get-ubuntu {
-    div {
-      height: 210px;
-    }
-    li {
-      width: 24.5%;
-    }
-  }
-  
-  body.community-stay-connected {
-    
-    .social-list li {
-      width: 100%;
-    }
-    
-  }
-  
-  /* body.download */
-  body.download button {
-    cursor: pointer;
-  }
-  
-  body.download-home .row-list-download .four-col {
-    width: 27.2%;
-  }
-
-  body.download #download-other .box {
-    min-height: 200px;
-    width: 41.3221%;
-  }
-  
-  .download-cloud #download-other .cloud { 
-    background-image: none; 
-  }
-  
-  body.download-cloud #download-other .cloud .box {
-    margin-bottom: 0;
-    width: 64.4%;
-  }
-
-  body.download-help #download-help {
-    width: 600px;
-  }
-  body.download-help .sidebar {
-    width: 280px;
-    display: inline;
-  }
-  
-  body.download-arm .link-cta-ubuntu {
-    width: 100%;
-  }
-  
-  /* body.devices */
-  body.devices {
-    .edge-magic-animation .screen { 
-      background: url("/sites/ubuntu/latest/u/img/devices/phone-3-edge-magic-twitter.png") no-repeat;
-      z-index: 999;
-    }
-  }
-  
-  #context-footer div div {
-    background: none;
-    display: inline;
-    float: left;
-    padding-left: 0;
-    width: 199px;
-  }
-  
-  /* body.business */
-  body.business .row-hero-business {
-    margin-left: 2px;
-  }
-    
-} /* end html.lt-ie8 */
-
-/*  @section ie6 specific 
--------------------------------------------------------------- */
-html.lt-ie7 {
-
-  font-size: 16px;
-  
-  a.link-cta-ubuntu { color: #fff; }
-
-  div { zoom: 1; } /* stops the shit hitting the fan */
-  
-  .wrapper { 
-    overflow: hidden; 
-    border: 1px solid #e9e9e9; /* to make up for the lack of box-shadow */
-    border-width: 1px;
-  }
-  
-  .inner-wrapper {
-    border: 0;
-    padding: 0;
-  }
-    
-  header.banner .logo-ubuntu {
-    background: url("/sites/ubuntu/latest/u/img/ie/logo.gif") no-repeat;
-      width: 140px;
-      height: 27px;
-      display: block;
-      text-indent: -999em;
-      top: 8px;
-      left: 20px;
-  }
-  
-  #box-search {
-    float: none;
-    position: relative;
-    right: 0;
-    top: 0;
-  }
-  
-  #box-search input.form-text {
-    background: #f12d00;
-    border: 1px solid #ce2600 !important;
-    width: 150px !important;
-    right: -10px;
-    top: 2px;
-    position: relative;
-  } 
-  
-  #context-footer div div {
-    background: none;
-    display: inline;
-    float: left;
-    width: 200px;
-  }
-
-  .no-border { border: 0 !important; }
-  
-  .nav-secondary {
-    padding-bottom: 15px;
-    margin-top: -5px;
-  }
-   
-  footer { 
-    margin-top: 40px;
-  }
-  
-  footer.global .footer-a ul li {
-    width: 100px;
-    display: inline;
-    height: 15em;
-  }
-  
-  footer.global .footer-a ul li li {
-    height: auto; 
-  } 
-  
-  footer.global .footer-b ul li li {
-    padding-right: 6px;
-  }
-  
-  /* homepage */
-  body.homepage .box a.link-cta-download { color: #fff; }
-  
-  body.homepage header.banner .nav-secondary ul { background: none; }
-  
-  /* ubuntu */
-  .row-do-more .six-col {
-    display: inline;
-      width: $six_col/* - ($gutter_width / 2)*/;
-  }
-  
-  .quote-right-top { 
-    background: none; 
-    top: 0;
-    padding: 0;
-  }
-    
-  .quote-right-top p { color: $ubuntu_orange; }
-
-  .ubuntu-why-use-ubuntu .quote-right-right {
-    position: absolute;
-    left: -999em;
-  }
-  
-  .ubuntu-why-use-ubuntu .row-free .article  .quote-right-alt {
-      height: 207px;
-      top: -($gutter_width * 3.1);
-      padding-top: 20px;
-  }
-  
-  body.ubuntu-why-is-it-free .quote-right {
-    background: none;
-    top: -($gutter_width * 3);
-    right:  -( 2 * $gutter_width );   
-    width: 220px;
-  }
-  
-  body.ubuntu-why-is-it-free .quote-right p { color: $ubuntu_orange; }
-  
-  /* business */
-  body.business .row-hero-business, body.business-desktop-remix .row-hero, .row-ubuntu-advantage {
-      left: 18px;
-  }
-  
-  body.business .row-enterprise .six-col {
-    overflow: hidden;
-  }
-
-  body.business .row-enterprise .quote-canonical {
-      background: #fff;
-    height: 0;
-    margin-top: $gutter_width;
-      padding-bottom: 0;
-  }
-  
-  body.business .row-community {
-    padding-bottom: $gutter_width;
-  }
-    
-  body.business .row-community .nine-col {
-      padding-left: $three_col;
-      width: $nine_col - $four_col;
-  }
-  
-  /* cloud */
-  .row-cloud-guest .eight-col, 
-  .row-consultancy .eight-col {
-    border-right: 1px solid $warm_grey;
-    width: $eight_col/* - ( 4 * $gutter_width)*/;
-  } 
-  
-  .row-providers .six-col {
-    width: $six_col/* - ( 2 * $gutter_width)*/;
-  }
-  
-  /*  @subsection download > desktop/server & cloud
-  -------------------------------------------------------------- */
-  body.download .row-hero {
-    width: 100% - (20/$base);
-  }
-  
-  body.download .row-hero .intro { 
-    padding-right: 0; 
-    width: $six_col - (200/$base); 
-  }
-  
-  body.download .row-hero .intro p { 
-    padding-right: 20px; 
-  }
-  
-  #download-help {
-    background: $light_grey;
-    width: $eight_col/* - ( 8 * $gutter_width )*/;
-  }
-  
-  #download-help li span {
-      margin-left: -(180/36)em;
-      overflow: hidden;
-      position: absolute;
-  }
-  
-  /* cloud */
-  .row-home .intro {
-    background: none;
-    padding: 0 19px $gutter_width 0;
-    width: $eight_col;
-  } 
-  .row-home .box-openstack-cloud {
-    background: none;
-    padding-top: 0;
-  }
-  .row-menu h3 {
-    display: block;
-    float: left;
-    clear: both;
-    width: $three_col/* - ( 1.5 * $gutter_width)*/;
-    margin-bottom: 0;
-  }
-  .row-features .list-features-content li .list-feature-footer {
-    bottom: -90px;
-    margin-left: -30px;
-    width: 673px;
-  }
-  .nav-list-features li {
-    margin-top: 13px;
-  }
-  .row-cloud-services div { 
-    padding-right: 0;
-    width: $three_col/* + (2 * $gutter_width)*/;
-  }
-  
-  /* min-height fixes */
-  footer nav ul li.two-col { height: 10em; }
-  body.download .row-hero .intro { height: 10em; }
-  
-} /* end html.lt-ie7 */
-
diff --git a/templates/static/css/core-print.css b/templates/static/css/core-print.css
deleted file mode 100644
index bd4569d43a9..00000000000
--- a/templates/static/css/core-print.css
+++ /dev/null
@@ -1 +0,0 @@
-@charset "UTF-8";*{background:#fff;color:#000}body{background:#fff;font-size:16pt;line-height:1.5}a:link,a:visited{color:#898989;background:transparent;font-weight:bold;text-decoration:underline}#box-search,.cookie-policy,.link-top,footer,nav{display:none}.wrapper{width:auto;margin:0 5%;padding:0;padding-top:1em;float:none !important}
\ No newline at end of file
diff --git a/templates/static/css/core-reset.scss b/templates/static/css/core-reset.scss
deleted file mode 100644
index e34fc7b6782..00000000000
--- a/templates/static/css/core-reset.scss
+++ /dev/null
@@ -1,196 +0,0 @@
-@charset "UTF-8";
-/**
- * Ubuntu Core Front-End Framework
- *
- * Reset CSS file part of the Ubuntu Core Framework
- * 
- * @project		Ubuntu Core Front-End Framework
- * @author		Web Team at Canonical Ltd
- * @copyright	2012 Canonical Ltd
- */
-
-/**
- * Reset
- *
- * Resets and default styles for all simple elements
- *
- * @section defaults
- * @see		http://meyerweb.com/eric/tools/css/reset/
- * @see		http://developer.yahoo.com/yui/3/cssreset/
- * @see		http://necolas.github.com/normalize.css/
- */
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, ol, ul, li,
-form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed, 
-figure, figcaption, footer, header, hgroup, 
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	vertical-align: baseline;
-}
-article, aside, details, figcaption, figure,
-footer, header, hgroup, nav, section { /** Corrects block level element display in older browsers. */
-    display: block;
-}
-audio, canvas, video { /** Corrects inline-block level element display in older browsers. */
-    display: inline-block;
-    *display: inline;
-    *zoom: 1;
-}
-audio:not([controls]) { /** Prevents modern browsers from displaying 'audio' without controls. */
-    display: none;
-}
-[hidden] { /** Styling for 'hidden' attribute not present in IE7/8/9, FF3, S4. */
-    display: none; 
-}
-html {
-    font-size: 100%; /** HACK_IE_LTE_7: Corrects text resizing oddly in IE6/7 when body font-size is set using em units. @see http://clagnut.com/blog/348/#c790 */
-    overflow-y: scroll;
-    -webkit-text-size-adjust: 100%; /** HACK_IOS: Prevents text size adjust after orientation change, without disabling user zoom. @see www.456bereastreet.com/archive/201012/controlling_text_size_in_safari_for_ios_without_disabling_user_zoom/ */
-    -ms-text-size-adjust: 100%;
-}
-body {
-	background: #fff url(http://www.ubuntu.com/sites/all/themes/ubuntu10/images/bg_dotted.png);
-	color: #333;
-	font-family: Ubuntu, Arial, "libra sans", sans-serif;
-	font-weight: 300;
-	/*line-height: 1;*/
-		-webkit-font-smoothing: antialiased;
-		-moz-font-smoothing: antialiased;
-		-o-font-smoothing: antialiased;
-	font-smoothing: antialiased;
-}
-a:focus {
-    outline: thin dotted;
-}
-a:hover,
-a:active {
-    outline: 0;
-}
-ol, ul {
-	margin-left: 20px;
-	margin-bottom: 1.538em;
-}
-nav ul,
-nav ol {
-    list-style: none;
-    list-style-image: none;
-}
-blockquote, q {
-	quotes: none;
-}
-blockquote {
-	margin: 28px 20px;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
-	content: "";
-	content: none;
-}
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}
-legend {
-    border: 0; /** HACK_IE_LTE_9: Corrects color not being inherited in IE6/7/8/9. */
-    *margin-left: -7px; /* HACK_IE_LTE_7: Corrects alignment displayed oddly in IE6/7. */
-}
-figure {
-    margin: 0;
-}
-svg:not(:root) { /** HACK_IE_9: Corrects overflow displayed oddly in IE 9. */
-    overflow: hidden;
-}
-img {
-    border: 0;
-}
-abbr[title] {
-	border-bottom: 1px dotted;
-	cursor: help;
-}
-button,
-input,
-select,
-textarea {
-    /*font-size: 100%;*/ /** Corrects font size not being inherited in all browsers. */
-    margin: 0; /** Addresses margins set differently in IE6/7, FF3+, S5, Chrome. */
-    vertical-align: baseline; /** Improves appearance and consistency in all browsers. */
-    *vertical-align: middle;
-}
-button,
-input {
-    line-height: normal; /** HACK_FF_3_4: setting line-height on 'input' using !important in the UA stylesheet. */
-}
-button,
-input[type="button"], 
-input[type="reset"], 
-input[type="submit"] {
-    cursor: pointer; /** Improves usability and consistency of cursor style between image-type 'input' and others. */
-    -webkit-appearance: button; /** HACK_IOS: Corrects inability to style clickable 'input' types. */
-    *overflow: visible;  /** HACK_IE_7: Removes inner spacing without affecting normal text inputs. Known issue: inner spacing remains in IE6. */
-}
-input[type="checkbox"],
-input[type="radio"] {
-    box-sizing: border-box; /** HACK_IE_8_9: Addresses box sizing set to content-box in IE8/9. */
-    padding: 0; /** HACK_IE_8_9: Removes excess padding in IE8/9. */
-}
-input[type="search"] {
-    -webkit-appearance: textfield; /** Addresses appearance set to searchfield in S5, Chrome. */
-    -moz-box-sizing: content-box;
-    -webkit-box-sizing: content-box; /** Addresses box-sizing set to border-box in S5, Chrome. */
-    box-sizing: content-box;
-}
-input[type="search"]::-webkit-search-decoration { /** Removes inner padding that is displayed in S5, Chrome on OS X. */
-    -webkit-appearance: none;
-}
-button::-moz-focus-inner,
-input::-moz-focus-inner { /** HACK_FF_GTE_3: Removes inner padding and border in FF3+. */
-    border: 0;
-    padding: 0;
-}
-textarea {
-    overflow: auto; /** HACK_IE_LTE-_9: Removes default vertical scrollbar in IE6/7/8/9. */
-    vertical-align: top; /** Improves readability and alignment in all browsers. */
-}
-ins {
-	background: #fffbeb;
-	text-decoration: none;
-}
-small {
-    font-size: 75%;
-}
-sub,
-sup { /** Prevents sub and sup affecting line-height in all browsers. @see gist.github.com/413930 */
-    font-size: 75%;
-    line-height: 0;
-    position: relative;
-    vertical-align: baseline;
-}
-sup {
-	vertical-align: text-top;
-}
-sub {
-	vertical-align: text-bottom;
-}
-dfn {
-    font-style: italic;
-}
-mark {
-    background: #ff0;
-    color: #000;
-}
-pre {
-    white-space: pre;
-    white-space: pre-wrap;
-    word-wrap: break-word;
-}
\ No newline at end of file
diff --git a/templates/static/css/core-templates.scss b/templates/static/css/core-templates.scss
deleted file mode 100644
index 252d109945b..00000000000
--- a/templates/static/css/core-templates.scss
+++ /dev/null
@@ -1,181 +0,0 @@
-@charset "UTF-8";
-/**
- * Ubuntu Super Patterns Stylesheet
- *
- * Contains audience related themes for site-wide application
- * 
- * @project		Ubuntu Patterns
- * @author		Web Team at Canonical Ltd
- * @copyright	2012 Canonical Ltd
- *
- */
-
-/**
- * Audience specific
- * 
- * @section audience
- */
-
-/* Voice */
-.voice-community { }
-.voice-canonical { }
-.voice-community.voice-canonical { }
-
-/* 
- * Consumer 
- */
-
-.audience-consumer{
-  color: $cool_grey;
-  
-  .row-box, .main-content {
-    color: $cool_grey;
-  } 
-  
-  .inner-wrapper {
-    background: #fff;
-  }
-  
-  .quote-right-top {
-    padding: 60px 60px 0 40px;
-    background: url("/sites/ubuntu/latest/u/img/patterns/quote-orange-br-287x287.png") no-repeat;
-    height: 287px; 
-    position: absolute;
-    right:  -($gutter_width * 2);
-    text-align: left;
-    top: -($gutter_width * 4.5);
-    width: $four_col;
-    
-    p {
-      @include font_size (16);
-      margin: (1.538em / 2);
-      padding-bottom: 0;
-      color: #fff;
-      
-      cite {
-        @include font_size (12);
-        color: #fff;
-        padding: 0;
-      }
-    }
-  }
-  .quote-right-top p a,
-  .quote-right p a { color: #fff; }
-  .quote-right {
-    @include font_size (18);
-    color: #fff;
-    padding: 50px 100px 0 50px;
-    text-indent: -6px;
-    background: url("/sites/ubuntu/latest/u/img/patterns/quote-orange-bl-287x287.png") no-repeat;
-    min-height: 287px; 
-    position: absolute;
-    right:  -$gutter_width;
-    text-align: left;
-    top: -($gutter_width * 4.5);
-    width: $four_col -(150/$base)em;
-    
-    cite {
-      font-style: normal;
-      margin-left: 6px;
-    }
-  }
-  .quote-right-alt {
-    background: url(/sites/ubuntu/latest/u/img/patterns/quote-white-br-360x360.png) 0 -100px no-repeat;
-    color: $ubuntu_orange;
-    padding: 50px 50px 0 50px;
-  }
-  .quote-right-right { background: url("/sites/ubuntu/latest/u/img/patterns/quote-orange-br-287x287.png") no-repeat; }
-}
-
-/* 
- * Enterprise
- */
-
-.audience-enterprise {
-
-  h1 { margin: 0 0 18px 0; }
-  td{ background: #fff; }
-  
-  th, td {
-    padding: 6px 10px;
-    background: #fff;
-  }
-  th[scope="col"] {
-    background: #E2D4DC;
-    color: $canonical_aubergine;
-  }
-  tbody th[rowspan] { background: #F7F2F6; }
-  tfoot th[rowspan] { background: #dfdcd9; }
-  tfoot td, tfoot th {
-    font-weight: normal;
-    background: #dfdcd9;   
-  }
-  .inner-wrapper {
-    background: $dark_aubergine;
-	  color: #fff;
-	}
-	.row-box {
-    background: #fff;
-    color: $cool_grey;
-  }
-  /*.row-quote { 
-    background: none repeat scroll 0 0 #E2D4DC;
-    color: #772953;
-    margin-left: -1.125em;
-    padding-top: 1.25em;
-    width: 58.75em;
-  }
-  .row-quote blockquote,
-  .row-quote blockquote p {
-    color: inherit;
-    font-size: 1.313em;
-    margin: 0 0.563em;
-    padding: 0;
-    top: auto;
-    width: auto;
-  }
-  .row-quote blockquote p {
-    line-height: 1.3;
-    text-indent: -12px;
-  }
-  .row-quote blockquote cite {
-    @include font_size (12);
-    color: #656565;
-    font-style: normal;
-    margin-left: 12px;
-    text-indent: 0;
-  }*/
-}
-
-.row-enterprise {
-  background: $canonical_aubergine;
-  color:#fff;
-  @include rounded_corners(0);
-  
-  .box, div {
-    background: $canonical_aubergine;
-    color:#fff;
-  }
-  a {
-    color:#fff; 
-  }
-}
-/*
-.audience-consumer.audience-enterprise{
-  
-  .inner-wrapper {
-    background: $mid_aubergine;
-    color: #fff;
-  }
-  
-  .row-box,
-  .main-content {
-    background: #fff;
-    color: $cool_grey;
-  }
-  
-}
-*/
-
-.enterprise-dot-pattern { background:url('/sites/ubuntu/latest/u/img/patterns/enterprise-dot-pattern.png') }
-.developer-dot-pattern { background:url('/sites/ubuntu/latest/u/img/patterns/developer-dot-pattern.png') }
\ No newline at end of file
diff --git a/templates/static/css/core.scss b/templates/static/css/core.scss
deleted file mode 100644
index 3711e8cf162..00000000000
--- a/templates/static/css/core.scss
+++ /dev/null
@@ -1,484 +0,0 @@
-@charset "UTF-8";
-/**
- * Ubuntu Core Front-End Framework
- *
- * Main CSS file part of the Ubuntu Core Front-End Framework
- * 
- * @project		Ubuntu Core Front-End Framework
- * @author		Web Team at Canonical Ltd
- * @copyright	2012 Canonical Ltd
- *
- * @colordef	$cool_grey (#333); main text
- * @colordef	$ubuntu_orange (#dd4814); Ubuntu orange
- */
-
-/**
- * Dependencies
- *
- * Importing reset file: core-reset.css
- * Importing grid file: core-grid.css
- */
-
-/**
- * Font sizes
- * 
- * 45px
- * 32px
- * 23px
- * 19.5px
- * 16px - bold
- * 13px - bold - uppercase
- */
- 
-/**
- * Table of contents
- * General
- * Links
- * Lists
- * Images
- * Base typography
- * Global elements
- * Forms
- * Tables
- */
- 
-/**
- * General
- *
- * @section links
- */
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, ol, ul, li,
-form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed, 
-figure, figcaption, footer, header, hgroup, 
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  vertical-align: baseline;
-}
-
-article, aside, details, figcaption, figure,
-footer, header, hgroup, nav, section {
-    display: block;
-}
-
-audio, canvas, video {
-    display: inline-block;
-    *display: inline;
-    *zoom: 1;
-}
-
-audio:not([controls]) { 
-    display: none;
-}
-
-[hidden] {
-    display: none; 
-}
-
-html {
-    font-size: 100%; 
-    overflow-y: scroll;
-    -webkit-text-size-adjust: 100%; 
-    -ms-text-size-adjust: 100%;
-}
-
-body {
-  background: #fff url("/sites/ubuntu/latest/u/img/patterns/body_bg.jpg");
-  color: #333;
-  font-family: Ubuntu, Arial, "libra sans", sans-serif;
-  font-weight: 300;
-}
-
-blockquote, q {
-  quotes: none;
-}
-
-blockquote {
-  margin: 28px 20px;
-}
-
-blockquote:before, blockquote:after,
-q:before, q:after {
-  content: "";
-  content: none;
-}
-
-legend {
-    border: 0;
-    *margin-left: -7px;
-}
-figure {
-    margin: 0;
-}
-
-abbr, acronym { cursor: help; }
-  
-/**
- * Links
- *
- * @section links
- */
-
-a:focus {
-    outline: thin dotted;
-}
-a:hover,
-a:active {
-    outline: 0;
-}
-
-a:link, a:visited {
-	color: $link_color;
-	text-decoration: none;
-}
-
-a:hover, a:active, a:focus {
-	text-decoration: underline;
-}
-
-a.link-arrow:after { content: "\0000a0›"; }
-nav ul li h2 a:after { content: "\0000a0›"; }
-nav ul li a:after, .carousel ul li a:after, ul li p a:after { content: ""; }
-
-/**
- * Lists
- * 
- * @section lists
- */
-
-ol, ul {
-  margin-left: 20px;
-  margin-bottom: 20px;
-}
-ol ol, ul ul, ol ul, ul ol {
-  margin-bottom: 0;
-}
-
-nav ul,
-nav ol {
-    list-style: none;
-    list-style-image: none;
-}
-
-/**
- * Images
- * 
- * @section images
- */
-
-svg:not(:root) {
-    overflow: hidden;
-}
-
-img {
-    border: 0;
-}
-
-img.left { margin-right: $gutter_width; }
-img.right { margin-left: $gutter_width; }
-
-.middle img {
-  vertical-align: middle;
-  margin-top: 4em;
-}
-
-/**
- * Base typography
- *
- * @section type
- */
- 
-h1, h2, h3, h4 { 
-	font-weight: 300;
-	line-height: 1.3; 
-}
-
-h1 { @include font_size (45) } 
-h2 { @include font_size (32) } 
-
-h2 span, h1 span { display: block; }
-
-p + h2, ul + h2, ol + h2, pre + h2 { margin-top: (18 / 32)em; }
-
-header nav a:link { font-weight: normal; }
-
-h3 { @include font_size (23) } 
-
-p + h3, ul + h3, ol + h3, pre + h3 { margin-top: (18 / 23)em; }
-
-h4 { @include font_size (19.5) } 
-
-p + h4, ul + h4, ol + h4, , pre + h4 { margin-top: (19.5 / $base)em; }
-
-h5 { @include font_size (16); } 
-
-h6 { @include font_size (13); text-transform: uppercase; letter-spacing: .1em }
-
-p, li, code, pre { @include font_size(16); line-height: 1.6; margin-bottom: (12/$base)em; } 
-
-/* p + ol, p + dl { 
-  margin-top: 1.5em;
-  margin-bottom: 1.5em;
-  
-}*/
-
-li { margin-bottom: .4em; }
-
-li:last-of-type { margin-bottom: 0; }
-
-ins {
-  background: #fffbeb;
-  text-decoration: none;
-}
-small, .smaller { font-size: 13px; }
-
-sub,
-sup {
-    font-size: 75%;
-    line-height: 0;
-    position: relative;
-    vertical-align: baseline;
-}
-sup {
-  vertical-align: text-top;
-}
-sub {
-  vertical-align: text-bottom;
-}
-dfn {
-    font-style: italic;
-}
-mark {
-    background: #ff0;
-    color: #000;
-}
-
-code, pre {
-	font-family: "Ubuntu Mono", "Consolas", "Monaco", "Lucida Console", "Courier New", Courier, monospace;
-}
-
-pre {
-  @include rounded_corners(4px);
-  background: $light_orange;
-  padding: .6em 1em;
-  white-space: pre-wrap;
-  word-wrap: break-word;
-}
-
-hgroup > h1 + h2,
-hgroup > h2 + h3,
-hgroup > h3 + h4 {
-  color: $warm_grey;
-  margin-top: (10 / $base)em;
-}
-hgroup > h2 + h3 { margin-top: 0; }
-hgroup > h3 + h4 { margin-top: (5 / $base)em; }
-
-blockquote { margin: 0; }
-
-blockquote > p { 
-  @include font_size (13);
-  font-weight:100;
-  margin:0 0 .4em 0;
-}
-
-blockquote small {
-  font-size:.813em;
-  line-height:1.4;
-}
-
-/**
- * Forms
- *
- * Global form element styles
- *
- * @section forms
- */
-
-button,
-input,
-select,
-textarea {
-    margin: 0;
-    vertical-align: baseline;
-    *vertical-align: middle;
-}
-button,
-input {
-    line-height: normal;
-}
-button,
-input[type="button"], 
-input[type="reset"], 
-input[type="submit"] {
-    cursor: pointer; 
-    -webkit-appearance: button; 
-    *overflow: visible; 
-}
-input[type="checkbox"],
-input[type="radio"] {
-    box-sizing: border-box;
-    padding: 0; 
-}
-input[type="search"] {
-    -webkit-appearance: textfield;
-    -moz-box-sizing: content-box;
-    -webkit-box-sizing: content-box;
-    box-sizing: content-box;
-}
-input[type="search"]::-webkit-search-decoration {
-    -webkit-appearance: none;
-}
-button::-moz-focus-inner,
-input::-moz-focus-inner {
-    border: 0;
-    padding: 0;
-}
-textarea {
-    overflow: auto; 
-    vertical-align: top;
-}
-
-form fieldset {
-	@include rounded_corners(4px);
-	  background-repeat: no-repeat;
-    background-color: #EFEEEC;
-    background-position: -15px -15px;
-    border: 0;
-    margin-bottom: 8px;
-    padding: 15px 20px 15px 94px;
-}
-
-form fieldset h3 {
-    border-bottom: 1px dotted #dfdcd9;
-    margin-bottom: 9px;
-    padding-bottom: 10px;
-}
-
-form fieldset li:first-child { margin-top: 0; }
-
-form input[type="text"], form textarea {
-  @include rounded_corners(2px);
-    background: #fff;
-    border: 1px solid #999999;
-    font-family: Ubuntu, Arial, "libra sans", sans-serif;
-    display: block;
-    padding: 4px;
-}
-
-form input:focus, form textarea:focus {
-  border: 1px solid #000;
-}
-
-form textarea[readonly='readonly'] {
-  color: #999;
-}
-
-form input[type="checkbox"], form input[type="radio"] {
-    margin: 0;
-    width:auto;
-}
-
-form input[type="checkbox"] + label, 
-form input[type="radio"] + label{
-    display: inline;
-    margin-left: 5px;
-    vertical-align: middle;
-    width: auto;
-}
-
-form input[type="submit"] {
-  @include font_size (16);
-  @include rounded_corners(4px);
-    @include gradient(#f26120, $ubuntu_orange);
-    @include box_shadow(none);
-    border: 0;
-    color: #fff;
-    display: block;
-    padding: 10px 14px;
-    text-shadow: none;
-    width: auto;
-    margin-bottom: 0;
-}
-
-form input[type="submit"]:hover {
-  background: $ubuntu_orange;
-}
-
-form label {
-    cursor: pointer;
-    display: block;
-    margin-bottom: 4px;
-}
-form label span {
-  color: $error;
-}
-
-form ul { margin-left:0; }
-
-form li {
-    list-style: none outside none;
-    margin-top: 14px;
-}
-
-
-form button[type="submit"] {
-  border: 0;
-  display: inline-block;
-  font-family: Ubuntu, Arial, "libra sans", sans-serif;
-  text-decoration:none;
-	font-weight: 300;
-}
-
-form input[type="reset"] {
-  display: none;
-}
-
-/**
- * Tables
- *
- * @section tables
- */
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-  width: 100%;
-  margin: 0 0 (40/$base)em 0;
-  margin-bottom: $gutter_width;
-  
-  th, td {
-    padding: 15px 10px;
-    background: #f0edea;
-    border: 1px dotted $warm_grey;
-  }
-  td {
-    text-align: center;
-    vertical-align: middle;
-  }
-  
-  thead th {
-    border-collapse: separate;
-    border-spacing: 0 10px;
-    background: #fee3d2;
-    color: #333333;
-    font-weight: normal;
-  }
-  tbody th {
-    font-weight: 300;
-  }
-  th[scope="col"] {
-    text-align: center;
-  }
-  thead th:first-of-type { text-align: left; }
-}
\ No newline at end of file
diff --git a/templates/static/css/global.css b/templates/static/css/global.css
deleted file mode 100644
index 0bd6d26677e..00000000000
--- a/templates/static/css/global.css
+++ /dev/null
@@ -1,169 +0,0 @@
-@charset "UTF-8";
-body {
-  padding-top: 30px;
-}
-#nav-global {
-  background: #efefef;
-  width: 100%;
-  height: 30px;
-  line-height: 19.2px;
-  display: block;
-  z-index: 101;
-  position: relative;
-   -webkit-box-shadow: 0 2px 2px rgba(0,0,0,0.2);
-    -moz-box-shadow: 0 2px 2px rgba(0,0,0,0.2);
-  box-shadow: 0 2px 2px rgba(0,0,0,0.2);
-  margin-top: -30px;
-}
-#nav-global .nav-global-wrapper {
-    -moz-box-sizing: border-box;
-    background: none repeat scroll 0 0 #FFFFFF;
-    margin: 0 auto;
-    position: relative;
-    text-align: left;
-    width: 984px;
-}
-#nav-global.drop-shadow {
-	-webkit-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
-  -moz-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
-  box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
-}
-#nav-global div {
-  	background: #efefef;
-	box-shadow: none;
-	margin-top: 0;
-	margin-bottom: 0;
-
-}
-#nav-global ul {
-  margin-bottom: 0;
-  margin-left: 0;
-  top: 0;
-}
-#nav-global ul li {
-  float: left;
-  display: block;
-  text-align: left;
-  margin: 0;
-  height: 30px;
-  margin-top: -1px;
-  position: relative;
-  top: 0;
-}
-#nav-global ul ul {
-  display: none;
-  float: none;
-  background: #fff;
-  position: absolute;
-  min-width: 120px;
-  top: 30px;
-  border-top: 1px solid #d7d7d7;
-  -webkit-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.3);
-  -moz-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.3);
-  box-shadow: 0 2px 2px rgba(0, 0, 0, 0.3);
-}
-#nav-global ul ul a:link, #nav-global ul ul a:visited {
-  border-top: none;
-  float: none;
-}
-#nav-global ul ul li {
-  float: none;
-}
-#nav-global ul ul li:first-of-type {
-  padding-top: 5px;
-}
-#nav-global .more {
-  border-left: 1px solid transparent;
-  border-right: 1px solid transparent;
-  min-width: 60px;
-}
-#nav-global .more span {
-  display: block;
-  top: -10px;
-  left: 46px;
-  line-height: 19.2px;
-  height: 0;
-  position: relative;
-  -webkit-transform-origin: 0 0;
-  -moz-transform-origin: 0 0;
-  -ms-transform-origin: 0 0;
-  -o-transform-origin: 0 0;
-  -webkit-transform: rotate(90deg);
-  -moz-transform: rotate(90deg);
-  -ms-transform: rotate(90deg);
-  -o-transform: rotate(90deg);
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
-}
-#nav-global .open {
-  background: #fff;
-  min-width: 120px;
-  border-left: 1px solid #d7d7d7;
-  border-right: 1px solid #d7d7d7;
-}
-
-#nav-global a:link, #nav-global a:visited {
-  color: #333;
-  font-size: 12px;
-  font-weight: 300;
-  line-height: 1.6;
-  border-top: 3px solid transparent;
-  border-bottom: 0;
-  margin-right: 10px;
-  margin-left: 10px;
-  padding-top: 3px;
-  padding-bottom: 4px;
-  position: relative;
-  text-decoration: none;
-	  -moz-transition: opacity 0.25s ease-in-out;
-	  -webkit-transition: opacity 0.25s ease-in-out;
-  transition: opacity 0.25s ease-in-out;
-  display: block;
-  list-style-image: none;
-}
-#nav-global li:first-of-type a {
-	margin-left: 0;
-}
-#nav-global a.active {
-  color: #dd4814;
-  border-top: 3px solid #dd4814;
-  text-decoration: none;
-  opacity: 1;
-}
-#nav-global a:hover {
-  color: #dd4814;
-  text-decoration: none;
-}
-#nav-global:hover a {
-  opacity: 1;
-}
-#nav-global .open a:link,
-#nav-global .open a:visited,
-#nav-global .open span {
-	color: #dd4814;
-	opacity: 1;
-}
-#nav-global .open ul a:link,
-#nav-global .open ul a:visited{
-	color: #333;
-	opacity: 1;
-}
-
-#nav-global .open ul a:hover {
-	color: #dd4814;
-  	text-decoration: none;
-}
-
-#nav-global .open ul {
-  display: block;
-}
-#nav-global ul ul li:first-of-type a {
-	margin-left: 10px;
-}
-
-/*
- * Temp styles
- */
-
-.login-logout {
-	z-index: 5;
-}
\ No newline at end of file
diff --git a/templates/static/css/responsive.scss b/templates/static/css/responsive.scss
deleted file mode 100644
index f5d95df3ce0..00000000000
--- a/templates/static/css/responsive.scss
+++ /dev/null
@@ -1,112 +0,0 @@
-/* Smaller than standard 960 (devices and browsers) */
-@media only screen and (max-width: 959px) {
-  
-}
-
-/* Tablet Portrait size to standard 960 (devices and browsers) */
-@media only screen and (min-width: 768px) and (max-width: 959px) {
-  
-}
-
-/* All Mobile Sizes (devices and browser) */
-@media only screen and (max-width: 767px) {
-  
-}
-
-/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */
-@media only screen and (min-width: 480px) and (max-width: 767px) {
-  
-}
-
-
-
-/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */
-@media only screen and (max-width: 479px) {
-	body {
-		margin: 0;
-		padding: 0;
-	}
-	.wrapper { max-width: 65.333em;} /* 980px / 15px (baseline font); 980px + (60px x 2) = 1100px */	
-	.inner-wrapper { max-width: 100%; } /* 940px / 15px */
-	
-	.wrapper, .inner-wrapper, .row, .one-col, .two-col, .three-col, .four-col, .five-col, .six-col, .seven-col, .eight-col, .nine-col, .twelve-col {
-		clear: both;
-		display: block;
-		float: none;
-		height: auto;
-		margin: 0;
-		padding: 0;
-		width: 100%;
-	}
-	header {
-		background: $ubuntu_orange;
-		clear: both;
-		display: block;
-		height: auto;
-		margin: 0;
-		padding: 0;
-		position: relative;
-		width: 100%;
-	}
-	.logo-ubuntu {
-		background: $ubuntu_orange;
-		height: 60px;
-		display: block;
-		float: none;
-		position: relative;
-		top: auto;
-		left: 20px;
-		width: $five_col;
-	}
-	header .nav-secondary, header .nav-primary, header .nav-secondary ul, header .nav-primary ul {
-		clear: both;
-		display: block;
-		float: none;
-		margin: 0;
-		padding: 0;
-		position: relative;
-		height: auto;
-		width: 100%;
-		top: auto;
-	}
-	header .nav-primary ul {
-		background: $ubuntu_orange;
-	}
-	header .nav-secondary li, header .nav-primary li {
-		border-bottom: 1px solid #fff;
-		height: auto;
-		margin: 0;
-		padding: 0;
-		text-align: center;
-		width: 100%;
-	}
-	header .nav-primary li a:link, header .nav-primary li a:visited, header .nav-secondary li a:link, header .nav-secondary li a:visited {
-		border: 0;
-		height: auto;
-		margin: 0;
-		padding: 10px;
-		text-align: center;
-		width: 100%;
-	}
-	header .nav-primary li a:link, header .nav-primary li a:visited {
-		background: $ubuntu_orange;
-	}
-	.main-content {
-		padding: 0;
-	}
-	.box {
-		@include rounded_corners(0);
-		border-width: 1px 0 0;
-		padding: 20px 20px 0;
-	}
-	img { 
-		height: auto;
-		max-width: 100%; 
-	}	
-	div.row-image-centered img, 
-	div.box-image-centered img {
-		position: absolute;
-		left: -999em;
-	}
-
-}
diff --git a/templates/static/css/scratch.scss b/templates/static/css/scratch.scss
deleted file mode 100644
index 541d11d0f08..00000000000
--- a/templates/static/css/scratch.scss
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * This stylesheet is used to override the core styles until the monthly merge.
- * 
- * Please comment your changes to help documentation.
-
-  	CONTENTS:
-	-----------------------------------------------------------------
-
-*/
-
-@mixin vertical-align {
-  position: relative;
-  top: 50%;
-  -webkit-transform: translateY(-50%);
-  -ms-transform: translateY(-50%);
-  transform: translateY(-50%);
-}
-
-/*
- * 7 June 2013
- * Remove blue glow on search focus.
- * file: core-pattern
- * line: 1456
- */
-
-#box-search form input[type="text"] {
-  outline: none;
-}
-
-
-div.warning {
-    background-color: #fdffdc;
-    color: #333;
-    
-  p {
-    padding: 0;
-    margin: inherit;
-  }
-}
\ No newline at end of file
diff --git a/templates/static/css/section/cloud.scss b/templates/static/css/section/cloud.scss
deleted file mode 100644
index bd61ac7b6ea..00000000000
--- a/templates/static/css/section/cloud.scss
+++ /dev/null
@@ -1,867 +0,0 @@
-@charset "UTF-8";
-/* ---------------------------------------------------------------
-------------------------------------------------------------------
-	DO NOT EDIT STYLES.CSS
-	It is autogenerated.
-
-	Project:		Ubuntu Front-End Cloud section
-	Author:			Web Team at Canonical Ltd
-	Last edited by:
-	Last edited on:
-
-  	CONTENTS:
-	-----------------------------------------------------------------
-	@section cloud
-		@subsection cloud > insights
-		@subsection cloud > public-cloud
-		@subsection cloud > private-cloud
-		@subsection cloud > orchestration
-		@subsection cloud > solutions
-		@subsection cloud > tools
-
-------------------------------------------------------------------
--------------------------------------------------------------- */
-/*body.cloud a[href=""]:after {
-	content:" - DEV NOTE: NEEDS URL";
-	color: #333;
-	font-weight: bold;
-}*/
-
-/*	@section cloud
--------------------------------------------------------------- */
-body.cloud-home {
-	.row-hero {
-		padding-bottom: 60px;
-	}
-	.row-hero .tagline {
-    @include font_size (23);
-	}
-	.inline-icons {
-	  li {
-	    margin-right: 30px;
-	    margin-top: 30px;
-	  }
-	  li.last-item {
-	    margin-right: 0;
-	  }
-	}
-	.row-promo {
-  	background: url("../img/homepage/charm/juju_bg.png") repeat;
-  	padding-right: 0;
-  	padding-bottom: 0;
-
-  	div {
-  		background: url(../img/homepage/charm/image-juju-charms.png) 100% 0 no-repeat;
-	  	padding-right: 58%;
-	  	padding-bottom: 23px;
-  	}
-
-  	h2 {
-  		background: url(../img/homepage/charm/icon-juju-logo.png) no-repeat;
-	  	padding-top: 60px;
-  	}
-  	p {
-	  	@include font_size (19.5);
-	  	padding-bottom: 10px;
-  	}
-	}
-
-	.row-use-a-cloud {
-	  padding-top: 80px;
-	}
-}
-
-.maas-col h3 a, .juju-col h3 a, .landscape-col h3 a {
-	background-position: center left;
-	background-repeat: no-repeat;
-	padding: 6px 0 6px 56px;
-	margin-bottom: 0;
-}
-.maas-col h3 a {
-	background-image: url("../img/pictograms/image-picto-maas-40.png");
-	background-image: url("../img/cloud/maas-logo.svg");
-	background-size: 50px 50px;
-}
-
-.juju-col h3 a {
-	background-image: url("../img/pictograms/image-picto-juju-40.png");
-}
-
-.landscape-col h3 a {
-	background-image: url("../img/pictograms/image-picto-landscape-40.png");
-}
-
-body.cloud .row-hero {
-	padding-top: 20px;
-}
-
-.cloud-context-footer .feature-three.picto {
-    background: url("../img/cloud/picto-footer-cloud.png") no-repeat scroll right center transparent;
-    min-height: 170px;
-
-    p {
-        padding-right: 65px;
-    }
-}
-
-.cloud-context-footer .picto-maas {
-    background: url("../img/cloud/picto-footer-maas.png") no-repeat scroll right center transparent;
-    min-height: 170px;
-
-    p {
-        padding-right: 65px;
-    }
-}
-
-body.cloud .last-row, body.cloud .no-border { border-bottom: 0; }
-
-body.cloud .six-col .inline-items li {
-	display: inline;
-	float: left;
-	margin-right: 25px;
-}
-
-body.cloud .six-col .inline-items li.last-item { margin-right: 0; }
-
-.nav-list-features ul {
-	margin-right: -$gutter_width;
-	position: relative;
-}
-
-.nav-list-features li {
-	display: inherit;
-	margin-right: 0;
-	margin-top: 26px;
-	text-align: right;
-}
-
-.nav-list-features li a:link, .nav-list-features li a:visited {
-	color: #333;
-	display: block;
-	padding-right: $gutter_width;
-}
-
-.nav-list-features li a:hover { text-decoration: none; }
-
-.nav-list-features li a:after { content: ""; }
-
-.yui3-js-enabled .nav-list-features li a.active {
-	background: url(../img/cloud/feature-arrows.png) 100% 0 no-repeat;
-	font-weight: normal;
-	margin-right: -1px;
-}
-
-.yui3-js-enabled .nav-list-features li#nav-list-feature-private a.active, .yui3-js-enabled .nav-list-features li#nav-list-feature-virtualisation a.active { background-position: right -18px; }
-
-.list-features-content li {
-    	-moz-box-shadow:inset 0 0 5px 1px rgba(0,0,0,0.1);
-    	-webkit-box-shadow:inset 0 0 5px 1px rgba(0,0,0,0.1);
-    @include rounded_corners(4px);
-    background-color: $light_grey;
-    box-shadow:inset 0 0 5px 1px rgba(0,0,0,0.1);
-    min-height: 255px;
-    padding: 30px 30px 100px 30px;
-    position: relative;
-}
-
-.row-features .list-features-content li h4 {
-	@include font_size (36);
-	font-weight: normal;
-}
-
-.row-features .list-features-content li p {
-	@include font_size (19);
-	padding-right: 230px;
-}
-
-/* Feature widget - SASS */
-.row-features .list-features-content #list-feature-saas p { padding-right: 350px; }
-
-.row-features .list-features-content #list-feature-saas { background: $light_grey url(../img/cloud/bg-list-feature-saas.png) 240px 70px no-repeat; }
-
-.yui3-js-enabled .row-features .list-features-content #list-feature-saas { background-position: 50px 70px; }
-
-/*  Feature widget - Service orchestration */
-.row-features .list-features-content #list-feature-orchestration { background: $light_grey url(../img/cloud/bg-list-feature-orchestration.png) 620px 50px no-repeat; }
-
-.yui3-js-enabled .row-features .list-features-content #list-feature-orchestration { background-position: 400px 50px; }
-
-.row-features .list-features-content #list-feature-orchestration p { padding-right: 250px; }
-
-/*  Feature widget - PAAS */
-.row-features .list-features-content #list-feature-paas { background: $light_grey url(../img/cloud/bg-list-feature-paas.png) right 84px no-repeat;  }
-
-/*  Feature widget - Guest OS */
-.row-features .list-features-content #list-feature-guest { background: $light_grey url(../img/cloud/bg-list-feature-guest.png) 590px 100px no-repeat; }
-
-.yui3-js-enabled .row-features .list-features-content #list-feature-guest { background-position: 390px 100px; }
-
-.row-features .list-features-content #list-feature-guest p { padding-right: 340px; }
-
-/*  Feature widget - Public cloud */
-.row-features .list-features-content #list-feature-public { background: $light_grey url(../img/cloud/bg-list-feature-public.png) 590px 100px no-repeat; }
-
-.yui3-js-enabled .row-features .list-features-content #list-feature-public { background-position:  390px 100px; }
-
-.row-features .list-features-content #list-feature-public p { padding-right: 300px; }
-
-/*  Feature widget - Private cloud */
-.row-features .list-features-content #list-feature-private { background: $light_grey url(../img/cloud/bg-list-feature-private.png) 680px 39px no-repeat; }
-
-.yui3-js-enabled .row-features .list-features-content #list-feature-private { background-position: 480px 39px; }
-
-.row-features .list-features-content #list-feature-private p { padding-right: 260px; }
-
-/*  Feature widget - Virtualisation */
-.row-features .list-features-content #list-feature-virtualisation { background: $light_grey url(../img/cloud/bg-list-feature-virtualisation.png) 595px 80px no-repeat; }
-
-.yui3-js-enabled .row-features .list-features-content #list-feature-virtualisation { background-position: 395px 80px; }
-
-.row-features .list-features-content #list-feature-virtualisation p { padding-right: 280px; }
-
-.row-features .list-features-content li .list-feature-footer {
-		-moz-box-shadow:inset 0 -5px 15px 1px rgba(0,0,0,0.1);
-	@include rounded_corners(0 0 4px 4px);
-	background: $warm_grey;
-	bottom: 0;
-	height: 100px;
-	left: 0;
-	margin: 0;
-	position: absolute;
-	width: 100%;
-    	-webkit-box-shadow:inset 0 -5px 15px 1px rgba(0,0,0,0.1);
-    box-shadow:inset 0 -5px 15px 1px rgba(0,0,0,0.1);
-}
-
-.row-features .list-features-content li .list-feature-footer a {
-	color: #fff;
-	@include font_size (20);
-	padding: $gutter_width 30px 50px;
-	display: block;
-}
-
-/* commercial support, enterprise tools table */
-.row-cloud-tools table th.product {
-	border-bottom: 0;
-	width: 300px;
-}
-
-.row-cloud-tools table thead th:first-of-type { border-bottom: 1px dotted #AEA79F; }
-
-.row-cloud-tools table th.product {
-	border-bottom: 0;
-	text-align: left;
-}
-
-.row-cloud-tools table th.no-bottom-border {
-	background: #f7f2f6;
-	border-top: 0;
-}
-
-.row-cloud-tools table thead th.no-bottom-border:first-of-type {
-	border-bottom: 0;
-	border-top: 1px dotted #AEA79F;
-}
-
-.row-cloud-tools table th.product strong {
-	@include font_size (20);
-	background: #f7f2f6;
-}
-
-.row-cloud-tools table .price {
-	background: #dfddda;
-	font-weight: normal;
-	padding-left: 35px;
-}
-
-.row-cloud-tools table td {
-	text-align: left;
-}
-.row-cloud-tools table.last { margin-bottom: 1em; }
-
-.row-cloud-services div {
-	padding-top: 120px;
-}
-
-.row-cloud-services div h2, .awsome .row-cloud-services h3 {
-	@include font_size (16);
-	font-weight: normal;
-}
-
-.row-cloud-services div.box-hyperscale {
-	background: url(../img/pictograms/pictogram-hyperspeed-100x100.png) 50% 0 no-repeat;
-}
-
-.row-cloud-services div.box-juju {
-	background: url(../img/pictograms/pictogram-juju-100x100.png) 50% 0 no-repeat;
-}
-
-.row-cloud-services div.box-webinars {
-	background: url(../img/pictograms/pictogram-virtualise-100x100.png) 50% 0 no-repeat;
-}
-
-/* @subsection cloud > insights (body.cloud-insights) */
-body.cloud-insights {
-	blockquote > p {
-		text-indent: -0.4em;
-		font-size: 30px;
-		line-height: 1.3;
-		color: #aea79f;
-	}
-	blockquote p cite {
-		margin: 10px 0 0 0.8em;
-		font-size: 16px;
-		font-weight: 300;
-		display: block;
-	}
-} /* end body.cloud-insights */
-
-/* @subsection cloud > public-cloud */
-body.public-cloud-home {
-	.row-hero {
-		background: url(../img/pictograms/pictograms-public-cloud-353x119.png) 574px 70px no-repeat;
-	}
-	.row-hero h2 {
-		padding: 0 480px 25px 0;
-	}
-	.row-why-public-cloud  {
-		background: #fff url(../img/cloud/pictogram-public-cloud-cropped-235x351.png) right 50px no-repeat;
-	}
-}
-
-.box-cloud-contact-header h2 { margin-bottom: 10px; }
-
-.box-cloud-contact .box-cloud-contact-header {
-	border-bottom: 1px dotted $warm_grey;
-	margin-bottom: 20px;
-	padding-bottom: 15px;
-	float: left;
-	margin-right: 20px;
-}
-
-.box-cloud-contact p.six-col {
-	margin: -5px 0 0 -50px;
-}
-
-.box-cloud-contact .box-cloud-contact-header p {
-    color: #656565;
-	@include font_size (21);
-	margin-bottom: 0;
-    line-height: 1.4;
-    margin: 0;
-}
-
-.box-try-cloud-guest {
-	padding-bottom: 0;
-}
-
-.box-try-cloud-guest p {
-	border-bottom: 1px dotted $warm_grey;
-	margin-bottom: 20px;
-	padding-bottom: 20px;
-}
-
-.box-cloud-contact p a.link-cta-canonical {
-    float: left;
-}
-
-/* @subsection cloud > private-cloud */
-body.cloud-private-cloud .hero-wrap {
-	@include rounded_corners(4px 4px 0 0);
-	background: #fff url(../img/cloud/cropped_cloud_310x465.png) right 90px no-repeat;
-	display: block;
-	margin: 0;
-}
-
-body.cloud-private-cloud .hero-wrap .row {
-	background: transparent;
-	color: #333;
-	margin-bottom: 0;
-	padding-left: 40px;
-	padding-top: 0;
-	margin-left: 0;
-}
-
-body.cloud-private-cloud .hero-wrap .touch-bottom {
-	padding-bottom: 0;
-}
-
-body.cloud-private-cloud .hero-wrap .row-hero {
-	padding-top: 0;
-}
-
-body.cloud-private-cloud .hero-wrap .row-hero h2 {
-	margin-bottom: 0;
-}
-
-body.cloud-private-cloud .hero-wrap .row-hero p {
-	color: $warm_grey;
-	@include font_size (25); /* Same as h2 */
-	border-bottom: 1px dotted $warm_grey;
-	padding-bottom: 30px;
-	margin-left: -40px;
-	padding-left: 40px;
-}
-
-body.cloud-private-cloud .hero-wrap .row p {
-	margin-right: $two_col;
-	padding-right: 20px;
-}
-
-/* /cloud/private-cloud/hybrid-cloud */
-body.cloud-private-cloud-hybrid-cloud .row-hero {
-	background: #fff url(../img/pictograms/pictogram-cloud-computing-350.png) 104% 75px no-repeat;
-}
-
-.box-virtualisation {
-	background: url(../img/pictograms/pictogram-virtualise-205x205.png) 40px 50% no-repeat;
-	padding-bottom: 1.538em;
-	padding-left: $four_col;
-}
-
-.row-cloud-amazon-openstack { background: url(../img/cloud/logo-amazon-openstack.png) 630px 50px no-repeat; }
-
-.row-cloud-awsome .article {
-	background: url(../img/pictograms/pictogram-community-243x217.png) 20px 55px no-repeat;
-	padding-right: 0;
-	padding-left: $four_col;
-}
-
-/* @subsection cloud > orchestration */
-body.orchestration-home {
-	.row-hero {
-		background: #fff url(../img/cloud/orchestration-pictograms.png) 92% center no-repeat;
-		padding-right: 100px;
-	}
-} /* end body.cloud-orchestration */
-
-body.cloud-orchestration-juju #main-content .juju-intro {
-	@include font_size (26);
-	background: $box_solid_grey url(../img/cloud/logo-juju-171x174.png) 90% 50% no-repeat;
-}
-
-body.cloud-orchestration-juju #main-content .juju-intro p {
-}
-
-body.cloud-orchestration .juju-intro strong {
-	font-weight: bold;
-}
-
-body.cloud .row-demanding-tech .article {
-	padding-left: 320px;
-	padding-right: 0;
-}
-
-.row-demanding-tech .article .pull-quote {
-	@include font_size (30);
-	font-weight: normal;
-	left: ( $grid_gutter );
-	line-height: 1.2;
-	margin-top: -24px;
-	padding-left: 0;
-	right: auto;
-	text-indent: -13px;
-	width: $two_col;
-}
-
-.row-juju-left {
-  background: url(../img/logos/logo-juju-171x174.png) 40px 50px no-repeat;
-  padding-left: $four_col;
-}
-.row-public-cloud-operations {
-  background: url(../img/pictograms/pictogram-support-199x199.png) 670px 55px no-repeat;
-}
-
-.row-juju-examples code {
-	padding: 10px;
-}
-
-.row-juju-examples ul {
-	padding: 10px 0 5px;
-}
-.row-juju-examples ul code {
-	padding: 5px 10px;
-}
-
-.row-juju-examples code, .row-juju-examples ul {
-	@include font_size (16);
-	@include rounded_corners(4px);
-	background-color: #fdf6f2;
-	display: block;
-	font-family: "Ubuntu Mono", "Bitstream Vera Sans Mono",Monaco,"Lucida Console",monospace, Arial;
-}
-
-.row-cloud-maas img, .row-cloud-maas-teach img {
-	margin-right: -26px;
-}
-
-/* @subsection cloud > solutions */
-body.cloud-solutions .row-ubuntu-advantage {
-	background-color: #efeeec;
-}
-body.cloud-solutions .row-ubuntu-advantage li.first {
-	height: 33.468em;
-}
-
-.row-features table { margin-bottom: 0; }
-
-.row-providers .six-col {
-	border-right: 1px dotted $warm_grey;
-	padding-right: 19px;
-}
-
-.row-providers .last-col { border: 0; }
-
-/* @this will turn into a tertiary nav pattern */
-.row-menu h3 {
-	@include font_size (16);
-	border-bottom: 1px dotted $warm_grey;
-	font-weight: normal;
-	margin-bottom: 0;
-	padding-bottom: 10px;
-}
-
-.row-menu h3 a { color: #333; }
-
-body.cloud-insights .row-supported .inline-items { margin-left: 0; }
-body.cloud-insights .row-support .list-ubuntu {
-  margin-bottom: 0;
-}
-body.cloud-insights .cloud-computing-pictogram {
-   background: url(../img/pictograms/pictogram-cloud-computing-grey-199x199.png) no-repeat scroll 50px center transparent;
-   padding-left: $four_col;
-}
-.talk-footer {
-  @include footer("../img/pictograms/pictogram-discussion-115x115.png");
-}
-.download-footer {
-  @include footer("../img/pictograms/pictogram-download-115x115.png");
-}
-
-body.cloud .row-cloud-guest li {
-  float: left;
-}
-
-body.cloud-public-cloud-strategy .row-hero {
-  background: #fff url(../img/pictograms/pictogram-public-cloud-350x350.png) no-repeat scroll 105% 20px;
-}
-
-body.cloud .row-openstack {
-  background: url(../img/third-party-logos/logo-openstack-120x122.png) no-repeat scroll 685px 30px transparent;
-}
-
-body.cloud .packages {
-  h2 { width: 45.4761%; }
-
-  .price-annual  { top: 242px; }
-  .price-monthly { top: 200px; }
-}
-
-/* jumpstart */
-.list-jumpstart h3 {
-	@include font_size (19.5);
-	padding-top: 3px;
-}
-.list-jumpstart h3 img {
-	float: left;
-	margin-right: 10px;
-	margin-top: -3px;
-}
-
-.cloud-solutions-jumpstart .row-hero {
-	background: #efefef;
-	padding-bottom: 10px;
-}
-
-.row-open-cloud p.six-col {
-	margin-bottom: 30px;
-}
-
-body.cloud-cloud-management {
-	.audience-enterprise {
-		margin-top: 18px;
-	}
-}
-
-/* @subsection cloud > tools */
-body.cloud-tools {
-	.row-juju {
-		background: url(../img/cloud/image-juju-background-pattern.png);
-		position: relative;
-		overflow: visible;
-		padding: 85px 40px 20px; /* default is 20px 40px */
-	}
-	.row-juju img {
-		position: absolute;
-		left: 0;
-		top: -35px;
-	}
-	.row-computers-selected {
-	  background: url("../img/cloud/image-landscape-graph.png") no-repeat right 0;
-
-	  .computers-selected p {
-      @include font_size (144);
-	    color: $mid_aubergine;
-	    float: left;
-	    letter-spacing: -8px;
-	    padding-left: 10px;
-	    margin-bottom: 0;
-	    width: 433px;
-
-	    span {
-	      float: right;
-        font-size: 0.333333333em;
-        line-height: 54px;
-        margin-top: 60px;
-        width: 260px;
-        letter-spacing: normal;
-	    }
-	  }
-	}
-} /* end @subsection cloud > tools */
-
-.row-ubuntu-family {
-	background: url(../img/pictograms/pictogram-logo-ubuntu.png) 94.5% 50% no-repeat;
-}
-
-body.cloud-build-a-cloud {
-  .row-hero {
-    h2 {
-      font-size: 2.25em;
-    }
-  }
-	.row-management {
-    background: url(../img/cloud/screenshot-landscape-358x37.png) no-repeat 107% 0%;
-		min-height: 0;
-	}
-	.row-public-cloud-providers {
-  }
-  .ubuntu-column {
-    position: relative;
-
-    img {
-			margin-left: 15px;
-      margin-top: -102px;
-      position: absolute;
-    }
-    img:last-of-type {
-			margin-left: 112px;
-		}
-  }
-  .openstack-open-cloud {
-    margin-top: 20px;
-  }
-  .start-today h2 {
-    margin-top: 10px;
-  }
-}
-
-body.cloud-use-a-cloud {
-  .certified-public-clouds {
-    .inline-icons{
-      margin-bottom: 0;
-
-      li {
-        margin: 20px 40px 20px 0;
-      }
-
-      li.last-item {
-        margin-right: 0;
-      }
-    }
-  }
-
-  .developers-favourite {
-    img {
-      margin-left: -10px;
-      margin-top: 10px;
-    }
-  }
-
-  .push-down {
-    margin-top: 50px;
-  }
-
-  .row-juju-man {
-  	padding-bottom: 0;
-    overflow: hidden;
-  }
-  .row-juju-man div {
-  	padding-bottom: 0;
-  }
-  .box-juju img {
-		margin-left: -40px;
-		margin-top: 60px;
-		margin-bottom: 40px;
-  }
-  .box-management {
-		position: relative;
-  }
-  .box-management img {
-  	position: absolute;
-  	margin-left: -20px;
-  	margin-top: 10px;
-  }
-}
-
-.row-interoperability img {
-	margin-bottom: -60px;
-	position: relative;
-	top: -62px;
-}
-
-body.cloud-tools-juju {
-
-  .row-hero {
-  	background: url(../img/cloud/cloud-juju-gui-screen.jpg) no-repeat 420px 0;
-  	height: 514px;
-
-  	a {
-  	   margin-top: 20px;
-  	}
-
-  	img {
-  	  margin: 10px 0 10px;
-  	}
-	}
-
-	.row-one-stop-shop {
-	  background: url("../img/cloud/cloud-juju-charm-grid.png") no-repeat 0 30px;
-	  padding-top: 280px;
-	}
-
-	.row-config-scale h2 {
-	  margin-top: 30px;
-	}
-
-  .row-join-the-fun h2 {
-    margin-top: 15px;
-  }
-}
-
-body.cloud-tools-maas {
-  .row-hero {
-    background: url(../img/cloud/cloud-maas-screenshot.jpg) no-repeat 420px 0px;
-  }
-  h1 {
-		background-image: url("../img/pictograms/image-picto-maas-40.png");
-		background-image: url("../img/cloud/maas-logo.svg");
-		background-repeat: no-repeat;
-		background-position: 0 5px;
-		background-size: 65px 65px;
-		padding-left: 64px;
-		margin-left: -6px;
-		padding-top: 5px;
-  }
-}
-
-body.cloud-tools-openstack-home {
-  .row-hero {
-    background: url("../img/cloud/cloud-openstack-window.jpg") no-repeat 420px -10px;
-    height: 500px;
-  }
-}
-
-body.cloud .row-community {
-	padding-bottom: 40px !important;
-}
-body.cloud-labs {
-  .row-hero {
-    background: url("../img/cloud/cloud-labs-hero.png") no-repeat 620px center;
-  }
-  .box {
-  	margin-bottom: $gutter_width;
-  }
-}
-body.cloud-ecosystem {
-  img.partner-logo {
-    margin-bottom: 20px;
-  }
-}
-
-body.cloud-ecosystem .row-ubuntu-oil {
-    background: url("../img/cloud/interoperability-lab.png") no-repeat 600px center;
-}
-
-body.cloud-ecosystem .row-ubuntu-oil p {
-	width: 510px;
-}
-
-/* cloud helper classes */
-.offer {
-	color: #aea79f;
-	font-size: 14px;
-	letter-spacing: 1px;
-	position: relative;
-	text-transform: uppercase;
-}
-
-.tight-section {
-  padding-top: 0;
-  padding-bottom: 0;
-
-  a {
-    margin-bottom: 40px;
-    display: block;
-  }
-
-  .ubuntu-column a {
-  	margin-bottom: 0;
-  }
-}
-
-.cloud-home .tight-section div div {
-	padding-bottom: 40px;
-}
-
-/* build-a-cloud > row-cloud-get-started */
-.row-cloud-get-started ol {
-	margin-bottom: 40px;
-}
-.row-cloud-get-started li {
-	padding: 20px 0 0 20px;
-}
-
-/* same styles as steps on juju.ubutnu.com */
-.row-cloud-get-started li span {
-	background-color: #DD4814;
-	border: 3px solid #DD4814;
-	border-radius: 20px;
-	color: #FFFFFF;
-	display: block;
-	float: left;
-	font-size: 1.25em;
-	height: 18px;
-	margin: -5px 10px 0.333em -1.222em;
-	padding: 6px;
-	line-height: 0.9;
-	text-align: center;
-	vertical-align: top;
-	width: 18px;
-}
-
-/* @subsection cloud > ecosystem > ubuntu OIL */
-.cloud-ecosystem-ubuntu-oil .inner-wrapper {
-	background: url("../img/cloud/image-interoperability-lab.png") no-repeat 580px 100px #fff;
-}
-
-.cloud-ecosystem-ubuntu-oil .row-involved img {
-	position: relative;
-	left: -40px;
-	top: 10px;
-}
-
-.cloud-ecosystem-ubuntu-oil .row-partners li {
-	margin: 0 24px 24px 0;
-	padding: 1.333em 24px;
-}
-
-.cloud-ecosystem-ubuntu-oil .row-partners li:nth-child(4n) {
-	margin: 0 0 20px 0;
-}
-
-.cloud-ecosystem-ubuntu-oil .row-partners li:not(:nth-child(4n)) {
-	margin: 0 20px 20px 0;
-}
-
-/* end @subsection cloud > ecosystem > ubuntu OIL */
\ No newline at end of file
diff --git a/templates/static/css/section/desktop.scss b/templates/static/css/section/desktop.scss
deleted file mode 100644
index a27f5b7f9df..00000000000
--- a/templates/static/css/section/desktop.scss
+++ /dev/null
@@ -1,974 +0,0 @@
-/*	@section pc
---------------------------------------------------------------
-	Contents:
-		@section general
-		@section home
-		@section features
-			@subsection ubuntu > features > ubuntu-software-centre
-			@subsection ubuntu > features > photos and videos
-			@subsection ubuntu > features > ubuntu-one
-		@section desktop remix
-		@subsection for-business > desktop
-		@section desktop developer
-		@section desktop management (see management.scss)
-		@section contextualised footer #context-footer
-		@section UbuntuKylin
-
--------------------------------------------------------------- */
-
-/*	@section general
--------------------------------------------------------------- */
-body.desktop .share-this {
-	height: 25px;
-	position: relative;
-	display: block;
-	float: left;
-	clear: both;
-	width: 100%;
-}
-
-body.desktop .share-this iframe {
-	width: 80px;
-	padding: 0;
-	float: left;
-	display: inline-block;
-	margin: 0 0 0;
-}
-
-body.desktop .share-this iframe:first-child {
-	width: 80px;
-}
-body.desktop .share-this iframe:last-child {
-	margin-right: 0;
-}
-
-body.desktop .share-this .twitter-share-button {
-	width: 58px;
-	display: inline-block;
-	float: none;
-}
-
-body.desktop-features-home .share-this {
-	right: auto;
-}
-
-.box-get-ubuntu{
-  div {
-    min-height: 176px;
-  }
-  @media screen and (-webkit-min-device-pixel-ratio:0) {
-  div {
-    min-height: 173px;
-  }
-  }
-  li {
-    float: left;
-    list-style-type: none;
-    text-align: center;
-    width: 24.8%;
-    margin-top:20px;
-
-    a {
-      background: url(../img/pictograms/sprite-pictograms-get-ubuntu-66x772.png) top center no-repeat;
-      display:block;
-      padding-top:75px;
-      line-height: 1.3;
-    }
-  }
-  li.cd a { background-position: center -303px; }
-  li.windows a { background-position: center -606px; }
-  li.download a { background-position: center -919px; }
-
-  li a:hover { background-position: center -161px; }
-  li.cd a:hover { background-position: center -464px; }
-  li.windows a:hover { background-position: center -767px; }
-  li.download a:hover { background-position: center -1080px; }
-}
-
-/*	@section home
--------------------------------------------------------------- */
-body.desktop-home {
-	.row-hero {
-		background: url(../img/desktop/image-meet-ubuntu.jpg) 290px 10px no-repeat;
-		p {
-			padding-right: 90px;
-		}
-	}
-	.row-hero h1 {
-	}
-	.share-this {
-		margin-top: 30px;
-	}
-	.intro {
-		@include font_size (23);
-		line-height: 1.3;
-		margin-bottom: 30px;
-		padding-right: 50px;
-	}
-	.accessible {
-		background: url(../img/desktop/desktop-accessible.jpg) 103% top no-repeat;
-		min-height: 311px;
-	}
-
-	.loaded {
-		background-image: url(../img/desktop/desktop-loaded.png);
-		background-position: left center;
-		background-repeat: no-repeat;
-	}
-
-	.take-the-tour {
-		background: url(../img/desktop/screenshot-demo.png) 104.3% top no-repeat;
-		min-height: 290px;
-	}
-
-	.row-free p.first {
-		padding-right: 186px;
-	}
-
-	.row-free > div.open-source {
-		background: url(../img/pictograms/pictogram-heart-166.png) 93% 40% no-repeat;
-	}
-
-	.row-free > div.backed-by-canonical {
-		background: url(../img/logos/canonical-logo-166.png) 93% 40% no-repeat;
-	}
-
-	.row-free blockquote {
-		margin-top: -70px;
-	}
-
-	.row-beautiful img {
-		position: relative;
-		margin: 0 -40px -20px 0;
-	}
-} /* end @section home */
-
-/*	@section features
--------------------------------------------------------------- */
-body.desktop-features .intro {
-	padding-top: 0;
-}
-body.desktop-features .share-this {
-	margin-top: 25px;
-}
-
-img.touch-border {
-  margin-bottom: -20px;
-  position: relative;
-  display: block;
-}
-
-body.desktop-features .intro div { margin-bottom: 0; }
-
-body.desktop-features .row-hero,
-body.desktop-features .row-hero div,
-body.desktop-features .row-hero p,
-body.desktop-features .row-hero h1 {
-	margin-bottom: 0;
-	padding-bottom: 0;
-}
-
-body.desktop-features .row-hero h1 {
-	margin-bottom: 36px;
-}
-
-body.desktop-features .row-hero .link-cta-ubuntu {
-	margin: 15px 0 0 0;
-}
-
-body.desktop-features .row-your-ubuntu {
-	background: url("../img/desktop/features/image-your-ubuntu.jpg") 290px 10px no-repeat;
-	margin-bottom: 40px;
-	padding-bottom: 20px;
-	h1 {
-		margin-bottom: 0.267em;
-		position: relative;
-		z-index: 2;
-	}
-
-	img {
-		margin-top: -4em;
-		position: relative;
-		right: 0;
-		margin-bottom: 30px;
-		margin-right: 50px;
-		z-index: 0;
-		height: auto;
-	}
-
-}
-
-body.desktop-features .box-explore-ubuntu {
-	@include box_sizing;
-	background: $light_grey;
-		-moz-box-shadow: inset 0 0 2px 1px #dedede;
-		-webkit-box-shadow: inset 0 0 2px 1px #dedede;
-	box-shadow: inset 0 0 2px 1px #dedede;
-	margin: 0 0 20px 0;
-	margin-left: 40px;
-	margin-right: 40px;
-	position: relative;
-}
-
-body.desktop-features-home .row-explore-ubuntu {
-	padding-left: 0;
-	padding-right: 0;
-	padding-bottom: 0;
-}
-
-.row-what-is-new {
-	background: url("../img/desktop/features/image-smart-scopes.jpg") no-repeat;
-	padding-left: $six_col + 2.21238%;
-}
-
-body.desktop-features .box-explore-ubuntu {
-	margin-bottom: 40px;
-}
-
-body.desktop-features .box-explore-ubuntu h2 {
-	@include font_size (16);
-	color: $cool_grey;
-	margin-bottom: 1.25em;
-}
-
-body.desktop-features .box-explore-ubuntu ul {
-	margin: 0;
-}
-
-body.desktop-features .box-explore-ubuntu ul li {
-	float: left;
-	margin-bottom: 0;
-	padding-bottom: 0;
-	text-align: center;
-	width: 14.28%;
-}
-
-body.desktop-features .box-explore-ubuntu ul li a {
-	@include font_size (13);
-	color: $cool_grey;
-}
-
-body.desktop-features .box-explore-ubuntu ul li a:hover {
-	color: $ubuntu_orange;
-	text-decoration: none;
-}
-
-body.desktop-features .box-explore-ubuntu ul li p {
-	margin-bottom: 0;
-}
-
-/*body.desktop-features .box-explore-ubuntu li.current {
-	background: url("../img/tertiary-arrow.png") center bottom no-repeat;
-	padding-bottom: 42px;
-	margin-bottom: -22px;
-}
-*/
-body.desktop-features .box-explore-ubuntu li.current a {
-	color: $ubuntu_orange;
-}
-
-body.desktop-features .row-accessible {
-	border-bottom: 1px dotted $warm_grey;
-	height: 287px;
-	margin-bottom: 20px;
-}
-
-body.desktop-features .row-accessible img.pull-bottom-right {
-	margin-top: -19px;
-	margin-right: -41px;
-}
-
-body.desktop-features .row-compatible div {
-	margin-bottom: 0;
-}
-
-body.desktop-features .row-compatible img {
-	margin-top: 35px;
-}
-
-body.desktop-features .row-fast .box {
-	padding-bottom: 0;
-}
-
-body.desktop-features .row-fast blockquote {
-	position: absolute;
-	color: #fff;
-	width: 148px;
-	top: 58px;
-	left: 60px;
-}
-
-body.desktop-features .row-fast blockquote p:first-child {
-	@include font_size (20)
-}
-
-body.desktop-features .row-fast blockquote cite {
-	font-style: normal;
-}
-
-body.desktop-features .row-fast img {
-	margin-bottom: -20px;
-}
-
-body.desktop-features .row-developer {
-	@include box_sizing;
-	background-image: url(../img/patterns/developer-dot-pattern.png);
-	position: relative;
-	margin-bottom: 40px;
-
-	h3, p {
-		background: #fff;
-	}
-}
-
-body.desktop-features .row-hero .box { background: none; }
-
-body.desktop-features .row .four-col h3,
-body.desktop-features .row .eight-col h3 {
-	@include font_size (16);
-	font-weight: normal;
-}
-
-body.desktop-features .box-compatible img {
-	margin: 55px 0 0 10px;
-}
-
-body.ubuntu .row-hero { position: relative; }
-
-body.desktop-features .box-skype img {
-	bottom: -11px;
-	position: relative;
-}
-
-body.desktop-features .box-padded-feature ul.vertical-divider {
-	margin-left: 0;
-}
-
-/* @subsection features > office-applications
--------------------------------------------------------------- */
-.inline-icons li.row-text {
-	margin-right: 10px;
-}
-
-/*	@subsection games-apps
--------------------------------------------------------------- */
-
-body.desktop-features-games-apps img.touch-border {
-	right: -14px;
-	bottom: -2px;
-}
-
-body.desktop-features-games-apps .intro img.touch-border {
-	right: -10px;
-	bottom: 0;
-}
-
-body.desktop-features .row-humble-indie-bundle {
-	background: url(../img/desktop/features/image-fez-background.jpg) no-repeat;
-	min-height: 360px;
-}
-
-#preload-fez {
-	background: url(../img/desktop/features/image-fez-gomez-rollover.gif) no-repeat;
-}
-
-body.desktop-features .row-humble-indie-bundle .fez {
-	background: url(../img/desktop/features/image-fez-gomez.gif) no-repeat;
-	width: 60px;
-	height: 60px;
-	position: absolute;
-	left: 560px;
-	top: 234px;
-}
-
-body.desktop-features .row-humble-indie-bundle .fez:hover {
-	background: url(../img/desktop/features/image-fez-gomez-rollover.gif) no-repeat;
-}
-
-body.desktop-features .row .box-ratings-and-reviews {
-	background: #fff url(../img/ubuntu/features/bg-usc-ratings-288x285.jpg) 0 170px no-repeat;
-	padding-bottom: 260px;
-}
-
-body.desktop-features .row .box-education-resources {
-
-}
-
-body.desktop-features .row .box-fun-and-games {
-
-}
-
-.free-apps h3 {
-	@include font_size (16);
-	font-weight: normal;
-}
-
-/* music an mobile page */
-.row-feats-intro .box {
-	padding-bottom: 190px;
-}
-
-.row-feats-intro img {
-	@include rounded_corners(0 0 4px 4px);
-	position: absolute;
-	left: 0;
-	bottom: 0;
-}
-
-/* @subsection ubuntu > features > photos and videos  */
-.compatible-device {
-	@include rounded_corners();
-	background: $ubuntu_orange url(../img/ubuntu/features/photos-device-compatible-904x301.gif) no-repeat;
-	color: #fff;
-	min-height: 300px;
-	margin-bottom: $gutter_width;
-	width: 100%;
-}
-
-.compatible-device .article {
-	padding: $gutter_width $gutter_width $gutter_width $eight_col;
-}
-
-/* @subsection ubuntu > features > ubuntu-one */
-
-body.desktop-features-personal-cloud .one-intro {
-	padding-right: 20px;
-}
-
-body.desktop-features-personal-cloud .one-picto-list {
-	padding-left: 10px;
-}
-
-body.desktop-features-personal-cloud .row-one-features {
-	margin-bottom: 40px;
-}
-
-body.desktop-features-personal-cloud .row-one-features h3 {
-	@include font_size (16);
-	font-weight: normal;
-}
-
-body.desktop-features-personal-cloud .row-one-features ul li {
-	text-align: center;
-}
-
-body.desktop-features-personal-cloud .row-one-features ul li img {
-	margin-bottom: 20px;
-}
-
-body.desktop-features-personal-cloud .row-one-features ul li h3,
-body.desktop-features-personal-cloud .row-one-features ul li p {
-  text-align: left;
-}
-
-body.desktop-features-personal-cloud .row-one-features ul {
-	margin-bottom: 0;
-}
-
-/*	@section desktop remix
--------------------------------------------------------------- */
-body.desktop-desktop-remix .row-hero {
-	padding-bottom: $gutter_width;
-}
-body.desktop-desktop-remix .row-hero div {
-	padding-bottom: $gutter_width;
-	padding-top: $gutter_width;
-}
-body.desktop-desktop-remix .row-hero h2{
-	color: #666;
-}
-body.desktop-desktop-remix p.intro {
-	@include font_size (23);
-	line-height: 1.3
-}
-body.desktop-desktop-remix .remix-download a {
-	margin-top: 10px;
-	margin-bottom: 10px;
-}
-body.desktop-desktop-remix #mktFrmSubmit {
-	padding: 10px 14px;
-  font-family: Ubuntu, Arial, "libra sans", sans-serif;
-	@include font_size (16);
-}
-
-/* @subsection for-business > desktop
--------------------------------------------------------------- */
-body.desktop-business {
-	.row-hero {
-		background: url(../img/business/desktop-for-business.jpg) right bottom no-repeat;
-		padding-bottom: 0;
-	}
-
-	.row-hero .quote {
-		top: 0;
-	}
-
-	.row-hero .quote-right-bottom {
-		padding-left: 46px;
-		padding-top: 70px;
-	}
-
-	th {
-		font-weight: normal;
-	}
-
-	tfoot th {
-		font-weight:  bold;
-	}
-
-	.row-list-ticks,
-	.row-methodology {
-		background: $light_grey;
-	}
-
-	.row-list-ticks {
-		@include rounded_corners(0 0 4px 4px);
-	}
-
-	.row-list-ticks ul {
-		padding-bottom: 0;
-		margin-bottom: 0;
-	}
-
-	.row-list-ticks li {
-		font-size: 14px;
-	}
-
-	.row-thin-client {
-		background: #fff url(../img/desktop/desktop-business-thin-client.jpg) 502px 0 no-repeat;
-		min-height: 326px;
-	}
-
-}
-
-/* enterprise blog promo on /business/desktop */
-body.business .row-enterprise-blog {
-	background: #fff;
-	padding-bottom: 10px;
-	padding-top: 20px;
-}
-
-body.business {
-  .item-download a,
-  .item-contact a,
-  .item-desktop a,
-  .item-server a,
-  .item-cloud a{
-    display: block;
-    height: 37px;
-    line-height: 37px;
-    padding-left: 47px;
-  }
-
-  .item-download a { background: url('../img/pictograms/pictogram-grey-download-37x37.png') no-repeat; }
-  .item-contact a { background: url('../img/pictograms/pictogram-grey-contact-37x37.png') no-repeat; }
-  .item-desktop a { background: url('../img/pictograms/pictogram-grey-desktop-37x37.png') no-repeat; }
-  .item-server a { background: url('../img/pictograms/pictogram-grey-server-37x37.png') no-repeat; }
-  .item-cloud a { background: url('../img/pictograms/pictogram-grey-cloud-37x37.png') no-repeat; }
-}
-
-body.desktop-business .row-developer-desktop .six-col img {
-	margin-top: 170px;
-}
-
-body.desktop-business .row-business-as-usual {
-	background: $light_grey url(../img/business/desktop-for-business.jpg) left $gutter_width no-repeat;
-}
-
-body.desktop-business .row-business-as-usual h3 {
-	@include font_size (16);
-	font-weight: 400;
-}
-
-body.desktop-business .row-business-as-usual .quote-right-bottom {
-	right: auto;
-	left: 3 * $gutter_width;
-	top: -3em;
-	padding: 60px 35px 60px 45px;
-}
-
-body.desktop-business .row-professional-support {
-	position: relative;
-	clear: both;
-}
-
-body.desktop-business .row-professional-support .link-cta-canonical {
-	position: absolute;
-	right: $gutter_width;
-	bottom: 2.5em;
-}
-
-body.desktop-business .row-methodology .box {
-	background: #fff;
-	border-color: $warm_grey;
-}
-
-body.desktop-business .row-methodology .list-ubuntu {
-	margin-right: -$gutter_width;
-}
-
-body.desktop-business .row-methodology .list-ubuntu li {
-	display: inline-block;
-	float: left;
-	margin-right: $gutter_width;
-	width: $three_col;
-}
-
-body.desktop-business .packages dd {
-	min-height: 100px;
-}
-
-body.desktop-business .packages dd.price {
-	min-height: 0;
-}
-
-body.desktop-business .packages dl {
-	width: 245px;
-	width: 29.7%;
-}
-
-body.desktop-business .row-ubuntu-advantage {
-	background-color: #efeeec;
-}
-
-body.desktop-business .row-ubuntu-advantage .list-details {
-	margin-bottom: 0;
-}
-
-body.desktop-business .row-ubuntu-advantage li.first {
-	height: 33.55em;
-}
-
-body.desktop-business .row-consultancy .quote {
-	margin-top: -80px;
-}
-
-body.desktop-business .row-methodology  {
-	background: #efeeec;
-}
-
-.row-community {
-	background: #fff url(../img/patterns/background-dots.png);
-	color: $cool_grey;
-	padding: 40px 20px 20px !important;
-}
-
-.row-community .eight-col,
-.row-community .eight-col.box,
-.row-community .six-col,
-.row-community .nine-col {
-	padding: 0 20px;
-}
-
-.row-community div.six-col, .box-community div.six-col, .row-community div.eight-col, {
-	background: rgba(255,255,255,1);
-	position: relative;
-}
-
-.where-to-find-us {
-  background: #fff;
-  margin: 0;
-  padding: 15px 20px;
-}
-
-.where-to-find-us ul {
-	margin-bottom: 0;
-}
-
-.row-community .where-to-find-us h3,
-.row-community .where-to-find-us h4 {
-	@include font_size (16);
-	border-bottom: 1px dotted $warm_grey;
-	padding-bottom: 10px;
-	margin-bottom: 10px;
-}
-
-.where-to-find-us a { padding: 2px 0 2px 26px; }
-
-.where-to-find-us .ask-ubuntu a { background: url("../img/patterns/icon-irc.png") 0 2px no-repeat; }
-
-.where-to-find-us .mailing-lists a { background: url("../img/patterns/icon-mail.png") 0 2px no-repeat; }
-
-.where-to-find-us .ubuntu-blog a { background: url("../img/patterns/icon-rss.png") 0 2px no-repeat; }
-
-.row-community .nine-col div.six-col {
-    background: #fff;
-    float: left;
-    display: block;
-}
-
-body.desktop-business .row-community,
-body.server .row-community {
-	background: #fff url(../img/patterns/background-dots.png);
-	color: $cool_grey;
-}
-
-body.desktop-business .where-to-find-us,
-body.server .where-to-find-us {
-  background: #fff;
-  margin: 0;
-}
-
-body.desktop-business .row-community .where-to-find-us h3,
-body.desktop-business .row-community .where-to-find-us h4,
-body.server .row-community .where-to-find-us h3,
-body.server .row-community .where-to-find-us h4 {
-	@include font_size (16);
-	border-bottom: 1px dotted $warm_grey;
-	padding-bottom: 5px;
-	margin-bottom: 10px;
-}
-
-body.desktop-business .row-community .nine-col div,
-body.server .row-community .nine-col div {
-    background: #fff;
-    float: left;
-    display: block;
-}
-
-body.desktop-business .row-ubuntu-advantage {
-	background-color: #efeeec;
-}
-
-body.desktop-business-desktop .row-ubuntu-advantage .list-details {
-	margin-bottom: 0;
-}
-
-body.desktop-business-desktop .row-ubuntu-advantage li.first {
-	height: 33.55em;
-}
-
-body.desktop-business-desktop .row-consultancy .quote {
-	margin-top: -80px;
-}
-
-body.desktop-business-desktop .row-methodology  {
-	background: #efeeec;
-}
-
-/*	@section desktop developer
--------------------------------------------------------------- */
-body.desktop-for-developers {
-	.row-hero {
-		background: url(../img/desktop/desktop-developer.png) 540px 120px no-repeat;
-	}
-	/* Why use Ubuntu for development? */
-	.row-why-ubuntu li {
-		font-size: 13px;
-	}
-
-	/* With Ubuntu, you're in good company */
-
-	/* All the tools developers need */
-
-	.row-developer-tools {
-		background-color: $box_solid_grey;
-		position: relative;
-		padding-top: 40px;
-		padding-bottom: 10px;
-	}
-
-	.row-developer-tools img {
-		position: absolute;
-		left: auto;
-		right: 0;
-		bottom: 0;
-	}
-
-	/* By developers, for developers */
-
-	.row-for-developers blockquote > p {
-		margin-left: 0.4em;
-		text-indent: -0.4em;
-		font-size: 30px;
-		line-height: 1.3;
-		color: #aea79f;
-	}
-
-	.row-for-developers blockquote > p cite {
-
-		display: block;
-		font-size: 16px;
-		font-weight: 300;
-		margin: 10px 0 0 0.8em;
-	}
-
-	/* Deployment made easy */
-
-	.row-easy-deployment {
-		background-color: $box_solid_grey;
-	}
-
-	/* A cutting-edge yet reliable release cadence */
-
-	.row-reliable-release {
-		padding-top: 0;
-		padding-bottom: 0;
-	}
-
-	.row-reliable-release img {
-		position: relative;
-		left: -40px;
-		margin-bottom: -24px;
-	}
-
-	.row-reliable-release h3 {
-		padding-top: 20px;
-	}
-
-	/* Support that's tailored to the needs of developers */
-
-	.row-tailored-support {
-		border-bottom: 0;
-	}
-
-	.row-tailored-support table {
-		margin: 20px 0;
-	}
-} /* end pc-developers-desktop */
-
-/*	@section photos-and-videos
--------------------------------------------------------------- */
-.desktop-features-social-and-email .eight-col.box {
-	overflow: hidden;
-	position: relative;
-}
-
-.desktop-features-photos-and-videos .intro {
-	min-height: 337px;
-}
-.desktop-features-photos-and-videos .intro img.right {
-	bottom: 0;
-	position: absolute;
-	right: -40px;
-	top: 9px;
-}
-
-.desktop-features-photos-and-videos .eight-col.box img.right {
-	bottom: 0;
-	position: absolute;
-	right: 0;
-	top: auto;
-}
-
-.row-organise .box {
-	height: 258px;
-}
-
-/*	@section contextualised footer #context-footer
--------------------------------------------------------------- */
-.desktop-context-footer .feature-two {
-	background: url(../img/pictograms/pictogram-download-136.png) 176% 22% no-repeat;
-	min-height: 170px;
-
-	p {
-		padding-right: 60px;
-	}
-
-}
-
-body.desktop-take-the-tour {
-  .row-hero {
-    background: url("../img/desktop/tour-screen.jpg") no-repeat scroll 425px 0;
-    min-height: 360px;
-  }
-}
-
-/*	@section UbuntuKylin
--------------------------------------------------------------- */
-$item_margin: 40px;
-
-body.desktop-ubuntu-kylin, body.desktop-ubuntu-kylin-chinese {
-	.lang-switch {
-		position: absolute;
-		top: -20px;
-		right: 40px;
-	}
-	.screenshot-shadowed {
-		margin-left: -5px;
-	}
-	.row-hero {
-		background: url(../img/desktop/image-kylin-laptop.jpg) 498px 20px no-repeat;
-		padding-bottom: 55px;
-	}
-
-	.row-partnership ul {
-		margin-left: -$item_margin;
-
-		li {
-			margin-left: $item_margin;
-		}
-	}
-	.row-ubuntu-kylin-more img {
-		margin-top: -95px;
-	}
-} /* end body.desktop-ubuntukylin */
-
-body.desktop-ubuntu-kylin-chinese .row-hero {
-	padding-bottom: 80px;
-}
-
-.tabbed-menu-hover {
-	background: url(../img/desktop/image-for-you.jpg) 42px 40px no-repeat;
-	padding-bottom: 80px;
-}
-
-.tabbed-menu-hover li {
-	background: transparent;
-	margin-bottom: -20px;
-	padding-bottom: 20px;
-	float: left;
-	display: block;
-	position: relative;
-	z-index: 1;
-}
-
-.tabbed-menu-hover li p, .tabbed-menu-hover h3 {
-	position: relative;
-	z-index: 999;
-}
-
-.tabbed-menu-hover img {
-  position: absolute;
-  top: 0;
-  opacity: 0;
-	right: 523px;
-  z-index: -50;
-  -webkit-transition:  opacity .25s ease;
-  -moz-transition: opacity .25s ease;
-  -o-transition:  opacity .25s ease;
-  -ms-transition:  opacity .25s ease;
-  transition:  opacity .25s ease;
-}
-
-li#feature-for-business > img, li#feature-for-business:hover > img {
-	z-index: 1;
-	top: -82px;
-	right: 523px;
-	left: auto;
-	opacity: 1;
-}
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-	li#feature-for-business > img, li#feature-for-business:hover > img {
-		top: -80px;
-	}
-}
-li#feature-for-business > img { opacity: 0; }
-
-li#feature-for-developers > img, li#feature-for-developers:hover > img {
-	z-index: 1;
-	opacity: 1;
-	top: -212px;
-	right: 523px;
-	left: auto;
-}
-
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-  li#feature-for-developers > img, li#feature-for-developers:hover > img {
-		top: -208px;
-  }
-}
-
-li#feature-for-developers > img { opacity: 0; }
-
-
diff --git a/templates/static/css/section/download.scss b/templates/static/css/section/download.scss
deleted file mode 100644
index c7a332c3dbc..00000000000
--- a/templates/static/css/section/download.scss
+++ /dev/null
@@ -1,807 +0,0 @@
-@charset "UTF-8";
-/* ---------------------------------------------------------------
-------------------------------------------------------------------
-	DO NOT EDIT STYLES.CSS
-	It is autogenerated. 
-	
-	Project:		Ubuntu Front-End download section
-	Author:			Web Team at Canonical Ltd
-	Last edited by: 
-	Last edited on: 
-  
-  	CONTENTS:
-	-----------------------------------------------------------------
-	@section download homepage
-	@section download >  desktop/server & cloud
-	@section download > download-zh-CN
-	@section help
-
-	@section Needs to go into patterns
-
-	@this may turn into a pattern
-	
-	Rounded corners
-	-----------------------------------------------------------------
-	@include rounded_corners(top-left top-right bottom-right bottom-left);
-		examples
-		@include rounded_corners(0 0 4px 4px); rounded bottoms
-		@include rounded_corners(4px); all corners rounded
-		
-	Base grid sass, this lives in /sites/core/static/css/core-grid.scss
-	-----------------------------------------------------------------
-	$base: 			16;
-	$column_width:	( 60 / $base )em;
-	$gutter_width: 	( 20 / $base )em;
-	$grid_column: 	( 57 / $base )em; nested columns
-	$grid_gutter: 	( 18 / $base )em;
-	
-	Available grid widths
-	-----------------------------------------------------------------
-	$one_col - 100%
-
-	Using these enables us to give individual elements specific widths without adding a static width:
-
-	padding: $gutter_width;
-	width: 100% - ( 2 * $gutter_width );
-
-	Colour definitiions are in /sites/core/static/css/core-constants.scss
-	-----------------------------------------------------------------
-	$ubuntu_orange:			#dd4814; ubuntu orange (used for text links also on any site except canonical) 
-	$canonical_aubergine:	#772953; canonical aubergine 
-	$light_aubergine:		#77216f; light aubergine (consumer) 
-	$mid_aubergine:			#5e2750; mid aubergine (both) 
-	$dark_aubergine:		#2c001e; dark aubergine (enterprise) 
-	$warm_grey:				#aea79f; warm grey 
-	$cool_grey:				#333333; cool grey
-	$light_grey:			#f7f7f7; light grey
-	
-	notifications 
-	$error:					#df382c; red 
-	$warning:				#eca918; yellow 
-	$success:				#38b44a; green 
-	$information:			#19b6ee; cyan 
-	
-	colour coded status - from negative to positive (icon: canonical circle) 
-	$status_red:			#df382c; red, for status that require immediate attention 
-	$status_grey:			#aea79f; grey, for disabled status or ones that don�t require attention 
-	$status_yellow:			#efb73e; yellow, for status that require attention 
-	$status_blue:			#19b6ee; blue, for status that don�t require action 
-	$status_green:			#38b44a; green, for positive status 
-	
-	misc colours 
-	$box_solid_grey:		#EFEFEF;
-	
-	$link_color:			$ubuntu_orange; This is the global link color, mainly used for links in content
-		
-	Notes:
-	-----------------------------------------------------------------
-	Using '.yui3-js-enabled' for CSS with JS enabled as it's there for free atm, be nice to have just js-enabled as a class.
-		
------------------------------------------------------------------
--------------------------------------------------------------- */
-//@import "core-constants";
-
-/*	@section download homepage
--------------------------------------------------------------- */
-.download .last-row {
-	margin-bottom: 60px;	
-}
-
-.download .chinese-download {
-	margin-bottom: 20px;
-}
-
-.download .row-hero { 
-	margin-bottom: 0;
-	border-bottom: 0;
-}
-
-body.download-desktop-home {
-  
-  .download-button {
-    margin-top: -73px;
-    border-left: 1px dotted $warm_grey;
-    padding-left: $gutter_width;
-    width: 277px;
-  }
-  
-  .row .download-description {
-    border: 0;
-    margin-right: 0;
-  }
-}
-
-.download .row-box {
-	border-bottom: 0;
-}
-
-.download-home .row-hero {
-	padding-bottom: 0;
-}
-.download-home .row-hero p { @include font_size (19.5); }
-
-.row-list-download {
-	padding-bottom: 0; 
-	padding-top: 0; 
-}
-
-.row-list-download h2 a {
-	@include font_size (12);
-	display: block;
-	position: relative;
-	z-index: 2;
-}
-
-.chinese-download {
-	padding-top: 0;
-}
-
-.row-list-download .box { 
-	padding-bottom: 0; 
-	padding-left: 160px;
-}
-
-.row-list-download .desktop {
-	padding-left: 0;
-}
-
-.row-list-download .desktop #download-desktop {
-	background: #fff url(../img/pictograms/pictogram-orange-desktop-113x113.png) 20px 0 no-repeat;
-	padding: 0 0 20px 160px;
-}
-
-.row-list-download .server {
-	background: #fff url(../img/pictograms/pictogram-server-113x113.png) 20px center no-repeat;
-	color: $cool_grey;
-	padding-bottom: 20px;
-}
-
-.row-list-download .cloud {
-	background: #fff url(../img/pictograms/pictogram-cloud-113x113.png) 20px center no-repeat;
-	color: $cool_grey;
-	padding-bottom: 20px;
-} 
-
-.row-list-download .server h2 a,
-.row-list-download .cloud h2 a {
-	margin-bottom: -180px;
-	margin-left: -160px;
-	margin-right: -20px;
-	padding: 20px 0 180px 160px;
-	margin-top: -20px;
-}
-
-.windows-installer {
-	@include box_sizing;
-	@include font_size (13);
-	background: $light_grey url(../img/pictograms/pictogram-windows-44x44.png) $gutter_width center no-repeat;
-	border-top: 2px solid #e3e3e3;
-	display: inline-block;
-	margin-left: -(25/$base)em;
-	margin-right: -(25/$base)em;
-	padding: $gutter_width $gutter_width $gutter_width 84px;
-}
-
-body.download-desktop p.ubuntu-upgrade, p.ubuntu-upgrade {
-	background: $light_grey url(../img/pictograms/pictorgram-upgrade-44x44.png) 20px 10px no-repeat;
-	border-top: 2px solid #e3e3e3;
-	display: block;
-	margin-bottom: 0;
-	padding: 20px 0 20px 84px;
-}
-
-body.download-desktop-home p.ubuntu-upgrade {
-	background-position: 0 10px;
-	border: 0;
-	margin: 0;
-	padding: 20px 0 20px 64px;
-}
-
-.desktop p.ubuntu-upgrade {
-	margin-right: -21px;
-}
-
-.alternative-options {
-	border-top: 1px dotted $warm_grey;
-	padding: 20px 0 0;
-}
-
-.box-chinese { padding-left: $four_col; }
-
-.box-chinese img {
-	left: $gutter_width;
-	position: absolute;
-	top: 1.538em;
-}
-
-/* heros */
-body.download-desktop-windows-installer .row-hero, 
-body.download-alternative-downloads .row-hero, 
-body.download-desktop-upgrade .row-hero, 
-body.download-desktop-zh-CN .row-hero { background: none; }
-
-body.download-desktop-windows-installer .row-windows-installer .box-highlight {
-	background: #fff url(../img/pictograms/pictogram-windows-143x143.png) 40px 40px no-repeat;
-	padding-left: $three_col;
-}
-
-body.download-desktop-windows-installer .row-windows-installer .box-highlight p {
-	padding-right: $gutter_width;
-}
-
-body.download-desktop-zh-CN .row-zh-CN .box-highlight { 
-	@include box_sizing;
-}
-
-body.download-desktop-zh-CN .row-zh-CN .box-highlight h2,
-body.download-desktop-zh-CN .row-zh-CN .box-highlight p {
-	padding-right: 20px;
-}
-
-/*body.download .row-hero .box { padding-left: $three_col; }*/
-
-/*	@section download > desktop/server & cloud
--------------------------------------------------------------- */
-body.download .box-highlight,
-body.download .box { margin-bottom: 20px; }
-body.download .box-highlight.no-margin-bottom { margin-bottom: 0px; }
-
-body.download-desktop .windows-8 { padding-top: $gutter_width; }
-
-body.download .desktop.box-highlight { margin-bottom: 40px; }
-
-body.download .download-description {
-	@include box_sizing;
-	border-right: 1px dotted $warm_grey;
-	display: inline;
-	float: left;
-	min-height: 8em;
-	padding-right: 10px;
-}
-
-body.download-desktop-zh-CN .download-description { min-height: 9.5em; }
-
-body.download .inner-wrapper form fieldset {
-	background: none;
-	margin: 0;
-	padding-left: $gutter_width;
-	padding: 0;
-}
-
-body.download .inner-wrapper form select { 
-	font-weight: 300;
-	margin-bottom: 30px;
-	width: 100%;
-}
-
-body.download .inner-wrapper form button, 
-body.download .inner-wrapper form .link-cta-download {
-	@include font_size (19.5);
-	padding: 10px 14px;
-	border: 0;
-	float: left;
-	text-align: center;
-	width: 100%;
-}	
-
-body.download-desktop-zh-CN .inner-wrapper form button { margin-left: 0; }
-
-body.download .inner-wrapper .small {
-	@include font_size (13);
-	display: block;
-	text-align: center;
-	margin-top: -.5em;
-}
-
-body.download-desktop-zh-CN .inner-wrapper  {
-	.link-cta-download, .small { margin-left: 0; }
-}
-
-body.download-cloud-home .row-hero form.form-download p { font-size: 0.8125em; }
-
-body.download-desktop {
-  div.warning { 
-    padding: 20px 40px;
-    margin-bottom: $gutter_width;
-  }
-}
-
-/* body.download */
-
-.download-cloud #download-other .cloud .box {
-	background: #fff url(../img/pictograms/pictogram-cloud-113x113.png) 93% 60px no-repeat;
-	min-height: 0;
-	padding-right: $four_col;
-	padding-top: 1.538em;
-}
-
-#download-other form fieldset {
-	background: none;
-	padding: 0;
-}
-
-body.download .inner-wrapper #download-other form button {
-	@include font_size (16);
-	float: left;
-	margin: 0;
-	display: inline-block;
-	text-align: center;
-	width: 100%;
-}
-
-#download-other .box {
-	background-color: #fff;
-	background-position: center $gutter_width;
-	background-repeat: no-repeat;
-	padding-top: 153px;
-	min-height: 27.5em;
-	margin-bottom: 0;
-}
-
-body.download-desktop-zh-CN #download-other .box { min-height: auto; }
-
-body.download-desktop #download-other .box { margin-bottom: 20px; }
-
-body.download-server #download-other .box { min-height: 34em; }
-
-#download-other .windows { background-image: url(../img/pictograms/pictogram-windows-grey-113x113.png); }
-#download-other .cd { background-image: url(../img/pictograms/pictogram-cd-grey-113x113.png); }
-#download-other .chinese { background-image: url(../img/pictograms/ubuntu-kylin-chinese-grey.png); }
-#download-other .cloud { background-image: url(../img/pictograms/pictogram-juju-113x113.png); }
-body.download-server #download-other .juju,
-body.download-cloud #download-other .juju { 
-	background: #fff url(../img/pictograms/pictogram-juju-113x113.png) 90% 50% no-repeat;
-	min-height: 1em;
-	padding-top: 20px;
-}
-body.download-server #download-other .juju p,
-body.download-cloud #download-other .juju p  { padding-right: 150px; }
-body.download-desktop-windows-installer #download-other .desktop  { background-image: url(../img/pictograms/pictogram-desktop-113x113.png); }
-body.download .sidebar .box { padding-top: 0; }
-
-body.download-help .box-arm,
-body.download-help .box-juju  {
-	padding-left: $four_col/* + ( $gutter_width / 2 )/*/;
-	margin-bottom: 0;
-}
-
-body.download-help .box-juju { 
-	padding-top: 2 * $gutter_width; 
-	padding-bottom: 2 * $gutter_width; 
-}
-
-body.download #download-other {
-  @include rounded_corners(4px);
-	background: $light_grey;
-	padding: 20px;
-	/*width: 67.9292%;*/
-}
-
-body.download .sidebar {	
-	h4 { font-size: 1em; font-weight: normal; }
-		
-	li h5 { 
-		font-weight: normal; 
-		color: $cool_grey; 
-		margin-left: -15px; 
-	}
-	
-	ul { margin-left: 15px }
-	
-	ul ul { margin-left: 0; }
-	
-	li li { list-style-type: disc; }
-}
-
-body.download .box h4 {
-	@include font_size (16);
-	font-weight: normal;
-}
-
-body.download .sidebar li a, 
-body.download .box ul li, 
-body.download-alternative-downloads ul li { color: $ubuntu_orange; }
-
-body.download .box ul li p {
-	color: #333;	
-	margin-bottom: 0;
-}
-
-body.download .sidebar li a:after, 
-body.download-alternative-downloads .box li a:after { content: "\0000a0›"; }
-
-/* @section download > download-zh-CN */
-body.download-zh-CN h1 span,
-body.download-zh-CN h2 span {
-	float: none;
-	clear: none;
-	display: inline;
-}
-
-/* Thank you pages */
-.download-thank-you .row-download-thanks {
-	.four-col .box {
-		background-color: #fff;
-		background-position: center $gutter_width;
-		background-repeat: no-repeat;
-		padding-top: 160px;
-	}
-	.one .box { background-image: url(../img/pictograms/pictogram-ubuntu-one-113x113.png); }
-	.support .box { background-image: url(../img/pictograms/pictogram-support-113x113.png); }
-	.ask .box { background-image: url(../img/pictograms/pictogram-ask-ubuntu-113x113.png); }
-	.jumpstart .box { background-image:  url(../img/pictograms/pictogram-jumpstart-113x113.png); }
-	.advantage .box { background-image: url(../img/pictograms/pictogram-advantage-113x113.png); }
-	.consulting .box { background-image:  url(../img/pictograms/pictogram-consulting-113x113.png); }
-}
-
-.row-next-steps {
-	li {
-		border-right: 1px dotted $warm_grey;
-		margin: 0 $gutter_width 0 0;
-		padding-right: $gutter_width;
-		width: $four_col;
-	}
-	li.last-col {
-		border-right: 0;
-		margin-right: 0;
-		padding-right: 0;
-	}
-}
-
-/*	@section help
--------------------------------------------------------------- */
-#download-help {	
-	li {
-		border-bottom: 1px dotted $warm_grey;
-		margin-bottom: 1.25em;
-		min-height: 5em;
-		padding-bottom: .625em;
-		padding-left: $two_col;
-		position: relative;
-	}
-	
-	li:last-child { 
-		border-bottom: 0; 
-		margin-bottom: 0;
-	}
-	
-	li li {
-		border-bottom: 0;
-		list-style-type: disc;
-		padding-left: 0;
-		margin-bottom: 0;
-		min-height: 0;
-		color: #333;
-	}
-		
-	.box-tip {
-		background: #fff url(../img/pictograms/pictogram-download-tip-60x49.png) $gutter_width $gutter_width no-repeat;
-		margin-bottom: 1.538em;
-		padding-left: 100px;
-		padding-bottom: 1.25em;
-	}
-	
-	.box-tip p { margin-bottom: 0; }
-	
-	.row-wiki {
-		border-bottom: 1px dotted $warm_grey;
-		margin-top: 20px;
-	}
-	
-	dl {
-		@include font_size (16);
-	    border-top: 1px dotted #AEA79F;
-	    margin-bottom: 10px;
-	    padding-top: 10px;
-	    position: relative;
-	}
-	
-	dl.last { border-bottom: 1px dotted #AEA79F; }
-	
-	dt {
-	    display: inline-block;
-	    left: 0;
-	    position: absolute;
-	    top: 10px;
-	    width: 40%;
-	}
-	
-	dd {
-	    float: right;
-	    padding-bottom: 10px;
-	    width: 55%;
-	}
-		
-} /* end .download-help */
-
-.download-cloud-install-ubuntu-cloud #download-help dl:first-of-type {
-	border-top: 0;
-}
-
-.download-cloud-cloud-archive-instructions #download-help li { padding-left: 0; }
-
-#ubuntu-help {
-	margin-bottom: 60px;
-}
-
-#download-help li span, 
-#ubuntu-help li span {
-	@include font_size (36);
-  @include rounded_corners(40px);
-	background-color: #DD4814;
-  border: 3px solid #DD4814;
-  color: #fff;
-  display: block;
-  float: left;
-  height: 38px;
-  margin-left: -(80/36)em;
-  padding: 0 21px 20px 19px;
-  text-align: center;
-  vertical-align: top;
-  width: 18px;
-}
-
-#ubuntu-help li span { margin-left: 0; }
-	
-#download-help li.double span,
-#download-help li span.double,
-#ubuntu-help li.double span,
-#ubuntu-help li span.double { text-indent: -11px; }
-
-#ubuntu-help .no-numbers li {
-	padding-left: 0;
-}
-
-.row-ask {
-	margin-top: 20px;
-}
-
-.row-ask p {
-	padding: 15px 0 0;
-}
-
-body.download p.link-wrap {
-	clear: both;
-	display: inline-block; 
-	float: left;
-	margin-bottom: 10px;
-	width: 100%;
-}
-
-/* /download/help/install-ubuntu-cloud */
-.download-cloud-install-ubuntu-cloud {
-	.row .cloud, .row .server, .row .juju {
-    border-bottom: 1px dotted $warm_grey;
-		margin-bottom: 15px;
-		padding-bottom: 20px;
-	}
-	.row .juju { 
-		border: 0;
-		margin: 0;
-		padding: 0;
-	}
-	.row .cloud h3, .row .server h3, .row .juju h3 {
-		background-color: #fff;
-		background-position: left 50%;
-		background-repeat: no-repeat;
-		padding: 10px 0 10px 50px;
-	}
-	
-	.row .cloud h3 { background-image: url(../img/pictograms/image-picto-server-40.png); }
-	.row .server h3 { background-image: url(../img/pictograms/image-picto-openstack-40.png); }
-	.row .juju h3 { background-image: url(../img/pictograms/image-picto-juju-40.png); }
-	
-	.row .cloud h2, .row .server h2, .row .juju h2 { @include font_size (23); }
-	
-	#cloud-infra {
-		margin-top: 20px;
-		display: block;
-		float: left;
-		width: 100%;
-	}
-}
-
-/* Contribute page */
-
-.contribute-to-ubuntu {
-	form input[type=number] {
-        -webkit-border-radius: 2px;
-        -moz-border-radius: 2px;
-        border-radius: 2px;
-        background: #fff;
-        border: 1px solid #999;
-        font-family: Ubuntu,Arial,"libra sans",sans-serif;
-        padding: 4px;
-        width: 50px;
-        display: inline-block;
-        font-size: 16px;
-        padding-top: 2px;
-    }
-    form input[type=number]:focus {
-		border: 1px solid #000;
-	}
-
-    /* Styling for contributions slider rows */
-    .contribution-intro-row {
-        padding-bottom: 0;
-    }
-    .contribution-intro {
-    	display: none;
-    }
-    .contribution-intro:first-child {
-    	display: block;
-    }
-    .sliders-container {
-        background-color: #EFEFEF;
-        padding: 20px;
-        border-radius: 5px;
-        max-width: 584px;
-    }
-    .slider-area {
-        overflow: hidden;
-        margin-top: 20px;
-    }
-    .slider-area p {
-        margin-bottom: 0;
-    }
-    .slider-area:first-child {
-        margin-top: 0;
-    }
-
-    .slider-area p {
-        float: left;
-    }
-
-    .contribution-slider {
-        float: left;
-        margin-top: 4px;
-    }
-
-    .contribution-value, body.download .inner-wrapper .contribution-value {
-        float: right;
-        font-size: 16px;
-    }
-    .contribution-value label {
-        display: inline-block;
-        color: #AEA79F;
-    }
-
-    /* totalling area styling */
-    .contribution {
-        float: right;
-        font-size: 20px;
-    }
-    .contribution .price {
-        float: right;
-    }
-    .contribution .currency {
-        color: #AEA79F;
-    }
-    .contribution .final-amount {
-        display: inline-block;
-        padding: 0 5px;
-        border-radius: 5px;
-        text-align: right;
-    }
-    .price-equivalent {
-        max-width: 350px;
-    }
-    .price-equivalent p {
-        margin-bottom: 0;
-    }
-    .price-equivalent img {
-        float: left;
-        margin-right: 20px;
-        margin-bottom: 20px;
-    }
-    .price-equivalent .title {
-        font-weight: bold;
-    }
-    .price-equivalent .price {
-        color: #AEA79F;
-    }
-    .total-area {
-        max-width: 624px;
-    }
-    .total-area-row.noscript {
-        display: none;
-    }
-
-    .total-area .contribution .title {
-        margin-top: -0.3em;
-        margin-bottom: 0;
-    }
-    .total-area .contribution .price .final-amount {
-        font-weight: bold;
-    }
-
-    .contribute-row {
-        padding-top: 20px;
-    }
-    .contribute {
-        border-top: 1px solid #efefef;
-        padding-top: 20px;
-        max-width: 624px;
-    }
-    .contribute .pay-with-paypal, body.download .contribute button.pay-with-paypal {
-        float: right;
-        font-size: 1em;
-        width: auto;
-    }
-
-    /*  Slider styles */
-    .yui3-slider-content, .yui3-widget {
-        display: block;
-        padding: 5px 0;
-    }
-    .yui3-slider-rail-cap-left, .yui3-slider-rail-cap-right {
-        display: none;
-    }
-    .yui3-slider-rail {
-        display: block;
-        height: 4px;
-        background-color: #DD4713;
-        background: linear-gradient(to left, #E1DAD2 98.4%, #DD4713 0%);
-        border-radius: 2px;
-        overflow: visible;
-        box-shadow: inset 0px 1px 0px 0px rgba(0, 0, 0, 0.15);
-        cursor: pointer;
-    }
-    .yui3-slider-rail .yui3-slider-thumb {
-        width:  18px;
-        height: 18px;
-        border-radius: 4px;
-        background: #fff;
-        overflow: visible;
-        display: block;
-        position: relative;
-        top: -7px !important;
-        outline: none;
-        box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.2);
-        cursor: pointer;
-    }
-
-    .yui3-slider-rail .yui3-slider-thumb:hover {
-        -webkit-transform: scale(1.25, 1.25);
-        transform: scale(1.25, 1.25);
-        -ms-transition: transform 0.1s cubic-bezier(0.895, 0.03, 0.685, 0.22);
-        transition:  transform 0.1s cubic-bezier(0.895, 0.03, 0.685, 0.22);
-    }
-
-    .yui3-slider-thumb-shadow, .yui3-slider-thumb-image {
-        display: none;
-    }
-}
-
-/* Special overrides for JS-enabled */
-.js .contribute-to-ubuntu {
-    .contribution-intro:first-child {
-    	display: none;
-    }
-    .contribution-intro-row {
-    	min-height: 95px;
-    }
-
-    .slider-area p {
-        float: none;
-    }
-    .contribution-slider {
-    	min-height: 24px;
-    	min-width: 10px;
-    }
-}
-
-
-/* Desktop thankyou page */
-.download-thankyou {
-    .download-cross-sells {
-        margin-top: 40px;
-    }
-    .download-cross-sells .box-highlight {
-        height: 380px;
-    }
-    .download-cross-sells .box-highlight img {
-        display: block;
-        margin: 0 auto 20px auto;
-    }
-}
diff --git a/templates/static/css/section/download.scss.~2~ b/templates/static/css/section/download.scss.~2~
deleted file mode 100644
index 2220266b37b..00000000000
--- a/templates/static/css/section/download.scss.~2~
+++ /dev/null
@@ -1,613 +0,0 @@
-@charset "UTF-8";
-/* ---------------------------------------------------------------
-------------------------------------------------------------------
-	DO NOT EDIT STYLES.CSS
-	It is autogenerated. 
-	
-	Project:		Ubuntu Front-End download section
-	Author:			Web Team at Canonical Ltd
-	Last edited by: 
-	Last edited on: 
-  
-  	CONTENTS:
-	-----------------------------------------------------------------
-	@section download homepage
-	@section download >  desktop/server & cloud
-	@section download > download-zh-CN
-	@section help
-
-	@section Needs to go into patterns
-
-	@this may turn into a pattern
-	
-	Rounded corners
-	-----------------------------------------------------------------
-	@include rounded_corners(top-left top-right bottom-right bottom-left);
-		examples
-		@include rounded_corners(0 0 4px 4px); rounded bottoms
-		@include rounded_corners(4px); all corners rounded
-		
-	Base grid sass, this lives in /sites/core/static/css/core-grid.scss
-	-----------------------------------------------------------------
-	$base: 			16;
-	$column_width:	( 60 / $base )em;
-	$gutter_width: 	( 20 / $base )em;
-	$grid_column: 	( 57 / $base )em; nested columns
-	$grid_gutter: 	( 18 / $base )em;
-	
-	Available grid widths
-	-----------------------------------------------------------------
-	$one_col - 100%
-
-	Using these enables us to give individual elements specific widths without adding a static width:
-
-	padding: $gutter_width;
-	width: 100% - ( 2 * $gutter_width );
-
-	Colour definitiions are in /sites/core/static/css/core-constants.scss
-	-----------------------------------------------------------------
-	$ubuntu_orange:			#dd4814; ubuntu orange (used for text links also on any site except canonical) 
-	$canonical_aubergine:	#772953; canonical aubergine 
-	$light_aubergine:		#77216f; light aubergine (consumer) 
-	$mid_aubergine:			#5e2750; mid aubergine (both) 
-	$dark_aubergine:		#2c001e; dark aubergine (enterprise) 
-	$warm_grey:				#aea79f; warm grey 
-	$cool_grey:				#333333; cool grey
-	$light_grey:			#f7f7f7; light grey
-	
-	notifications 
-	$error:					#df382c; red 
-	$warning:				#eca918; yellow 
-	$success:				#38b44a; green 
-	$information:			#19b6ee; cyan 
-	
-	colour coded status - from negative to positive (icon: canonical circle) 
-	$status_red:			#df382c; red, for status that require immediate attention 
-	$status_grey:			#aea79f; grey, for disabled status or ones that don�t require attention 
-	$status_yellow:			#efb73e; yellow, for status that require attention 
-	$status_blue:			#19b6ee; blue, for status that don�t require action 
-	$status_green:			#38b44a; green, for positive status 
-	
-	misc colours 
-	$box_solid_grey:		#EFEFEF;
-	
-	$link_color:			$ubuntu_orange; This is the global link color, mainly used for links in content
-		
-	Notes:
-	-----------------------------------------------------------------
-	Using '.yui3-js-enabled' for CSS with JS enabled as it's there for free atm, be nice to have just js-enabled as a class.
-		
------------------------------------------------------------------
--------------------------------------------------------------- */
-//@import "core-constants";
-
-/*	@section download homepage
--------------------------------------------------------------- */
-.download .last-row {
-	margin-bottom: 60px;	
-}
-
-.download .chinese-download {
-	margin-bottom: 20px;
-}
-
-.download .row-hero { 
-	margin-bottom: 0;
-	border-bottom: 0;
-}
-
-body.download-desktop-home {
-  
-  .download-button {
-    margin-top: -73px;
-    border-left: 1px dotted $warm_grey;
-    padding-left: $gutter_width;
-    width: 277px;
-  }
-  
-  .row .download-description {
-    border: 0;
-    margin-right: 0;
-  }
-}
-
-.download .row-box {
-	border-bottom: 0;
-}
-
-.download-home .row-hero {
-	padding-bottom: 0;
-}
-.download-home .row-hero p { @include font_size (19.5); }
-
-.row-list-download {
-	padding-bottom: 0; 
-	padding-top: 0; 
-}
-
-.row-list-download h2 a {
-	@include font_size (12);
-	display: block;
-	position: relative;
-	z-index: 2;
-}
-
-.chinese-download {
-	padding-top: 0;
-}
-
-.row-list-download .box { 
-	padding-bottom: 0; 
-	padding-left: 160px;
-}
-
-.row-list-download .desktop {
-	padding-left: 0;
-}
-
-.row-list-download .desktop #download-desktop {
-	background: #fff url(../img/pictograms/pictogram-orange-desktop-113x113.png) 20px 0 no-repeat;
-	padding: 0 0 20px 160px;
-}
-
-.row-list-download .server {
-	background: #fff url(../img/pictograms/pictogram-server-113x113.png) 20px center no-repeat;
-	color: $cool_grey;
-	padding-bottom: 20px;
-}
-
-.row-list-download .cloud {
-	background: #fff url(../img/pictograms/pictogram-cloud-113x113.png) 20px center no-repeat;
-	color: $cool_grey;
-	padding-bottom: 20px;
-} 
-
-.row-list-download .server h2 a,
-.row-list-download .cloud h2 a {
-	margin-bottom: -180px;
-	margin-left: -160px;
-	margin-right: -20px;
-	padding: 20px 0 180px 160px;
-	margin-top: -20px;
-}
-
-.windows-installer {
-	@include box_sizing;
-	@include font_size (13);
-	background: $light_grey url(../img/pictograms/pictogram-windows-44x44.png) $gutter_width center no-repeat;
-	border-top: 2px solid #e3e3e3;
-	display: inline-block;
-	margin-left: -(25/$base)em;
-	margin-right: -(25/$base)em;
-	padding: $gutter_width $gutter_width $gutter_width 84px;
-}
-
-body.download-desktop p.ubuntu-upgrade, p.ubuntu-upgrade {
-	background: $light_grey url(../img/pictograms/pictorgram-upgrade-44x44.png) 20px 10px no-repeat;
-	border-top: 2px solid #e3e3e3;
-	display: block;
-	margin-bottom: 0;
-	padding: 20px 0 20px 84px;
-}
-
-body.download-desktop-home p.ubuntu-upgrade {
-	background-position: 0 10px;
-	border: 0;
-	margin: 0;
-	padding: 20px 0 20px 64px;
-}
-
-.desktop p.ubuntu-upgrade {
-	margin-right: -21px;
-}
-
-.alternative-options {
-	border-top: 1px dotted $warm_grey;
-	padding: 20px 0 0;
-}
-
-.box-chinese { padding-left: $four_col; }
-
-.box-chinese img {
-	left: $gutter_width;
-	position: absolute;
-	top: 1.538em;
-}
-
-/* heros */
-body.download-desktop-windows-installer .row-hero, 
-body.download-alternative-downloads .row-hero, 
-body.download-desktop-upgrade .row-hero, 
-body.download-desktop-zh-CN .row-hero { background: none; }
-
-body.download-desktop-windows-installer .row-windows-installer .box-highlight {
-	background: #fff url(../img/pictograms/pictogram-windows-143x143.png) 40px 40px no-repeat;
-	padding-left: $three_col;
-}
-
-body.download-desktop-windows-installer .row-windows-installer .box-highlight p {
-	padding-right: $gutter_width;
-}
-
-body.download-desktop-zh-CN .row-zh-CN .box-highlight { 
-	@include box_sizing;
-}
-
-body.download-desktop-zh-CN .row-zh-CN .box-highlight h2,
-body.download-desktop-zh-CN .row-zh-CN .box-highlight p {
-	padding-right: 20px;
-}
-
-/*body.download .row-hero .box { padding-left: $three_col; }*/
-
-/*	@section download > desktop/server & cloud
--------------------------------------------------------------- */
-body.download .box-highlight,
-body.download .box { margin-bottom: 20px; }
-body.download .box-highlight.no-margin-bottom { margin-bottom: 0px; }
-
-body.download-desktop .windows-8 { padding-top: $gutter_width; }
-
-body.download .desktop.box-highlight { margin-bottom: 40px; }
-
-body.download .download-description {
-	@include box_sizing;
-	border-right: 1px dotted $warm_grey;
-	display: inline;
-	float: left;
-	min-height: 8em;
-	padding-right: 10px;
-}
-
-body.download-desktop-zh-CN .download-description { min-height: 9.5em; }
-
-body.download .inner-wrapper form fieldset {
-	background: none;
-	margin: 0;
-	padding-left: $gutter_width;
-	padding: 0;
-}
-
-body.download .inner-wrapper form select { 
-	font-weight: 300;
-	margin-bottom: 30px;
-	width: 100%;
-}
-
-body.download .inner-wrapper form button, 
-body.download .inner-wrapper form .link-cta-download {
-	@include font_size (19.5);
-	padding: 10px 14px;
-	border: 0;
-	float: left;
-	text-align: center;
-	width: 100%;
-}	
-
-body.download-desktop-zh-CN .inner-wrapper form button { margin-left: 0; }
-
-body.download .inner-wrapper .small {
-	@include font_size (13);
-	display: block;
-	text-align: center;
-	margin-top: -.5em;
-}
-
-body.download-desktop-zh-CN .inner-wrapper  {
-	.link-cta-download, .small { margin-left: 0; }
-}
-
-body.download-cloud-home .row-hero form.form-download p { font-size: 0.8125em; }
-
-body.download-desktop {
-  div.warning { 
-    padding: 20px 40px;
-    margin-bottom: $gutter_width;
-  }
-}
-
-/* body.download */
-
-.download-cloud #download-other .cloud .box {
-	background: #fff url(../img/pictograms/pictogram-cloud-113x113.png) 93% 60px no-repeat;
-	min-height: 0;
-	padding-right: $four_col;
-	padding-top: 1.538em;
-}
-
-#download-other form fieldset {
-	background: none;
-	padding: 0;
-}
-
-body.download .inner-wrapper #download-other form button {
-	@include font_size (16);
-	float: left;
-	margin: 0;
-	display: inline-block;
-	text-align: center;
-	width: 100%;
-}
-
-#download-other .box {
-	background-color: #fff;
-	background-position: center $gutter_width;
-	background-repeat: no-repeat;
-	padding-top: 153px;
-	min-height: 27.5em;
-	margin-bottom: 0;
-}
-
-body.download-desktop-zh-CN #download-other .box { min-height: auto; }
-
-body.download-desktop #download-other .box { margin-bottom: 20px; }
-
-body.download-server #download-other .box { min-height: 34em; }
-
-#download-other .windows { background-image: url(../img/pictograms/pictogram-windows-grey-113x113.png); }
-#download-other .cd { background-image: url(../img/pictograms/pictogram-cd-grey-113x113.png); }
-#download-other .chinese { background-image: url(../img/pictograms/ubuntu-kylin-chinese-grey.png); }
-#download-other .cloud { background-image: url(../img/pictograms/pictogram-juju-113x113.png); }
-body.download-server #download-other .juju,
-body.download-cloud #download-other .juju { 
-	background: #fff url(../img/pictograms/pictogram-juju-113x113.png) 90% 50% no-repeat;
-	min-height: 1em;
-	padding-top: 20px;
-}
-body.download-server #download-other .juju p,
-body.download-cloud #download-other .juju p  { padding-right: 150px; }
-body.download-desktop-windows-installer #download-other .desktop  { background-image: url(../img/pictograms/pictogram-desktop-113x113.png); }
-body.download .sidebar .box { padding-top: 0; }
-
-body.download-help .box-arm,
-body.download-help .box-juju  {
-	padding-left: $four_col/* + ( $gutter_width / 2 )/*/;
-	margin-bottom: 0;
-}
-
-body.download-help .box-juju { 
-	padding-top: 2 * $gutter_width; 
-	padding-bottom: 2 * $gutter_width; 
-}
-
-body.download #download-other {
-  @include rounded_corners(4px);
-	background: $light_grey;
-	padding: 20px;
-	/*width: 67.9292%;*/
-}
-
-body.download .sidebar {	
-	h4 { font-size: 1em; font-weight: normal; }
-		
-	li h5 { 
-		font-weight: normal; 
-		color: $cool_grey; 
-		margin-left: -15px; 
-	}
-	
-	ul { margin-left: 15px }
-	
-	ul ul { margin-left: 0; }
-	
-	li li { list-style-type: disc; }
-}
-
-body.download .box h4 {
-	@include font_size (16);
-	font-weight: normal;
-}
-
-body.download .sidebar li a, 
-body.download .box ul li, 
-body.download-alternative-downloads ul li { color: $ubuntu_orange; }
-
-body.download .box ul li p {
-	color: #333;	
-	margin-bottom: 0;
-}
-
-body.download .sidebar li a:after, 
-body.download-alternative-downloads .box li a:after { content: "\0000a0›"; }
-
-/* @section download > download-zh-CN */
-body.download-zh-CN h1 span,
-body.download-zh-CN h2 span {
-	float: none;
-	clear: none;
-	display: inline;
-}
-
-/* Thank you pages */
-.download-thank-you .row-download-thanks {
-	.four-col .box {
-		background-color: #fff;
-		background-position: center $gutter_width;
-		background-repeat: no-repeat;
-		padding-top: 160px;
-	}
-	.one .box { background-image: url(../img/pictograms/pictogram-ubuntu-one-113x113.png); }
-	.support .box { background-image: url(../img/pictograms/pictogram-support-113x113.png); }
-	.ask .box { background-image: url(../img/pictograms/pictogram-ask-ubuntu-113x113.png); }
-	.jumpstart .box { background-image:  url(../img/pictograms/pictogram-jumpstart-113x113.png); }
-	.advantage .box { background-image: url(../img/pictograms/pictogram-advantage-113x113.png); }
-	.consulting .box { background-image:  url(../img/pictograms/pictogram-consulting-113x113.png); }
-}
-
-.row-next-steps {
-	li {
-		border-right: 1px dotted $warm_grey;
-		margin: 0 $gutter_width 0 0;
-		padding-right: $gutter_width;
-		width: $four_col;
-	}
-	li.last-col {
-		border-right: 0;
-		margin-right: 0;
-		padding-right: 0;
-	}
-}
-
-/*	@section help
--------------------------------------------------------------- */
-#download-help {	
-	li {
-		border-bottom: 1px dotted $warm_grey;
-		margin-bottom: 1.25em;
-		min-height: 5em;
-		padding-bottom: .625em;
-		padding-left: $two_col;
-		position: relative;
-	}
-	
-	li:last-child { 
-		border-bottom: 0; 
-		margin-bottom: 0;
-	}
-	
-	li li {
-		border-bottom: 0;
-		list-style-type: disc;
-		padding-left: 0;
-		margin-bottom: 0;
-		min-height: 0;
-		color: #333;
-	}
-		
-	.box-tip {
-		background: #fff url(../img/pictograms/pictogram-download-tip-60x49.png) $gutter_width $gutter_width no-repeat;
-		margin-bottom: 1.538em;
-		padding-left: 100px;
-		padding-bottom: 1.25em;
-	}
-	
-	.box-tip p { margin-bottom: 0; }
-	
-	.row-wiki {
-		border-bottom: 1px dotted $warm_grey;
-		margin-top: 20px;
-	}
-	
-	dl {
-		@include font_size (16);
-	    border-top: 1px dotted #AEA79F;
-	    margin-bottom: 10px;
-	    padding-top: 10px;
-	    position: relative;
-	}
-	
-	dl.last { border-bottom: 1px dotted #AEA79F; }
-	
-	dt {
-	    display: inline-block;
-	    left: 0;
-	    position: absolute;
-	    top: 10px;
-	    width: 40%;
-	}
-	
-	dd {
-	    float: right;
-	    padding-bottom: 10px;
-	    width: 55%;
-	}
-		
-} /* end .download-help */
-
-.download-cloud-install-ubuntu-cloud #download-help dl:first-of-type {
-	border-top: 0;
-}
-
-.download-cloud-cloud-archive-instructions #download-help li { padding-left: 0; }
-
-#ubuntu-help {
-	margin-bottom: 60px;
-}
-
-#download-help li span, 
-#ubuntu-help li span {
-	@include font_size (36);
-  @include rounded_corners(40px);
-	background-color: #DD4814;
-  border: 3px solid #DD4814;
-  color: #fff;
-  display: block;
-  float: left;
-  height: 38px;
-  margin-left: -(80/36)em;
-  padding: 0 21px 20px 19px;
-  text-align: center;
-  vertical-align: top;
-  width: 18px;
-}
-
-#ubuntu-help li span { margin-left: 0; }
-	
-#download-help li.double span,
-#download-help li span.double,
-#ubuntu-help li.double span,
-#ubuntu-help li span.double { text-indent: -11px; }
-
-#ubuntu-help .no-numbers li {
-	padding-left: 0;
-}
-
-.row-ask {
-	margin-top: 20px;
-}
-
-.row-ask p {
-	padding: 15px 0 0;
-}
-
-body.download p.link-wrap {
-	clear: both;
-	display: inline-block; 
-	float: left;
-	margin-bottom: 10px;
-	width: 100%;
-}
-
-/* /download/help/install-ubuntu-cloud */
-.download-cloud-install-ubuntu-cloud {
-	.row .cloud, .row .server, .row .juju {
-    border-bottom: 1px dotted $warm_grey;
-		margin-bottom: 15px;
-		padding-bottom: 20px;
-	}
-	.row .juju { 
-		border: 0;
-		margin: 0;
-		padding: 0;
-	}
-	.row .cloud h3, .row .server h3, .row .juju h3 {
-		background-color: #fff;
-		background-position: left 50%;
-		background-repeat: no-repeat;
-		padding: 10px 0 10px 50px;
-	}
-	
-	.row .cloud h3 { background-image: url(../img/pictograms/image-picto-server-40.png); }
-	.row .server h3 { background-image: url(../img/pictograms/image-picto-openstack-40.png); }
-	.row .juju h3 { background-image: url(../img/pictograms/image-picto-juju-40.png); }
-	
-	.row .cloud h2, .row .server h2, .row .juju h2 { @include font_size (23); }
-	
-	#cloud-infra {
-		margin-top: 20px;
-		display: block;
-		float: left;
-		width: 100%;
-	}
-}
-
-.download-cross-sells {
-    margin-top: 40px;
-}
-.download-cross-sells .box-highlight {
-    height: 330px;
-}
-.download-cross-sells .box-highlight img {
-    display: block;
-    margin: 0 auto 20px auto;
-}
diff --git a/templates/static/css/section/error.scss b/templates/static/css/section/error.scss
deleted file mode 100644
index 8fc17d88920..00000000000
--- a/templates/static/css/section/error.scss
+++ /dev/null
@@ -1,55 +0,0 @@
-@charset "UTF-8";
-/*  @section error
--------------------------------------------------------------- */
-
-/**
- * 404 page
- *
- * @subsection 404
- */
-
-body.error-page {
-  #main-content {
-    .hero-box {
-    	padding-bottom: 0; 
-    	position: relative;
-    
-      div{
-    		min-height: 360px;
-        margin-bottom: -20px;
-        position: relative;
-      }
-      img{
-        position: absolute;
-        bottom: 0;
-        left: 0;
-      }
-      span {
-        background: url(../img/error/image-quote-154.png);
-        color: #fff;
-        font-size: 90px;
-        font-weight: bold;
-        height: 126px;
-        padding-top: 28px;
-        position: absolute;
-        right: 0;
-        text-align: center;
-        top: 10px;
-        width: 154px;
-      }
-      p {
-        font-size: 21px;
-      }
-      .last-col {
-        padding-top: 110px;
-      }
-    }
-    
-    h2 {
-      font-size: 21px;
-    }
-    .events a{
-      float:right;
-    }
-  }
-}
\ No newline at end of file
diff --git a/templates/static/css/section/homepage.scss b/templates/static/css/section/homepage.scss
deleted file mode 100644
index 1d1241aa848..00000000000
--- a/templates/static/css/section/homepage.scss
+++ /dev/null
@@ -1,1104 +0,0 @@
-/*
-	DO NOT EDIT HOMEPAGE.CSS
-	It is autogenerated.
-
-	Project:		Ubuntu homepage
-	Author:			Web Team at Canonical Ltd
-	Last edited by:
-	Last edited on:
-
-  	CONTENTS:
-	-----------------------------------------------------------------
-	body.homepage - general homepage styles
-	body.homepage-default - default fall-back design - currently 12.10
-	body.homepage-humble - Humble Indie Bundle specific
-	body.homepage-phone  - Ubuntu phone specific
-	body.homepage-hp - HP specific (UK only)
-	body.homepage-sputnik - Dell Sputnik specific (US & Canada, Germany and France only)
-	body.homepage-dell-server - Dell server
-	body.homepage-juju
-	body.homepage-cag
-	body.homepage-charm - Charm championship
-	body.homepage-edge - Edge
-	body.homepage-1310 - 13.10 launch
-
--------------------------------------------------------------- */
-body.homepage {
-
-	.box { background-color: #fff; }
-
-	.row-hero { padding-bottom: 0; }
-
-  .row{
-    padding-left: 20px;
-    padding-right: 20px;
-  }
-
-	.inner-wrapper .box li img { vertical-align: middle; }
-
-	#main-content {
-		background: none;
-		box-shadow: none;
-	}
-
-  #main-content .box-hero {
-     border: 0;
-   @include rounded_corners(4px);
-    margin: 0 0 20px;
-    padding: 0;
-  }
-
-  #main-content h2 {
-    @include font_size (21);
-  }
-
-	.box-stylish div {
-		display: inline-block;
-		float: left;
-	}
-
-	.box-stylish .left-side {
-		@include border();
-		margin-right: $gutter_width;
-		width: $three_col/* - ( $gutter_width )/*/;
-	}
-
-	.box-stylish .right-side {
-		width: $three_col/* - ( 2 * $gutter_width )/*/;
-	}
-
-	.box-cloud { position: relative; }
-
-	.box-cloud div {
-		background: url(../img/pictograms/pictogram-cloud-100x100.png) 99% center no-repeat;
-		display: block;
-		padding-right: 120px;
-	}
-
-  .box-highlight {
-      -moz-box-shadow: 0 1px 6px 0 #c2c2c2;
-      -webkit-box-shadow: 0 1px 6px 0 #c2c2c2;
-    box-shadow: 0 1px 6px 0 #c2c2c2;
-    border: 1px solid #f7f7f7;
-  }
-
-	/* homepage feature boxes */
-	.box-textured, .box-feature-one, .box-feature-two, .box-feature-three {
-    background-repeat: no-repeat, repeat;
-	}
-  .box-textured {
-		background-color: $light_grey;
-    padding: 24px 20px 20px;
-    min-height: 304px;
-
-    h2 {
-      font-size: 21px;
-    }
-
-    p {
-      font-size: 16px;
-    }
-  } /* end box-textured */
-
-	.box-textured.box-feature-one {
-    background-image: url("../img/homepage/cnet-award-phone-tablet.png"), url("../img/patterns/grey-textured-background.jpg");
-    background-position: center 160px, 0 0;
-  }
-  .box-textured.box-feature-two {
-    background-image: url("../img/homepage/homepage-12.10-launch-ubuntu.png"), url("../img/patterns/grey-textured-background.jpg");
-    background-position: 16px 237px, 0 0;
-  }
-	.box-textured.box-feature-three {
-		/* Raring promo */
-		background-image: url("../img/homepage/raring-promo-bg.png"), url("../img/patterns/grey-textured-background.jpg");
-    background-position: 190px 104%, 0 0;
-   /* Landscape Prono */
-    /*background-image: url("../img/homepage/hero-landscape-screenshot-small.png"), url("../img/patterns/grey-textured-background.jpg");
-    background-position: 170px 68px, 0 0;*/
-
-    p {
-      /* raring padding-right: 100px; */
-      padding-right: 123px;
-    }
-  }
-  .homepage-features {
-    .box {
-      padding: 0;
-      background-position: 50% 85%;
-      background-repeat: no-repeat;
-      background-color: #fff;
-      border: 0;
-    }
-    a {
-      padding: 20px 20px 191px;
-      display: block;
-    }
-    a p {
-      color: #333;
-    }
-    a:hover {
-      text-decoration: none
-    }
-    a:hover h2 {
-      text-decoration: underline;
-    }
-    .box-feature-one {
-      background-image: url(../img/homepage/image-phone.png);
-    }
-    .box-feature-two {
-      background-image: url(../img/homepage/image-openstack.png);
-    }
-    .box-feature-three {
-      background-image: url(../img/homepage/image-take-the-tour.png);
-      background-position: right bottom;
-    }
-  }
-
-} /* end body.homepage */
-
-/* body.homepage-default
--------------------------------------------------------------- */
-body.homepage-default {
-		.row-hero .box {
-	  background: #fff url(../img/homepage/homepage-1204-background-laptop.png) 355px 30px no-repeat;
-	}
-
-	.row-hero div div {
-		padding-bottom: $gutter_width;
-		padding-top: 2 * $gutter_width;
-		text-align: center;
-		width: $five_col;
-	}
-
-	.row-hero p {
-		@include font_size (18);
-	}
-} /* end body.default */
-
-/* body.homepage-raring
--------------------------------------------------------------- */
-body.homepage-raring {
-  .row-hero {
-    padding: 0 0 0 50px;
-    position: relative;
-    overflow: visible;
-  }
-
-  .row-hero img {
-    display: none;
-  }
-
-  .row-hero h1 {
-    @include font_size (45);
-    padding-top: 32px;
-    margin-bottom: 12px;
-    line-height: 1.2;
-    margin-top: 22px;
-  }
-
-  .row-hero .tagline {
-    @include font_size (24);
-    line-height: 1.4;
-    margin-bottom: 5px;
-  }
-
-  .row-hero .hero {
-    background: #fff url(../img/homepage/1304-takeover-laptop.png) 361px 14px no-repeat;
-    border-bottom: 0;
-    border-right: 0;
-      -moz-border-radius: 0 4px 0 0;
-      -webkit-border-radius: 0 4px 0 0;
-    border-radius: 0 4px 0 0;
-  }
-
-  .row-hero div div {
-      padding-bottom: $gutter_width;
-      width: 450px;
-      margin-left: $gutter_width;
-  }
-
-  .row-hero .share-this {
-    padding-top: 0;
-    padding-bottom: 0;
-  }
-
-   .row-hero a.link-cta-ubuntu {
-     margin-bottom: 20px;
-   }
-
-  .row-hero p.tagline {
-    font-size: 24px;
-    margin-bottom: 20px;
-  }
-
-  a.hidden {
-      display: block;
-      height: 306px;
-      left: 0;
-      position: absolute;
-      top: 0;
-      width: 301px;
-  }
-
-  .row-hero .share-this {
-    text-align: left;
-    width: 290px;
-    margin-top: 20px;
-    margin-left: 0;
-    float: none;
-
-    iframe, div {
-      float: right;
-    }
-
-    .twitter-share-button{
-      width: 101px !important;
-    }
-  }
-
-} /* End Raring */
-
-/* body.homepage-charm
--------------------------------------------------------------- */
-body.homepage-charm {
-	.inner-wrapper {
-  	background-image: url(../img/homepage/charm/juju_bg.png);
-	}
-
-  #main-content .row-hero {
-	  background: url(../img/homepage/charm/juju-main.png) 105% 70px no-repeat;
-    position: relative;
-    overflow: visible;
-    margin-bottom: 20px;
-  }
-    #main-content .row-hero br{
-    margin-bottom: 10px;
-    }
-
-  .row-hero .tagline {
-    @include font_size (26);
-    line-height: 1.4;
-    margin-bottom: 20px;
-    padding-right: 440px;
-  }
-  .row-hero .link-cta-ubuntu {
-	  margin-right: 10px;
-  }
-  .hero {
-  	background: url(../img/homepage/charm/icon-juju-logo.png) 20px 70px no-repeat;
-    padding-left: 20px;
-    margin-top: -50px;
-    padding-top: 130px;
-  }
-}/* end homepage-charm */
-
-/* body.homepage-edge
--------------------------------------------------------------- */
-body.homepage-edge {
-	h1 {
-		background: url(../img/homepage/edge-logo.png) no-repeat;
-		display: block;
-		height: 74px;
-		margin-bottom: 7px;
-		margin-left: -10px;
-		text-indent: -999em;
-		width: 320px;
-	}
-	#main-content .row-hero {
-		background: #282828;
-		height: 355px;
-		margin-bottom: 0;
-		margin-top: 0;
-		overflow: hidden;
-		position: relative;
-		width: 100%;
-		z-index: 2;
-		@include rounded_corners(4px 4px 0 0);
-	}
-	.hero {
-		position: relative;
-		z-index: 3;
-		padding-top: 0;
-		top: 65px;
-		position: relative;
-		padding-left: 40px;
-	}
-	#edge {
-		background: url(../img/homepage/2_3_generic.jpg) right -400px no-repeat;
-		color: #fff;
-		display: block;
-		height: 600px;
-		left: 55%;
-		position: absolute;
-		top: 0;
-		width: 922px;
-		z-index: 1;
-	}
- 	.tagline {
-    @include font_size (24);
-    color: #fff;
-    margin-bottom: 25px;
-		text-shadow: 0 2px 4px rgba(0,0,0,.6);
-		line-height: 54px;
-		width: 490px;
-	}
- 	.tagline {
-    line-height: 1.3;
-   }
-	.link-cta-ubuntu {
-		-moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
-		-webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
-	}
-} /* end homepage-edge */
-
-/* body.homepage-azure
--------------------------------------------------------------- */
-body.homepage-azure {
-  #main-content .row-hero {
-	  background: url(../img/homepage/image-windows-azure-charms.png) 100% 30px no-repeat;
-    position: relative;
-    overflow: visible;
-    margin-bottom: 15px;
-    padding-bottom: 20px;
-  }
-  #main-content h1 {
-    @include font_size (38);
-    margin-bottom: 30px;
-  }
-  #main-content h1 span {
-	  display: inline;
-	  background: url(../img/homepage/logo-windows-azure-280.png) 0 2px no-repeat;
-	  text-indent: -999em;
-	  display: inline-block;
-	  width: 280px;
-	  height: 47px;
-	  margin-left: 6px;
-  }
-  .row-hero p a {
-	  text-decoration: none;
-  }
-	.row-hero p {
-    @include font_size (20);
-  }
-  .row-hero p a {
-	  color: #333;
-  }
-  .row-hero p a span {
-		color: $ubuntu_orange;;
-  }
-  .row-hero p a:hover span {
-		text-decoration: underline;
-  }
-  .row-hero .tagline {
-    @include font_size (30);
-    line-height: 1.4;
-    margin-bottom: 20px;
-    padding-right: 440px;
-  }
-  .hero {
-    padding-left: 20px;
-    padding-top: 60px;
-  }
-}/* end homepage-azure */
-
-/* body.homepage-openstack
--------------------------------------------------------------- */
-body.homepage-openstack, body.cloud-home {
-  #main-content .row-hero,
-  #main-content .box-hero {
-		@include box_sizing;
-	  background: #fff url(../img/homepage/image-ubuntu-openstack-medals.png) 90% 0 no-repeat;
-    clear: both;
-    display: block;
-    width: 100%;
-    float: left;
-    overflow: visible;
-    padding-bottom: 70px;
-    padding-top: 60px;
-    position: relative;
-  }
-  #main-content .row-hero {
-    margin-top: 0;
-  }
-  #main-content .box-hero {
-  	padding-left: 20px;
-  	padding-bottom: 70px;
-  }
-  #main-content h1 {
-    padding-right: 10em;
-  }
-  #main-content .box-hero h1 {
-    @include font_size (43);
-    margin-bottom: 10px;
-	}
-  .row-hero .tagline,
-  .box-hero .tagline {
-    @include font_size (30);
-    line-height: 1.4;
-    margin-bottom: 20px;
-  }
-  .row-hero .tagline {
-  	max-width: 400px;
-  }
-  .box-hero .hero {
-    padding-left: 20px;
-    padding-top: 0;
-  }
-
-}/* end homepage-openstack */
-
-/* body.homepage-1310
--------------------------------------------------------------- */
-body.homepage-1310 {
-	#main-content .box-hero {
-		@include rounded_corners(4px);
-		background: #3b0208 url(../img/homepage/image-ubuntu-dash.png) right top no-repeat;
-		margin: 0 0 20px;
-		padding: 0;
-		border: 0;
-	}
-  #main-content h1 {
-		text-shadow: 0 2px 4px rgba(0,0,0,.6);
-    @include font_size (58);
-    color: #fff;
-    margin-bottom: 10px;
-  }
-  .box-hero .tagline {
-    @include font_size (30);
-    line-height: 1.4;
-    margin-bottom: 20px;
-    padding-right: 360px;
-		text-shadow: 0 2px 4px rgba(0,0,0,.6);
-  }
-  .hero {
-		@include rounded_corners(4px);
-    background: url(../img/homepage/image-ubuntu-dash-dock.jpg) no-repeat;
-    color: #fff;
-    margin-top: 0;
-    padding: 128px 20px 8px 120px;
-		height: 325px;
-  }
-  .hero .link-cta-ubuntu {
-		-moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
-		-webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
-  }
-  #main-content .box-hero p a {
-		@include font_size (18);
-    color: #fff;
-		text-shadow: 0 2px 4px rgba(0,0,0,.6);
-  }
-  #main-content h2 {
-    @include font_size (21);
-  }
-}/* end homepage-1310 */
-
-/* body.homepage-uoil
--------------------------------------------------------------- */
-body.homepage-uoil{
-  #main-content {
-    background: none;
-    box-shadow: none;
-  }
-  .box-highlight {
-      -moz-box-shadow: 0 1px 6px 0 #c2c2c2;
-      -webkit-box-shadow: 0 1px 6px 0 #c2c2c2;
-    box-shadow: 0 1px 6px 0 #c2c2c2;
-    border: 1px solid #f7f7f7;
-  }
-  #main-content h1 {
-    @include font_size (60);
-    color: #333;
-    margin-bottom: 10px;
-  }
-  .box-hero .tagline,
-  .box-hero a {
-    @include font_size (23);
-    line-height: 1.3;
-    margin-bottom: 20px;
-    padding-right: 455px;
-  }
-  .hero {
-    @include rounded_corners(4px);
-    background: url(../img/homepage/interoperability-lab.png) no-repeat right center;
-    color: #333;
-    margin-top: 0;
-    padding: 100px 0 0 50px;
-    height: 358px;
-  }
-  .hero .link-cta-ubuntu {
-    margin-bottom: 15px;
-  }
-  #main-content h2 {
-    @include font_size (21);
-  }
-}
-/* end homepage uoil */
-
-/* body.homepage-landscape
--------------------------------------------------------------- */
-body.homepage-landscape {
-  .box-hero {
-    @include rounded_corners(4px);
-    position: relative;
-    overflow: visible;
-  }
-
-  .hero {
-		@include rounded_corners(4px);
-		padding-left: 20px;
-  }
-
-  .box-hero img {
-    display: none;
-  }
-
-  .box-hero h1 {
-    @include font_size (45);
-    padding-top: 60px;
-    margin-bottom: 20px;
-    line-height: 1.2;
-  }
-
-  .box-hero .tagline {
-    @include font_size (24);
-    line-height: 1.4;
-    margin-bottom: 5px;
-  }
-
-  .box-hero .hero {
-    background: #fff url(../img/homepage/hero-landscape-screenshot.png) 532px -6px no-repeat;
-    border-bottom: 0;
-    border-right: 0;
-  }
-
-  .box-hero div div {
-      padding-bottom: 42px;
-      width: 450px;
-      margin-left: $gutter_width;
-  }
-
-  .box-hero .share-this {
-    padding-top: 0;
-  }
-
-  .box-hero p {
-    font-size: 24px;
-  }
-
-  a.hidden {
-      display: block;
-      height: 306px;
-      left: 0;
-      position: absolute;
-      top: 0;
-      width: 301px;
-  }
-
-} /* End Landscape */
-
-/* body.homepage-cesg
--------------------------------------------------------------- */
-body.homepage-cesg {
-  .box-hero {
-    @include rounded_corners(4px);
-    position: relative;
-    overflow: visible;
-  }
-
-  .hero {
-    @include rounded_corners(4px);
-    padding-left: 20px;
-  }
-
-  .box-hero img {
-    position: absolute;
-    bottom: 0;
-  }
-
-  .box-hero h1 {
-    @include font_size (45);
-    padding-top: 85px;
-    margin-bottom: 20px;
-    line-height: 1.2;
-  }
-
-  .box-hero .tagline {
-    @include font_size (24);
-    line-height: 1.4;
-    margin-bottom: 5px;
-  }
-
-  .box-hero .hero {
-    border-bottom: 0;
-    border-right: 0;
-  }
-
-  .box-hero div .copy {
-      padding-bottom: 42px;
-      width: 450px;
-      margin-left: $gutter_width;
-  }
-
-  .box-hero .share-this {
-    padding-top: 0;
-  }
-
-  .box-hero p {
-    font-size: 24px;
-  }
-
-  a.hidden {
-      display: block;
-      height: 306px;
-      left: 0;
-      position: absolute;
-      top: 0;
-      width: 301px;
-  }
-}
-
-.bar-chart {
-    width: 430px;
-    height: 396px;
-    margin: auto;
-    position: absolute;
-    right: 40px;
-    bottom: 0;
-}
-
-.bar-chart div {
-    position: absolute;
-    width: 30px;
-    height: 0;
-    bottom: 0;
-    -webkit-border-top-left-radius: 4px;
-    -moz-border-radius-topleft: 4px;
-    border-top-left-radius: 4px;
-    -webkit-border-top-right-radius: 4px;
-    -moz-border-radius-topright: 4px;
-    border-top-right-radius: 4px;
-    -moz-border-radius-topleft: 4px;
-    -moz-border-radius-topright: 4px;
-    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-    filter: alpha(opacity=0);
-    opacity: 0
-}
-
-.bar {
-    background-color: #ada69e;
-    height: 0;
-    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-    filter: alpha(opacity=0);
-    opacity: 0;
-    -moz-transition: all 1s cubic-bezier(0.19, 1, 0.22, 1);
-    -o-transition: all 1s cubic-bezier(0.19, 1, 0.22, 1);
-    -webkit-transition: all 1s cubic-bezier(0.19, 1, 0.22, 1);
-    transition: all 1s cubic-bezier(0.19, 1, 0.22, 1);
-}
-
-.bar1 {
-    left: 0;
-    -moz-transition-delay: 1s;
-    -o-transition-delay: 1s;
-    -webkit-transition-delay: 1s;
-    transition-delay: 1s
-}
-
-.no-transitions .bar1, .run .bar1 {
-    height: 176px;
-    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=20)";
-    filter: alpha(opacity=20);
-    opacity: 0.2
-}
-
-.bar2 {
-    left: 40px;
-    -moz-transition-delay: 1.1s;
-    -o-transition-delay: 1.1s;
-    -webkit-transition-delay: 1.1s;
-    transition-delay: 1.1s
-}
-
-.no-transitions .bar2, .run .bar2 {
-    height: 176px;
-    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=20)";
-    filter: alpha(opacity=20);
-    opacity: 0.2
-}
-
-.bar3 {
-    left: 80px;
-    -moz-transition-delay: 1.2s;
-    -o-transition-delay: 1.2s;
-    -webkit-transition-delay: 1.2s;
-    transition-delay: 1.2s
-}
-
-.no-transitions .bar3, .run .bar3 {
-    height: 220px;
-    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
-    filter: alpha(opacity=30);
-    opacity: 0.3
-}
-
-.bar4 {
-    left: 120px;
-    -moz-transition-delay: 1.3s;
-    -o-transition-delay: 1.3s;
-    -webkit-transition-delay: 1.3s;
-    transition-delay: 1.3s
-}
-
-.no-transitions .bar4, .run .bar4 {
-    height: 264px;
-    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=40)";
-    filter: alpha(opacity=40);
-    opacity: 0.4
-}
-
-.bar5 {
-    left: 160px;
-    -moz-transition-delay: 1.4s;
-    -o-transition-delay: 1.4s;
-    -webkit-transition-delay: 1.4s;
-    transition-delay: 1.4s
-}
-
-.no-transitions .bar5, .run .bar5 {
-    height: 264px;
-    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=40)";
-    filter: alpha(opacity=40);
-    opacity: 0.4
-}
-
-.bar6 {
-    left: 200px;
-    -moz-transition-delay: 1.5s;
-    -o-transition-delay: 1.5s;
-    -webkit-transition-delay: 1.5s;
-    transition-delay: 1.5s
-}
-
-.no-transitions .bar6, .run .bar6 {
-    height: 308px;
-    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
-    filter: alpha(opacity=50);
-    opacity: 0.5
-}
-
-.bar7 {
-    left: 240px;
-    -moz-transition-delay: 1.6s;
-    -o-transition-delay: 1.6s;
-    -webkit-transition-delay: 1.6s;
-    transition-delay: 1.6s
-}
-
-.no-transitions .bar7, .run .bar7 {
-    height: 352px;
-    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
-    filter: alpha(opacity=60);
-    opacity: 0.6
-}
-
-.bar8 {
-    left: 280px;
-    -moz-transition-delay: 1.7s;
-    -o-transition-delay: 1.7s;
-    -webkit-transition-delay: 1.7s;
-    transition-delay: 1.7s
-}
-
-.no-transitions .bar8, .run .bar8 {
-    height: 352px;
-    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
-    filter: alpha(opacity=60);
-    opacity: 0.6
-}
-
-.bar9 {
-    left: 320px;
-    -moz-transition-delay: 1.8s;
-    -o-transition-delay: 1.8s;
-    -webkit-transition-delay: 1.8s;
-    transition-delay: 1.8s
-}
-
-.no-transitions .bar9, .run .bar9 {
-    height: 352px;
-    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
-    filter: alpha(opacity=60);
-    opacity: 0.6
-}
-
-.bar10 {
-    left: 360px;
-    -moz-transition-delay: 1.9s;
-    -o-transition-delay: 1.9s;
-    -webkit-transition-delay: 1.9s;
-    transition-delay: 1.9s
-}
-
-.no-transitions .bar10, .run .bar10 {
-    height: 352px;
-    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
-    filter: alpha(opacity=60);
-    opacity: 0.6
-}
-
-.bar11 {
-    left: 400px;
-    background-color: #dd4813;
-    -moz-transition-delay: 2s;
-    -o-transition-delay: 2s;
-    -webkit-transition-delay: 2s;
-    transition-delay: 2s
-}
-
-.no-transitions .bar11, .run .bar11 {
-    height: 396px;
-    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-    filter: alpha(opacity=100);
-    opacity: 1
-}
-
-
-
-/* body.homepage-asus - USA only 22 Nov - 3 Dec 2013
--------------------------------------------------------------- */
-body.homepage-asus {
-  .box-hero .hero {
-	  background: url("../img/homepage/1015e-takeover.jpg") 390px 15px no-repeat;
-	  padding-top: 65px;
-	  padding-left: 40px;
-	  padding-bottom: 55px
-
-	  h1 {
-		  background: url("../img/third-party-logos/logo-asus-130x28.png") 0 10px no-repeat;
-	    @include font_size (45);
-	    padding-top: 66px;
-	    padding-right: 0;
-	    margin-bottom: 20px;
-	  }
-	  p {
-		  margin-bottom: 20px;
-	    line-height: 1.4;
-	  }
-	  p.tagline {
-	    @include font_size (21);
-		  margin-bottom: 20px;
-	    font-weight: 300;
-	    line-height: 1.5;
-	    padding-right: 40px;
-	  }
-	  p:last-child {
-		  margin-bottom: 0;
-	  }
-	  .share-this {
-		  margin-bottom: -20px;
-		  margin-top: 0;
-	  }
-	 }
-}
-
-body.index_asus {
-  .row-hero .hero {
-	  padding-top: 30px;
-	}
-}
-
-/* body.homepage-community
--------------------------------------------------------------- */
-body.homepage-community {
-  .box-hero .hero {
-	  background: #DD4713 url("../img/homepage/hand-illustration.png") 425px 50% no-repeat;
-	  padding-top: 120px;
-    @include rounded_corners(4px);
-	  color: #fff;
-	  padding-left: 40px;
-	  padding-bottom: 30px;
-	  height: 293px;
-
-	  h1 {
-	    @include font_size (60);
-	  }
-	  p {
-	    @include font_size (21);
-		  margin-bottom: 20px;
-	    line-height: 1.4;
-	  }
-	  p.tagline {
-		  margin-bottom: 20px;
-	    font-weight: 300;
-	    line-height: 1.5;
-	    width: 300px;
-	  }
-	  p:last-child {
-		  margin-bottom: 0;
-	  }
-	  a:link, a:visited {
-	  	color: #fff;
-	  }
-	 }
-
-} /* End homepage-community */
-
-/* body.homepage-hp-emea aka HP Discover EMEA
--------------------------------------------------------------- */
-body.homepage-hp-emea {
-	.box-hero {
-	  background: #fff url(../img/homepage/hpemea-takeover.png) 324px 250px no-repeat;
-	}
-  .box-hero .hero {
-    @include rounded_corners(4px);
-	  padding-left: 40px;
-	  padding-bottom: 125px;
-	  width: 65%;
-
-		  h1 {
-		    @include font_size (50);
-		    padding-top: 66px;
-		    padding-right: 0;
-		    margin-bottom: 10px;
-		  }
-		  p {
-		    @include font_size (23);
-			  margin-bottom: 20px;
-		    line-height: 1.4;
-		  }
-		  p.tagline {
-			  margin-bottom: 20px;
-		    font-weight: 300;
-		    line-height: 1.5;
-		    padding-right: 40px;
-		  }
-
-	  }
-
-} /* End homepage-hp-emea */
-
-/* body.homepage-xmas-shop-13
--------------------------------------------------------------- */
-body.homepage-xmas-shop-13 {
-  .box-hero {
-    background: #fff url(../img/homepage/homepage-xmas-shop.jpg) right 0 no-repeat;
-  }
-  .box-hero .hero {
-    @include rounded_corners(4px);
-    padding-left: 40px;
-    padding-bottom: 50px;
-    width: 360px;
-
-      h1 {
-        @include font_size (50);
-        padding-top: 56px;
-        padding-right: 0;
-        margin-bottom: 15px;
-      }
-      p {
-        @include font_size (23);
-        margin-bottom: 20px;
-        line-height: 1.4;
-      }
-      p.tagline {
-        margin-bottom: 20px;
-        font-weight: 300;
-        line-height: 1.5;
-        padding-right: 40px;
-      }
-
-    }
-
-} /* End homepage-xmas-shop-13 */
-
-/* body.homepage-cloud-survey
--------------------------------------------------------------- */
-body.homepage-cloud-survey {
-  .box-hero .hero {
-    @include rounded_corners(4px);
-    padding: 60px 40px;
-
-      h1 {
-        @include font_size (45);
-        margin-bottom: 15px;
-      }
-      p {
-        @include font_size (23);
-        line-height: 1.4;
-        margin-bottom: 0;
-      }
-      p.intro {
-        margin-bottom: 20px;
-      }
-
-    }
-
-} /* End homepage-cloud-survey */
-
-/* body.homepage-vmw1
--------------------------------------------------------------- */
-body.homepage-vmw1 {
-  .box-hero {
-    @include rounded_corners(4px);
-    position: relative;
-    overflow: visible;
-  }
-
-  .hero {
-    @include rounded_corners(4px);
-    padding-left: 20px;
-    height: 460px;
-  }
-
-  .box-hero {
-    img {
-      position: absolute;
-      bottom: 0;
-    }
-    img.webinar {
-      top: 30px;
-      right: 0px;
-    }
-  }
-
-  .box-hero h1 {
-    @include font_size (45);
-    padding-top: 85px;
-    margin-bottom: 20px;
-    line-height: 1.2;
-  }
-
-  .box-hero .tagline {
-    @include font_size (24);
-    line-height: 1.4;
-    margin-bottom: 5px;
-  }
-
-  .box-hero .hero {
-    border-bottom: 0;
-    border-right: 0;
-  }
-
-  .box-hero div .copy {
-      margin-left: $gutter_width;
-  }
-
-  .box-hero .share-this {
-    padding-top: 0;
-  }
-
-  .box-hero p {
-    font-size: 24px;
-  }
-
-  a.hidden {
-      display: block;
-      height: 306px;
-      left: 0;
-      position: absolute;
-      top: 0;
-      width: 301px;
-  }
-}
diff --git a/templates/static/css/section/local.scss b/templates/static/css/section/local.scss
deleted file mode 100644
index aaa7e42ad76..00000000000
--- a/templates/static/css/section/local.scss
+++ /dev/null
@@ -1,240 +0,0 @@
-
-/*
- * Cookie policy style updates
- * To be updated in core-patterns
- */
-
-.cookie-policy {
-  z-index: 100;
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-  @include box_shadow(0 -1px 2px rgba(0, 0, 0, 0.2));
-  background-color: #fae4dc;
-  
-  .wrapper {
-    background: transparent;
-  }
-  
-  p {
-    font-size: 13px;
-    margin-left: 0;
-    padding: 8px 0;
-    width: 100%;
-    margin-bottom: 0;
-  }
-  
-  .link-cta {
-    text-indent: -9999px;
-    margin-top: 12px;
-    padding: 0;
-    background: url(../img/icons/close-orange.png) no-repeat;
-    width: 16px;
-    height: 15px;
-    float: right;
-    font-size: 1em;
-    text-decoration: none;
-    color: #fff;
-  }
-}
-
-
-/*
- * Main navigation dropdown styles
- */
-
-header.banner .nav-primary ul {
-  position: static;
-}
-
-header.banner .nav-primary li ul {
-    @include rounded_corners(10px);
-    @include box_shadow(0 2px 2px -1px #777777);
-    background: none repeat scroll 0 0 #f7f7f7;
-    border: 0 none;
-    display: none;
-    float: none;
-    margin: 0;
-    padding: 5px 0;
-    position: absolute;
-    top: 51px;
-    width: 200px;
-    border: 1px solid #d5d5d5;
-}
-header.banner .nav-primary li ul .arrow-up {
-    left: 0;
-    margin-left: 20px;
-    top: -8px;
-    width: 200px;
-    background-image: url("../img/patterns/arrow-up-smaller.png");
-}
-header.banner .nav-primary li ul li {
-    border: 0 none;
-    float: none;
-}
-header.banner .nav-primary li ul li a:link, 
-header.banner .nav-primary li ul li a:visited {
-    border: 0 none;
-    color: #333333;
-    padding: 0 0 11px 14px;
-    text-align: left;
-    width: 170px;
-}
-header.banner .nav-primary li ul li a:hover {
-    background: none repeat scroll 0 0 transparent;
-    @include box_shadow(none);
-    color: #DD4814;
-}
-header.banner .nav-primary li ul li.first a:link, 
-header.banner .nav-primary li ul li.first a:visited, 
-header.banner .nav-primary li ul li:first-of-type a:link {
-    padding: 10px 14px;
-}
-header.banner .nav-primary li ul li.active a:link, 
-header.banner .nav-primary li ul li.active a:visited {
-    background: none repeat scroll 0 0 transparent !important;
-}
-header.banner .nav-primary li ul .promo {
-    border-top: 1px solid #D5D5D5;
-    float: left;
-    margin-top: 5px;
-    padding: 15px 0 0;
-}
-header.banner .nav-primary li ul .promo a:link, 
-header.banner .nav-primary li ul .promo a:visited {
-    background: none repeat scroll 0 0 transparent;
-    border-left: 0 none;
-    color: #333333;
-    height: auto;
-    padding: 0;
-    text-align: left;
-}
-header.banner .nav-primary li ul .promo p {
-    margin: 0 10px;
-}
-header.banner .nav-primary li ul .promo a:hover {
-    box-shadow: none;
-    color: #DD4814;
-}
-header.banner .nav-primary li ul .promo img {
-    margin-top: 14px;
-    margin-bottom: -6px;
-    @include rounded_corners(0 0 10px 10px);
-    position:relative;
-    top:1px;
-}
-header.banner .nav-primary li ul .promo .category {
-    color: #AEA79F;
-    font-size: 11px;
-    margin: 0 10px;
-    text-transform: uppercase;
-}
-header.banner .nav-primary li:hover ul {
-    display: block;
-}
-
-html.lt-ie8 header.banner .nav-primary li:hover ul {
-    display: none;
-}
-
-/* resource hub content */
-.resource {
-    -moz-transition: background .2s ease-out;
-    -webkit-transition: background .2s ease-out;
-  transition: background .2s ease-out;
-  position: relative;
-  cursor: pointer;
-  padding-bottom: 40px;
-  
-  &.four-col {
-    h2 a:link,
-    h2 a:visited {
-      font-size: 1.125em; /* 36 / 32 */
-    }
-  }
-  &.twelve-col {
-    h2 a:link,
-    h2 a:visited {
-      font-size: 1.40625em; /* 36 / 32 */
-    }
-  }
-  &:hover {
-    background-color: #fafafa;
-  }
-  &:after {
-      -moz-transition: all .2s ease-out;
-      -webkit-transition: all .2s ease-out;
-    transition: all .2s ease-out;
-    content: "";
-    position: absolute;
-    z-index: 2;
-    right: -6px;
-    top: 14px;
-    height: 1px;
-    width: 41px;
-    -ms-transform:rotate(45deg);
-    -webkit-transform:rotate(45deg);
-    transform:rotate(45deg);
-      -moz-box-shadow: 0 -1px 2px 0 #ddd;
-      -webkit-box-shadow: 0 -1px 2px 0 #ddd;
-    box-shadow: 0 -1px 2px 0 #ddd;
-  }
-  &:hover:after {
-    right: -9px;
-    top: 18px;
-    width: 48px;
-  }
-  &:before {
-    content: "";
-    position: absolute;
-      -moz-transition: border-width .2s ease-out;
-      -webkit-transition: border-width .2s ease-out;
-    transition: border-width .2s ease-out;
-    top: -2px;
-    right: -3px;
-    width: 0px;
-    height: 0px;
-    border-bottom: 30px solid #fdfdfd;
-    border-right: 30px solid #fff;
-    -webkit-box-shadow: -2px 2px 2px rgba(176, 176, 176, 0.4);
-    -moz-box-shadow: -2px 2px 2px rgba(176, 176, 176, 0.4);
-    box-shadow: -2px 2px 2px rgba(176, 176, 176, 0.4);
-    z-index: 2;
-    @include rounded_corners(0 0 0 0);
-  }
-  &:hover:before {
-    border-bottom-width: 35px;
-    border-right-width: 35px;
-  }
-  &:last-of-type {
-    margin-bottom: 30px;
-  }
-  .content-cat {
-    bottom: 16px;
-    color: #aea79f;
-    font-size: 14px;
-    left: 20px;
-    letter-spacing: 1px;
-    margin: 0;
-    padding: 0;
-    padding-left: 20px;
-    position: absolute;
-    text-transform: uppercase;
-  }
-  .content-cat {
-    background: url("../img/icons/icon-resource-hub-icon-document.png") left center no-repeat;
-  }
-  .content-cat-webinar {
-    background: url("../img/icons/icon-resource-hub-webinar.png") left center no-repeat;
-  }
-  &.box-image-centered div + span img {
-    margin-top: 20px;
-    margin-bottom: -10px;
-  }
-}
-html.yui3-js-enabled .resource:hover a {
-  text-decoration: underline;
-}
-.row-grey .resource:before {
-  border-right-color: #F7F7F7; 
-}
\ No newline at end of file
diff --git a/templates/static/css/section/management.scss b/templates/static/css/section/management.scss
deleted file mode 100644
index b6ca6283cf3..00000000000
--- a/templates/static/css/section/management.scss
+++ /dev/null
@@ -1,353 +0,0 @@
-/*	@section management ubuntu.com/management
--------------------------------------------------------------- 
-	Contents:
-		@section general
-		@section management-landscape-features
-		@section ubuntu-advantage
-		@section return-on-investment
-		@section working-with-landscape
-		@section desktop, server and cloud management pages in other sections
-
--------------------------------------------------------------- */
-
-/*	@section general
--------------------------------------------------------------- */
-body.management .row-hero { /* First bit of content on a page, normally contains h1 and sometimes a bit of blurb */
-	position: relative;	
-}
-
-body.management {	
-	.row-benefits .six-col {
-		border-right: 1px dotted $warm_grey;
-		padding-right: $gutter_width;
-	}
-	.row-benefits .last-col {
-		border: 0;
-		padding-right: 0;
-	}
-	.stats-panel {
-		@include box_sizing();
-		background: #f6f6f6;
-		padding-top: 1.5em;
-	}
-	.stats-panel dl, .stat dl {
-		@include box_sizing();
-    border-right: 1px dotted $warm_grey;
-    float: left;
-    margin: 20px 0 20px 0;
-    min-height: 107px;
-    padding: 20px 0 0;
-    text-align: center;
-	}	
-	.stats-panel dl:first-of-type {
-		margin-left: 20px;
-	}
-	.stats-panel dl.last-col {
-		border: 0;
-	}
-	.stat dl {
-    	margin: 0 0 0 40px;
-    	padding-top: 6px;
-		border: 0;
-		font-size: 32px;
-		text-align: center;
-    }
-	.stats-panel dt, .stat dt {
-	    font-size: 80px;
-	    font-weight: normal;
-	    height: 20px;
-	    line-height: 20px;
-	    margin: 20px 0 40px 30px;
-	    color: $canonical_aubergine;
-	}
-	.stats-panel p {
-    	color: #555;
-    	@include font_size (21); 
-    	font-style: italic;
-    	text-align: center;
-    	clear: both;
-    	padding: 0 ($grid_gutter/1.5);
-    }
-	.stats-panel p a {
-    	@include font_size (13); 
-    }
-    .stats-panel p.first {
-	    font-style: normal;
-    }
-    .stats-panel dt span {
-    	@include font_size (8.5); 
-    	margin-left: -15px;
-    }
-	.row-landscape {
-		margin-bottom: 0;
-	}
-	img.flush-right {
-		float: right;
-		margin-right: -40px;
-		margin-left: 20px;
-	}
-	img.flush-left {
-		float: left;
-		margin-left: -40px;
-	}
-	.row-image-float-right p {
-		width: $eight_col;
-	}
-} /* end body.management */
-
-body.management-home {
-	.margin-top { margin-top: 20px; }
-	.row-whats-included {
-		background: url("../img/management/screenshot-landscape-01.jpg") 685px 0 no-repeat;
-
-		h3 {
-			background: url("../img/pictograms/picto-reduce-costs-grey.png") 0 center no-repeat;
-			padding: 6px 0 10px 50px;
-			margin-top: 18px;
-		}
-	}
-
-	.support h3 {
-		background: url("../img/pictograms/picto-support-grey.png") 0 center no-repeat;
-		padding: 10px 0 10px 50px;
-	}
-	.technical-library h3 {
-		background: url("../img/pictograms/picto-articles-grey.png") 0 center no-repeat;
-		padding: 10px 0 10px 50px;
-	}
-	.legal-assurance h3 {
-		background: url("../img/pictograms/picto-business-grey.png") 0 center no-repeat;
-		padding: 10px 0 10px 50px;
-	}
-	.row-return-investment {
-		background: url("../img/management/illustration-graph.png") 125px bottom no-repeat;
-	}
-} /* end body.management-home */
-
-body.management .row-landscape-trial-home div {
-	@include rounded_corners(4px);
-	border: 1px solid #dfdcd9;
-	box-shadow: none;
-	margin-bottom: inherit;
-	margin-left: 0;
-	margin-right: 0;
-} 
-
-/*	@section management-landscape-features
--------------------------------------------------------------- */
-body.management-landscape-features {
-  .tabbed-menu {
-    padding-left: 0;
-    padding-right: 0;
-    margin-left: 40px;
-    margin-right: 40px;
-  }
-  .tabbed-content { 
-		@include rounded_corners(0 0 4px 4px);
-	  background: $light_grey;
-    margin-left: 40px;
-    margin-right: 40px;
-    margin-bottom: 60px;
-    border-bottom: 0;
-  }
-  .tabbed-content #management ul {
-  	margin-bottom: 0;
-  }
-  .tabbed-content #management .six-col, .tabbed-content #deployment .six-col, .tabbed-content #monitoring .six-col, .tabbed-content #inventory .six-col {
-  	border-right: 1px dotted $warm_grey;
-  	padding-right: (20/$base)em;
-  } 
-  .tabbed-content a.right {
-  	margin-bottom: 1.25em;
-  	margin-left: (20/$base)em;
-  }
-  .tabbed-content #management .last-col, .tabbed-content #deployment .last-col, .tabbed-content #monitoring .last-col, .tabbed-content #inventory .last-col  {
-  	border: 0;
-  	padding-right: 0;
-  }
-}
-
-body.management-ubuntu-advantage, 
-body.management-return-on-investment, 
-body.management-working-with-landscape {
-	.row-hero { background: #fff url(../img/pictograms/pictogram-compliance-290x175.png) 694px 50% no-repeat; }
-	.row-hero p.last { 
-		margin-top: 40px; 
-		background: none;
-	}
-	.row-hero p.last .link-cta-canonical {
-		margin-right: 6px;
-		margin-top: -7px;
-	}
-	.ubuntu-advantage { margin-bottom: 0; }
-	.ubuntu-advantage img { margin-left: -$grid_gutter; }
-	.row-purchase-advantage .box {
-		background: $light_grey url(../img/pictograms/pictogram-reduce-costs-115x115.png) 20px 20px no-repeat;
-		padding-bottom: 1em;
-	}
-	.row-purchase-advantage .promo-description {
-		padding-left: 135px;
-		border-right: 1px dotted $warm_grey;
-		padding-right: 1.1875em;
-		min-height: 9em;
-		margin-bottom: 0;
-	}
-	.row-purchase-advantage .promo-price {
-	}
-	.row-purchase-advantage .box div {
-		margin-bottom: 0;
-	}
-	.row-purchase-advantage .box p.last-item {
-		margin-top: 20px;
-		float: left;
-		font-style: italic;
-		@include font_size (13); 
-	}
-} /* end body.business-systems-management-ubuntu-advantage */
-
-/*	@section ubuntu-advantage
--------------------------------------------------------------- */
-body.management-ubuntu-advantage {
-	#main-content .row-hero {
-		padding-top: 0;
-	}
-	#main-content .row-hero p span {
-		@include font_size (18);
-	}
-	
-	.row-management .product-intro h2 {
-		@include font_size (23);
-		background-position: 46% 0;
-		background-repeat: no-repeat;
-		padding-top: 110px;
-	}
-	
-	.row-desktop-management .product-intro h2 {
-		background-image: url(../img/pictograms/pictogram-desktop-90.png);
-	}
-
-	.row-server-management .product-intro h2 {
-		background-image: url(../img/pictograms/pictogram-server-grey-90.png);
-	}
-
-	.row-cloud-management .product-intro h2 {
-		background-image: url(../img/pictograms/pictogram-cloud-90.png);
-	}
-		
-	.price {
-		@include font_size (13);
-		position: absolute;
-		bottom: 0;
-	}
-	
-	.row-cloud-management .price {
-		height: 48px;
-	}
-	
-	.price p {
-		margin: 0;
-		padding: 0;
-	}
-	
-	.price span {
-		@include font_size (18);
-		font-weight: normal;
-	}
-	
-} /* end body.management-ubuntu-advantage */
-
-.three-divided {
-	@include box_sizing;	
-}
-
-.three-divided li {
-	width: 30.9%;
-	margin-bottom: 0;
-	margin-right: 20px;
-	padding-bottom: 38px;
-}
-
-.row-cloud-management .three-divided li {
-	padding-bottom: 62px;
-}
-
-/*	@section return-on-investment
--------------------------------------------------------------- */
-body.management-compliance .row-hero, 
-body.management-return-on-investment .row-hero {
-	background: #fff url(../img/pictograms/pictogram-reduce-costs-300x300.png) 654px 50% no-repeat; 
-}
-
-body.management-return-on-investment {
-	.row-box {
-		padding-bottom: 40px;
-		padding-top: 40px;
-	}
-	.row-landscape-trial {
-		margin-bottom: 20px;
-		padding-bottom: 0;
-	}
-	.logos img { margin: 20px 0 0 40px; }
-}
-
-/*	@section working-with-landscape
--------------------------------------------------------------- */
-body.management-working-with-landscape {
-	.row-hero .eight-col {
-		margin-bottom: 0;
-		padding-bottom: 1.25em;
-	}
-	.row .six-col { margin-bottom: 0; }
-	
-	iframe { margin-bottom: 1.25em; }
-	
-	.row-landscape-trial {
-		padding-bottom: 0;
-		border-bottom: 0;
-	}
-}
-
-
-/* Ubuntu Advantage: what's included? */
-.uawi {
-	background: $light_grey url(../img/desktop/screenshot_landscape_482x540.png) top right no-repeat;
-	min-height: 460px;
-}
-
-
-/*	@section desktop, server and cloud management pages in other sections
--------------------------------------------------------------- */
-.desktop-desktop-management {
-	.row-hero {
-		background: url(../img/desktop/desktop-management-pictos.png) 88% 20% no-repeat;
-	}
-}
-
-.server-server-management {
-	.row-hero {
-		background: url(../img/server/server-management-pictos.png) 88% 20% no-repeat;
-	}
-}
-
-.cloud-cloud-management {
-	.row-hero {
-		background: url(../img/cloud/cloud-management-pictos.png) 88% 20% no-repeat;
-	}
-}
-
-body.desktop-desktop-management p.intro,
-body.server-server-management p.intro,
-body.cloud-cloud-management p.intro {
-	@include font_size (23);
-	line-height: 1.5;
-}
-
-/* Ubuntu Advantage: what's included? */
-.uawi {
-	background: $light_grey url(../img/desktop/screenshot_landscape_482x540.png) top right no-repeat;
-	min-height: 460px;
-}
-
-/* end @section desktop management */
-
-
diff --git a/templates/static/css/section/oldtheme.scss b/templates/static/css/section/oldtheme.scss
deleted file mode 100644
index 0276b08a6ac..00000000000
--- a/templates/static/css/section/oldtheme.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-body.support .equal-height .box,
-body.about .equal-height .box  { /* rather than having grey-box etc*/
-  background: $light_grey;
-  border: 0;
-}
-
-body.about .equal-height .box h2 {
-  @include font_size (16);
-  font-weight: normal;
-}
\ No newline at end of file
diff --git a/templates/static/css/section/partners.scss b/templates/static/css/section/partners.scss
deleted file mode 100644
index c4fb204f759..00000000000
--- a/templates/static/css/section/partners.scss
+++ /dev/null
@@ -1,136 +0,0 @@
-/*	@section partners
--------------------------------------------------------------- */
-body.partners {
-	.row:last-child {
-		border-bottom: 0;
-	}
-	.four-col h2 {
-		@include font_size (23); /* Same as h3 */
-	}
-
-} /*  end @section partners */
-body.partners-arm .row div {
-	-moz-column-count: 2;
-	-moz-column-gap: 20px;
-	-webkit-column-count: 2;
-	-webkit-column-gap: 20px;
-	column-count: 2;
-	column-gap: 20px;
-}
-
-body.partners-home .row {
-	border-bottom: 0;
-}
-
-body.partners .row-hero div {
-	-moz-column-count: inherit;
-	-webkit-column-count: 1;
-	column-count: 1;
-	-moz-column-gap: 0;
-	-webkit-column-gap: 0;
-	column-gap: 0;
-}
-
-body.partners-dell #dell-quotes {
-	border-top: 1px dotted $warm_grey;
-	padding-top: 20px;
-}
-
-body.partners-dell #dell-quotes p {
-		@include font_size (16); /* Same as h3 */
-}
-
-body.partners-dell #servers img {
-	margin-bottom: 20px;
-}
-
-body.partners-dell-dellxps .row-hero {
-	background: url(../img/homepage/dell_sputnik.png) 94% 50px no-repeat;
-}
-
-body.partners-dell-dellxps #dell-buy-now {
-	float: left;
-}
-
-body.partners-dell-dellxps #dell-buy-now a  {
-	display: block;
-}
-
-body.partners-dell-dellxps .border {
-	border-bottom: 1px dotted #AEA79F;
-	padding-bottom: 10px;
-}
-
-body.partners-find-a-partner,
-body.partners-certified-software {
-
-  .row-hero .link-cta-ubuntu {
-    margin-top: 20px;
-  }
-
-  .box {
-
-    img {
-      max-height: 50px;
-      margin-bottom: 10px;
-    }
-
-    h3 {
-      color: $warm_grey;
-      font-size: 15px;
-      margin-bottom: $gutter_width;
-    }
-  }
-
-  ul {
-    margin-bottom: 10px;
-  }
-
-  .list-partners li:nth-child(3n) {
-		margin-right: 0;
-  }
-}
-body.partners-find-a-partner-hardware .box p:first-child {
-	min-height: 60px;
-	margin-bottom: 0;
-}
-body.partners-hp {
-  blockquote.pull-quote p cite {
-    margin: 10px 0 0;
-    text-indent: 0;
-  }
-
-  .hp-pcs {
-    background: url("../img/partners/hp-partners-laptop.jpg") no-repeat scroll 670px 18px #fff;
-    padding-bottom: 70px;
-  }
-  .server-hp-proliant {
-    background: url("../img/partners/hp-partners-server.jpg") no-repeat scroll -213px 30px #fff;
-    padding-bottom: 40px;
-    padding-top: 65px;
-  }
-  .certified-software img {
-    margin-top: 30px;
-  }
-}
-
-body.partners-ubuntu-certified-home .row-hero {
-	background: url("../img/partners/ubuntu-certified-hero.png") 93% 0 no-repeat;
-	min-height: 261px;
-}
-
-body.partners-become-a-partner h2.isv-partner,
-body.partners-become-a-partner h2.reseller-partner,
-body.partners-become-a-partner h2.hardware-partner {
-	background-position: 0 50%;
-	background-repeat: no-repeat;
-	padding-left: 40px;
-}
-
-body.partners-become-a-partner h2.isv-partner { background-image: url("../img/partners/pictogram-become-a-partner-isv.png"); }
-body.partners-become-a-partner h2.reseller-partner { background-image: url("../img/partners/pictogram-become-a-partner-reseller.png"); }
-body.partners-become-a-partner h2.hardware-partner { background-image: url("../img/partners/pictogram-become-a-partner-hardware.png"); }
-
-body.partners-partner-services .row-hero {
- background: url(../img/partners/partner-services-hero.png) 90% 50% no-repeat;
-}
diff --git a/templates/static/css/section/phone.scss b/templates/static/css/section/phone.scss
deleted file mode 100644
index 2346f3cf6ac..00000000000
--- a/templates/static/css/section/phone.scss
+++ /dev/null
@@ -1,946 +0,0 @@
-/*	@section phone
--------------------------------------------------------------- 
-
-	Contents:
-		@section general
-		@section phone home (LOL)
-		@section more general
-		@section operators-and-oems
-		@section animations on design page
-		@section design
-		@section ubuntu-for-android
-		@section ubuntu-for-android > features
-		@section backed-by-canonical
-		@section contextualised footer
-		
--------------------------------------------------------------- */
-
-/*	@section general
--------------------------------------------------------------- */
-body.phone div.touch-border { 
-  padding-bottom: 0;
-  
-  div {
-    margin-bottom: 0;
-    padding-bottom: $gutter_width * 2; 
-  }
-}
-
-.box-phone, .box-android  {
-	min-height: 15em;
-	padding-right: $six_col;
-}
-
-.box-phone { background: #fff url(../img/devices/devices-phone-hero-353x206.png) 95% center no-repeat; }
-
-.box-android { background: #fff url(../img/devices/photo-industry-android-381x230.jpg) 90% center no-repeat; }
-
-body.phone-home .row-hero{   
-  height: 385px;
-  h2 {
-	  padding-right: 10px;
-  }
-}
-
-body.phone-contact-us .row-hero {
-  height: auto;
-}
-
-/*	@section phone home (LOL)
--------------------------------------------------------------- */
-body.phone-home {
-
-  li.verizon img {
-    position: relative;
-    top: -8px;
-  }
-
-  .row-hero {
-		background: url("../img/devices/phone-photo-hero.jpg") no-repeat scroll 365px 20px #fff;
-    position: relative;
-    
-    #panel .back {
-      p, div {
-        margin-left: 172px;
-      }
-      .right {
-        margin-right: 172px;
-      }
-    }
-    
-    h2 {
-      margin-bottom: 1em;
-    }
-  }
-  
-  .row-features {
-  }/* end row-features */
-  
-  .touch-border {
-    div {
-      min-height: 553px;
-    }
-    img {
-      margin-top: $gutter_width;
-    }
-  }
-  
-  .the-video { 
-    width: 569px;
-    height: 320px;
-    position: absolute;
-    left: 210px;
-    z-index: 20;
-  }
-    
-  .video-background {
-    display: block;
-    width: 569px;
-    height: 320px;
-    background: #000;
-    margin-bottom: 5px;
-  }
-
-  .video.hide {
-    display: none;
-  }
-	.inline-icons {
-		text-align: center;
-	}
-  .inline-icons li {
-    margin-right: 75px;
-    margin-bottom: 30px;
-  }
-  .inline-icons li.last {
-    margin-right: 0;
-  }
-}
-
-/*	@section more general
--------------------------------------------------------------- */
-body.phone {
-  .row-app-grid {
-    overflow: hidden;
-    
-    img {
-      margin-left: -80px;
-      margin-top: 0;
-    }
-  }
-  
-  .row {
-    padding-bottom: 30px;
-    padding-top: 50px;
-    margin-bottom: 0;
-  }
-  .row-app-grid {
-  	background: url("../img/patterns/grey-textured-background.jpg");
-  }
-  .row-hero {
-    padding-top: 0;
-    
-    a img {
-      vertical-align: middle;
-      margin-right: 10px;
-    }
-    
-    a.close-video {
-      margin-top: 5px;
-      img {
-        vertical-align: top;
-      }
-    }
-  }
-  .row img.touch-border { 
-    margin-bottom: -30px; 
-    margin-left: auto;
-    margin-right: auto;
-    display: block;
-  }
-  .adapt-web-apps {
-    background: url('../img/devices/phone-twitter-320x556.jpg') no-repeat scroll 92% 50px transparent;
-    padding-bottom: 100px;
-  }
-  .thumbs{
-    margin-right: $gutter_width;
-  }
-  .thumbs li {
-    float: right;
-    margin-right: ($gutter_width * 2);
-    margin-bottom: 1.2em;
-    list-style-type: none;
-    padding: 0;
-  }
-  .thumbs li.last-item {
-    margin-right: 0;
-  }
-  .thumbs li.bottom {
-    margin-bottom: 0;
-  }
-  .thumbs li img {
-    float: left;
-  }
-  
-  .row-interlinks {
-    padding: 0 56px 0 $gutter_width;
-    border-bottom: 1px solid #CDCDCD;
-    background: $light_grey;
-      -moz-border-radius: 0;
-      -webkit-border-radius: 0;
-    border-bottom: 1px solid #CDCDCD;
-    border-radius: 0;
-    margin-bottom: 0;
-    margin-left: 0;
-    padding: 0 56px 0 $gutter_width;
-      
-    .navigation {
-      
-      li {
-        float: left;
-        margin-right: $gutter_width;
-        list-style-type: none;
-        font-weight: normal;
-        margin-bottom: 0;
-        
-        a {
-          font-size: 13px;
-          color: #333;
-          text-decoration: none;
-          display: block;
-          border-top: 4px solid transparent;
-          padding: 12px 10px 16px;
-        }
-        a:hover {
-          color: #dd4814;
-        }
-        a.active {
-          border-top: 4px solid #dd4814;
-          color: #dd4814;
-        }
-      }
-    }
-  }
-  .next-steps li {
-    border-bottom: 1px dotted #AEA79F;
-    padding: 8px 0 10px;
-  }
-  .next-steps li:first-child {
-    border-top: 1px dotted #AEA79F;
-  }
-}
-
-/*	@section app-ecosystem
--------------------------------------------------------------- */
-body.phone-app-ecosystem {
-  .row-hero {
-    background: url("../img/devices/phone-operators-hero-410x342.jpg") no-repeat scroll 90% 20px;
-    padding-bottom: 60px;
-    div {
-      margin-bottom: 0;
-    }
-    img {
-      padding-top: $gutter_width * 2;
-    }
-  }
-  .write-apps {
-    background: url("../img/devices/phone-write-apps-background.png") no-repeat scroll right 55px;
-  }
-	.row-box-feature {
-		overflow: hidden;
-    
-    img {
-      margin-left: -80px;
-      margin-top: 55px;
-    }
-  }
-}
-
-/*	@section operators-and-oems
--------------------------------------------------------------- */
-body.phone-operators-and-oems {
-  .row-hero {
-    background: url("../img/devices/phone-app-hero-420x338.jpg") no-repeat scroll 90% 30px;
-  }
-  .list-link {
-    padding-left: 30px;
-    position: relative;
-    top: -8px;
-  }
-}
-body.phone-thank-you {  
-  .row-hero{   
-    height: auto;
-    padding-bottom: 20px;
-  }
-  .row-box {
-    @include rounded_corners(0);
-  }
-}
-
-/*	@section animations on design page
--------------------------------------------------------------- */
-body.phone-features {
-		.row strong {
-		font-weight: bold;
-	}
-  .clever-convos {
-    background: url("../img/devices/phone-conversations-324x576.jpg") no-repeat scroll 580px 30px;
-    height: 450px;
-  }
-  .edge-magic-content {
-      margin-top: 95px;
-      padding-right: 60px;
-  }
-  .edge-magic {
-    padding-bottom: 0;
-    padding-top: 0;
-    margin-top: -70px;
-    z-index: 5;
-    
-    .replay {
-      background: url("../img/devices/phone-animation-repeat.png") no-repeat;
-      width: 25px;
-      height: 21px;
-      overflow: hidden;
-      position: absolute;
-      top: 360px;
-      left: 325px;
-      outline: none;
-    }
-    .replay:hover {
-      background-position: 0 -21px;
-    }
-  }
-  .edge-top {
-    margin-top: 0;
-    z-index: 20;
-  }
-  .edge-left {
-    z-index: 10;
-    
-    .edge-magic-content {
-        padding-left: 60px;
-        padding-right: 0;
-      }
-  }
-  .edge-bottom {
-    z-index: 1;
-  }
-  
- .slider-animation {
-  width: 275px;
-  height: 447px;
-  position: relative;
-  background: url("../img/devices/phone-portrait.png") no-repeat;
-  margin: 0 auto;
-  
-    .screen {  
-      width: 182px;
-      height: 324px;
-      position: absolute;
-      top: 54px;
-      left: 36px;
-      overflow: hidden;
-      
-      .launcher {
-        width: 44px;
-        height: 324px;
-        position: absolute;
-        top: 0;
-        left: -100px;
-      }
-    }
-  }
-    
-  .edge-magic-animation .screen { 
-    background: url("../img/devices/phone-edge-magic-twitter.png") no-repeat;
-    .launcher {
-      background: url("../img/devices/phone-edge-magic-launcher.png") no-repeat;
-    }
-    .screen-fade {
-      background: #000;
-      opacity: 0;
-      width: 182px;
-      height: 324px;
-    }
-  }
-  
-  .full-swipe .screen { 
-     background: url("../img/devices/phone-edge-magic-apps-scope.png") no-repeat;
-    .launcher {
-      background: url("../img/devices/phone-edge-magic-launcher.png") no-repeat;
-    }
-    .fb-screen {
-      background: url("../img/devices/phone-edge-magic-facebook.png") no-repeat;
-      width: 182px;
-      height: 324px;
-      position: absolute;
-      top: 0;
-      left: 0;
-    }
-  }
-  
-  .go-back {
-    background: url("../img/devices/phone-portrait.png") no-repeat;
-    .screen {
-      .camera-screen {
-        background: url("../img/devices/phone-edge-magic-camera.png") no-repeat;
-        width: 182px;
-        height: 324px;
-        position: absolute;
-        top: 0;
-        left: 0;
-      }
-      .gallery-screen {
-        background: url("../img/devices/phone-edge-magic-gallery.png") no-repeat scroll center center #000;
-        background-size: 142px 250px;
-        height: 324px;
-        left: 0;
-        position: absolute;
-        top: 0;
-        width: 182px;
-      }
-    }
-  }
-  
-  .content-controls {
-    background: url("../img/devices/phone-portrait.png") no-repeat;
-    margin-bottom: $gutter_width;
-    .screen {
-      .gallery-screen {
-        background: url("../img/devices/phone-edge-magic-gallery-no-controls.png") no-repeat;
-        width: 182px;
-        height: 324px;
-        position: absolute;
-        top: 0;
-        left: 0;
-        display: none;
-      }
-      .gallery-controls {
-        background: url("../img/devices/phone-edge-magic-gallery-controls.png") no-repeat;
-        width: 182px;
-        height: 324px;
-        position: absolute;
-        top: 317px;
-        left: 0;
-      }
-    }
-  }
-  
-  .edge-magic-animation.run {
-    .screen .launcher {
-        -moz-transition: left 1s;
-        -webkit-transition: left 1s;
-        -o-transition: left 1s;
-      transition: left 1s;
-      left: 0;
-    }
-    .screen .screen-fade {
-        -moz-transition-delay: 1s;
-        -webkit-transition-delay: 1s;
-        -o-transition-delay: 1s;
-      transition-delay: 1s;
-        -moz-transition: opacity 1s;
-        -webkit-transition: opacity 1s;
-        -o-transition: opacity 1s;
-      transition: opacity 1s;
-      opacity: 0.3;
-    }
-  }
-  
-  .full-swipe.run .screen {
-    .launcher{
-      left: 0;
-        -moz-transition: left 1s;
-        -webkit-transition: left 1s;
-        -o-transition: left 1s;
-      transition: left 1s;
-    }
-    .launcher.return {
-      left: -100px; 
-    }
-    .fb-screen {
-       left: 182px;
-       
-        -moz-transition: left 1s;
-        -webkit-transition: left 1s;
-        -o-transition: left 1s;
-      transition: left 1s;
-        -moz-transition-delay: .7s;
-        -webkit-transition-delay: .7s;
-        -o-transition-delay: .7s;
-      transition-delay: .7s;
-    }
-  }
-  
-  .go-back.run .screen {
-    .camera-screen{
-      left: -182px;
-          -moz-transition: left 1s;
-          -webkit-transition: left 1s;
-          -o-transition: left 1s;
-        transition: left 1s;
-    }
-    .gallery-screen {
-      background-size: 182px 324px;
-        -moz-transition: left 1s ease 1.5s;
-          -webkit-transition: left 1s ease 1.5s;
-          -o-transition: left 1s ease 1.5s;
-        transition: left 1s ease 1.5s;
-          -moz-transition: background-size 1s ease;
-          -webkit-transition: background-size 1s ease;
-          -o-transition: background-size 1s ease;
-        transition: background-size 1s ease;
-    }
-  }
-  
-  .content-controls.run {
-    .screen .gallery-controls {
-      top: 280px;
-        -moz-transition: top 0.5s;
-        -webkit-transition: top 0.5s;
-        -o-transition: top 0.5s;
-      transition: top 0.5s;
-    }
-  }
-  
-  .row-notifications {
-  
-    .screen {
-		  background: url(../img/devices/phone-notifications.png) no-repeat;
-		}
-		
-		.settings-screen {
-		  transition: height .8s;
-		  background: url(../img/devices/phone-anim-settings-screen.png) no-repeat;
-		  width: 182px;
-      height: 0;
-      position: absolute;
-      top: 0;
-      left: 0;
-		}
-		
-		.slider-knot {
-		  transition: top .8s;
-		  background: url(../img/devices/phone-anim-slider-knot.png) no-repeat;
-		  width: 182px;
-		  height: 15px;
-		  position: absolute;
-		  top: -15px;
-		  left: 0;
-		}
-		
-		.run {
-		   .slider-knot {
-		     top: 309px;
-		   }
-		   .settings-screen {
-		     height: 324px;
-		   }
-		}
-  }
-  
-  .row-hud .screen {
-		background: url(../img/devices/phone-hud.png) no-repeat;
-  }
-}
-
-/*	@section design
--------------------------------------------------------------- */
-body.phone-features {
-  .row-hero {
-    background: url("../img/devices/phone-photo-hero-561x323.png") no-repeat scroll 96% 20px;
-  }
-  .infographic {
-    background:url("../img/devices/phone-infographic-background.jpg") no-repeat; 
-    background-size: 100% 100%;
-    color: #fff;
-    height: 442px;
-    padding-top: 0 ;
-    padding-bottom: $gutter_width;
-    
-    h1 {
-      margin-top: 70px;
-      padding-right: 40px;
-    }
-    
-    .main-image {
-      opacity: 1;
-        -moz-transition: opacity 2s;
-        -webkit-transition: opacity 2s;
-        -o-transition: opacity 2s;
-      transition: opacity 2s;
-      position: absolute;
-      margin-left: -38px;
-    }
-    
-    .hide {
-      opacity: 0;
-    }
-    
-    .thumbnails {
-      list-style-type: none;
-      height: 80px;
-      position: absolute;
-      top: 350px;
-      text-align: center;
-      padding-bottom: 20px;
-      width: 550px;
-      
-      img {
-        margin-right: 20px;
-      }
-    }
-    .no-print img {
-    	position: absolute;
-    	left: -50px;
-    }
-  }
-  
-  .search-animation {
-	  width: 275px;
-	  height: 447px;
-	  position: relative;
-	  background: url("../img/devices/phone-portrait.png") no-repeat;
-	  margin: 50px auto 0;
-
-    .replay {   
-      left: 242px;
-    }
-     
-    .search-screen {
-      position: absolute;
-      background: #000;
-      width: 180px;
-      height: 320px;
-      overflow: hidden;
-      left: 36px;
-      top: 55px;
-      
-      .search-results {
-        position: absolute;
-        top: 17px;
-        height: 320px;
-        width: 237px;
-        overflow: hidden;
-        
-        img {
-          position: absolute;
-          top: 0;
-            -moz-transition: top 1s;
-            -webkit-transition: top 1s;
-            -o-transition: top 1s;
-          transition: top 1s;
-        }
-      }
-      
-      .search-search {
-        position: absolute;
-        top: 17px;
-        width: 237px;
-        height: 39px;
-        overflow: hidden;
-        
-        img {
-          position: absolute;
-          top: 0;
-            -moz-transition: top 0.5s;
-            -webkit-transition: top 0.5s;
-            -o-transition: top 0.5s;
-          transition: top 0.5s;
-        }
-      }
-      
-      .search-title {
-        position: absolute;
-        top: 0;
-        height: 17px;
-        overflow: hidden;
-        width: 80px;
-        
-        img {
-          position: absolute;
-          top: 0;
-            -moz-transition: top 0.5s;
-            -webkit-transition: top 0.5s;
-            -o-transition: top 0.5s;
-          transition: top 0.5s;
-        }
-      }
-    }
-    
-    .search-screen.run {
-      .search-title img {
-        top: -17px;
-      }
-      .search-search img {
-        top: -33px;
-      }
-      .search-results img {
-        top: -290px;
-      }
-    }
-    /*.search-screen:hover {
-      .search-title img{
-        top: -17px;
-      }
-      .search-search img{
-        top: -33px;
-      }
-      .search-results img{
-        top: -1000px;
-      }
-    }*/
-  }
-  .phone-photos {
-    padding-bottom: 0;
-    overflow: hidden;
-    
-    h2{
-      margin-top: 30px;
-    }
-    
-    .phone-camera {
-      margin-left: -80px;
-      margin-top: $gutter_width; 
-    }
-    
-    .photo-gallery {
-      margin-left: -30px;
-    }
-  }
-  .row-pictures {
-	  top: -110px;
-	  margin-bottom: -110px;
-	  float: left;
-	  position: relative;
-  }
-  .row-pictures div.feature-image {
-		background: #000;
-		position: relative;
-		top: 0;
-		left: 0;
-  }
-  .row-pictures .pictures-portrait .feature-image {
-  	background: url("../img/devices/phone-gallery-photos-portrait.png") 36px 53px no-repeat;
-		margin-top: 123px;
-		margin-left: 38px;
-  	height: 447px;
-  	width: 258px;
-  }
-  .row-pictures .pictures-portrait img {
-		position: relative;
-		z-index: -1;
-	}
-  .row-pictures .pictures-landscape .feature-image {
-  	background: url("../img/devices/phone-gallery-camera-landscape.png") 92px 40px no-repeat;
-  	width: 500px;
-  	height: 258px;
-	  margin-left: -50px;
-	  margin-top: 10px;
-	  margin-bottom: 20px;
-  }
-  .row-pictures .pictures-landscape img {
-		position: relative;
-		z-index: -1;
-  }
-}
-
-body.phone-ubuntu-for-android {
-	.row-free .eight-col ul {
-		background:url('../img/patterns/android-background-dotted.png');
-		padding: $gutter_width 0;
-		text-align: center;
-		width: 100%;
-	}
-	
-	.row-free ul li {
-		margin-bottom: 0;
-	}
-}
-
-body.phone-ubuntu-for-android #easy-integration {
-	background: $light_grey url(../img/devices/bg-android-integrate-301x296.png) right bottom no-repeat;
-	background-size: 311px 306px;
-	margin-bottom: 0;
-	padding: 30px $four_col 20px 40px;
-	width: 100%;
-}
-
-body.phone-ubuntu-for-android #ecosystem {
-	background: $light_grey;	
-}
-
-/*	@section ubuntu-for-android
--------------------------------------------------------------- */
-.row-hero-android {
-	background: url(../img/devices/photo-android-hero-749x456.jpg) 145% top no-repeat;
-	min-height: 22.5em;
-	margin-bottom: 0;
-}
-
-.row-android-intro .four-col { min-height: 30em; }
-
-.row-android .four-col {
-	background:url('../img/patterns/android-background-dotted.png') 0 2px;
-	display: table;
-	text-align: center;
-}
-
-.row-android span {
-	display: table-cell;
-	vertical-align: middle;
-}
-
-body.phone-ubuntu-for-android .box-contact { 
-	@include rounded_corners(4px);
-	padding: $gutter_width; 
-	margin-bottom: $gutter_width;
-}
-
-/*	@section ubuntu-for-android > features
--------------------------------------------------------------- */
-body.phone-ubuntu-for-android-features {
-  h1 {
-    position: relative;
-    z-index: 2;
-  }
-  .row-hero { overflow: visible; }
-  .row-hero img { margin-bottom: $gutter_width; }
-  .default-apps{
-    ul {
-      padding: 20px;
-    }
-    li {
-      width: 17.7953%;
-      padding-top: 20px;
-      border-bottom: 1px dotted #AEA79F;
-      border-right: 1px dotted #AEA79F;
-      height: 150px;
-      width: 166px;
-      text-align: center;
-      margin-bottom: 0;
-    }
-    li.bottom {
-      border-bottom: 0;
-      margin-bottom: $gutter_width;
-    }
-    li.last-item {
-      border-right: 0;
-    }
-  } 
-} 
-
-/*	@section backed-by-canonical
--------------------------------------------------------------- */
-body.phone-backed-by-canonical,
-body.tablet-backed-by-canonical {
-	#main-content .row-hero {
-		height: auto;
-		min-height: 0;
-		padding-top: 40px;
-		
-		p {
-		  width: 570px;
-		}
-	}
-	#main-content .intro {
-		background: url(../img/logos/canonical-symbol-167x167.png) 90% center no-repeat;
-		padding: 0 $four_col 0 0;
-	}
-	.intro li .link-cta-ubuntu { margin-right: $gutter_width; }
-	.row-experience .five-col { margin-top: $gutter_width * 4; }
-}
-
-body.phone-ubuntu-for-android-contact-us .row-hero {
-	height: auto;
-}
-
-/*	@section contextualised footer #context-footer
--------------------------------------------------------------- */
-.phone-context-footer .feature-three {
-	background: url(../img/devices/phone-bottom-find-out.png) right center no-repeat;
-	min-height: 170px;
-	
-	p {
-		padding-right: 65px;
-	}
-
-}
-
-/*  @section carrier-advisory-group
--------------------------------------------------------------- */
-body.phone-carrier-advisory-group {
-  #main-content .list li:first-of-type{
-    padding-top: 0;
-  }
-  .row-hero ul {
-    margin-top: 35px;
-    margin-right: -20px;
-    text-align: center;
-    li {	
-      margin-right: 20px;
-      margin-bottom: 20px;
-      padding: 20px 10px 14px;
-      width: 189px;
-    }
-    li img {
-    	float: none;
-    }
-    li.five {
-      margin-right: 25px;
-    }
-    li.verizon img {
-      position: relative;
-      top: -8px;
-    }
-  } 
-  
-  
-  .independently-chained {
-    padding-top: 60px;
-    padding-bottom: 60px;
-    background: url("../img/devices/phone-photo-app.png") no-repeat scroll 0 center #f7f7f7;
-  }
-  .benefits-of-joining {
-    background: url("../img/devices/phone-cag-gallery.jpg") no-repeat scroll 700px center transparent;
-    
-    h2 {
-      margin-bottom: 22px;
-    }
-  }
-  .row-image-centered {
-    padding-bottom: 40px;
-  }
-}
-/* Edge Indiegogo promo */
-.edge-promo {
-	min-height: 300px;
-	
-	background: #282828 url(../img/homepage/2_3_generic.jpg) 680% 72% no-repeat;
-    -moz-box-shadow:    inset 0  4px 6px -4px rgba(0, 0, 0, 0.6), 
-                        inset 0 -4px 6px -4px rgba(0, 0, 0, 0.6);
-    -webkit-box-shadow: inset 0  4px 6px -4px rgba(0, 0, 0, 0.6), 
-                        inset 0 -4px 6px -4px rgba(0, 0, 0, 0.6);
-     box-shadow:        inset 0  4px 6px -4px rgba(0, 0, 0, 0.6), 
-                        inset 0 -4px 6px -4px rgba(0, 0, 0, 0.6);
-	color: #fff;
-	
-	h2 {
-			text-shadow: 0 2px 4px rgba(0,0,0,.6);
-	}
-	
-	p {
-		margin-bottom: 25px;
-	}
-	p:last-child {
-		margin-bottom: 0;
-	}
-	
-	.link-cta-ubuntu {
-		-moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
-		-webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
-	}
-
-}
\ No newline at end of file
diff --git a/templates/static/css/section/server.scss b/templates/static/css/section/server.scss
deleted file mode 100644
index 068537fbdc4..00000000000
--- a/templates/static/css/section/server.scss
+++ /dev/null
@@ -1,181 +0,0 @@
-/*	@section server
--------------------------------------------------------------- 
-	Contents:
-		@section general
-		@section server-services
--------------------------------------------------------------- */
-
-/*	@section general
--------------------------------------------------------------- */
-body.server .row-hero { /* First bit of content on a page, normally contains h1 and sometimes a bit of blurb */
-	position: relative;	
-}
-
-body.server th { font-weight: normal; }
-body.server tfoot th { font-weight:  bold; }
-
-body.server .button-right {
-	margin-top: 18px;
-	margin-bottom: 0;
-}
-
-body.server .row-hero {
-	xbackground: #fff url('../img/patterns/enterprise-dot-pattern.png');
-}
-
-body.server .row-hero h2 {
-	color: $warm_grey;
-	padding-top: 20px;
-}
-
-body.server .row-hero { }
-
-body.server .row-experts .eight-col,
-body.server .row-support .six-col { border-right: 1px dotted $warm_grey; }
-
-body.server .row-support .six-col { min-height: 6em; }
-
-body.server .row-experts .last-col, body.server .row-support .last-col {
-	border: 0;
-	width: (246/$base)em
-}
-
-body.server .row-experts .last-col .link-cta-canonical { width: auto; }
-
-body.server .row-budget .box div {
-	border-bottom: 1px dotted $warm_grey; 
-	margin-bottom: .769em;
-}
-
-.row-support-systems-management {
-	background: #fff url(../img/desktop/screenshot-landscape-482x460.png) top right no-repeat;
-	min-height: 460px;
-}
-
-body.server .row-integration {
-	background: #efeeec url(../img/pictograms/pictogram-server-integration-352x90.png) 3em center no-repeat;
-	margin-bottom: 0;
-}
-
-body.server .row-integration div {
-	padding-left: $six_col;
-	padding-bottom: $gutter_width;
-}
-
-body.server .row-landscape img {
-	height: auto;
-	max-width: 100%;
-}
-
-body.server .row-community {	margin-bottom: 0; border-bottom: 0; }
-body.server .row-community .nine-col { background: #fff; }
-.row-juju-maas div {
-	padding-bottom: 0;
-}
-
-.row-juju-maas div h2 {
-	padding-top: 130px;
-}
-
-.row-juju-maas .box-juju h2 {
-	background: url(../img/pictograms/pictogram-juju-100x100.png) center top no-repeat;
-}
-
-.row-juju-maas .box-maas h2 {
-	background: url(../img/pictograms/pictogram-maas-100x100.png) center top no-repeat;
-}
-
-
-/*	@section server-services
--------------------------------------------------------------- */
-body.server-services .row-hero {
-	background-image: none;
-	border: 0;
-	padding-bottom: 0;
-}
-
-body.server-services .row-hero h2 {
-	background: none;
-	color: inherit;
-	padding: 0;
-	text-align: left;
-}
-
-body.server-services .packages {	margin-bottom: 20px; }
-
-body.server-services .packages h2 {
-	background: #efeeec url(../img/cloud/bg-servicesserver-owl-125x101.png) no-repeat 20px 50%;
-	width: 45.5%;
-	padding-top: 85px;
-	padding-bottom: 77px;
-}
-
-body.server-services .packages dd {	min-height: 10em; }
-body.server-services .packages dd.price {	min-height: 0; }
-body.server-services .packages .price-annual  {	top: 220px; }
-body.server-services .row-ubuntu-advantage { padding-bottom: 0; }
-body.server-services .row-ubuntu-advantage h3 { @include font_size (19.5); }
-body.server-services .row-ubuntu-advantage .list-details { margin-bottom: 0; }
-body.server-services .row-ubuntu-advantage li.first { height: 38.7em; }
-
-body.server-services .row-blockquote {
-	background: #e2d4dc;
-	padding-top: $gutter_width;
-	margin-bottom: 0;
-	padding-bottom: $gutter_width/2;
-}
-
-body.server-services .row-blockquote p.last {
-	padding-left: 25px;
-	display: block;
-	float: left;
-}
-
-body.server-services .row-blockquote p a { @include font_size (16); }
-
-body.server-services .row-enterprise {
-	padding-top: $gutter_width;
-	margin-bottom: 0;
-	overflow: hidden;
-}
-
-body.server-services .row-ubuntu-advantage { padding-top: 30px; }
-
-body.server-services .row-enterprise .quote-canonical {
-	margin-right: 20px;
-	padding: 20px 40px 0 80px;
-}
-
-body.server-services .row-methodology {
-	background: #e2d4dc;
-	padding-top: $gutter_width;
-}
-
-body.server-services .row-methodology .arrow-left {
-	bottom: auto;
-	top: 20px;
-}
-
-body.server-hyperscale h1 {
-  float: none;
-  margin-bottom: 18px;
-}
-
-body.server-hyperscale .partner-logo {
-	height: 124px;
-	margin-top: -20px;
-}
-
-body.server-hyperscale .partner-logo img {
-	@include vertical-align;
-}
-
-body.server-hyperscale .welcome-hyperscale {
-  background: url("../img/business/hyperscale-servers.png") no-repeat scroll 575px center #fff;
-}
-
-body.server-contact-us .row-hero h2,
-body.server-thank-you .row-hero h2   {
-  color: #333;
-  padding-top: 0;
-}
diff --git a/templates/static/css/section/tablet.scss b/templates/static/css/section/tablet.scss
deleted file mode 100644
index 36b2cae21a7..00000000000
--- a/templates/static/css/section/tablet.scss
+++ /dev/null
@@ -1,386 +0,0 @@
-/*	@section tablet
--------------------------------------------------------------- 
-	Contents:
-		@section general
-		@section tablet home
-		@section Get in touch and thank you
-		@section app ecosystem
-		@section tablet animations
-		@section contextualised footer #context-footer
-		
--------------------------------------------------------------- */
-
-/*	@section general
--------------------------------------------------------------- */
-.box-tablet { 
-	background: url("../img/devices/devices-tablet-hero-432x252.jpg") no-repeat scroll 98% center #FFFFFF; 
-	min-height: 15em;
-	padding-right: $six_col;
-}
-
-body.tablet  {
-  
-  .row {
-    padding-bottom: 30px;
-    padding-top: 50px;
-    margin-bottom: 0;
-  }
-  
-  .row img.shadow-fix {
-    margin-left: -40px;
-  }
-  
-  .row-tight {
-    padding-top: 0;
-  }
-  
-  .row h2 + img {
-    margin-top: 20px;
-  }
-  
-  .row-box-feature {
-  	background: url("../img/patterns/grey-textured-background.jpg");
-  }
-  
-  .row-hero {
-    min-height: 450px;
-    padding-top: 0;
-
-    .twelve-col { padding: 0 1em; }
-    .eight-col { margin-bottom: 0; }
-
-    a img {
-      vertical-align: middle;
-      margin-right: 10px;
-    }
-    
-    a.close-video {
-      margin-top: 5px;
-      img {
-        vertical-align: top;
-      }
-    }
-  }
-  
-  .row-bottom {
-  	background: none;
-  	border-bottom: 0;
-    padding-top: 0;
-    border-bottom: 0;
-    
-    div {
-      min-height: 305px;
-    }
-    
-    div p:first-of-type {
-      padding-right: 74px;
-    }
-    .meet-us {
-      background: url("../img/devices/phone-bottom-meet-us.png") no-repeat right 60px, url("../img/patterns/grey-textured-background.jpg");
-    }
-    
-    .when-its-here {
-      background: url("../img/devices/phone-bottom-find-out.png") no-repeat right 60px, url("../img/patterns/grey-textured-background.jpg");
-    }
-  }
-	.box-highlight { 
-		border: 0; 
-		margin-bottom: 40px;
-	}  
-  .box {
-    border: 0;
-    padding-bottom: 0;
-  }
-  .next-steps li {
-    border-bottom: 1px dotted #AEA79F;
-    padding: 8px 0 10px;
-  }
-  .next-steps li:first-child {
-    border-top: 1px dotted #AEA79F;
-  }
-}
-
-body.tablet-backed-by-canonical .row-hero,
-body.tablet-contact-us .row-hero,
-body.tablet-thank-you .row-hero {
-	min-height: 0;	
-}
-
-/*	@section tablet home
--------------------------------------------------------------- */
-body.tablet-design {
-  .row-hero {
-    background: url("../img/devices/tablet-hero.jpg") no-repeat scroll 340px 50px;
-      -moz-transition: height 0.3s linear;
-      -webkit-ttransition: height 0.3s linear;
-      -o-transition: height 0.3s linear;
-    transition: height 0.3s linear;
-    
-    .video-link {
-      margin-top: 30px;
-    }
-    
-    .the-video {
-      position: absolute;
-      left: 0;
-      height: 554px;
-      width: 984px;
-      background: #fff;
-      display: none;
-      
-      p {
-        padding: 5px;
-        margin: 0 $gutter_width/2 0 $gutter_width;
-      }
-      
-      div {
-        margin-top: 20px;
-      }
-      
-    }
-    
-    .the-video.show {
-      display: block;
-      z-index: 10;
-    }
-    
-    a {
-      outline: none;
-    }
-  }
-  
-  .row-tight {
-    padding-top: 0;
-    
-    h3 {
-      margin-top: 40px;
-    }
-  }
-  
-  .naturally-neat h2 {
-    margin-top: 50px;
-  }
-  
-  .safer-sharing {
-    background: url("../img/devices/safer-sharing-bg.png") no-repeat scroll;
-    color: #fff;
-  }
-  
-  .gorgeous-gallery {
-    background: url("../img/devices/tablet-gallery-bg.jpg") no-repeat scroll;
-    height: 666px;
-  }
-  
-  .instant-share {
-    background: url("../img/devices/tablet-share-menu.png") no-repeat scroll;
-    height: 480px;
-  }
-  
-  .world-of-apps {
-    background: url("../img/devices/tablet-world-of-apps.jpg") no-repeat scroll right 57px;
-  }
-}
-
-/*	@section Get in touch and thank you
--------------------------------------------------------------- */
-body.tablet-contact-us,
-body.tablet-thank-you {
-  
-  .row-hero {
-    height: auto;
-  }
-}
-
-body.tablet-operators-and-oems {
-  .row-hero {
-    background: url("../img/devices/tablet-hero-2.png") no-repeat scroll 340px 23px;
-    min-height: 440px;
-  }
-  
-  .row-dark-enterprise {
-    background: $dark_aubergine;
-    color: #fff;
-  }
-  
-  .pull-quote {
-    margin-top: 80px;
-  }
-  
-}
-
-/*	@section app ecosystem
--------------------------------------------------------------- */
-body.tablet-app-ecosystem {
-  .row-hero {
-    background: url("../img/devices/tablet-hero-3.png") no-repeat scroll 400px 50px;
-  }
-  .write-apps {
-    background: url("../img/devices/phone-write-apps-background.png") no-repeat scroll right 55px;
-  }
-}
-
-/*	@section tablet animations
--------------------------------------------------------------- */
-body.tablet {
-  .replay {
-    background: url("../img/devices/phone-animation-repeat.png") no-repeat;
-    width: 25px;
-    height: 21px;
-    overflow: hidden;
-    position: absolute;
-    outline: none;
-    top: 420px;
-    left: 280px;
-    display: none;
-  }
-  
-  .replay:hover {
-    background-position: 0 -21px;
-  }
-  
-  .slider-animation {
-    width: 682px;
-    height: 433px;
-    position: relative;
-    background: url("../img/devices/tablet-landscape-blank.png") no-repeat;
-    margin: 0 auto;
-  
-    .screen {  
-      width: 487px;
-      height: 306px;
-      position: absolute;
-      top: 47px;
-      left: 99px;
-      overflow: hidden;
-      
-      .launcher {
-        width: 44px;
-        height: 324px;
-        position: absolute;
-        top: 0;
-        left: -100px;
-      }
-      
-      .messages {
-        width: 155px;
-        height: 0px;
-        position: absolute;
-        top: 0;
-        right: 0;
-      }
-    }
-  }
-  
-  .instant-launch {
-    margin-left: -50px;
-    .screen { 
-      background: url("../img/devices/tablet-landscape-album-screen.png") no-repeat;
-      .launcher {
-        background: url("../img/devices/tablet-launcher.png") no-repeat;
-      }
-      .screen-fade {
-        background: #000;
-        opacity: 0;
-        width: 487px;
-        height: 306px;
-      }
-    }
-  }
-  .instant-launch.run {
-    .screen .launcher {
-        -moz-transition: left 1s;
-        -webkit-transition: left 1s;
-        -o-transition: left 1s;
-      transition: left 1s;
-      left: 0;
-    }
-    .screen .screen-fade {
-        -moz-transition-delay: 1s;
-        -webkit-transition-delay: 1s;
-        -o-transition-delay: 1s;
-      transition-delay: 1s;
-        -moz-transition: opacity 1s;
-        -webkit-transition: opacity 1s;
-        -o-transition: opacity 1s;
-      transition: opacity 1s;
-      opacity: 0.3;
-    }
-  }
-  
-  .system-service {
-    margin-left: -40px;
-    .screen { 
-      background: url("../img/devices/tablet-google-doc-screen.png") no-repeat;
-      .messages {
-        background: url("../img/devices/tablet-messages.png") no-repeat;
-        height: 0;
-      }
-      .screen-fade {
-        background: #000;
-        opacity: 0;
-        width: 487px;
-        height: 306px;
-      }
-    }
-  }
-  .system-service.run {
-    .screen .messages {
-        -moz-transition: height .8s;
-        -webkit-transition: height .8s;
-        -o-transition: height .8s;
-      transition: height .8s;
-      height: 306px;
-    }
-    .screen .screen-fade {
-        -moz-transition-delay: .8s;
-        -webkit-transition-delay: .8s;
-        -o-transition-delay: .8s;
-      transition-delay: .8s;
-        -moz-transition: opacity .8s;
-        -webkit-transition: opacity .8s;
-        -o-transition: opacity .8s;
-      transition: opacity .8s;
-      opacity: 0.3;
-    }
-  }
-  
-  .content-controls{
-    margin-left: -50px;
-    .screen { 
-      background: url("../img/devices/tablet-video-screen.png") no-repeat;
-      .menu {
-        position: relative;
-        background: url("../img/devices/tablet-media-controls.png") no-repeat;
-        top: 306px;
-        width: 487px;
-        height: 27px;
-      }
-    }
-  }
-  .content-controls.run {
-    .screen .menu {
-        -moz-transition: top .5s;
-        -webkit-transition: top .5s;
-        -o-transition: top .5s;
-      transition: top .5s;
-      top: 280px;
-    }
-  }
-}
-
-.yui3-js-enabled body.tablet .replay {
-  display: block;
-}
-
-/*	@section contextualised footer #context-footer
--------------------------------------------------------------- */
-.tablet-context-footer .feature-three {
-	background: url(../img/devices/phone-bottom-find-out.png) right center no-repeat;
-	min-height: 170px;
-	
-	p {
-		padding-right: 65px;
-	}
-
-}
-
diff --git a/templates/static/css/section/tv.scss b/templates/static/css/section/tv.scss
deleted file mode 100644
index f6c10ea4a64..00000000000
--- a/templates/static/css/section/tv.scss
+++ /dev/null
@@ -1,115 +0,0 @@
-/*	@section tv
--------------------------------------------------------------- 
-	Contents:
-		@section general
-		@section experience
-		@section commercial-info & contributors
-
--------------------------------------------------------------- */
-
-/*	@section general
--------------------------------------------------------------- */
-body.tv .row img.touch-border { 
-  margin-bottom: -$gutter_width; 
-  margin-left: auto;
-  margin-right: auto;
-  display: block;
-}
-
-body.tv .row-hero p { padding-left: 0; }
-body.tv .row img { margin-bottom: -4px; }
-body.tv .row-hero h2 { @include font_size (36); }
-
-.box-tv {
-	min-height: 15em;
-	padding-right: $six_col;
-}
-
-.box-tv { background: #fff url(../img/devices/photo-industry-tv-427x247.jpg) 95% center no-repeat; }
-
-.tv .no-margin { margin-bottom: 0; }
-
-body.tv .row-hero iframe { margin-bottom: 20px }
-
-body.tv-experience .row-hero h2,
-body.tv-industry .row-hero h2,
-body.tv-features-and-specs .row-hero h2 { @include font_size (25); }
-body.tv-features-and-specs .inline-icons li { margin-top: 1.25em; }
-
-body.tv-features-and-specs .row-hero h2 { margin-bottom: 1em; }
-
-body.tv-home #main-content .row-hero {
-	padding-top: 20px;	
-}
-
-
-
-/*	@section experience
--------------------------------------------------------------- */
-body.tv-experience .row-hero {
-	overflow: hidden;
-}
-
-body.tv-experience .row-hero .intro {
-	padding: 0 $seven_col 2em 0;
-	margin: 0;
-}
-
-body.tv-experience .inner-wrapper .row-hero .intro img {
-	position: absolute;
-	right: -120px;
-	bottom: -35px;
-}
-
-.row-tv-start .box {
-	background: url(../img/pictograms/pictogram-develop-125x125.png) $two_col top no-repeat;
-	padding-left: $six_col/* - $grid_gutter/*/;
-}
-
-.row-tv-talk {
-	@include rounded_corners(0);
-	padding-top: 0;
-}
-
-.row-tv-talk .box {
-	background: $light_grey;
-}
-
-/*	@section commercial-info & contributors
--------------------------------------------------------------- */
-.tv-commercial-info .row-terms .article, 
-.tv-commercial-info .row-maintenance .article,
-.row-contributors .article,
-.row-get-involved .article {
-	background-position: $nine_col 48px;
-	background-repeat: no-repeat;
-	padding: 0 $four_col $gutter_width 0;
-}
-
-.tv-commercial-info .row-terms .article {
-	background-image: url(../img/pictograms/pictogram-partner-124x124.png);
-}
-
-.tv-commercial-info .row-maintenance .article {
-	background-image: url(../img/pictograms/pictogram-upgrade-124x124.png);
-}
-
-.tv-commercial-info .row-engineering .article {
-	background-image: url(../img/pictograms/pictogram-engineering-124x124.png);
-}	
-
-.tv-industry .row-hero .intro {
-	padding-right: $five_col;
-}
-
-body.tv .row-tv-contact {
-	border-bottom: 0;
-	padding: 20px 0 20px $grid_gutter;
-}
-
-body.tv #context-footer .feature-two {
-	background: url(../img/pictograms/pictogram-develop-125x125.png) 125% 20px no-repeat;
-}
-body.tv #context-footer .feature-two p {
-	padding-right: 60px;
-}
\ No newline at end of file
diff --git a/templates/static/css/section/widgets.scss b/templates/static/css/section/widgets.scss
deleted file mode 100644
index 85202b0bcf4..00000000000
--- a/templates/static/css/section/widgets.scss
+++ /dev/null
@@ -1,35 +0,0 @@
-/* insights blog widget */
-#insights-feed ul { display: table; }
-
-#insights-feed ul li {
-	display: table-cell;
-	line-height: 1.4;
-	float: none;
-	padding-left: 20px;
-}
-
-#insights-feed ul li a {
-	display: block;
-	margin-bottom: 6px;
-}
-
-#insights-feed ul li span {
-	text-transform: uppercase;
-}
-
-#insights-feed ul li span.date {
-	text-transform: none;
-}
-
-#insights-feed ul li:first-child {
-	padding-left: 0;
-}
-
-#insights-feed ul li:last-child {
-	margin-right: 0;
-}
-
-/* non js enterprise promo */
-.yui3-js-enabled .row-enterprise-blog {
-	display: none;
-}
\ No newline at end of file
diff --git a/templates/static/css/ubuntu-styles.css b/templates/static/css/ubuntu-styles.css
deleted file mode 100644
index e582edb86be..00000000000
--- a/templates/static/css/ubuntu-styles.css
+++ /dev/null
@@ -1 +0,0 @@
-@charset "UTF-8";a.broken{border:2px dashed #008000!important;clear:both;display:inline-block}a.broken img{float:left}.col,.eight-col,.eleven-col,.five-col,.four-col,.nine-col,.one-col,.seven-col,.six-col,.ten-col,.three-col,.twelve-col,.two-col{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;clear:none;display:inline-block;float:left;margin-right:2.128%;margin-bottom:20px;padding:0;position:relative}.one-col{width:6.38297%}.two-col{width:14.89361%}.three-col{width:23.40425%}.four-col{width:31.91489%}.five-col{width:40.42553%}.six-col{width:48.93617%}.seven-col{width:57.4468%}.eight-col{width:65.95744%}.nine-col{width:74.46808%}.ten-col{width:82.97872%}.eleven-col{width:91.48936%}.twelve-col{width:100%;margin-right:0}.twelve-col .one-col{width:6.3053%;margin-right:2.21238%}.twelve-col .two-col{width:14.823%;margin-right:2.21238%}.twelve-col .three-col{width:23.3407%;margin-right:2.21238%}.twelve-col .four-col{width:31.8584%;margin-right:2.21238%}.twelve-col .five-col{width:40.3761%;margin-right:2.21238%}.twelve-col .six-col{width:48.8938%;margin-right:2.21238%}.twelve-col .seven-col{width:57.4115%;margin-right:2.21238%}.twelve-col .eight-col{width:65.9292%;margin-right:2.21238%}.twelve-col .nine-col{width:74.4469%;margin-right:2.21238%}.twelve-col .ten-col{width:82.9646%;margin-right:2.21238%}.twelve-col .eleven-col{width:91.4823%;margin-right:2.21238%}.twelve-col .twelve-col{width:100%;margin-right:0}.eleven-col .one-col{width:6.89238%;margin-right:2.41837%}.eleven-col .two-col{width:16.20314%;margin-right:2.41837%}.eleven-col .three-col{width:25.5139%;margin-right:2.41837%}.eleven-col .four-col{width:34.82466%;margin-right:2.41837%}.eleven-col .five-col{width:44.13542%;margin-right:2.41837%}.eleven-col .six-col{width:53.44619%;margin-right:2.41837%}.eleven-col .seven-col{width:62.75695%;margin-right:2.41837%}.eleven-col .eight-col{width:72.06771%;margin-right:2.41837%}.eleven-col .nine-col{width:81.37847%;margin-right:2.41837%}.eleven-col .ten-col{width:90.68923%;margin-right:2.41837%}.eleven-col .eleven-col{width:100%;margin-right:0}.ten-col .one-col{width:7.6%;margin-right:2.66666%}.ten-col .two-col{width:17.86666%;margin-right:2.66666%}.ten-col .three-col{width:28.13333%;margin-right:2.66666%}.ten-col .four-col{width:38.4%;margin-right:2.66666%}.ten-col .five-col{width:48.66666%;margin-right:2.66666%}.ten-col .six-col{width:58.93333%;margin-right:2.66666%}.ten-col .seven-col{width:69.19999%;margin-right:2.66666%}.ten-col .eight-col{width:79.46666%;margin-right:2.66666%}.ten-col .nine-col{width:89.73333%;margin-right:2.66666%}.ten-col .ten-col{width:100%;margin-right:0}.nine-col .one-col{width:8.46953%;margin-right:2.97176%}.nine-col .two-col{width:19.91084%;margin-right:2.97176%}.nine-col .three-col{width:31.35215%;margin-right:2.97176%}.nine-col .four-col{width:42.79346%;margin-right:2.97176%}.nine-col .five-col{width:54.23476%;margin-right:2.97176%}.nine-col .six-col{width:65.67607%;margin-right:2.97176%}.nine-col .seven-col{width:77.11738%;margin-right:2.97176%}.nine-col .eight-col{width:88.55869%;margin-right:2.97176%}.nine-col .nine-col{width:100%;margin-right:0}.eight-col .one-col{width:9.56375%;margin-right:3.3557%}.eight-col .two-col{width:22.48322%;margin-right:3.3557%}.eight-col .three-col{width:35.40268%;margin-right:3.3557%}.eight-col .four-col{width:48.32214%;margin-right:3.3557%}.eight-col .five-col{width:61.24161%;margin-right:3.3557%}.eight-col .six-col{width:74.16107%;margin-right:3.3557%}.eight-col .seven-col{width:87.08053%;margin-right:3.3557%}.eight-col .eight-col{width:100%;margin-right:0}.seven-col .one-col{width:10.98265%;margin-right:3.85356%}.seven-col .two-col{width:25.81888%;margin-right:3.85356%}.seven-col .three-col{width:40.6551%;margin-right:3.85356%}.seven-col .four-col{width:55.49132%;margin-right:3.85356%}.seven-col .five-col{width:70.32755%;margin-right:3.85356%}.seven-col .six-col{width:85.16377%;margin-right:3.85356%}.seven-col .seven-col{width:100%;margin-right:0}.six-col .one-col{width:12.89592%;margin-right:4.52488%}.six-col .two-col{width:30.31674%;margin-right:4.52488%}.six-col .three-col{width:47.73755%;margin-right:4.52488%}.six-col .four-col{width:65.15837%;margin-right:4.52488%}.six-col .five-col{width:82.57918%;margin-right:4.52488%}.six-col .six-col{width:100%;margin-right:0}.five-col .one-col{width:15.61643%;margin-right:5.47945%}.five-col .two-col{width:36.71232%;margin-right:5.47945%}.five-col .three-col{width:57.80821%;margin-right:5.47945%}.five-col .four-col{width:78.9041%;margin-right:5.47945%}.five-col .five-col{width:100%;margin-right:0}.four-col .one-col{width:19.79166%;margin-right:6.94444%}.four-col .two-col{width:46.52777%;margin-right:6.94444%}.four-col .three-col{width:73.26388%;margin-right:6.94444%}.four-col .four-col{width:100%;margin-right:0}.three-col .one-col{width:27.01421%;margin-right:9.47867%}.three-col .two-col{width:63.5071%;margin-right:9.47867%}.three-col .three-col{width:100%;margin-right:0}.two-col .one-col{width:42.53731%;margin-right:14.92537%}.two-col .two-col{width:100%;margin-right:0}.one-col .one-col{width:100%;margin-right:0}.twelve-col .last-col{margin-right:0}.eleven-col .last-col{margin-right:0}.ten-col .last-col{margin-right:0}.nine-col .last-col{margin-right:0}.eight-col .last-col{margin-right:0}.seven-col .last-col{margin-right:0}.six-col .last-col{margin-right:0}.five-col .last-col{margin-right:0}.four-col .last-col{margin-right:0}.three-col .last-col{margin-right:0}.two-col .last-col{margin-right:0}.one-col .last-col{margin-right:0}#context-footer,.row{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;border-bottom:1px dotted #aea79f;clear:both;position:relative}#context-footer,.row{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;margin:0;padding:40px 40px 20px}.row:after{content:".";visibility:hidden;display:block;height:0;clear:both}.row-feature{background:0}.container{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:20px 20px 0;width:100%}.append-one{margin-right:8.511%}.append-two{margin-right:17.021%}.append-three{margin-right:25.532%}.append-four{margin-right:34.043%}.append-five{margin-right:42.553%}.append-six{margin-right:51.064%}.append-seven{margin-right:59.574%}.append-eight{margin-right:68.085%}.append-nine{margin-right:76.596%}.append-ten{margin-right:85.106%}.append-eleven{margin-right:undefined}.prepend-one{margin-left:8.511%}.prepend-two{margin-left:17.021%}.prepend-three{margin-left:25.532%}.prepend-four{margin-left:34.043%}.prepend-five{margin-left:42.553%}.prepend-six{margin-left:51.064%}.prepend-seven{margin-left:59.574%}.prepend-eight{margin-left:68.085%}.prepend-nine{margin-left:76.596%}.prepend-ten{margin-left:85.106%}.prepend-eleven{margin-left:undefined}.push-one{margin-left:57px}.pull-eight,.pull-eleven,.pull-five,.pull-four,.pull-nine,.pull-one,.pull-seven,.pull-six,.pull-ten,.pull-three,.pull-two{float:left;position:relative}.pull-one{margin-left:-6.383%}.pull-two{margin-left:-17.021%}.pull-three{margin-left:-25.532%}.pull-four{margin-left:-34.043%}.pull-five{margin-left:-34.043%}.pull-six{margin-left:-51.064%}.pull-seven{margin-left:-59.574%}.pull-eight{margin-left:-68.085%}.pull-nine{margin-left:-76.596%}.pull-ten{margin-left:-85.106%}.pull-eleven{margin-left:undefined}.push-1,.push-eight,.push-eleven,.push-five,.push-four,.push-nine,.push-seven,.push-six,.push-ten,.push-three,.push-two{float:left;position:relative}.push-one{margin:0 -8.511% 0 8.511%}.push-two{margin:0 -19.149% 0 19.149%}.push-three{margin:0 -27.66% 0 27.66%}.push-four{margin:0 -36.17% 0 36.17%}.push-five{margin:0 -36.17% 0 36.17%}.push-six{margin:0 -53.191% 0 53.191%}.push-seven{margin:0 -61.702% 0 61.702%}.push-eight{margin:0 -70.213% 0 70.213%}.push-nine{margin:0 -78.723% 0 78.723%}.push-ten{margin:0 -87.234% 0 87.234%}.push-eleven{margin:0 undefined 0 undefined}.border{border-right:1px solid #ddd;margin-right:10px;padding-right:.5625em}.prepend-top,div.prepend-top{margin-top:20px}.append-bottom,div.append-bottom{margin-bottom:20px}.last,.last-col{margin-right:0}.clearfix:after,.container:after{clear:both;content:"\0020";display:block;height:0;overflow:hidden;visibility:hidden}.clear{clear:both}.clearfix{display:block}a,acronym,address,applet,article,aside,audio,b,big,blockquote,body,canvas,caption,center,cite,code,del,details,dfn,div,dl,em,embed,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,nav,object,ol,output,p,pre,q,ruby,s,samp,section,small,span,strike,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,tt,u,ul,var,video{margin:0;padding:0;border:0;vertical-align:baseline}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}[hidden]{display:none}html{font-size:100%;overflow-y:scroll;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{background:#fff url("/sites/ubuntu/latest/u/img/patterns/body_bg.jpg");color:#333;font-family:Ubuntu,Arial,"libra sans",sans-serif;font-weight:300}blockquote,q{quotes:none}blockquote{margin:28px 20px}blockquote:after,blockquote:before,q:after,q:before{content:"";content:none}legend{border:0;*margin-left:-7px}figure{margin:0}abbr,acronym{cursor:help}a:focus{outline:thin dotted}a:active,a:hover{outline:0}a:link,a:visited{color:#dd4814;text-decoration:none}a:active,a:focus,a:hover{text-decoration:underline}a.link-arrow:after{content:"\0000a0›"}nav ul li h2 a:after{content:"\0000a0›"}.carousel ul li a:after,nav ul li a:after,ul li p a:after{content:""}ol,ul{margin-left:20px;margin-bottom:20px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}nav ol,nav ul{list-style:none;list-style-image:none}svg:not(:root){overflow:hidden}img{border:0}img.left{margin-right:20px}img.right{margin-left:20px}.middle img{vertical-align:middle;margin-top:4em}h1,h2,h3,h4{font-weight:300;line-height:1.3}h1{font-size:2.813em;margin-bottom:.267em}h2{font-size:2em;margin-bottom:.375em}h1 span,h2 span{display:block}ol+h2,p+h2,pre+h2,ul+h2{margin-top:.563em}header nav a:link{font-weight:normal}h3{font-size:1.438em;margin-bottom:.522em}ol+h3,p+h3,pre+h3,ul+h3{margin-top:.783em}h4{font-size:1.219em;margin-bottom:.615em}ol+h4,p+h4,pre+h4,ul+h4{margin-top:1.219em}h5{font-size:1em;margin-bottom:.75em}h6{font-size:.813em;margin-bottom:.923em;text-transform:uppercase;letter-spacing:.1em}code,li,p,pre{font-size:1em;margin-bottom:.75em;line-height:1.6;margin-bottom:.75em}li{margin-bottom:.4em}li:last-of-type{margin-bottom:0}ins{background:#fffbeb;text-decoration:none}.smaller,small{font-size:13px}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{vertical-align:text-top}sub{vertical-align:text-bottom}dfn{font-style:italic}mark{background:#ff0;color:#000}code,pre{font-family:"Ubuntu Mono","Consolas","Monaco","Lucida Console","Courier New",Courier,monospace}pre{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background:#fdf6f2;padding:.6em 1em;white-space:pre-wrap;word-wrap:break-word}hgroup>h1+h2,hgroup>h2+h3,hgroup>h3+h4{color:#aea79f;margin-top:.625em}hgroup>h2+h3{margin-top:0}hgroup>h3+h4{margin-top:.313em}blockquote{margin:0}blockquote>p{font-size:.813em;margin-bottom:.923em;font-weight:100;margin:0 0 .4em 0}blockquote small{font-size:.813em;line-height:1.4}button,input,select,textarea{margin:0;vertical-align:baseline;*vertical-align:middle}button,input{line-height:normal}button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;*overflow:visible}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}form fieldset{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background-repeat:no-repeat;background-color:#efeeec;background-position:-15px -15px;border:0;margin-bottom:8px;padding:15px 20px 15px 94px}form fieldset h3{border-bottom:1px dotted #dfdcd9;margin-bottom:9px;padding-bottom:10px}form fieldset li:first-child{margin-top:0}form input[type="text"],form textarea{-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;background:#fff;border:1px solid #999;font-family:Ubuntu,Arial,"libra sans",sans-serif;display:block;padding:4px}form input:focus,form textarea:focus{border:1px solid #000}form textarea[readonly='readonly']{color:#999}form input[type="checkbox"],form input[type="radio"]{margin:0;width:auto}form input[type="checkbox"]+label,form input[type="radio"]+label{display:inline;margin-left:5px;vertical-align:middle;width:auto}form input[type="submit"]{font-size:1em;margin-bottom:.75em;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background-color:#dd4814;background-image:-moz-linear-gradient(#f26120,#dd4814);background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#f26120),to(#dd4814));background-image:-webkit-linear-gradient(#f26120,#dd4814);background-image:-o-linear-gradient(#f26120,#dd4814);-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;border:0;color:#fff;display:block;padding:10px 14px;text-shadow:none;width:auto;margin-bottom:0}form input[type="submit"]:hover{background:#dd4814}form label{cursor:pointer;display:block;margin-bottom:4px}form label span{color:#df382c}form ul{margin-left:0}form li{list-style:none outside none;margin-top:14px}form button[type="submit"]{border:0;display:inline-block;font-family:Ubuntu,Arial,"libra sans",sans-serif;text-decoration:none;font-weight:300}form input[type="reset"]{display:none}table{border-collapse:collapse;border-spacing:0;width:100%;margin:0 0 2.5em 0;margin-bottom:20px}table td,table th{padding:15px 10px;background:#f0edea;border:1px dotted #aea79f}table td{text-align:center;vertical-align:middle}table thead th{border-collapse:separate;border-spacing:0 10px;background:#fee3d2;color:#333;font-weight:normal}table tbody th{font-weight:300}table th[scope="col"]{text-align:center}table thead th:first-of-type{text-align:left}.audience-consumer{color:#333}.audience-consumer .main-content,.audience-consumer .row-box{color:#333}.audience-consumer .inner-wrapper{background:#fff}.audience-consumer .quote-right-top{padding:60px 60px 0 40px;background:url("/sites/ubuntu/latest/u/img/patterns/quote-orange-br-287x287.png") no-repeat;height:287px;position:absolute;right:-40px;text-align:left;top:-90px;width:31.915%}.audience-consumer .quote-right-top p{font-size:1em;margin-bottom:.75em;margin:.769em;padding-bottom:0;color:#fff}.audience-consumer .quote-right-top p cite{font-size:.75em;margin-bottom:1em;color:#fff;padding:0}.audience-consumer .quote-right p a,.audience-consumer .quote-right-top p a{color:#fff}.audience-consumer .quote-right{font-size:1.125em;margin-bottom:.667em;color:#fff;padding:50px 100px 0 50px;text-indent:-6px;background:url("/sites/ubuntu/latest/u/img/patterns/quote-orange-bl-287x287.png") no-repeat;min-height:287px;position:absolute;right:-20px;text-align:left;top:-90px;width:31.915% -9.375em}.audience-consumer .quote-right cite{font-style:normal;margin-left:6px}.audience-consumer .quote-right-alt{background:url(/sites/ubuntu/latest/u/img/patterns/quote-white-br-360x360.png) 0 -100px no-repeat;color:#dd4814;padding:50px 50px 0 50px}.audience-consumer .quote-right-right{background:url("/sites/ubuntu/latest/u/img/patterns/quote-orange-br-287x287.png") no-repeat}.audience-enterprise h1{margin:0 0 18px 0}.audience-enterprise td{background:#fff}.audience-enterprise td,.audience-enterprise th{padding:6px 10px;background:#fff}.audience-enterprise th[scope="col"]{background:#e2d4dc;color:#772953}.audience-enterprise tbody th[rowspan]{background:#f7f2f6}.audience-enterprise tfoot th[rowspan]{background:#dfdcd9}.audience-enterprise tfoot td,.audience-enterprise tfoot th{font-weight:normal;background:#dfdcd9}.audience-enterprise .inner-wrapper{background:#2c001e;color:#fff}.audience-enterprise .row-box{background:#fff;color:#333}.row-enterprise{background:#772953;color:#fff;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.row-enterprise .box,.row-enterprise div{background:#772953;color:#fff}.row-enterprise a{color:#fff}.enterprise-dot-pattern{background:url(/sites/ubuntu/latest/u/img/patterns/enterprise-dot-pattern.png)}.developer-dot-pattern{background:url(/sites/ubuntu/latest/u/img/patterns/developer-dot-pattern.png)}html{background:#f7f7f7}p.intro{font-size:1.438em;margin-bottom:.522em;line-height:1.4}header.banner{background:#dd4814;position:relative;z-index:2;width:100%;margin-bottom:20px;display:inline-block;border-top:0;-moz-box-shadow:inset 0 2px 2px -2px #777,2px 1px #fff;-webkit-box-shadow:inset 0 2px 2px -2px #777,2px 1px #fff;box-shadow:inset 0 2px 2px -2px #777,2px 1px #fff}header.banner .nav-primary{border:0;margin:0 auto;overflow:hidden;width:984px}header.banner .nav-primary ul{border-right:1px solid rgb(92.905%,40.05%,21.604%);float:left;margin:0;position:relative}header.banner .nav-primary li{border-left:1px solid rgb(77.497%,25.248%,7.013%);float:left;list-style-image:none;margin:0;text-indent:0;vertical-align:bottom}header.banner .nav-primary ul li:last-child{border-right:1px solid rgb(77.497%,25.248%,7.013%)}header.banner .nav-primary li a:link,header.banner .nav-primary li a:visited{font-size:14px;border-left:1px solid rgb(92.407%,35.843%,16.102%);color:#fff;display:block;margin-bottom:0;padding:12px 14px 14px;position:relative;text-align:center;text-decoration:none;-webkit-font-smoothing:subpixel-antialiased;-moz-font-smoothing:subpixel-antialiased;-o-font-smoothing:subpixel-antialiased;font-smoothing:subpixel-antialiased}header.banner .nav-primary a.active{background:#b83a10;border-left:1px solid rgb(92.407%,35.843%,16.102%)}header.banner .nav-primary li a:hover{background:#e1662f;border-top:0;-moz-box-shadow:inset 0 2px 2px -2px #777;-webkit-box-shadow:inset 0 2px 2px -2px #777;box-shadow:inset 0 2px 2px -2px #777}.nav-secondary{border-bottom:1px solid #dfdcd9;margin-bottom:0}.nav-secondary ul{float:left;margin-bottom:10px;margin-left:2px}.nav-secondary ul li{float:left;margin-top:16px;font-size:14px;margin-right:15px}.nav-secondary ul li a:link,.nav-secondary ul li a:visited{color:#333;font-size:14px;float:left}.nav-secondary ul li a:hover{color:#dd4814;text-decoration:none}.nav-secondary ul li,.nav-secondary ul li.active a:link,.nav-secondary ul li.active a:visited{color:#dd4814;text-decoration:none}.nav-secondary ul.breadcrumb{margin-left:20px}.nav-secondary ul.breadcrumb li,.nav-secondary ul.breadcrumb li a:link,.nav-secondary ul.breadcrumb li a:visited{color:#aea79f;margin-right:8px}.nav-secondary ul.breadcrumb li.active a:link,.nav-secondary ul.breadcrumb li.active a:visited{color:#dd4814}header.banner h2{font-size:1.563em;margin-bottom:.48em;display:block;left:4px;margin-bottom:0;position:relative;text-transform:lowercase;top:14px}header.banner a,header.banner h2 a:link,header.banner h2 a:visited{color:#fff;float:left;text-decoration:none}header.banner .logo{border-left:0;float:left;height:48px;overflow:hidden}header.banner .logo-ubuntu{background:url("/sites/ubuntu/latest/u/img/ubuntu-logo.png") no-repeat scroll 0 10px transparent;font-size:18px;margin-bottom:0;position:relative;text-transform:lowercase;float:left;margin:0;display:inline-block;height:32px;min-width:128px;margin-right:-20px}header.banner .logo-ubuntu img{margin-right:8px;position:absolute;left:-999em}header.banner .logo-ubuntu span{float:left;font-size:23px;padding-left:122px;padding-right:20px;position:relative;top:5px}header.banner .nav-primary.nav-left .logo-ubuntu{float:right}header.banner .nav-primary.nav-right .logo-ubuntu{float:left}footer.global{-moz-box-shadow:inset 0 2px 2px -2px #d3d3d3;-webkit-box-shadow:inset 0 2px 2px -2px #d3d3d3;background:#f7f7f7;border-top:0;box-shadow:inset 0 2px 2px -1px #d3d3d3;clear:both;display:block;padding:30px 0 20px;position:relative;width:100%}footer.global .footer-a{border-bottom:1px solid #d8d8d8;clear:both;padding-bottom:20px;margin-bottom:20px}footer.global .footer-a div{padding-bottom:10px}footer.global .footer-a ul{border-collapse:collapse;display:table;float:none;margin-left:-15px;padding-bottom:0;width:100%}footer.global .footer-a ul li{border-right:1px dotted #aea79f;display:table-cell;float:none;margin-left:15px;padding-bottom:5px;padding-left:15px;padding-right:5px;width:auto;width:124px}footer.global .footer-a ul li.secondary-desktop{width:128px}footer.global .footer-a ul li.secondary-server{width:118px}footer.global .footer-a ul li.secondary-tablet{width:123px}footer.global .footer-a ul li.secondary-cloud{width:115px}footer.global .footer-a ul li.secondary-tv{width:115px}footer.global .footer-a ul li.secondary-management{width:143px}footer.global .footer-a ul li.last-item,footer.global .footer-a ul li:last-child{border:0;padding-right:0}footer.global .footer-a ul ul{margin-left:0;display:block}footer.global .footer-a li li{margin-left:0;float:none;width:auto;display:block;min-height:0;border:0;margin-bottom:2px;padding-left:0;padding-bottom:inherit;background:0}footer.global .footer-a li li:last-child{margin-bottom:0}footer.global .footer-a li li a{display:block}footer.global .inline-lists ul,footer.global .legal,footer.global nav div.footer-a div{margin:0 auto;width:984px}footer.global .legal{background:url(/sites/ubuntu/latest/u/img/logos/logo-ubuntu-grey.png) 100% 0 no-repeat;position:relative;clear:both;min-height:40px}footer.global h2{font-size:.75em;margin-bottom:1em;line-height:1.4;margin-bottom:0;padding-bottom:.5em}footer.global h2,footer.global h2 a:link,footer.global h2 a:visited{color:#333;font-weight:normal}footer.global nav ul li h2 a:after{content:""}footer.global ul{margin:0}footer.global nav ul li.two-col{display:inline-block;min-height:10em;vertical-align:top}footer.global nav ul li li{font-size:.75em;margin-bottom:1em;margin-bottom:0}footer.global ul li li a:link,footer.global ul li li a:visited{color:#333;margin-bottom:0}footer.global h2 a:active,footer.global h2 a:hover,footer.global ul li li a:active,footer.global ul li li a:hover{color:#dd4814;text-decoration:underline}footer.global p,footer.global ul.inline li a{color:#333;font-size:12px;margin-bottom:0}footer.global ul.inline li a:hover{color:#dd4814}footer.global ul.inline li:after{color:#aea79f;content:"•";vertical-align:middle;margin:0 5px}footer.global ul.inline li:last-child{width:120px}footer.global ul.inline li:last-child:after{content:""}footer.global .footer-b{border-bottom:1px solid #d8d8d8;padding:0 0 20px;margin:0 auto 20px}footer.global .footer-b h2,footer.global .footer-b h2 a,footer.global .footer-b ul li,footer.global .footer-b ul ul{margin:0;padding:0;line-height:2;width:auto;float:none}footer.global .footer-b h2{float:left;margin-right:6px;display:inline}footer.global .footer-b li{width:100%;display:block;clear:both;overflow:hidden}footer.global .footer-b li li{width:auto;background:0;float:left;clear:none}footer.global .footer-b li li:last-child{width:200px}footer.global .footer-b li li:after{content:"|";padding-left:6px;padding-right:6px;position:relative}footer.global .footer-b li h2 a:after,footer.global .footer-b li li:last-child:after{content:""}#context-footer{font-size:.875em;margin-bottom:.857em;border-bottom:0;padding-bottom:1px;padding-top:0;width:100%}#context-footer hr{background:#dd4814;height:14px;margin:0 -40px 40px;border:0;-moz- box-shadow:inset 0 2px 2px -2px #333;-webkit box-shadow:inset 0 2px 2px -2px #333;box-shadow:inset 0 2px 2px -2px #333;clear:both}#context-footer div.twelve-col{display:table;float:none;margin-bottom:7px}#context-footer div div{display:table-cell;float:none;padding-left:20px;margin-bottom:0}#context-footer div div div{display:block;padding-left:0;margin-bottom:0}#context-footer div div.feature-one{padding-left:0}#context-footer div div.feature-four{margin-right:0}#context-footer ul{margin-bottom:5px}#context-footer li.active{display:none}#context-footer h3{font-size:1em;margin-bottom:.75em;font-weight:normal}#context-footer .list a:after{content:"\0000a0›"}a.link-cta-canonical,a.link-cta-inverted,a.link-cta-ubuntu,button.cta-canonical,button.cta-ubuntu,form button[type="submit"],form input[type="submit"]{font-size:1em;margin-bottom:.75em;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background-color:#c03f11;background-image:-moz-linear-gradient(#dd4814,#c03f11);background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#dd4814),to(#c03f11));background-image:-webkit-linear-gradient(#dd4814,#c03f11);background-image:-o-linear-gradient(#dd4814,#c03f11);color:#fff;text-decoration:none;display:inline-block;margin:0;padding:8px 14px;font-family:Ubuntu,Arial,"libra sans",sans-serif;font-weight:300;-webkit-font-smoothing:subpixel-antialiased;-moz-font-smoothing:subpixel-antialiased;-o-font-smoothing:subpixel-antialiased;font-smoothing:subpixel-antialiased}a.cta-large,button.cta-large{font-size:1.125em;margin-bottom:.667em;padding:10px 20px}a.link-cta-canonical,button.cta-canonical,form button.cta-canonical[type="submit"],form input.cta-canonical[type="submit"]{background-color:#5f193e;background-image:-moz-linear-gradient(#772953,#5f193e);background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#772953),to(#5f193e));background-image:-webkit-linear-gradient(#772953,#5f193e);background-image:-o-linear-gradient(#772953,#5f193e);color:#fff}a.link-cta-inverted,button.cta-inverted{background:#fff;color:#333}.row -enterprise button.link-cta-canonical,.row-enterprise a.link-cta-canonical{background:#fff;color:#772953}a.link-cta-ubuntu:hover,button.cta-ubuntu:hover,form button[type="submit"]:hover,form input[type="submit"]:hover{text-decoration:none;background:#dd4814}a.link-cta-canonical:hover,button.cta-canonical:hover{text-decoration:none;background:#772953}.row-enterprise a.link-cta-canonical:hover,.row-enterprise button.cta-canonical:hover,a.link-cta-inverted:hover,button.cta-inverted:hover{text-decoration:underline;background:#fff}a.cta-deactivated,a.cta-deactivated:hover,button.cta-deactivated,button.cta-deactivated:hover{color:#fff;background:#efefef;cursor:not-allowed}.four-col p:last-child{margin-bottom:0}form .fieldset-1{background-image:url("/sites/ubuntu/latest/u/img/patterns/fieldsets-1.png")}form .fieldset-2{background-image:url("/sites/ubuntu/latest/u/img/patterns/fieldsets-2.png")}form .fieldset-3{background-image:url("/sites/ubuntu/latest/u/img/patterns/fieldsets-3.png")}form .fieldset-4{background-image:url("/sites/ubuntu/latest/u/img/patterns/fieldsets-4.png")}form .fieldset-submit ul{margin-bottom:0}form .errMsg,form fieldset .mktError{color:#df382c}.reqMark{color:#df382c}form fieldset .mktFormMsg{clear:both;display:block}.donation-button{margin-bottom:1em}.mktFormText,.mktFormTextarea{width:83%}.wrapper{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;background:#fff;margin:0 auto;text-align:left;width:984px;position:relative}.inner-wrapper{-moz-box-shadow:0 0 3px #c9c9c9;-webkit-box-shadow:0 0 3px #c9c9c9;box-shadow:0 0 3px #c9c9c9;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background:#fff;clear:both;display:block;float:left;width:100%;margin:10px 0 30px;padding-bottom:20px;position:relative;z-index:1}#main-content .row-hero{padding-top:40px}.row-feature{background:0;border:1px solid #dfdcd9;padding-bottom:20px}.row-grey{background:#f7f7f7}.box,.box-grey{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;padding:1.333em 20px}.box{background:#fff;border:1px solid #dfdcd9}.box-grey{background:#f7f7f7;color:#333}.box-orange{background:#dd4814;color:#fff}.box-highlight{-moz-box-shadow:0 2px 2px 0 #c2c2c2;-webkit-box-shadow:0 2px 2px 0 #c2c2c2;box-shadow:0 2px 2px 0 #c2c2c2;border:1px solid #f7f7f7}.box-textured{-moz-box-shadow:0 2px 2px 0 #c2c2c2;-webkit-box-shadow:0 2px 2px 0 #c2c2c2;box-shadow:0 2px 2px 0 #c2c2c2;background:url("/sites/ubuntu/latest/u/img/patterns/grey-textured-background.jpg");border:0}.box-padded{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background:#efefef;border:0;margin-bottom:20px;padding:6px 5px 6px}.box-padded h3{font-size:1.219em;margin-bottom:.615em;margin-left:5px;margin-top:5px}.box-padded li h3{font-size:1.219em;margin-bottom:.615em;margin:0}.box-padded div{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background:#fff;overflow:hidden;padding:8px 8px 2px}.box-padded-feature{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background:url("/sites/ubuntu/latest/u/img/patterns/soft-centre-bkg.gif") repeat scroll 0 0 #a09f9f;border:0;margin-bottom:20px;padding:11px 5px 6px}.box-padded-feature h3{color:#fff;margin-left:5px;font-size:1.219em;margin-bottom:.615em}.box-padded-feature h4{font-size:1em;margin-bottom:.75em;font-weight:normal}.box-padded-feature>div{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background:#fff;overflow:hidden;padding:20px 8px 0}.box-padded-feature div div{margin-bottom:0}.box-padded-feature .inline-icons{display:table;width:100%;margin:0 0 20px 0}.box-padded-feature .inline-icons li{display:table-cell;text-align:left;float:none}.arrow-down,.arrow-left,.arrow-right,.arrow-up{height:11px;position:absolute;width:18px}.arrow-right{background:url("/sites/ubuntu/latest/u/img/patterns/arrow-right.png") 0 0 no-repeat;height:18px;right:-11px;top:20px;width:11px}.arrow-up{background:url("/sites/ubuntu/latest/u/img/patterns/arrow-up.png") 0 0 no-repeat;left:20px;top:-11px}.arrow-down{background:url("/sites/ubuntu/latest/u/img/patterns/arrow-down.png") 0 0 no-repeat;bottom:-11px;right:20px}.arrow-left{background:url("/sites/ubuntu/latest/u/img/patterns/arrow-left.png") 0 0 no-repeat;bottom:20px;height:18px;left:-11px;width:11px}div>.arrow-left{left:-10px}.list,.list-canonical,.list-ubuntu{list-style:none;margin-left:0}.list li,.list-canonical li,.list-ubuntu li{border-bottom:1px dotted #aea79f;margin-bottom:0;padding:10px 0}.list li.last-item,.list li:last-of-type,.list-canonical li.last-item,.list-canonical li:last-of-type,.list-ubuntu li.last-item,.list-ubuntu li:last-of-type{border:0;padding-bottom:0}nav .list a{display:block}.list-canonical li,.list-ubuntu li{background-repeat:no-repeat;background-position:0 15px;padding-left:25px}.list-ubuntu li{background-image:url("/sites/ubuntu/latest/u/img/patterns/tick-orange.png")}.list-canonical li{background-image:url("/sites/ubuntu/latest/u/img/patterns/tick-aubergine.png")}blockquote.pull-quote p{margin-left:.4em;text-indent:-0.4em;font-size:30px;line-height:1.3;color:#aea79f}blockquote.pull-quote p cite{margin:10px 0 0 .8em;font-size:16px;font-weight:300;display:block}blockquote.quote-canonical,blockquote.quote-canonical-white{font-size:1em;margin-bottom:.75em;background:url("/sites/ubuntu/latest/u/img/patterns/quote-white-360x360.png") no-repeat 20px -130px;color:#772953;float:right;height:215px;margin-top:0;padding:20px 60px 0 60px;position:relative;width:236px}blockquote.quote-canonical-white{background:url("/sites/ubuntu/latest/u/img/patterns/quote-aubergine-345x345.png") no-repeat 0 0;color:#fff;padding:80px 60px 0 60px;height:265px}blockquote.quote p:first-child{font-size:1.125em;margin-bottom:.667em;line-height:1.3;text-indent:-7px}blockquote.quote-right-bottom p{color:#fff}blockquote.quote-right-bottom{background:url("/sites/ubuntu/latest/u/img/patterns/quote-orange-br-287x287.png") no-repeat;color:#fff;height:167px;padding:60px 40px;position:absolute;right:-40px;top:-90px;width:207px}blockquote.quote-grey{font-size:2.25em;margin-bottom:.333em;background:url("/sites/ubuntu/latest/u/img/patterns/quote-grey-br-211x211.png") no-repeat scroll 0 0 transparent;color:#fff;height:152px;line-height:40px;margin-left:20px;padding:60px 0 0;text-align:center;width:211px}blockquote.quote-bottom-left{background:url("/sites/ubuntu/latest/u/img/patterns/quote-orange-bl-287x287.png") no-repeat;color:#fff;height:167px;padding:55px 40px 70px 45px;width:225px}.row-quote{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.row-quote blockquote{font-size:1.5em;margin-bottom:.5em;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;margin:0;padding:0 80px 20px;text-indent:-10px}.row-quote blockquote p{font-size:1em;margin-bottom:.75em;line-height:1.3;color:#333}.row-quote blockquote cite{font-size:.75em;margin-bottom:1em;color:#333;font-style:normal;margin-bottom:0}.row-quote .quote-twitter{background:#fcece7 url(/sites/ubuntu/latest/u/img/pictograms/pictogram-twitter-115x139.png) 20px bottom no-repeat;padding:20px 20px 20px 23.404%}.row-quote .quote-twitter-small{background:#fcece7 url(/sites/ubuntu/latest/u/img/pictograms/pictogram-twitter-54x63.png) 99% bottom no-repeat;padding:20px 20px 20px 80px}.row-quote .quote-twitter-small p{margin:0;padding:0}.pull-wrap{padding-right:40.426%;width:57.447%;margin-bottom:20px}.pull-quote{font-size:1.875em;margin-bottom:.4em;color:#aea79f;line-height:1.4;right:0;text-indent:-0.4em}.pull-quote.js{padding-left:60px;display:table-cell}blockquote.pull-quote{text-indent:0}.row-box-feature{background:url("/sites/ubuntu/latest/u/img/patterns/grey-textured-background.jpg");padding-top:20px}.tabbed-menu{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;-moz-box-shadow:0 -1px 10px #cfcfcf inset;-webkit-box-shadow:0 -1px 10px #cfcfcf inset;box-shadow:0 -1px 10px #cfcfcf inset;background:none repeat scroll 0 0 #f7f7f7;position:relative;padding-top:20px;padding-bottom:20px}.tabbed-menu ul{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin-bottom:0;display:table;width:100%;table-layout:fixed;position:relative;padding:0}.tabbed-menu li{text-align:center;display:table-cell}.tabbed-menu a{color:#666;display:block;outline:0}.tabbed-menu a:hover{text-decoration:none}.tabbed-menu a.active{color:#772953;text-decoration:none}.tabbed-menu .arrow{position:absolute;bottom:0}.tabbed-content{*zoom:1;padding:20px 40px 0}.tabbed-content:after,.tabbed-content:before{content:"";display:table}.tabbed-content:after{clear:both}.tabbed-content .row{padding-left:0;padding-right:0}.tabbed-content .main-content{padding-bottom:40px}html.yui3-js-enabled .tabbed-content.hide{display:none;opacity:0}.tabbed-content-bg{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;background:#fff;margin-left:20px;margin-right:20px}.tabbed-content-bg .row-box{padding-left:0;padding-right:0}.slider{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background:#f7f7f7;padding-top:40px}.slider .slide-window{overflow:hidden;position:relative;height:450px;-moz-transition:left 1s;-webkit-transition:left 1s;-o-transition:left 1s;transition:left 1s}.slider .slide-container{position:absolute;width:2800px;-moz-transition:left 1s;-webkit-transition:left 1s;-o-transition:left 1s;transition:left 1s;left:0}.slider .slider-dots ul{position:absolute;top:550px;left:220px;z-index:5}.slider .slider-dots li{background:url("/sites/ubuntu/latest/u/img/patterns/sprite-pager.png") no-repeat;list-style-type:none;float:left;text-indent:-9999em;width:7px;height:7px;margin-right:.75em;background-position:0 -8px}.slider .slider-dots li.active{background-position:0 0}.slider .slider-dots a{display:block;outline:0}.slider .slide{float:right;width:700px}.slider .slide h3{margin-top:65px;display:inline-block}.slider .slide p{width:350px}.slider .arrow-next,.slider .arrow-prev{font-size:5em;margin-top:150px;display:block;color:#aea79f;outline:0}.slider .arrow-next:hover,.slider .arrow-prev:hover{text-decoration:none;color:#333}.slider .arrow-next:active,.slider .arrow-prev:active{padding-top:1px;text-decoration:none}.slider .arrow-next:focus,.slider .arrow-prev:focus{text-decoration:none}.no-bullets{list-style:none;margin-left:0}.inline{margin-left:0}.inline li{display:inline;list-style:none;margin-left:0;float:left}.inline-icons{margin:0 0 20px 0}.inline-icons li{margin-right:20px;margin-bottom:20px;text-align:left;display:inline-block}.inline-icons.no-margin-bottom li{margin-bottom:0}.inline-icons li.last-item{margin-right:0}.inline-icons img{vertical-align:middle}.left{float:left}.right{float:right}.accessibility-aid,.off-left{position:absolute;left:-999em}.text-center{text-align:center}.text-right{text-align:right}.text-left{text-align:left}.middle{display:inline-block;vertical-align:middle;text-align:center}.no-margin{margin:0}.no-margin-bottom{margin-bottom:0}.no-padding-bottom{padding-bottom:0}.note{font-size:.813em;margin-bottom:.923em;color:#aea79f}.pull-left-20{margin-left:-20px}.pull-right-20{margin-right:-20px}.pull-left-40{margin-left:-40px}.pull-right-40{margin-right:-41px}.no-border{border:0}.no-indent{text-indent:0}.extra-gap div.last{padding-left:1.25em}.boxed{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background-color:#f7f7f7;margin-bottom:1.538em}.link-top{font-size:.875em;margin-bottom:.857em;clear:both;margin-bottom:40px;margin-top:-40px}.link-top a{background:#fff;margin-right:10px;margin-top:-17px;padding:5px;float:right}.pull-bottom-right{position:absolute;right:0;bottom:0;left:auto}.box .pull-bottom-right{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0}.pull-bottom-left{margin-left:-20px;margin-bottom:-21px}.pull-top-right{margin-right:-20px;margin-top:-21px}.pull-top-right{margin-left:-20px;margin-top:-21px}.row.vertical-divider{padding-bottom:40px}.vertical-divider>div,.vertical-divider>li{border-right:1px dotted #aea79f;margin-right:0;padding-right:20px;padding-left:20px;float:none;display:table-cell;vertical-align:top}.vertical-divider>div.last-col,.vertical-divider>div:last-child,.vertical-divider>div:last-of-type,.vertical-divider>li.last-col,.vertical-divider>li:last-child,.vertical-divider>li:last-of-type{border-right:0;padding-right:0}.vertical-divider>div.first-col,.vertical-divider>div:first-child,.vertical-divider>div:first-of-type,.vertical-divider>li.first-col,.vertical-divider>li:first-child,.vertical-divider>li:first-of-type{padding-left:0}.vertical-divider-full{padding-bottom:0}.vertical-divider-full>div{padding-bottom:40px}.row.vertical-divider-full{padding-bottom:0}div.warning{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background-color:#fdffdc;color:#333}div.warning p{padding:20px;margin:0}.row-box.row-image-centered{display:table;padding-top:20px;padding-bottom:20px}.row.row-image-centered{display:table;padding-top:40px;padding-bottom:40px}.row-hero.row-image-centered{padding-top:0}div.box-image-centered{width:100%;clear:both;position:relative}div.box-image-centered,div.row-image-centered{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding-top:0;display:table}div.box-image-centered div,div.row-image-centered div{float:none;display:table-cell;position:relative}div.box-image-centered div h2,div.box-image-centered div h3,div.box-image-centered div p,div.row-image-centered div h2,div.row-image-centered div h3,div.row-image-centered div p{display:block;width:100%;float:left}div.box-image-centered span,div.row-image-centered span{display:table-cell;text-align:center;vertical-align:middle;float:none;position:relative;top:0}div.box-image-centered span img,div.row-image-centered span img{padding-right:20px}div.box-image-centered div+span img,div.row-image-centered div+span img{padding-right:0;margin-right:-20px}div.box-image-centered{padding-top:20px}.yui3-tooltip-hidden{display:none}.yui3-tooltip-content{-moz-box-shadow:0 2px 8px hsla(0,0%,0%,0.2);-webkit-box-shadow:0 2px 8px hsla(0,0%,0%,0.2);box-shadow:0 2px 8px hsla(0,0%,0%,0.2);position:relative;max-width:520px;_width:520px;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;border:1px solid #efefef;color:#333;background:url("/sites/ubuntu/latest/u/img/patterns/grey-textured-background.jpg") repeat scroll 0 0 transparent;margin-top:-30px}.yui3-tooltip .yui3-widget-bd{padding:20px;width:320px}.yui3-tooltip .yui3-widget-bd *{max-width:100%}.yui3-tooltip .yui3-widget-bd h5{margin-bottom:10px;font-size:22px;font-weight:300}.yui3-tooltip .yui3-widget-bd img{float:left;margin-right:10px}.yui3-tooltip .yui3-widget-bd q{margin-top:20px;margin-bottom:0;padding:10px 0;display:block;font-size:13px;border-top:1px dotted #aea79f;border-bottom:1px dotted #aea79f;font-style:italic}.yui3-tooltip .yui3-widget-bd p:last-child{margin-bottom:0}.yui3-tooltip .yui3-widget-ft,.yui3-tooltip .yui3-widget-ft div{*display:none;position:absolute;width:0;height:0;border-style:solid;line-height:0;font-size:0}.yui3-tooltip .yui3-tooltip-align-bottom .yui3-widget-ft,.yui3-tooltip .yui3-tooltip-align-bottom .yui3-widget-ft div{top:-10px;left:50%;margin:0 0 0 -10px;border-width:0 10px 10px 10px;border-color:#efefef transparent}.yui3-tooltip .yui3-tooltip-align-bottom .yui3-widget-ft div{top:0;border-color:#efefef transparent}.tooltip-label{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-moz-box-shadow:3px 3px 6px rgba(0,0,0,0.3);-webkit-box-shadow:3px 3px 6px rgba(0,0,0,0.3);box-shadow:3px 3px 6px rgba(0,0,0,0.3);display:none;background:#fff;padding:6px 5px;border:1px solid #dfdcd9;position:absolute;top:-20px;z-index:1000;font-size:13px;line-height:1;white-space:nowrap;margin:0}.share-this{margin-top:10px;float:left}#box-search{float:right;margin-bottom:0;padding-bottom:5px;padding-top:7px;border-right:0;padding-right:0}#box-search form input[type="text"]{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;font-size:.813em;margin-bottom:.923em;width:86px;height:24px;border-bottom:1px solid #de6532;border-left:0;border-right:0;margin-bottom:0;background:#be3d00;background:url("/sites/ubuntu/latest/u/img/icons/icon-search.png") no-repeat scroll 5px center #dd4814;-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.4);-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.4);box-shadow:inset 0 2px 4px rgba(0,0,0,0.4);-moz-transition:all .5s;-webkit-transition:all .5s;transition:all .5s;-webkit-appearance:none;padding-left:30px;color:#fff}#box-search form input[type="text"]:focus{width:160px;background:#a63603;background:url("/sites/ubuntu/latest/u/img/icons/icon-search.png") no-repeat 5px center,#a63603}#box-search form button{display:none}.lt-ie8 #box-search{margin-right:0;padding-top:9px}.lt-ie8 body #box-search form .form-text{width:158px!important}.yui3-tooltip-hidden{display:none}.yui3-tooltip-content{-moz-box-shadow:0 2px 8px hsla(0,0%,0%,0.2);-webkit-box-shadow:0 2px 8px hsla(0,0%,0%,0.2);box-shadow:0 2px 8px hsla(0,0%,0%,0.2);position:relative;max-width:520px;_width:520px;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;border:1px solid #e3e3e3;color:#333;background:#f7f7f7}.yui3-tooltip .yui3-widget-bd{padding:20px}.yui3-tooltip .yui3-widget-bd *{max-width:100%}.yui3-tooltip .yui3-widget-bd h5{margin-bottom:10px;font-size:22px;font-weight:300}.yui3-tooltip .yui3-widget-bd q{margin-top:20px;margin-bottom:0;padding:10px 0;display:block;font-size:16px;border-top:1px dotted #aea79f;border-bottom:1px dotted #aea79f;font-style:italic}.yui3-tooltip .yui3-widget-bd p:last-child{margin-bottom:0}.yui3-tooltip .yui3-widget-ft,.yui3-tooltip .yui3-widget-ft div{*display:none;position:absolute;width:0;height:0;border-style:solid;line-height:0;font-size:0}.yui3-tooltip .yui3-tooltip-align-bottom .yui3-widget-ft,.yui3-tooltip .yui3-tooltip-align-bottom .yui3-widget-ft div{top:-10px;left:50%;margin:0 0 0 -10px;border-width:0 10px 10px 10px;border-color:#e3e3e3 transparent}.yui3-tooltip .yui3-tooltip-align-bottom .yui3-widget-ft div{top:1px;border-color:#f7f7f7 transparent}html.lt-ie8 footer.global .footer-a ul li{float:left;min-height:200px}html.lt-ie8 footer.global .footer-a ul ul li{min-height:auto;float:none}html.lt-ie8 .vertical-divider>div,html.lt-ie8 .vertical-divider>li{display:inline;float:left;border:0;padding-left:0}html.lt-ie8 *{zoom:1}html.lt-ie8 .one-col{width:6.3053%}html.lt-ie8 .two-col{width:14.823%}html.lt-ie8 .three-col{width:23.3407%}html.lt-ie8 .four-col{width:28%}html.lt-ie8 .five-col{width:40.3761%}html.lt-ie8 .six-col{width:48.8938%}html.lt-ie8 .seven-col{width:57.4115%}html.lt-ie8 .eight-col{width:65.9292%}html.lt-ie8 .nine-col{width:74.4469%}html.lt-ie8 .ten-col{width:82.9646%}html.lt-ie8 .eleven-col{width:91.4823%}html.lt-ie8 .inline-icons{margin-left:-10px}html.lt-ie8 .inline-icons li{display:inline;float:left;text-align:center;margin-left:10px}html.lt-ie8 .box-padded-feature .six-col{width:px}html.lt-ie8 .feature-list-four .six-col{width:42.8%}html.lt-ie8 header.banner{margin-bottom:20px}html.lt-ie8 .nav-secondary{padding-bottom:15px;padding-left:20px;margin-top:-5px}html.lt-ie8 .row-box{overflow:hidden}html.lt-ie8 a.link-cta-ubuntu{color:#fff}html.lt-ie8 .wrapper{overflow:hidden;border:1px solid #e9e9e9;border-width:0 1px}html.lt-ie8 .inner-wrapper{border-bottom:1px solid #c7c6c5;padding-bottom:20px;width:984px}html.lt-ie8 header.banner .logo-ubuntu{background:url(../img/ie/logo.gif) no-repeat;width:140px;height:27px;display:block;text-indent:-999em;top:8px;left:20px}html.lt-ie8 #box-search{float:none;position:relative;right:0;top:0}html.lt-ie8 #box-search input.form-text{background:#f12d00;border:1px solid #ce2600!important;width:140px!important;right:-10px;top:-2px;position:relative}html.lt-ie8 footer{margin-top:40px}html.lt-ie8 footer.global .footer-a ul li{width:120px;display:inline;height:15em;padding-left:0}html.lt-ie8 footer.global .footer-a ul li li{height:auto}html.lt-ie8 footer.global .footer-b ul li li{padding-right:6px}html.lt-ie8 body.homepage .box a.link-cta-download{color:#fff}html.lt-ie8 body.homepage header.banner .nav-secondary ul{background:0}html.lt-ie8 .row-do-more{padding-left:0}html.lt-ie8 .row-do-more .six-col{display:inline;width:48.936%}html.lt-ie8 .quote-right-top{background:0;top:0;padding:0}html.lt-ie8 .quote-right-top p{color:#dd4814}html.lt-ie8 .ubuntu-why-use-ubuntu .quote-right-right{position:absolute;left:-999em}html.lt-ie8 .ubuntu-why-use-ubuntu .row-free .article .quote-right-alt{height:207px;top:-62px;padding-top:20px}html.lt-ie8 body.ubuntu-why-is-it-free .quote-right{background:0;top:-60px;right:-40px;width:220px}html.lt-ie8 body.ubuntu-why-is-it-free .quote-right p{color:#dd4814}html.lt-ie8 body.business .row-hero p.strip{background:0}html.lt-ie8 body.business .row-hero-business,html.lt-ie8 body.business-desktop-remix .row-hero{left:18px}html.lt-ie8 .row-ubuntu-advantage li{width:46.6938%}html.lt-ie8 body.business-desktop .row-ubuntu-advantage li.first{height:32.25em}html.lt-ie8 body.business-desktop .packages h2{padding:50px 47px 50px 140px}html.lt-ie8 body.business-desktop .packages dl{width:175px}html.lt-ie8 body.business .row-enterprise .six-col{overflow:hidden}html.lt-ie8 body.business .row-enterprise .quote-canonical{background:#fff;height:auto;margin-top:20px;padding-bottom:0}html.lt-ie8 body.business .row-community{padding-bottom:20px}html.lt-ie8 body.business .row-community .nine-col{padding-left:23.404%;width:42.553%}html.lt-ie8 .row-cloud-guest .eight-col,html.lt-ie8 .row-consultancy .eight-col{border-right:1px solid #aea79f;width:65.957%}html.lt-ie8 .row-providers .six-col{width:48.936%}html.lt-ie8 body.download .row-hero{width:98.75%}html.lt-ie8 body.download .row-hero .intro{padding-right:0;width:48.936%}html.lt-ie8 body.download .row-hero .intro p{padding-right:20px}html.lt-ie8 #download-help{background:#f7f7f7;width:65.957%}html.lt-ie8 #download-help li span{margin-left:-5em;overflow:hidden;position:absolute}html.lt-ie8 footer nav ul li.two-col{height:10em}html.lt-ie8 body.download .row-hero .intro{height:10em}html.lt-ie8 .eight-col,html.lt-ie8 .eleven-col,html.lt-ie8 .five-col,html.lt-ie8 .four-col,html.lt-ie8 .nine-col,html.lt-ie8 .one-col,html.lt-ie8 .seven-col,html.lt-ie8 .six-col,html.lt-ie8 .ten-col,html.lt-ie8 .three-col,html.lt-ie8 .twelve-col,html.lt-ie8 .two-col{display:inline}html.lt-ie8 body.project .equal-height .box,html.lt-ie8 body.support .equal-height .box{background:#fff}html.lt-ie8 body.partners .box{border:0}html.lt-ie8 .row{width:904px;float:left;padding-left:40px;clear:both}html.lt-ie8 .row-box{width:904px;float:left;margin-left:20px;clear:both}html.lt-ie8 .row-image-centered span img{position:absolute;left:-999em}html.lt-ie8 body.devices-phone .row-interlinks .navigation li a{padding-bottom:0}html.lt-ie8 body.devices-phone .edge-magic-content{margin-left:-20px;margin-right:-20px;padding-left:20px;padding-right:20px}html.lt-ie8 body.devices-phone .meet-us{border:0;background:#ececec url("/sites/ubuntu/latest/u/img/patterns/grey-textured-background.jpg")}html.lt-ie8 .ubuntu .box-get-ubuntu div{height:210px}html.lt-ie8 .ubuntu .box-get-ubuntu li{width:24.5%}html.lt-ie8 body.community-stay-connected .social-list li{width:100%}html.lt-ie8 body.download button{cursor:pointer}html.lt-ie8 body.download-home .row-list-download .four-col{width:27.2%}html.lt-ie8 body.download #download-other .box{min-height:200px;width:41.3221%}html.lt-ie8 .download-cloud #download-other .cloud{background-image:none}html.lt-ie8 body.download-cloud #download-other .cloud .box{margin-bottom:0;width:64.4%}html.lt-ie8 body.download-help #download-help{width:600px}html.lt-ie8 body.download-help .sidebar{width:280px;display:inline}html.lt-ie8 body.download-arm .link-cta-ubuntu{width:100%}html.lt-ie8 body.devices .edge-magic-animation .screen{background:url("/sites/ubuntu/latest/u/../img/devices/phone-3-edge-magic-twitter.png") no-repeat;z-index:999}html.lt-ie8 #context-footer div div{background:0;display:inline;float:left;padding-left:0;width:199px}html.lt-ie8 body.business .row-hero-business{margin-left:2px}html.lt-ie7{font-size:16px}html.lt-ie7 a.link-cta-ubuntu{color:#fff}html.lt-ie7 div{zoom:1}html.lt-ie7 .wrapper{overflow:hidden;border:1px solid #e9e9e9;border-width:1px}html.lt-ie7 .inner-wrapper{border:0;padding:0}html.lt-ie7 header.banner .logo-ubuntu{background:url(../img/ie/logo.gif) no-repeat;width:140px;height:27px;display:block;text-indent:-999em;top:8px;left:20px}html.lt-ie7 #box-search{float:none;position:relative;right:0;top:0}html.lt-ie7 #box-search input.form-text{background:#f12d00;border:1px solid #ce2600!important;width:150px!important;right:-10px;top:2px;position:relative}html.lt-ie7 #context-footer div div{background:0;display:inline;float:left;width:200px}html.lt-ie7 .no-border{border:0!important}html.lt-ie7 .nav-secondary{padding-bottom:15px;margin-top:-5px}html.lt-ie7 footer{margin-top:40px}html.lt-ie7 footer.global .footer-a ul li{width:100px;display:inline;height:15em}html.lt-ie7 footer.global .footer-a ul li li{height:auto}html.lt-ie7 footer.global .footer-b ul li li{padding-right:6px}html.lt-ie7 body.homepage .box a.link-cta-download{color:#fff}html.lt-ie7 body.homepage header.banner .nav-secondary ul{background:0}html.lt-ie7 .row-do-more .six-col{display:inline;width:48.936%}html.lt-ie7 .quote-right-top{background:0;top:0;padding:0}html.lt-ie7 .quote-right-top p{color:#dd4814}html.lt-ie7 .ubuntu-why-use-ubuntu .quote-right-right{position:absolute;left:-999em}html.lt-ie7 .ubuntu-why-use-ubuntu .row-free .article .quote-right-alt{height:207px;top:-62px;padding-top:20px}html.lt-ie7 body.ubuntu-why-is-it-free .quote-right{background:0;top:-60px;right:-40px;width:220px}html.lt-ie7 body.ubuntu-why-is-it-free .quote-right p{color:#dd4814}html.lt-ie7 .row-ubuntu-advantage,html.lt-ie7 body.business .row-hero-business,html.lt-ie7 body.business-desktop-remix .row-hero{left:18px}html.lt-ie7 body.business .row-enterprise .six-col{overflow:hidden}html.lt-ie7 body.business .row-enterprise .quote-canonical{background:#fff;height:0;margin-top:20px;padding-bottom:0}html.lt-ie7 body.business .row-community{padding-bottom:20px}html.lt-ie7 body.business .row-community .nine-col{padding-left:23.404%;width:42.553%}html.lt-ie7 .row-cloud-guest .eight-col,html.lt-ie7 .row-consultancy .eight-col{border-right:1px solid #aea79f;width:65.957%}html.lt-ie7 .row-providers .six-col{width:48.936%}html.lt-ie7 body.download .row-hero{width:98.75%}html.lt-ie7 body.download .row-hero .intro{padding-right:0;width:36.436%}html.lt-ie7 body.download .row-hero .intro p{padding-right:20px}html.lt-ie7 #download-help{background:#f7f7f7;width:65.957%}html.lt-ie7 #download-help li span{margin-left:-5em;overflow:hidden;position:absolute}html.lt-ie7 .row-home .intro{background:0;padding:0 19px 20px 0;width:65.957%}html.lt-ie7 .row-home .box-openstack-cloud{background:0;padding-top:0}html.lt-ie7 .row-menu h3{display:block;float:left;clear:both;width:23.404%;margin-bottom:0}html.lt-ie7 .row-features .list-features-content li .list-feature-footer{bottom:-90px;margin-left:-30px;width:673px}html.lt-ie7 .nav-list-features li{margin-top:13px}html.lt-ie7 .row-cloud-services div{padding-right:0;width:23.404%}html.lt-ie7 footer nav ul li.two-col{height:10em}html.lt-ie7 body.download .row-hero .intro{height:10em}
\ No newline at end of file
diff --git a/templates/static/files/20130802-UbuntuAdvantageSD.pdf b/templates/static/files/20130802-UbuntuAdvantageSD.pdf
deleted file mode 100644
index b43ee7b7282..00000000000
Binary files a/templates/static/files/20130802-UbuntuAdvantageSD.pdf and /dev/null differ
diff --git a/templates/static/files/dell-ua-reseller-end-user-terms.pdf b/templates/static/files/dell-ua-reseller-end-user-terms.pdf
deleted file mode 100644
index 19bc76181ed..00000000000
Binary files a/templates/static/files/dell-ua-reseller-end-user-terms.pdf and /dev/null differ
diff --git a/templates/static/files/section/cloud/Cloud_Jumpstart.pdf b/templates/static/files/section/cloud/Cloud_Jumpstart.pdf
deleted file mode 100644
index 28dab74f934..00000000000
Binary files a/templates/static/files/section/cloud/Cloud_Jumpstart.pdf and /dev/null differ
diff --git a/templates/static/files/section/cloud/openstack-deployment.pdf b/templates/static/files/section/cloud/openstack-deployment.pdf
deleted file mode 100644
index a0a1d41e7b5..00000000000
Binary files a/templates/static/files/section/cloud/openstack-deployment.pdf and /dev/null differ
diff --git a/templates/static/files/section/devices/CAG_FAQ.pdf b/templates/static/files/section/devices/CAG_FAQ.pdf
deleted file mode 100644
index 893873fe807..00000000000
Binary files a/templates/static/files/section/devices/CAG_FAQ.pdf and /dev/null differ
diff --git a/templates/static/files/section/devices/Ubuntu-fast_facts.pdf b/templates/static/files/section/devices/Ubuntu-fast_facts.pdf
deleted file mode 100644
index 4f526790226..00000000000
Binary files a/templates/static/files/section/devices/Ubuntu-fast_facts.pdf and /dev/null differ
diff --git a/templates/static/files/section/devices/Ubuntu-phone-FAQ.pdf b/templates/static/files/section/devices/Ubuntu-phone-FAQ.pdf
deleted file mode 100644
index 4f90df38149..00000000000
Binary files a/templates/static/files/section/devices/Ubuntu-phone-FAQ.pdf and /dev/null differ
diff --git a/templates/static/files/section/devices/Ubuntu-phone-press_brochure.pdf b/templates/static/files/section/devices/Ubuntu-phone-press_brochure.pdf
deleted file mode 100644
index f6fec27792f..00000000000
Binary files a/templates/static/files/section/devices/Ubuntu-phone-press_brochure.pdf and /dev/null differ
diff --git a/templates/static/files/section/devices/Ubuntu-phone-press_release.pdf b/templates/static/files/section/devices/Ubuntu-phone-press_release.pdf
deleted file mode 100644
index ba084922f1e..00000000000
Binary files a/templates/static/files/section/devices/Ubuntu-phone-press_release.pdf and /dev/null differ
diff --git a/templates/static/files/section/devices/Ubuntu-phone-product_image.zip b/templates/static/files/section/devices/Ubuntu-phone-product_image.zip
deleted file mode 100644
index 68bc40f50fd..00000000000
Binary files a/templates/static/files/section/devices/Ubuntu-phone-product_image.zip and /dev/null differ
diff --git a/templates/static/files/section/devices/Ubuntu-phone-spokespeople.pdf b/templates/static/files/section/devices/Ubuntu-phone-spokespeople.pdf
deleted file mode 100644
index ae9c2cff70f..00000000000
Binary files a/templates/static/files/section/devices/Ubuntu-phone-spokespeople.pdf and /dev/null differ
diff --git a/templates/static/files/section/devices/Ubuntu-tablet-FAQ.pdf b/templates/static/files/section/devices/Ubuntu-tablet-FAQ.pdf
deleted file mode 100644
index 752bc5b34ea..00000000000
Binary files a/templates/static/files/section/devices/Ubuntu-tablet-FAQ.pdf and /dev/null differ
diff --git a/templates/static/files/section/devices/Ubuntu-tablet-brochure.pdf b/templates/static/files/section/devices/Ubuntu-tablet-brochure.pdf
deleted file mode 100644
index 97615475e0c..00000000000
Binary files a/templates/static/files/section/devices/Ubuntu-tablet-brochure.pdf and /dev/null differ
diff --git a/templates/static/files/section/devices/Ubuntu-tablet-press-release-cn.pdf b/templates/static/files/section/devices/Ubuntu-tablet-press-release-cn.pdf
deleted file mode 100644
index 0aee8711ca8..00000000000
Binary files a/templates/static/files/section/devices/Ubuntu-tablet-press-release-cn.pdf and /dev/null differ
diff --git a/templates/static/files/section/devices/Ubuntu-tablet-press-release-en.pdf b/templates/static/files/section/devices/Ubuntu-tablet-press-release-en.pdf
deleted file mode 100644
index 1ff410a6ddf..00000000000
Binary files a/templates/static/files/section/devices/Ubuntu-tablet-press-release-en.pdf and /dev/null differ
diff --git a/templates/static/files/section/devices/Ubuntu-tablet-press-release-es.pdf b/templates/static/files/section/devices/Ubuntu-tablet-press-release-es.pdf
deleted file mode 100644
index 00b89c5bcac..00000000000
Binary files a/templates/static/files/section/devices/Ubuntu-tablet-press-release-es.pdf and /dev/null differ
diff --git a/templates/static/files/section/devices/Ubuntu-tablet-press-release.pdf b/templates/static/files/section/devices/Ubuntu-tablet-press-release.pdf
deleted file mode 100644
index 78ff3de3ac7..00000000000
Binary files a/templates/static/files/section/devices/Ubuntu-tablet-press-release.pdf and /dev/null differ
diff --git a/templates/static/files/section/devices/Ubuntu-tablet-product_image.zip b/templates/static/files/section/devices/Ubuntu-tablet-product_image.zip
deleted file mode 100644
index f5b52b59960..00000000000
Binary files a/templates/static/files/section/devices/Ubuntu-tablet-product_image.zip and /dev/null differ
diff --git a/templates/static/files/section/devices/Ubuntu-tablet-spokespeople.pdf b/templates/static/files/section/devices/Ubuntu-tablet-spokespeople.pdf
deleted file mode 100644
index 2b117dc0a48..00000000000
Binary files a/templates/static/files/section/devices/Ubuntu-tablet-spokespeople.pdf and /dev/null differ
diff --git a/templates/static/files/section/devices/edge_web_banners.zip b/templates/static/files/section/devices/edge_web_banners.zip
deleted file mode 100644
index e40e2c7ca30..00000000000
Binary files a/templates/static/files/section/devices/edge_web_banners.zip and /dev/null differ
diff --git a/templates/static/files/section/devices/ubuntu-edge-product-images.zip b/templates/static/files/section/devices/ubuntu-edge-product-images.zip
deleted file mode 100644
index f0e8b1df723..00000000000
Binary files a/templates/static/files/section/devices/ubuntu-edge-product-images.zip and /dev/null differ
diff --git a/templates/static/files/section/legal/12.04.1_Main_FoundLiceneses_20Aug2012.pdf b/templates/static/files/section/legal/12.04.1_Main_FoundLiceneses_20Aug2012.pdf
deleted file mode 100644
index 757749ced32..00000000000
Binary files a/templates/static/files/section/legal/12.04.1_Main_FoundLiceneses_20Aug2012.pdf and /dev/null differ
diff --git a/templates/static/files/section/partners/HP-Cloud.pdf b/templates/static/files/section/partners/HP-Cloud.pdf
deleted file mode 100644
index edd49be2a58..00000000000
Binary files a/templates/static/files/section/partners/HP-Cloud.pdf and /dev/null differ
diff --git a/templates/static/files/section/partners/HP-PCs.pdf b/templates/static/files/section/partners/HP-PCs.pdf
deleted file mode 100644
index ccfdb511287..00000000000
Binary files a/templates/static/files/section/partners/HP-PCs.pdf and /dev/null differ
diff --git a/templates/static/files/section/partners/Technical_Partner_Programme_v2.pdf b/templates/static/files/section/partners/Technical_Partner_Programme_v2.pdf
deleted file mode 100644
index ae486901184..00000000000
Binary files a/templates/static/files/section/partners/Technical_Partner_Programme_v2.pdf and /dev/null differ
diff --git a/templates/static/img/apple-touch-icon-114x114-precomposed.png b/templates/static/img/apple-touch-icon-114x114-precomposed.png
deleted file mode 100644
index 30b6245475f..00000000000
Binary files a/templates/static/img/apple-touch-icon-114x114-precomposed.png and /dev/null differ
diff --git a/templates/static/img/apple-touch-icon-144x144-precomposed.png b/templates/static/img/apple-touch-icon-144x144-precomposed.png
deleted file mode 100644
index a6d4be4f232..00000000000
Binary files a/templates/static/img/apple-touch-icon-144x144-precomposed.png and /dev/null differ
diff --git a/templates/static/img/apple-touch-icon-57x57-precomposed.png b/templates/static/img/apple-touch-icon-57x57-precomposed.png
deleted file mode 100644
index 4bcc10738f0..00000000000
Binary files a/templates/static/img/apple-touch-icon-57x57-precomposed.png and /dev/null differ
diff --git a/templates/static/img/apple-touch-icon-72x72-precomposed.png b/templates/static/img/apple-touch-icon-72x72-precomposed.png
deleted file mode 100644
index 9bb26e5ddc4..00000000000
Binary files a/templates/static/img/apple-touch-icon-72x72-precomposed.png and /dev/null differ
diff --git a/templates/static/img/apple-touch-icon-precomposed.png b/templates/static/img/apple-touch-icon-precomposed.png
deleted file mode 100644
index b60304eaf89..00000000000
Binary files a/templates/static/img/apple-touch-icon-precomposed.png and /dev/null differ
diff --git a/templates/static/img/apple-touch-icon.png b/templates/static/img/apple-touch-icon.png
deleted file mode 100644
index d5fd651b9ec..00000000000
Binary files a/templates/static/img/apple-touch-icon.png and /dev/null differ
diff --git a/templates/static/img/arrow_down.svg b/templates/static/img/arrow_down.svg
deleted file mode 100755
index 0e85e43ac10..00000000000
--- a/templates/static/img/arrow_down.svg
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48+devel r12648"
-   width="90"
-   height="90"
-   xml:space="preserve"
-   sodipodi:docname="dropdown-menu.svg"><metadata
-     id="metadata8"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs6"><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath16"><path
-         d="m 0,595.28 841.89,0 L 841.89,0 0,0 0,595.28 Z"
-         id="path18"
-         inkscape:connector-curvature="0" /></clipPath></defs><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview4"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="2.4272256"
-     inkscape:cx="-157.44016"
-     inkscape:cy="98.291931"
-     inkscape:current-layer="g10" /><g
-     id="g10"
-     inkscape:groupmode="layer"
-     inkscape:label="chevron"
-     transform="matrix(1.25,0,0,-1.25,-406.97987,423.35437)"><g
-       id="g12"
-       transform="matrix(0,-0.54716981,0.54545455,0,180.52017,492.43318)"><g
-         id="g14"
-         clip-path="url(#clipPath16)"><g
-           id="g20"
-           transform="translate(358.7529,350.7095)"><path
-             d="M 0.08234413,-0.04707909 C -3.7872386,6.7930863 -8.1560576,13.837137 -13.025115,21.088072 c -4.866051,7.248937 -10.085977,14.383937 -15.657776,21.400003 -1.493699,1.879947 -2.9884,3.705923 -4.486109,5.485925 l 0,-20.343595 c 3.055567,-4.021746 6.04898,-8.184412 8.972219,-12.50499 3.403428,-5.03018 6.597338,-10.1742961 9.588746,-15.43634617 C -11.61763,-5.5719818 -7.9465387,-12.998818 -5.6007295,-18.026 c -2.3458092,-5.026182 -6.0169005,-12.453019 -9.0073055,-17.715069 -2.991408,-5.26205 -6.185318,-10.406166 -9.588746,-15.435347 -2.923239,-4.321577 -5.916652,-8.484243 -8.972219,-12.505989 l 0,-20.343595 c 1.497709,1.780002 2.99241,3.606978 4.486109,5.485925 5.571799,7.017066 10.791725,14.151066 15.657776,21.400003 4.8690574,7.251934 9.2378764,14.294986 13.10745913,21.135151 C 3.9519268,-29.163756 7.0044862,-23.170116 9.231,-18.026 7.0044862,-12.881884 3.9519268,-6.8882439 0.08234413,-0.04707909"
-             style="fill:#5D264F;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path22"
-             inkscape:connector-curvature="0" /></g></g></g></g></svg>
\ No newline at end of file
diff --git a/templates/static/img/arrow_down_9fa097.png b/templates/static/img/arrow_down_9fa097.png
deleted file mode 100644
index dde1fdca8a9..00000000000
Binary files a/templates/static/img/arrow_down_9fa097.png and /dev/null differ
diff --git a/templates/static/img/arrow_down_9fa097.svg b/templates/static/img/arrow_down_9fa097.svg
deleted file mode 100644
index 7cffb936fe0..00000000000
--- a/templates/static/img/arrow_down_9fa097.svg
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48+devel r12648"
-   width="90"
-   height="90"
-   xml:space="preserve"
-   sodipodi:docname="dropdown-menu.svg"><metadata
-     id="metadata8"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs6"><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath16"><path
-         d="m 0,595.28 841.89,0 L 841.89,0 0,0 0,595.28 Z"
-         id="path18"
-         inkscape:connector-curvature="0" /></clipPath></defs><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview4"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="2.4272256"
-     inkscape:cx="-157.44016"
-     inkscape:cy="98.291931"
-     inkscape:current-layer="g10" /><g
-     id="g10"
-     inkscape:groupmode="layer"
-     inkscape:label="chevron"
-     transform="matrix(1.25,0,0,-1.25,-406.97987,423.35437)"><g
-       id="g12"
-       transform="matrix(0,-0.54716981,0.54545455,0,180.52017,492.43318)"><g
-         id="g14"
-         clip-path="url(#clipPath16)"><g
-           id="g20"
-           transform="translate(358.7529,350.7095)"><path
-             d="M 0.08234413,-0.04707909 C -3.7872386,6.7930863 -8.1560576,13.837137 -13.025115,21.088072 c -4.866051,7.248937 -10.085977,14.383937 -15.657776,21.400003 -1.493699,1.879947 -2.9884,3.705923 -4.486109,5.485925 l 0,-20.343595 c 3.055567,-4.021746 6.04898,-8.184412 8.972219,-12.50499 3.403428,-5.03018 6.597338,-10.1742961 9.588746,-15.43634617 C -11.61763,-5.5719818 -7.9465387,-12.998818 -5.6007295,-18.026 c -2.3458092,-5.026182 -6.0169005,-12.453019 -9.0073055,-17.715069 -2.991408,-5.26205 -6.185318,-10.406166 -9.588746,-15.435347 -2.923239,-4.321577 -5.916652,-8.484243 -8.972219,-12.505989 l 0,-20.343595 c 1.497709,1.780002 2.99241,3.606978 4.486109,5.485925 5.571799,7.017066 10.791725,14.151066 15.657776,21.400003 4.8690574,7.251934 9.2378764,14.294986 13.10745913,21.135151 C 3.9519268,-29.163756 7.0044862,-23.170116 9.231,-18.026 7.0044862,-12.881884 3.9519268,-6.8882439 0.08234413,-0.04707909"
-             style="fill:#9fa097;fill-opacity:1;fill-rule:nonzero;stroke:none"
-             id="path22"
-             inkscape:connector-curvature="0" /></g></g></g></g></svg>
\ No newline at end of file
diff --git a/templates/static/img/arrow_up.svg b/templates/static/img/arrow_up.svg
deleted file mode 100755
index 78954ff55bd..00000000000
--- a/templates/static/img/arrow_up.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1"
-	 id="svg2" sodipodi:docname="dropdown-menu.svg" inkscape:version="0.48+devel r12648" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="90px" height="90px"
-	 viewBox="0 0 90 90" enable-background="new 0 0 90 90" xml:space="preserve">
-<sodipodi:namedview  id="namedview4" borderopacity="1" bordercolor="#666666" pagecolor="#ffffff" guidetolerance="10" objecttolerance="10" gridtolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" fit-margin-top="0" inkscape:window-width="640" inkscape:window-height="480" inkscape:cx="-157.44016" showgrid="false" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:zoom="2.4272256" inkscape:cy="98.291931" inkscape:current-layer="g10">
-	</sodipodi:namedview>
-<sodipodi:namedview  id="namedview4" borderopacity="1" bordercolor="#666666" pagecolor="#ffffff" guidetolerance="10" objecttolerance="10" gridtolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" fit-margin-top="0" inkscape:window-width="640" inkscape:window-height="480" inkscape:cx="-157.44016" showgrid="false" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:zoom="2.4272256" inkscape:cy="98.291931" inkscape:current-layer="g10">
-	</sodipodi:namedview>
-<g id="g10_1_" transform="matrix(1.25,0,0,-1.25,-406.97987,423.35437)" inkscape:groupmode="layer" inkscape:label="chevron">
-	<g id="g12_1_" transform="matrix(0,-0.54716981,0.54545455,0,180.52017,492.43318)">
-		<g>
-			<defs>
-				<rect id="SVGID_1_" x="69.475" y="81.283" width="405.873" height="575.821"/>
-			</defs>
-			<clipPath id="SVGID_2_">
-				<use xlink:href="#SVGID_1_"  overflow="visible"/>
-			</clipPath>
-			<g id="g14_1_" clip-path="url(#SVGID_2_)">
-				<g id="g20_1_" transform="translate(358.7529,350.7095)">
-					<path id="path22_1_" inkscape:connector-curvature="0" fill="#5D264F" d="M-24.231-34.538
-						c3.869-6.841,8.238-13.885,13.107-21.135c4.866-7.25,10.086-14.386,15.657-21.401c1.493-1.879,2.988-3.707,4.486-5.486v20.344
-						c-3.055,4.022-6.048,8.184-8.972,12.504c-3.404,5.03-6.596,10.175-9.589,15.437c-2.99,5.261-6.662,12.687-9.007,17.715
-						c2.344,5.026,6.017,12.452,9.007,17.715c2.993,5.262,6.185,10.407,9.589,15.436c2.924,4.321,5.917,8.483,8.972,12.505V49.44
-						c-1.498-1.78-2.993-3.607-4.486-5.486c-5.571-7.018-10.791-14.151-15.657-21.401c-4.869-7.25-9.238-14.294-13.107-21.135
-						C-28.1-5.422-31.153-11.415-33.38-16.56C-31.153-21.704-28.1-27.697-24.231-34.538"/>
-				</g>
-			</g>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/templates/static/img/arrow_up_9fa097.png b/templates/static/img/arrow_up_9fa097.png
deleted file mode 100644
index 878751f20b1..00000000000
Binary files a/templates/static/img/arrow_up_9fa097.png and /dev/null differ
diff --git a/templates/static/img/arrow_up_9fa097.svg b/templates/static/img/arrow_up_9fa097.svg
deleted file mode 100644
index 2d2a0f4131e..00000000000
--- a/templates/static/img/arrow_up_9fa097.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1"
-	 id="svg2" sodipodi:docname="dropdown-menu.svg" inkscape:version="0.48+devel r12648" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="90px" height="90px"
-	 viewBox="0 0 90 90" enable-background="new 0 0 90 90" xml:space="preserve">
-<sodipodi:namedview  id="namedview4" borderopacity="1" bordercolor="#666666" pagecolor="#ffffff" guidetolerance="10" objecttolerance="10" gridtolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" fit-margin-top="0" inkscape:window-width="640" inkscape:window-height="480" inkscape:cx="-157.44016" showgrid="false" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:zoom="2.4272256" inkscape:cy="98.291931" inkscape:current-layer="g10">
-	</sodipodi:namedview>
-<sodipodi:namedview  id="namedview4" borderopacity="1" bordercolor="#666666" pagecolor="#ffffff" guidetolerance="10" objecttolerance="10" gridtolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" fit-margin-top="0" inkscape:window-width="640" inkscape:window-height="480" inkscape:cx="-157.44016" showgrid="false" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:zoom="2.4272256" inkscape:cy="98.291931" inkscape:current-layer="g10">
-	</sodipodi:namedview>
-<g id="g10_1_" transform="matrix(1.25,0,0,-1.25,-406.97987,423.35437)" inkscape:groupmode="layer" inkscape:label="chevron">
-	<g id="g12_1_" transform="matrix(0,-0.54716981,0.54545455,0,180.52017,492.43318)">
-		<g>
-			<defs>
-				<rect id="SVGID_1_" x="69.475" y="81.283" width="405.873" height="575.821"/>
-			</defs>
-			<clipPath id="SVGID_2_">
-				<use xlink:href="#SVGID_1_"  overflow="visible"/>
-			</clipPath>
-			<g id="g14_1_" clip-path="url(#SVGID_2_)">
-				<g id="g20_1_" transform="translate(358.7529,350.7095)">
-					<path id="path22_1_" inkscape:connector-curvature="0" fill="#9fa097" d="M-24.231-34.538
-						c3.869-6.841,8.238-13.885,13.107-21.135c4.866-7.25,10.086-14.386,15.657-21.401c1.493-1.879,2.988-3.707,4.486-5.486v20.344
-						c-3.055,4.022-6.048,8.184-8.972,12.504c-3.404,5.03-6.596,10.175-9.589,15.437c-2.99,5.261-6.662,12.687-9.007,17.715
-						c2.344,5.026,6.017,12.452,9.007,17.715c2.993,5.262,6.185,10.407,9.589,15.436c2.924,4.321,5.917,8.483,8.972,12.505V49.44
-						c-1.498-1.78-2.993-3.607-4.486-5.486c-5.571-7.018-10.791-14.151-15.657-21.401c-4.869-7.25-9.238-14.294-13.107-21.135
-						C-28.1-5.422-31.153-11.415-33.38-16.56C-31.153-21.704-28.1-27.697-24.231-34.538"/>
-				</g>
-			</g>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/templates/static/img/background-ubuntu-cta.png b/templates/static/img/background-ubuntu-cta.png
deleted file mode 100644
index 744da206a32..00000000000
Binary files a/templates/static/img/background-ubuntu-cta.png and /dev/null differ
diff --git a/templates/static/img/backgrounds/image-background-paper.png b/templates/static/img/backgrounds/image-background-paper.png
deleted file mode 100644
index c437179b8c9..00000000000
Binary files a/templates/static/img/backgrounds/image-background-paper.png and /dev/null differ
diff --git a/templates/static/img/business/business-desktop-pictograms-431x115.png b/templates/static/img/business/business-desktop-pictograms-431x115.png
deleted file mode 100644
index 611f68c77f1..00000000000
Binary files a/templates/static/img/business/business-desktop-pictograms-431x115.png and /dev/null differ
diff --git a/templates/static/img/business/business-hero-webinars-bg.png b/templates/static/img/business/business-hero-webinars-bg.png
deleted file mode 100644
index 0df5cb102d4..00000000000
Binary files a/templates/static/img/business/business-hero-webinars-bg.png and /dev/null differ
diff --git a/templates/static/img/business/business-promo-webinar.png b/templates/static/img/business/business-promo-webinar.png
deleted file mode 100644
index d5d0f7e5f0d..00000000000
Binary files a/templates/static/img/business/business-promo-webinar.png and /dev/null differ
diff --git a/templates/static/img/business/dell-copper-arm-server-chassis.jpg b/templates/static/img/business/dell-copper-arm-server-chassis.jpg
deleted file mode 100644
index cdebca0f057..00000000000
Binary files a/templates/static/img/business/dell-copper-arm-server-chassis.jpg and /dev/null differ
diff --git a/templates/static/img/business/desktop-business.jpg b/templates/static/img/business/desktop-business.jpg
deleted file mode 100644
index 8aecbf699c3..00000000000
Binary files a/templates/static/img/business/desktop-business.jpg and /dev/null differ
diff --git a/templates/static/img/business/desktop-dell-ultrabook.png b/templates/static/img/business/desktop-dell-ultrabook.png
deleted file mode 100644
index 610c905a2f2..00000000000
Binary files a/templates/static/img/business/desktop-dell-ultrabook.png and /dev/null differ
diff --git a/templates/static/img/business/desktop-deployment-diagram.png b/templates/static/img/business/desktop-deployment-diagram.png
deleted file mode 100644
index 7dddb512a2d..00000000000
Binary files a/templates/static/img/business/desktop-deployment-diagram.png and /dev/null differ
diff --git a/templates/static/img/business/desktop-landscape-screen.png b/templates/static/img/business/desktop-landscape-screen.png
deleted file mode 100644
index 4343ae5d821..00000000000
Binary files a/templates/static/img/business/desktop-landscape-screen.png and /dev/null differ
diff --git a/templates/static/img/business/desktop-preferred-platform.png b/templates/static/img/business/desktop-preferred-platform.png
deleted file mode 100644
index 45bf917b44e..00000000000
Binary files a/templates/static/img/business/desktop-preferred-platform.png and /dev/null differ
diff --git a/templates/static/img/business/desktop-software-centre.png b/templates/static/img/business/desktop-software-centre.png
deleted file mode 100644
index 538d2f5b526..00000000000
Binary files a/templates/static/img/business/desktop-software-centre.png and /dev/null differ
diff --git a/templates/static/img/business/header-cloud.jpg b/templates/static/img/business/header-cloud.jpg
deleted file mode 100644
index 5e2a8cd591d..00000000000
Binary files a/templates/static/img/business/header-cloud.jpg and /dev/null differ
diff --git a/templates/static/img/business/header-desktop.jpg b/templates/static/img/business/header-desktop.jpg
deleted file mode 100644
index 7c3e51480cd..00000000000
Binary files a/templates/static/img/business/header-desktop.jpg and /dev/null differ
diff --git a/templates/static/img/business/header-ebook.jpg b/templates/static/img/business/header-ebook.jpg
deleted file mode 100644
index 2af507ad5b4..00000000000
Binary files a/templates/static/img/business/header-ebook.jpg and /dev/null differ
diff --git a/templates/static/img/business/header-server.jpg b/templates/static/img/business/header-server.jpg
deleted file mode 100644
index cf3257cca05..00000000000
Binary files a/templates/static/img/business/header-server.jpg and /dev/null differ
diff --git a/templates/static/img/business/hyperscale-server.jpg b/templates/static/img/business/hyperscale-server.jpg
deleted file mode 100644
index 5dadc7566ab..00000000000
Binary files a/templates/static/img/business/hyperscale-server.jpg and /dev/null differ
diff --git a/templates/static/img/business/hyperscale-servers.png b/templates/static/img/business/hyperscale-servers.png
deleted file mode 100644
index e7e83a24b67..00000000000
Binary files a/templates/static/img/business/hyperscale-servers.png and /dev/null differ
diff --git a/templates/static/img/business/photo-service-cloudservices-248x165.jpg b/templates/static/img/business/photo-service-cloudservices-248x165.jpg
deleted file mode 100644
index b9eeaed87da..00000000000
Binary files a/templates/static/img/business/photo-service-cloudservices-248x165.jpg and /dev/null differ
diff --git a/templates/static/img/business/photo-service-desktopserbices-248x165.jpg b/templates/static/img/business/photo-service-desktopserbices-248x165.jpg
deleted file mode 100644
index e9851858c29..00000000000
Binary files a/templates/static/img/business/photo-service-desktopserbices-248x165.jpg and /dev/null differ
diff --git a/templates/static/img/business/photo-service-serverservices-248x165.jpg b/templates/static/img/business/photo-service-serverservices-248x165.jpg
deleted file mode 100644
index 145aa76e2f2..00000000000
Binary files a/templates/static/img/business/photo-service-serverservices-248x165.jpg and /dev/null differ
diff --git a/templates/static/img/business/photo-virtualization-402x268.jpg b/templates/static/img/business/photo-virtualization-402x268.jpg
deleted file mode 100644
index bdaabf85b45..00000000000
Binary files a/templates/static/img/business/photo-virtualization-402x268.jpg and /dev/null differ
diff --git a/templates/static/img/business/picto-server-large.png b/templates/static/img/business/picto-server-large.png
deleted file mode 100644
index bb3a945ffe9..00000000000
Binary files a/templates/static/img/business/picto-server-large.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-1-hardware-inventory-1200x754.png b/templates/static/img/business/screenshot-1-hardware-inventory-1200x754.png
deleted file mode 100644
index f5cfc84a614..00000000000
Binary files a/templates/static/img/business/screenshot-1-hardware-inventory-1200x754.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-1-hardware-inventory-thumb-430x225.png b/templates/static/img/business/screenshot-1-hardware-inventory-thumb-430x225.png
deleted file mode 100644
index 9d1f0686f14..00000000000
Binary files a/templates/static/img/business/screenshot-1-hardware-inventory-thumb-430x225.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-2-user-listing-1200x754.png b/templates/static/img/business/screenshot-2-user-listing-1200x754.png
deleted file mode 100644
index c6096558c19..00000000000
Binary files a/templates/static/img/business/screenshot-2-user-listing-1200x754.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-2-user-listing-thumb-430x225.png b/templates/static/img/business/screenshot-2-user-listing-thumb-430x225.png
deleted file mode 100644
index a3f29abb136..00000000000
Binary files a/templates/static/img/business/screenshot-2-user-listing-thumb-430x225.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-3-process-listing-1200x754.png b/templates/static/img/business/screenshot-3-process-listing-1200x754.png
deleted file mode 100644
index f8d8ecf0754..00000000000
Binary files a/templates/static/img/business/screenshot-3-process-listing-1200x754.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-3-process-listing-thumb-430x225.png b/templates/static/img/business/screenshot-3-process-listing-thumb-430x225.png
deleted file mode 100644
index e1f858e1b26..00000000000
Binary files a/templates/static/img/business/screenshot-3-process-listing-thumb-430x225.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-4-software-inventory-1200x754.png b/templates/static/img/business/screenshot-4-software-inventory-1200x754.png
deleted file mode 100644
index e1539420cc0..00000000000
Binary files a/templates/static/img/business/screenshot-4-software-inventory-1200x754.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-4-software-inventory-thumb-430x225.png b/templates/static/img/business/screenshot-4-software-inventory-thumb-430x225.png
deleted file mode 100644
index 48b6a3360f9..00000000000
Binary files a/templates/static/img/business/screenshot-4-software-inventory-thumb-430x225.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-audit-1200x647.png b/templates/static/img/business/screenshot-audit-1200x647.png
deleted file mode 100644
index 6e56489a893..00000000000
Binary files a/templates/static/img/business/screenshot-audit-1200x647.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-audit-450x271.png b/templates/static/img/business/screenshot-audit-450x271.png
deleted file mode 100644
index e7b76315c27..00000000000
Binary files a/templates/static/img/business/screenshot-audit-450x271.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-casestudy-agoragames464x288.jpg b/templates/static/img/business/screenshot-casestudy-agoragames464x288.jpg
deleted file mode 100644
index 96ed8c3bfea..00000000000
Binary files a/templates/static/img/business/screenshot-casestudy-agoragames464x288.jpg and /dev/null differ
diff --git a/templates/static/img/business/screenshot-casestudy-wikipedia-464x288.jpg b/templates/static/img/business/screenshot-casestudy-wikipedia-464x288.jpg
deleted file mode 100644
index ca83d23cfe8..00000000000
Binary files a/templates/static/img/business/screenshot-casestudy-wikipedia-464x288.jpg and /dev/null differ
diff --git a/templates/static/img/business/screenshot-compliance-450x271.png b/templates/static/img/business/screenshot-compliance-450x271.png
deleted file mode 100644
index ef7e458ef01..00000000000
Binary files a/templates/static/img/business/screenshot-compliance-450x271.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-compliance-755x601.png b/templates/static/img/business/screenshot-compliance-755x601.png
deleted file mode 100644
index 40fbb0b2f21..00000000000
Binary files a/templates/static/img/business/screenshot-compliance-755x601.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-cost-effective-460x307.png b/templates/static/img/business/screenshot-cost-effective-460x307.png
deleted file mode 100644
index dc65c198aff..00000000000
Binary files a/templates/static/img/business/screenshot-cost-effective-460x307.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-desktop-release-600x425.png b/templates/static/img/business/screenshot-desktop-release-600x425.png
deleted file mode 100644
index fde8ba434ea..00000000000
Binary files a/templates/static/img/business/screenshot-desktop-release-600x425.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-detail-summary-pending-1046x547.png b/templates/static/img/business/screenshot-detail-summary-pending-1046x547.png
deleted file mode 100644
index 3521663461a..00000000000
Binary files a/templates/static/img/business/screenshot-detail-summary-pending-1046x547.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-detail-summary-pending-thumb-430x225.png b/templates/static/img/business/screenshot-detail-summary-pending-thumb-430x225.png
deleted file mode 100644
index 6054355ce19..00000000000
Binary files a/templates/static/img/business/screenshot-detail-summary-pending-thumb-430x225.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-detail-summary-selected-1046x547.png b/templates/static/img/business/screenshot-detail-summary-selected-1046x547.png
deleted file mode 100644
index 4eab0c2072c..00000000000
Binary files a/templates/static/img/business/screenshot-detail-summary-selected-1046x547.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-detail-summary-selected-thumb-430x225.png b/templates/static/img/business/screenshot-detail-summary-selected-thumb-430x225.png
deleted file mode 100644
index c2aef8ee3dc..00000000000
Binary files a/templates/static/img/business/screenshot-detail-summary-selected-thumb-430x225.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-landscape-390x287.png b/templates/static/img/business/screenshot-landscape-390x287.png
deleted file mode 100644
index 4b6705ad159..00000000000
Binary files a/templates/static/img/business/screenshot-landscape-390x287.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-monitoring-1200x642.png b/templates/static/img/business/screenshot-monitoring-1200x642.png
deleted file mode 100644
index 9d999b6bb20..00000000000
Binary files a/templates/static/img/business/screenshot-monitoring-1200x642.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-monitoring-crop-430x225.png b/templates/static/img/business/screenshot-monitoring-crop-430x225.png
deleted file mode 100644
index b2b69f842c0..00000000000
Binary files a/templates/static/img/business/screenshot-monitoring-crop-430x225.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-package-hold-1046x547.png b/templates/static/img/business/screenshot-package-hold-1046x547.png
deleted file mode 100644
index a69716e5058..00000000000
Binary files a/templates/static/img/business/screenshot-package-hold-1046x547.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-package-hold-thumb-430x225.png b/templates/static/img/business/screenshot-package-hold-thumb-430x225.png
deleted file mode 100644
index 732411bd277..00000000000
Binary files a/templates/static/img/business/screenshot-package-hold-thumb-430x225.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-patch-1200x568.png b/templates/static/img/business/screenshot-patch-1200x568.png
deleted file mode 100644
index 501e7b5f531..00000000000
Binary files a/templates/static/img/business/screenshot-patch-1200x568.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-patch-450x271.png b/templates/static/img/business/screenshot-patch-450x271.png
deleted file mode 100644
index 4cf09061e2a..00000000000
Binary files a/templates/static/img/business/screenshot-patch-450x271.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-provisioning-1200x756.png b/templates/static/img/business/screenshot-provisioning-1200x756.png
deleted file mode 100644
index b6661d48dc3..00000000000
Binary files a/templates/static/img/business/screenshot-provisioning-1200x756.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-provisioning-crop-430x225.png b/templates/static/img/business/screenshot-provisioning-crop-430x225.png
deleted file mode 100644
index 673722213cf..00000000000
Binary files a/templates/static/img/business/screenshot-provisioning-crop-430x225.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-rbac-1200x756.png b/templates/static/img/business/screenshot-rbac-1200x756.png
deleted file mode 100644
index ef6f22175e0..00000000000
Binary files a/templates/static/img/business/screenshot-rbac-1200x756.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-rbac-450x271.png b/templates/static/img/business/screenshot-rbac-450x271.png
deleted file mode 100644
index 0058881e609..00000000000
Binary files a/templates/static/img/business/screenshot-rbac-450x271.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-rollback-1046x547.png b/templates/static/img/business/screenshot-rollback-1046x547.png
deleted file mode 100644
index 8db12e92765..00000000000
Binary files a/templates/static/img/business/screenshot-rollback-1046x547.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-rollback-thumb-430x225.png b/templates/static/img/business/screenshot-rollback-thumb-430x225.png
deleted file mode 100644
index 3eae7394894..00000000000
Binary files a/templates/static/img/business/screenshot-rollback-thumb-430x225.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-server-release.png b/templates/static/img/business/screenshot-server-release.png
deleted file mode 100644
index cc428f85234..00000000000
Binary files a/templates/static/img/business/screenshot-server-release.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-server-systems-462x354.png b/templates/static/img/business/screenshot-server-systems-462x354.png
deleted file mode 100644
index c6d8b6ee5ca..00000000000
Binary files a/templates/static/img/business/screenshot-server-systems-462x354.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-ubuntu-advantage-1200x642.png b/templates/static/img/business/screenshot-ubuntu-advantage-1200x642.png
deleted file mode 100644
index 9d999b6bb20..00000000000
Binary files a/templates/static/img/business/screenshot-ubuntu-advantage-1200x642.png and /dev/null differ
diff --git a/templates/static/img/business/screenshot-ubuntu-advantage-450x270.png b/templates/static/img/business/screenshot-ubuntu-advantage-450x270.png
deleted file mode 100644
index 1aacddb5544..00000000000
Binary files a/templates/static/img/business/screenshot-ubuntu-advantage-450x270.png and /dev/null differ
diff --git a/templates/static/img/business/ubuntu-advantage-crop-450x270.png b/templates/static/img/business/ubuntu-advantage-crop-450x270.png
deleted file mode 100644
index 371cba64bb8..00000000000
Binary files a/templates/static/img/business/ubuntu-advantage-crop-450x270.png and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-1.jpg b/templates/static/img/campaigns/22072013_gogo/concepts/concepts-1.jpg
deleted file mode 100644
index 3cf37b7f0b2..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-1.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-2-large.jpg b/templates/static/img/campaigns/22072013_gogo/concepts/concepts-2-large.jpg
deleted file mode 100644
index 3e2f7fdd0c2..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-2-large.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-2-thumb.jpg b/templates/static/img/campaigns/22072013_gogo/concepts/concepts-2-thumb.jpg
deleted file mode 100644
index 5b9a21c254c..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-2-thumb.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-2.jpg b/templates/static/img/campaigns/22072013_gogo/concepts/concepts-2.jpg
deleted file mode 100644
index 0f5f93818bb..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-2.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-3-large.jpg b/templates/static/img/campaigns/22072013_gogo/concepts/concepts-3-large.jpg
deleted file mode 100644
index 0cb6e60a5c8..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-3-large.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-3-thumb.jpg b/templates/static/img/campaigns/22072013_gogo/concepts/concepts-3-thumb.jpg
deleted file mode 100644
index afccc483fce..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-3-thumb.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-3.jpg b/templates/static/img/campaigns/22072013_gogo/concepts/concepts-3.jpg
deleted file mode 100644
index f0a84a1883b..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-3.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-4-large.jpg b/templates/static/img/campaigns/22072013_gogo/concepts/concepts-4-large.jpg
deleted file mode 100644
index f480e3d04de..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-4-large.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-4-thumb.jpg b/templates/static/img/campaigns/22072013_gogo/concepts/concepts-4-thumb.jpg
deleted file mode 100644
index 7cca476e957..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-4-thumb.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-4.jpg b/templates/static/img/campaigns/22072013_gogo/concepts/concepts-4.jpg
deleted file mode 100644
index f941081656c..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-4.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-5-large.jpg b/templates/static/img/campaigns/22072013_gogo/concepts/concepts-5-large.jpg
deleted file mode 100644
index 8b4c8ab824d..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-5-large.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-5-thumb.jpg b/templates/static/img/campaigns/22072013_gogo/concepts/concepts-5-thumb.jpg
deleted file mode 100644
index 05946ec0f2d..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-5-thumb.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-5.jpg b/templates/static/img/campaigns/22072013_gogo/concepts/concepts-5.jpg
deleted file mode 100644
index c9201ca1adf..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-5.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-6-large.jpg b/templates/static/img/campaigns/22072013_gogo/concepts/concepts-6-large.jpg
deleted file mode 100644
index 9107e2b6edb..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-6-large.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-6-thumb.jpg b/templates/static/img/campaigns/22072013_gogo/concepts/concepts-6-thumb.jpg
deleted file mode 100644
index f79074e7b09..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-6-thumb.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-6.jpg b/templates/static/img/campaigns/22072013_gogo/concepts/concepts-6.jpg
deleted file mode 100644
index 82762440c6c..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/concepts/concepts-6.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/dark/edge-1-large.jpg b/templates/static/img/campaigns/22072013_gogo/dark/edge-1-large.jpg
deleted file mode 100644
index 59a694006d9..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/dark/edge-1-large.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/dark/edge-1-thumb.jpg b/templates/static/img/campaigns/22072013_gogo/dark/edge-1-thumb.jpg
deleted file mode 100644
index b0d5e239481..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/dark/edge-1-thumb.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/dark/edge-1.jpg b/templates/static/img/campaigns/22072013_gogo/dark/edge-1.jpg
deleted file mode 100644
index a225f9b8271..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/dark/edge-1.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/dark/edge-2-large.jpg b/templates/static/img/campaigns/22072013_gogo/dark/edge-2-large.jpg
deleted file mode 100644
index e750e7934d7..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/dark/edge-2-large.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/dark/edge-2-thumb.jpg b/templates/static/img/campaigns/22072013_gogo/dark/edge-2-thumb.jpg
deleted file mode 100644
index 3e0c3fa1f42..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/dark/edge-2-thumb.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/dark/edge-2.jpg b/templates/static/img/campaigns/22072013_gogo/dark/edge-2.jpg
deleted file mode 100644
index a8a6631c9f6..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/dark/edge-2.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/dark/edge-3-large.jpg b/templates/static/img/campaigns/22072013_gogo/dark/edge-3-large.jpg
deleted file mode 100644
index 24f145fb801..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/dark/edge-3-large.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/dark/edge-3-thumb.jpg b/templates/static/img/campaigns/22072013_gogo/dark/edge-3-thumb.jpg
deleted file mode 100644
index 2f21b9237b1..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/dark/edge-3-thumb.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/dark/edge-3.jpg b/templates/static/img/campaigns/22072013_gogo/dark/edge-3.jpg
deleted file mode 100644
index 643993fd917..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/dark/edge-3.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/dark/edge-4-large.jpg b/templates/static/img/campaigns/22072013_gogo/dark/edge-4-large.jpg
deleted file mode 100644
index bc766a070e7..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/dark/edge-4-large.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/dark/edge-4-thumb.jpg b/templates/static/img/campaigns/22072013_gogo/dark/edge-4-thumb.jpg
deleted file mode 100644
index 89d8a511904..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/dark/edge-4-thumb.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/dark/edge-4.jpg b/templates/static/img/campaigns/22072013_gogo/dark/edge-4.jpg
deleted file mode 100644
index e21ef1e4e1c..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/dark/edge-4.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/edge-thumbnail.png b/templates/static/img/campaigns/22072013_gogo/edge-thumbnail.png
deleted file mode 100644
index 073c9ab6a42..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/edge-thumbnail.png and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/graphics/developers-01.png b/templates/static/img/campaigns/22072013_gogo/graphics/developers-01.png
deleted file mode 100644
index dbb34979ad0..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/graphics/developers-01.png and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/graphics/headers-01.png b/templates/static/img/campaigns/22072013_gogo/graphics/headers-01.png
deleted file mode 100644
index 81db514f344..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/graphics/headers-01.png and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/graphics/headers-02.png b/templates/static/img/campaigns/22072013_gogo/graphics/headers-02.png
deleted file mode 100644
index 12a94842e0d..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/graphics/headers-02.png and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/graphics/headers-03.png b/templates/static/img/campaigns/22072013_gogo/graphics/headers-03.png
deleted file mode 100644
index 811edcec062..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/graphics/headers-03.png and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/graphics/headers-04.png b/templates/static/img/campaigns/22072013_gogo/graphics/headers-04.png
deleted file mode 100644
index 6e144c430bc..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/graphics/headers-04.png and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/graphics/headers-05.png b/templates/static/img/campaigns/22072013_gogo/graphics/headers-05.png
deleted file mode 100644
index 29e90d92dba..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/graphics/headers-05.png and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/graphics/headers-06.png b/templates/static/img/campaigns/22072013_gogo/graphics/headers-06.png
deleted file mode 100644
index 149b23a3539..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/graphics/headers-06.png and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/graphics/headers-07.png b/templates/static/img/campaigns/22072013_gogo/graphics/headers-07.png
deleted file mode 100644
index 7cb8b6469ed..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/graphics/headers-07.png and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/graphics/headers-08.png b/templates/static/img/campaigns/22072013_gogo/graphics/headers-08.png
deleted file mode 100644
index 8ff23bc86c6..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/graphics/headers-08.png and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/graphics/headers-09.png b/templates/static/img/campaigns/22072013_gogo/graphics/headers-09.png
deleted file mode 100644
index 451b74b0911..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/graphics/headers-09.png and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/graphics/headers-10.png b/templates/static/img/campaigns/22072013_gogo/graphics/headers-10.png
deleted file mode 100644
index f7f0242f5e3..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/graphics/headers-10.png and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/graphics/hr-01.jpg b/templates/static/img/campaigns/22072013_gogo/graphics/hr-01.jpg
deleted file mode 100644
index 3af0f2beda1..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/graphics/hr-01.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/graphics/video-1.jpg b/templates/static/img/campaigns/22072013_gogo/graphics/video-1.jpg
deleted file mode 100644
index c156008c7c3..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/graphics/video-1.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/graphics/video-2.jpg b/templates/static/img/campaigns/22072013_gogo/graphics/video-2.jpg
deleted file mode 100644
index 49fbb9e0110..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/graphics/video-2.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/ui/ui-2.jpg b/templates/static/img/campaigns/22072013_gogo/ui/ui-2.jpg
deleted file mode 100644
index 0e0577230d9..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/ui/ui-2.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/ui/ui-3.jpg b/templates/static/img/campaigns/22072013_gogo/ui/ui-3.jpg
deleted file mode 100644
index 523d3eb6661..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/ui/ui-3.jpg and /dev/null differ
diff --git a/templates/static/img/campaigns/22072013_gogo/ui/ui-4.jpg b/templates/static/img/campaigns/22072013_gogo/ui/ui-4.jpg
deleted file mode 100644
index 44f97e80995..00000000000
Binary files a/templates/static/img/campaigns/22072013_gogo/ui/ui-4.jpg and /dev/null differ
diff --git a/templates/static/img/cloud/beyond-config-pictos.png b/templates/static/img/cloud/beyond-config-pictos.png
deleted file mode 100644
index 4c1242f6e45..00000000000
Binary files a/templates/static/img/cloud/beyond-config-pictos.png and /dev/null differ
diff --git a/templates/static/img/cloud/bg-list-feature-guest.png b/templates/static/img/cloud/bg-list-feature-guest.png
deleted file mode 100644
index 9d2583cafcf..00000000000
Binary files a/templates/static/img/cloud/bg-list-feature-guest.png and /dev/null differ
diff --git a/templates/static/img/cloud/bg-list-feature-orchestration.png b/templates/static/img/cloud/bg-list-feature-orchestration.png
deleted file mode 100644
index b68fbfe87a1..00000000000
Binary files a/templates/static/img/cloud/bg-list-feature-orchestration.png and /dev/null differ
diff --git a/templates/static/img/cloud/bg-list-feature-paas.png b/templates/static/img/cloud/bg-list-feature-paas.png
deleted file mode 100644
index 8053f5191d6..00000000000
Binary files a/templates/static/img/cloud/bg-list-feature-paas.png and /dev/null differ
diff --git a/templates/static/img/cloud/bg-list-feature-private.png b/templates/static/img/cloud/bg-list-feature-private.png
deleted file mode 100644
index cda9897acb0..00000000000
Binary files a/templates/static/img/cloud/bg-list-feature-private.png and /dev/null differ
diff --git a/templates/static/img/cloud/bg-list-feature-public.png b/templates/static/img/cloud/bg-list-feature-public.png
deleted file mode 100644
index 33ba19fe1c2..00000000000
Binary files a/templates/static/img/cloud/bg-list-feature-public.png and /dev/null differ
diff --git a/templates/static/img/cloud/bg-list-feature-saas.png b/templates/static/img/cloud/bg-list-feature-saas.png
deleted file mode 100644
index 0f892dca78d..00000000000
Binary files a/templates/static/img/cloud/bg-list-feature-saas.png and /dev/null differ
diff --git a/templates/static/img/cloud/bg-list-feature-virtualisation.png b/templates/static/img/cloud/bg-list-feature-virtualisation.png
deleted file mode 100644
index db8ac74aaa2..00000000000
Binary files a/templates/static/img/cloud/bg-list-feature-virtualisation.png and /dev/null differ
diff --git a/templates/static/img/cloud/bg-openstack-cloud.png b/templates/static/img/cloud/bg-openstack-cloud.png
deleted file mode 100644
index 39d921482c8..00000000000
Binary files a/templates/static/img/cloud/bg-openstack-cloud.png and /dev/null differ
diff --git a/templates/static/img/cloud/bg-servicesserver-owl-125x101.png b/templates/static/img/cloud/bg-servicesserver-owl-125x101.png
deleted file mode 100644
index 5c70497b243..00000000000
Binary files a/templates/static/img/cloud/bg-servicesserver-owl-125x101.png and /dev/null differ
diff --git a/templates/static/img/cloud/cloud-background-grey-cloud.png b/templates/static/img/cloud/cloud-background-grey-cloud.png
deleted file mode 100755
index 3279c738016..00000000000
Binary files a/templates/static/img/cloud/cloud-background-grey-cloud.png and /dev/null differ
diff --git a/templates/static/img/cloud/cloud-hero-build-infographic.png b/templates/static/img/cloud/cloud-hero-build-infographic.png
deleted file mode 100644
index 1e2de9e356f..00000000000
Binary files a/templates/static/img/cloud/cloud-hero-build-infographic.png and /dev/null differ
diff --git a/templates/static/img/cloud/cloud-homepage-jumpstart.png b/templates/static/img/cloud/cloud-homepage-jumpstart.png
deleted file mode 100644
index 2fde2908ddb..00000000000
Binary files a/templates/static/img/cloud/cloud-homepage-jumpstart.png and /dev/null differ
diff --git a/templates/static/img/cloud/cloud-homepage-openstack.png b/templates/static/img/cloud/cloud-homepage-openstack.png
deleted file mode 100644
index cfc15d4ca19..00000000000
Binary files a/templates/static/img/cloud/cloud-homepage-openstack.png and /dev/null differ
diff --git a/templates/static/img/cloud/cloud-juju-charm-grid.png b/templates/static/img/cloud/cloud-juju-charm-grid.png
deleted file mode 100644
index 8b4327e78fe..00000000000
Binary files a/templates/static/img/cloud/cloud-juju-charm-grid.png and /dev/null differ
diff --git a/templates/static/img/cloud/cloud-juju-charms.png b/templates/static/img/cloud/cloud-juju-charms.png
deleted file mode 100644
index 985cffc3f1f..00000000000
Binary files a/templates/static/img/cloud/cloud-juju-charms.png and /dev/null differ
diff --git a/templates/static/img/cloud/cloud-juju-connected.png b/templates/static/img/cloud/cloud-juju-connected.png
deleted file mode 100644
index a0bc42db98d..00000000000
Binary files a/templates/static/img/cloud/cloud-juju-connected.png and /dev/null differ
diff --git a/templates/static/img/cloud/cloud-juju-gui-screen.jpg b/templates/static/img/cloud/cloud-juju-gui-screen.jpg
deleted file mode 100644
index 6b9b16c7a20..00000000000
Binary files a/templates/static/img/cloud/cloud-juju-gui-screen.jpg and /dev/null differ
diff --git a/templates/static/img/cloud/cloud-juju-inspector.jpg b/templates/static/img/cloud/cloud-juju-inspector.jpg
deleted file mode 100644
index 07021c9f841..00000000000
Binary files a/templates/static/img/cloud/cloud-juju-inspector.jpg and /dev/null differ
diff --git a/templates/static/img/cloud/cloud-juju-make-a-charm.png b/templates/static/img/cloud/cloud-juju-make-a-charm.png
deleted file mode 100644
index 2eb1d4464f4..00000000000
Binary files a/templates/static/img/cloud/cloud-juju-make-a-charm.png and /dev/null differ
diff --git a/templates/static/img/cloud/cloud-labs-hero.png b/templates/static/img/cloud/cloud-labs-hero.png
deleted file mode 100644
index 6f09331c68b..00000000000
Binary files a/templates/static/img/cloud/cloud-labs-hero.png and /dev/null differ
diff --git a/templates/static/img/cloud/cloud-maas-screenshot.jpg b/templates/static/img/cloud/cloud-maas-screenshot.jpg
deleted file mode 100644
index 4159c14740f..00000000000
Binary files a/templates/static/img/cloud/cloud-maas-screenshot.jpg and /dev/null differ
diff --git a/templates/static/img/cloud/cloud-management-pictos.png b/templates/static/img/cloud/cloud-management-pictos.png
deleted file mode 100644
index 3dec4c2df85..00000000000
Binary files a/templates/static/img/cloud/cloud-management-pictos.png and /dev/null differ
diff --git a/templates/static/img/cloud/cloud-openstack-window.jpg b/templates/static/img/cloud/cloud-openstack-window.jpg
deleted file mode 100644
index 1945ce67e7e..00000000000
Binary files a/templates/static/img/cloud/cloud-openstack-window.jpg and /dev/null differ
diff --git a/templates/static/img/cloud/cropped_cloud_310x465.png b/templates/static/img/cloud/cropped_cloud_310x465.png
deleted file mode 100644
index 924ca6350e7..00000000000
Binary files a/templates/static/img/cloud/cropped_cloud_310x465.png and /dev/null differ
diff --git a/templates/static/img/cloud/feature-arrows.png b/templates/static/img/cloud/feature-arrows.png
deleted file mode 100644
index d073e64c3f4..00000000000
Binary files a/templates/static/img/cloud/feature-arrows.png and /dev/null differ
diff --git a/templates/static/img/cloud/hero-ecosystem-cloud.png b/templates/static/img/cloud/hero-ecosystem-cloud.png
deleted file mode 100644
index bdde6c4e357..00000000000
Binary files a/templates/static/img/cloud/hero-ecosystem-cloud.png and /dev/null differ
diff --git a/templates/static/img/cloud/image-charms.png b/templates/static/img/cloud/image-charms.png
deleted file mode 100755
index 36c0648954c..00000000000
Binary files a/templates/static/img/cloud/image-charms.png and /dev/null differ
diff --git a/templates/static/img/cloud/image-havana-promo.png b/templates/static/img/cloud/image-havana-promo.png
deleted file mode 100644
index a5f7462a4e0..00000000000
Binary files a/templates/static/img/cloud/image-havana-promo.png and /dev/null differ
diff --git a/templates/static/img/cloud/image-hero-build-infographic.png b/templates/static/img/cloud/image-hero-build-infographic.png
deleted file mode 100644
index b9659f9923b..00000000000
Binary files a/templates/static/img/cloud/image-hero-build-infographic.png and /dev/null differ
diff --git a/templates/static/img/cloud/image-interoperability-lab.png b/templates/static/img/cloud/image-interoperability-lab.png
deleted file mode 100755
index 51c006bb369..00000000000
Binary files a/templates/static/img/cloud/image-interoperability-lab.png and /dev/null differ
diff --git a/templates/static/img/cloud/image-interoperability-large.png b/templates/static/img/cloud/image-interoperability-large.png
deleted file mode 100644
index be3df14022d..00000000000
Binary files a/templates/static/img/cloud/image-interoperability-large.png and /dev/null differ
diff --git a/templates/static/img/cloud/image-interoperability.png b/templates/static/img/cloud/image-interoperability.png
deleted file mode 100644
index c7e50ffb5b4..00000000000
Binary files a/templates/static/img/cloud/image-interoperability.png and /dev/null differ
diff --git a/templates/static/img/cloud/image-juju-background-pattern.png b/templates/static/img/cloud/image-juju-background-pattern.png
deleted file mode 100644
index 43c50c576ba..00000000000
Binary files a/templates/static/img/cloud/image-juju-background-pattern.png and /dev/null differ
diff --git a/templates/static/img/cloud/image-juju-charms.png b/templates/static/img/cloud/image-juju-charms.png
deleted file mode 100644
index 02eb51d8f78..00000000000
Binary files a/templates/static/img/cloud/image-juju-charms.png and /dev/null differ
diff --git a/templates/static/img/cloud/image-juju-window.png b/templates/static/img/cloud/image-juju-window.png
deleted file mode 100644
index 1ddba3dae56..00000000000
Binary files a/templates/static/img/cloud/image-juju-window.png and /dev/null differ
diff --git a/templates/static/img/cloud/image-juju.png b/templates/static/img/cloud/image-juju.png
deleted file mode 100644
index eb35b393f83..00000000000
Binary files a/templates/static/img/cloud/image-juju.png and /dev/null differ
diff --git a/templates/static/img/cloud/image-jumpstart.png b/templates/static/img/cloud/image-jumpstart.png
deleted file mode 100644
index 1a0a2354ff8..00000000000
Binary files a/templates/static/img/cloud/image-jumpstart.png and /dev/null differ
diff --git a/templates/static/img/cloud/image-landscape-background-pattern.png b/templates/static/img/cloud/image-landscape-background-pattern.png
deleted file mode 100644
index 57d09dcb500..00000000000
Binary files a/templates/static/img/cloud/image-landscape-background-pattern.png and /dev/null differ
diff --git a/templates/static/img/cloud/image-landscape-cloud.png b/templates/static/img/cloud/image-landscape-cloud.png
deleted file mode 100644
index 9b17bbbb9fd..00000000000
Binary files a/templates/static/img/cloud/image-landscape-cloud.png and /dev/null differ
diff --git a/templates/static/img/cloud/image-landscape-graph.png b/templates/static/img/cloud/image-landscape-graph.png
deleted file mode 100644
index 0ea5709091a..00000000000
Binary files a/templates/static/img/cloud/image-landscape-graph.png and /dev/null differ
diff --git a/templates/static/img/cloud/image-landscape.png b/templates/static/img/cloud/image-landscape.png
deleted file mode 100644
index 49c88a88c9e..00000000000
Binary files a/templates/static/img/cloud/image-landscape.png and /dev/null differ
diff --git a/templates/static/img/cloud/image-maas.png b/templates/static/img/cloud/image-maas.png
deleted file mode 100644
index 1fffbfaadfb..00000000000
Binary files a/templates/static/img/cloud/image-maas.png and /dev/null differ
diff --git a/templates/static/img/cloud/image-openstack-infographic.png b/templates/static/img/cloud/image-openstack-infographic.png
deleted file mode 100644
index b0c1926d796..00000000000
Binary files a/templates/static/img/cloud/image-openstack-infographic.png and /dev/null differ
diff --git a/templates/static/img/cloud/image-openstack.png b/templates/static/img/cloud/image-openstack.png
deleted file mode 100644
index 0b4fe9902b4..00000000000
Binary files a/templates/static/img/cloud/image-openstack.png and /dev/null differ
diff --git a/templates/static/img/cloud/image-resource-hub-server.png b/templates/static/img/cloud/image-resource-hub-server.png
deleted file mode 100644
index 7d96df5e3e6..00000000000
Binary files a/templates/static/img/cloud/image-resource-hub-server.png and /dev/null differ
diff --git a/templates/static/img/cloud/interoperability-lab.png b/templates/static/img/cloud/interoperability-lab.png
deleted file mode 100644
index 324545c808d..00000000000
Binary files a/templates/static/img/cloud/interoperability-lab.png and /dev/null differ
diff --git a/templates/static/img/cloud/juju-hero.png b/templates/static/img/cloud/juju-hero.png
deleted file mode 100644
index 05aa98c4012..00000000000
Binary files a/templates/static/img/cloud/juju-hero.png and /dev/null differ
diff --git a/templates/static/img/cloud/jumpstart-deploy.png b/templates/static/img/cloud/jumpstart-deploy.png
deleted file mode 100644
index e6f82734bcf..00000000000
Binary files a/templates/static/img/cloud/jumpstart-deploy.png and /dev/null differ
diff --git a/templates/static/img/cloud/jumpstart-manage.png b/templates/static/img/cloud/jumpstart-manage.png
deleted file mode 100644
index b5faa72ea7e..00000000000
Binary files a/templates/static/img/cloud/jumpstart-manage.png and /dev/null differ
diff --git a/templates/static/img/cloud/jumpstart-plan.png b/templates/static/img/cloud/jumpstart-plan.png
deleted file mode 100644
index 75e0d66fd92..00000000000
Binary files a/templates/static/img/cloud/jumpstart-plan.png and /dev/null differ
diff --git a/templates/static/img/cloud/jumpstart-train.png b/templates/static/img/cloud/jumpstart-train.png
deleted file mode 100644
index bcce3d66e76..00000000000
Binary files a/templates/static/img/cloud/jumpstart-train.png and /dev/null differ
diff --git a/templates/static/img/cloud/logo-amazon-openstack.png b/templates/static/img/cloud/logo-amazon-openstack.png
deleted file mode 100644
index 76fcdc5b7b9..00000000000
Binary files a/templates/static/img/cloud/logo-amazon-openstack.png and /dev/null differ
diff --git a/templates/static/img/cloud/logo-hp-cloud.png b/templates/static/img/cloud/logo-hp-cloud.png
deleted file mode 100644
index d1f4b8e79bd..00000000000
Binary files a/templates/static/img/cloud/logo-hp-cloud.png and /dev/null differ
diff --git a/templates/static/img/cloud/logo-juju-108.png b/templates/static/img/cloud/logo-juju-108.png
deleted file mode 100644
index 360f0f66141..00000000000
Binary files a/templates/static/img/cloud/logo-juju-108.png and /dev/null differ
diff --git a/templates/static/img/cloud/logo-juju-171x174.png b/templates/static/img/cloud/logo-juju-171x174.png
deleted file mode 100644
index eb6314423cd..00000000000
Binary files a/templates/static/img/cloud/logo-juju-171x174.png and /dev/null differ
diff --git a/templates/static/img/cloud/maas-logo.svg b/templates/static/img/cloud/maas-logo.svg
deleted file mode 100644
index fe87be453d5..00000000000
--- a/templates/static/img/cloud/maas-logo.svg
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="354.33069"
-   height="354.33069"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="maas-logo-simpler.svg"
-   inkscape:export-filename="/home/mark/Pictures/Ubuntu/maas/maas-logo-256.png"
-   inkscape:export-xdpi="76.860001"
-   inkscape:export-ydpi="76.860001">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4033915"
-     inkscape:cx="163.10349"
-     inkscape:cy="195.25471"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="cm"
-     inkscape:window-width="1366"
-     inkscape:window-height="744"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-698.03017)">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.59670780999999995;fill:#333333;fill-opacity:0;stroke:none"
-       id="path2993"
-       sodipodi:cx="176.85178"
-       sodipodi:cy="176.85178"
-       sodipodi:rx="82.154549"
-       sodipodi:ry="82.154549"
-       d="m 259.00632,176.85178 c 0,45.3727 -36.78184,82.15454 -82.15454,82.15454 -45.37271,0 -82.154553,-36.78184 -82.154553,-82.15454 0,-45.37271 36.781843,-82.154553 82.154553,-82.154553 45.3727,0 82.15454,36.781843 82.15454,82.154553 z"
-       transform="matrix(1.8244275,0,0,1.8244275,-145.80146,552.22871)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.59670780999999995;fill:#dd4814;fill-opacity:0;stroke:none"
-       id="path3765"
-       sodipodi:cx="176.85178"
-       sodipodi:cy="181.24171"
-       sodipodi:rx="60.204861"
-       sodipodi:ry="84.663086"
-       d="m 237.05664,181.24171 c 0,46.75814 -26.95464,84.66309 -60.20486,84.66309 -33.25023,0 -60.20486,-37.90495 -60.20486,-84.66309 0,-46.75813 26.95463,-84.663081 60.20486,-84.663081 33.25022,0 60.20486,37.904951 60.20486,84.663081 z"
-       transform="translate(0,698.03017)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.59670781;fill:#dd4814;fill-opacity:0;stroke:none"
-       id="path3767"
-       sodipodi:cx="211.65771"
-       sodipodi:cy="221.69185"
-       sodipodi:rx="56.12849"
-       sodipodi:ry="27.907461"
-       d="m 267.78621,221.69185 c 0,15.41286 -25.12959,27.90746 -56.1285,27.90746 -30.9989,0 -56.12849,-12.4946 -56.12849,-27.90746 0,-15.41287 25.12959,-27.90746 56.12849,-27.90746 30.99891,0 56.1285,12.49459 56.1285,27.90746 z"
-       transform="translate(0,698.03017)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#dd4814;fill-opacity:1;stroke:none"
-       id="path3773"
-       sodipodi:cx="177.47891"
-       sodipodi:cy="176.22464"
-       sodipodi:rx="73.374672"
-       sodipodi:ry="73.374672"
-       d="m 250.85358,176.22464 c 0,40.52371 -32.85096,73.37467 -73.37467,73.37467 -40.52371,0 -73.37467,-32.85096 -73.37467,-73.37467 0,-40.52371 32.85096,-73.37467 73.37467,-73.37467 40.52371,0 73.37467,32.85096 73.37467,73.37467 z"
-       transform="matrix(1.9669837,0,0,1.9669837,-171.61921,527.62382)" />
-    <g
-       id="g3058"
-       transform="translate(4.772041e-7,14.996107)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path3794"
-         d="m 164.91486,912.51937 c -18.34234,0.0325 -50.34122,0.34573 -63.05698,2.30459 -6.875545,1.08899 -6.340477,5.64207 -6.539442,9.3973 7.99e-4,0.0146 -7.81e-4,0.0302 0,0.0447 -3.99e-4,0.007 3.99e-4,0.015 0,0.0224 0.198965,3.75522 -0.336103,8.30828 6.539442,9.3973 16.93556,2.60892 68.05397,2.30528 75.57933,2.30456 0.008,0 0.0476,0 0.0558,0 7.52538,6.9e-4 58.64376,0.30436 75.57933,-2.30456 6.87557,-1.08902 6.36832,-5.64208 6.56728,-9.3973 -0.20879,-3.7675 0.34814,-8.36909 -6.56728,-9.46442 -16.93557,-2.60893 -68.05395,-2.30527 -75.57933,-2.30456 -1.85922,0 -6.4639,-0.0103 -12.57799,0 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.79847866px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.79847866px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 164.91486,782.5271 c -18.34234,0.0325 -50.34122,0.34573 -63.05698,2.30459 -6.875545,1.08898 -6.340477,5.64206 -6.539442,9.39729 7.99e-4,0.0146 -7.81e-4,0.0302 0,0.0448 -3.99e-4,0.008 3.99e-4,0.015 0,0.0224 0.198965,3.7552 -0.336103,8.30828 6.539442,9.39729 16.93556,2.60893 68.05397,2.30527 75.57933,2.30456 0.008,0 0.0476,0 0.0558,0 7.52538,6.9e-4 58.64376,0.30437 75.57933,-2.30456 6.87557,-1.08901 6.36832,-5.64209 6.56728,-9.39729 -0.20879,-3.76751 0.34814,-8.3691 -6.56728,-9.46443 -16.93557,-2.60892 -68.05395,-2.30527 -75.57933,-2.30456 -1.85922,0 -6.4639,-0.0103 -12.57799,0 z"
-         id="path3816"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3818"
-         d="m 164.91486,869.18854 c -18.34234,0.0326 -50.34122,0.34573 -63.05698,2.30461 -6.875545,1.08898 -6.340477,5.64204 -6.539442,9.39729 7.99e-4,0.0145 -7.81e-4,0.0302 0,0.0447 -3.99e-4,0.007 3.99e-4,0.015 0,0.0225 0.198965,3.75519 -0.336103,8.30827 6.539442,9.39727 16.93556,2.60893 68.05397,2.30529 75.57933,2.30458 0.008,0 0.0476,0 0.0558,0 7.52538,6.8e-4 58.64376,0.30435 75.57933,-2.30458 6.87557,-1.089 6.36832,-5.64208 6.56728,-9.39727 -0.20879,-3.76752 0.34814,-8.3691 -6.56728,-9.46441 -16.93557,-2.60896 -68.05395,-2.30529 -75.57933,-2.30458 -1.85922,0 -6.4639,-0.0103 -12.57799,0 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.79847866px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path3930"
-         d="m 164.91486,825.85784 c -18.34234,0.0325 -50.34122,0.34573 -63.05698,2.30459 -6.875545,1.08898 -6.340477,5.64206 -6.539442,9.39729 7.99e-4,0.0146 -7.81e-4,0.0302 0,0.0448 -3.99e-4,0.007 3.99e-4,0.015 0,0.0224 0.198965,3.7552 -0.336103,8.30828 6.539442,9.39729 16.93556,2.60893 68.05397,2.30527 75.57933,2.30456 0.008,0 0.0476,0 0.0558,0 7.52538,6.9e-4 58.64376,0.30437 75.57933,-2.30456 6.87557,-1.08901 6.36832,-5.64209 6.56728,-9.39729 -0.20879,-3.76751 0.34814,-8.3691 -6.56728,-9.46443 -16.93557,-2.60892 -68.05395,-2.30527 -75.57933,-2.30456 -1.85922,0 -6.4639,-0.0103 -12.57799,0 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.79847866px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>
diff --git a/templates/static/img/cloud/maas.png b/templates/static/img/cloud/maas.png
deleted file mode 100644
index 018b4ddc079..00000000000
Binary files a/templates/static/img/cloud/maas.png and /dev/null differ
diff --git a/templates/static/img/cloud/ods-takeover-hero-260.png b/templates/static/img/cloud/ods-takeover-hero-260.png
deleted file mode 100644
index 60406423a10..00000000000
Binary files a/templates/static/img/cloud/ods-takeover-hero-260.png and /dev/null differ
diff --git a/templates/static/img/cloud/openstack-logical-architecture.png b/templates/static/img/cloud/openstack-logical-architecture.png
deleted file mode 100644
index 3c8ad5b9e1c..00000000000
Binary files a/templates/static/img/cloud/openstack-logical-architecture.png and /dev/null differ
diff --git a/templates/static/img/cloud/openstack-logo.png b/templates/static/img/cloud/openstack-logo.png
deleted file mode 100644
index d716dd871e9..00000000000
Binary files a/templates/static/img/cloud/openstack-logo.png and /dev/null differ
diff --git a/templates/static/img/cloud/orchestration-pictograms.png b/templates/static/img/cloud/orchestration-pictograms.png
deleted file mode 100644
index 77ce8bd7140..00000000000
Binary files a/templates/static/img/cloud/orchestration-pictograms.png and /dev/null differ
diff --git a/templates/static/img/cloud/partners/logo-dell-160.png b/templates/static/img/cloud/partners/logo-dell-160.png
deleted file mode 100755
index 9f2da61ace3..00000000000
Binary files a/templates/static/img/cloud/partners/logo-dell-160.png and /dev/null differ
diff --git a/templates/static/img/cloud/partners/logo-emc-160.png b/templates/static/img/cloud/partners/logo-emc-160.png
deleted file mode 100755
index 1d984e61c0e..00000000000
Binary files a/templates/static/img/cloud/partners/logo-emc-160.png and /dev/null differ
diff --git a/templates/static/img/cloud/partners/logo-emulex-160.png b/templates/static/img/cloud/partners/logo-emulex-160.png
deleted file mode 100755
index f07706e0836..00000000000
Binary files a/templates/static/img/cloud/partners/logo-emulex-160.png and /dev/null differ
diff --git a/templates/static/img/cloud/partners/logo-fusion-io-160.png b/templates/static/img/cloud/partners/logo-fusion-io-160.png
deleted file mode 100755
index 64d0c49c4cd..00000000000
Binary files a/templates/static/img/cloud/partners/logo-fusion-io-160.png and /dev/null differ
diff --git a/templates/static/img/cloud/partners/logo-hp-160.png b/templates/static/img/cloud/partners/logo-hp-160.png
deleted file mode 100755
index 23223d99fb1..00000000000
Binary files a/templates/static/img/cloud/partners/logo-hp-160.png and /dev/null differ
diff --git a/templates/static/img/cloud/partners/logo-ibm-160.png b/templates/static/img/cloud/partners/logo-ibm-160.png
deleted file mode 100755
index 9bf5b4daee6..00000000000
Binary files a/templates/static/img/cloud/partners/logo-ibm-160.png and /dev/null differ
diff --git a/templates/static/img/cloud/partners/logo-inktank-160.png b/templates/static/img/cloud/partners/logo-inktank-160.png
deleted file mode 100755
index 8525ae99fd4..00000000000
Binary files a/templates/static/img/cloud/partners/logo-inktank-160.png and /dev/null differ
diff --git a/templates/static/img/cloud/partners/logo-intel-160.png b/templates/static/img/cloud/partners/logo-intel-160.png
deleted file mode 100755
index d83e94b4866..00000000000
Binary files a/templates/static/img/cloud/partners/logo-intel-160.png and /dev/null differ
diff --git a/templates/static/img/cloud/partners/logo-lsi-160.png b/templates/static/img/cloud/partners/logo-lsi-160.png
deleted file mode 100755
index 37521170c12..00000000000
Binary files a/templates/static/img/cloud/partners/logo-lsi-160.png and /dev/null differ
diff --git a/templates/static/img/cloud/partners/logo-open-compute-160.png b/templates/static/img/cloud/partners/logo-open-compute-160.png
deleted file mode 100755
index f42b958d346..00000000000
Binary files a/templates/static/img/cloud/partners/logo-open-compute-160.png and /dev/null differ
diff --git a/templates/static/img/cloud/partners/logo-seamicro-160.png b/templates/static/img/cloud/partners/logo-seamicro-160.png
deleted file mode 100755
index 7f28257502f..00000000000
Binary files a/templates/static/img/cloud/partners/logo-seamicro-160.png and /dev/null differ
diff --git a/templates/static/img/cloud/partners/logo-vmware-160.png b/templates/static/img/cloud/partners/logo-vmware-160.png
deleted file mode 100755
index 3af5adc3f5e..00000000000
Binary files a/templates/static/img/cloud/partners/logo-vmware-160.png and /dev/null differ
diff --git a/templates/static/img/cloud/photo-methodology-lily-400x267.jpg b/templates/static/img/cloud/photo-methodology-lily-400x267.jpg
deleted file mode 100644
index 3f4e673e190..00000000000
Binary files a/templates/static/img/cloud/photo-methodology-lily-400x267.jpg and /dev/null differ
diff --git a/templates/static/img/cloud/picto-enterprise-blog.png b/templates/static/img/cloud/picto-enterprise-blog.png
deleted file mode 100644
index e73dbf17475..00000000000
Binary files a/templates/static/img/cloud/picto-enterprise-blog.png and /dev/null differ
diff --git a/templates/static/img/cloud/picto-footer-cloud.png b/templates/static/img/cloud/picto-footer-cloud.png
deleted file mode 100644
index 5d47b697208..00000000000
Binary files a/templates/static/img/cloud/picto-footer-cloud.png and /dev/null differ
diff --git a/templates/static/img/cloud/picto-footer-maas.png b/templates/static/img/cloud/picto-footer-maas.png
deleted file mode 100644
index bc45b91a7f8..00000000000
Binary files a/templates/static/img/cloud/picto-footer-maas.png and /dev/null differ
diff --git a/templates/static/img/cloud/picto-jumpstart-orange-180x180.png b/templates/static/img/cloud/picto-jumpstart-orange-180x180.png
deleted file mode 100644
index f3a920b5036..00000000000
Binary files a/templates/static/img/cloud/picto-jumpstart-orange-180x180.png and /dev/null differ
diff --git a/templates/static/img/cloud/picto-whats-included.png b/templates/static/img/cloud/picto-whats-included.png
deleted file mode 100755
index e7b9e5106e4..00000000000
Binary files a/templates/static/img/cloud/picto-whats-included.png and /dev/null differ
diff --git a/templates/static/img/cloud/picto-workloads.png b/templates/static/img/cloud/picto-workloads.png
deleted file mode 100644
index 34fb89abdc0..00000000000
Binary files a/templates/static/img/cloud/picto-workloads.png and /dev/null differ
diff --git a/templates/static/img/cloud/pictogram-public-cloud-cropped-235x351.png b/templates/static/img/cloud/pictogram-public-cloud-cropped-235x351.png
deleted file mode 100644
index a03c413773b..00000000000
Binary files a/templates/static/img/cloud/pictogram-public-cloud-cropped-235x351.png and /dev/null differ
diff --git a/templates/static/img/cloud/popular-charm-logos.png b/templates/static/img/cloud/popular-charm-logos.png
deleted file mode 100644
index 91408551063..00000000000
Binary files a/templates/static/img/cloud/popular-charm-logos.png and /dev/null differ
diff --git a/templates/static/img/cloud/public-love-partners.png b/templates/static/img/cloud/public-love-partners.png
deleted file mode 100644
index 2a7a5eadaa1..00000000000
Binary files a/templates/static/img/cloud/public-love-partners.png and /dev/null differ
diff --git a/templates/static/img/cloud/screenshot-cloud-systems-462x354.png b/templates/static/img/cloud/screenshot-cloud-systems-462x354.png
deleted file mode 100644
index ca671701ec7..00000000000
Binary files a/templates/static/img/cloud/screenshot-cloud-systems-462x354.png and /dev/null differ
diff --git a/templates/static/img/cloud/screenshot-landscape-358x37.png b/templates/static/img/cloud/screenshot-landscape-358x37.png
deleted file mode 100644
index c9b6e70acb9..00000000000
Binary files a/templates/static/img/cloud/screenshot-landscape-358x37.png and /dev/null differ
diff --git a/templates/static/img/cloud/screenshot-landscape-390x287.png b/templates/static/img/cloud/screenshot-landscape-390x287.png
deleted file mode 100644
index 525dc4eac12..00000000000
Binary files a/templates/static/img/cloud/screenshot-landscape-390x287.png and /dev/null differ
diff --git a/templates/static/img/cloud/screenshot-landscape-390x371.png b/templates/static/img/cloud/screenshot-landscape-390x371.png
deleted file mode 100644
index 9e72c5fb422..00000000000
Binary files a/templates/static/img/cloud/screenshot-landscape-390x371.png and /dev/null differ
diff --git a/templates/static/img/cloud/screenshot-landscape-923x516.png b/templates/static/img/cloud/screenshot-landscape-923x516.png
deleted file mode 100644
index 9b17bbbb9fd..00000000000
Binary files a/templates/static/img/cloud/screenshot-landscape-923x516.png and /dev/null differ
diff --git a/templates/static/img/cloud/screenshot-maas-239x325-v3.png b/templates/static/img/cloud/screenshot-maas-239x325-v3.png
deleted file mode 100644
index 01a848b1912..00000000000
Binary files a/templates/static/img/cloud/screenshot-maas-239x325-v3.png and /dev/null differ
diff --git a/templates/static/img/community/icon-facebook-bullet.png b/templates/static/img/community/icon-facebook-bullet.png
deleted file mode 100644
index d6bae7669b6..00000000000
Binary files a/templates/static/img/community/icon-facebook-bullet.png and /dev/null differ
diff --git a/templates/static/img/community/icon-twitter-bullet.png b/templates/static/img/community/icon-twitter-bullet.png
deleted file mode 100644
index a457b1eb3f7..00000000000
Binary files a/templates/static/img/community/icon-twitter-bullet.png and /dev/null differ
diff --git a/templates/static/img/community/icon-youtube-bullet.png b/templates/static/img/community/icon-youtube-bullet.png
deleted file mode 100644
index 61859d2d1e6..00000000000
Binary files a/templates/static/img/community/icon-youtube-bullet.png and /dev/null differ
diff --git a/templates/static/img/community/small-background-dots.png b/templates/static/img/community/small-background-dots.png
deleted file mode 100644
index a14a4e23b11..00000000000
Binary files a/templates/static/img/community/small-background-dots.png and /dev/null differ
diff --git a/templates/static/img/community/stay-connected-pictogram-birds.png b/templates/static/img/community/stay-connected-pictogram-birds.png
deleted file mode 100644
index 2b23f77cf3f..00000000000
Binary files a/templates/static/img/community/stay-connected-pictogram-birds.png and /dev/null differ
diff --git a/templates/static/img/communitylogo.png b/templates/static/img/communitylogo.png
deleted file mode 100644
index 109956b9ab1..00000000000
Binary files a/templates/static/img/communitylogo.png and /dev/null differ
diff --git a/templates/static/img/contact.png b/templates/static/img/contact.png
deleted file mode 100644
index 631b860edac..00000000000
Binary files a/templates/static/img/contact.png and /dev/null differ
diff --git a/templates/static/img/contact.svg b/templates/static/img/contact.svg
deleted file mode 100644
index 74e305a5948..00000000000
--- a/templates/static/img/contact.svg
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="90"
-   height="90.000031"
-   id="svg3615"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="contact.svg">
-  <defs
-     id="defs3617">
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath2995-6">
-      <path
-         style="color:#000000;fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 222,818.36215 0,54 126,0 0,-54 -43.875,0 c -0.0316,0.0521 -0.062,0.1043 -0.0937,0.15625 -2.2906,3.75334 -4.87723,7.16686 -7.875,9.875 -2.99777,2.70814 -6.52444,5 -11.125,5 -4.60056,0 -8.12214,-2.29391 -11.125,-5 -3.00286,-2.70609 -5.60728,-6.12218 -7.90625,-9.875 -0.0318,-0.0519 -0.062,-0.1042 -0.0937,-0.15625 L 222.0001,818.36215 Z"
-         id="path2997-4"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9580786"
-     inkscape:cx="36.190065"
-     inkscape:cy="48.918863"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4271"
-     showgrid="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1861"
-     inkscape:window-height="1056"
-     inkscape:window-x="1425"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2986"
-       empspacing="6"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0px"
-       originy="2.6171875e-06px" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3620">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(1978.2857,336.49495)">
-    <g
-       id="g4271"
-       transform="translate(-2218.2857,-1106.8571)">
-      <path
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         clip-path="none"
-         d="M 30.21875 54.15625 C 11.057821 55.125058 6 61.297631 6 75 L 6 81 C 6 90 6 90 18 90 L 72 90 C 84 90 84 90 84 81 L 84 75 C 84 61.305107 78.947539 55.130228 59.8125 54.15625 C 58.661142 55.560765 57.451922 56.86076 56.15625 58.03125 C 53.15848 60.73939 49.63181 63.03125 45.03125 63.03125 C 40.43069 63.03125 36.90911 60.73734 33.90625 58.03125 C 32.605846 56.859364 31.377261 55.564123 30.21875 54.15625 z "
-         transform="translate(240,770.36215)"
-         id="rect3461-3-1" />
-      <rect
-         y="770.36218"
-         x="240"
-         height="90"
-         width="90"
-         id="rect4269"
-         style="color:#000000;fill:none;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         inkscape:transform-center-y="21.408856"
-         inkscape:transform-center-x="-0.0067782248"
-         id="path3447-0-6"
-         d="m 285.00024,770.36215 c -14.99976,-3e-5 -20.99976,6.00003 -20.99976,21.00003 l 0,3 c 0,12 12.03506,33 21.01729,33 8.98223,0 20.98223,-21 20.98223,-33 l 0,-3 c 0,-15 -6,-21 -20.99976,-21.00003 z"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="zsszssz" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Clips"
-     sodipodi:insensitive="true"
-     style="display:none">
-    <path
-       transform="translate(-240,-770.36215)"
-       style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 246,851.36218 c 0,9 0,9 12,9 l 54,0 c 12,0 12,0 12,-9 l 0,-6 c 0,-15 -6,-21 -30,-21 l -18,0 C 252,824.36218 246,830.36218 246,845.36218 Z"
-       id="rect3461-3-1-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csscccccc"
-       clip-path="url(#clipPath2995-6)" />
-    <rect
-       y="3.2134991e-05"
-       x="0"
-       height="90"
-       width="90"
-       id="rect4269-8"
-       style="color:#000000;fill:none;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       inkscape:transform-center-y="21.408856"
-       inkscape:transform-center-x="-0.0067782248"
-       id="path3447-0-6-9"
-       d="M 45.00024,-4.8230939e-7 C 30.00048,-3.0482196e-5 24.00048,6.0000295 24.00048,21.00003 l 0,3 c 0,12 12.03506,33 21.01729,33 8.98223,0 20.98223,-21 20.98223,-33 l 0,-3 C 66,6.0000295 60,2.9517803e-5 45.00024,-4.8230939e-7 Z"
-       style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="zsszssz" />
-  </g>
-</svg>
diff --git a/templates/static/img/contributions/ace-of-spades.png b/templates/static/img/contributions/ace-of-spades.png
deleted file mode 100644
index 2036e3f0c48..00000000000
Binary files a/templates/static/img/contributions/ace-of-spades.png and /dev/null differ
diff --git a/templates/static/img/contributions/camel.png b/templates/static/img/contributions/camel.png
deleted file mode 100644
index 619bc6a6c86..00000000000
Binary files a/templates/static/img/contributions/camel.png and /dev/null differ
diff --git a/templates/static/img/contributions/cinema-ticket.png b/templates/static/img/contributions/cinema-ticket.png
deleted file mode 100644
index d735396abef..00000000000
Binary files a/templates/static/img/contributions/cinema-ticket.png and /dev/null differ
diff --git a/templates/static/img/contributions/drum-kit.png b/templates/static/img/contributions/drum-kit.png
deleted file mode 100644
index bdc94f553c3..00000000000
Binary files a/templates/static/img/contributions/drum-kit.png and /dev/null differ
diff --git a/templates/static/img/contributions/emu-chicks.png b/templates/static/img/contributions/emu-chicks.png
deleted file mode 100644
index 4c9ca57fd5f..00000000000
Binary files a/templates/static/img/contributions/emu-chicks.png and /dev/null differ
diff --git a/templates/static/img/contributions/frying-pan.png b/templates/static/img/contributions/frying-pan.png
deleted file mode 100644
index ceb2ad2f02f..00000000000
Binary files a/templates/static/img/contributions/frying-pan.png and /dev/null differ
diff --git a/templates/static/img/contributions/happy-meal.png b/templates/static/img/contributions/happy-meal.png
deleted file mode 100644
index 9d75c358ef7..00000000000
Binary files a/templates/static/img/contributions/happy-meal.png and /dev/null differ
diff --git a/templates/static/img/contributions/king-kong.png b/templates/static/img/contributions/king-kong.png
deleted file mode 100644
index a086b83826c..00000000000
Binary files a/templates/static/img/contributions/king-kong.png and /dev/null differ
diff --git a/templates/static/img/contributions/ldn-nyc-flight.png b/templates/static/img/contributions/ldn-nyc-flight.png
deleted file mode 100644
index bbb597e04be..00000000000
Binary files a/templates/static/img/contributions/ldn-nyc-flight.png and /dev/null differ
diff --git a/templates/static/img/contributions/levi-501.png b/templates/static/img/contributions/levi-501.png
deleted file mode 100644
index de44d43d3a0..00000000000
Binary files a/templates/static/img/contributions/levi-501.png and /dev/null differ
diff --git a/templates/static/img/contributions/mocca.png b/templates/static/img/contributions/mocca.png
deleted file mode 100644
index 74837968db0..00000000000
Binary files a/templates/static/img/contributions/mocca.png and /dev/null differ
diff --git a/templates/static/img/contributions/pint-of-ale.png b/templates/static/img/contributions/pint-of-ale.png
deleted file mode 100644
index 7c76b9bf41c..00000000000
Binary files a/templates/static/img/contributions/pint-of-ale.png and /dev/null differ
diff --git a/templates/static/img/contributions/sega-controller.png b/templates/static/img/contributions/sega-controller.png
deleted file mode 100644
index 8cf7a736388..00000000000
Binary files a/templates/static/img/contributions/sega-controller.png and /dev/null differ
diff --git a/templates/static/img/contributions/skull.png b/templates/static/img/contributions/skull.png
deleted file mode 100644
index 7de87141d70..00000000000
Binary files a/templates/static/img/contributions/skull.png and /dev/null differ
diff --git a/templates/static/img/contributions/slide-sprite.png b/templates/static/img/contributions/slide-sprite.png
deleted file mode 100644
index fc59ce4776d..00000000000
Binary files a/templates/static/img/contributions/slide-sprite.png and /dev/null differ
diff --git a/templates/static/img/contributions/t-shirt.png b/templates/static/img/contributions/t-shirt.png
deleted file mode 100644
index 0fc194ada80..00000000000
Binary files a/templates/static/img/contributions/t-shirt.png and /dev/null differ
diff --git a/templates/static/img/cta-background-hover.png b/templates/static/img/cta-background-hover.png
deleted file mode 100644
index f9bf72396bf..00000000000
Binary files a/templates/static/img/cta-background-hover.png and /dev/null differ
diff --git a/templates/static/img/cta-background.png b/templates/static/img/cta-background.png
deleted file mode 100644
index 010a4e61c35..00000000000
Binary files a/templates/static/img/cta-background.png and /dev/null differ
diff --git a/templates/static/img/desktop/desktop-accessible.jpg b/templates/static/img/desktop/desktop-accessible.jpg
deleted file mode 100755
index 73bb3a6b9c7..00000000000
Binary files a/templates/static/img/desktop/desktop-accessible.jpg and /dev/null differ
diff --git a/templates/static/img/desktop/desktop-business-thin-client.jpg b/templates/static/img/desktop/desktop-business-thin-client.jpg
deleted file mode 100644
index 14e6f29684b..00000000000
Binary files a/templates/static/img/desktop/desktop-business-thin-client.jpg and /dev/null differ
diff --git a/templates/static/img/desktop/desktop-deployment-diagram.png b/templates/static/img/desktop/desktop-deployment-diagram.png
deleted file mode 100644
index 312cb33ea9b..00000000000
Binary files a/templates/static/img/desktop/desktop-deployment-diagram.png and /dev/null differ
diff --git a/templates/static/img/desktop/desktop-developer.png b/templates/static/img/desktop/desktop-developer.png
deleted file mode 100755
index 759ed22f6cd..00000000000
Binary files a/templates/static/img/desktop/desktop-developer.png and /dev/null differ
diff --git a/templates/static/img/desktop/desktop-loaded.png b/templates/static/img/desktop/desktop-loaded.png
deleted file mode 100755
index 54bad721450..00000000000
Binary files a/templates/static/img/desktop/desktop-loaded.png and /dev/null differ
diff --git a/templates/static/img/desktop/desktop-management-pictos.png b/templates/static/img/desktop/desktop-management-pictos.png
deleted file mode 100755
index 0abc149026d..00000000000
Binary files a/templates/static/img/desktop/desktop-management-pictos.png and /dev/null differ
diff --git a/templates/static/img/desktop/features/features-laptop.jpg b/templates/static/img/desktop/features/features-laptop.jpg
deleted file mode 100755
index 7bb36d6d159..00000000000
Binary files a/templates/static/img/desktop/features/features-laptop.jpg and /dev/null differ
diff --git a/templates/static/img/desktop/features/image-developer.png b/templates/static/img/desktop/features/image-developer.png
deleted file mode 100644
index 827e5a7d1ae..00000000000
Binary files a/templates/static/img/desktop/features/image-developer.png and /dev/null differ
diff --git a/templates/static/img/desktop/features/image-educational-resources.png b/templates/static/img/desktop/features/image-educational-resources.png
deleted file mode 100644
index 3106ce394ba..00000000000
Binary files a/templates/static/img/desktop/features/image-educational-resources.png and /dev/null differ
diff --git a/templates/static/img/desktop/features/image-fez-background.jpg b/templates/static/img/desktop/features/image-fez-background.jpg
deleted file mode 100644
index 656bec49f15..00000000000
Binary files a/templates/static/img/desktop/features/image-fez-background.jpg and /dev/null differ
diff --git a/templates/static/img/desktop/features/image-fez-gomez-rollover.gif b/templates/static/img/desktop/features/image-fez-gomez-rollover.gif
deleted file mode 100644
index 751f3b03721..00000000000
Binary files a/templates/static/img/desktop/features/image-fez-gomez-rollover.gif and /dev/null differ
diff --git a/templates/static/img/desktop/features/image-fez-gomez.gif b/templates/static/img/desktop/features/image-fez-gomez.gif
deleted file mode 100644
index 2fd0a3fe995..00000000000
Binary files a/templates/static/img/desktop/features/image-fez-gomez.gif and /dev/null differ
diff --git a/templates/static/img/desktop/features/image-fun-and-games.png b/templates/static/img/desktop/features/image-fun-and-games.png
deleted file mode 100644
index a679501d18d..00000000000
Binary files a/templates/static/img/desktop/features/image-fun-and-games.png and /dev/null differ
diff --git a/templates/static/img/desktop/features/image-ratings-and-reviews.png b/templates/static/img/desktop/features/image-ratings-and-reviews.png
deleted file mode 100644
index d8a14157d3e..00000000000
Binary files a/templates/static/img/desktop/features/image-ratings-and-reviews.png and /dev/null differ
diff --git a/templates/static/img/desktop/features/image-smart-scopes.jpg b/templates/static/img/desktop/features/image-smart-scopes.jpg
deleted file mode 100644
index f474b60ab87..00000000000
Binary files a/templates/static/img/desktop/features/image-smart-scopes.jpg and /dev/null differ
diff --git a/templates/static/img/desktop/features/image-software-centre.jpg b/templates/static/img/desktop/features/image-software-centre.jpg
deleted file mode 100644
index 5cdba43b38f..00000000000
Binary files a/templates/static/img/desktop/features/image-software-centre.jpg and /dev/null differ
diff --git a/templates/static/img/desktop/features/image-steam.jpg b/templates/static/img/desktop/features/image-steam.jpg
deleted file mode 100644
index acaad99aec4..00000000000
Binary files a/templates/static/img/desktop/features/image-steam.jpg and /dev/null differ
diff --git a/templates/static/img/desktop/features/image-your-ubuntu.jpg b/templates/static/img/desktop/features/image-your-ubuntu.jpg
deleted file mode 100644
index 897922eadb6..00000000000
Binary files a/templates/static/img/desktop/features/image-your-ubuntu.jpg and /dev/null differ
diff --git a/templates/static/img/desktop/features/row-funsies-bg.jpg b/templates/static/img/desktop/features/row-funsies-bg.jpg
deleted file mode 100755
index 2e2d7de6b8f..00000000000
Binary files a/templates/static/img/desktop/features/row-funsies-bg.jpg and /dev/null differ
diff --git a/templates/static/img/desktop/features/screenshot-feartures-photos-main.jpg b/templates/static/img/desktop/features/screenshot-feartures-photos-main.jpg
deleted file mode 100755
index 2fe5ae5e7b6..00000000000
Binary files a/templates/static/img/desktop/features/screenshot-feartures-photos-main.jpg and /dev/null differ
diff --git a/templates/static/img/desktop/features/screenshot-features-music-anywhere.png b/templates/static/img/desktop/features/screenshot-features-music-anywhere.png
deleted file mode 100755
index 4a084a14c65..00000000000
Binary files a/templates/static/img/desktop/features/screenshot-features-music-anywhere.png and /dev/null differ
diff --git a/templates/static/img/desktop/features/screenshot-features-music-main.png b/templates/static/img/desktop/features/screenshot-features-music-main.png
deleted file mode 100755
index 7c15c8b7c41..00000000000
Binary files a/templates/static/img/desktop/features/screenshot-features-music-main.png and /dev/null differ
diff --git a/templates/static/img/desktop/features/screenshot-features-music-preview.png b/templates/static/img/desktop/features/screenshot-features-music-preview.png
deleted file mode 100755
index 194ed4d72ea..00000000000
Binary files a/templates/static/img/desktop/features/screenshot-features-music-preview.png and /dev/null differ
diff --git a/templates/static/img/desktop/features/screenshot-features-office-gtd.png b/templates/static/img/desktop/features/screenshot-features-office-gtd.png
deleted file mode 100755
index 525c3f97ddd..00000000000
Binary files a/templates/static/img/desktop/features/screenshot-features-office-gtd.png and /dev/null differ
diff --git a/templates/static/img/desktop/features/screenshot-features-office-main.png b/templates/static/img/desktop/features/screenshot-features-office-main.png
deleted file mode 100755
index 6641233fab7..00000000000
Binary files a/templates/static/img/desktop/features/screenshot-features-office-main.png and /dev/null differ
diff --git a/templates/static/img/desktop/features/screenshot-features-usc-main.jpg b/templates/static/img/desktop/features/screenshot-features-usc-main.jpg
deleted file mode 100755
index 18f22f643c0..00000000000
Binary files a/templates/static/img/desktop/features/screenshot-features-usc-main.jpg and /dev/null differ
diff --git a/templates/static/img/desktop/features/screenshot-features-web-616x326.png b/templates/static/img/desktop/features/screenshot-features-web-616x326.png
deleted file mode 100755
index 8eb5de60996..00000000000
Binary files a/templates/static/img/desktop/features/screenshot-features-web-616x326.png and /dev/null differ
diff --git a/templates/static/img/desktop/features/screenshot-photos-watch.png b/templates/static/img/desktop/features/screenshot-photos-watch.png
deleted file mode 100755
index e42f38fc5d5..00000000000
Binary files a/templates/static/img/desktop/features/screenshot-photos-watch.png and /dev/null differ
diff --git a/templates/static/img/desktop/features/screenshot-social-main.png b/templates/static/img/desktop/features/screenshot-social-main.png
deleted file mode 100755
index 76b174691e9..00000000000
Binary files a/templates/static/img/desktop/features/screenshot-social-main.png and /dev/null differ
diff --git a/templates/static/img/desktop/features/screenshot-social-skype.jpg b/templates/static/img/desktop/features/screenshot-social-skype.jpg
deleted file mode 100755
index 2e132a79c1f..00000000000
Binary files a/templates/static/img/desktop/features/screenshot-social-skype.jpg and /dev/null differ
diff --git a/templates/static/img/desktop/features/screenshot-ubuntu-one.png b/templates/static/img/desktop/features/screenshot-ubuntu-one.png
deleted file mode 100755
index dd4cc0efabb..00000000000
Binary files a/templates/static/img/desktop/features/screenshot-ubuntu-one.png and /dev/null differ
diff --git a/templates/static/img/desktop/features/screenshot-web-secure.png b/templates/static/img/desktop/features/screenshot-web-secure.png
deleted file mode 100755
index 2e3304d104b..00000000000
Binary files a/templates/static/img/desktop/features/screenshot-web-secure.png and /dev/null differ
diff --git a/templates/static/img/desktop/features/screenshots-photos-organise.png b/templates/static/img/desktop/features/screenshots-photos-organise.png
deleted file mode 100755
index c9c4e785c0b..00000000000
Binary files a/templates/static/img/desktop/features/screenshots-photos-organise.png and /dev/null differ
diff --git a/templates/static/img/desktop/features/stars.jpg b/templates/static/img/desktop/features/stars.jpg
deleted file mode 100755
index 397785badf7..00000000000
Binary files a/templates/static/img/desktop/features/stars.jpg and /dev/null differ
diff --git a/templates/static/img/desktop/graph-eclipse-preferred-platform.png b/templates/static/img/desktop/graph-eclipse-preferred-platform.png
deleted file mode 100644
index d909fba0c72..00000000000
Binary files a/templates/static/img/desktop/graph-eclipse-preferred-platform.png and /dev/null differ
diff --git a/templates/static/img/desktop/home-launch.png b/templates/static/img/desktop/home-launch.png
deleted file mode 100644
index e171cb9f6ab..00000000000
Binary files a/templates/static/img/desktop/home-launch.png and /dev/null differ
diff --git a/templates/static/img/desktop/image-beautiful.jpg b/templates/static/img/desktop/image-beautiful.jpg
deleted file mode 100644
index 858d51a4854..00000000000
Binary files a/templates/static/img/desktop/image-beautiful.jpg and /dev/null differ
diff --git a/templates/static/img/desktop/image-chinese-lunar-calendar.png b/templates/static/img/desktop/image-chinese-lunar-calendar.png
deleted file mode 100644
index f7ff0b08c40..00000000000
Binary files a/templates/static/img/desktop/image-chinese-lunar-calendar.png and /dev/null differ
diff --git a/templates/static/img/desktop/image-for-business.jpg b/templates/static/img/desktop/image-for-business.jpg
deleted file mode 100644
index 43d1261df8c..00000000000
Binary files a/templates/static/img/desktop/image-for-business.jpg and /dev/null differ
diff --git a/templates/static/img/desktop/image-for-business.png b/templates/static/img/desktop/image-for-business.png
deleted file mode 100644
index a1abb5afccb..00000000000
Binary files a/templates/static/img/desktop/image-for-business.png and /dev/null differ
diff --git a/templates/static/img/desktop/image-for-developers.jpg b/templates/static/img/desktop/image-for-developers.jpg
deleted file mode 100644
index a732e55023e..00000000000
Binary files a/templates/static/img/desktop/image-for-developers.jpg and /dev/null differ
diff --git a/templates/static/img/desktop/image-for-developers.png b/templates/static/img/desktop/image-for-developers.png
deleted file mode 100644
index 34f1da2a10d..00000000000
Binary files a/templates/static/img/desktop/image-for-developers.png and /dev/null differ
diff --git a/templates/static/img/desktop/image-for-you.jpg b/templates/static/img/desktop/image-for-you.jpg
deleted file mode 100644
index 58caeb78884..00000000000
Binary files a/templates/static/img/desktop/image-for-you.jpg and /dev/null differ
diff --git a/templates/static/img/desktop/image-instant-messaging.png b/templates/static/img/desktop/image-instant-messaging.png
deleted file mode 100644
index 18787fe7e5d..00000000000
Binary files a/templates/static/img/desktop/image-instant-messaging.png and /dev/null differ
diff --git a/templates/static/img/desktop/image-kingsoft-wps-office.png b/templates/static/img/desktop/image-kingsoft-wps-office.png
deleted file mode 100644
index e76063ebef5..00000000000
Binary files a/templates/static/img/desktop/image-kingsoft-wps-office.png and /dev/null differ
diff --git a/templates/static/img/desktop/image-kylin-icons.png b/templates/static/img/desktop/image-kylin-icons.png
deleted file mode 100644
index e0c6dcfe03d..00000000000
Binary files a/templates/static/img/desktop/image-kylin-icons.png and /dev/null differ
diff --git a/templates/static/img/desktop/image-kylin-laptop.jpg b/templates/static/img/desktop/image-kylin-laptop.jpg
deleted file mode 100644
index 39e3eec0bec..00000000000
Binary files a/templates/static/img/desktop/image-kylin-laptop.jpg and /dev/null differ
diff --git a/templates/static/img/desktop/image-kylin.png b/templates/static/img/desktop/image-kylin.png
deleted file mode 100644
index ebd53aee032..00000000000
Binary files a/templates/static/img/desktop/image-kylin.png and /dev/null differ
diff --git a/templates/static/img/desktop/image-laptop-right.jpg b/templates/static/img/desktop/image-laptop-right.jpg
deleted file mode 100644
index 82a2dc7d2d3..00000000000
Binary files a/templates/static/img/desktop/image-laptop-right.jpg and /dev/null differ
diff --git a/templates/static/img/desktop/image-meet-ubuntu.jpg b/templates/static/img/desktop/image-meet-ubuntu.jpg
deleted file mode 100644
index 526db21da92..00000000000
Binary files a/templates/static/img/desktop/image-meet-ubuntu.jpg and /dev/null differ
diff --git a/templates/static/img/desktop/image-smart-scopes.png b/templates/static/img/desktop/image-smart-scopes.png
deleted file mode 100644
index d9525a45aaa..00000000000
Binary files a/templates/static/img/desktop/image-smart-scopes.png and /dev/null differ
diff --git a/templates/static/img/desktop/image-youker-assistant.png b/templates/static/img/desktop/image-youker-assistant.png
deleted file mode 100644
index 6707eb324ac..00000000000
Binary files a/templates/static/img/desktop/image-youker-assistant.png and /dev/null differ
diff --git a/templates/static/img/desktop/logo-canonical-288.png b/templates/static/img/desktop/logo-canonical-288.png
deleted file mode 100644
index 5c26650182f..00000000000
Binary files a/templates/static/img/desktop/logo-canonical-288.png and /dev/null differ
diff --git a/templates/static/img/desktop/logo-csip-180.png b/templates/static/img/desktop/logo-csip-180.png
deleted file mode 100644
index fd5b79f7177..00000000000
Binary files a/templates/static/img/desktop/logo-csip-180.png and /dev/null differ
diff --git a/templates/static/img/desktop/logo-nudt-288.png b/templates/static/img/desktop/logo-nudt-288.png
deleted file mode 100644
index dbe55b636c7..00000000000
Binary files a/templates/static/img/desktop/logo-nudt-288.png and /dev/null differ
diff --git a/templates/static/img/desktop/meet-ubuntu-1310.jpg b/templates/static/img/desktop/meet-ubuntu-1310.jpg
deleted file mode 100644
index f72e8c5d422..00000000000
Binary files a/templates/static/img/desktop/meet-ubuntu-1310.jpg and /dev/null differ
diff --git a/templates/static/img/desktop/meet-ubuntu.jpg b/templates/static/img/desktop/meet-ubuntu.jpg
deleted file mode 100755
index b293048c588..00000000000
Binary files a/templates/static/img/desktop/meet-ubuntu.jpg and /dev/null differ
diff --git a/templates/static/img/desktop/screenshot-demo.png b/templates/static/img/desktop/screenshot-demo.png
deleted file mode 100755
index 8140da838b4..00000000000
Binary files a/templates/static/img/desktop/screenshot-demo.png and /dev/null differ
diff --git a/templates/static/img/desktop/screenshot-landscape-482x460.png b/templates/static/img/desktop/screenshot-landscape-482x460.png
deleted file mode 100755
index 88b2c1d4cd0..00000000000
Binary files a/templates/static/img/desktop/screenshot-landscape-482x460.png and /dev/null differ
diff --git a/templates/static/img/desktop/screenshot_landscape_482x540.png b/templates/static/img/desktop/screenshot_landscape_482x540.png
deleted file mode 100644
index 4ee73aa02ea..00000000000
Binary files a/templates/static/img/desktop/screenshot_landscape_482x540.png and /dev/null differ
diff --git a/templates/static/img/desktop/tour-screen.jpg b/templates/static/img/desktop/tour-screen.jpg
deleted file mode 100755
index 87c91341135..00000000000
Binary files a/templates/static/img/desktop/tour-screen.jpg and /dev/null differ
diff --git a/templates/static/img/desktop/ubuntu-beautiful-886x549.jpg b/templates/static/img/desktop/ubuntu-beautiful-886x549.jpg
deleted file mode 100755
index 348a4355be8..00000000000
Binary files a/templates/static/img/desktop/ubuntu-beautiful-886x549.jpg and /dev/null differ
diff --git a/templates/static/img/devices/UB1-diagram.png b/templates/static/img/devices/UB1-diagram.png
deleted file mode 100644
index 68649afd7f2..00000000000
Binary files a/templates/static/img/devices/UB1-diagram.png and /dev/null differ
diff --git a/templates/static/img/devices/android-facebook-96x97.png b/templates/static/img/devices/android-facebook-96x97.png
deleted file mode 100644
index 77445a0c30f..00000000000
Binary files a/templates/static/img/devices/android-facebook-96x97.png and /dev/null differ
diff --git a/templates/static/img/devices/android-twitter-96x97.png b/templates/static/img/devices/android-twitter-96x97.png
deleted file mode 100644
index 93cad0bd18f..00000000000
Binary files a/templates/static/img/devices/android-twitter-96x97.png and /dev/null differ
diff --git a/templates/static/img/devices/animation-marker.png b/templates/static/img/devices/animation-marker.png
deleted file mode 100644
index 4e8904b52e1..00000000000
Binary files a/templates/static/img/devices/animation-marker.png and /dev/null differ
diff --git a/templates/static/img/devices/app-grid.png b/templates/static/img/devices/app-grid.png
deleted file mode 100644
index b1e105608d0..00000000000
Binary files a/templates/static/img/devices/app-grid.png and /dev/null differ
diff --git a/templates/static/img/devices/bg-android-integrate-301x296.png b/templates/static/img/devices/bg-android-integrate-301x296.png
deleted file mode 100644
index 0db5d082ee2..00000000000
Binary files a/templates/static/img/devices/bg-android-integrate-301x296.png and /dev/null differ
diff --git a/templates/static/img/devices/calculator-app-icon.png b/templates/static/img/devices/calculator-app-icon.png
deleted file mode 100755
index bf72d11520a..00000000000
Binary files a/templates/static/img/devices/calculator-app-icon.png and /dev/null differ
diff --git a/templates/static/img/devices/camera-app-icon.png b/templates/static/img/devices/camera-app-icon.png
deleted file mode 100755
index f602c0a1516..00000000000
Binary files a/templates/static/img/devices/camera-app-icon.png and /dev/null differ
diff --git a/templates/static/img/devices/camera-phone.png b/templates/static/img/devices/camera-phone.png
deleted file mode 100755
index 46644f71f45..00000000000
Binary files a/templates/static/img/devices/camera-phone.png and /dev/null differ
diff --git a/templates/static/img/devices/clock-app-icon.png b/templates/static/img/devices/clock-app-icon.png
deleted file mode 100755
index c31d9d72fdd..00000000000
Binary files a/templates/static/img/devices/clock-app-icon.png and /dev/null differ
diff --git a/templates/static/img/devices/close-button.png b/templates/static/img/devices/close-button.png
deleted file mode 100644
index 08a02b908cc..00000000000
Binary files a/templates/static/img/devices/close-button.png and /dev/null differ
diff --git a/templates/static/img/devices/converged-device-440x267.jpg b/templates/static/img/devices/converged-device-440x267.jpg
deleted file mode 100644
index a5aba87e4de..00000000000
Binary files a/templates/static/img/devices/converged-device-440x267.jpg and /dev/null differ
diff --git a/templates/static/img/devices/devices-family.png b/templates/static/img/devices/devices-family.png
deleted file mode 100644
index c159e750b10..00000000000
Binary files a/templates/static/img/devices/devices-family.png and /dev/null differ
diff --git a/templates/static/img/devices/devices-home-hero-432x252.jpg b/templates/static/img/devices/devices-home-hero-432x252.jpg
deleted file mode 100644
index 45392098bb7..00000000000
Binary files a/templates/static/img/devices/devices-home-hero-432x252.jpg and /dev/null differ
diff --git a/templates/static/img/devices/devices-phone-hero-353x206.png b/templates/static/img/devices/devices-phone-hero-353x206.png
deleted file mode 100644
index 9bc2603b10e..00000000000
Binary files a/templates/static/img/devices/devices-phone-hero-353x206.png and /dev/null differ
diff --git a/templates/static/img/devices/devices-tablet-hero-432x252.jpg b/templates/static/img/devices/devices-tablet-hero-432x252.jpg
deleted file mode 100644
index 9fc6003435c..00000000000
Binary files a/templates/static/img/devices/devices-tablet-hero-432x252.jpg and /dev/null differ
diff --git a/templates/static/img/devices/diagram-architecture-841x330.jpg b/templates/static/img/devices/diagram-architecture-841x330.jpg
deleted file mode 100644
index d856f96df5f..00000000000
Binary files a/templates/static/img/devices/diagram-architecture-841x330.jpg and /dev/null differ
diff --git a/templates/static/img/devices/edge-stripes.png b/templates/static/img/devices/edge-stripes.png
deleted file mode 100644
index 7f0917381bc..00000000000
Binary files a/templates/static/img/devices/edge-stripes.png and /dev/null differ
diff --git a/templates/static/img/devices/edge_1_launch-4.png b/templates/static/img/devices/edge_1_launch-4.png
deleted file mode 100644
index c8d2b759836..00000000000
Binary files a/templates/static/img/devices/edge_1_launch-4.png and /dev/null differ
diff --git a/templates/static/img/devices/edge_1_launch.jpg b/templates/static/img/devices/edge_1_launch.jpg
deleted file mode 100644
index fc2291ad64f..00000000000
Binary files a/templates/static/img/devices/edge_1_launch.jpg and /dev/null differ
diff --git a/templates/static/img/devices/gallery-app-icon.png b/templates/static/img/devices/gallery-app-icon.png
deleted file mode 100755
index 477774a8d34..00000000000
Binary files a/templates/static/img/devices/gallery-app-icon.png and /dev/null differ
diff --git a/templates/static/img/devices/icon-android-calendar.png b/templates/static/img/devices/icon-android-calendar.png
deleted file mode 100644
index 55bdce35996..00000000000
Binary files a/templates/static/img/devices/icon-android-calendar.png and /dev/null differ
diff --git a/templates/static/img/devices/icon-android-chromium.png b/templates/static/img/devices/icon-android-chromium.png
deleted file mode 100644
index c468d13a1ca..00000000000
Binary files a/templates/static/img/devices/icon-android-chromium.png and /dev/null differ
diff --git a/templates/static/img/devices/icon-android-dialler.png b/templates/static/img/devices/icon-android-dialler.png
deleted file mode 100644
index c8582eba2af..00000000000
Binary files a/templates/static/img/devices/icon-android-dialler.png and /dev/null differ
diff --git a/templates/static/img/devices/icon-android-docs.png b/templates/static/img/devices/icon-android-docs.png
deleted file mode 100644
index 72a38640590..00000000000
Binary files a/templates/static/img/devices/icon-android-docs.png and /dev/null differ
diff --git a/templates/static/img/devices/icon-android-gwibber.png b/templates/static/img/devices/icon-android-gwibber.png
deleted file mode 100644
index cae15cd712c..00000000000
Binary files a/templates/static/img/devices/icon-android-gwibber.png and /dev/null differ
diff --git a/templates/static/img/devices/icon-android-pitivi.png b/templates/static/img/devices/icon-android-pitivi.png
deleted file mode 100644
index d8813d7c133..00000000000
Binary files a/templates/static/img/devices/icon-android-pitivi.png and /dev/null differ
diff --git a/templates/static/img/devices/icon-android-rhythmbox.png b/templates/static/img/devices/icon-android-rhythmbox.png
deleted file mode 100644
index 79f30a716da..00000000000
Binary files a/templates/static/img/devices/icon-android-rhythmbox.png and /dev/null differ
diff --git a/templates/static/img/devices/icon-android-shotwell.png b/templates/static/img/devices/icon-android-shotwell.png
deleted file mode 100644
index b06fa1bbee8..00000000000
Binary files a/templates/static/img/devices/icon-android-shotwell.png and /dev/null differ
diff --git a/templates/static/img/devices/icon-android-thunderbird.png b/templates/static/img/devices/icon-android-thunderbird.png
deleted file mode 100644
index 48c21728726..00000000000
Binary files a/templates/static/img/devices/icon-android-thunderbird.png and /dev/null differ
diff --git a/templates/static/img/devices/icon-android-vlc.png b/templates/static/img/devices/icon-android-vlc.png
deleted file mode 100644
index 27389653d37..00000000000
Binary files a/templates/static/img/devices/icon-android-vlc.png and /dev/null differ
diff --git a/templates/static/img/devices/image-edge.jpg b/templates/static/img/devices/image-edge.jpg
deleted file mode 100644
index 35b28aec82e..00000000000
Binary files a/templates/static/img/devices/image-edge.jpg and /dev/null differ
diff --git a/templates/static/img/devices/image-open-to-everyone.png b/templates/static/img/devices/image-open-to-everyone.png
deleted file mode 100644
index 6bd3f47cc9c..00000000000
Binary files a/templates/static/img/devices/image-open-to-everyone.png and /dev/null differ
diff --git a/templates/static/img/devices/infographic-14tweets-received.png b/templates/static/img/devices/infographic-14tweets-received.png
deleted file mode 100755
index 0246b4194f9..00000000000
Binary files a/templates/static/img/devices/infographic-14tweets-received.png and /dev/null differ
diff --git a/templates/static/img/devices/infographic-33minutes-talk-time.png b/templates/static/img/devices/infographic-33minutes-talk-time.png
deleted file mode 100755
index b5236ea2d1f..00000000000
Binary files a/templates/static/img/devices/infographic-33minutes-talk-time.png and /dev/null differ
diff --git a/templates/static/img/devices/infographic-3km-walked.png b/templates/static/img/devices/infographic-3km-walked.png
deleted file mode 100755
index 4d70a306300..00000000000
Binary files a/templates/static/img/devices/infographic-3km-walked.png and /dev/null differ
diff --git a/templates/static/img/devices/infographic-7hours-at-rest.png b/templates/static/img/devices/infographic-7hours-at-rest.png
deleted file mode 100755
index 667940a3774..00000000000
Binary files a/templates/static/img/devices/infographic-7hours-at-rest.png and /dev/null differ
diff --git a/templates/static/img/devices/infographic-7messages-received.png b/templates/static/img/devices/infographic-7messages-received.png
deleted file mode 100755
index 7e42532e6ba..00000000000
Binary files a/templates/static/img/devices/infographic-7messages-received.png and /dev/null differ
diff --git a/templates/static/img/devices/mail-app-icon.png b/templates/static/img/devices/mail-app-icon.png
deleted file mode 100755
index 304d07e6d0a..00000000000
Binary files a/templates/static/img/devices/mail-app-icon.png and /dev/null differ
diff --git a/templates/static/img/devices/maps-app-icon.png b/templates/static/img/devices/maps-app-icon.png
deleted file mode 100755
index a3b9cc2a631..00000000000
Binary files a/templates/static/img/devices/maps-app-icon.png and /dev/null differ
diff --git a/templates/static/img/devices/music-app-icon.png b/templates/static/img/devices/music-app-icon.png
deleted file mode 100755
index 70360cb02b0..00000000000
Binary files a/templates/static/img/devices/music-app-icon.png and /dev/null differ
diff --git a/templates/static/img/devices/music-phone.png b/templates/static/img/devices/music-phone.png
deleted file mode 100755
index 10b50730d25..00000000000
Binary files a/templates/static/img/devices/music-phone.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-1-edge-magic-home.png b/templates/static/img/devices/phone-1-edge-magic-home.png
deleted file mode 100644
index ee2ceffef2b..00000000000
Binary files a/templates/static/img/devices/phone-1-edge-magic-home.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-1-edge-magic-launcher.png b/templates/static/img/devices/phone-1-edge-magic-launcher.png
deleted file mode 100644
index bc8b2310e58..00000000000
Binary files a/templates/static/img/devices/phone-1-edge-magic-launcher.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-2-edge-magic-apps-scope.png b/templates/static/img/devices/phone-2-edge-magic-apps-scope.png
deleted file mode 100644
index 3a5fee9fef4..00000000000
Binary files a/templates/static/img/devices/phone-2-edge-magic-apps-scope.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-2-edge-magic-facebook.png b/templates/static/img/devices/phone-2-edge-magic-facebook.png
deleted file mode 100644
index 7ab6a7c61f8..00000000000
Binary files a/templates/static/img/devices/phone-2-edge-magic-facebook.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-2-edge-magic-launcher.png b/templates/static/img/devices/phone-2-edge-magic-launcher.png
deleted file mode 100644
index bc8b2310e58..00000000000
Binary files a/templates/static/img/devices/phone-2-edge-magic-launcher.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-3-edge-magic-camera.png b/templates/static/img/devices/phone-3-edge-magic-camera.png
deleted file mode 100644
index 5969bd687e2..00000000000
Binary files a/templates/static/img/devices/phone-3-edge-magic-camera.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-3-edge-magic-gallery.png b/templates/static/img/devices/phone-3-edge-magic-gallery.png
deleted file mode 100644
index 16aecf60aca..00000000000
Binary files a/templates/static/img/devices/phone-3-edge-magic-gallery.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-3-edge-magic-phone.png b/templates/static/img/devices/phone-3-edge-magic-phone.png
deleted file mode 100644
index a5b25dc59a0..00000000000
Binary files a/templates/static/img/devices/phone-3-edge-magic-phone.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-3-edge-magic-twitter.png b/templates/static/img/devices/phone-3-edge-magic-twitter.png
deleted file mode 100644
index 26a1114e850..00000000000
Binary files a/templates/static/img/devices/phone-3-edge-magic-twitter.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-5-edge-magic-gallery-controls.png b/templates/static/img/devices/phone-5-edge-magic-gallery-controls.png
deleted file mode 100644
index f724310559e..00000000000
Binary files a/templates/static/img/devices/phone-5-edge-magic-gallery-controls.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-5-edge-magic-gallery-no-controls.png b/templates/static/img/devices/phone-5-edge-magic-gallery-no-controls.png
deleted file mode 100644
index ae52da9994e..00000000000
Binary files a/templates/static/img/devices/phone-5-edge-magic-gallery-no-controls.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-5-edge-magic-gallery-phone.png b/templates/static/img/devices/phone-5-edge-magic-gallery-phone.png
deleted file mode 100644
index 221fb7aaa34..00000000000
Binary files a/templates/static/img/devices/phone-5-edge-magic-gallery-phone.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-UB1-diagram.png b/templates/static/img/devices/phone-UB1-diagram.png
deleted file mode 100644
index 4939e3b742c..00000000000
Binary files a/templates/static/img/devices/phone-UB1-diagram.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-anim-settings-screen.png b/templates/static/img/devices/phone-anim-settings-screen.png
deleted file mode 100644
index bdd987ec5dc..00000000000
Binary files a/templates/static/img/devices/phone-anim-settings-screen.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-anim-slider-knot.png b/templates/static/img/devices/phone-anim-slider-knot.png
deleted file mode 100644
index ab604b6c3e4..00000000000
Binary files a/templates/static/img/devices/phone-anim-slider-knot.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-animation-repeat.png b/templates/static/img/devices/phone-animation-repeat.png
deleted file mode 100644
index 5a9bb281b8b..00000000000
Binary files a/templates/static/img/devices/phone-animation-repeat.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-app-hero-420x338.jpg b/templates/static/img/devices/phone-app-hero-420x338.jpg
deleted file mode 100644
index 4bdefacfdf7..00000000000
Binary files a/templates/static/img/devices/phone-app-hero-420x338.jpg and /dev/null differ
diff --git a/templates/static/img/devices/phone-app-hero-487x392.jpg b/templates/static/img/devices/phone-app-hero-487x392.jpg
deleted file mode 100644
index 5c60071f14a..00000000000
Binary files a/templates/static/img/devices/phone-app-hero-487x392.jpg and /dev/null differ
diff --git a/templates/static/img/devices/phone-apps-grid-extended.png b/templates/static/img/devices/phone-apps-grid-extended.png
deleted file mode 100644
index 21ea2f623b5..00000000000
Binary files a/templates/static/img/devices/phone-apps-grid-extended.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-apps-grid.png b/templates/static/img/devices/phone-apps-grid.png
deleted file mode 100644
index 53723e7b22e..00000000000
Binary files a/templates/static/img/devices/phone-apps-grid.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-bottom-find-out.png b/templates/static/img/devices/phone-bottom-find-out.png
deleted file mode 100644
index 598f1711d9f..00000000000
Binary files a/templates/static/img/devices/phone-bottom-find-out.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-bottom-meet-us.png b/templates/static/img/devices/phone-bottom-meet-us.png
deleted file mode 100644
index 4d1abccef51..00000000000
Binary files a/templates/static/img/devices/phone-bottom-meet-us.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-cag-gallery.jpg b/templates/static/img/devices/phone-cag-gallery.jpg
deleted file mode 100644
index 97bc170d4d2..00000000000
Binary files a/templates/static/img/devices/phone-cag-gallery.jpg and /dev/null differ
diff --git a/templates/static/img/devices/phone-cag-hero.jpg b/templates/static/img/devices/phone-cag-hero.jpg
deleted file mode 100644
index 11cf07dee9d..00000000000
Binary files a/templates/static/img/devices/phone-cag-hero.jpg and /dev/null differ
diff --git a/templates/static/img/devices/phone-conversations-324x576.jpg b/templates/static/img/devices/phone-conversations-324x576.jpg
deleted file mode 100644
index 9035f1d436c..00000000000
Binary files a/templates/static/img/devices/phone-conversations-324x576.jpg and /dev/null differ
diff --git a/templates/static/img/devices/phone-design-hero-584x340.jpg b/templates/static/img/devices/phone-design-hero-584x340.jpg
deleted file mode 100644
index d63896614a5..00000000000
Binary files a/templates/static/img/devices/phone-design-hero-584x340.jpg and /dev/null differ
diff --git a/templates/static/img/devices/phone-developer-pictograms.png b/templates/static/img/devices/phone-developer-pictograms.png
deleted file mode 100644
index 8c36504bd90..00000000000
Binary files a/templates/static/img/devices/phone-developer-pictograms.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-edge-magic-camera.png b/templates/static/img/devices/phone-edge-magic-camera.png
deleted file mode 100644
index 45d47abce30..00000000000
Binary files a/templates/static/img/devices/phone-edge-magic-camera.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-edge-magic-gallery-controls.png b/templates/static/img/devices/phone-edge-magic-gallery-controls.png
deleted file mode 100644
index d724cb663e8..00000000000
Binary files a/templates/static/img/devices/phone-edge-magic-gallery-controls.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-edge-magic-gallery-no-controls.png b/templates/static/img/devices/phone-edge-magic-gallery-no-controls.png
deleted file mode 100644
index 84a7ffae8cf..00000000000
Binary files a/templates/static/img/devices/phone-edge-magic-gallery-no-controls.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-edge-magic-gallery.png b/templates/static/img/devices/phone-edge-magic-gallery.png
deleted file mode 100644
index 5079f2eec24..00000000000
Binary files a/templates/static/img/devices/phone-edge-magic-gallery.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-edge-magic-launcher.png b/templates/static/img/devices/phone-edge-magic-launcher.png
deleted file mode 100644
index 1faebbd32a6..00000000000
Binary files a/templates/static/img/devices/phone-edge-magic-launcher.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-edge-magic-twitter.png b/templates/static/img/devices/phone-edge-magic-twitter.png
deleted file mode 100644
index a314562b733..00000000000
Binary files a/templates/static/img/devices/phone-edge-magic-twitter.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-gallery-camera-landscape.png b/templates/static/img/devices/phone-gallery-camera-landscape.png
deleted file mode 100644
index 074c0f41284..00000000000
Binary files a/templates/static/img/devices/phone-gallery-camera-landscape.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-gallery-photos-portrait.png b/templates/static/img/devices/phone-gallery-photos-portrait.png
deleted file mode 100644
index 92fed54fb0d..00000000000
Binary files a/templates/static/img/devices/phone-gallery-photos-portrait.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-global-solutions-pictogram.png b/templates/static/img/devices/phone-global-solutions-pictogram.png
deleted file mode 100644
index f41e2a1e338..00000000000
Binary files a/templates/static/img/devices/phone-global-solutions-pictogram.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-hero.jpg b/templates/static/img/devices/phone-hero.jpg
deleted file mode 100644
index 4b72ada9893..00000000000
Binary files a/templates/static/img/devices/phone-hero.jpg and /dev/null differ
diff --git a/templates/static/img/devices/phone-home-design-269x185.jpg b/templates/static/img/devices/phone-home-design-269x185.jpg
deleted file mode 100644
index ac33a81db73..00000000000
Binary files a/templates/static/img/devices/phone-home-design-269x185.jpg and /dev/null differ
diff --git a/templates/static/img/devices/phone-home-developers-290x188.jpg b/templates/static/img/devices/phone-home-developers-290x188.jpg
deleted file mode 100644
index 3935673afd7..00000000000
Binary files a/templates/static/img/devices/phone-home-developers-290x188.jpg and /dev/null differ
diff --git a/templates/static/img/devices/phone-home-hero-616x431.png b/templates/static/img/devices/phone-home-hero-616x431.png
deleted file mode 100644
index 3ee6da52da4..00000000000
Binary files a/templates/static/img/devices/phone-home-hero-616x431.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-home-industry-269x192.jpg b/templates/static/img/devices/phone-home-industry-269x192.jpg
deleted file mode 100644
index c94123c9e9b..00000000000
Binary files a/templates/static/img/devices/phone-home-industry-269x192.jpg and /dev/null differ
diff --git a/templates/static/img/devices/phone-home-screen-resize.png b/templates/static/img/devices/phone-home-screen-resize.png
deleted file mode 100644
index 75e4238b44f..00000000000
Binary files a/templates/static/img/devices/phone-home-screen-resize.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-home-screen.png b/templates/static/img/devices/phone-home-screen.png
deleted file mode 100644
index 886990a71cd..00000000000
Binary files a/templates/static/img/devices/phone-home-screen.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-hud.png b/templates/static/img/devices/phone-hud.png
deleted file mode 100644
index 32233c6a8d2..00000000000
Binary files a/templates/static/img/devices/phone-hud.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-infographic-background.jpg b/templates/static/img/devices/phone-infographic-background.jpg
deleted file mode 100644
index eb631134488..00000000000
Binary files a/templates/static/img/devices/phone-infographic-background.jpg and /dev/null differ
diff --git a/templates/static/img/devices/phone-landscape.png b/templates/static/img/devices/phone-landscape.png
deleted file mode 100644
index 924840b7698..00000000000
Binary files a/templates/static/img/devices/phone-landscape.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-launcher-resize.png b/templates/static/img/devices/phone-launcher-resize.png
deleted file mode 100644
index d8b224ceacb..00000000000
Binary files a/templates/static/img/devices/phone-launcher-resize.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-launcher.png b/templates/static/img/devices/phone-launcher.png
deleted file mode 100644
index bb8f31df3bc..00000000000
Binary files a/templates/static/img/devices/phone-launcher.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-make-ubuntu-your-own.jpg b/templates/static/img/devices/phone-make-ubuntu-your-own.jpg
deleted file mode 100644
index e85199a311e..00000000000
Binary files a/templates/static/img/devices/phone-make-ubuntu-your-own.jpg and /dev/null differ
diff --git a/templates/static/img/devices/phone-naturally-neat.jpg b/templates/static/img/devices/phone-naturally-neat.jpg
deleted file mode 100644
index af023662a0c..00000000000
Binary files a/templates/static/img/devices/phone-naturally-neat.jpg and /dev/null differ
diff --git a/templates/static/img/devices/phone-naturally-neat.png b/templates/static/img/devices/phone-naturally-neat.png
deleted file mode 100644
index 811f24bd3fb..00000000000
Binary files a/templates/static/img/devices/phone-naturally-neat.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-notifications.png b/templates/static/img/devices/phone-notifications.png
deleted file mode 100644
index a62e1e4f995..00000000000
Binary files a/templates/static/img/devices/phone-notifications.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-operators-hero-410x342.jpg b/templates/static/img/devices/phone-operators-hero-410x342.jpg
deleted file mode 100644
index d336d1864e3..00000000000
Binary files a/templates/static/img/devices/phone-operators-hero-410x342.jpg and /dev/null differ
diff --git a/templates/static/img/devices/phone-operators-hero-462x385.jpg b/templates/static/img/devices/phone-operators-hero-462x385.jpg
deleted file mode 100644
index f243662d05e..00000000000
Binary files a/templates/static/img/devices/phone-operators-hero-462x385.jpg and /dev/null differ
diff --git a/templates/static/img/devices/phone-phone-resize.png b/templates/static/img/devices/phone-phone-resize.png
deleted file mode 100644
index 6e74e46f863..00000000000
Binary files a/templates/static/img/devices/phone-phone-resize.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-phone.png b/templates/static/img/devices/phone-phone.png
deleted file mode 100644
index 3911a60bbea..00000000000
Binary files a/templates/static/img/devices/phone-phone.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-photo-app.jpg b/templates/static/img/devices/phone-photo-app.jpg
deleted file mode 100644
index b6bb27e85cb..00000000000
Binary files a/templates/static/img/devices/phone-photo-app.jpg and /dev/null differ
diff --git a/templates/static/img/devices/phone-photo-app.png b/templates/static/img/devices/phone-photo-app.png
deleted file mode 100644
index a3b21e7f364..00000000000
Binary files a/templates/static/img/devices/phone-photo-app.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-photo-camera.png b/templates/static/img/devices/phone-photo-camera.png
deleted file mode 100644
index da6e3f85803..00000000000
Binary files a/templates/static/img/devices/phone-photo-camera.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-photo-gallery.png b/templates/static/img/devices/phone-photo-gallery.png
deleted file mode 100644
index 9929b2386b1..00000000000
Binary files a/templates/static/img/devices/phone-photo-gallery.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-photo-hero-561x323.png b/templates/static/img/devices/phone-photo-hero-561x323.png
deleted file mode 100644
index 607e77b52a7..00000000000
Binary files a/templates/static/img/devices/phone-photo-hero-561x323.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-photo-hero.jpg b/templates/static/img/devices/phone-photo-hero.jpg
deleted file mode 100644
index 2fb8f566b48..00000000000
Binary files a/templates/static/img/devices/phone-photo-hero.jpg and /dev/null differ
diff --git a/templates/static/img/devices/phone-photos-background.jpg b/templates/static/img/devices/phone-photos-background.jpg
deleted file mode 100644
index cb258cba5c3..00000000000
Binary files a/templates/static/img/devices/phone-photos-background.jpg and /dev/null differ
diff --git a/templates/static/img/devices/phone-photos-background.png b/templates/static/img/devices/phone-photos-background.png
deleted file mode 100644
index c947638ac6c..00000000000
Binary files a/templates/static/img/devices/phone-photos-background.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-portrait.png b/templates/static/img/devices/phone-portrait.png
deleted file mode 100644
index 2185c94bc56..00000000000
Binary files a/templates/static/img/devices/phone-portrait.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-search-background.jpg b/templates/static/img/devices/phone-search-background.jpg
deleted file mode 100644
index a78ea2e65a3..00000000000
Binary files a/templates/static/img/devices/phone-search-background.jpg and /dev/null differ
diff --git a/templates/static/img/devices/phone-search-results.jpg b/templates/static/img/devices/phone-search-results.jpg
deleted file mode 100644
index 68d67c4f193..00000000000
Binary files a/templates/static/img/devices/phone-search-results.jpg and /dev/null differ
diff --git a/templates/static/img/devices/phone-search-search-box.png b/templates/static/img/devices/phone-search-search-box.png
deleted file mode 100644
index 260e6bf4bc8..00000000000
Binary files a/templates/static/img/devices/phone-search-search-box.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-search-title.png b/templates/static/img/devices/phone-search-title.png
deleted file mode 100644
index 6d7f9cc517a..00000000000
Binary files a/templates/static/img/devices/phone-search-title.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-tooltip-camera.png b/templates/static/img/devices/phone-tooltip-camera.png
deleted file mode 100644
index 46644f71f45..00000000000
Binary files a/templates/static/img/devices/phone-tooltip-camera.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-tooltip-music.png b/templates/static/img/devices/phone-tooltip-music.png
deleted file mode 100644
index 10b50730d25..00000000000
Binary files a/templates/static/img/devices/phone-tooltip-music.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-tooltip-telephony.png b/templates/static/img/devices/phone-tooltip-telephony.png
deleted file mode 100644
index ff5916990a3..00000000000
Binary files a/templates/static/img/devices/phone-tooltip-telephony.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-twitter-320x556.jpg b/templates/static/img/devices/phone-twitter-320x556.jpg
deleted file mode 100644
index 04e61effd55..00000000000
Binary files a/templates/static/img/devices/phone-twitter-320x556.jpg and /dev/null differ
diff --git a/templates/static/img/devices/phone-watch-video-icon.png b/templates/static/img/devices/phone-watch-video-icon.png
deleted file mode 100644
index 6e21ee85a42..00000000000
Binary files a/templates/static/img/devices/phone-watch-video-icon.png and /dev/null differ
diff --git a/templates/static/img/devices/phone-write-apps-background.png b/templates/static/img/devices/phone-write-apps-background.png
deleted file mode 100644
index ad5de4909f5..00000000000
Binary files a/templates/static/img/devices/phone-write-apps-background.png and /dev/null differ
diff --git a/templates/static/img/devices/photo-android-hero-749x456.jpg b/templates/static/img/devices/photo-android-hero-749x456.jpg
deleted file mode 100644
index cb3922ec9f7..00000000000
Binary files a/templates/static/img/devices/photo-android-hero-749x456.jpg and /dev/null differ
diff --git a/templates/static/img/devices/photo-android-phone-302x287.jpg b/templates/static/img/devices/photo-android-phone-302x287.jpg
deleted file mode 100644
index 91f9701801e..00000000000
Binary files a/templates/static/img/devices/photo-android-phone-302x287.jpg and /dev/null differ
diff --git a/templates/static/img/devices/photo-industry-android-381x230.jpg b/templates/static/img/devices/photo-industry-android-381x230.jpg
deleted file mode 100644
index 670c7c92ff9..00000000000
Binary files a/templates/static/img/devices/photo-industry-android-381x230.jpg and /dev/null differ
diff --git a/templates/static/img/devices/photo-industry-tv-427x247.jpg b/templates/static/img/devices/photo-industry-tv-427x247.jpg
deleted file mode 100644
index 235b0a40ecb..00000000000
Binary files a/templates/static/img/devices/photo-industry-tv-427x247.jpg and /dev/null differ
diff --git a/templates/static/img/devices/photo-tv-features-screen-1-282x220.jpg b/templates/static/img/devices/photo-tv-features-screen-1-282x220.jpg
deleted file mode 100644
index eeb32b2fdcf..00000000000
Binary files a/templates/static/img/devices/photo-tv-features-screen-1-282x220.jpg and /dev/null differ
diff --git a/templates/static/img/devices/photo-tv-features-screen-2-282x220.jpg b/templates/static/img/devices/photo-tv-features-screen-2-282x220.jpg
deleted file mode 100644
index 6e38ec18c15..00000000000
Binary files a/templates/static/img/devices/photo-tv-features-screen-2-282x220.jpg and /dev/null differ
diff --git a/templates/static/img/devices/photo-tv-features-screen-3-282x220.jpg b/templates/static/img/devices/photo-tv-features-screen-3-282x220.jpg
deleted file mode 100644
index d79be4df00b..00000000000
Binary files a/templates/static/img/devices/photo-tv-features-screen-3-282x220.jpg and /dev/null differ
diff --git a/templates/static/img/devices/pictogram-smile-purple.png b/templates/static/img/devices/pictogram-smile-purple.png
deleted file mode 100644
index c5282fce62a..00000000000
Binary files a/templates/static/img/devices/pictogram-smile-purple.png and /dev/null differ
diff --git a/templates/static/img/devices/play-video-icon.png b/templates/static/img/devices/play-video-icon.png
deleted file mode 100644
index 237e81ea014..00000000000
Binary files a/templates/static/img/devices/play-video-icon.png and /dev/null differ
diff --git a/templates/static/img/devices/product-android-contacts-442x249.png b/templates/static/img/devices/product-android-contacts-442x249.png
deleted file mode 100644
index 168c81650f2..00000000000
Binary files a/templates/static/img/devices/product-android-contacts-442x249.png and /dev/null differ
diff --git a/templates/static/img/devices/product-android-features-hero-418x325.png b/templates/static/img/devices/product-android-features-hero-418x325.png
deleted file mode 100644
index 82955f303d0..00000000000
Binary files a/templates/static/img/devices/product-android-features-hero-418x325.png and /dev/null differ
diff --git a/templates/static/img/devices/product-android-messaging-442x249.png b/templates/static/img/devices/product-android-messaging-442x249.png
deleted file mode 100644
index 2975ae4c6f8..00000000000
Binary files a/templates/static/img/devices/product-android-messaging-442x249.png and /dev/null differ
diff --git a/templates/static/img/devices/product-tv-experience-features-442x327.jpg b/templates/static/img/devices/product-tv-experience-features-442x327.jpg
deleted file mode 100644
index b484397964d..00000000000
Binary files a/templates/static/img/devices/product-tv-experience-features-442x327.jpg and /dev/null differ
diff --git a/templates/static/img/devices/product-tv-experience-spongebob-904x506.jpg b/templates/static/img/devices/product-tv-experience-spongebob-904x506.jpg
deleted file mode 100644
index 8d10d9ae7b6..00000000000
Binary files a/templates/static/img/devices/product-tv-experience-spongebob-904x506.jpg and /dev/null differ
diff --git a/templates/static/img/devices/product-tv-experience-top-590x386.png b/templates/static/img/devices/product-tv-experience-top-590x386.png
deleted file mode 100644
index 5b936519e12..00000000000
Binary files a/templates/static/img/devices/product-tv-experience-top-590x386.png and /dev/null differ
diff --git a/templates/static/img/devices/product-ubuntu-laptop-for-tv-442x267.jpg b/templates/static/img/devices/product-ubuntu-laptop-for-tv-442x267.jpg
deleted file mode 100644
index 5ec7f997361..00000000000
Binary files a/templates/static/img/devices/product-ubuntu-laptop-for-tv-442x267.jpg and /dev/null differ
diff --git a/templates/static/img/devices/safer-sharing-bg.png b/templates/static/img/devices/safer-sharing-bg.png
deleted file mode 100644
index 0e1b190f934..00000000000
Binary files a/templates/static/img/devices/safer-sharing-bg.png and /dev/null differ
diff --git a/templates/static/img/devices/safer-sharing-login.png b/templates/static/img/devices/safer-sharing-login.png
deleted file mode 100644
index 2ddf6ce108c..00000000000
Binary files a/templates/static/img/devices/safer-sharing-login.png and /dev/null differ
diff --git a/templates/static/img/devices/screenshot-movie-440x331.jpg b/templates/static/img/devices/screenshot-movie-440x331.jpg
deleted file mode 100644
index 5dfc5fd7159..00000000000
Binary files a/templates/static/img/devices/screenshot-movie-440x331.jpg and /dev/null differ
diff --git a/templates/static/img/devices/screenshot-pause-and-play-440x331.jpg b/templates/static/img/devices/screenshot-pause-and-play-440x331.jpg
deleted file mode 100644
index 88c5a49d28d..00000000000
Binary files a/templates/static/img/devices/screenshot-pause-and-play-440x331.jpg and /dev/null differ
diff --git a/templates/static/img/devices/screenshot-tv-channels-900x413.jpg b/templates/static/img/devices/screenshot-tv-channels-900x413.jpg
deleted file mode 100644
index 4935f1ab187..00000000000
Binary files a/templates/static/img/devices/screenshot-tv-channels-900x413.jpg and /dev/null differ
diff --git a/templates/static/img/devices/screenshot-tv-homepage-wide-image-900x334.jpg b/templates/static/img/devices/screenshot-tv-homepage-wide-image-900x334.jpg
deleted file mode 100644
index 8af952fa43f..00000000000
Binary files a/templates/static/img/devices/screenshot-tv-homepage-wide-image-900x334.jpg and /dev/null differ
diff --git a/templates/static/img/devices/tablet-and-phone-side.png b/templates/static/img/devices/tablet-and-phone-side.png
deleted file mode 100644
index 410046b57bc..00000000000
Binary files a/templates/static/img/devices/tablet-and-phone-side.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-app-carousel.png b/templates/static/img/devices/tablet-app-carousel.png
deleted file mode 100644
index c90982453fb..00000000000
Binary files a/templates/static/img/devices/tablet-app-carousel.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-app-media-player.png b/templates/static/img/devices/tablet-app-media-player.png
deleted file mode 100644
index e7ac429cfb5..00000000000
Binary files a/templates/static/img/devices/tablet-app-media-player.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-app-native-ski-safari.png b/templates/static/img/devices/tablet-app-native-ski-safari.png
deleted file mode 100644
index 13587cffcbd..00000000000
Binary files a/templates/static/img/devices/tablet-app-native-ski-safari.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-apps-screen-portrait.png b/templates/static/img/devices/tablet-apps-screen-portrait.png
deleted file mode 100644
index 033fa823840..00000000000
Binary files a/templates/static/img/devices/tablet-apps-screen-portrait.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-branded-and-apps.png b/templates/static/img/devices/tablet-branded-and-apps.png
deleted file mode 100644
index 253d835c76f..00000000000
Binary files a/templates/static/img/devices/tablet-branded-and-apps.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-branded-screens.png b/templates/static/img/devices/tablet-branded-screens.png
deleted file mode 100644
index c6aca3b6b55..00000000000
Binary files a/templates/static/img/devices/tablet-branded-screens.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-browser-notes.jpg b/templates/static/img/devices/tablet-browser-notes.jpg
deleted file mode 100755
index 986d3704a8c..00000000000
Binary files a/templates/static/img/devices/tablet-browser-notes.jpg and /dev/null differ
diff --git a/templates/static/img/devices/tablet-convergence-illustration.jpg b/templates/static/img/devices/tablet-convergence-illustration.jpg
deleted file mode 100755
index 1b292c627c0..00000000000
Binary files a/templates/static/img/devices/tablet-convergence-illustration.jpg and /dev/null differ
diff --git a/templates/static/img/devices/tablet-convergence-illustration.png b/templates/static/img/devices/tablet-convergence-illustration.png
deleted file mode 100644
index ca0ffff9e42..00000000000
Binary files a/templates/static/img/devices/tablet-convergence-illustration.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-doc-skype.jpg b/templates/static/img/devices/tablet-doc-skype.jpg
deleted file mode 100755
index 3d90b9112cf..00000000000
Binary files a/templates/static/img/devices/tablet-doc-skype.jpg and /dev/null differ
diff --git a/templates/static/img/devices/tablet-entertain-us-bg.png b/templates/static/img/devices/tablet-entertain-us-bg.png
deleted file mode 100644
index 0768badb206..00000000000
Binary files a/templates/static/img/devices/tablet-entertain-us-bg.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-gallery-bg.jpg b/templates/static/img/devices/tablet-gallery-bg.jpg
deleted file mode 100755
index 0ca93e6f642..00000000000
Binary files a/templates/static/img/devices/tablet-gallery-bg.jpg and /dev/null differ
diff --git a/templates/static/img/devices/tablet-google-doc-screen.png b/templates/static/img/devices/tablet-google-doc-screen.png
deleted file mode 100644
index cc09c0224da..00000000000
Binary files a/templates/static/img/devices/tablet-google-doc-screen.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-hero-2.png b/templates/static/img/devices/tablet-hero-2.png
deleted file mode 100644
index a037eb94e25..00000000000
Binary files a/templates/static/img/devices/tablet-hero-2.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-hero-3.png b/templates/static/img/devices/tablet-hero-3.png
deleted file mode 100644
index f348766c926..00000000000
Binary files a/templates/static/img/devices/tablet-hero-3.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-hero.jpg b/templates/static/img/devices/tablet-hero.jpg
deleted file mode 100755
index cf604a496e3..00000000000
Binary files a/templates/static/img/devices/tablet-hero.jpg and /dev/null differ
diff --git a/templates/static/img/devices/tablet-home-portrait.jpg b/templates/static/img/devices/tablet-home-portrait.jpg
deleted file mode 100755
index d6f4fc877a2..00000000000
Binary files a/templates/static/img/devices/tablet-home-portrait.jpg and /dev/null differ
diff --git a/templates/static/img/devices/tablet-home-screen-large.jpg b/templates/static/img/devices/tablet-home-screen-large.jpg
deleted file mode 100755
index 84759a5aabe..00000000000
Binary files a/templates/static/img/devices/tablet-home-screen-large.jpg and /dev/null differ
diff --git a/templates/static/img/devices/tablet-hud-controls-searching.jpg b/templates/static/img/devices/tablet-hud-controls-searching.jpg
deleted file mode 100755
index f08929a5ffe..00000000000
Binary files a/templates/static/img/devices/tablet-hud-controls-searching.jpg and /dev/null differ
diff --git a/templates/static/img/devices/tablet-hud-controls-settings.jpg b/templates/static/img/devices/tablet-hud-controls-settings.jpg
deleted file mode 100755
index 4a630ee3af3..00000000000
Binary files a/templates/static/img/devices/tablet-hud-controls-settings.jpg and /dev/null differ
diff --git a/templates/static/img/devices/tablet-landscape-album-screen.png b/templates/static/img/devices/tablet-landscape-album-screen.png
deleted file mode 100644
index b0e249876b0..00000000000
Binary files a/templates/static/img/devices/tablet-landscape-album-screen.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-landscape-album.png b/templates/static/img/devices/tablet-landscape-album.png
deleted file mode 100644
index b0e249876b0..00000000000
Binary files a/templates/static/img/devices/tablet-landscape-album.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-landscape-blank.png b/templates/static/img/devices/tablet-landscape-blank.png
deleted file mode 100644
index a39747b8367..00000000000
Binary files a/templates/static/img/devices/tablet-landscape-blank.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-landscape-gallery.png b/templates/static/img/devices/tablet-landscape-gallery.png
deleted file mode 100644
index d62cabedde7..00000000000
Binary files a/templates/static/img/devices/tablet-landscape-gallery.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-launcher.png b/templates/static/img/devices/tablet-launcher.png
deleted file mode 100644
index 767666e78d7..00000000000
Binary files a/templates/static/img/devices/tablet-launcher.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-media-controls.png b/templates/static/img/devices/tablet-media-controls.png
deleted file mode 100644
index 5b31dc2b950..00000000000
Binary files a/templates/static/img/devices/tablet-media-controls.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-media-player-large.png b/templates/static/img/devices/tablet-media-player-large.png
deleted file mode 100644
index 177058c960a..00000000000
Binary files a/templates/static/img/devices/tablet-media-player-large.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-messages.png b/templates/static/img/devices/tablet-messages.png
deleted file mode 100644
index e920f375b84..00000000000
Binary files a/templates/static/img/devices/tablet-messages.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-multi-tasking.png b/templates/static/img/devices/tablet-multi-tasking.png
deleted file mode 100644
index 9901236eb2b..00000000000
Binary files a/templates/static/img/devices/tablet-multi-tasking.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-partner-branded.jpg b/templates/static/img/devices/tablet-partner-branded.jpg
deleted file mode 100755
index 22c65505e0b..00000000000
Binary files a/templates/static/img/devices/tablet-partner-branded.jpg and /dev/null differ
diff --git a/templates/static/img/devices/tablet-partner-branded.png b/templates/static/img/devices/tablet-partner-branded.png
deleted file mode 100644
index bc0aee0f14b..00000000000
Binary files a/templates/static/img/devices/tablet-partner-branded.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-safer-sharing-bg.jpg b/templates/static/img/devices/tablet-safer-sharing-bg.jpg
deleted file mode 100755
index 16748531b4b..00000000000
Binary files a/templates/static/img/devices/tablet-safer-sharing-bg.jpg and /dev/null differ
diff --git a/templates/static/img/devices/tablet-search.jpg b/templates/static/img/devices/tablet-search.jpg
deleted file mode 100755
index 516c9303ce4..00000000000
Binary files a/templates/static/img/devices/tablet-search.jpg and /dev/null differ
diff --git a/templates/static/img/devices/tablet-search.png b/templates/static/img/devices/tablet-search.png
deleted file mode 100644
index 29e0aa73acc..00000000000
Binary files a/templates/static/img/devices/tablet-search.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-share-menu.png b/templates/static/img/devices/tablet-share-menu.png
deleted file mode 100755
index 1f4b7d3346c..00000000000
Binary files a/templates/static/img/devices/tablet-share-menu.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-social-apps.jpg b/templates/static/img/devices/tablet-social-apps.jpg
deleted file mode 100755
index 44a906d4208..00000000000
Binary files a/templates/static/img/devices/tablet-social-apps.jpg and /dev/null differ
diff --git a/templates/static/img/devices/tablet-video-screen.png b/templates/static/img/devices/tablet-video-screen.png
deleted file mode 100644
index 01f6cf8f7e4..00000000000
Binary files a/templates/static/img/devices/tablet-video-screen.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-voice-control-HUD.png b/templates/static/img/devices/tablet-voice-control-HUD.png
deleted file mode 100644
index 47480ed87ce..00000000000
Binary files a/templates/static/img/devices/tablet-voice-control-HUD.png and /dev/null differ
diff --git a/templates/static/img/devices/tablet-world-of-apps.jpg b/templates/static/img/devices/tablet-world-of-apps.jpg
deleted file mode 100755
index 8348bbe3660..00000000000
Binary files a/templates/static/img/devices/tablet-world-of-apps.jpg and /dev/null differ
diff --git a/templates/static/img/devices/telephony-app-icon.png b/templates/static/img/devices/telephony-app-icon.png
deleted file mode 100755
index 88285d7c473..00000000000
Binary files a/templates/static/img/devices/telephony-app-icon.png and /dev/null differ
diff --git a/templates/static/img/devices/telephony-phone.png b/templates/static/img/devices/telephony-phone.png
deleted file mode 100755
index ff5916990a3..00000000000
Binary files a/templates/static/img/devices/telephony-phone.png and /dev/null differ
diff --git a/templates/static/img/devices/ubuntuone-app-icon.png b/templates/static/img/devices/ubuntuone-app-icon.png
deleted file mode 100755
index e652db7c641..00000000000
Binary files a/templates/static/img/devices/ubuntuone-app-icon.png and /dev/null differ
diff --git a/templates/static/img/download/U2.2.2_03_medium.jpg b/templates/static/img/download/U2.2.2_03_medium.jpg
deleted file mode 100755
index edc05e9136e..00000000000
Binary files a/templates/static/img/download/U2.2.2_03_medium.jpg and /dev/null differ
diff --git a/templates/static/img/download/U2.2.2_07_medium.jpg b/templates/static/img/download/U2.2.2_07_medium.jpg
deleted file mode 100755
index 1fe684e17b7..00000000000
Binary files a/templates/static/img/download/U2.2.2_07_medium.jpg and /dev/null differ
diff --git a/templates/static/img/download/ask-ubuntu.png b/templates/static/img/download/ask-ubuntu.png
deleted file mode 100644
index 603b2b1d3d9..00000000000
Binary files a/templates/static/img/download/ask-ubuntu.png and /dev/null differ
diff --git a/templates/static/img/download/burn-cd-mac-1-12.10.png b/templates/static/img/download/burn-cd-mac-1-12.10.png
deleted file mode 100755
index e9d47717a8b..00000000000
Binary files a/templates/static/img/download/burn-cd-mac-1-12.10.png and /dev/null differ
diff --git a/templates/static/img/download/burn-cd-mac-1.png b/templates/static/img/download/burn-cd-mac-1.png
deleted file mode 100755
index f0e444fe45f..00000000000
Binary files a/templates/static/img/download/burn-cd-mac-1.png and /dev/null differ
diff --git a/templates/static/img/download/burn-cd-mac-2-12.10.png b/templates/static/img/download/burn-cd-mac-2-12.10.png
deleted file mode 100755
index f608ead00f8..00000000000
Binary files a/templates/static/img/download/burn-cd-mac-2-12.10.png and /dev/null differ
diff --git a/templates/static/img/download/burn-cd-mac-2.png b/templates/static/img/download/burn-cd-mac-2.png
deleted file mode 100755
index c1c414a1f9c..00000000000
Binary files a/templates/static/img/download/burn-cd-mac-2.png and /dev/null differ
diff --git a/templates/static/img/download/burn-cd-ubuntu-1.png b/templates/static/img/download/burn-cd-ubuntu-1.png
deleted file mode 100755
index 077256740bf..00000000000
Binary files a/templates/static/img/download/burn-cd-ubuntu-1.png and /dev/null differ
diff --git a/templates/static/img/download/burn-cd-ubuntu-2-12.10.png b/templates/static/img/download/burn-cd-ubuntu-2-12.10.png
deleted file mode 100755
index c3c7f2ef001..00000000000
Binary files a/templates/static/img/download/burn-cd-ubuntu-2-12.10.png and /dev/null differ
diff --git a/templates/static/img/download/burn-cd-ubuntu-2.png b/templates/static/img/download/burn-cd-ubuntu-2.png
deleted file mode 100755
index 7afddaf09d3..00000000000
Binary files a/templates/static/img/download/burn-cd-ubuntu-2.png and /dev/null differ
diff --git a/templates/static/img/download/burn-cd-ubuntu-3-12.10.png b/templates/static/img/download/burn-cd-ubuntu-3-12.10.png
deleted file mode 100755
index 704ec5666f5..00000000000
Binary files a/templates/static/img/download/burn-cd-ubuntu-3-12.10.png and /dev/null differ
diff --git a/templates/static/img/download/burn-cd-ubuntu-3.png b/templates/static/img/download/burn-cd-ubuntu-3.png
deleted file mode 100755
index beb1876a348..00000000000
Binary files a/templates/static/img/download/burn-cd-ubuntu-3.png and /dev/null differ
diff --git a/templates/static/img/download/burn-cd-windows-1-12.10.png b/templates/static/img/download/burn-cd-windows-1-12.10.png
deleted file mode 100755
index 7096e603791..00000000000
Binary files a/templates/static/img/download/burn-cd-windows-1-12.10.png and /dev/null differ
diff --git a/templates/static/img/download/burn-cd-windows-2-12.10.png b/templates/static/img/download/burn-cd-windows-2-12.10.png
deleted file mode 100755
index 6c15774e65b..00000000000
Binary files a/templates/static/img/download/burn-cd-windows-2-12.10.png and /dev/null differ
diff --git a/templates/static/img/download/burn-cd-windows-2.png b/templates/static/img/download/burn-cd-windows-2.png
deleted file mode 100755
index bc4a70bab8e..00000000000
Binary files a/templates/static/img/download/burn-cd-windows-2.png and /dev/null differ
diff --git a/templates/static/img/download/cd_windows_01_medium.jpg b/templates/static/img/download/cd_windows_01_medium.jpg
deleted file mode 100755
index 3b7ec139a87..00000000000
Binary files a/templates/static/img/download/cd_windows_01_medium.jpg and /dev/null differ
diff --git a/templates/static/img/download/cloud-jumpstart.png b/templates/static/img/download/cloud-jumpstart.png
deleted file mode 100644
index 91479086cf4..00000000000
Binary files a/templates/static/img/download/cloud-jumpstart.png and /dev/null differ
diff --git a/templates/static/img/download/complete.jpg b/templates/static/img/download/complete.jpg
deleted file mode 100755
index f02f57810f3..00000000000
Binary files a/templates/static/img/download/complete.jpg and /dev/null differ
diff --git a/templates/static/img/download/create-usb-stick-on-ubuntu-2-12.10.png b/templates/static/img/download/create-usb-stick-on-ubuntu-2-12.10.png
deleted file mode 100755
index 631b8b728f1..00000000000
Binary files a/templates/static/img/download/create-usb-stick-on-ubuntu-2-12.10.png and /dev/null differ
diff --git a/templates/static/img/download/create-usb-stick-on-ubuntu-3-12.10.png b/templates/static/img/download/create-usb-stick-on-ubuntu-3-12.10.png
deleted file mode 100755
index 06084d9fe9f..00000000000
Binary files a/templates/static/img/download/create-usb-stick-on-ubuntu-3-12.10.png and /dev/null differ
diff --git a/templates/static/img/download/create-usb-stick-on-ubuntu-4-12.10.png b/templates/static/img/download/create-usb-stick-on-ubuntu-4-12.10.png
deleted file mode 100755
index e4648138a0c..00000000000
Binary files a/templates/static/img/download/create-usb-stick-on-ubuntu-4-12.10.png and /dev/null differ
diff --git a/templates/static/img/download/create-usb-ubuntu-1.png b/templates/static/img/download/create-usb-ubuntu-1.png
deleted file mode 100755
index afb5ffbd35d..00000000000
Binary files a/templates/static/img/download/create-usb-ubuntu-1.png and /dev/null differ
diff --git a/templates/static/img/download/create-usb-ubuntu-2.png b/templates/static/img/download/create-usb-ubuntu-2.png
deleted file mode 100755
index cbc167bd1e1..00000000000
Binary files a/templates/static/img/download/create-usb-ubuntu-2.png and /dev/null differ
diff --git a/templates/static/img/download/create-usb-ubuntu-3.png b/templates/static/img/download/create-usb-ubuntu-3.png
deleted file mode 100755
index 8850c11aa69..00000000000
Binary files a/templates/static/img/download/create-usb-ubuntu-3.png and /dev/null differ
diff --git a/templates/static/img/download/create-usb-ubuntu-4.png b/templates/static/img/download/create-usb-ubuntu-4.png
deleted file mode 100755
index f431584c507..00000000000
Binary files a/templates/static/img/download/create-usb-ubuntu-4.png and /dev/null differ
diff --git a/templates/static/img/download/create-usb-windows-1-12.10.png b/templates/static/img/download/create-usb-windows-1-12.10.png
deleted file mode 100755
index a4fe38a1170..00000000000
Binary files a/templates/static/img/download/create-usb-windows-1-12.10.png and /dev/null differ
diff --git a/templates/static/img/download/create-usb-windows-1.png b/templates/static/img/download/create-usb-windows-1.png
deleted file mode 100755
index de43efb0929..00000000000
Binary files a/templates/static/img/download/create-usb-windows-1.png and /dev/null differ
diff --git a/templates/static/img/download/create-usb-windows-2-12.10.png b/templates/static/img/download/create-usb-windows-2-12.10.png
deleted file mode 100755
index 51f8c768cb8..00000000000
Binary files a/templates/static/img/download/create-usb-windows-2-12.10.png and /dev/null differ
diff --git a/templates/static/img/download/create-usb-windows-2.png b/templates/static/img/download/create-usb-windows-2.png
deleted file mode 100755
index e2daf6149f9..00000000000
Binary files a/templates/static/img/download/create-usb-windows-2.png and /dev/null differ
diff --git a/templates/static/img/download/create-usb-windows-3.png b/templates/static/img/download/create-usb-windows-3.png
deleted file mode 100755
index 50610d950fe..00000000000
Binary files a/templates/static/img/download/create-usb-windows-3.png and /dev/null differ
diff --git a/templates/static/img/download/create-usb-windows-4-12.10.png b/templates/static/img/download/create-usb-windows-4-12.10.png
deleted file mode 100755
index 21235bc22b6..00000000000
Binary files a/templates/static/img/download/create-usb-windows-4-12.10.png and /dev/null differ
diff --git a/templates/static/img/download/create-usb-windows-4.png b/templates/static/img/download/create-usb-windows-4.png
deleted file mode 100755
index 470670a4c75..00000000000
Binary files a/templates/static/img/download/create-usb-windows-4.png and /dev/null differ
diff --git a/templates/static/img/download/desktop-1204-install-10.jpg b/templates/static/img/download/desktop-1204-install-10.jpg
deleted file mode 100644
index ece9d3815ee..00000000000
Binary files a/templates/static/img/download/desktop-1204-install-10.jpg and /dev/null differ
diff --git a/templates/static/img/download/desktop-1204-install-3.jpg b/templates/static/img/download/desktop-1204-install-3.jpg
deleted file mode 100644
index f11b0921ceb..00000000000
Binary files a/templates/static/img/download/desktop-1204-install-3.jpg and /dev/null differ
diff --git a/templates/static/img/download/desktop-1204-install-4.jpg b/templates/static/img/download/desktop-1204-install-4.jpg
deleted file mode 100644
index 6ad2ee9ca5e..00000000000
Binary files a/templates/static/img/download/desktop-1204-install-4.jpg and /dev/null differ
diff --git a/templates/static/img/download/desktop-1204-install-5.jpg b/templates/static/img/download/desktop-1204-install-5.jpg
deleted file mode 100644
index 33370d67ebf..00000000000
Binary files a/templates/static/img/download/desktop-1204-install-5.jpg and /dev/null differ
diff --git a/templates/static/img/download/desktop-1210-install-keyboa.jpg b/templates/static/img/download/desktop-1210-install-keyboa.jpg
deleted file mode 100644
index 4dd57f091d8..00000000000
Binary files a/templates/static/img/download/desktop-1210-install-keyboa.jpg and /dev/null differ
diff --git a/templates/static/img/download/desktop-1210-install-tea.png b/templates/static/img/download/desktop-1210-install-tea.png
deleted file mode 100644
index 65b46a0e10e..00000000000
Binary files a/templates/static/img/download/desktop-1210-install-tea.png and /dev/null differ
diff --git a/templates/static/img/download/desktop-1210-install-where.jpg b/templates/static/img/download/desktop-1210-install-where.jpg
deleted file mode 100644
index 8b3c6a1a2c3..00000000000
Binary files a/templates/static/img/download/desktop-1210-install-where.jpg and /dev/null differ
diff --git a/templates/static/img/download/desktop-1210-install-who.jpg b/templates/static/img/download/desktop-1210-install-who.jpg
deleted file mode 100644
index b4430bae589..00000000000
Binary files a/templates/static/img/download/desktop-1210-install-who.jpg and /dev/null differ
diff --git a/templates/static/img/download/desktop-1304-install-tea.png b/templates/static/img/download/desktop-1304-install-tea.png
deleted file mode 100644
index 6bc0bf17a40..00000000000
Binary files a/templates/static/img/download/desktop-1304-install-tea.png and /dev/null differ
diff --git a/templates/static/img/download/desktop-1310-install-10.jpg b/templates/static/img/download/desktop-1310-install-10.jpg
deleted file mode 100755
index 83d806adb2c..00000000000
Binary files a/templates/static/img/download/desktop-1310-install-10.jpg and /dev/null differ
diff --git a/templates/static/img/download/desktop-1310-install-3.jpg b/templates/static/img/download/desktop-1310-install-3.jpg
deleted file mode 100755
index f9df22f271e..00000000000
Binary files a/templates/static/img/download/desktop-1310-install-3.jpg and /dev/null differ
diff --git a/templates/static/img/download/desktop-1310-install-4.jpg b/templates/static/img/download/desktop-1310-install-4.jpg
deleted file mode 100755
index 4c527a3043e..00000000000
Binary files a/templates/static/img/download/desktop-1310-install-4.jpg and /dev/null differ
diff --git a/templates/static/img/download/desktop-1310-install-5.jpg b/templates/static/img/download/desktop-1310-install-5.jpg
deleted file mode 100755
index cc15f7a0480..00000000000
Binary files a/templates/static/img/download/desktop-1310-install-5.jpg and /dev/null differ
diff --git a/templates/static/img/download/desktop-1310-install-keyboa.jpg b/templates/static/img/download/desktop-1310-install-keyboa.jpg
deleted file mode 100755
index 4f270dd39ce..00000000000
Binary files a/templates/static/img/download/desktop-1310-install-keyboa.jpg and /dev/null differ
diff --git a/templates/static/img/download/desktop-1310-install-tea.png b/templates/static/img/download/desktop-1310-install-tea.png
deleted file mode 100755
index 6a5eb2e1f1b..00000000000
Binary files a/templates/static/img/download/desktop-1310-install-tea.png and /dev/null differ
diff --git a/templates/static/img/download/desktop-1310-install-ubuntu-one.jpg b/templates/static/img/download/desktop-1310-install-ubuntu-one.jpg
deleted file mode 100755
index 4e8d73f2ac2..00000000000
Binary files a/templates/static/img/download/desktop-1310-install-ubuntu-one.jpg and /dev/null differ
diff --git a/templates/static/img/download/desktop-1310-install-where.jpg b/templates/static/img/download/desktop-1310-install-where.jpg
deleted file mode 100755
index c5936e636fd..00000000000
Binary files a/templates/static/img/download/desktop-1310-install-where.jpg and /dev/null differ
diff --git a/templates/static/img/download/desktop-1310-install-who.jpg b/templates/static/img/download/desktop-1310-install-who.jpg
deleted file mode 100755
index 227b38adb16..00000000000
Binary files a/templates/static/img/download/desktop-1310-install-who.jpg and /dev/null differ
diff --git a/templates/static/img/download/desktop-install-1.png b/templates/static/img/download/desktop-install-1.png
deleted file mode 100755
index 223d9fb8927..00000000000
Binary files a/templates/static/img/download/desktop-install-1.png and /dev/null differ
diff --git a/templates/static/img/download/desktop-install-2.png b/templates/static/img/download/desktop-install-2.png
deleted file mode 100755
index f240d0954c7..00000000000
Binary files a/templates/static/img/download/desktop-install-2.png and /dev/null differ
diff --git a/templates/static/img/download/desktop-install-3.png b/templates/static/img/download/desktop-install-3.png
deleted file mode 100755
index 791f5b4a88c..00000000000
Binary files a/templates/static/img/download/desktop-install-3.png and /dev/null differ
diff --git a/templates/static/img/download/desktop-install-4.png b/templates/static/img/download/desktop-install-4.png
deleted file mode 100755
index 5a93d05ac57..00000000000
Binary files a/templates/static/img/download/desktop-install-4.png and /dev/null differ
diff --git a/templates/static/img/download/desktop-install-5.png b/templates/static/img/download/desktop-install-5.png
deleted file mode 100755
index bb8c185ab8f..00000000000
Binary files a/templates/static/img/download/desktop-install-5.png and /dev/null differ
diff --git a/templates/static/img/download/desktop-install-6.png b/templates/static/img/download/desktop-install-6.png
deleted file mode 100755
index b4e0d1780e1..00000000000
Binary files a/templates/static/img/download/desktop-install-6.png and /dev/null differ
diff --git a/templates/static/img/download/desktop-install-7.png b/templates/static/img/download/desktop-install-7.png
deleted file mode 100755
index 737a8b19319..00000000000
Binary files a/templates/static/img/download/desktop-install-7.png and /dev/null differ
diff --git a/templates/static/img/download/desktop-install-8.png b/templates/static/img/download/desktop-install-8.png
deleted file mode 100755
index 581283c86b2..00000000000
Binary files a/templates/static/img/download/desktop-install-8.png and /dev/null differ
diff --git a/templates/static/img/download/desktop-install-9.png b/templates/static/img/download/desktop-install-9.png
deleted file mode 100755
index 3841daf89c7..00000000000
Binary files a/templates/static/img/download/desktop-install-9.png and /dev/null differ
diff --git a/templates/static/img/download/desktop-update-1-20.10.png b/templates/static/img/download/desktop-update-1-20.10.png
deleted file mode 100644
index a7e31d734bd..00000000000
Binary files a/templates/static/img/download/desktop-update-1-20.10.png and /dev/null differ
diff --git a/templates/static/img/download/desktop-update-2-20.10.png b/templates/static/img/download/desktop-update-2-20.10.png
deleted file mode 100644
index 11470b73ad3..00000000000
Binary files a/templates/static/img/download/desktop-update-2-20.10.png and /dev/null differ
diff --git a/templates/static/img/download/desktop-update-3-20.10.png b/templates/static/img/download/desktop-update-3-20.10.png
deleted file mode 100644
index 3cf1fd5ca8c..00000000000
Binary files a/templates/static/img/download/desktop-update-3-20.10.png and /dev/null differ
diff --git a/templates/static/img/download/firefox.jpg b/templates/static/img/download/firefox.jpg
deleted file mode 100755
index 6d2466dc204..00000000000
Binary files a/templates/static/img/download/firefox.jpg and /dev/null differ
diff --git a/templates/static/img/download/ie.jpg b/templates/static/img/download/ie.jpg
deleted file mode 100755
index 5690f0fb497..00000000000
Binary files a/templates/static/img/download/ie.jpg and /dev/null differ
diff --git a/templates/static/img/download/screen-applications.png b/templates/static/img/download/screen-applications.png
deleted file mode 100755
index b77616e8d91..00000000000
Binary files a/templates/static/img/download/screen-applications.png and /dev/null differ
diff --git a/templates/static/img/download/screen-landscape.png b/templates/static/img/download/screen-landscape.png
deleted file mode 100755
index e0659810e30..00000000000
Binary files a/templates/static/img/download/screen-landscape.png and /dev/null differ
diff --git a/templates/static/img/download/screen-openjdk.png b/templates/static/img/download/screen-openjdk.png
deleted file mode 100755
index ffbb7b69083..00000000000
Binary files a/templates/static/img/download/screen-openjdk.png and /dev/null differ
diff --git a/templates/static/img/download/screen-vmware.png b/templates/static/img/download/screen-vmware.png
deleted file mode 100755
index da19a23734f..00000000000
Binary files a/templates/static/img/download/screen-vmware.png and /dev/null differ
diff --git a/templates/static/img/download/screenshot-desktop-trail-2-444x263.jpg b/templates/static/img/download/screenshot-desktop-trail-2-444x263.jpg
deleted file mode 100755
index 499c8914161..00000000000
Binary files a/templates/static/img/download/screenshot-desktop-trail-2-444x263.jpg and /dev/null differ
diff --git a/templates/static/img/download/screenshot-desktop-trail-2.png b/templates/static/img/download/screenshot-desktop-trail-2.png
deleted file mode 100755
index d585e2cb35d..00000000000
Binary files a/templates/static/img/download/screenshot-desktop-trail-2.png and /dev/null differ
diff --git a/templates/static/img/download/ubuntu-advantage.png b/templates/static/img/download/ubuntu-advantage.png
deleted file mode 100644
index b3f784d68f8..00000000000
Binary files a/templates/static/img/download/ubuntu-advantage.png and /dev/null differ
diff --git a/templates/static/img/download/ubuntu-one.png b/templates/static/img/download/ubuntu-one.png
deleted file mode 100644
index 428c8c10283..00000000000
Binary files a/templates/static/img/download/ubuntu-one.png and /dev/null differ
diff --git a/templates/static/img/download/update-dash.jpg b/templates/static/img/download/update-dash.jpg
deleted file mode 100755
index ca636d9e591..00000000000
Binary files a/templates/static/img/download/update-dash.jpg and /dev/null differ
diff --git a/templates/static/img/download/update-manager.jpg b/templates/static/img/download/update-manager.jpg
deleted file mode 100755
index 79725a57795..00000000000
Binary files a/templates/static/img/download/update-manager.jpg and /dev/null differ
diff --git a/templates/static/img/download/upgrade.jpg b/templates/static/img/download/upgrade.jpg
deleted file mode 100755
index 30de01a7703..00000000000
Binary files a/templates/static/img/download/upgrade.jpg and /dev/null differ
diff --git a/templates/static/img/download/windows-installer-4-12.10.png b/templates/static/img/download/windows-installer-4-12.10.png
deleted file mode 100755
index 227603562ba..00000000000
Binary files a/templates/static/img/download/windows-installer-4-12.10.png and /dev/null differ
diff --git a/templates/static/img/download/windows-installer-4.png b/templates/static/img/download/windows-installer-4.png
deleted file mode 100755
index bc5cdacaf79..00000000000
Binary files a/templates/static/img/download/windows-installer-4.png and /dev/null differ
diff --git a/templates/static/img/download/windows-installer-5-12.10.png b/templates/static/img/download/windows-installer-5-12.10.png
deleted file mode 100755
index 486e739b39d..00000000000
Binary files a/templates/static/img/download/windows-installer-5-12.10.png and /dev/null differ
diff --git a/templates/static/img/download/windows-installer-5.png b/templates/static/img/download/windows-installer-5.png
deleted file mode 100755
index 61aa255f41b..00000000000
Binary files a/templates/static/img/download/windows-installer-5.png and /dev/null differ
diff --git a/templates/static/img/error/error404-hero-full.png b/templates/static/img/error/error404-hero-full.png
deleted file mode 100644
index 319c0dd4e39..00000000000
Binary files a/templates/static/img/error/error404-hero-full.png and /dev/null differ
diff --git a/templates/static/img/error/error404-hero.png b/templates/static/img/error/error404-hero.png
deleted file mode 100644
index 64be8c0dbb1..00000000000
Binary files a/templates/static/img/error/error404-hero.png and /dev/null differ
diff --git a/templates/static/img/error/image-knowledge-365.png b/templates/static/img/error/image-knowledge-365.png
deleted file mode 100644
index 6abb67f3c10..00000000000
Binary files a/templates/static/img/error/image-knowledge-365.png and /dev/null differ
diff --git a/templates/static/img/error/image-knowledge-error-365.png b/templates/static/img/error/image-knowledge-error-365.png
deleted file mode 100644
index 3687ac4adac..00000000000
Binary files a/templates/static/img/error/image-knowledge-error-365.png and /dev/null differ
diff --git a/templates/static/img/error/image-quote-154.png b/templates/static/img/error/image-quote-154.png
deleted file mode 100644
index ad168ec905a..00000000000
Binary files a/templates/static/img/error/image-quote-154.png and /dev/null differ
diff --git a/templates/static/img/external-link-9fa097.svg b/templates/static/img/external-link-9fa097.svg
deleted file mode 100644
index 781ffdc0f88..00000000000
--- a/templates/static/img/external-link-9fa097.svg
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="90"
-   height="90"
-   id="svg3140"
-   version="1.1"
-   inkscape:version="0.48+devel r12585"
-   sodipodi:docname="external-link-9fa097.svg">
-  <defs
-     id="defs3142" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.6077032"
-     inkscape:cx="40.342015"
-     inkscape:cy="41.108902"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4978"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1029"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     showguides="false"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:object-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3178"
-       empspacing="6"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0px"
-       originy="-1.7382813e-05px" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3145">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-962.36218)">
-    <rect
-       style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect4198"
-       width="90"
-       height="90"
-       x="0"
-       y="962.36218" />
-    <g
-       id="g4978"
-       transform="translate(-60,548.00002)">
-      <path
-         style="fill:#9fa097;fill-opacity:1"
-         d="M 33 13.011719 C 8.9936146 13.041401 6 13.746598 6 31 L 6 67 C 6 85 9 85 36 85 L 48 85 C 75 85 78 85 78 67 L 78 58 L 69 58 L 69 64 C 69 76 69 76 45 76 L 39 76 C 15 76 15 76 15 64 L 15 34 C 15 23.136095 15.191578 22.114954 33 22.017578 L 33 13.011719 z "
-         transform="translate(60,414.36216)"
-         id="path3759" />
-      <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect3045"
-         width="90"
-         height="90"
-         x="0"
-         y="1.7382814e-05"
-         transform="translate(60,414.36216)" />
-      <path
-         sodipodi:type="star"
-         style="color:#000000;fill:#9fa097;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path4984-3"
-         sodipodi:sides="3"
-         sodipodi:cx="111"
-         sodipodi:cy="174.09448"
-         sodipodi:r1="5.8309517"
-         sodipodi:r2="2.9154758"
-         sodipodi:arg1="1.0471976"
-         sodipodi:arg2="2.0943951"
-         inkscape:flatsided="true"
-         inkscape:rounded="0.06"
-         inkscape:randomized="0"
-         d="m 113.91548,179.14423 c -0.52479,0.30299 -8.74643,-4.44378 -8.74643,-5.04975 0,-0.60597 8.22164,-5.35273 8.74643,-5.04975 0.52478,0.30299 0.52478,9.79652 0,10.0995 z"
-         transform="matrix(-2.9934635,2.9934635,-3.1108986,-3.1108989,1000.1718,648.37103)"
-         inkscape:transform-center-y="5.2240217"
-         inkscape:transform-center-x="5.2240132"
-         xml:space="default" />
-      <path
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#9fa097;fill-opacity:1;stroke:none;stroke-width:9;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         d="m 116.42642,438.99503 -24.340002,24.33999 9.940732,9.94073 24.34,-24.34 z"
-         id="path3789"
-         inkscape:connector-curvature="0"
-         xml:space="default"
-         sodipodi:nodetypes="ccccc" />
-    </g>
-  </g>
-</svg>
diff --git a/templates/static/img/external-link-orange.png b/templates/static/img/external-link-orange.png
deleted file mode 100755
index 8ab560de3ae..00000000000
Binary files a/templates/static/img/external-link-orange.png and /dev/null differ
diff --git a/templates/static/img/external-link-orange.svg b/templates/static/img/external-link-orange.svg
deleted file mode 100755
index de5c0cdf5dd..00000000000
--- a/templates/static/img/external-link-orange.svg
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="90"
-   height="90"
-   id="svg3140"
-   version="1.1"
-   inkscape:version="0.48+devel r12585"
-   sodipodi:docname="external-link-orange.svg">
-  <defs
-     id="defs3142" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.6077032"
-     inkscape:cx="40.342015"
-     inkscape:cy="41.108902"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4978"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1029"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     showguides="false"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:object-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3178"
-       empspacing="6"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0px"
-       originy="-1.7382813e-05px" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3145">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-962.36218)">
-    <rect
-       style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect4198"
-       width="90"
-       height="90"
-       x="0"
-       y="962.36218" />
-    <g
-       id="g4978"
-       transform="translate(-60,548.00002)">
-      <path
-         style="fill:#dd4814;fill-opacity:1"
-         d="M 33 13.011719 C 8.9936146 13.041401 6 13.746598 6 31 L 6 67 C 6 85 9 85 36 85 L 48 85 C 75 85 78 85 78 67 L 78 58 L 69 58 L 69 64 C 69 76 69 76 45 76 L 39 76 C 15 76 15 76 15 64 L 15 34 C 15 23.136095 15.191578 22.114954 33 22.017578 L 33 13.011719 z "
-         transform="translate(60,414.36216)"
-         id="path3759" />
-      <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect3045"
-         width="90"
-         height="90"
-         x="0"
-         y="1.7382814e-05"
-         transform="translate(60,414.36216)" />
-      <path
-         sodipodi:type="star"
-         style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path4984-3"
-         sodipodi:sides="3"
-         sodipodi:cx="111"
-         sodipodi:cy="174.09448"
-         sodipodi:r1="5.8309517"
-         sodipodi:r2="2.9154758"
-         sodipodi:arg1="1.0471976"
-         sodipodi:arg2="2.0943951"
-         inkscape:flatsided="true"
-         inkscape:rounded="0.06"
-         inkscape:randomized="0"
-         d="m 113.91548,179.14423 c -0.52479,0.30299 -8.74643,-4.44378 -8.74643,-5.04975 0,-0.60597 8.22164,-5.35273 8.74643,-5.04975 0.52478,0.30299 0.52478,9.79652 0,10.0995 z"
-         transform="matrix(-2.9934635,2.9934635,-3.1108986,-3.1108989,1000.1718,648.37103)"
-         inkscape:transform-center-y="5.2240217"
-         inkscape:transform-center-x="5.2240132"
-         xml:space="default" />
-      <path
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#dd4814;fill-opacity:1;stroke:none;stroke-width:9;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         d="m 116.42642,438.99503 -24.340002,24.33999 9.940732,9.94073 24.34,-24.34 z"
-         id="path3789"
-         inkscape:connector-curvature="0"
-         xml:space="default"
-         sodipodi:nodetypes="ccccc" />
-    </g>
-  </g>
-</svg>
diff --git a/templates/static/img/external-link.png b/templates/static/img/external-link.png
deleted file mode 100755
index 5d515c3dd70..00000000000
Binary files a/templates/static/img/external-link.png and /dev/null differ
diff --git a/templates/static/img/external-link.svg b/templates/static/img/external-link.svg
deleted file mode 100755
index 70274e51c9b..00000000000
--- a/templates/static/img/external-link.svg
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="90"
-   height="90"
-   id="svg3140"
-   version="1.1"
-   inkscape:version="0.48+devel r12585"
-   sodipodi:docname="external-link.svg">
-  <defs
-     id="defs3142" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.6077032"
-     inkscape:cx="40.342015"
-     inkscape:cy="41.108902"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4978"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1029"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     showguides="false"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:object-paths="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3178"
-       empspacing="6"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0px"
-       originy="-1.7382813e-05px" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3145">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-962.36218)">
-    <rect
-       style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect4198"
-       width="90"
-       height="90"
-       x="0"
-       y="962.36218" />
-    <g
-       id="g4978"
-       transform="translate(-60,548.00002)">
-      <path
-         style="fill:#808080;fill-opacity:1"
-         d="M 33 13.011719 C 8.9936146 13.041401 6 13.746598 6 31 L 6 67 C 6 85 9 85 36 85 L 48 85 C 75 85 78 85 78 67 L 78 58 L 69 58 L 69 64 C 69 76 69 76 45 76 L 39 76 C 15 76 15 76 15 64 L 15 34 C 15 23.136095 15.191578 22.114954 33 22.017578 L 33 13.011719 z "
-         transform="translate(60,414.36216)"
-         id="path3759" />
-      <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect3045"
-         width="90"
-         height="90"
-         x="0"
-         y="1.7382814e-05"
-         transform="translate(60,414.36216)" />
-      <path
-         sodipodi:type="star"
-         style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path4984-3"
-         sodipodi:sides="3"
-         sodipodi:cx="111"
-         sodipodi:cy="174.09448"
-         sodipodi:r1="5.8309517"
-         sodipodi:r2="2.9154758"
-         sodipodi:arg1="1.0471976"
-         sodipodi:arg2="2.0943951"
-         inkscape:flatsided="true"
-         inkscape:rounded="0.06"
-         inkscape:randomized="0"
-         d="m 113.91548,179.14423 c -0.52479,0.30299 -8.74643,-4.44378 -8.74643,-5.04975 0,-0.60597 8.22164,-5.35273 8.74643,-5.04975 0.52478,0.30299 0.52478,9.79652 0,10.0995 z"
-         transform="matrix(-2.9934635,2.9934635,-3.1108986,-3.1108989,1000.1718,648.37103)"
-         inkscape:transform-center-y="5.2240217"
-         inkscape:transform-center-x="5.2240132"
-         xml:space="default" />
-      <path
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#808080;fill-opacity:1;stroke:none;stroke-width:9;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         d="m 116.42642,438.99503 -24.340002,24.33999 9.940732,9.94073 24.34,-24.34 z"
-         id="path3789"
-         inkscape:connector-curvature="0"
-         xml:space="default"
-         sodipodi:nodetypes="ccccc" />
-    </g>
-  </g>
-</svg>
diff --git a/templates/static/img/favicon.gif b/templates/static/img/favicon.gif
deleted file mode 100644
index a1713c36771..00000000000
Binary files a/templates/static/img/favicon.gif and /dev/null differ
diff --git a/templates/static/img/favicon.ico b/templates/static/img/favicon.ico
deleted file mode 100644
index 136b443228b..00000000000
Binary files a/templates/static/img/favicon.ico and /dev/null differ
diff --git a/templates/static/img/favicon.jpg b/templates/static/img/favicon.jpg
deleted file mode 100644
index e5fab16ff66..00000000000
Binary files a/templates/static/img/favicon.jpg and /dev/null differ
diff --git a/templates/static/img/favicon.png b/templates/static/img/favicon.png
deleted file mode 100644
index f21b89a350c..00000000000
Binary files a/templates/static/img/favicon.png and /dev/null differ
diff --git a/templates/static/img/fieldsets-1.png b/templates/static/img/fieldsets-1.png
deleted file mode 100644
index be9212e0c7b..00000000000
Binary files a/templates/static/img/fieldsets-1.png and /dev/null differ
diff --git a/templates/static/img/fieldsets-2.png b/templates/static/img/fieldsets-2.png
deleted file mode 100644
index 4f913611064..00000000000
Binary files a/templates/static/img/fieldsets-2.png and /dev/null differ
diff --git a/templates/static/img/fieldsets-3.png b/templates/static/img/fieldsets-3.png
deleted file mode 100644
index 1e4a2cf0e24..00000000000
Binary files a/templates/static/img/fieldsets-3.png and /dev/null differ
diff --git a/templates/static/img/fieldsets-4.png b/templates/static/img/fieldsets-4.png
deleted file mode 100644
index 78059ac5dc9..00000000000
Binary files a/templates/static/img/fieldsets-4.png and /dev/null differ
diff --git a/templates/static/img/googleplus.svg b/templates/static/img/googleplus.svg
deleted file mode 100755
index 18954dc3f68..00000000000
--- a/templates/static/img/googleplus.svg
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Google_x2B_"
-   x="0px"
-   y="0px"
-   width="90"
-   height="90"
-   viewBox="0 0 90.000003 90"
-   enable-background="new 0 0 266.667 267"
-   xml:space="preserve"
-   inkscape:version="0.48+devel r12585"
-   sodipodi:docname="googleplus-symbolic.svg"><metadata
-     id="metadata24"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs22" /><sodipodi:namedview
-     pagecolor="#808080"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview20"
-     showgrid="false"
-     inkscape:zoom="5.0214782"
-     inkscape:cx="35.94559"
-     inkscape:cy="28.504575"
-     inkscape:current-layer="Google_x2B_" /><g
-     id="g3"
-     xml:space="preserve"
-     transform="translate(0,-177.00001)"><linearGradient
-       id="SVGID_1_"
-       gradientUnits="userSpaceOnUse"
-       x1="-402.66751"
-       y1="-20.6665"
-       x2="-402.66751"
-       y2="55.3335"
-       gradientTransform="matrix(1,0,0,-1,244,322)"
-       xml:space="preserve"><stop
-         offset="0"
-         style="stop-color:#7D2617"
-         id="stop6" /><stop
-         offset="1"
-         style="stop-color:#BF3B27"
-         id="stop8" /></linearGradient><path
-       display="none"
-       d="m -125.667,342.667 -65.289,0 c -2.979,0 -5.711,-2.748 -5.711,-5.726 l 0,-64.777 c 0,-2.979 2.732,-5.497 5.711,-5.497 l 64.736,0 c 2.98,0 5.553,2.521 5.553,5.497 l 0,65.503 c 0,2.977 -2.02,5 -5,5 z m -65.289,-75 c -2.752,0 -4.711,1.745 -4.711,4.497 l 0,64.777 c 0,2.753 1.959,4.726 4.711,4.726 l 64.289,0 c 3,0 5,-2 5,-5 l 0,-64.503 c 0,-2.752 -1.798,-4.497 -4.553,-4.497 l -64.736,0 0,0 z"
-       id="path10"
-       inkscape:connector-curvature="0"
-       xml:space="preserve"
-       style="fill:url(#SVGID_1_);display:none" /></g><path
-     style="fill:#808080;fill-opacity:1"
-     d="M 36 6 C 11.647713 6 6.8339176 6.0470193 6.1210938 19.253906 C 6.3603757 19.028533 6.611254 18.794305 6.8535156 18.585938 C 13.333725 13.221694 20.444661 12.325571 26.40625 12.214844 L 50.431641 12.214844 L 44.050781 17.365234 L 37.083984 17.365234 C 39.874897 19.784755 44.039063 24.110152 44.039062 31.816406 C 44.039062 40.257646 39.589469 44.258268 34.814453 48.017578 C 33.336998 49.49772 31.632813 51.099493 31.632812 53.613281 C 31.632812 56.120186 33.338017 57.48872 34.585938 58.517578 L 38.681641 61.705078 C 43.681701 65.928841 50.216797 70.819219 50.216797 78.693359 C 50.216797 80.675712 50.003756 82.461563 49.410156 84 L 54 84 C 81 84 84 84 84 66 L 84 32.683594 L 69.783203 32.683594 L 69.783203 47.226562 L 63.603516 47.226562 L 63.603516 32.683594 L 49.1875 32.683594 L 49.1875 26.632812 L 63.603516 26.632812 L 63.603516 12.214844 L 69.783203 12.214844 L 69.783203 26.632812 L 84 26.632812 L 84 24 C 84 6.0000003 81 6 54 6 L 45 6 L 36 6 z M 20.576172 16.072266 C 17.617374 16.072266 14.439389 17.55603 12.617188 19.837891 C 10.684258 22.235267 10.384766 25.310648 10.384766 28.283203 C 10.384766 35.923921 14.398311 47.226563 24.175781 47.226562 C 27.015773 47.226562 29.929798 46.505278 31.800781 44.373047 C 33.933618 41.929286 34.769531 38.711441 34.769531 37.066406 C 34.769531 28.850511 30.006801 16.072266 20.576172 16.072266 z M 6 47.275391 L 6 66 C 6 66.488979 6.0127294 66.91418 6.0175781 67.376953 C 11.178251 63.328025 20.035938 64.055453 24.359375 63.763672 C 22.765209 61.706256 20.949219 59.54148 20.949219 56.007812 C 20.949219 54.067708 21.516584 52.925299 22.083984 51.554688 C 20.831276 51.66631 19.586854 51.783203 18.447266 51.783203 C 13.322147 51.783203 9.1106496 49.840597 6 47.275391 z M 25.615234 66.957031 C 24.58757 66.957031 18.447349 67.186207 13.673828 68.785156 C 12.123971 69.351666 8.7121264 70.675084 6.359375 73.5 C 7.6681932 83.95983 13.468966 84 36 84 L 42.75 84 C 42.920299 83.56514 43.132812 83.166452 43.123047 82.240234 C 43.058707 76.410343 36.865171 73.23974 28.220703 67.076172 C 27.314539 66.957964 26.745545 66.957031 25.615234 66.957031 z "
-     transform="translate(0,-1.5e-6)"
-     id="path14" /></svg>
\ No newline at end of file
diff --git a/templates/static/img/header_bg.png b/templates/static/img/header_bg.png
deleted file mode 100644
index 96902c504f0..00000000000
Binary files a/templates/static/img/header_bg.png and /dev/null differ
diff --git a/templates/static/img/header_bg_active.png b/templates/static/img/header_bg_active.png
deleted file mode 100644
index b7a414b3b5e..00000000000
Binary files a/templates/static/img/header_bg_active.png and /dev/null differ
diff --git a/templates/static/img/homepage/1015e-takeover.jpg b/templates/static/img/homepage/1015e-takeover.jpg
deleted file mode 100644
index 75d20ec8dec..00000000000
Binary files a/templates/static/img/homepage/1015e-takeover.jpg and /dev/null differ
diff --git a/templates/static/img/homepage/1304-takeover-laptop.png b/templates/static/img/homepage/1304-takeover-laptop.png
deleted file mode 100644
index ac2ea099ed4..00000000000
Binary files a/templates/static/img/homepage/1304-takeover-laptop.png and /dev/null differ
diff --git a/templates/static/img/homepage/22032013.jpg b/templates/static/img/homepage/22032013.jpg
deleted file mode 100644
index 60bf0b30d73..00000000000
Binary files a/templates/static/img/homepage/22032013.jpg and /dev/null differ
diff --git a/templates/static/img/homepage/2_1_generic.jpg b/templates/static/img/homepage/2_1_generic.jpg
deleted file mode 100644
index 1a697dd4117..00000000000
Binary files a/templates/static/img/homepage/2_1_generic.jpg and /dev/null differ
diff --git a/templates/static/img/homepage/2_2_generic.jpg b/templates/static/img/homepage/2_2_generic.jpg
deleted file mode 100644
index 9cd7350de9a..00000000000
Binary files a/templates/static/img/homepage/2_2_generic.jpg and /dev/null differ
diff --git a/templates/static/img/homepage/2_3_generic.jpg b/templates/static/img/homepage/2_3_generic.jpg
deleted file mode 100644
index ec70e4fbd34..00000000000
Binary files a/templates/static/img/homepage/2_3_generic.jpg and /dev/null differ
diff --git a/templates/static/img/homepage/3_end.jpg b/templates/static/img/homepage/3_end.jpg
deleted file mode 100644
index 758e1a6db5b..00000000000
Binary files a/templates/static/img/homepage/3_end.jpg and /dev/null differ
diff --git a/templates/static/img/homepage/3_special.jpg b/templates/static/img/homepage/3_special.jpg
deleted file mode 100644
index decc42d104b..00000000000
Binary files a/templates/static/img/homepage/3_special.jpg and /dev/null differ
diff --git a/templates/static/img/homepage/3_special.png b/templates/static/img/homepage/3_special.png
deleted file mode 100644
index bfaa720862c..00000000000
Binary files a/templates/static/img/homepage/3_special.png and /dev/null differ
diff --git a/templates/static/img/homepage/Cloud-survey-Takeover-03a.png b/templates/static/img/homepage/Cloud-survey-Takeover-03a.png
deleted file mode 100644
index 963245d70dd..00000000000
Binary files a/templates/static/img/homepage/Cloud-survey-Takeover-03a.png and /dev/null differ
diff --git a/templates/static/img/homepage/Xmas-shopping-02.png b/templates/static/img/homepage/Xmas-shopping-02.png
deleted file mode 100644
index 0f5426711ef..00000000000
Binary files a/templates/static/img/homepage/Xmas-shopping-02.png and /dev/null differ
diff --git a/templates/static/img/homepage/asus-1015e-takeover.jpg b/templates/static/img/homepage/asus-1015e-takeover.jpg
deleted file mode 100644
index f2c624ef9f8..00000000000
Binary files a/templates/static/img/homepage/asus-1015e-takeover.jpg and /dev/null differ
diff --git a/templates/static/img/homepage/asus_takeover.png b/templates/static/img/homepage/asus_takeover.png
deleted file mode 100644
index 15129c95fb8..00000000000
Binary files a/templates/static/img/homepage/asus_takeover.png and /dev/null differ
diff --git a/templates/static/img/homepage/bg_days.png b/templates/static/img/homepage/bg_days.png
deleted file mode 100644
index 1e6c68183e8..00000000000
Binary files a/templates/static/img/homepage/bg_days.png and /dev/null differ
diff --git a/templates/static/img/homepage/cesg-graph.png b/templates/static/img/homepage/cesg-graph.png
deleted file mode 100644
index 26ebfc9b584..00000000000
Binary files a/templates/static/img/homepage/cesg-graph.png and /dev/null differ
diff --git a/templates/static/img/homepage/charm/icon-juju-logo.png b/templates/static/img/homepage/charm/icon-juju-logo.png
deleted file mode 100644
index e3628b917e1..00000000000
Binary files a/templates/static/img/homepage/charm/icon-juju-logo.png and /dev/null differ
diff --git a/templates/static/img/homepage/charm/image-juju-charms.png b/templates/static/img/homepage/charm/image-juju-charms.png
deleted file mode 100644
index a55ecb0445e..00000000000
Binary files a/templates/static/img/homepage/charm/image-juju-charms.png and /dev/null differ
diff --git a/templates/static/img/homepage/charm/juju-main.png b/templates/static/img/homepage/charm/juju-main.png
deleted file mode 100644
index abc1c0154e0..00000000000
Binary files a/templates/static/img/homepage/charm/juju-main.png and /dev/null differ
diff --git a/templates/static/img/homepage/charm/juju_bg.png b/templates/static/img/homepage/charm/juju_bg.png
deleted file mode 100644
index 1d7c4ad20be..00000000000
Binary files a/templates/static/img/homepage/charm/juju_bg.png and /dev/null differ
diff --git a/templates/static/img/homepage/cloud-survey.png b/templates/static/img/homepage/cloud-survey.png
deleted file mode 100644
index acef12eccde..00000000000
Binary files a/templates/static/img/homepage/cloud-survey.png and /dev/null differ
diff --git a/templates/static/img/homepage/cnet-award-phone-tablet.png b/templates/static/img/homepage/cnet-award-phone-tablet.png
deleted file mode 100644
index e45e752fbcc..00000000000
Binary files a/templates/static/img/homepage/cnet-award-phone-tablet.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/_1.png b/templates/static/img/homepage/countdown/_1.png
deleted file mode 100755
index 1092b9df413..00000000000
Binary files a/templates/static/img/homepage/countdown/_1.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/_10.png b/templates/static/img/homepage/countdown/_10.png
deleted file mode 100755
index c2eaefaff54..00000000000
Binary files a/templates/static/img/homepage/countdown/_10.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/_11.png b/templates/static/img/homepage/countdown/_11.png
deleted file mode 100755
index 7a96efa9194..00000000000
Binary files a/templates/static/img/homepage/countdown/_11.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/_12.png b/templates/static/img/homepage/countdown/_12.png
deleted file mode 100755
index 2579986bb8e..00000000000
Binary files a/templates/static/img/homepage/countdown/_12.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/_13.png b/templates/static/img/homepage/countdown/_13.png
deleted file mode 100755
index 5bab14ee6d6..00000000000
Binary files a/templates/static/img/homepage/countdown/_13.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/_14.png b/templates/static/img/homepage/countdown/_14.png
deleted file mode 100755
index 594c3b7bf04..00000000000
Binary files a/templates/static/img/homepage/countdown/_14.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/_15.png b/templates/static/img/homepage/countdown/_15.png
deleted file mode 100755
index fac6219db5b..00000000000
Binary files a/templates/static/img/homepage/countdown/_15.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/_16.png b/templates/static/img/homepage/countdown/_16.png
deleted file mode 100755
index 3e8a9455fea..00000000000
Binary files a/templates/static/img/homepage/countdown/_16.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/_17.png b/templates/static/img/homepage/countdown/_17.png
deleted file mode 100755
index f5aca227eb6..00000000000
Binary files a/templates/static/img/homepage/countdown/_17.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/_18.png b/templates/static/img/homepage/countdown/_18.png
deleted file mode 100755
index 51acb2b0223..00000000000
Binary files a/templates/static/img/homepage/countdown/_18.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/_19.png b/templates/static/img/homepage/countdown/_19.png
deleted file mode 100755
index 3e8faf9cdf6..00000000000
Binary files a/templates/static/img/homepage/countdown/_19.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/_2.png b/templates/static/img/homepage/countdown/_2.png
deleted file mode 100755
index 892ca0a7f4e..00000000000
Binary files a/templates/static/img/homepage/countdown/_2.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/_3.png b/templates/static/img/homepage/countdown/_3.png
deleted file mode 100755
index e2961f7ba2a..00000000000
Binary files a/templates/static/img/homepage/countdown/_3.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/_4.png b/templates/static/img/homepage/countdown/_4.png
deleted file mode 100755
index a85745d5a8e..00000000000
Binary files a/templates/static/img/homepage/countdown/_4.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/_5.png b/templates/static/img/homepage/countdown/_5.png
deleted file mode 100755
index b2fbbd14df6..00000000000
Binary files a/templates/static/img/homepage/countdown/_5.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/_6.png b/templates/static/img/homepage/countdown/_6.png
deleted file mode 100755
index 8b465468516..00000000000
Binary files a/templates/static/img/homepage/countdown/_6.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/_7.png b/templates/static/img/homepage/countdown/_7.png
deleted file mode 100755
index 69f0264f391..00000000000
Binary files a/templates/static/img/homepage/countdown/_7.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/_8.png b/templates/static/img/homepage/countdown/_8.png
deleted file mode 100755
index a8b997a37ad..00000000000
Binary files a/templates/static/img/homepage/countdown/_8.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/_9.png b/templates/static/img/homepage/countdown/_9.png
deleted file mode 100755
index 0fda5eb8fe0..00000000000
Binary files a/templates/static/img/homepage/countdown/_9.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/countdown-bg.jpg b/templates/static/img/homepage/countdown/countdown-bg.jpg
deleted file mode 100755
index c1f26557ef9..00000000000
Binary files a/templates/static/img/homepage/countdown/countdown-bg.jpg and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/countdown-circle.png b/templates/static/img/homepage/countdown/countdown-circle.png
deleted file mode 100755
index 81b93254754..00000000000
Binary files a/templates/static/img/homepage/countdown/countdown-circle.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/homepage-countdown-bg.png b/templates/static/img/homepage/countdown/homepage-countdown-bg.png
deleted file mode 100644
index 6f586483826..00000000000
Binary files a/templates/static/img/homepage/countdown/homepage-countdown-bg.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/homepage-countdown-centre.png b/templates/static/img/homepage/countdown/homepage-countdown-centre.png
deleted file mode 100644
index 6c90255a140..00000000000
Binary files a/templates/static/img/homepage/countdown/homepage-countdown-centre.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/spinner-white.png b/templates/static/img/homepage/countdown/spinner-white.png
deleted file mode 100644
index f05179869bf..00000000000
Binary files a/templates/static/img/homepage/countdown/spinner-white.png and /dev/null differ
diff --git a/templates/static/img/homepage/countdown/spinning-white.gif b/templates/static/img/homepage/countdown/spinning-white.gif
deleted file mode 100644
index 52edaeaef00..00000000000
Binary files a/templates/static/img/homepage/countdown/spinning-white.gif and /dev/null differ
diff --git a/templates/static/img/homepage/dell_servers.png b/templates/static/img/homepage/dell_servers.png
deleted file mode 100644
index f5829f9e0ce..00000000000
Binary files a/templates/static/img/homepage/dell_servers.png and /dev/null differ
diff --git a/templates/static/img/homepage/dell_sputnik.png b/templates/static/img/homepage/dell_sputnik.png
deleted file mode 100644
index 78b222f378b..00000000000
Binary files a/templates/static/img/homepage/dell_sputnik.png and /dev/null differ
diff --git a/templates/static/img/homepage/dell_sputnik_large.png b/templates/static/img/homepage/dell_sputnik_large.png
deleted file mode 100644
index b4a5547f7cd..00000000000
Binary files a/templates/static/img/homepage/dell_sputnik_large.png and /dev/null differ
diff --git a/templates/static/img/homepage/edge-logo.png b/templates/static/img/homepage/edge-logo.png
deleted file mode 100644
index 375465f2511..00000000000
Binary files a/templates/static/img/homepage/edge-logo.png and /dev/null differ
diff --git a/templates/static/img/homepage/hand-illustration.png b/templates/static/img/homepage/hand-illustration.png
deleted file mode 100644
index 0e519245ff6..00000000000
Binary files a/templates/static/img/homepage/hand-illustration.png and /dev/null differ
diff --git a/templates/static/img/homepage/hero-landscape-screenshot-small.png b/templates/static/img/homepage/hero-landscape-screenshot-small.png
deleted file mode 100644
index 2c9a0b6e49b..00000000000
Binary files a/templates/static/img/homepage/hero-landscape-screenshot-small.png and /dev/null differ
diff --git a/templates/static/img/homepage/hero-landscape-screenshot.png b/templates/static/img/homepage/hero-landscape-screenshot.png
deleted file mode 100644
index 03e871781e7..00000000000
Binary files a/templates/static/img/homepage/hero-landscape-screenshot.png and /dev/null differ
diff --git a/templates/static/img/homepage/home-bkg.gif b/templates/static/img/homepage/home-bkg.gif
deleted file mode 100644
index 0966eb1b765..00000000000
Binary files a/templates/static/img/homepage/home-bkg.gif and /dev/null differ
diff --git a/templates/static/img/homepage/homepage-12.10-launch-hero-small.png b/templates/static/img/homepage/homepage-12.10-launch-hero-small.png
deleted file mode 100644
index 80fb9b4f543..00000000000
Binary files a/templates/static/img/homepage/homepage-12.10-launch-hero-small.png and /dev/null differ
diff --git a/templates/static/img/homepage/homepage-12.10-launch-ubuntu.png b/templates/static/img/homepage/homepage-12.10-launch-ubuntu.png
deleted file mode 100644
index aca6f4a2e45..00000000000
Binary files a/templates/static/img/homepage/homepage-12.10-launch-ubuntu.png and /dev/null differ
diff --git a/templates/static/img/homepage/homepage-1204-background-laptop.png b/templates/static/img/homepage/homepage-1204-background-laptop.png
deleted file mode 100644
index d4bf44614f8..00000000000
Binary files a/templates/static/img/homepage/homepage-1204-background-laptop.png and /dev/null differ
diff --git a/templates/static/img/homepage/homepage-cag-takeover.jpg b/templates/static/img/homepage/homepage-cag-takeover.jpg
deleted file mode 100644
index 0b28165205a..00000000000
Binary files a/templates/static/img/homepage/homepage-cag-takeover.jpg and /dev/null differ
diff --git a/templates/static/img/homepage/homepage-cag-takeover.png b/templates/static/img/homepage/homepage-cag-takeover.png
deleted file mode 100644
index bc781e73df3..00000000000
Binary files a/templates/static/img/homepage/homepage-cag-takeover.png and /dev/null differ
diff --git a/templates/static/img/homepage/homepage-webinars.png b/templates/static/img/homepage/homepage-webinars.png
deleted file mode 100644
index daacaeac7db..00000000000
Binary files a/templates/static/img/homepage/homepage-webinars.png and /dev/null differ
diff --git a/templates/static/img/homepage/homepage-xmas-shop.jpg b/templates/static/img/homepage/homepage-xmas-shop.jpg
deleted file mode 100644
index 0ccbc5d54c8..00000000000
Binary files a/templates/static/img/homepage/homepage-xmas-shop.jpg and /dev/null differ
diff --git a/templates/static/img/homepage/hp_takeover_130213.png b/templates/static/img/homepage/hp_takeover_130213.png
deleted file mode 100644
index c77cc200789..00000000000
Binary files a/templates/static/img/homepage/hp_takeover_130213.png and /dev/null differ
diff --git a/templates/static/img/homepage/hpemea-takeover.png b/templates/static/img/homepage/hpemea-takeover.png
deleted file mode 100644
index 2cda914bf31..00000000000
Binary files a/templates/static/img/homepage/hpemea-takeover.png and /dev/null differ
diff --git a/templates/static/img/homepage/humble-bundle/amnesia.png b/templates/static/img/homepage/humble-bundle/amnesia.png
deleted file mode 100644
index e6e1a5770b2..00000000000
Binary files a/templates/static/img/homepage/humble-bundle/amnesia.png and /dev/null differ
diff --git a/templates/static/img/homepage/humble-bundle/bastion.png b/templates/static/img/homepage/humble-bundle/bastion.png
deleted file mode 100644
index 3d8f9134c87..00000000000
Binary files a/templates/static/img/homepage/humble-bundle/bastion.png and /dev/null differ
diff --git a/templates/static/img/homepage/humble-bundle/braid.png b/templates/static/img/homepage/humble-bundle/braid.png
deleted file mode 100644
index 11d3d29848d..00000000000
Binary files a/templates/static/img/homepage/humble-bundle/braid.png and /dev/null differ
diff --git a/templates/static/img/homepage/humble-bundle/limbo.png b/templates/static/img/homepage/humble-bundle/limbo.png
deleted file mode 100644
index c16ed4e0950..00000000000
Binary files a/templates/static/img/homepage/humble-bundle/limbo.png and /dev/null differ
diff --git a/templates/static/img/homepage/humble-bundle/lone.png b/templates/static/img/homepage/humble-bundle/lone.png
deleted file mode 100644
index 2d96971a471..00000000000
Binary files a/templates/static/img/homepage/humble-bundle/lone.png and /dev/null differ
diff --git a/templates/static/img/homepage/humble-bundle/meatboy.png b/templates/static/img/homepage/humble-bundle/meatboy.png
deleted file mode 100644
index bea8debc988..00000000000
Binary files a/templates/static/img/homepage/humble-bundle/meatboy.png and /dev/null differ
diff --git a/templates/static/img/homepage/humble-bundle/psychonauts.png b/templates/static/img/homepage/humble-bundle/psychonauts.png
deleted file mode 100644
index cbd2a274a4f..00000000000
Binary files a/templates/static/img/homepage/humble-bundle/psychonauts.png and /dev/null differ
diff --git a/templates/static/img/homepage/humble-bundle/sword.png b/templates/static/img/homepage/humble-bundle/sword.png
deleted file mode 100644
index 1538e80cd04..00000000000
Binary files a/templates/static/img/homepage/humble-bundle/sword.png and /dev/null differ
diff --git a/templates/static/img/homepage/image-openstack-68.png b/templates/static/img/homepage/image-openstack-68.png
deleted file mode 100644
index 498a28cabc0..00000000000
Binary files a/templates/static/img/homepage/image-openstack-68.png and /dev/null differ
diff --git a/templates/static/img/homepage/image-openstack.png b/templates/static/img/homepage/image-openstack.png
deleted file mode 100644
index 2177f5e4409..00000000000
Binary files a/templates/static/img/homepage/image-openstack.png and /dev/null differ
diff --git a/templates/static/img/homepage/image-phone.png b/templates/static/img/homepage/image-phone.png
deleted file mode 100644
index d3370e2ec80..00000000000
Binary files a/templates/static/img/homepage/image-phone.png and /dev/null differ
diff --git a/templates/static/img/homepage/image-take-the-tour.png b/templates/static/img/homepage/image-take-the-tour.png
deleted file mode 100644
index c3e563fa093..00000000000
Binary files a/templates/static/img/homepage/image-take-the-tour.png and /dev/null differ
diff --git a/templates/static/img/homepage/image-ubuntu-dash-dock.jpg b/templates/static/img/homepage/image-ubuntu-dash-dock.jpg
deleted file mode 100644
index c88529c0caa..00000000000
Binary files a/templates/static/img/homepage/image-ubuntu-dash-dock.jpg and /dev/null differ
diff --git a/templates/static/img/homepage/image-ubuntu-dash-dock.png b/templates/static/img/homepage/image-ubuntu-dash-dock.png
deleted file mode 100644
index d514717f776..00000000000
Binary files a/templates/static/img/homepage/image-ubuntu-dash-dock.png and /dev/null differ
diff --git a/templates/static/img/homepage/image-ubuntu-dash.png b/templates/static/img/homepage/image-ubuntu-dash.png
deleted file mode 100644
index e8b8d5116de..00000000000
Binary files a/templates/static/img/homepage/image-ubuntu-dash.png and /dev/null differ
diff --git a/templates/static/img/homepage/image-ubuntu-openstack-medals.png b/templates/static/img/homepage/image-ubuntu-openstack-medals.png
deleted file mode 100644
index 3c0363b2c32..00000000000
Binary files a/templates/static/img/homepage/image-ubuntu-openstack-medals.png and /dev/null differ
diff --git a/templates/static/img/homepage/image-webinar-background.png b/templates/static/img/homepage/image-webinar-background.png
deleted file mode 100755
index e8025203292..00000000000
Binary files a/templates/static/img/homepage/image-webinar-background.png and /dev/null differ
diff --git a/templates/static/img/homepage/image-webinar.png b/templates/static/img/homepage/image-webinar.png
deleted file mode 100755
index 4403fa1d489..00000000000
Binary files a/templates/static/img/homepage/image-webinar.png and /dev/null differ
diff --git a/templates/static/img/homepage/image-windows-azure-charms.png b/templates/static/img/homepage/image-windows-azure-charms.png
deleted file mode 100644
index fab0d173e0c..00000000000
Binary files a/templates/static/img/homepage/image-windows-azure-charms.png and /dev/null differ
diff --git a/templates/static/img/homepage/interoperability-lab.png b/templates/static/img/homepage/interoperability-lab.png
deleted file mode 100644
index 99d5ff2011c..00000000000
Binary files a/templates/static/img/homepage/interoperability-lab.png and /dev/null differ
diff --git a/templates/static/img/homepage/logo-windows-azure-280.png b/templates/static/img/homepage/logo-windows-azure-280.png
deleted file mode 100644
index 10056ab9544..00000000000
Binary files a/templates/static/img/homepage/logo-windows-azure-280.png and /dev/null differ
diff --git a/templates/static/img/homepage/meet-ubuntu-small.jpg b/templates/static/img/homepage/meet-ubuntu-small.jpg
deleted file mode 100644
index 2547897024e..00000000000
Binary files a/templates/static/img/homepage/meet-ubuntu-small.jpg and /dev/null differ
diff --git a/templates/static/img/homepage/moonshot-takeover-hero.png b/templates/static/img/homepage/moonshot-takeover-hero.png
deleted file mode 100644
index 98f6fd3fcc8..00000000000
Binary files a/templates/static/img/homepage/moonshot-takeover-hero.png and /dev/null differ
diff --git a/templates/static/img/homepage/ods-takeover-hero.png b/templates/static/img/homepage/ods-takeover-hero.png
deleted file mode 100644
index 280013dcbef..00000000000
Binary files a/templates/static/img/homepage/ods-takeover-hero.png and /dev/null differ
diff --git a/templates/static/img/homepage/raring-promo-bg.png b/templates/static/img/homepage/raring-promo-bg.png
deleted file mode 100644
index e9c99338415..00000000000
Binary files a/templates/static/img/homepage/raring-promo-bg.png and /dev/null differ
diff --git a/templates/static/img/homepage/tagline.png b/templates/static/img/homepage/tagline.png
deleted file mode 100644
index 0cea843d39a..00000000000
Binary files a/templates/static/img/homepage/tagline.png and /dev/null differ
diff --git a/templates/static/img/homepage/teaser_3.png b/templates/static/img/homepage/teaser_3.png
deleted file mode 100644
index f95edaad429..00000000000
Binary files a/templates/static/img/homepage/teaser_3.png and /dev/null differ
diff --git a/templates/static/img/homepage/teaser_fri.png b/templates/static/img/homepage/teaser_fri.png
deleted file mode 100644
index 8a93ebd9021..00000000000
Binary files a/templates/static/img/homepage/teaser_fri.png and /dev/null differ
diff --git a/templates/static/img/homepage/ubuntu-home-juju-background.jpg b/templates/static/img/homepage/ubuntu-home-juju-background.jpg
deleted file mode 100644
index 76e7f949534..00000000000
Binary files a/templates/static/img/homepage/ubuntu-home-juju-background.jpg and /dev/null differ
diff --git a/templates/static/img/homepage/ubuntuedgelogo.png b/templates/static/img/homepage/ubuntuedgelogo.png
deleted file mode 100644
index 5415c861c09..00000000000
Binary files a/templates/static/img/homepage/ubuntuedgelogo.png and /dev/null differ
diff --git a/templates/static/img/homepage/wed_bg.png b/templates/static/img/homepage/wed_bg.png
deleted file mode 100644
index a90679827e6..00000000000
Binary files a/templates/static/img/homepage/wed_bg.png and /dev/null differ
diff --git a/templates/static/img/icons/.DS_Store b/templates/static/img/icons/.DS_Store
deleted file mode 100644
index 5008ddfcf53..00000000000
Binary files a/templates/static/img/icons/.DS_Store and /dev/null differ
diff --git a/templates/static/img/icons/close-orange.png b/templates/static/img/icons/close-orange.png
deleted file mode 100644
index 6d03ad34299..00000000000
Binary files a/templates/static/img/icons/close-orange.png and /dev/null differ
diff --git a/templates/static/img/icons/close-orange.svg b/templates/static/img/icons/close-orange.svg
deleted file mode 100644
index 4b7f19516ad..00000000000
--- a/templates/static/img/icons/close-orange.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="14px" height="14px" viewBox="0 0 14 14" enable-background="new 0 0 14 14" xml:space="preserve">
-<path id="rect3978_1_" fill="#DD4814" d="M2.257,0.933
-	L0.934,2.259L5.676,7l-4.742,4.741l1.323,1.326L7,8.325l4.742,4.742l1.324-1.326L8.323,7l4.743-4.741l-1.324-1.326L7,5.675
-	L2.257,0.933z"/>
-</svg>
diff --git a/templates/static/img/icons/close.svg b/templates/static/img/icons/close.svg
deleted file mode 100755
index 69cff56f93a..00000000000
--- a/templates/static/img/icons/close.svg
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="90"
-   height="90"
-   id="svg3747"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="close@30.svg">
-  <defs
-     id="defs3749" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9580785"
-     inkscape:cx="26.149528"
-     inkscape:cy="43.24527"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4171"
-     showgrid="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1920"
-     inkscape:window-height="1029"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3007"
-       empspacing="6"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0px"
-       originy="-4.7900391e-05px" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3752">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-144,-962.36215)">
-    <g
-       transform="translate(-198,611)"
-       id="g4171">
-      <rect
-         style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect4198"
-         width="90"
-         height="90"
-         x="342"
-         y="351.36215" />
-      <path
-         style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 356.51714,357.36215 348,365.87929 378.48286,396.36215 348,426.84501 356.51714,435.36215 387,404.87929 417.48286,435.36215 426,426.84501 395.51714,396.36215 426,365.87929 417.48286,357.36215 387,387.84501 z"
-         id="rect3978"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccc" />
-    </g>
-  </g>
-</svg>
diff --git a/templates/static/img/icons/icon-android-28x28.png b/templates/static/img/icons/icon-android-28x28.png
deleted file mode 100644
index eecdb906bda..00000000000
Binary files a/templates/static/img/icons/icon-android-28x28.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-apps-reader-33x34.png b/templates/static/img/icons/icon-apps-reader-33x34.png
deleted file mode 100644
index 480ffd5ff43..00000000000
Binary files a/templates/static/img/icons/icon-apps-reader-33x34.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-apps-reader-48.png b/templates/static/img/icons/icon-apps-reader-48.png
deleted file mode 100644
index 54177e138a2..00000000000
Binary files a/templates/static/img/icons/icon-apps-reader-48.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-arrow-down.png b/templates/static/img/icons/icon-arrow-down.png
deleted file mode 100644
index dde1fdca8a9..00000000000
Binary files a/templates/static/img/icons/icon-arrow-down.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-arrow-down.svg b/templates/static/img/icons/icon-arrow-down.svg
deleted file mode 100644
index 169fa0fce62..00000000000
--- a/templates/static/img/icons/icon-arrow-down.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<path fill="#AEA79F" d="M5.821,9.465C6.65,9.936,7.376,10.307,8,10.578c0.624-0.271,1.35-0.642,2.179-1.113
-	c0.829-0.471,1.683-1.002,2.562-1.594s1.743-1.227,2.594-1.904C15.563,5.786,15.784,5.604,16,5.422h-2.466
-	c-0.488,0.372-0.992,0.736-1.516,1.091c-0.61,0.414-1.233,0.802-1.871,1.166C9.509,8.042,8.609,8.489,8,8.774
-	C7.391,8.489,6.49,8.043,5.853,7.679C5.215,7.315,4.592,6.927,3.982,6.513C3.458,6.158,2.953,5.794,2.466,5.422H0
-	c0.216,0.182,0.437,0.364,0.665,0.546C1.515,6.645,2.38,7.28,3.259,7.872C4.138,8.464,4.992,8.995,5.821,9.465"/>
-</svg>
diff --git a/templates/static/img/icons/icon-arrow-right.svg b/templates/static/img/icons/icon-arrow-right.svg
deleted file mode 100644
index ba634168092..00000000000
--- a/templates/static/img/icons/icon-arrow-right.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 17.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px"
-	 height="16px" viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
-<path style="fill:#AEA79F;" d="M9.465,5.821C8.995,4.992,8.464,4.138,7.872,3.259
-	C7.28,2.38,6.645,1.515,5.968,0.665C5.786,0.437,5.604,0.216,5.422,0v2.466c0.372,0.487,0.736,0.992,1.091,1.516
-	c0.414,0.61,0.802,1.233,1.166,1.871C8.043,6.49,8.489,7.391,8.774,8c-0.285,0.609-0.732,1.509-1.095,2.147
-	c-0.364,0.638-0.752,1.261-1.166,1.871c-0.355,0.524-0.719,1.028-1.091,1.516V16c0.182-0.216,0.364-0.437,0.545-0.665
-	c0.677-0.851,1.312-1.715,1.904-2.594c0.592-0.879,1.123-1.733,1.594-2.562C9.936,9.35,10.307,8.624,10.578,8
-	C10.307,7.376,9.936,6.65,9.465,5.821"/>
-</svg>
diff --git a/templates/static/img/icons/icon-arrow-up.svg b/templates/static/img/icons/icon-arrow-up.svg
deleted file mode 100644
index 6d21ecbada0..00000000000
--- a/templates/static/img/icons/icon-arrow-up.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 17.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px"
-	 height="16px" viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
-<path style="fill:#AEA79F;" d="M5.821,6.535C4.992,7.005,4.138,7.536,3.259,8.128
-	C2.38,8.72,1.515,9.355,0.665,10.032C0.437,10.214,0.216,10.396,0,10.578h2.466c0.487-0.372,0.992-0.736,1.516-1.091
-	c0.61-0.414,1.233-0.802,1.871-1.166C6.49,7.957,7.391,7.511,8,7.226c0.609,0.285,1.509,0.732,2.147,1.095
-	c0.638,0.364,1.261,0.752,1.871,1.166c0.524,0.355,1.028,0.719,1.516,1.091H16c-0.216-0.182-0.437-0.364-0.665-0.545
-	c-0.851-0.677-1.715-1.312-2.594-1.904c-0.879-0.592-1.733-1.123-2.562-1.594C9.35,6.064,8.624,5.693,8,5.422
-	C7.376,5.693,6.65,6.064,5.821,6.535"/>
-</svg>
diff --git a/templates/static/img/icons/icon-audacity-35x35.png b/templates/static/img/icons/icon-audacity-35x35.png
deleted file mode 100644
index 36025c43542..00000000000
Binary files a/templates/static/img/icons/icon-audacity-35x35.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-audacity-48.png b/templates/static/img/icons/icon-audacity-48.png
deleted file mode 100644
index 115cf90ca73..00000000000
Binary files a/templates/static/img/icons/icon-audacity-48.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-banshee-reflex-38x88.png b/templates/static/img/icons/icon-banshee-reflex-38x88.png
deleted file mode 100644
index cb95d6e6111..00000000000
Binary files a/templates/static/img/icons/icon-banshee-reflex-38x88.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-blender-48.png b/templates/static/img/icons/icon-blender-48.png
deleted file mode 100644
index f926c3c19d1..00000000000
Binary files a/templates/static/img/icons/icon-blender-48.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-category-sprite-25x543.png b/templates/static/img/icons/icon-category-sprite-25x543.png
deleted file mode 100644
index fcebfbc8c5e..00000000000
Binary files a/templates/static/img/icons/icon-category-sprite-25x543.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-cheese-35x35.png b/templates/static/img/icons/icon-cheese-35x35.png
deleted file mode 100644
index 717fdd393eb..00000000000
Binary files a/templates/static/img/icons/icon-cheese-35x35.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-cheese-48.png b/templates/static/img/icons/icon-cheese-48.png
deleted file mode 100644
index 33cd4618bd6..00000000000
Binary files a/templates/static/img/icons/icon-cheese-48.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-chrome-32x32.png b/templates/static/img/icons/icon-chrome-32x32.png
deleted file mode 100644
index e822cb42d55..00000000000
Binary files a/templates/static/img/icons/icon-chrome-32x32.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-chrome-reflex-48x88.png b/templates/static/img/icons/icon-chrome-reflex-48x88.png
deleted file mode 100644
index 127da7249c6..00000000000
Binary files a/templates/static/img/icons/icon-chrome-reflex-48x88.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-chromium-48.png b/templates/static/img/icons/icon-chromium-48.png
deleted file mode 100644
index 62e90f37d98..00000000000
Binary files a/templates/static/img/icons/icon-chromium-48.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-clementine-35x35.png b/templates/static/img/icons/icon-clementine-35x35.png
deleted file mode 100644
index b25848a5c9c..00000000000
Binary files a/templates/static/img/icons/icon-clementine-35x35.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-clementine-48.png b/templates/static/img/icons/icon-clementine-48.png
deleted file mode 100644
index 7d301480cf8..00000000000
Binary files a/templates/static/img/icons/icon-clementine-48.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-digg-32.png b/templates/static/img/icons/icon-digg-32.png
deleted file mode 100644
index c7d7b333f26..00000000000
Binary files a/templates/static/img/icons/icon-digg-32.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-digg-36x21.png b/templates/static/img/icons/icon-digg-36x21.png
deleted file mode 100644
index 8d001cb60a7..00000000000
Binary files a/templates/static/img/icons/icon-digg-36x21.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-ekiga-35x35.png b/templates/static/img/icons/icon-ekiga-35x35.png
deleted file mode 100644
index 99a16e62aca..00000000000
Binary files a/templates/static/img/icons/icon-ekiga-35x35.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-ekiga-48.png b/templates/static/img/icons/icon-ekiga-48.png
deleted file mode 100644
index c99a0eeadcd..00000000000
Binary files a/templates/static/img/icons/icon-ekiga-48.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-empathy-reflex-48x88.png b/templates/static/img/icons/icon-empathy-reflex-48x88.png
deleted file mode 100644
index 8f3ecb2f7c8..00000000000
Binary files a/templates/static/img/icons/icon-empathy-reflex-48x88.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-evolution-35x35.png b/templates/static/img/icons/icon-evolution-35x35.png
deleted file mode 100644
index 34f183ca935..00000000000
Binary files a/templates/static/img/icons/icon-evolution-35x35.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-evolution-48.png b/templates/static/img/icons/icon-evolution-48.png
deleted file mode 100644
index c83ac53cb47..00000000000
Binary files a/templates/static/img/icons/icon-evolution-48.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-excel2010-28x28.gif b/templates/static/img/icons/icon-excel2010-28x28.gif
deleted file mode 100644
index 86c90ef5c88..00000000000
Binary files a/templates/static/img/icons/icon-excel2010-28x28.gif and /dev/null differ
diff --git a/templates/static/img/icons/icon-facebook-24x24.png b/templates/static/img/icons/icon-facebook-24x24.png
deleted file mode 100644
index 53c2f5673ea..00000000000
Binary files a/templates/static/img/icons/icon-facebook-24x24.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-firefox-32x32.png b/templates/static/img/icons/icon-firefox-32x32.png
deleted file mode 100644
index 09f0c0faf54..00000000000
Binary files a/templates/static/img/icons/icon-firefox-32x32.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-flash-48.png b/templates/static/img/icons/icon-flash-48.png
deleted file mode 100644
index 57ae5edc962..00000000000
Binary files a/templates/static/img/icons/icon-flash-48.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-flickr-24x24.png b/templates/static/img/icons/icon-flickr-24x24.png
deleted file mode 100644
index e8a5cc4a725..00000000000
Binary files a/templates/static/img/icons/icon-flickr-24x24.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-flickr-32.png b/templates/static/img/icons/icon-flickr-32.png
deleted file mode 100644
index f5885f5b30a..00000000000
Binary files a/templates/static/img/icons/icon-flickr-32.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-fretsonfire-35x35.png b/templates/static/img/icons/icon-fretsonfire-35x35.png
deleted file mode 100644
index 47c6d51b833..00000000000
Binary files a/templates/static/img/icons/icon-fretsonfire-35x35.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-gimp-24x24.png b/templates/static/img/icons/icon-gimp-24x24.png
deleted file mode 100644
index 176040a5490..00000000000
Binary files a/templates/static/img/icons/icon-gimp-24x24.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-gimp-35x35.png b/templates/static/img/icons/icon-gimp-35x35.png
deleted file mode 100644
index 80d28a5d1c0..00000000000
Binary files a/templates/static/img/icons/icon-gimp-35x35.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-gimp-48.png b/templates/static/img/icons/icon-gimp-48.png
deleted file mode 100644
index c878e964f77..00000000000
Binary files a/templates/static/img/icons/icon-gimp-48.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-homebank-35x35.gif b/templates/static/img/icons/icon-homebank-35x35.gif
deleted file mode 100644
index 13288f0ad62..00000000000
Binary files a/templates/static/img/icons/icon-homebank-35x35.gif and /dev/null differ
diff --git a/templates/static/img/icons/icon-homebank-48.png b/templates/static/img/icons/icon-homebank-48.png
deleted file mode 100644
index d69414266ec..00000000000
Binary files a/templates/static/img/icons/icon-homebank-48.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-iconsLocal-184x182.png b/templates/static/img/icons/icon-iconsLocal-184x182.png
deleted file mode 100644
index 903428fbc05..00000000000
Binary files a/templates/static/img/icons/icon-iconsLocal-184x182.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-iconsTwitterLarge-115x139.png b/templates/static/img/icons/icon-iconsTwitterLarge-115x139.png
deleted file mode 100644
index 6800acec1ef..00000000000
Binary files a/templates/static/img/icons/icon-iconsTwitterLarge-115x139.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-iconsTwitterSmall-54x63.png b/templates/static/img/icons/icon-iconsTwitterSmall-54x63.png
deleted file mode 100644
index 5104db88a8a..00000000000
Binary files a/templates/static/img/icons/icon-iconsTwitterSmall-54x63.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-iconsUpdates-400x107.png b/templates/static/img/icons/icon-iconsUpdates-400x107.png
deleted file mode 100644
index c9177a9bd2e..00000000000
Binary files a/templates/static/img/icons/icon-iconsUpdates-400x107.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-identica-24x24.png b/templates/static/img/icons/icon-identica-24x24.png
deleted file mode 100644
index 8777391763b..00000000000
Binary files a/templates/static/img/icons/icon-identica-24x24.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-inkscape-24x24.png b/templates/static/img/icons/icon-inkscape-24x24.png
deleted file mode 100644
index 3ea3e7515a4..00000000000
Binary files a/templates/static/img/icons/icon-inkscape-24x24.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-inkscape-35x35.png b/templates/static/img/icons/icon-inkscape-35x35.png
deleted file mode 100644
index 5fc74a724f6..00000000000
Binary files a/templates/static/img/icons/icon-inkscape-35x35.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-inkscape-48.png b/templates/static/img/icons/icon-inkscape-48.png
deleted file mode 100644
index 01d71263669..00000000000
Binary files a/templates/static/img/icons/icon-inkscape-48.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-iphone-28x28.png b/templates/static/img/icons/icon-iphone-28x28.png
deleted file mode 100644
index 8fd135ea0a5..00000000000
Binary files a/templates/static/img/icons/icon-iphone-28x28.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-jokosher-29x35.png b/templates/static/img/icons/icon-jokosher-29x35.png
deleted file mode 100644
index 0ebdb715762..00000000000
Binary files a/templates/static/img/icons/icon-jokosher-29x35.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-jokosher-48.png b/templates/static/img/icons/icon-jokosher-48.png
deleted file mode 100644
index 1b40a01a6a0..00000000000
Binary files a/templates/static/img/icons/icon-jokosher-48.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-lastfm-28x28.png b/templates/static/img/icons/icon-lastfm-28x28.png
deleted file mode 100644
index 1ee2fba4da5..00000000000
Binary files a/templates/static/img/icons/icon-lastfm-28x28.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-libreoffice-cal-reflex-40x88.png b/templates/static/img/icons/icon-libreoffice-cal-reflex-40x88.png
deleted file mode 100644
index 2f0f8d5633b..00000000000
Binary files a/templates/static/img/icons/icon-libreoffice-cal-reflex-40x88.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-libreoffice-impress-reflex-40x88.png b/templates/static/img/icons/icon-libreoffice-impress-reflex-40x88.png
deleted file mode 100644
index c2b7a606366..00000000000
Binary files a/templates/static/img/icons/icon-libreoffice-impress-reflex-40x88.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-libreoffice-writer-reflex-40x88.png b/templates/static/img/icons/icon-libreoffice-writer-reflex-40x88.png
deleted file mode 100644
index ada5a6e4a84..00000000000
Binary files a/templates/static/img/icons/icon-libreoffice-writer-reflex-40x88.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-liferea-48.png b/templates/static/img/icons/icon-liferea-48.png
deleted file mode 100644
index 28c268e0f1a..00000000000
Binary files a/templates/static/img/icons/icon-liferea-48.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-link-labs.png b/templates/static/img/icons/icon-link-labs.png
deleted file mode 100644
index d07c522dfda..00000000000
Binary files a/templates/static/img/icons/icon-link-labs.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-movieplayer-24x24.png b/templates/static/img/icons/icon-movieplayer-24x24.png
deleted file mode 100644
index 08ed78bb4ae..00000000000
Binary files a/templates/static/img/icons/icon-movieplayer-24x24.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-movieplayer-48.png b/templates/static/img/icons/icon-movieplayer-48.png
deleted file mode 100644
index ec3ced675cc..00000000000
Binary files a/templates/static/img/icons/icon-movieplayer-48.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-msn-24x24.png b/templates/static/img/icons/icon-msn-24x24.png
deleted file mode 100644
index cdba63ad0a7..00000000000
Binary files a/templates/static/img/icons/icon-msn-24x24.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-openshot-24x24.png b/templates/static/img/icons/icon-openshot-24x24.png
deleted file mode 100644
index 7fc40f287a2..00000000000
Binary files a/templates/static/img/icons/icon-openshot-24x24.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-pidgin-35x35.png b/templates/static/img/icons/icon-pidgin-35x35.png
deleted file mode 100644
index b55a39e8617..00000000000
Binary files a/templates/static/img/icons/icon-pidgin-35x35.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-pidgin-48.png b/templates/static/img/icons/icon-pidgin-48.png
deleted file mode 100644
index 56c62da7fa1..00000000000
Binary files a/templates/static/img/icons/icon-pidgin-48.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-pitivi-24x24.png b/templates/static/img/icons/icon-pitivi-24x24.png
deleted file mode 100644
index 1c38f3ea79d..00000000000
Binary files a/templates/static/img/icons/icon-pitivi-24x24.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-pitivi-48.png b/templates/static/img/icons/icon-pitivi-48.png
deleted file mode 100644
index 55e28797f32..00000000000
Binary files a/templates/static/img/icons/icon-pitivi-48.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-powerpoint2010-28x28.gif b/templates/static/img/icons/icon-powerpoint2010-28x28.gif
deleted file mode 100644
index 956608a9ff2..00000000000
Binary files a/templates/static/img/icons/icon-powerpoint2010-28x28.gif and /dev/null differ
diff --git a/templates/static/img/icons/icon-qaiku-40x13.png b/templates/static/img/icons/icon-qaiku-40x13.png
deleted file mode 100644
index 9385390c775..00000000000
Binary files a/templates/static/img/icons/icon-qaiku-40x13.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-qq-24x24.png b/templates/static/img/icons/icon-qq-24x24.png
deleted file mode 100644
index 8654eaa81a3..00000000000
Binary files a/templates/static/img/icons/icon-qq-24x24.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-resource-hub-icon-document.png b/templates/static/img/icons/icon-resource-hub-icon-document.png
deleted file mode 100644
index 392dd8df960..00000000000
Binary files a/templates/static/img/icons/icon-resource-hub-icon-document.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-resource-hub-webinar.png b/templates/static/img/icons/icon-resource-hub-webinar.png
deleted file mode 100644
index 4054caa9f65..00000000000
Binary files a/templates/static/img/icons/icon-resource-hub-webinar.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-rythmbox-reflex-48x88.png b/templates/static/img/icons/icon-rythmbox-reflex-48x88.png
deleted file mode 100644
index 210f0cf7afa..00000000000
Binary files a/templates/static/img/icons/icon-rythmbox-reflex-48x88.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-search.png b/templates/static/img/icons/icon-search.png
deleted file mode 100644
index 1c45f932085..00000000000
Binary files a/templates/static/img/icons/icon-search.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-shotwell-24x24.png b/templates/static/img/icons/icon-shotwell-24x24.png
deleted file mode 100644
index b8f93602721..00000000000
Binary files a/templates/static/img/icons/icon-shotwell-24x24.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-skype-32x32.png b/templates/static/img/icons/icon-skype-32x32.png
deleted file mode 100644
index 8d5f089b479..00000000000
Binary files a/templates/static/img/icons/icon-skype-32x32.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-skype-reflex-48x88.png b/templates/static/img/icons/icon-skype-reflex-48x88.png
deleted file mode 100644
index 7cc004c6b14..00000000000
Binary files a/templates/static/img/icons/icon-skype-reflex-48x88.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-software-centre-44.png b/templates/static/img/icons/icon-software-centre-44.png
deleted file mode 100644
index 349c9445bc9..00000000000
Binary files a/templates/static/img/icons/icon-software-centre-44.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-spotify-28x28.png b/templates/static/img/icons/icon-spotify-28x28.png
deleted file mode 100644
index 1c4adc5a16a..00000000000
Binary files a/templates/static/img/icons/icon-spotify-28x28.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-steam-44.png b/templates/static/img/icons/icon-steam-44.png
deleted file mode 100644
index 11ef126e854..00000000000
Binary files a/templates/static/img/icons/icon-steam-44.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-thunderbird-32x32.png b/templates/static/img/icons/icon-thunderbird-32x32.png
deleted file mode 100644
index c61f6472a8d..00000000000
Binary files a/templates/static/img/icons/icon-thunderbird-32x32.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-thunderbird-reflex-44x88.png b/templates/static/img/icons/icon-thunderbird-reflex-44x88.png
deleted file mode 100644
index d48a99841f3..00000000000
Binary files a/templates/static/img/icons/icon-thunderbird-reflex-44x88.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-totem-video-48.png b/templates/static/img/icons/icon-totem-video-48.png
deleted file mode 100644
index 4e37c2e5188..00000000000
Binary files a/templates/static/img/icons/icon-totem-video-48.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-twitter-24x24.png b/templates/static/img/icons/icon-twitter-24x24.png
deleted file mode 100644
index a707bc4254f..00000000000
Binary files a/templates/static/img/icons/icon-twitter-24x24.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-twitter-32.png b/templates/static/img/icons/icon-twitter-32.png
deleted file mode 100644
index 7ed391f17d8..00000000000
Binary files a/templates/static/img/icons/icon-twitter-32.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-vlc-48.png b/templates/static/img/icons/icon-vlc-48.png
deleted file mode 100644
index b443117c9dd..00000000000
Binary files a/templates/static/img/icons/icon-vlc-48.png and /dev/null differ
diff --git a/templates/static/img/icons/icon-word2010-28x28.gif b/templates/static/img/icons/icon-word2010-28x28.gif
deleted file mode 100644
index f5b4e318730..00000000000
Binary files a/templates/static/img/icons/icon-word2010-28x28.gif and /dev/null differ
diff --git a/templates/static/img/icons/icon-writer-doc.png b/templates/static/img/icons/icon-writer-doc.png
deleted file mode 100644
index bfa984eb6ec..00000000000
Binary files a/templates/static/img/icons/icon-writer-doc.png and /dev/null differ
diff --git a/templates/static/img/icons/navigation-menu-plain.png b/templates/static/img/icons/navigation-menu-plain.png
deleted file mode 100644
index 01aa3941d08..00000000000
Binary files a/templates/static/img/icons/navigation-menu-plain.png and /dev/null differ
diff --git a/templates/static/img/icons/navigation-menu-plain.svg b/templates/static/img/icons/navigation-menu-plain.svg
deleted file mode 100644
index 909d052c0e3..00000000000
--- a/templates/static/img/icons/navigation-menu-plain.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="90"
-   height="90"
-   id="svg2"
-   xml:space="preserve"><metadata
-     id="metadata8"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs6"><clipPath
-       id="clipPath16"><path
-         d="m 0,595.28 841.89,0 L 841.89,0 0,0 0,595.28 z"
-         id="path18" /></clipPath></defs><g
-     transform="matrix(1.25,0,0,-1.25,-406.97987,423.35437)"
-     id="g10"><rect
-       width="62.400002"
-       height="9.6000004"
-       x="330.38391"
-       y="-326.68362"
-       transform="scale(1,-1)"
-       id="rect4067"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /><rect
-       width="62.400002"
-       height="9.6000004"
-       x="330.38391"
-       y="-307.48361"
-       transform="scale(1,-1)"
-       id="rect4069"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /><rect
-       width="62.400002"
-       height="9.6000004"
-       x="330.38391"
-       y="-288.28363"
-       transform="scale(1,-1)"
-       id="rect4090"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /><rect
-       width="72"
-       height="72"
-       x="325.58389"
-       y="-338.6835"
-       transform="scale(1,-1)"
-       id="rect4065"
-       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /></g></svg>
\ No newline at end of file
diff --git a/templates/static/img/icons/sso_icon_askubuntu.png b/templates/static/img/icons/sso_icon_askubuntu.png
deleted file mode 100644
index ddcee98391e..00000000000
Binary files a/templates/static/img/icons/sso_icon_askubuntu.png and /dev/null differ
diff --git a/templates/static/img/icons/sso_icon_canonical.png b/templates/static/img/icons/sso_icon_canonical.png
deleted file mode 100644
index ec69088a522..00000000000
Binary files a/templates/static/img/icons/sso_icon_canonical.png and /dev/null differ
diff --git a/templates/static/img/icons/sso_icon_juju-ubuntu.png b/templates/static/img/icons/sso_icon_juju-ubuntu.png
deleted file mode 100644
index 1d36f526d72..00000000000
Binary files a/templates/static/img/icons/sso_icon_juju-ubuntu.png and /dev/null differ
diff --git a/templates/static/img/icons/sso_icon_landscape-canonical.png b/templates/static/img/icons/sso_icon_landscape-canonical.png
deleted file mode 100644
index ec69088a522..00000000000
Binary files a/templates/static/img/icons/sso_icon_landscape-canonical.png and /dev/null differ
diff --git a/templates/static/img/icons/sso_icon_ubuntu.png b/templates/static/img/icons/sso_icon_ubuntu.png
deleted file mode 100644
index ae73f1fcb7f..00000000000
Binary files a/templates/static/img/icons/sso_icon_ubuntu.png and /dev/null differ
diff --git a/templates/static/img/icons/sso_icon_ubuntuone.png b/templates/static/img/icons/sso_icon_ubuntuone.png
deleted file mode 100644
index 6afc94fed76..00000000000
Binary files a/templates/static/img/icons/sso_icon_ubuntuone.png and /dev/null differ
diff --git a/templates/static/img/icons/sso_icon_wiki-canonical.png b/templates/static/img/icons/sso_icon_wiki-canonical.png
deleted file mode 100644
index ec69088a522..00000000000
Binary files a/templates/static/img/icons/sso_icon_wiki-canonical.png and /dev/null differ
diff --git a/templates/static/img/icons/sso_icon_wiki-ubuntu.png b/templates/static/img/icons/sso_icon_wiki-ubuntu.png
deleted file mode 100644
index ae73f1fcb7f..00000000000
Binary files a/templates/static/img/icons/sso_icon_wiki-ubuntu.png and /dev/null differ
diff --git a/templates/static/img/ie/logo.gif b/templates/static/img/ie/logo.gif
deleted file mode 100644
index 7ea4fd16d50..00000000000
Binary files a/templates/static/img/ie/logo.gif and /dev/null differ
diff --git a/templates/static/img/location.svg b/templates/static/img/location.svg
deleted file mode 100755
index befbf610bca..00000000000
--- a/templates/static/img/location.svg
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="90"
-   height="90"
-   id="svg3140"
-   version="1.1"
-   inkscape:version="0.48+devel r12261"
-   sodipodi:docname="location.svg">
-  <defs
-     id="defs3142" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4.0745362"
-     inkscape:cx="36.998075"
-     inkscape:cy="71.603195"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1029"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3178"
-       empspacing="6"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0px"
-       originy="-1.7382813e-05px" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3145">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-962.36218)">
-    <path
-       style="color:#000000;fill:#aea79f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 45 0 C 30.088312 9.4739031e-15 18 12.088312 18 27 C 18 27.561584 18.028705 28.10317 18.0625 28.65625 C 18.075828 28.904467 18.074737 29.153199 18.09375 29.40625 C 18.114049 29.634857 18.161539 29.866817 18.1875 30.09375 C 20.219665 51.854176 41.922228 90 45 90 C 48.077772 90 69.780331 51.854176 71.8125 30.09375 C 71.83413 29.862134 71.889131 29.634086 71.90625 29.40625 C 71.92827 29.158255 71.922231 28.906127 71.9375 28.65625 C 71.967647 28.094801 72 27.535211 72 27 C 72 12.088312 59.911688 -4.7369516e-15 45 0 z M 45 18 C 49.970563 18 54 22.029437 54 27 C 54 31.970563 49.970563 36 45 36 C 40.029437 36 36 31.970563 36 27 C 36 22.029437 40.029437 18 45 18 z "
-       transform="translate(0,962.36218)"
-       id="path4984" />
-    <rect
-       style="color:#000000;fill:none;stroke:none;stroke-width:7.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect4198"
-       width="90"
-       height="90"
-       x="0"
-       y="962.36218" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Shapes"
-     sodipodi:insensitive="true"
-     style="display:none">
-    <path
-       style="color:#000000;fill:#aea79f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:transform-center-y="6.7348177"
-       d="m 72.000025,27.000021 c 0,21.00001 -23.770828,62.99996 -27.000046,62.99996 -3.229217,0 -26.999993,-41.99995 -26.999993,-62.99996 C 19.614621,23.340381 72.000025,23.000066 72.000025,27.000021 Z"
-       id="path4984-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sscs" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#aea79f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path830-6"
-       sodipodi:cx="45"
-       sodipodi:cy="21.000017"
-       sodipodi:rx="21"
-       sodipodi:ry="21"
-       d="m 66,21.000017 a 21,21 0 1 1 -42,0 A 21,21 0 1 1 66,21.000017 Z"
-       transform="matrix(1.2857143,0,0,1.2857143,-12.857144,-2.0070749e-5)" />
-    <path
-       transform="matrix(0.42857143,0,0,0.42857143,25.714286,17.99999)"
-       d="m 66,21.000017 a 21,21 0 1 1 -42,0 A 21,21 0 1 1 66,21.000017 Z"
-       sodipodi:ry="21"
-       sodipodi:rx="21"
-       sodipodi:cy="21.000017"
-       sodipodi:cx="45"
-       id="path832-2"
-       style="color:#000000;fill:#aea79f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       sodipodi:type="arc" />
-  </g>
-</svg>
diff --git a/templates/static/img/logo-ubuntu_cof-white_orange-hex.svg b/templates/static/img/logo-ubuntu_cof-white_orange-hex.svg
deleted file mode 100644
index 73d715f9171..00000000000
--- a/templates/static/img/logo-ubuntu_cof-white_orange-hex.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="285px" height="285px" viewBox="-0.866 -0.866 285 285" enable-background="new -0.866 -0.866 285 285"
-	 xml:space="preserve">
-<defs>
-</defs>
-<path fill="#FFFFFF" d="M283.465,141.734c0,78.273-63.457,141.73-141.734,141.73S0,220.008,0,141.734C0,63.455,63.453,0,141.73,0
-	S283.465,63.455,283.465,141.734z"/>
-<path fill="#DD4814" d="M45.356,122.812c-10.453,0-18.923,8.47-18.923,18.923c0,10.449,8.47,18.92,18.923,18.92
-	c10.449,0,18.92-8.471,18.92-18.92C64.276,131.281,55.806,122.812,45.356,122.812z M180.463,208.814
-	c-9.051,5.225-12.149,16.793-6.926,25.84c5.226,9.051,16.793,12.151,25.844,6.926c9.048-5.224,12.148-16.792,6.923-25.842
-	C201.08,206.691,189.511,203.59,180.463,208.814z M86.458,141.732c0-18.701,9.293-35.219,23.504-45.221L96.128,73.338
-	c-16.56,11.064-28.878,27.978-33.995,47.788c5.977,4.872,9.796,12.291,9.796,20.608c0,8.315-3.819,15.734-9.797,20.605
-	c5.116,19.812,17.435,36.726,33.995,47.789l13.835-23.175C95.751,176.953,86.458,160.436,86.458,141.732z M141.733,86.457
-	c28.877,0,52.564,22.141,55.047,50.373l26.968-0.394c-1.327-20.844-10.432-39.562-24.425-53.319
-	c-7.194,2.718-15.505,2.306-22.688-1.842c-7.192-4.152-11.705-11.156-12.941-18.757c-6.992-1.935-14.351-2.99-21.96-2.99
-	c-13.086,0-25.449,3.072-36.431,8.512l13.146,23.56C125.526,88.307,133.412,86.457,141.733,86.457z M141.733,197.008
-	c-8.322,0-16.207-1.85-23.285-5.143L105.3,215.427c10.983,5.438,23.347,8.511,36.433,8.511c7.609,0,14.968-1.055,21.961-2.99
-	c1.236-7.601,5.75-14.605,12.943-18.76c7.183-4.146,15.494-4.558,22.688-1.839c13.992-13.758,23.097-32.476,24.422-53.32
-	l-26.968-0.394C194.298,174.871,170.61,197.008,141.733,197.008z M180.46,74.649c9.05,5.227,20.619,2.126,25.842-6.921
-	c5.226-9.051,2.128-20.619-6.923-25.845c-9.049-5.224-20.617-2.124-25.843,6.927C168.312,57.857,171.412,69.426,180.46,74.649z"/>
-</svg>
diff --git a/templates/static/img/logo.png b/templates/static/img/logo.png
deleted file mode 100644
index b2634a58046..00000000000
Binary files a/templates/static/img/logo.png and /dev/null differ
diff --git a/templates/static/img/logos/canonical-logo-166.png b/templates/static/img/logos/canonical-logo-166.png
deleted file mode 100644
index 89c1911ddec..00000000000
Binary files a/templates/static/img/logos/canonical-logo-166.png and /dev/null differ
diff --git a/templates/static/img/logos/canonical-symbol-167x167.png b/templates/static/img/logos/canonical-symbol-167x167.png
deleted file mode 100644
index 7eaf34448fd..00000000000
Binary files a/templates/static/img/logos/canonical-symbol-167x167.png and /dev/null differ
diff --git a/templates/static/img/logos/cof-25x25.png b/templates/static/img/logos/cof-25x25.png
deleted file mode 100644
index 6d4d0bc143c..00000000000
Binary files a/templates/static/img/logos/cof-25x25.png and /dev/null differ
diff --git a/templates/static/img/logos/icon-mtn-small.png b/templates/static/img/logos/icon-mtn-small.png
deleted file mode 100755
index 2ed0fbbe054..00000000000
Binary files a/templates/static/img/logos/icon-mtn-small.png and /dev/null differ
diff --git a/templates/static/img/logos/icon-verizon-small.png b/templates/static/img/logos/icon-verizon-small.png
deleted file mode 100644
index 433875bad95..00000000000
Binary files a/templates/static/img/logos/icon-verizon-small.png and /dev/null differ
diff --git a/templates/static/img/logos/icon-verizon.png b/templates/static/img/logos/icon-verizon.png
deleted file mode 100644
index 91b7bc207a2..00000000000
Binary files a/templates/static/img/logos/icon-verizon.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-amazon-web-services.png b/templates/static/img/logos/logo-amazon-web-services.png
deleted file mode 100644
index 7d0325eb5bb..00000000000
Binary files a/templates/static/img/logos/logo-amazon-web-services.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-china-unicom-small.png b/templates/static/img/logos/logo-china-unicom-small.png
deleted file mode 100644
index 4fdc561cc5f..00000000000
Binary files a/templates/static/img/logos/logo-china-unicom-small.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-china-unicom.png b/templates/static/img/logos/logo-china-unicom.png
deleted file mode 100644
index 3ca5b225abf..00000000000
Binary files a/templates/static/img/logos/logo-china-unicom.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-deutsche-telekom-small.png b/templates/static/img/logos/logo-deutsche-telekom-small.png
deleted file mode 100755
index dea9fd3f56a..00000000000
Binary files a/templates/static/img/logos/logo-deutsche-telekom-small.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-deutsche-telekom.png b/templates/static/img/logos/logo-deutsche-telekom.png
deleted file mode 100755
index d43f41293f9..00000000000
Binary files a/templates/static/img/logos/logo-deutsche-telekom.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-download-chinese-268x35.png b/templates/static/img/logos/logo-download-chinese-268x35.png
deleted file mode 100644
index f43a6427da2..00000000000
Binary files a/templates/static/img/logos/logo-download-chinese-268x35.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-everything-everywhere-small.png b/templates/static/img/logos/logo-everything-everywhere-small.png
deleted file mode 100755
index e13604ee18b..00000000000
Binary files a/templates/static/img/logos/logo-everything-everywhere-small.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-everything-everywhere.png b/templates/static/img/logos/logo-everything-everywhere.png
deleted file mode 100755
index da443d8a4c4..00000000000
Binary files a/templates/static/img/logos/logo-everything-everywhere.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-h3g.png b/templates/static/img/logos/logo-h3g.png
deleted file mode 100644
index 4f8acdc1dca..00000000000
Binary files a/templates/static/img/logos/logo-h3g.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-hp-cloud.png b/templates/static/img/logos/logo-hp-cloud.png
deleted file mode 100644
index d1f4b8e79bd..00000000000
Binary files a/templates/static/img/logos/logo-hp-cloud.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-ibm-50.png b/templates/static/img/logos/logo-ibm-50.png
deleted file mode 100644
index 792147a8e8d..00000000000
Binary files a/templates/static/img/logos/logo-ibm-50.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-ibm-large.png b/templates/static/img/logos/logo-ibm-large.png
deleted file mode 100644
index 4c99ebaff1c..00000000000
Binary files a/templates/static/img/logos/logo-ibm-large.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-ibm.png b/templates/static/img/logos/logo-ibm.png
deleted file mode 100644
index ed6b69aac75..00000000000
Binary files a/templates/static/img/logos/logo-ibm.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-inktank-grey.png b/templates/static/img/logos/logo-inktank-grey.png
deleted file mode 100644
index 1c861c15291..00000000000
Binary files a/templates/static/img/logos/logo-inktank-grey.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-joyent-50.png b/templates/static/img/logos/logo-joyent-50.png
deleted file mode 100644
index 1f606ede7d3..00000000000
Binary files a/templates/static/img/logos/logo-joyent-50.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-joyent.png b/templates/static/img/logos/logo-joyent.png
deleted file mode 100644
index b03baf3617c..00000000000
Binary files a/templates/static/img/logos/logo-joyent.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-juju-108x111.png b/templates/static/img/logos/logo-juju-108x111.png
deleted file mode 100644
index bac91761256..00000000000
Binary files a/templates/static/img/logos/logo-juju-108x111.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-juju-130.png b/templates/static/img/logos/logo-juju-130.png
deleted file mode 100644
index c7accace1d1..00000000000
Binary files a/templates/static/img/logos/logo-juju-130.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-juju-143x143.png b/templates/static/img/logos/logo-juju-143x143.png
deleted file mode 100644
index fe72d7da21f..00000000000
Binary files a/templates/static/img/logos/logo-juju-143x143.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-juju-171x174.png b/templates/static/img/logos/logo-juju-171x174.png
deleted file mode 100644
index 8c1bdc11725..00000000000
Binary files a/templates/static/img/logos/logo-juju-171x174.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-juju-54.png b/templates/static/img/logos/logo-juju-54.png
deleted file mode 100644
index e69c137aed3..00000000000
Binary files a/templates/static/img/logos/logo-juju-54.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-korea-telecom-small.png b/templates/static/img/logos/logo-korea-telecom-small.png
deleted file mode 100755
index d9659ee8d9b..00000000000
Binary files a/templates/static/img/logos/logo-korea-telecom-small.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-korea-telecom.png b/templates/static/img/logos/logo-korea-telecom.png
deleted file mode 100755
index fa5e7e6b294..00000000000
Binary files a/templates/static/img/logos/logo-korea-telecom.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-kylin-160.png b/templates/static/img/logos/logo-kylin-160.png
deleted file mode 100644
index ee25e001075..00000000000
Binary files a/templates/static/img/logos/logo-kylin-160.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-lg-uplus-small.png b/templates/static/img/logos/logo-lg-uplus-small.png
deleted file mode 100755
index f864eb6a92a..00000000000
Binary files a/templates/static/img/logos/logo-lg-uplus-small.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-lg-uplus.png b/templates/static/img/logos/logo-lg-uplus.png
deleted file mode 100755
index f872db27866..00000000000
Binary files a/templates/static/img/logos/logo-lg-uplus.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-mtn.png b/templates/static/img/logos/logo-mtn.png
deleted file mode 100644
index 2d023dc2a2a..00000000000
Binary files a/templates/static/img/logos/logo-mtn.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-portugal-telecom-small.png b/templates/static/img/logos/logo-portugal-telecom-small.png
deleted file mode 100755
index aa99f927844..00000000000
Binary files a/templates/static/img/logos/logo-portugal-telecom-small.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-portugal-telecom.png b/templates/static/img/logos/logo-portugal-telecom.png
deleted file mode 100755
index 950b2421686..00000000000
Binary files a/templates/static/img/logos/logo-portugal-telecom.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-rackspace.png b/templates/static/img/logos/logo-rackspace.png
deleted file mode 100644
index 8999589a581..00000000000
Binary files a/templates/static/img/logos/logo-rackspace.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-smartfren-small.png b/templates/static/img/logos/logo-smartfren-small.png
deleted file mode 100644
index 9fb17f178c0..00000000000
Binary files a/templates/static/img/logos/logo-smartfren-small.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-smartfren.png b/templates/static/img/logos/logo-smartfren.png
deleted file mode 100644
index a21e90ecfa0..00000000000
Binary files a/templates/static/img/logos/logo-smartfren.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-south-korea-telecom-small.png b/templates/static/img/logos/logo-south-korea-telecom-small.png
deleted file mode 100755
index 3912f40e66c..00000000000
Binary files a/templates/static/img/logos/logo-south-korea-telecom-small.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-south-korea-telecom.png b/templates/static/img/logos/logo-south-korea-telecom.png
deleted file mode 100755
index 1fed940ba4e..00000000000
Binary files a/templates/static/img/logos/logo-south-korea-telecom.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-telecom-italia-small.png b/templates/static/img/logos/logo-telecom-italia-small.png
deleted file mode 100755
index f607e28c387..00000000000
Binary files a/templates/static/img/logos/logo-telecom-italia-small.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-telecom-italia.png b/templates/static/img/logos/logo-telecom-italia.png
deleted file mode 100755
index f668e285926..00000000000
Binary files a/templates/static/img/logos/logo-telecom-italia.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-telefonica.png b/templates/static/img/logos/logo-telefonica.png
deleted file mode 100644
index 47c04c38263..00000000000
Binary files a/templates/static/img/logos/logo-telefonica.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-telstra-small.png b/templates/static/img/logos/logo-telstra-small.png
deleted file mode 100644
index c9f10f08afc..00000000000
Binary files a/templates/static/img/logos/logo-telstra-small.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-telstra.png b/templates/static/img/logos/logo-telstra.png
deleted file mode 100644
index 37c4fe4edac..00000000000
Binary files a/templates/static/img/logos/logo-telstra.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-tmobile-small.png b/templates/static/img/logos/logo-tmobile-small.png
deleted file mode 100644
index 89a7c61f21d..00000000000
Binary files a/templates/static/img/logos/logo-tmobile-small.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-tmobile.png b/templates/static/img/logos/logo-tmobile.png
deleted file mode 100644
index deb3b6afb01..00000000000
Binary files a/templates/static/img/logos/logo-tmobile.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-ubuntu-grey.png b/templates/static/img/logos/logo-ubuntu-grey.png
deleted file mode 100644
index 8951095f8a1..00000000000
Binary files a/templates/static/img/logos/logo-ubuntu-grey.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-ubuntu-one-300x279.jpg b/templates/static/img/logos/logo-ubuntu-one-300x279.jpg
deleted file mode 100644
index 2cff1c869dd..00000000000
Binary files a/templates/static/img/logos/logo-ubuntu-one-300x279.jpg and /dev/null differ
diff --git a/templates/static/img/logos/logo-ubuntu-orange.jpg b/templates/static/img/logos/logo-ubuntu-orange.jpg
deleted file mode 100644
index cdf8114a4b1..00000000000
Binary files a/templates/static/img/logos/logo-ubuntu-orange.jpg and /dev/null differ
diff --git a/templates/static/img/logos/logo-ubuntu-orange.png b/templates/static/img/logos/logo-ubuntu-orange.png
deleted file mode 100644
index f442fa40588..00000000000
Binary files a/templates/static/img/logos/logo-ubuntu-orange.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-uone-262x106.png b/templates/static/img/logos/logo-uone-262x106.png
deleted file mode 100644
index 24679e0ebdc..00000000000
Binary files a/templates/static/img/logos/logo-uone-262x106.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-verizon-small.png b/templates/static/img/logos/logo-verizon-small.png
deleted file mode 100644
index 4a130ba0d67..00000000000
Binary files a/templates/static/img/logos/logo-verizon-small.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-verizon.png b/templates/static/img/logos/logo-verizon.png
deleted file mode 100644
index 4a130ba0d67..00000000000
Binary files a/templates/static/img/logos/logo-verizon.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-vmware-grey.png b/templates/static/img/logos/logo-vmware-grey.png
deleted file mode 100644
index 838fe955d85..00000000000
Binary files a/templates/static/img/logos/logo-vmware-grey.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-vodafone-small.png b/templates/static/img/logos/logo-vodafone-small.png
deleted file mode 100644
index 4a4e2f54066..00000000000
Binary files a/templates/static/img/logos/logo-vodafone-small.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-vodafone.png b/templates/static/img/logos/logo-vodafone.png
deleted file mode 100644
index 0209977682e..00000000000
Binary files a/templates/static/img/logos/logo-vodafone.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-window-azure-large.png b/templates/static/img/logos/logo-window-azure-large.png
deleted file mode 100644
index f9698422edf..00000000000
Binary files a/templates/static/img/logos/logo-window-azure-large.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-window-azure.png b/templates/static/img/logos/logo-window-azure.png
deleted file mode 100644
index c83e4953833..00000000000
Binary files a/templates/static/img/logos/logo-window-azure.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-windows-azure-50.png b/templates/static/img/logos/logo-windows-azure-50.png
deleted file mode 100644
index 96baf0f5a65..00000000000
Binary files a/templates/static/img/logos/logo-windows-azure-50.png and /dev/null differ
diff --git a/templates/static/img/logos/logo-windows-azure.png b/templates/static/img/logos/logo-windows-azure.png
deleted file mode 100644
index 96baf0f5a65..00000000000
Binary files a/templates/static/img/logos/logo-windows-azure.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/10genLogo.png b/templates/static/img/logos/partners/10genLogo.png
deleted file mode 100644
index dfde468aa5f..00000000000
Binary files a/templates/static/img/logos/partners/10genLogo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/10genLogo_1.png b/templates/static/img/logos/partners/10genLogo_1.png
deleted file mode 100644
index 2d83822fec5..00000000000
Binary files a/templates/static/img/logos/partners/10genLogo_1.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/2X_logo_small_scaled.jpg b/templates/static/img/logos/partners/2X_logo_small_scaled.jpg
deleted file mode 100644
index 6c90278c709..00000000000
Binary files a/templates/static/img/logos/partners/2X_logo_small_scaled.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/2X_logo_small_scaled_.jpg b/templates/static/img/logos/partners/2X_logo_small_scaled_.jpg
deleted file mode 100644
index f2f0e3c885b..00000000000
Binary files a/templates/static/img/logos/partners/2X_logo_small_scaled_.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/ACLlogo.png b/templates/static/img/logos/partners/ACLlogo.png
deleted file mode 100644
index b1247ecf44f..00000000000
Binary files a/templates/static/img/logos/partners/ACLlogo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/AIMS-1.png b/templates/static/img/logos/partners/AIMS-1.png
deleted file mode 100644
index 1ba040f7f2e..00000000000
Binary files a/templates/static/img/logos/partners/AIMS-1.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/AIMS-1_.png b/templates/static/img/logos/partners/AIMS-1_.png
deleted file mode 100644
index 7a05199ef3a..00000000000
Binary files a/templates/static/img/logos/partners/AIMS-1_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/ASCI.png b/templates/static/img/logos/partners/ASCI.png
deleted file mode 100644
index 3fc323ff88b..00000000000
Binary files a/templates/static/img/logos/partners/ASCI.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/ASCI_.png b/templates/static/img/logos/partners/ASCI_.png
deleted file mode 100644
index 50beb76b88a..00000000000
Binary files a/templates/static/img/logos/partners/ASCI_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/AWS.png b/templates/static/img/logos/partners/AWS.png
deleted file mode 100644
index d4b81c2b2a0..00000000000
Binary files a/templates/static/img/logos/partners/AWS.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Agreeya.png b/templates/static/img/logos/partners/Agreeya.png
deleted file mode 100644
index 166d7df072b..00000000000
Binary files a/templates/static/img/logos/partners/Agreeya.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/AlcaTorda.png b/templates/static/img/logos/partners/AlcaTorda.png
deleted file mode 100644
index 9b65cfb4e67..00000000000
Binary files a/templates/static/img/logos/partners/AlcaTorda.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/AlterWay.png b/templates/static/img/logos/partners/AlterWay.png
deleted file mode 100644
index 29058d07fa1..00000000000
Binary files a/templates/static/img/logos/partners/AlterWay.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/AlterWayLogo.jpg b/templates/static/img/logos/partners/AlterWayLogo.jpg
deleted file mode 100644
index 644f27049d5..00000000000
Binary files a/templates/static/img/logos/partners/AlterWayLogo.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/AlterWayLogo1.jpg b/templates/static/img/logos/partners/AlterWayLogo1.jpg
deleted file mode 100644
index 7cad3dbb8b9..00000000000
Binary files a/templates/static/img/logos/partners/AlterWayLogo1.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/Alter_Way_FORMATIONNew1.png b/templates/static/img/logos/partners/Alter_Way_FORMATIONNew1.png
deleted file mode 100644
index 30e4e40636f..00000000000
Binary files a/templates/static/img/logos/partners/Alter_Way_FORMATIONNew1.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Alter_Way_FORMATIONNew2.png b/templates/static/img/logos/partners/Alter_Way_FORMATIONNew2.png
deleted file mode 100644
index e39f7276cbc..00000000000
Binary files a/templates/static/img/logos/partners/Alter_Way_FORMATIONNew2.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Alter_Way_SOLUTIONS.png b/templates/static/img/logos/partners/Alter_Way_SOLUTIONS.png
deleted file mode 100644
index d77f9f668ad..00000000000
Binary files a/templates/static/img/logos/partners/Alter_Way_SOLUTIONS.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Alterego.png b/templates/static/img/logos/partners/Alterego.png
deleted file mode 100644
index 1417fb860ef..00000000000
Binary files a/templates/static/img/logos/partners/Alterego.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Americati.png b/templates/static/img/logos/partners/Americati.png
deleted file mode 100644
index b61582dbf93..00000000000
Binary files a/templates/static/img/logos/partners/Americati.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Anaska_AW_Formation_RVB2.png b/templates/static/img/logos/partners/Anaska_AW_Formation_RVB2.png
deleted file mode 100644
index 4048f74301c..00000000000
Binary files a/templates/static/img/logos/partners/Anaska_AW_Formation_RVB2.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/AppFirst_LogoScaled.jpg b/templates/static/img/logos/partners/AppFirst_LogoScaled.jpg
deleted file mode 100644
index a70352a3f3c..00000000000
Binary files a/templates/static/img/logos/partners/AppFirst_LogoScaled.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/ArkeiaSoftware.png b/templates/static/img/logos/partners/ArkeiaSoftware.png
deleted file mode 100644
index 15e15e5476f..00000000000
Binary files a/templates/static/img/logos/partners/ArkeiaSoftware.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Autonomic.png b/templates/static/img/logos/partners/Autonomic.png
deleted file mode 100644
index 00c14db6ad6..00000000000
Binary files a/templates/static/img/logos/partners/Autonomic.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/BEEMLOGO2.png b/templates/static/img/logos/partners/BEEMLOGO2.png
deleted file mode 100644
index e14b8dec292..00000000000
Binary files a/templates/static/img/logos/partners/BEEMLOGO2.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/BMN_Logo.png b/templates/static/img/logos/partners/BMN_Logo.png
deleted file mode 100644
index 94fb64b7720..00000000000
Binary files a/templates/static/img/logos/partners/BMN_Logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Bacula.png b/templates/static/img/logos/partners/Bacula.png
deleted file mode 100644
index f3de7bb83dd..00000000000
Binary files a/templates/static/img/logos/partners/Bacula.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Bitdefender.png b/templates/static/img/logos/partners/Bitdefender.png
deleted file mode 100644
index da156c7f01b..00000000000
Binary files a/templates/static/img/logos/partners/Bitdefender.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/BoxedIce.png b/templates/static/img/logos/partners/BoxedIce.png
deleted file mode 100644
index 6fce4b3af52..00000000000
Binary files a/templates/static/img/logos/partners/BoxedIce.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/C9Operations.png b/templates/static/img/logos/partners/C9Operations.png
deleted file mode 100644
index e555704ce28..00000000000
Binary files a/templates/static/img/logos/partners/C9Operations.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/CFENGINE.png b/templates/static/img/logos/partners/CFENGINE.png
deleted file mode 100644
index 69f0820cf5f..00000000000
Binary files a/templates/static/img/logos/partners/CFENGINE.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/CIrruslogo.scaled.jpg b/templates/static/img/logos/partners/CIrruslogo.scaled.jpg
deleted file mode 100644
index cbbf99e82ce..00000000000
Binary files a/templates/static/img/logos/partners/CIrruslogo.scaled.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/CSS.png b/templates/static/img/logos/partners/CSS.png
deleted file mode 100644
index 19517d1753a..00000000000
Binary files a/templates/static/img/logos/partners/CSS.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Centrify.png b/templates/static/img/logos/partners/Centrify.png
deleted file mode 100644
index baeb421a558..00000000000
Binary files a/templates/static/img/logos/partners/Centrify.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/CirrusComputing-SCALED.png b/templates/static/img/logos/partners/CirrusComputing-SCALED.png
deleted file mode 100644
index fb78c3ce8f8..00000000000
Binary files a/templates/static/img/logos/partners/CirrusComputing-SCALED.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Cloudera.png b/templates/static/img/logos/partners/Cloudera.png
deleted file mode 100644
index ab008e76a52..00000000000
Binary files a/templates/static/img/logos/partners/Cloudera.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Colosa.png b/templates/static/img/logos/partners/Colosa.png
deleted file mode 100644
index 03634b2a782..00000000000
Binary files a/templates/static/img/logos/partners/Colosa.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/CompuManiac.png b/templates/static/img/logos/partners/CompuManiac.png
deleted file mode 100644
index a55dd628f67..00000000000
Binary files a/templates/static/img/logos/partners/CompuManiac.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Conextia.png b/templates/static/img/logos/partners/Conextia.png
deleted file mode 100644
index 74a8decd848..00000000000
Binary files a/templates/static/img/logos/partners/Conextia.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Convirture_Logo_scaled.jpg b/templates/static/img/logos/partners/Convirture_Logo_scaled.jpg
deleted file mode 100644
index 1bf5bf15a2b..00000000000
Binary files a/templates/static/img/logos/partners/Convirture_Logo_scaled.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/Covenco.png b/templates/static/img/logos/partners/Covenco.png
deleted file mode 100644
index 42955154855..00000000000
Binary files a/templates/static/img/logos/partners/Covenco.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/DEIIS.png b/templates/static/img/logos/partners/DEIIS.png
deleted file mode 100644
index 3cb207f056a..00000000000
Binary files a/templates/static/img/logos/partners/DEIIS.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/DNS.png b/templates/static/img/logos/partners/DNS.png
deleted file mode 100644
index 9815a867e8c..00000000000
Binary files a/templates/static/img/logos/partners/DNS.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Dell_logo.jpg b/templates/static/img/logos/partners/Dell_logo.jpg
deleted file mode 100644
index c2af65b5993..00000000000
Binary files a/templates/static/img/logos/partners/Dell_logo.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/Dell_logolowres.jpg b/templates/static/img/logos/partners/Dell_logolowres.jpg
deleted file mode 100644
index a7169913e1f..00000000000
Binary files a/templates/static/img/logos/partners/Dell_logolowres.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/E-nteractiva2.png b/templates/static/img/logos/partners/E-nteractiva2.png
deleted file mode 100644
index a7fd2d4543c..00000000000
Binary files a/templates/static/img/logos/partners/E-nteractiva2.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/EandA.png b/templates/static/img/logos/partners/EandA.png
deleted file mode 100644
index 5c41517a84e..00000000000
Binary files a/templates/static/img/logos/partners/EandA.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Epidata.png b/templates/static/img/logos/partners/Epidata.png
deleted file mode 100644
index 71f00c21588..00000000000
Binary files a/templates/static/img/logos/partners/Epidata.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Evolution.png b/templates/static/img/logos/partners/Evolution.png
deleted file mode 100644
index e9eab4ef28d..00000000000
Binary files a/templates/static/img/logos/partners/Evolution.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/FL_Logo-1.jpg b/templates/static/img/logos/partners/FL_Logo-1.jpg
deleted file mode 100644
index 6d4f95fed8f..00000000000
Binary files a/templates/static/img/logos/partners/FL_Logo-1.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/FL_Logo-2.jpg b/templates/static/img/logos/partners/FL_Logo-2.jpg
deleted file mode 100644
index ce6360c1702..00000000000
Binary files a/templates/static/img/logos/partners/FL_Logo-2.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/FL_Logo-2_.jpg b/templates/static/img/logos/partners/FL_Logo-2_.jpg
deleted file mode 100644
index ce6360c1702..00000000000
Binary files a/templates/static/img/logos/partners/FL_Logo-2_.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/FL_Logo-3.jpg b/templates/static/img/logos/partners/FL_Logo-3.jpg
deleted file mode 100644
index ca6e20d973a..00000000000
Binary files a/templates/static/img/logos/partners/FL_Logo-3.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/FL_Logo-3_.jpg b/templates/static/img/logos/partners/FL_Logo-3_.jpg
deleted file mode 100644
index e7439cc7b6c..00000000000
Binary files a/templates/static/img/logos/partners/FL_Logo-3_.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/FL_Logo-3__.jpg b/templates/static/img/logos/partners/FL_Logo-3__.jpg
deleted file mode 100644
index d5f05b467ff..00000000000
Binary files a/templates/static/img/logos/partners/FL_Logo-3__.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/FOSS-stewart.png b/templates/static/img/logos/partners/FOSS-stewart.png
deleted file mode 100644
index 8aa4b4a32bd..00000000000
Binary files a/templates/static/img/logos/partners/FOSS-stewart.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/FastLaneLOGO_510x100.png b/templates/static/img/logos/partners/FastLaneLOGO_510x100.png
deleted file mode 100644
index d36574506b4..00000000000
Binary files a/templates/static/img/logos/partners/FastLaneLOGO_510x100.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Fluendo-new.png b/templates/static/img/logos/partners/Fluendo-new.png
deleted file mode 100644
index eb18cf1812f..00000000000
Binary files a/templates/static/img/logos/partners/Fluendo-new.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Foss-IT.png b/templates/static/img/logos/partners/Foss-IT.png
deleted file mode 100644
index 63cc693faad..00000000000
Binary files a/templates/static/img/logos/partners/Foss-IT.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/FreeOpenSource.png b/templates/static/img/logos/partners/FreeOpenSource.png
deleted file mode 100644
index 199e5d9f369..00000000000
Binary files a/templates/static/img/logos/partners/FreeOpenSource.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/G17.png b/templates/static/img/logos/partners/G17.png
deleted file mode 100644
index 1d5d6df463d..00000000000
Binary files a/templates/static/img/logos/partners/G17.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/GWOS_scaled.jpg b/templates/static/img/logos/partners/GWOS_scaled.jpg
deleted file mode 100644
index 1f33ea7ceb1..00000000000
Binary files a/templates/static/img/logos/partners/GWOS_scaled.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/Garl.png b/templates/static/img/logos/partners/Garl.png
deleted file mode 100644
index 1781c6b6348..00000000000
Binary files a/templates/static/img/logos/partners/Garl.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Garl_.png b/templates/static/img/logos/partners/Garl_.png
deleted file mode 100644
index 1781c6b6348..00000000000
Binary files a/templates/static/img/logos/partners/Garl_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Gemini.png b/templates/static/img/logos/partners/Gemini.png
deleted file mode 100644
index c7d7b005ab9..00000000000
Binary files a/templates/static/img/logos/partners/Gemini.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Genesi-1.png b/templates/static/img/logos/partners/Genesi-1.png
deleted file mode 100644
index 87751be2538..00000000000
Binary files a/templates/static/img/logos/partners/Genesi-1.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Genesi-1_.png b/templates/static/img/logos/partners/Genesi-1_.png
deleted file mode 100644
index af71328dec8..00000000000
Binary files a/templates/static/img/logos/partners/Genesi-1_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Genesi.png b/templates/static/img/logos/partners/Genesi.png
deleted file mode 100644
index edfe8ac504b..00000000000
Binary files a/templates/static/img/logos/partners/Genesi.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/GoWorld.png b/templates/static/img/logos/partners/GoWorld.png
deleted file mode 100644
index 2a6d4d8c922..00000000000
Binary files a/templates/static/img/logos/partners/GoWorld.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/GoWorld_.png b/templates/static/img/logos/partners/GoWorld_.png
deleted file mode 100644
index b2c39b813be..00000000000
Binary files a/templates/static/img/logos/partners/GoWorld_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/GoWorld_Ltd_Logo2.png b/templates/static/img/logos/partners/GoWorld_Ltd_Logo2.png
deleted file mode 100644
index fec66492f50..00000000000
Binary files a/templates/static/img/logos/partners/GoWorld_Ltd_Logo2.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/GoWorld_Ltd_Logo2_.png b/templates/static/img/logos/partners/GoWorld_Ltd_Logo2_.png
deleted file mode 100644
index fc2ac8986d8..00000000000
Binary files a/templates/static/img/logos/partners/GoWorld_Ltd_Logo2_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/GoWorld_Ltd_Logo3.png b/templates/static/img/logos/partners/GoWorld_Ltd_Logo3.png
deleted file mode 100644
index 1d4a058b58f..00000000000
Binary files a/templates/static/img/logos/partners/GoWorld_Ltd_Logo3.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/GoWorld__.png b/templates/static/img/logos/partners/GoWorld__.png
deleted file mode 100644
index caa341b4b84..00000000000
Binary files a/templates/static/img/logos/partners/GoWorld__.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/HP-logo2.jpg b/templates/static/img/logos/partners/HP-logo2.jpg
deleted file mode 100644
index 405e2291eea..00000000000
Binary files a/templates/static/img/logos/partners/HP-logo2.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/HP-logolowres.jpg b/templates/static/img/logos/partners/HP-logolowres.jpg
deleted file mode 100644
index fdfff39837a..00000000000
Binary files a/templates/static/img/logos/partners/HP-logolowres.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/Hansaworld.png b/templates/static/img/logos/partners/Hansaworld.png
deleted file mode 100644
index e8b57160fac..00000000000
Binary files a/templates/static/img/logos/partners/Hansaworld.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/IB.png b/templates/static/img/logos/partners/IB.png
deleted file mode 100644
index 717dee065d5..00000000000
Binary files a/templates/static/img/logos/partners/IB.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/INS_LLC_scaled.png b/templates/static/img/logos/partners/INS_LLC_scaled.png
deleted file mode 100644
index 7b9bdff460d..00000000000
Binary files a/templates/static/img/logos/partners/INS_LLC_scaled.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/ITSynergy.png b/templates/static/img/logos/partners/ITSynergy.png
deleted file mode 100644
index f6bb9f5b071..00000000000
Binary files a/templates/static/img/logos/partners/ITSynergy.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/ITSynergy_.png b/templates/static/img/logos/partners/ITSynergy_.png
deleted file mode 100644
index f6bb9f5b071..00000000000
Binary files a/templates/static/img/logos/partners/ITSynergy_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/IndustrialTSI.png b/templates/static/img/logos/partners/IndustrialTSI.png
deleted file mode 100644
index b39268df1cf..00000000000
Binary files a/templates/static/img/logos/partners/IndustrialTSI.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Intalio.png b/templates/static/img/logos/partners/Intalio.png
deleted file mode 100644
index 03f8ec6866a..00000000000
Binary files a/templates/static/img/logos/partners/Intalio.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Isotrol.png b/templates/static/img/logos/partners/Isotrol.png
deleted file mode 100644
index ceda26e1a3c..00000000000
Binary files a/templates/static/img/logos/partners/Isotrol.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Isotrol_.png b/templates/static/img/logos/partners/Isotrol_.png
deleted file mode 100644
index c2740a7c796..00000000000
Binary files a/templates/static/img/logos/partners/Isotrol_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/JFA.png b/templates/static/img/logos/partners/JFA.png
deleted file mode 100644
index 0ca9880fa45..00000000000
Binary files a/templates/static/img/logos/partners/JFA.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/JNet2000.png b/templates/static/img/logos/partners/JNet2000.png
deleted file mode 100644
index 05fb8299b0c..00000000000
Binary files a/templates/static/img/logos/partners/JNet2000.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/JosephKing.png b/templates/static/img/logos/partners/JosephKing.png
deleted file mode 100644
index 098b12a2f82..00000000000
Binary files a/templates/static/img/logos/partners/JosephKing.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/K7Cloudlogo_scaled.png b/templates/static/img/logos/partners/K7Cloudlogo_scaled.png
deleted file mode 100644
index 27e9cc2503c..00000000000
Binary files a/templates/static/img/logos/partners/K7Cloudlogo_scaled.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/KIS.png b/templates/static/img/logos/partners/KIS.png
deleted file mode 100644
index c211ddc1da5..00000000000
Binary files a/templates/static/img/logos/partners/KIS.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Kaavo.png b/templates/static/img/logos/partners/Kaavo.png
deleted file mode 100644
index 9b7e289b4ee..00000000000
Binary files a/templates/static/img/logos/partners/Kaavo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Kangaroot.png b/templates/static/img/logos/partners/Kangaroot.png
deleted file mode 100644
index 5bf5bfd0331..00000000000
Binary files a/templates/static/img/logos/partners/Kangaroot.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Kuwaitnet.png b/templates/static/img/logos/partners/Kuwaitnet.png
deleted file mode 100644
index 83d8050e49d..00000000000
Binary files a/templates/static/img/logos/partners/Kuwaitnet.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/L4.png b/templates/static/img/logos/partners/L4.png
deleted file mode 100644
index 21b3c2d3b8c..00000000000
Binary files a/templates/static/img/logos/partners/L4.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/LB_logo_blackback_scaled.jpg b/templates/static/img/logos/partners/LB_logo_blackback_scaled.jpg
deleted file mode 100644
index eab243140b9..00000000000
Binary files a/templates/static/img/logos/partners/LB_logo_blackback_scaled.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/LOGO_GCIS_TRANS.png b/templates/static/img/logos/partners/LOGO_GCIS_TRANS.png
deleted file mode 100644
index c498243161d..00000000000
Binary files a/templates/static/img/logos/partners/LOGO_GCIS_TRANS.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/LSD.jpg b/templates/static/img/logos/partners/LSD.jpg
deleted file mode 100644
index 74e7e62a620..00000000000
Binary files a/templates/static/img/logos/partners/LSD.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/LSD.png b/templates/static/img/logos/partners/LSD.png
deleted file mode 100644
index f7b0e5afc77..00000000000
Binary files a/templates/static/img/logos/partners/LSD.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/LSD3.jpg b/templates/static/img/logos/partners/LSD3.jpg
deleted file mode 100644
index e6d5cb3ef60..00000000000
Binary files a/templates/static/img/logos/partners/LSD3.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/LSD_1.jpg b/templates/static/img/logos/partners/LSD_1.jpg
deleted file mode 100644
index c0dcd51e5c3..00000000000
Binary files a/templates/static/img/logos/partners/LSD_1.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/LSD_2.jpg b/templates/static/img/logos/partners/LSD_2.jpg
deleted file mode 100644
index 4f36ba8882e..00000000000
Binary files a/templates/static/img/logos/partners/LSD_2.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/LSD_logo.png b/templates/static/img/logos/partners/LSD_logo.png
deleted file mode 100644
index 037f0222e57..00000000000
Binary files a/templates/static/img/logos/partners/LSD_logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/LSD_logo_on_white_highres_Scaled.jpg b/templates/static/img/logos/partners/LSD_logo_on_white_highres_Scaled.jpg
deleted file mode 100644
index 6375612edbb..00000000000
Binary files a/templates/static/img/logos/partners/LSD_logo_on_white_highres_Scaled.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/LSD_logo_on_white_highres_Scaled_-2.jpg b/templates/static/img/logos/partners/LSD_logo_on_white_highres_Scaled_-2.jpg
deleted file mode 100644
index e2923f31a60..00000000000
Binary files a/templates/static/img/logos/partners/LSD_logo_on_white_highres_Scaled_-2.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/LSD_logo_on_white_highres_Scaled_.jpg b/templates/static/img/logos/partners/LSD_logo_on_white_highres_Scaled_.jpg
deleted file mode 100644
index 40e7dfe7c9b..00000000000
Binary files a/templates/static/img/logos/partners/LSD_logo_on_white_highres_Scaled_.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/Likewise.png b/templates/static/img/logos/partners/Likewise.png
deleted file mode 100644
index e923e8e260a..00000000000
Binary files a/templates/static/img/logos/partners/Likewise.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Linmin.png b/templates/static/img/logos/partners/Linmin.png
deleted file mode 100644
index b6227855b8b..00000000000
Binary files a/templates/static/img/logos/partners/Linmin.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/LinuxCertified.png b/templates/static/img/logos/partners/LinuxCertified.png
deleted file mode 100644
index 771753560bd..00000000000
Binary files a/templates/static/img/logos/partners/LinuxCertified.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/LinuxCertified_.png b/templates/static/img/logos/partners/LinuxCertified_.png
deleted file mode 100644
index 771753560bd..00000000000
Binary files a/templates/static/img/logos/partners/LinuxCertified_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/LinuxCertified__.png b/templates/static/img/logos/partners/LinuxCertified__.png
deleted file mode 100644
index 771753560bd..00000000000
Binary files a/templates/static/img/logos/partners/LinuxCertified__.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/LinuxCertified___.png b/templates/static/img/logos/partners/LinuxCertified___.png
deleted file mode 100644
index 771753560bd..00000000000
Binary files a/templates/static/img/logos/partners/LinuxCertified___.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/LinuxCertified____.png b/templates/static/img/logos/partners/LinuxCertified____.png
deleted file mode 100644
index 771753560bd..00000000000
Binary files a/templates/static/img/logos/partners/LinuxCertified____.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/LinuxCertified_____.png b/templates/static/img/logos/partners/LinuxCertified_____.png
deleted file mode 100644
index dd6d78bb45c..00000000000
Binary files a/templates/static/img/logos/partners/LinuxCertified_____.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/LinuxCertified______.png b/templates/static/img/logos/partners/LinuxCertified______.png
deleted file mode 100644
index dd6d78bb45c..00000000000
Binary files a/templates/static/img/logos/partners/LinuxCertified______.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/LinuxTuki.png b/templates/static/img/logos/partners/LinuxTuki.png
deleted file mode 100644
index d672bb8f4dc..00000000000
Binary files a/templates/static/img/logos/partners/LinuxTuki.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/LogicSupply.png b/templates/static/img/logos/partners/LogicSupply.png
deleted file mode 100644
index 8ab664aff50..00000000000
Binary files a/templates/static/img/logos/partners/LogicSupply.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Login.png b/templates/static/img/logos/partners/Login.png
deleted file mode 100644
index b823484237b..00000000000
Binary files a/templates/static/img/logos/partners/Login.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Logo-Eucalyptus_Logo_two_words.png b/templates/static/img/logos/partners/Logo-Eucalyptus_Logo_two_words.png
deleted file mode 100644
index 99e441ea1ce..00000000000
Binary files a/templates/static/img/logos/partners/Logo-Eucalyptus_Logo_two_words.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Logo.png b/templates/static/img/logos/partners/Logo.png
deleted file mode 100644
index 402ba3ca621..00000000000
Binary files a/templates/static/img/logos/partners/Logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Logo1.png b/templates/static/img/logos/partners/Logo1.png
deleted file mode 100644
index 59df5f50262..00000000000
Binary files a/templates/static/img/logos/partners/Logo1.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Logo2.jpg b/templates/static/img/logos/partners/Logo2.jpg
deleted file mode 100644
index 20915de9d2a..00000000000
Binary files a/templates/static/img/logos/partners/Logo2.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/LogoNeuwald_Horizontal_Grande.png b/templates/static/img/logos/partners/LogoNeuwald_Horizontal_Grande.png
deleted file mode 100644
index 809b2178e38..00000000000
Binary files a/templates/static/img/logos/partners/LogoNeuwald_Horizontal_Grande.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Logo_CohesiveFT-Logo_2009-3-6.jpg b/templates/static/img/logos/partners/Logo_CohesiveFT-Logo_2009-3-6.jpg
deleted file mode 100644
index 17f6f17e53b..00000000000
Binary files a/templates/static/img/logos/partners/Logo_CohesiveFT-Logo_2009-3-6.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/MGE.png b/templates/static/img/logos/partners/MGE.png
deleted file mode 100644
index 98fe6f42dad..00000000000
Binary files a/templates/static/img/logos/partners/MGE.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/ManageIQ.png b/templates/static/img/logos/partners/ManageIQ.png
deleted file mode 100644
index 988d21c1323..00000000000
Binary files a/templates/static/img/logos/partners/ManageIQ.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/MartinSalbaba.png b/templates/static/img/logos/partners/MartinSalbaba.png
deleted file mode 100644
index 368b9a458cb..00000000000
Binary files a/templates/static/img/logos/partners/MartinSalbaba.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Mesiniaga_Logo_Ori-1.png b/templates/static/img/logos/partners/Mesiniaga_Logo_Ori-1.png
deleted file mode 100644
index 2b120302a38..00000000000
Binary files a/templates/static/img/logos/partners/Mesiniaga_Logo_Ori-1.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Mesiniaga_Logo_Ori-2.png b/templates/static/img/logos/partners/Mesiniaga_Logo_Ori-2.png
deleted file mode 100644
index 479974b8699..00000000000
Binary files a/templates/static/img/logos/partners/Mesiniaga_Logo_Ori-2.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Mesiniaga_Logo_Ori-4.png b/templates/static/img/logos/partners/Mesiniaga_Logo_Ori-4.png
deleted file mode 100644
index 6c22ddfce6d..00000000000
Binary files a/templates/static/img/logos/partners/Mesiniaga_Logo_Ori-4.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Mesiniaga_Logo_Ori-final.png b/templates/static/img/logos/partners/Mesiniaga_Logo_Ori-final.png
deleted file mode 100644
index 206c4587d38..00000000000
Binary files a/templates/static/img/logos/partners/Mesiniaga_Logo_Ori-final.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Mesiniaga_Logo_Ori.png b/templates/static/img/logos/partners/Mesiniaga_Logo_Ori.png
deleted file mode 100644
index 0099eb990fd..00000000000
Binary files a/templates/static/img/logos/partners/Mesiniaga_Logo_Ori.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Mesiniaga_Logo_Ori_1.png b/templates/static/img/logos/partners/Mesiniaga_Logo_Ori_1.png
deleted file mode 100644
index b70e925f49b..00000000000
Binary files a/templates/static/img/logos/partners/Mesiniaga_Logo_Ori_1.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Mesiniaga_Logo_Ori_2.png b/templates/static/img/logos/partners/Mesiniaga_Logo_Ori_2.png
deleted file mode 100644
index b70e925f49b..00000000000
Binary files a/templates/static/img/logos/partners/Mesiniaga_Logo_Ori_2.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Mukta.png b/templates/static/img/logos/partners/Mukta.png
deleted file mode 100644
index d757fcec6e9..00000000000
Binary files a/templates/static/img/logos/partners/Mukta.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/MySQL.png b/templates/static/img/logos/partners/MySQL.png
deleted file mode 100644
index ef63718e6ae..00000000000
Binary files a/templates/static/img/logos/partners/MySQL.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/NCPR_scaled____.JPG b/templates/static/img/logos/partners/NCPR_scaled____.JPG
deleted file mode 100644
index d842b5a0697..00000000000
Binary files a/templates/static/img/logos/partners/NCPR_scaled____.JPG and /dev/null differ
diff --git a/templates/static/img/logos/partners/NorthScale.png b/templates/static/img/logos/partners/NorthScale.png
deleted file mode 100644
index 976cac2a701..00000000000
Binary files a/templates/static/img/logos/partners/NorthScale.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Nullbound.png b/templates/static/img/logos/partners/Nullbound.png
deleted file mode 100644
index 007cb739119..00000000000
Binary files a/templates/static/img/logos/partners/Nullbound.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Nullbound_.png b/templates/static/img/logos/partners/Nullbound_.png
deleted file mode 100644
index 007cb739119..00000000000
Binary files a/templates/static/img/logos/partners/Nullbound_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/O-Biz.png b/templates/static/img/logos/partners/O-Biz.png
deleted file mode 100644
index 6d63534afba..00000000000
Binary files a/templates/static/img/logos/partners/O-Biz.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Om-Conseil.png b/templates/static/img/logos/partners/Om-Conseil.png
deleted file mode 100644
index 8664d7559f0..00000000000
Binary files a/templates/static/img/logos/partners/Om-Conseil.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/OneOS.png b/templates/static/img/logos/partners/OneOS.png
deleted file mode 100644
index 57e3a4cf424..00000000000
Binary files a/templates/static/img/logos/partners/OneOS.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/OpServices_logo_transparentel_scaled.png b/templates/static/img/logos/partners/OpServices_logo_transparentel_scaled.png
deleted file mode 100644
index b75a66197a9..00000000000
Binary files a/templates/static/img/logos/partners/OpServices_logo_transparentel_scaled.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/OpenBravo_.png b/templates/static/img/logos/partners/OpenBravo_.png
deleted file mode 100644
index 1db475bba83..00000000000
Binary files a/templates/static/img/logos/partners/OpenBravo_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/OpenCountry.png b/templates/static/img/logos/partners/OpenCountry.png
deleted file mode 100644
index 68d7e35009e..00000000000
Binary files a/templates/static/img/logos/partners/OpenCountry.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/OpenLearning.png b/templates/static/img/logos/partners/OpenLearning.png
deleted file mode 100644
index 5e6f868b18e..00000000000
Binary files a/templates/static/img/logos/partners/OpenLearning.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/OpenLearning_.png b/templates/static/img/logos/partners/OpenLearning_.png
deleted file mode 100644
index f6f0ef4529e..00000000000
Binary files a/templates/static/img/logos/partners/OpenLearning_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/OpenSourceDev.png b/templates/static/img/logos/partners/OpenSourceDev.png
deleted file mode 100644
index 545565ee8c3..00000000000
Binary files a/templates/static/img/logos/partners/OpenSourceDev.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Opera.png b/templates/static/img/logos/partners/Opera.png
deleted file mode 100644
index 2b154788e98..00000000000
Binary files a/templates/static/img/logos/partners/Opera.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Optimum.png b/templates/static/img/logos/partners/Optimum.png
deleted file mode 100644
index a87e7753b9b..00000000000
Binary files a/templates/static/img/logos/partners/Optimum.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Osoffice.png b/templates/static/img/logos/partners/Osoffice.png
deleted file mode 100644
index bf21f3ad846..00000000000
Binary files a/templates/static/img/logos/partners/Osoffice.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/PCHouse.png b/templates/static/img/logos/partners/PCHouse.png
deleted file mode 100644
index cf010ec804b..00000000000
Binary files a/templates/static/img/logos/partners/PCHouse.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/PGP.png b/templates/static/img/logos/partners/PGP.png
deleted file mode 100644
index c8afad4f94b..00000000000
Binary files a/templates/static/img/logos/partners/PGP.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Panora.png b/templates/static/img/logos/partners/Panora.png
deleted file mode 100644
index 179de5cf75e..00000000000
Binary files a/templates/static/img/logos/partners/Panora.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/PantekLogo.jpg b/templates/static/img/logos/partners/PantekLogo.jpg
deleted file mode 100644
index 011ce28ca22..00000000000
Binary files a/templates/static/img/logos/partners/PantekLogo.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/PortalSystems.png b/templates/static/img/logos/partners/PortalSystems.png
deleted file mode 100644
index 99f6b7065ad..00000000000
Binary files a/templates/static/img/logos/partners/PortalSystems.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/QA-IQ.png b/templates/static/img/logos/partners/QA-IQ.png
deleted file mode 100644
index 190e9049cca..00000000000
Binary files a/templates/static/img/logos/partners/QA-IQ.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/RandrLogo.png b/templates/static/img/logos/partners/RandrLogo.png
deleted file mode 100644
index 275f3c25984..00000000000
Binary files a/templates/static/img/logos/partners/RandrLogo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Real.png b/templates/static/img/logos/partners/Real.png
deleted file mode 100644
index 043a454045c..00000000000
Binary files a/templates/static/img/logos/partners/Real.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Realsoftware.png b/templates/static/img/logos/partners/Realsoftware.png
deleted file mode 100644
index 3bfd2e17458..00000000000
Binary files a/templates/static/img/logos/partners/Realsoftware.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/RnB_Logo_rgb_300.jpg b/templates/static/img/logos/partners/RnB_Logo_rgb_300.jpg
deleted file mode 100644
index 506025bf060..00000000000
Binary files a/templates/static/img/logos/partners/RnB_Logo_rgb_300.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/RnB_Logo_rgb_300_1.jpg b/templates/static/img/logos/partners/RnB_Logo_rgb_300_1.jpg
deleted file mode 100644
index 4d40e51b361..00000000000
Binary files a/templates/static/img/logos/partners/RnB_Logo_rgb_300_1.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/RnB_Logo_rgb_300_2.jpg b/templates/static/img/logos/partners/RnB_Logo_rgb_300_2.jpg
deleted file mode 100644
index a1e703432a6..00000000000
Binary files a/templates/static/img/logos/partners/RnB_Logo_rgb_300_2.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/RnB_Logo_rgb_300_3.jpg b/templates/static/img/logos/partners/RnB_Logo_rgb_300_3.jpg
deleted file mode 100644
index f46e85ced1f..00000000000
Binary files a/templates/static/img/logos/partners/RnB_Logo_rgb_300_3.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/SPC.png b/templates/static/img/logos/partners/SPC.png
deleted file mode 100644
index 9d0de36cdce..00000000000
Binary files a/templates/static/img/logos/partners/SPC.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Sicurante.png b/templates/static/img/logos/partners/Sicurante.png
deleted file mode 100644
index 6c6723466f4..00000000000
Binary files a/templates/static/img/logos/partners/Sicurante.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Sierra.png b/templates/static/img/logos/partners/Sierra.png
deleted file mode 100644
index aae2b1588bb..00000000000
Binary files a/templates/static/img/logos/partners/Sierra.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/SmartNetLogo.jpg b/templates/static/img/logos/partners/SmartNetLogo.jpg
deleted file mode 100644
index 8be1a25f13a..00000000000
Binary files a/templates/static/img/logos/partners/SmartNetLogo.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/SmartNetLogo1.jpg b/templates/static/img/logos/partners/SmartNetLogo1.jpg
deleted file mode 100644
index 2aa676598d4..00000000000
Binary files a/templates/static/img/logos/partners/SmartNetLogo1.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/Smartscale_Logo_Scaled.png b/templates/static/img/logos/partners/Smartscale_Logo_Scaled.png
deleted file mode 100644
index f3c06f35923..00000000000
Binary files a/templates/static/img/logos/partners/Smartscale_Logo_Scaled.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Solis.png b/templates/static/img/logos/partners/Solis.png
deleted file mode 100644
index cea99a2e826..00000000000
Binary files a/templates/static/img/logos/partners/Solis.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Soltuxscaled.png b/templates/static/img/logos/partners/Soltuxscaled.png
deleted file mode 100644
index 767bfa33d79..00000000000
Binary files a/templates/static/img/logos/partners/Soltuxscaled.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Sp_Synet_logo.png b/templates/static/img/logos/partners/Sp_Synet_logo.png
deleted file mode 100644
index e0203f71dfb..00000000000
Binary files a/templates/static/img/logos/partners/Sp_Synet_logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Spark_Logo_canonical_scaled.png b/templates/static/img/logos/partners/Spark_Logo_canonical_scaled.png
deleted file mode 100644
index d02bc826a6d..00000000000
Binary files a/templates/static/img/logos/partners/Spark_Logo_canonical_scaled.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Spark_Logo_canonical_scaled_.png b/templates/static/img/logos/partners/Spark_Logo_canonical_scaled_.png
deleted file mode 100644
index 110139e77d4..00000000000
Binary files a/templates/static/img/logos/partners/Spark_Logo_canonical_scaled_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Spark_Logo_canonical_scaled__.png b/templates/static/img/logos/partners/Spark_Logo_canonical_scaled__.png
deleted file mode 100644
index 6922ee637bb..00000000000
Binary files a/templates/static/img/logos/partners/Spark_Logo_canonical_scaled__.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Suzuki_Logo.png b/templates/static/img/logos/partners/Suzuki_Logo.png
deleted file mode 100644
index 5673a8449bf..00000000000
Binary files a/templates/static/img/logos/partners/Suzuki_Logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Switch.png b/templates/static/img/logos/partners/Switch.png
deleted file mode 100644
index 864f9362c88..00000000000
Binary files a/templates/static/img/logos/partners/Switch.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Syrtec.png b/templates/static/img/logos/partners/Syrtec.png
deleted file mode 100644
index 1f68ed173b8..00000000000
Binary files a/templates/static/img/logos/partners/Syrtec.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/System76.png b/templates/static/img/logos/partners/System76.png
deleted file mode 100644
index 5056c382481..00000000000
Binary files a/templates/static/img/logos/partners/System76.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/THINKCube.png b/templates/static/img/logos/partners/THINKCube.png
deleted file mode 100644
index 0c40227ba52..00000000000
Binary files a/templates/static/img/logos/partners/THINKCube.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/THINKCube_.png b/templates/static/img/logos/partners/THINKCube_.png
deleted file mode 100644
index 3b2838494ca..00000000000
Binary files a/templates/static/img/logos/partners/THINKCube_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/THINKCube__.png b/templates/static/img/logos/partners/THINKCube__.png
deleted file mode 100644
index f0fef4d7b51..00000000000
Binary files a/templates/static/img/logos/partners/THINKCube__.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Taashee-Logo-235x58.jpg b/templates/static/img/logos/partners/Taashee-Logo-235x58.jpg
deleted file mode 100644
index 15a030f7cdc..00000000000
Binary files a/templates/static/img/logos/partners/Taashee-Logo-235x58.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/Telynet_Pequeo.jpg b/templates/static/img/logos/partners/Telynet_Pequeo.jpg
deleted file mode 100644
index 43bc69438e6..00000000000
Binary files a/templates/static/img/logos/partners/Telynet_Pequeo.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/Telynet_Pequeo_.jpg b/templates/static/img/logos/partners/Telynet_Pequeo_.jpg
deleted file mode 100644
index 43bc69438e6..00000000000
Binary files a/templates/static/img/logos/partners/Telynet_Pequeo_.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/Tieturi_logo_punainenliuku_150x82.png b/templates/static/img/logos/partners/Tieturi_logo_punainenliuku_150x82.png
deleted file mode 100644
index a1ef854208d..00000000000
Binary files a/templates/static/img/logos/partners/Tieturi_logo_punainenliuku_150x82.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Torchlight-new.png b/templates/static/img/logos/partners/Torchlight-new.png
deleted file mode 100644
index 61ac0a4d78b..00000000000
Binary files a/templates/static/img/logos/partners/Torchlight-new.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Torchlight-small.png b/templates/static/img/logos/partners/Torchlight-small.png
deleted file mode 100644
index 80d230ee2da..00000000000
Binary files a/templates/static/img/logos/partners/Torchlight-small.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/UALinux_spp_logo.png b/templates/static/img/logos/partners/UALinux_spp_logo.png
deleted file mode 100644
index 6491ea803f8..00000000000
Binary files a/templates/static/img/logos/partners/UALinux_spp_logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/UltraEdit.png b/templates/static/img/logos/partners/UltraEdit.png
deleted file mode 100644
index 0a3d1ac6977..00000000000
Binary files a/templates/static/img/logos/partners/UltraEdit.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Unison.png b/templates/static/img/logos/partners/Unison.png
deleted file mode 100644
index 97549fa7f4f..00000000000
Binary files a/templates/static/img/logos/partners/Unison.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Unitrends.png b/templates/static/img/logos/partners/Unitrends.png
deleted file mode 100644
index b127f098c9c..00000000000
Binary files a/templates/static/img/logos/partners/Unitrends.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Unoware_logo.scaled.png.jpg b/templates/static/img/logos/partners/Unoware_logo.scaled.png.jpg
deleted file mode 100644
index 35126b690d6..00000000000
Binary files a/templates/static/img/logos/partners/Unoware_logo.scaled.png.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/Userful-new.jpg b/templates/static/img/logos/partners/Userful-new.jpg
deleted file mode 100644
index 77dc1c9ef54..00000000000
Binary files a/templates/static/img/logos/partners/Userful-new.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/VIPcom.png b/templates/static/img/logos/partners/VIPcom.png
deleted file mode 100644
index 3461f545517..00000000000
Binary files a/templates/static/img/logos/partners/VIPcom.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/VMWare.png b/templates/static/img/logos/partners/VMWare.png
deleted file mode 100644
index d7b3ae584c2..00000000000
Binary files a/templates/static/img/logos/partners/VMWare.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/VirtualBridges.png b/templates/static/img/logos/partners/VirtualBridges.png
deleted file mode 100644
index df7369d7676..00000000000
Binary files a/templates/static/img/logos/partners/VirtualBridges.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/VirtualConcepts.png.moved b/templates/static/img/logos/partners/VirtualConcepts.png.moved
deleted file mode 100644
index 82b1f0cde2b..00000000000
Binary files a/templates/static/img/logos/partners/VirtualConcepts.png.moved and /dev/null differ
diff --git a/templates/static/img/logos/partners/VirtualORGS_logo_scaled.png b/templates/static/img/logos/partners/VirtualORGS_logo_scaled.png
deleted file mode 100644
index 9ab505afa55..00000000000
Binary files a/templates/static/img/logos/partners/VirtualORGS_logo_scaled.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Vladster.png b/templates/static/img/logos/partners/Vladster.png
deleted file mode 100644
index 4f61069e035..00000000000
Binary files a/templates/static/img/logos/partners/Vladster.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Wavemaker.png b/templates/static/img/logos/partners/Wavemaker.png
deleted file mode 100644
index f86dc088271..00000000000
Binary files a/templates/static/img/logos/partners/Wavemaker.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/X-Tend.png b/templates/static/img/logos/partners/X-Tend.png
deleted file mode 100644
index 093a27a6538..00000000000
Binary files a/templates/static/img/logos/partners/X-Tend.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/ZSL.png b/templates/static/img/logos/partners/ZSL.png
deleted file mode 100644
index b546f5d8aef..00000000000
Binary files a/templates/static/img/logos/partners/ZSL.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/ZSL_.png b/templates/static/img/logos/partners/ZSL_.png
deleted file mode 100644
index b546f5d8aef..00000000000
Binary files a/templates/static/img/logos/partners/ZSL_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Zentyallogo.png b/templates/static/img/logos/partners/Zentyallogo.png
deleted file mode 100644
index 3cf122191a6..00000000000
Binary files a/templates/static/img/logos/partners/Zentyallogo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/Zylog.png b/templates/static/img/logos/partners/Zylog.png
deleted file mode 100644
index 83cd5eb9aa2..00000000000
Binary files a/templates/static/img/logos/partners/Zylog.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/abiss.png b/templates/static/img/logos/partners/abiss.png
deleted file mode 100644
index 2c75b6902d2..00000000000
Binary files a/templates/static/img/logos/partners/abiss.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/accountz.png b/templates/static/img/logos/partners/accountz.png
deleted file mode 100644
index 3bbafd62fa9..00000000000
Binary files a/templates/static/img/logos/partners/accountz.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/aceletLogo92x25.png b/templates/static/img/logos/partners/aceletLogo92x25.png
deleted file mode 100644
index 073f686694c..00000000000
Binary files a/templates/static/img/logos/partners/aceletLogo92x25.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/adconsulting-1.png b/templates/static/img/logos/partners/adconsulting-1.png
deleted file mode 100644
index 4b0a9269bfd..00000000000
Binary files a/templates/static/img/logos/partners/adconsulting-1.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/adconsulting.png b/templates/static/img/logos/partners/adconsulting.png
deleted file mode 100644
index db9173179a1..00000000000
Binary files a/templates/static/img/logos/partners/adconsulting.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/admelix_logo.png b/templates/static/img/logos/partners/admelix_logo.png
deleted file mode 100644
index 391ddfc0bc2..00000000000
Binary files a/templates/static/img/logos/partners/admelix_logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/alacos.png b/templates/static/img/logos/partners/alacos.png
deleted file mode 100644
index 7aad55f8ac1..00000000000
Binary files a/templates/static/img/logos/partners/alacos.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/alanta.png b/templates/static/img/logos/partners/alanta.png
deleted file mode 100644
index 103eab3978c..00000000000
Binary files a/templates/static/img/logos/partners/alanta.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/altkom-2.png b/templates/static/img/logos/partners/altkom-2.png
deleted file mode 100644
index e95edb6b059..00000000000
Binary files a/templates/static/img/logos/partners/altkom-2.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/altkom-3.png b/templates/static/img/logos/partners/altkom-3.png
deleted file mode 100644
index 567e6b2d0aa..00000000000
Binary files a/templates/static/img/logos/partners/altkom-3.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/ansteadlogo.png b/templates/static/img/logos/partners/ansteadlogo.png
deleted file mode 100644
index afbf0d76237..00000000000
Binary files a/templates/static/img/logos/partners/ansteadlogo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/archetech.png b/templates/static/img/logos/partners/archetech.png
deleted file mode 100644
index f6c131c06c6..00000000000
Binary files a/templates/static/img/logos/partners/archetech.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/arkeia.png b/templates/static/img/logos/partners/arkeia.png
deleted file mode 100644
index 2d9a7844d63..00000000000
Binary files a/templates/static/img/logos/partners/arkeia.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/arkeia_.png b/templates/static/img/logos/partners/arkeia_.png
deleted file mode 100644
index efdc76b7d4b..00000000000
Binary files a/templates/static/img/logos/partners/arkeia_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/arkeia__.png b/templates/static/img/logos/partners/arkeia__.png
deleted file mode 100644
index efdc76b7d4b..00000000000
Binary files a/templates/static/img/logos/partners/arkeia__.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/arm-logo.gif b/templates/static/img/logos/partners/arm-logo.gif
deleted file mode 100644
index 0a8691c33b0..00000000000
Binary files a/templates/static/img/logos/partners/arm-logo.gif and /dev/null differ
diff --git a/templates/static/img/logos/partners/ashisuto_s_scaled.jpg b/templates/static/img/logos/partners/ashisuto_s_scaled.jpg
deleted file mode 100644
index a454e20d41e..00000000000
Binary files a/templates/static/img/logos/partners/ashisuto_s_scaled.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/astrindo.png b/templates/static/img/logos/partners/astrindo.png
deleted file mode 100644
index ea5d152c743..00000000000
Binary files a/templates/static/img/logos/partners/astrindo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/asus_logo02.jpg b/templates/static/img/logos/partners/asus_logo02.jpg
deleted file mode 100644
index f4249abc918..00000000000
Binary files a/templates/static/img/logos/partners/asus_logo02.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/asus_logo02lowres.jpg b/templates/static/img/logos/partners/asus_logo02lowres.jpg
deleted file mode 100644
index 52f069b7549..00000000000
Binary files a/templates/static/img/logos/partners/asus_logo02lowres.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/axigen.png b/templates/static/img/logos/partners/axigen.png
deleted file mode 100644
index 72f4b8f6faa..00000000000
Binary files a/templates/static/img/logos/partners/axigen.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/b1-systems.png b/templates/static/img/logos/partners/b1-systems.png
deleted file mode 100644
index f9bbef17bda..00000000000
Binary files a/templates/static/img/logos/partners/b1-systems.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/beyondtrustlogo.jpeg b/templates/static/img/logos/partners/beyondtrustlogo.jpeg
deleted file mode 100644
index 9b45307ce5e..00000000000
Binary files a/templates/static/img/logos/partners/beyondtrustlogo.jpeg and /dev/null differ
diff --git a/templates/static/img/logos/partners/bitbone-1.png b/templates/static/img/logos/partners/bitbone-1.png
deleted file mode 100644
index e7ad04be855..00000000000
Binary files a/templates/static/img/logos/partners/bitbone-1.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/bluecherry.png b/templates/static/img/logos/partners/bluecherry.png
deleted file mode 100644
index 333f973a83c..00000000000
Binary files a/templates/static/img/logos/partners/bluecherry.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/bonitasoft.png b/templates/static/img/logos/partners/bonitasoft.png
deleted file mode 100644
index 598351a5904..00000000000
Binary files a/templates/static/img/logos/partners/bonitasoft.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/bricsys_logo.png b/templates/static/img/logos/partners/bricsys_logo.png
deleted file mode 100644
index f522f89b0b0..00000000000
Binary files a/templates/static/img/logos/partners/bricsys_logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/button-buy-support-small.png b/templates/static/img/logos/partners/button-buy-support-small.png
deleted file mode 100644
index af172ec02c1..00000000000
Binary files a/templates/static/img/logos/partners/button-buy-support-small.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/button-buy-support-small_.png b/templates/static/img/logos/partners/button-buy-support-small_.png
deleted file mode 100644
index af172ec02c1..00000000000
Binary files a/templates/static/img/logos/partners/button-buy-support-small_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/button-buy-support-small__.png b/templates/static/img/logos/partners/button-buy-support-small__.png
deleted file mode 100644
index af172ec02c1..00000000000
Binary files a/templates/static/img/logos/partners/button-buy-support-small__.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/button-buy-support-small___.png b/templates/static/img/logos/partners/button-buy-support-small___.png
deleted file mode 100644
index af172ec02c1..00000000000
Binary files a/templates/static/img/logos/partners/button-buy-support-small___.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/button-buy-support-small____.png b/templates/static/img/logos/partners/button-buy-support-small____.png
deleted file mode 100644
index af172ec02c1..00000000000
Binary files a/templates/static/img/logos/partners/button-buy-support-small____.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/cargol-1-medium.png b/templates/static/img/logos/partners/cargol-1-medium.png
deleted file mode 100644
index d1342b0dfca..00000000000
Binary files a/templates/static/img/logos/partners/cargol-1-medium.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/cargol-medium-1.png b/templates/static/img/logos/partners/cargol-medium-1.png
deleted file mode 100644
index 507cedfc146..00000000000
Binary files a/templates/static/img/logos/partners/cargol-medium-1.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/cargol-medium.png b/templates/static/img/logos/partners/cargol-medium.png
deleted file mode 100644
index 2a77f01c84e..00000000000
Binary files a/templates/static/img/logos/partners/cargol-medium.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/casalogic_logo.png b/templates/static/img/logos/partners/casalogic_logo.png
deleted file mode 100644
index 4ea92570ceb..00000000000
Binary files a/templates/static/img/logos/partners/casalogic_logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/catalyst_it_2002-1.png b/templates/static/img/logos/partners/catalyst_it_2002-1.png
deleted file mode 100644
index 0d38dccba01..00000000000
Binary files a/templates/static/img/logos/partners/catalyst_it_2002-1.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/catalyst_it_2002.png b/templates/static/img/logos/partners/catalyst_it_2002.png
deleted file mode 100644
index 88adde9c211..00000000000
Binary files a/templates/static/img/logos/partners/catalyst_it_2002.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/clarosvoip-1.png b/templates/static/img/logos/partners/clarosvoip-1.png
deleted file mode 100644
index 330b624cd38..00000000000
Binary files a/templates/static/img/logos/partners/clarosvoip-1.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/clarosvoip.png b/templates/static/img/logos/partners/clarosvoip.png
deleted file mode 100644
index 37faee6489f..00000000000
Binary files a/templates/static/img/logos/partners/clarosvoip.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/cloudkick.png b/templates/static/img/logos/partners/cloudkick.png
deleted file mode 100644
index 38d3812ff9c..00000000000
Binary files a/templates/static/img/logos/partners/cloudkick.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/cmdprompt.png b/templates/static/img/logos/partners/cmdprompt.png
deleted file mode 100644
index fc0dda68a86..00000000000
Binary files a/templates/static/img/logos/partners/cmdprompt.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/cms-1.png b/templates/static/img/logos/partners/cms-1.png
deleted file mode 100644
index 38e3050a28c..00000000000
Binary files a/templates/static/img/logos/partners/cms-1.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/cms.png b/templates/static/img/logos/partners/cms.png
deleted file mode 100644
index 4afe930adfd..00000000000
Binary files a/templates/static/img/logos/partners/cms.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/compumedia.png b/templates/static/img/logos/partners/compumedia.png
deleted file mode 100644
index 76a72dd7b60..00000000000
Binary files a/templates/static/img/logos/partners/compumedia.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/conversys.png b/templates/static/img/logos/partners/conversys.png
deleted file mode 100644
index 41bacee695b..00000000000
Binary files a/templates/static/img/logos/partners/conversys.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/couchbase_logo_final_SCALED.png b/templates/static/img/logos/partners/couchbase_logo_final_SCALED.png
deleted file mode 100644
index a187be64ae5..00000000000
Binary files a/templates/static/img/logos/partners/couchbase_logo_final_SCALED.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/couchbase_logo_final_SCALED_.png b/templates/static/img/logos/partners/couchbase_logo_final_SCALED_.png
deleted file mode 100644
index a187be64ae5..00000000000
Binary files a/templates/static/img/logos/partners/couchbase_logo_final_SCALED_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/couchbase_logo_final_SCALED__.png b/templates/static/img/logos/partners/couchbase_logo_final_SCALED__.png
deleted file mode 100644
index a187be64ae5..00000000000
Binary files a/templates/static/img/logos/partners/couchbase_logo_final_SCALED__.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/couchbase_logo_final_SCALED___.png b/templates/static/img/logos/partners/couchbase_logo_final_SCALED___.png
deleted file mode 100644
index 7a93c675c75..00000000000
Binary files a/templates/static/img/logos/partners/couchbase_logo_final_SCALED___.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/cpe.png b/templates/static/img/logos/partners/cpe.png
deleted file mode 100644
index f6a3fc4cae1..00000000000
Binary files a/templates/static/img/logos/partners/cpe.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/crealabs-1.png b/templates/static/img/logos/partners/crealabs-1.png
deleted file mode 100644
index 1e5f2115430..00000000000
Binary files a/templates/static/img/logos/partners/crealabs-1.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/crealabs.png b/templates/static/img/logos/partners/crealabs.png
deleted file mode 100644
index db5d33193f3..00000000000
Binary files a/templates/static/img/logos/partners/crealabs.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/csscorp1.png b/templates/static/img/logos/partners/csscorp1.png
deleted file mode 100644
index 4f1a8e166a2..00000000000
Binary files a/templates/static/img/logos/partners/csscorp1.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/cutter.png b/templates/static/img/logos/partners/cutter.png
deleted file mode 100644
index 1c03e3b840a..00000000000
Binary files a/templates/static/img/logos/partners/cutter.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/cybertec.png b/templates/static/img/logos/partners/cybertec.png
deleted file mode 100644
index a0005239f18..00000000000
Binary files a/templates/static/img/logos/partners/cybertec.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/directleap-1.png b/templates/static/img/logos/partners/directleap-1.png
deleted file mode 100644
index 3e9cab84c83..00000000000
Binary files a/templates/static/img/logos/partners/directleap-1.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/directleap-1_.png b/templates/static/img/logos/partners/directleap-1_.png
deleted file mode 100644
index 54f01865a14..00000000000
Binary files a/templates/static/img/logos/partners/directleap-1_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/directleap-1__.png b/templates/static/img/logos/partners/directleap-1__.png
deleted file mode 100644
index 5f9d85aaf06..00000000000
Binary files a/templates/static/img/logos/partners/directleap-1__.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/directleap-1___.png b/templates/static/img/logos/partners/directleap-1___.png
deleted file mode 100644
index 80648396966..00000000000
Binary files a/templates/static/img/logos/partners/directleap-1___.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/directleap-1____.png b/templates/static/img/logos/partners/directleap-1____.png
deleted file mode 100644
index 24a5797c4f1..00000000000
Binary files a/templates/static/img/logos/partners/directleap-1____.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/directleap-1_____.png b/templates/static/img/logos/partners/directleap-1_____.png
deleted file mode 100644
index 13a68798524..00000000000
Binary files a/templates/static/img/logos/partners/directleap-1_____.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/directleap-1______.png b/templates/static/img/logos/partners/directleap-1______.png
deleted file mode 100644
index ebaca643f6f..00000000000
Binary files a/templates/static/img/logos/partners/directleap-1______.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/directleap.png b/templates/static/img/logos/partners/directleap.png
deleted file mode 100644
index 6e4666f794f..00000000000
Binary files a/templates/static/img/logos/partners/directleap.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/directleap_.png b/templates/static/img/logos/partners/directleap_.png
deleted file mode 100644
index 2e68d345d22..00000000000
Binary files a/templates/static/img/logos/partners/directleap_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/directleap__.png b/templates/static/img/logos/partners/directleap__.png
deleted file mode 100644
index 6e4666f794f..00000000000
Binary files a/templates/static/img/logos/partners/directleap__.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/domsense_180x118.png b/templates/static/img/logos/partners/domsense_180x118.png
deleted file mode 100644
index 46d353e5288..00000000000
Binary files a/templates/static/img/logos/partners/domsense_180x118.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/eRacks.png b/templates/static/img/logos/partners/eRacks.png
deleted file mode 100644
index ee4dd41c964..00000000000
Binary files a/templates/static/img/logos/partners/eRacks.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/eRacks_1.png b/templates/static/img/logos/partners/eRacks_1.png
deleted file mode 100644
index b21dc9c6585..00000000000
Binary files a/templates/static/img/logos/partners/eRacks_1.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/eRacks_2.png b/templates/static/img/logos/partners/eRacks_2.png
deleted file mode 100644
index 014d34ae4bf..00000000000
Binary files a/templates/static/img/logos/partners/eRacks_2.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/efficientpclogo18.png b/templates/static/img/logos/partners/efficientpclogo18.png
deleted file mode 100644
index 60726fda294..00000000000
Binary files a/templates/static/img/logos/partners/efficientpclogo18.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/ego.png b/templates/static/img/logos/partners/ego.png
deleted file mode 100644
index 069b56a6f60..00000000000
Binary files a/templates/static/img/logos/partners/ego.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/emc.png b/templates/static/img/logos/partners/emc.png
deleted file mode 100755
index 83d2d716c15..00000000000
Binary files a/templates/static/img/logos/partners/emc.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/emergen.png b/templates/static/img/logos/partners/emergen.png
deleted file mode 100644
index d73cf0c323b..00000000000
Binary files a/templates/static/img/logos/partners/emergen.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/emulex_logo.png b/templates/static/img/logos/partners/emulex_logo.png
deleted file mode 100644
index 8a12382e907..00000000000
Binary files a/templates/static/img/logos/partners/emulex_logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/enjay.png b/templates/static/img/logos/partners/enjay.png
deleted file mode 100644
index 57fb6a60ee6..00000000000
Binary files a/templates/static/img/logos/partners/enjay.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/ephestus.png b/templates/static/img/logos/partners/ephestus.png
deleted file mode 100644
index 1f33470e8ff..00000000000
Binary files a/templates/static/img/logos/partners/ephestus.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/eracks.png.moved b/templates/static/img/logos/partners/eracks.png.moved
deleted file mode 100644
index 64ee6e85e4c..00000000000
Binary files a/templates/static/img/logos/partners/eracks.png.moved and /dev/null differ
diff --git a/templates/static/img/logos/partners/eracks_web_logo2.png b/templates/static/img/logos/partners/eracks_web_logo2.png
deleted file mode 100644
index 173bc83de49..00000000000
Binary files a/templates/static/img/logos/partners/eracks_web_logo2.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/eracks_web_logo3.png b/templates/static/img/logos/partners/eracks_web_logo3.png
deleted file mode 100644
index 3a84d51c7b6..00000000000
Binary files a/templates/static/img/logos/partners/eracks_web_logo3.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/ewe.png b/templates/static/img/logos/partners/ewe.png
deleted file mode 100644
index 0841e265c01..00000000000
Binary files a/templates/static/img/logos/partners/ewe.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/falconer.png b/templates/static/img/logos/partners/falconer.png
deleted file mode 100644
index 70b0723abe0..00000000000
Binary files a/templates/static/img/logos/partners/falconer.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/fermat.png b/templates/static/img/logos/partners/fermat.png
deleted file mode 100644
index d8e99b088c7..00000000000
Binary files a/templates/static/img/logos/partners/fermat.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/fleten.netLogo1.jpg b/templates/static/img/logos/partners/fleten.netLogo1.jpg
deleted file mode 100644
index 2a262d88546..00000000000
Binary files a/templates/static/img/logos/partners/fleten.netLogo1.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/fluendo.png b/templates/static/img/logos/partners/fluendo.png
deleted file mode 100644
index 702657df552..00000000000
Binary files a/templates/static/img/logos/partners/fluendo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/foradian_logo.png b/templates/static/img/logos/partners/foradian_logo.png
deleted file mode 100644
index 3c53d034538..00000000000
Binary files a/templates/static/img/logos/partners/foradian_logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/foradian_logoscaled.png b/templates/static/img/logos/partners/foradian_logoscaled.png
deleted file mode 100644
index 7bbbdf9ae35..00000000000
Binary files a/templates/static/img/logos/partners/foradian_logoscaled.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/foradian_logoscaled_.png b/templates/static/img/logos/partners/foradian_logoscaled_.png
deleted file mode 100644
index 7bbbdf9ae35..00000000000
Binary files a/templates/static/img/logos/partners/foradian_logoscaled_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/frogfoot_logo.png b/templates/static/img/logos/partners/frogfoot_logo.png
deleted file mode 100644
index 8b1ecee592f..00000000000
Binary files a/templates/static/img/logos/partners/frogfoot_logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/fusis.png b/templates/static/img/logos/partners/fusis.png
deleted file mode 100644
index 3ebf0a5a687..00000000000
Binary files a/templates/static/img/logos/partners/fusis.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/geego_logo-for-ubuntu2.jpg b/templates/static/img/logos/partners/geego_logo-for-ubuntu2.jpg
deleted file mode 100644
index 404f8bb9b94..00000000000
Binary files a/templates/static/img/logos/partners/geego_logo-for-ubuntu2.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/genos.png b/templates/static/img/logos/partners/genos.png
deleted file mode 100644
index 8b344bd23af..00000000000
Binary files a/templates/static/img/logos/partners/genos.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/ggs256.png b/templates/static/img/logos/partners/ggs256.png
deleted file mode 100644
index dd579a88816..00000000000
Binary files a/templates/static/img/logos/partners/ggs256.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/graebert_vert.jpg b/templates/static/img/logos/partners/graebert_vert.jpg
deleted file mode 100644
index 2237aaf957a..00000000000
Binary files a/templates/static/img/logos/partners/graebert_vert.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/graebert_vert_.jpg b/templates/static/img/logos/partners/graebert_vert_.jpg
deleted file mode 100644
index 2237aaf957a..00000000000
Binary files a/templates/static/img/logos/partners/graebert_vert_.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/graebert_vert_scaled.jpg b/templates/static/img/logos/partners/graebert_vert_scaled.jpg
deleted file mode 100644
index f16a27bba08..00000000000
Binary files a/templates/static/img/logos/partners/graebert_vert_scaled.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/grox.png b/templates/static/img/logos/partners/grox.png
deleted file mode 100644
index d8041d6ae03..00000000000
Binary files a/templates/static/img/logos/partners/grox.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/grupozip.png b/templates/static/img/logos/partners/grupozip.png
deleted file mode 100644
index 609f3d68b45..00000000000
Binary files a/templates/static/img/logos/partners/grupozip.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/hodgepodge_final_logo_scaled.jpg b/templates/static/img/logos/partners/hodgepodge_final_logo_scaled.jpg
deleted file mode 100644
index 5e693cf9f4a..00000000000
Binary files a/templates/static/img/logos/partners/hodgepodge_final_logo_scaled.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/hplogo2012.jpg b/templates/static/img/logos/partners/hplogo2012.jpg
deleted file mode 100644
index 5a2522acea5..00000000000
Binary files a/templates/static/img/logos/partners/hplogo2012.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/i-Layer.png b/templates/static/img/logos/partners/i-Layer.png
deleted file mode 100644
index dd9e8089a61..00000000000
Binary files a/templates/static/img/logos/partners/i-Layer.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/i4waresoftwarelogo2.png b/templates/static/img/logos/partners/i4waresoftwarelogo2.png
deleted file mode 100644
index 7620d3a2049..00000000000
Binary files a/templates/static/img/logos/partners/i4waresoftwarelogo2.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/i4waresoftwarelogo2_.png b/templates/static/img/logos/partners/i4waresoftwarelogo2_.png
deleted file mode 100644
index 7620d3a2049..00000000000
Binary files a/templates/static/img/logos/partners/i4waresoftwarelogo2_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/iconecta.png b/templates/static/img/logos/partners/iconecta.png
deleted file mode 100644
index d57cf7556a6..00000000000
Binary files a/templates/static/img/logos/partners/iconecta.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/ictivity.png b/templates/static/img/logos/partners/ictivity.png
deleted file mode 100644
index 67ca2230225..00000000000
Binary files a/templates/static/img/logos/partners/ictivity.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/iks-logo.png b/templates/static/img/logos/partners/iks-logo.png
deleted file mode 100644
index 0512bbb37c9..00000000000
Binary files a/templates/static/img/logos/partners/iks-logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/impi-1.png b/templates/static/img/logos/partners/impi-1.png
deleted file mode 100644
index 9ea1b24ae67..00000000000
Binary files a/templates/static/img/logos/partners/impi-1.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/inlab.png b/templates/static/img/logos/partners/inlab.png
deleted file mode 100644
index c28711c72d2..00000000000
Binary files a/templates/static/img/logos/partners/inlab.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/integrum.png b/templates/static/img/logos/partners/integrum.png
deleted file mode 100644
index d5df76a2f4d..00000000000
Binary files a/templates/static/img/logos/partners/integrum.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/intel_logo.png b/templates/static/img/logos/partners/intel_logo.png
deleted file mode 100644
index ea8b0c55808..00000000000
Binary files a/templates/static/img/logos/partners/intel_logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/interface.png b/templates/static/img/logos/partners/interface.png
deleted file mode 100644
index 39de988720e..00000000000
Binary files a/templates/static/img/logos/partners/interface.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/kSystems.png b/templates/static/img/logos/partners/kSystems.png
deleted file mode 100644
index cf14b46d573..00000000000
Binary files a/templates/static/img/logos/partners/kSystems.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/karmasphere_logo_scaled.jpg b/templates/static/img/logos/partners/karmasphere_logo_scaled.jpg
deleted file mode 100644
index ab2b6d15f17..00000000000
Binary files a/templates/static/img/logos/partners/karmasphere_logo_scaled.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/karmine.png b/templates/static/img/logos/partners/karmine.png
deleted file mode 100644
index 94dddaa85ed..00000000000
Binary files a/templates/static/img/logos/partners/karmine.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/kirolan.png b/templates/static/img/logos/partners/kirolan.png
deleted file mode 100644
index 36c938d6087..00000000000
Binary files a/templates/static/img/logos/partners/kirolan.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/knowledgetree.png b/templates/static/img/logos/partners/knowledgetree.png
deleted file mode 100644
index 69b9d1b2679..00000000000
Binary files a/templates/static/img/logos/partners/knowledgetree.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/koolu-1.png b/templates/static/img/logos/partners/koolu-1.png
deleted file mode 100644
index 3a4e6030b89..00000000000
Binary files a/templates/static/img/logos/partners/koolu-1.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/koolu.png b/templates/static/img/logos/partners/koolu.png
deleted file mode 100644
index 897c108295f..00000000000
Binary files a/templates/static/img/logos/partners/koolu.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/korus.png b/templates/static/img/logos/partners/korus.png
deleted file mode 100644
index b96e3df675e..00000000000
Binary files a/templates/static/img/logos/partners/korus.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/lbx-log.png b/templates/static/img/logos/partners/lbx-log.png
deleted file mode 100644
index 018e526c45a..00000000000
Binary files a/templates/static/img/logos/partners/lbx-log.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/lenovohighres.png b/templates/static/img/logos/partners/lenovohighres.png
deleted file mode 100644
index c1feb41f646..00000000000
Binary files a/templates/static/img/logos/partners/lenovohighres.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/lenovolowres.jpg b/templates/static/img/logos/partners/lenovolowres.jpg
deleted file mode 100644
index c1d204208eb..00000000000
Binary files a/templates/static/img/logos/partners/lenovolowres.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/lgsripplelogo.png b/templates/static/img/logos/partners/lgsripplelogo.png
deleted file mode 100644
index 48155325684..00000000000
Binary files a/templates/static/img/logos/partners/lgsripplelogo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/linagora.png b/templates/static/img/logos/partners/linagora.png
deleted file mode 100644
index eea6e5f3552..00000000000
Binary files a/templates/static/img/logos/partners/linagora.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/linalis.png b/templates/static/img/logos/partners/linalis.png
deleted file mode 100644
index 909df4b1f22..00000000000
Binary files a/templates/static/img/logos/partners/linalis.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/linuxit.png b/templates/static/img/logos/partners/linuxit.png
deleted file mode 100644
index 86d96ed9fbb..00000000000
Binary files a/templates/static/img/logos/partners/linuxit.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/linvox.png b/templates/static/img/logos/partners/linvox.png
deleted file mode 100644
index 1de1df218cc..00000000000
Binary files a/templates/static/img/logos/partners/linvox.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/lnx_logo_top.png b/templates/static/img/logos/partners/lnx_logo_top.png
deleted file mode 100644
index 980b034d843..00000000000
Binary files a/templates/static/img/logos/partners/lnx_logo_top.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/logo-eNovance-2011.png b/templates/static/img/logos/partners/logo-eNovance-2011.png
deleted file mode 100644
index 58e7fd70a80..00000000000
Binary files a/templates/static/img/logos/partners/logo-eNovance-2011.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/logo-eNovance-2011scaled.png b/templates/static/img/logos/partners/logo-eNovance-2011scaled.png
deleted file mode 100644
index 8b3584475d4..00000000000
Binary files a/templates/static/img/logos/partners/logo-eNovance-2011scaled.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/logo.jpg b/templates/static/img/logos/partners/logo.jpg
deleted file mode 100644
index 1a4dedac7b9..00000000000
Binary files a/templates/static/img/logos/partners/logo.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/logo1.jpg b/templates/static/img/logos/partners/logo1.jpg
deleted file mode 100644
index 651cd12676d..00000000000
Binary files a/templates/static/img/logos/partners/logo1.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/logoInfocom.png b/templates/static/img/logos/partners/logoInfocom.png
deleted file mode 100644
index 16b8635aba9..00000000000
Binary files a/templates/static/img/logos/partners/logoInfocom.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/logoOficinaLivre-high.png b/templates/static/img/logos/partners/logoOficinaLivre-high.png
deleted file mode 100644
index 1a8b57fb2dc..00000000000
Binary files a/templates/static/img/logos/partners/logoOficinaLivre-high.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/logoOficinaLivre-high2.png b/templates/static/img/logos/partners/logoOficinaLivre-high2.png
deleted file mode 100644
index 0ff5ee97c0d..00000000000
Binary files a/templates/static/img/logos/partners/logoOficinaLivre-high2.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/logo_amd.png b/templates/static/img/logos/partners/logo_amd.png
deleted file mode 100644
index c7fc1ea82e9..00000000000
Binary files a/templates/static/img/logos/partners/logo_amd.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/logo_f13_fundo_scaled.png b/templates/static/img/logos/partners/logo_f13_fundo_scaled.png
deleted file mode 100644
index 544164af2bc..00000000000
Binary files a/templates/static/img/logos/partners/logo_f13_fundo_scaled.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/logo_f13_fundo_transparente.png b/templates/static/img/logos/partners/logo_f13_fundo_transparente.png
deleted file mode 100644
index 610992d2477..00000000000
Binary files a/templates/static/img/logos/partners/logo_f13_fundo_transparente.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/logomarca_2008.jpg b/templates/static/img/logos/partners/logomarca_2008.jpg
deleted file mode 100644
index 20915de9d2a..00000000000
Binary files a/templates/static/img/logos/partners/logomarca_2008.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/logomarca_2008_.jpg b/templates/static/img/logos/partners/logomarca_2008_.jpg
deleted file mode 100644
index 20915de9d2a..00000000000
Binary files a/templates/static/img/logos/partners/logomarca_2008_.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/logomarca_2008_v2.jpg b/templates/static/img/logos/partners/logomarca_2008_v2.jpg
deleted file mode 100644
index d90f16b8ed5..00000000000
Binary files a/templates/static/img/logos/partners/logomarca_2008_v2.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/lsi_logo.png b/templates/static/img/logos/partners/lsi_logo.png
deleted file mode 100644
index 6e86bf727a3..00000000000
Binary files a/templates/static/img/logos/partners/lsi_logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/magnolia.png b/templates/static/img/logos/partners/magnolia.png
deleted file mode 100644
index b84eee0843b..00000000000
Binary files a/templates/static/img/logos/partners/magnolia.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/maldicorelogo.png b/templates/static/img/logos/partners/maldicorelogo.png
deleted file mode 100644
index 47b23788719..00000000000
Binary files a/templates/static/img/logos/partners/maldicorelogo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/mapr_logo.jpg b/templates/static/img/logos/partners/mapr_logo.jpg
deleted file mode 100644
index 52132537f7a..00000000000
Binary files a/templates/static/img/logos/partners/mapr_logo.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/mapr_logo_greyscale.jpg b/templates/static/img/logos/partners/mapr_logo_greyscale.jpg
deleted file mode 100644
index 02c43a0e8bc..00000000000
Binary files a/templates/static/img/logos/partners/mapr_logo_greyscale.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/mcwhirter.png b/templates/static/img/logos/partners/mcwhirter.png
deleted file mode 100644
index 5c69c5864ff..00000000000
Binary files a/templates/static/img/logos/partners/mcwhirter.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/mcwhirter_.png b/templates/static/img/logos/partners/mcwhirter_.png
deleted file mode 100644
index ab4849f9906..00000000000
Binary files a/templates/static/img/logos/partners/mcwhirter_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/me.png b/templates/static/img/logos/partners/me.png
deleted file mode 100644
index 94df84eda31..00000000000
Binary files a/templates/static/img/logos/partners/me.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/me_1.png b/templates/static/img/logos/partners/me_1.png
deleted file mode 100644
index 94df84eda31..00000000000
Binary files a/templates/static/img/logos/partners/me_1.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/meiburg_small.png b/templates/static/img/logos/partners/meiburg_small.png
deleted file mode 100644
index 1dd4932d798..00000000000
Binary files a/templates/static/img/logos/partners/meiburg_small.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/meso.png b/templates/static/img/logos/partners/meso.png
deleted file mode 100644
index 1ea1cba6b5d..00000000000
Binary files a/templates/static/img/logos/partners/meso.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/mingos.png b/templates/static/img/logos/partners/mingos.png
deleted file mode 100644
index 8938581a4f5..00000000000
Binary files a/templates/static/img/logos/partners/mingos.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/msc.png b/templates/static/img/logos/partners/msc.png
deleted file mode 100644
index 01ad10b102b..00000000000
Binary files a/templates/static/img/logos/partners/msc.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/mulesoft.png b/templates/static/img/logos/partners/mulesoft.png
deleted file mode 100644
index 206cb74705d..00000000000
Binary files a/templates/static/img/logos/partners/mulesoft.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/muli_logo_scaled.png b/templates/static/img/logos/partners/muli_logo_scaled.png
deleted file mode 100644
index dfb18ae2a65..00000000000
Binary files a/templates/static/img/logos/partners/muli_logo_scaled.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/mythostech.png b/templates/static/img/logos/partners/mythostech.png
deleted file mode 100644
index 1f1d51e897c..00000000000
Binary files a/templates/static/img/logos/partners/mythostech.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/networksolutions.png b/templates/static/img/logos/partners/networksolutions.png
deleted file mode 100644
index c58a081d73f..00000000000
Binary files a/templates/static/img/logos/partners/networksolutions.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/netzagentur_small.png b/templates/static/img/logos/partners/netzagentur_small.png
deleted file mode 100644
index 4ef4e582abf..00000000000
Binary files a/templates/static/img/logos/partners/netzagentur_small.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/nuisoft.png b/templates/static/img/logos/partners/nuisoft.png
deleted file mode 100644
index b8a6d857580..00000000000
Binary files a/templates/static/img/logos/partners/nuisoft.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/nuxeo_logo_black.png b/templates/static/img/logos/partners/nuxeo_logo_black.png
deleted file mode 100644
index aa7a58a3215..00000000000
Binary files a/templates/static/img/logos/partners/nuxeo_logo_black.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/nuxeo_logo_black_scaled.png b/templates/static/img/logos/partners/nuxeo_logo_black_scaled.png
deleted file mode 100644
index 04ff5e56173..00000000000
Binary files a/templates/static/img/logos/partners/nuxeo_logo_black_scaled.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/nuxeo_logo_black_scaled_.png b/templates/static/img/logos/partners/nuxeo_logo_black_scaled_.png
deleted file mode 100644
index 6ec00e8559f..00000000000
Binary files a/templates/static/img/logos/partners/nuxeo_logo_black_scaled_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/nuxeo_logo_black_scaled__.png b/templates/static/img/logos/partners/nuxeo_logo_black_scaled__.png
deleted file mode 100644
index 05cc7f19aa6..00000000000
Binary files a/templates/static/img/logos/partners/nuxeo_logo_black_scaled__.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/nvidia_logo.png b/templates/static/img/logos/partners/nvidia_logo.png
deleted file mode 100644
index ecc4c614db9..00000000000
Binary files a/templates/static/img/logos/partners/nvidia_logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/obsidian.jpg b/templates/static/img/logos/partners/obsidian.jpg
deleted file mode 100644
index 4d399dc8652..00000000000
Binary files a/templates/static/img/logos/partners/obsidian.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/obsidian_logo-1.png b/templates/static/img/logos/partners/obsidian_logo-1.png
deleted file mode 100644
index 9089dfe58bb..00000000000
Binary files a/templates/static/img/logos/partners/obsidian_logo-1.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/obsidian_logo.png b/templates/static/img/logos/partners/obsidian_logo.png
deleted file mode 100644
index e7d409f801d..00000000000
Binary files a/templates/static/img/logos/partners/obsidian_logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/obsidian_logo_.png b/templates/static/img/logos/partners/obsidian_logo_.png
deleted file mode 100644
index 0143f992315..00000000000
Binary files a/templates/static/img/logos/partners/obsidian_logo_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/oflogo.png b/templates/static/img/logos/partners/oflogo.png
deleted file mode 100644
index 85f1e0840c4..00000000000
Binary files a/templates/static/img/logos/partners/oflogo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/openbravo.png b/templates/static/img/logos/partners/openbravo.png
deleted file mode 100644
index edf6dac20ff..00000000000
Binary files a/templates/static/img/logos/partners/openbravo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/openbravo__.png b/templates/static/img/logos/partners/openbravo__.png
deleted file mode 100644
index 88febaf1ff3..00000000000
Binary files a/templates/static/img/logos/partners/openbravo__.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/opennebula-c12g-partner-72.jpg b/templates/static/img/logos/partners/opennebula-c12g-partner-72.jpg
deleted file mode 100644
index 4bf57eaa968..00000000000
Binary files a/templates/static/img/logos/partners/opennebula-c12g-partner-72.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/openoffice.nl.png b/templates/static/img/logos/partners/openoffice.nl.png
deleted file mode 100644
index 116816f6ea8..00000000000
Binary files a/templates/static/img/logos/partners/openoffice.nl.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/openqrm.png b/templates/static/img/logos/partners/openqrm.png
deleted file mode 100644
index 10af4d68253..00000000000
Binary files a/templates/static/img/logos/partners/openqrm.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/opensense.png b/templates/static/img/logos/partners/opensense.png
deleted file mode 100644
index 415526531f4..00000000000
Binary files a/templates/static/img/logos/partners/opensense.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/opmon_by_opservices_scaled.jpg b/templates/static/img/logos/partners/opmon_by_opservices_scaled.jpg
deleted file mode 100644
index 20ce28003c1..00000000000
Binary files a/templates/static/img/logos/partners/opmon_by_opservices_scaled.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/opso-logo.png b/templates/static/img/logos/partners/opso-logo.png
deleted file mode 100644
index 692dfcf51f0..00000000000
Binary files a/templates/static/img/logos/partners/opso-logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/opsview-logo.scaled.png b/templates/static/img/logos/partners/opsview-logo.scaled.png
deleted file mode 100644
index 1c4880908fb..00000000000
Binary files a/templates/static/img/logos/partners/opsview-logo.scaled.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/orizon.png b/templates/static/img/logos/partners/orizon.png
deleted file mode 100644
index cbf93cea4d9..00000000000
Binary files a/templates/static/img/logos/partners/orizon.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/parallels.png b/templates/static/img/logos/partners/parallels.png
deleted file mode 100644
index 46f4a09384f..00000000000
Binary files a/templates/static/img/logos/partners/parallels.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/pertec.png b/templates/static/img/logos/partners/pertec.png
deleted file mode 100644
index 45953ef48f1..00000000000
Binary files a/templates/static/img/logos/partners/pertec.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/presens.png b/templates/static/img/logos/partners/presens.png
deleted file mode 100644
index 651be7620af..00000000000
Binary files a/templates/static/img/logos/partners/presens.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/probusiness.png b/templates/static/img/logos/partners/probusiness.png
deleted file mode 100644
index 391367ec2a3..00000000000
Binary files a/templates/static/img/logos/partners/probusiness.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/prodigyds-1.png b/templates/static/img/logos/partners/prodigyds-1.png
deleted file mode 100644
index b79768e57d4..00000000000
Binary files a/templates/static/img/logos/partners/prodigyds-1.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/puppet-labs-black.png b/templates/static/img/logos/partners/puppet-labs-black.png
deleted file mode 100644
index d79794eba24..00000000000
Binary files a/templates/static/img/logos/partners/puppet-labs-black.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/r3_technologies_with_slogan.png b/templates/static/img/logos/partners/r3_technologies_with_slogan.png
deleted file mode 100644
index b978d5efd6c..00000000000
Binary files a/templates/static/img/logos/partners/r3_technologies_with_slogan.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/randr.png b/templates/static/img/logos/partners/randr.png
deleted file mode 100644
index 64122d28040..00000000000
Binary files a/templates/static/img/logos/partners/randr.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/realnetworks.png b/templates/static/img/logos/partners/realnetworks.png
deleted file mode 100644
index 0da547daf9d..00000000000
Binary files a/templates/static/img/logos/partners/realnetworks.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/redtel.png b/templates/static/img/logos/partners/redtel.png
deleted file mode 100644
index d837e23848a..00000000000
Binary files a/templates/static/img/logos/partners/redtel.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/revolutionlinux.png b/templates/static/img/logos/partners/revolutionlinux.png
deleted file mode 100644
index 339cb9338d0..00000000000
Binary files a/templates/static/img/logos/partners/revolutionlinux.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/rice.png b/templates/static/img/logos/partners/rice.png
deleted file mode 100644
index 79951368dd1..00000000000
Binary files a/templates/static/img/logos/partners/rice.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/rightscale_logo.png b/templates/static/img/logos/partners/rightscale_logo.png
deleted file mode 100644
index 7276a6c42ce..00000000000
Binary files a/templates/static/img/logos/partners/rightscale_logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/riptano-logo_scaled.png b/templates/static/img/logos/partners/riptano-logo_scaled.png
deleted file mode 100644
index 014b43b343e..00000000000
Binary files a/templates/static/img/logos/partners/riptano-logo_scaled.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/rnb.png b/templates/static/img/logos/partners/rnb.png
deleted file mode 100644
index 6fb7eebae12..00000000000
Binary files a/templates/static/img/logos/partners/rnb.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/rplp_log_rgb_200_gif.gif b/templates/static/img/logos/partners/rplp_log_rgb_200_gif.gif
deleted file mode 100644
index 3278a4d4cc7..00000000000
Binary files a/templates/static/img/logos/partners/rplp_log_rgb_200_gif.gif and /dev/null differ
diff --git a/templates/static/img/logos/partners/rrLogo.png b/templates/static/img/logos/partners/rrLogo.png
deleted file mode 100644
index 511c574730b..00000000000
Binary files a/templates/static/img/logos/partners/rrLogo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/ruffdogs_logo.png b/templates/static/img/logos/partners/ruffdogs_logo.png
deleted file mode 100644
index de74f8d25e0..00000000000
Binary files a/templates/static/img/logos/partners/ruffdogs_logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/safesquid-logo.png b/templates/static/img/logos/partners/safesquid-logo.png
deleted file mode 100644
index 300fd1dabb6..00000000000
Binary files a/templates/static/img/logos/partners/safesquid-logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/safew.png b/templates/static/img/logos/partners/safew.png
deleted file mode 100644
index 4ae17caafbc..00000000000
Binary files a/templates/static/img/logos/partners/safew.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/scalr_.png b/templates/static/img/logos/partners/scalr_.png
deleted file mode 100644
index a7d7b006307..00000000000
Binary files a/templates/static/img/logos/partners/scalr_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/seclinux.png b/templates/static/img/logos/partners/seclinux.png
deleted file mode 100644
index a2c0db20dac..00000000000
Binary files a/templates/static/img/logos/partners/seclinux.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/silverstrand.png b/templates/static/img/logos/partners/silverstrand.png
deleted file mode 100644
index 6dfcd3becc4..00000000000
Binary files a/templates/static/img/logos/partners/silverstrand.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/sirius.png b/templates/static/img/logos/partners/sirius.png
deleted file mode 100644
index a44ac62e19f..00000000000
Binary files a/templates/static/img/logos/partners/sirius.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/skylogo.png b/templates/static/img/logos/partners/skylogo.png
deleted file mode 100644
index 7049263e189..00000000000
Binary files a/templates/static/img/logos/partners/skylogo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/sm-new-AI-logo.jpg b/templates/static/img/logos/partners/sm-new-AI-logo.jpg
deleted file mode 100644
index 2a32f584961..00000000000
Binary files a/templates/static/img/logos/partners/sm-new-AI-logo.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/sm-new-AI-logo.png b/templates/static/img/logos/partners/sm-new-AI-logo.png
deleted file mode 100644
index 7dac661093e..00000000000
Binary files a/templates/static/img/logos/partners/sm-new-AI-logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/smartapp-logo.png b/templates/static/img/logos/partners/smartapp-logo.png
deleted file mode 100644
index e612844d164..00000000000
Binary files a/templates/static/img/logos/partners/smartapp-logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/specifix.png b/templates/static/img/logos/partners/specifix.png
deleted file mode 100644
index 703700fa02b..00000000000
Binary files a/templates/static/img/logos/partners/specifix.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/stromboli.png b/templates/static/img/logos/partners/stromboli.png
deleted file mode 100644
index d739f44dd63..00000000000
Binary files a/templates/static/img/logos/partners/stromboli.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/swsoft.png b/templates/static/img/logos/partners/swsoft.png
deleted file mode 100644
index d9e979b820a..00000000000
Binary files a/templates/static/img/logos/partners/swsoft.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/swsoft_.png b/templates/static/img/logos/partners/swsoft_.png
deleted file mode 100644
index 14ac5bbb062..00000000000
Binary files a/templates/static/img/logos/partners/swsoft_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/system76-sml.png b/templates/static/img/logos/partners/system76-sml.png
deleted file mode 100644
index 4d3f51ee0e4..00000000000
Binary files a/templates/static/img/logos/partners/system76-sml.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/technosec.png b/templates/static/img/logos/partners/technosec.png
deleted file mode 100644
index da06794e840..00000000000
Binary files a/templates/static/img/logos/partners/technosec.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/tersus.png b/templates/static/img/logos/partners/tersus.png
deleted file mode 100644
index 7f8336fe3cc..00000000000
Binary files a/templates/static/img/logos/partners/tersus.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/teutonet.png b/templates/static/img/logos/partners/teutonet.png
deleted file mode 100644
index ac97d8a3ff7..00000000000
Binary files a/templates/static/img/logos/partners/teutonet.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/tieturi.png b/templates/static/img/logos/partners/tieturi.png
deleted file mode 100644
index a6185149db2..00000000000
Binary files a/templates/static/img/logos/partners/tieturi.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/toltech_.png b/templates/static/img/logos/partners/toltech_.png
deleted file mode 100644
index 53cd8546016..00000000000
Binary files a/templates/static/img/logos/partners/toltech_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/tuki.png b/templates/static/img/logos/partners/tuki.png
deleted file mode 100644
index 8427fa8e64f..00000000000
Binary files a/templates/static/img/logos/partners/tuki.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/turnkey_.png b/templates/static/img/logos/partners/turnkey_.png
deleted file mode 100644
index fcac06e880a..00000000000
Binary files a/templates/static/img/logos/partners/turnkey_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/ulfix.png b/templates/static/img/logos/partners/ulfix.png
deleted file mode 100644
index 99b7de2135c..00000000000
Binary files a/templates/static/img/logos/partners/ulfix.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/ulfix_.png b/templates/static/img/logos/partners/ulfix_.png
deleted file mode 100644
index 0b63df6e164..00000000000
Binary files a/templates/static/img/logos/partners/ulfix_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/unovyx_large_logo_scaled.png b/templates/static/img/logos/partners/unovyx_large_logo_scaled.png
deleted file mode 100644
index d964ddca922..00000000000
Binary files a/templates/static/img/logos/partners/unovyx_large_logo_scaled.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/userful.png b/templates/static/img/logos/partners/userful.png
deleted file mode 100644
index d0b35cf906a..00000000000
Binary files a/templates/static/img/logos/partners/userful.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/userful_.png b/templates/static/img/logos/partners/userful_.png
deleted file mode 100644
index 26df03d651b..00000000000
Binary files a/templates/static/img/logos/partners/userful_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/usharesoft_Scaled.png b/templates/static/img/logos/partners/usharesoft_Scaled.png
deleted file mode 100644
index cae3b923104..00000000000
Binary files a/templates/static/img/logos/partners/usharesoft_Scaled.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/usharesoft_Scaled_.png b/templates/static/img/logos/partners/usharesoft_Scaled_.png
deleted file mode 100644
index 764a7fd39d6..00000000000
Binary files a/templates/static/img/logos/partners/usharesoft_Scaled_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/virtualappliances.png b/templates/static/img/logos/partners/virtualappliances.png
deleted file mode 100644
index 73ed046a86c..00000000000
Binary files a/templates/static/img/logos/partners/virtualappliances.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/virtualconcepts.png b/templates/static/img/logos/partners/virtualconcepts.png
deleted file mode 100644
index 27335598534..00000000000
Binary files a/templates/static/img/logos/partners/virtualconcepts.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/vmware.png.moved b/templates/static/img/logos/partners/vmware.png.moved
deleted file mode 100644
index 3c6d1dda966..00000000000
Binary files a/templates/static/img/logos/partners/vmware.png.moved and /dev/null differ
diff --git a/templates/static/img/logos/partners/w3internetsolutions.png b/templates/static/img/logos/partners/w3internetsolutions.png
deleted file mode 100644
index c97e9d81304..00000000000
Binary files a/templates/static/img/logos/partners/w3internetsolutions.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/wandisco_scaled.png b/templates/static/img/logos/partners/wandisco_scaled.png
deleted file mode 100644
index b0c84dcf994..00000000000
Binary files a/templates/static/img/logos/partners/wandisco_scaled.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/wavecon.png b/templates/static/img/logos/partners/wavecon.png
deleted file mode 100644
index e1b3c70df03..00000000000
Binary files a/templates/static/img/logos/partners/wavecon.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/websoft.png b/templates/static/img/logos/partners/websoft.png
deleted file mode 100644
index 565bbb3c4da..00000000000
Binary files a/templates/static/img/logos/partners/websoft.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/wedoit-trans.png b/templates/static/img/logos/partners/wedoit-trans.png
deleted file mode 100644
index 5905b1f249b..00000000000
Binary files a/templates/static/img/logos/partners/wedoit-trans.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/widesoft.png b/templates/static/img/logos/partners/widesoft.png
deleted file mode 100644
index d33a720d5b3..00000000000
Binary files a/templates/static/img/logos/partners/widesoft.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/win4lin.png b/templates/static/img/logos/partners/win4lin.png
deleted file mode 100644
index 2f80bc991be..00000000000
Binary files a/templates/static/img/logos/partners/win4lin.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/wipro.jpg b/templates/static/img/logos/partners/wipro.jpg
deleted file mode 100644
index 20d7af72516..00000000000
Binary files a/templates/static/img/logos/partners/wipro.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/wrede.png b/templates/static/img/logos/partners/wrede.png
deleted file mode 100644
index 3e704bba9c1..00000000000
Binary files a/templates/static/img/logos/partners/wrede.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/wso2_logo.png b/templates/static/img/logos/partners/wso2_logo.png
deleted file mode 100644
index cc52736bf43..00000000000
Binary files a/templates/static/img/logos/partners/wso2_logo.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/xceleritlogoscaled.png b/templates/static/img/logos/partners/xceleritlogoscaled.png
deleted file mode 100644
index 893380cae05..00000000000
Binary files a/templates/static/img/logos/partners/xceleritlogoscaled.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/xceleritlogoscaled_.png b/templates/static/img/logos/partners/xceleritlogoscaled_.png
deleted file mode 100644
index 81da911f5a9..00000000000
Binary files a/templates/static/img/logos/partners/xceleritlogoscaled_.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/yaSSLLog_scaled.jpg b/templates/static/img/logos/partners/yaSSLLog_scaled.jpg
deleted file mode 100644
index 15c96ea125b..00000000000
Binary files a/templates/static/img/logos/partners/yaSSLLog_scaled.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/yaSSLLog_scaled_.jpg b/templates/static/img/logos/partners/yaSSLLog_scaled_.jpg
deleted file mode 100644
index d9711781f1b..00000000000
Binary files a/templates/static/img/logos/partners/yaSSLLog_scaled_.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/yaSSLLog_scaled__.jpg b/templates/static/img/logos/partners/yaSSLLog_scaled__.jpg
deleted file mode 100644
index c3b82e574f1..00000000000
Binary files a/templates/static/img/logos/partners/yaSSLLog_scaled__.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/yaSSLLog_scaled___.jpg b/templates/static/img/logos/partners/yaSSLLog_scaled___.jpg
deleted file mode 100644
index 004f8a78a48..00000000000
Binary files a/templates/static/img/logos/partners/yaSSLLog_scaled___.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/yaSSLLog_scaled____.jpg b/templates/static/img/logos/partners/yaSSLLog_scaled____.jpg
deleted file mode 100644
index 0a9a8dd45e2..00000000000
Binary files a/templates/static/img/logos/partners/yaSSLLog_scaled____.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/z-logo-black.jpg b/templates/static/img/logos/partners/z-logo-black.jpg
deleted file mode 100644
index bb3e7ac3659..00000000000
Binary files a/templates/static/img/logos/partners/z-logo-black.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/zarafa.png b/templates/static/img/logos/partners/zarafa.png
deleted file mode 100644
index cf8f75cafac..00000000000
Binary files a/templates/static/img/logos/partners/zarafa.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/zend.png b/templates/static/img/logos/partners/zend.png
deleted file mode 100644
index 5cb5a183c20..00000000000
Binary files a/templates/static/img/logos/partners/zend.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/zeus.png b/templates/static/img/logos/partners/zeus.png
deleted file mode 100644
index 11300665a8f..00000000000
Binary files a/templates/static/img/logos/partners/zeus.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/zimbra.png b/templates/static/img/logos/partners/zimbra.png
deleted file mode 100644
index e15e2c02bec..00000000000
Binary files a/templates/static/img/logos/partners/zimbra.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/zinside.png b/templates/static/img/logos/partners/zinside.png
deleted file mode 100644
index 947ef625b3e..00000000000
Binary files a/templates/static/img/logos/partners/zinside.png and /dev/null differ
diff --git a/templates/static/img/logos/partners/zinside_240x80.jpg b/templates/static/img/logos/partners/zinside_240x80.jpg
deleted file mode 100644
index 0d71844d24b..00000000000
Binary files a/templates/static/img/logos/partners/zinside_240x80.jpg and /dev/null differ
diff --git a/templates/static/img/logos/partners/zmanda.png b/templates/static/img/logos/partners/zmanda.png
deleted file mode 100644
index a7a46afe8b3..00000000000
Binary files a/templates/static/img/logos/partners/zmanda.png and /dev/null differ
diff --git a/templates/static/img/logos/windows-8-logo-grey.png b/templates/static/img/logos/windows-8-logo-grey.png
deleted file mode 100644
index feb4a5f1b23..00000000000
Binary files a/templates/static/img/logos/windows-8-logo-grey.png and /dev/null differ
diff --git a/templates/static/img/management/illustration-graph.png b/templates/static/img/management/illustration-graph.png
deleted file mode 100644
index becfb7e2773..00000000000
Binary files a/templates/static/img/management/illustration-graph.png and /dev/null differ
diff --git a/templates/static/img/management/screenshot-landscape-01.jpg b/templates/static/img/management/screenshot-landscape-01.jpg
deleted file mode 100644
index 31351fcb7cb..00000000000
Binary files a/templates/static/img/management/screenshot-landscape-01.jpg and /dev/null differ
diff --git a/templates/static/img/management/ubuntu-advantage-hero.png b/templates/static/img/management/ubuntu-advantage-hero.png
deleted file mode 100644
index d117bc6d9ce..00000000000
Binary files a/templates/static/img/management/ubuntu-advantage-hero.png and /dev/null differ
diff --git a/templates/static/img/messages-white.png b/templates/static/img/messages-white.png
deleted file mode 100644
index 20bba5a245b..00000000000
Binary files a/templates/static/img/messages-white.png and /dev/null differ
diff --git a/templates/static/img/messages-white.svg b/templates/static/img/messages-white.svg
deleted file mode 100644
index bcc362d3337..00000000000
--- a/templates/static/img/messages-white.svg
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="90"
-   height="90"
-   id="svg3289"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="messages.svg">
-  <defs
-     id="defs3291" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.0931703"
-     inkscape:cx="45.30577"
-     inkscape:cy="78.045741"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4451"
-     showgrid="true"
-     inkscape:window-width="1861"
-     inkscape:window-height="1056"
-     inkscape:window-x="1425"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3061"
-       empspacing="6"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0px"
-       originy="2.5e-05px" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3294">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-962.36223)">
-    <g
-       style="display:inline"
-       transform="translate(-789,604.3622)"
-       id="g4451">
-      <g
-         transform="matrix(1.875,0,0,1.875,249,-1435.1791)"
-         id="g4143">
-        <rect
-           style="opacity:0.21171169;fill:none;stroke:none"
-           id="rect4145"
-           width="48"
-           height="48"
-           x="288"
-           y="152"
-           transform="translate(0,804.3622)" />
-      </g>
-      <path
-         style="fill:#ffffff;fill-opacity:1"
-         d="m 819,367.00003 c -27,0 -30,0 -30,18 l 0,24 c 0,18 3,18 30,18 l 30,0 c 27,0 30,0 30,-18 l 0,-24 c 0,-18 -3,-18 -30,-18 l -30,0 z m -12,15 54,0 0,6 -54,0 0,-6 z m 0,12 54,0 0,6 -54,0 0,-6 z m 0,12 30,0 0,6 -30,0 0,-6 z"
-         id="path3004"
-         inkscape:connector-curvature="0" />
-      <path
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 807,425 0,20 20,-20 z"
-         id="path3774"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
-    </g>
-  </g>
-</svg>
diff --git a/templates/static/img/navigation-menu.png b/templates/static/img/navigation-menu.png
deleted file mode 100644
index 2ab8954b6d8..00000000000
Binary files a/templates/static/img/navigation-menu.png and /dev/null differ
diff --git a/templates/static/img/navigation-menu.svg b/templates/static/img/navigation-menu.svg
deleted file mode 100755
index d6c2fe82349..00000000000
--- a/templates/static/img/navigation-menu.svg
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48+devel r12648"
-   width="90"
-   height="90"
-   xml:space="preserve"
-   sodipodi:docname="navigation-menu.svg"><metadata
-     id="metadata8"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs6"><clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath16"><path
-         d="m 0,595.28 841.89,0 L 841.89,0 0,0 0,595.28 Z"
-         id="path18"
-         inkscape:connector-curvature="0" /></clipPath></defs><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     id="namedview4"
-     showgrid="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="3.79254"
-     inkscape:cx="42.875543"
-     inkscape:cy="32.636886"
-     inkscape:current-layer="g10"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-midpoints="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true"><inkscape:grid
-       type="xygrid"
-       id="grid4065"
-       empspacing="6" /></sodipodi:namedview><g
-     id="g10"
-     inkscape:groupmode="layer"
-     inkscape:label="chevron"
-     transform="matrix(1.25,0,0,-1.25,-406.97987,423.35437)"><rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect4067"
-       width="62.400002"
-       height="9.6000004"
-       x="330.38391"
-       y="-326.68362"
-       transform="scale(1,-1)" /><rect
-       transform="scale(1,-1)"
-       y="-307.48361"
-       x="330.38391"
-       height="9.6000004"
-       width="62.400002"
-       id="rect4069"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /><rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect4090"
-       width="62.400002"
-       height="9.6000004"
-       x="330.38391"
-       y="-288.28363"
-       transform="scale(1,-1)" /><rect
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect4065"
-       width="72"
-       height="72"
-       x="325.58389"
-       y="-338.6835"
-       transform="scale(1,-1)" /></g></svg>
\ No newline at end of file
diff --git a/templates/static/img/partners/ASUS_X201_shot_3.jpg b/templates/static/img/partners/ASUS_X201_shot_3.jpg
deleted file mode 100644
index 55a4e571c95..00000000000
Binary files a/templates/static/img/partners/ASUS_X201_shot_3.jpg and /dev/null differ
diff --git a/templates/static/img/partners/asus-1015e-12.04.jpg b/templates/static/img/partners/asus-1015e-12.04.jpg
deleted file mode 100644
index aa02a9d6583..00000000000
Binary files a/templates/static/img/partners/asus-1015e-12.04.jpg and /dev/null differ
diff --git a/templates/static/img/partners/asus-logo.png b/templates/static/img/partners/asus-logo.png
deleted file mode 100644
index 9a1cf7c00ad..00000000000
Binary files a/templates/static/img/partners/asus-logo.png and /dev/null differ
diff --git a/templates/static/img/partners/cloudera-logo.png b/templates/static/img/partners/cloudera-logo.png
deleted file mode 100644
index 2abe7367e20..00000000000
Binary files a/templates/static/img/partners/cloudera-logo.png and /dev/null differ
diff --git a/templates/static/img/partners/dell-logo.jpg b/templates/static/img/partners/dell-logo.jpg
deleted file mode 100644
index 589203411a3..00000000000
Binary files a/templates/static/img/partners/dell-logo.jpg and /dev/null differ
diff --git a/templates/static/img/partners/dell_t420.png b/templates/static/img/partners/dell_t420.png
deleted file mode 100644
index ddf9f534f68..00000000000
Binary files a/templates/static/img/partners/dell_t420.png and /dev/null differ
diff --git a/templates/static/img/partners/hp-moonshot-server.jpg b/templates/static/img/partners/hp-moonshot-server.jpg
deleted file mode 100644
index 977caa35eef..00000000000
Binary files a/templates/static/img/partners/hp-moonshot-server.jpg and /dev/null differ
diff --git a/templates/static/img/partners/hp-partners-laptop.jpg b/templates/static/img/partners/hp-partners-laptop.jpg
deleted file mode 100644
index f2b6cce0e70..00000000000
Binary files a/templates/static/img/partners/hp-partners-laptop.jpg and /dev/null differ
diff --git a/templates/static/img/partners/hp-partners-server.jpg b/templates/static/img/partners/hp-partners-server.jpg
deleted file mode 100644
index 0b7002648e3..00000000000
Binary files a/templates/static/img/partners/hp-partners-server.jpg and /dev/null differ
diff --git a/templates/static/img/partners/ibm-logo.gif b/templates/static/img/partners/ibm-logo.gif
deleted file mode 100644
index aebf1e31acc..00000000000
Binary files a/templates/static/img/partners/ibm-logo.gif and /dev/null differ
diff --git a/templates/static/img/partners/lenovo-logo.jpg b/templates/static/img/partners/lenovo-logo.jpg
deleted file mode 100644
index f675eee9b37..00000000000
Binary files a/templates/static/img/partners/lenovo-logo.jpg and /dev/null differ
diff --git a/templates/static/img/partners/moonshot-hero.png b/templates/static/img/partners/moonshot-hero.png
deleted file mode 100644
index a14f0d7541c..00000000000
Binary files a/templates/static/img/partners/moonshot-hero.png and /dev/null differ
diff --git a/templates/static/img/partners/openstack-logo.png b/templates/static/img/partners/openstack-logo.png
deleted file mode 100644
index 62b48e0c645..00000000000
Binary files a/templates/static/img/partners/openstack-logo.png and /dev/null differ
diff --git a/templates/static/img/partners/partner-services-hero.png b/templates/static/img/partners/partner-services-hero.png
deleted file mode 100644
index b588e3ada1c..00000000000
Binary files a/templates/static/img/partners/partner-services-hero.png and /dev/null differ
diff --git a/templates/static/img/partners/partners-certified-220h.png b/templates/static/img/partners/partners-certified-220h.png
deleted file mode 100644
index 7f5c41a1702..00000000000
Binary files a/templates/static/img/partners/partners-certified-220h.png and /dev/null differ
diff --git a/templates/static/img/partners/partners-logo-arm.png b/templates/static/img/partners/partners-logo-arm.png
deleted file mode 100644
index 53cf0a9cfb6..00000000000
Binary files a/templates/static/img/partners/partners-logo-arm.png and /dev/null differ
diff --git a/templates/static/img/partners/partners-logo-cavium.png b/templates/static/img/partners/partners-logo-cavium.png
deleted file mode 100644
index fb45661d031..00000000000
Binary files a/templates/static/img/partners/partners-logo-cavium.png and /dev/null differ
diff --git a/templates/static/img/partners/partners-logo-dell.png b/templates/static/img/partners/partners-logo-dell.png
deleted file mode 100644
index 1cfe4954851..00000000000
Binary files a/templates/static/img/partners/partners-logo-dell.png and /dev/null differ
diff --git a/templates/static/img/partners/partners-logo-hp.png b/templates/static/img/partners/partners-logo-hp.png
deleted file mode 100644
index 203e5d72bcd..00000000000
Binary files a/templates/static/img/partners/partners-logo-hp.png and /dev/null differ
diff --git a/templates/static/img/partners/partners-logo-ibm.png b/templates/static/img/partners/partners-logo-ibm.png
deleted file mode 100644
index 8b8fc6c2fa5..00000000000
Binary files a/templates/static/img/partners/partners-logo-ibm.png and /dev/null differ
diff --git a/templates/static/img/partners/partners-main.jpg b/templates/static/img/partners/partners-main.jpg
deleted file mode 100644
index b83f121bd1e..00000000000
Binary files a/templates/static/img/partners/partners-main.jpg and /dev/null differ
diff --git a/templates/static/img/partners/pathfinder-moonshot.jpg b/templates/static/img/partners/pathfinder-moonshot.jpg
deleted file mode 100644
index 614cb346510..00000000000
Binary files a/templates/static/img/partners/pathfinder-moonshot.jpg and /dev/null differ
diff --git a/templates/static/img/partners/pathfinder-moonshot.png b/templates/static/img/partners/pathfinder-moonshot.png
deleted file mode 100644
index 1c70a90f164..00000000000
Binary files a/templates/static/img/partners/pathfinder-moonshot.png and /dev/null differ
diff --git a/templates/static/img/partners/pictogram-become-a-partner-hardware.png b/templates/static/img/partners/pictogram-become-a-partner-hardware.png
deleted file mode 100644
index 518fd3ad425..00000000000
Binary files a/templates/static/img/partners/pictogram-become-a-partner-hardware.png and /dev/null differ
diff --git a/templates/static/img/partners/pictogram-become-a-partner-isv.png b/templates/static/img/partners/pictogram-become-a-partner-isv.png
deleted file mode 100644
index f11714bc626..00000000000
Binary files a/templates/static/img/partners/pictogram-become-a-partner-isv.png and /dev/null differ
diff --git a/templates/static/img/partners/pictogram-become-a-partner-reseller.png b/templates/static/img/partners/pictogram-become-a-partner-reseller.png
deleted file mode 100644
index 7b0a62184b8..00000000000
Binary files a/templates/static/img/partners/pictogram-become-a-partner-reseller.png and /dev/null differ
diff --git a/templates/static/img/partners/pictos-server-hp-ubuntu.png b/templates/static/img/partners/pictos-server-hp-ubuntu.png
deleted file mode 100644
index a14f0d7541c..00000000000
Binary files a/templates/static/img/partners/pictos-server-hp-ubuntu.png and /dev/null differ
diff --git a/templates/static/img/partners/ubuntu-certified-hero.png b/templates/static/img/partners/ubuntu-certified-hero.png
deleted file mode 100644
index e9dc0fab0f0..00000000000
Binary files a/templates/static/img/partners/ubuntu-certified-hero.png and /dev/null differ
diff --git a/templates/static/img/patterns/android-background-dotted.png b/templates/static/img/patterns/android-background-dotted.png
deleted file mode 100644
index 94861fbe661..00000000000
Binary files a/templates/static/img/patterns/android-background-dotted.png and /dev/null differ
diff --git a/templates/static/img/patterns/arrow-down.png b/templates/static/img/patterns/arrow-down.png
deleted file mode 100644
index 3b30ccf21a6..00000000000
Binary files a/templates/static/img/patterns/arrow-down.png and /dev/null differ
diff --git a/templates/static/img/patterns/arrow-left.png b/templates/static/img/patterns/arrow-left.png
deleted file mode 100644
index 8cd8741e4a4..00000000000
Binary files a/templates/static/img/patterns/arrow-left.png and /dev/null differ
diff --git a/templates/static/img/patterns/arrow-right.png b/templates/static/img/patterns/arrow-right.png
deleted file mode 100644
index 29984ec41c2..00000000000
Binary files a/templates/static/img/patterns/arrow-right.png and /dev/null differ
diff --git a/templates/static/img/patterns/arrow-up-smaller.png b/templates/static/img/patterns/arrow-up-smaller.png
deleted file mode 100644
index efd9593b3ef..00000000000
Binary files a/templates/static/img/patterns/arrow-up-smaller.png and /dev/null differ
diff --git a/templates/static/img/patterns/arrow-up.png b/templates/static/img/patterns/arrow-up.png
deleted file mode 100644
index c12c97bd67d..00000000000
Binary files a/templates/static/img/patterns/arrow-up.png and /dev/null differ
diff --git a/templates/static/img/patterns/arrow_down.svg b/templates/static/img/patterns/arrow_down.svg
deleted file mode 100644
index eefcf72a909..00000000000
--- a/templates/static/img/patterns/arrow_down.svg
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   sodipodi:docname="arrow_up.svg"
-   inkscape:version="0.48.4 r9939"
-   x="0px"
-   y="0px"
-   width="90px"
-   height="90px"
-   viewBox="0 0 90 90"
-   enable-background="new 0 0 90 90"
-   xml:space="preserve"><metadata
-     id="metadata3079"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs3077" /><sodipodi:namedview
-     id="namedview4"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     guidetolerance="10"
-     objecttolerance="10"
-     gridtolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     fit-margin-top="0"
-     inkscape:window-width="1307"
-     inkscape:window-height="744"
-     inkscape:cx="21.901419"
-     showgrid="false"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="2.4272256"
-     inkscape:cy="47.210089"
-     inkscape:current-layer="g10_1_"
-     inkscape:window-x="59"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" /><sodipodi:namedview
-     id="namedview3062"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     guidetolerance="10"
-     objecttolerance="10"
-     gridtolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     fit-margin-top="0"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     inkscape:cx="-157.44016"
-     showgrid="false"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="2.4272256"
-     inkscape:cy="98.291931"
-     inkscape:current-layer="g10" /><g
-     id="g10_1_"
-     transform="matrix(1.25,0,0,-1.25,-406.97987,423.35437)"
-     inkscape:groupmode="layer"
-     inkscape:label="chevron"><g
-       id="g12_1_"
-       transform="matrix(-9.835598e-5,0.5471698,0.54545454,9.8047655e-5,180.55426,113.13251)"
-       style="fill:#ffffff"><g
-         id="g3066"
-         style="fill:#ffffff"><defs
-           id="defs3068"><rect
-             id="SVGID_1_"
-             x="69.474998"
-             y="81.282997"
-             width="405.87299"
-             height="575.82098" /></defs><clipPath
-           id="SVGID_2_"><use
-             xlink:href="#SVGID_1_"
-             overflow="visible"
-             id="use3072"
-             style="overflow:visible"
-             x="0"
-             y="0"
-             width="90"
-             height="90" /></clipPath><g
-           id="g14_1_"
-           clip-path="url(#SVGID_2_)"
-           style="fill:#ffffff"><g
-             id="g20_1_"
-             transform="translate(358.7529,350.7095)"
-             style="fill:#ffffff"><path
-               id="path22_1_"
-               inkscape:connector-curvature="0"
-               d="m -24.231,-34.538 c 3.869,-6.841 8.238,-13.885 13.107,-21.135 4.866,-7.25 10.086,-14.386 15.657,-21.401 1.493,-1.879 2.988,-3.707 4.486,-5.486 v 20.344 c -3.055,4.022 -6.048,8.184 -8.972,12.504 -3.404,5.03 -6.596,10.175 -9.589,15.437 -2.99,5.261 -6.662,12.687 -9.007,17.715 2.344,5.026 6.017,12.452 9.007,17.715 2.993,5.262 6.185,10.407 9.589,15.436 2.924,4.321 5.917,8.483 8.972,12.505 V 49.44 C 7.521,47.66 6.026,45.833 4.533,43.954 -1.038,36.936 -6.258,29.803 -11.124,22.553 -15.993,15.303 -20.362,8.259 -24.231,1.418 c -3.869,-6.84 -6.922,-12.833 -9.149,-17.978 2.227,-5.144 5.28,-11.137 9.149,-17.978"
-               style="fill:#ffffff" /></g></g></g></g></g></svg>
\ No newline at end of file
diff --git a/templates/static/img/patterns/arrow_up.svg b/templates/static/img/patterns/arrow_up.svg
deleted file mode 100644
index 68b639262fb..00000000000
--- a/templates/static/img/patterns/arrow_up.svg
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg2"
-   sodipodi:docname="arrow_up.svg"
-   inkscape:version="0.48.4 r9939"
-   x="0px"
-   y="0px"
-   width="90px"
-   height="90px"
-   viewBox="0 0 90 90"
-   enable-background="new 0 0 90 90"
-   xml:space="preserve"><metadata
-     id="metadata3079"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs3077" /><sodipodi:namedview
-     id="namedview4"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     guidetolerance="10"
-     objecttolerance="10"
-     gridtolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     fit-margin-top="0"
-     inkscape:window-width="1307"
-     inkscape:window-height="744"
-     inkscape:cx="21.901419"
-     showgrid="false"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="2.4272256"
-     inkscape:cy="47.210089"
-     inkscape:current-layer="g10_1_"
-     inkscape:window-x="59"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" /><sodipodi:namedview
-     id="namedview3062"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     guidetolerance="10"
-     objecttolerance="10"
-     gridtolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     fit-margin-top="0"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
-     inkscape:cx="-157.44016"
-     showgrid="false"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="2.4272256"
-     inkscape:cy="98.291931"
-     inkscape:current-layer="g10" /><g
-     id="g10_1_"
-     transform="matrix(1.25,0,0,-1.25,-406.97987,423.35437)"
-     inkscape:groupmode="layer"
-     inkscape:label="chevron"><g
-       id="g12_1_"
-       transform="matrix(0,-0.54716981,0.54545455,0,180.52017,492.43318)"
-       style="fill:#ffffff"><g
-         id="g3066"
-         style="fill:#ffffff"><defs
-           id="defs3068"><rect
-             id="SVGID_1_"
-             x="69.475"
-             y="81.283"
-             width="405.873"
-             height="575.821" /></defs><clipPath
-           id="SVGID_2_"><use
-             xlink:href="#SVGID_1_"
-             overflow="visible"
-             id="use3072" /></clipPath><g
-           id="g14_1_"
-           clip-path="url(#SVGID_2_)"
-           style="fill:#ffffff"><g
-             id="g20_1_"
-             transform="translate(358.7529,350.7095)"
-             style="fill:#ffffff"><path
-               id="path22_1_"
-               inkscape:connector-curvature="0"
-               d="M-24.231-34.538       c3.869-6.841,8.238-13.885,13.107-21.135c4.866-7.25,10.086-14.386,15.657-21.401c1.493-1.879,2.988-3.707,4.486-5.486v20.344       c-3.055,4.022-6.048,8.184-8.972,12.504c-3.404,5.03-6.596,10.175-9.589,15.437c-2.99,5.261-6.662,12.687-9.007,17.715       c2.344,5.026,6.017,12.452,9.007,17.715c2.993,5.262,6.185,10.407,9.589,15.436c2.924,4.321,5.917,8.483,8.972,12.505V49.44       c-1.498-1.78-2.993-3.607-4.486-5.486c-5.571-7.018-10.791-14.151-15.657-21.401c-4.869-7.25-9.238-14.294-13.107-21.135       C-28.1-5.422-31.153-11.415-33.38-16.56C-31.153-21.704-28.1-27.697-24.231-34.538"
-               style="fill:#ffffff"
-               fill="#bcb7b4" /></g></g></g></g></g></svg>
\ No newline at end of file
diff --git a/templates/static/img/patterns/background-dots-small.png b/templates/static/img/patterns/background-dots-small.png
deleted file mode 100644
index df7fb6c0ede..00000000000
Binary files a/templates/static/img/patterns/background-dots-small.png and /dev/null differ
diff --git a/templates/static/img/patterns/background-dots.png b/templates/static/img/patterns/background-dots.png
deleted file mode 100644
index 23c248dadef..00000000000
Binary files a/templates/static/img/patterns/background-dots.png and /dev/null differ
diff --git a/templates/static/img/patterns/background-ubuntu-cta.png b/templates/static/img/patterns/background-ubuntu-cta.png
deleted file mode 100644
index 744da206a32..00000000000
Binary files a/templates/static/img/patterns/background-ubuntu-cta.png and /dev/null differ
diff --git a/templates/static/img/patterns/background-white-cta.png b/templates/static/img/patterns/background-white-cta.png
deleted file mode 100644
index 3ab9c413229..00000000000
Binary files a/templates/static/img/patterns/background-white-cta.png and /dev/null differ
diff --git a/templates/static/img/patterns/body_bg.jpg b/templates/static/img/patterns/body_bg.jpg
deleted file mode 100644
index 99860721bef..00000000000
Binary files a/templates/static/img/patterns/body_bg.jpg and /dev/null differ
diff --git a/templates/static/img/patterns/cta-background-hover.png b/templates/static/img/patterns/cta-background-hover.png
deleted file mode 100644
index f9bf72396bf..00000000000
Binary files a/templates/static/img/patterns/cta-background-hover.png and /dev/null differ
diff --git a/templates/static/img/patterns/cta-background.png b/templates/static/img/patterns/cta-background.png
deleted file mode 100644
index 010a4e61c35..00000000000
Binary files a/templates/static/img/patterns/cta-background.png and /dev/null differ
diff --git a/templates/static/img/patterns/developer-dot-pattern.png b/templates/static/img/patterns/developer-dot-pattern.png
deleted file mode 100644
index 0cf1ad7af08..00000000000
Binary files a/templates/static/img/patterns/developer-dot-pattern.png and /dev/null differ
diff --git a/templates/static/img/patterns/dotted-pattern.png b/templates/static/img/patterns/dotted-pattern.png
deleted file mode 100644
index 917140363a5..00000000000
Binary files a/templates/static/img/patterns/dotted-pattern.png and /dev/null differ
diff --git a/templates/static/img/patterns/enterprise-dot-pattern.png b/templates/static/img/patterns/enterprise-dot-pattern.png
deleted file mode 100644
index 58ff6045e23..00000000000
Binary files a/templates/static/img/patterns/enterprise-dot-pattern.png and /dev/null differ
diff --git a/templates/static/img/patterns/feats-tick.gif b/templates/static/img/patterns/feats-tick.gif
deleted file mode 100644
index 5c80eac3b56..00000000000
Binary files a/templates/static/img/patterns/feats-tick.gif and /dev/null differ
diff --git a/templates/static/img/patterns/feats-tick.png b/templates/static/img/patterns/feats-tick.png
deleted file mode 100644
index d1964599a2c..00000000000
Binary files a/templates/static/img/patterns/feats-tick.png and /dev/null differ
diff --git a/templates/static/img/patterns/fieldsets-1.png b/templates/static/img/patterns/fieldsets-1.png
deleted file mode 100644
index be9212e0c7b..00000000000
Binary files a/templates/static/img/patterns/fieldsets-1.png and /dev/null differ
diff --git a/templates/static/img/patterns/fieldsets-2.png b/templates/static/img/patterns/fieldsets-2.png
deleted file mode 100644
index 4f913611064..00000000000
Binary files a/templates/static/img/patterns/fieldsets-2.png and /dev/null differ
diff --git a/templates/static/img/patterns/fieldsets-3.png b/templates/static/img/patterns/fieldsets-3.png
deleted file mode 100644
index 1e4a2cf0e24..00000000000
Binary files a/templates/static/img/patterns/fieldsets-3.png and /dev/null differ
diff --git a/templates/static/img/patterns/fieldsets-4.png b/templates/static/img/patterns/fieldsets-4.png
deleted file mode 100644
index 78059ac5dc9..00000000000
Binary files a/templates/static/img/patterns/fieldsets-4.png and /dev/null differ
diff --git a/templates/static/img/patterns/footer_bg.jpg b/templates/static/img/patterns/footer_bg.jpg
deleted file mode 100644
index aae5e4ba9d8..00000000000
Binary files a/templates/static/img/patterns/footer_bg.jpg and /dev/null differ
diff --git a/templates/static/img/patterns/grey-textured-background.jpg b/templates/static/img/patterns/grey-textured-background.jpg
deleted file mode 100644
index 85a0927caec..00000000000
Binary files a/templates/static/img/patterns/grey-textured-background.jpg and /dev/null differ
diff --git a/templates/static/img/patterns/greytick.png b/templates/static/img/patterns/greytick.png
deleted file mode 100644
index a0eb903c703..00000000000
Binary files a/templates/static/img/patterns/greytick.png and /dev/null differ
diff --git a/templates/static/img/patterns/icon-irc.png b/templates/static/img/patterns/icon-irc.png
deleted file mode 100644
index 15206cfcecf..00000000000
Binary files a/templates/static/img/patterns/icon-irc.png and /dev/null differ
diff --git a/templates/static/img/patterns/icon-mail.png b/templates/static/img/patterns/icon-mail.png
deleted file mode 100644
index 4e959751727..00000000000
Binary files a/templates/static/img/patterns/icon-mail.png and /dev/null differ
diff --git a/templates/static/img/patterns/icon-rss.png b/templates/static/img/patterns/icon-rss.png
deleted file mode 100644
index 015404f449f..00000000000
Binary files a/templates/static/img/patterns/icon-rss.png and /dev/null differ
diff --git a/templates/static/img/patterns/marker.png b/templates/static/img/patterns/marker.png
deleted file mode 100644
index 4e8904b52e1..00000000000
Binary files a/templates/static/img/patterns/marker.png and /dev/null differ
diff --git a/templates/static/img/patterns/picto-getubuntu-cd.gif b/templates/static/img/patterns/picto-getubuntu-cd.gif
deleted file mode 100644
index 62d836746aa..00000000000
Binary files a/templates/static/img/patterns/picto-getubuntu-cd.gif and /dev/null differ
diff --git a/templates/static/img/patterns/picto-getubuntu-download.gif b/templates/static/img/patterns/picto-getubuntu-download.gif
deleted file mode 100644
index 65f125b8ea0..00000000000
Binary files a/templates/static/img/patterns/picto-getubuntu-download.gif and /dev/null differ
diff --git a/templates/static/img/patterns/picto-getubuntu-windows.gif b/templates/static/img/patterns/picto-getubuntu-windows.gif
deleted file mode 100644
index 263fbf03bf4..00000000000
Binary files a/templates/static/img/patterns/picto-getubuntu-windows.gif and /dev/null differ
diff --git a/templates/static/img/patterns/pictogram-grey-contact.png b/templates/static/img/patterns/pictogram-grey-contact.png
deleted file mode 100644
index e5988bedf24..00000000000
Binary files a/templates/static/img/patterns/pictogram-grey-contact.png and /dev/null differ
diff --git a/templates/static/img/patterns/pictogram-grey-desktop.png b/templates/static/img/patterns/pictogram-grey-desktop.png
deleted file mode 100644
index 4f9dcf9aa8d..00000000000
Binary files a/templates/static/img/patterns/pictogram-grey-desktop.png and /dev/null differ
diff --git a/templates/static/img/patterns/pictogram-grey-download.png b/templates/static/img/patterns/pictogram-grey-download.png
deleted file mode 100644
index b1a42298715..00000000000
Binary files a/templates/static/img/patterns/pictogram-grey-download.png and /dev/null differ
diff --git a/templates/static/img/patterns/pictogram-grey-server.png b/templates/static/img/patterns/pictogram-grey-server.png
deleted file mode 100644
index 2b68dcb87c8..00000000000
Binary files a/templates/static/img/patterns/pictogram-grey-server.png and /dev/null differ
diff --git a/templates/static/img/patterns/purpletick.gif b/templates/static/img/patterns/purpletick.gif
deleted file mode 100644
index 15d9381e09e..00000000000
Binary files a/templates/static/img/patterns/purpletick.gif and /dev/null differ
diff --git a/templates/static/img/patterns/quote-aubergine-345x345.png b/templates/static/img/patterns/quote-aubergine-345x345.png
deleted file mode 100644
index 4e7de5dfda0..00000000000
Binary files a/templates/static/img/patterns/quote-aubergine-345x345.png and /dev/null differ
diff --git a/templates/static/img/patterns/quote-grey-br-211x211.png b/templates/static/img/patterns/quote-grey-br-211x211.png
deleted file mode 100644
index cb8cf1c68e1..00000000000
Binary files a/templates/static/img/patterns/quote-grey-br-211x211.png and /dev/null differ
diff --git a/templates/static/img/patterns/quote-orange-bl-287x287.png b/templates/static/img/patterns/quote-orange-bl-287x287.png
deleted file mode 100644
index b2d15174e18..00000000000
Binary files a/templates/static/img/patterns/quote-orange-bl-287x287.png and /dev/null differ
diff --git a/templates/static/img/patterns/quote-orange-br-287x287.png b/templates/static/img/patterns/quote-orange-br-287x287.png
deleted file mode 100644
index 37dda11490b..00000000000
Binary files a/templates/static/img/patterns/quote-orange-br-287x287.png and /dev/null differ
diff --git a/templates/static/img/patterns/quote-white-360x360.png b/templates/static/img/patterns/quote-white-360x360.png
deleted file mode 100644
index 7d41a856883..00000000000
Binary files a/templates/static/img/patterns/quote-white-360x360.png and /dev/null differ
diff --git a/templates/static/img/patterns/quote-white-br-360x360.png b/templates/static/img/patterns/quote-white-br-360x360.png
deleted file mode 100644
index 8cd3eaa6a33..00000000000
Binary files a/templates/static/img/patterns/quote-white-br-360x360.png and /dev/null differ
diff --git a/templates/static/img/patterns/search_submit_bg_2.png b/templates/static/img/patterns/search_submit_bg_2.png
deleted file mode 100644
index 9fcdf97b32a..00000000000
Binary files a/templates/static/img/patterns/search_submit_bg_2.png and /dev/null differ
diff --git a/templates/static/img/patterns/soft-centre-bkg.gif b/templates/static/img/patterns/soft-centre-bkg.gif
deleted file mode 100644
index 0bb9a615e25..00000000000
Binary files a/templates/static/img/patterns/soft-centre-bkg.gif and /dev/null differ
diff --git a/templates/static/img/patterns/spinner-white.png b/templates/static/img/patterns/spinner-white.png
deleted file mode 100644
index f05179869bf..00000000000
Binary files a/templates/static/img/patterns/spinner-white.png and /dev/null differ
diff --git a/templates/static/img/patterns/sprite-pager.png b/templates/static/img/patterns/sprite-pager.png
deleted file mode 100644
index a715db63865..00000000000
Binary files a/templates/static/img/patterns/sprite-pager.png and /dev/null differ
diff --git a/templates/static/img/patterns/subnav_active_bg.png b/templates/static/img/patterns/subnav_active_bg.png
deleted file mode 100644
index d92940ef294..00000000000
Binary files a/templates/static/img/patterns/subnav_active_bg.png and /dev/null differ
diff --git a/templates/static/img/patterns/tabbed-nav-arrow.png b/templates/static/img/patterns/tabbed-nav-arrow.png
deleted file mode 100644
index 2874897f624..00000000000
Binary files a/templates/static/img/patterns/tabbed-nav-arrow.png and /dev/null differ
diff --git a/templates/static/img/patterns/tick-aubergine.png b/templates/static/img/patterns/tick-aubergine.png
deleted file mode 100644
index d458464e038..00000000000
Binary files a/templates/static/img/patterns/tick-aubergine.png and /dev/null differ
diff --git a/templates/static/img/patterns/tick-orange.png b/templates/static/img/patterns/tick-orange.png
deleted file mode 100644
index 9ba74b6f576..00000000000
Binary files a/templates/static/img/patterns/tick-orange.png and /dev/null differ
diff --git a/templates/static/img/patterns/white-squircle.png b/templates/static/img/patterns/white-squircle.png
deleted file mode 100644
index f05a5de8932..00000000000
Binary files a/templates/static/img/patterns/white-squircle.png and /dev/null differ
diff --git a/templates/static/img/pictograms/bg-whyuse-desktop-wallpaper.jpg b/templates/static/img/pictograms/bg-whyuse-desktop-wallpaper.jpg
deleted file mode 100644
index 4f8b31cea9b..00000000000
Binary files a/templates/static/img/pictograms/bg-whyuse-desktop-wallpaper.jpg and /dev/null differ
diff --git a/templates/static/img/pictograms/download-picto-cloud-grey.png b/templates/static/img/pictograms/download-picto-cloud-grey.png
deleted file mode 100644
index dd831ea4d2d..00000000000
Binary files a/templates/static/img/pictograms/download-picto-cloud-grey.png and /dev/null differ
diff --git a/templates/static/img/pictograms/download-picto-server.png b/templates/static/img/pictograms/download-picto-server.png
deleted file mode 100644
index ee22a557f56..00000000000
Binary files a/templates/static/img/pictograms/download-picto-server.png and /dev/null differ
diff --git a/templates/static/img/pictograms/grow-on-demand-aubergine.png b/templates/static/img/pictograms/grow-on-demand-aubergine.png
deleted file mode 100644
index 763e4b4daa8..00000000000
Binary files a/templates/static/img/pictograms/grow-on-demand-aubergine.png and /dev/null differ
diff --git a/templates/static/img/pictograms/iconsCommunity.png b/templates/static/img/pictograms/iconsCommunity.png
deleted file mode 100644
index e286a52b232..00000000000
Binary files a/templates/static/img/pictograms/iconsCommunity.png and /dev/null differ
diff --git a/templates/static/img/pictograms/image-logo-windows-azure.png b/templates/static/img/pictograms/image-logo-windows-azure.png
deleted file mode 100644
index aff9aa18a0c..00000000000
Binary files a/templates/static/img/pictograms/image-logo-windows-azure.png and /dev/null differ
diff --git a/templates/static/img/pictograms/image-picto-education-211.png b/templates/static/img/pictograms/image-picto-education-211.png
deleted file mode 100644
index 8cf6d3102ba..00000000000
Binary files a/templates/static/img/pictograms/image-picto-education-211.png and /dev/null differ
diff --git a/templates/static/img/pictograms/image-picto-grow-on-demand-180.png b/templates/static/img/pictograms/image-picto-grow-on-demand-180.png
deleted file mode 100644
index 38e4743092c..00000000000
Binary files a/templates/static/img/pictograms/image-picto-grow-on-demand-180.png and /dev/null differ
diff --git a/templates/static/img/pictograms/image-picto-juju-100.png b/templates/static/img/pictograms/image-picto-juju-100.png
deleted file mode 100644
index f7feb41d171..00000000000
Binary files a/templates/static/img/pictograms/image-picto-juju-100.png and /dev/null differ
diff --git a/templates/static/img/pictograms/image-picto-juju-40.png b/templates/static/img/pictograms/image-picto-juju-40.png
deleted file mode 100644
index 029352a8a46..00000000000
Binary files a/templates/static/img/pictograms/image-picto-juju-40.png and /dev/null differ
diff --git a/templates/static/img/pictograms/image-picto-landscape-100.png b/templates/static/img/pictograms/image-picto-landscape-100.png
deleted file mode 100644
index 45b575e2ef9..00000000000
Binary files a/templates/static/img/pictograms/image-picto-landscape-100.png and /dev/null differ
diff --git a/templates/static/img/pictograms/image-picto-landscape-40.png b/templates/static/img/pictograms/image-picto-landscape-40.png
deleted file mode 100644
index 22c7fec7fe3..00000000000
Binary files a/templates/static/img/pictograms/image-picto-landscape-40.png and /dev/null differ
diff --git a/templates/static/img/pictograms/image-picto-maas-100.png b/templates/static/img/pictograms/image-picto-maas-100.png
deleted file mode 100644
index a23b7f7ff7f..00000000000
Binary files a/templates/static/img/pictograms/image-picto-maas-100.png and /dev/null differ
diff --git a/templates/static/img/pictograms/image-picto-maas-40.png b/templates/static/img/pictograms/image-picto-maas-40.png
deleted file mode 100644
index bdd3378c1c9..00000000000
Binary files a/templates/static/img/pictograms/image-picto-maas-40.png and /dev/null differ
diff --git a/templates/static/img/pictograms/image-picto-openstack-40.png b/templates/static/img/pictograms/image-picto-openstack-40.png
deleted file mode 100644
index 6dddbab80c5..00000000000
Binary files a/templates/static/img/pictograms/image-picto-openstack-40.png and /dev/null differ
diff --git a/templates/static/img/pictograms/image-picto-openstack.png b/templates/static/img/pictograms/image-picto-openstack.png
deleted file mode 100644
index 61324fa436b..00000000000
Binary files a/templates/static/img/pictograms/image-picto-openstack.png and /dev/null differ
diff --git a/templates/static/img/pictograms/image-picto-server-40.png b/templates/static/img/pictograms/image-picto-server-40.png
deleted file mode 100644
index d113dd6f534..00000000000
Binary files a/templates/static/img/pictograms/image-picto-server-40.png and /dev/null differ
diff --git a/templates/static/img/pictograms/image-picto-ubuntu.png b/templates/static/img/pictograms/image-picto-ubuntu.png
deleted file mode 100644
index e58dd0b53d5..00000000000
Binary files a/templates/static/img/pictograms/image-picto-ubuntu.png and /dev/null differ
diff --git a/templates/static/img/pictograms/image-public-private-picto.png b/templates/static/img/pictograms/image-public-private-picto.png
deleted file mode 100644
index 6741a6a322d..00000000000
Binary files a/templates/static/img/pictograms/image-public-private-picto.png and /dev/null differ
diff --git a/templates/static/img/pictograms/picto-articles-grey.png b/templates/static/img/pictograms/picto-articles-grey.png
deleted file mode 100755
index 61eaaedd428..00000000000
Binary files a/templates/static/img/pictograms/picto-articles-grey.png and /dev/null differ
diff --git a/templates/static/img/pictograms/picto-business-grey.png b/templates/static/img/pictograms/picto-business-grey.png
deleted file mode 100755
index 26c14f46ebe..00000000000
Binary files a/templates/static/img/pictograms/picto-business-grey.png and /dev/null differ
diff --git a/templates/static/img/pictograms/picto-cloud-grey-140x140.png b/templates/static/img/pictograms/picto-cloud-grey-140x140.png
deleted file mode 100644
index 9fe9685b2b5..00000000000
Binary files a/templates/static/img/pictograms/picto-cloud-grey-140x140.png and /dev/null differ
diff --git a/templates/static/img/pictograms/picto-discussion-purple-160x160.png b/templates/static/img/pictograms/picto-discussion-purple-160x160.png
deleted file mode 100644
index d2a7fe25817..00000000000
Binary files a/templates/static/img/pictograms/picto-discussion-purple-160x160.png and /dev/null differ
diff --git a/templates/static/img/pictograms/picto-jumpstart-orange-180x180.png b/templates/static/img/pictograms/picto-jumpstart-orange-180x180.png
deleted file mode 100644
index f3a920b5036..00000000000
Binary files a/templates/static/img/pictograms/picto-jumpstart-orange-180x180.png and /dev/null differ
diff --git a/templates/static/img/pictograms/picto-jumpstart-purple-288x288.png b/templates/static/img/pictograms/picto-jumpstart-purple-288x288.png
deleted file mode 100644
index d6e1a4276ab..00000000000
Binary files a/templates/static/img/pictograms/picto-jumpstart-purple-288x288.png and /dev/null differ
diff --git a/templates/static/img/pictograms/picto-partner-grey-180x180.png b/templates/static/img/pictograms/picto-partner-grey-180x180.png
deleted file mode 100644
index 7c2f6d3944d..00000000000
Binary files a/templates/static/img/pictograms/picto-partner-grey-180x180.png and /dev/null differ
diff --git a/templates/static/img/pictograms/picto-partner-purple-160x160.png b/templates/static/img/pictograms/picto-partner-purple-160x160.png
deleted file mode 100644
index 5f75e327686..00000000000
Binary files a/templates/static/img/pictograms/picto-partner-purple-160x160.png and /dev/null differ
diff --git a/templates/static/img/pictograms/picto-reduce-costs-grey.png b/templates/static/img/pictograms/picto-reduce-costs-grey.png
deleted file mode 100644
index eb35519f23a..00000000000
Binary files a/templates/static/img/pictograms/picto-reduce-costs-grey.png and /dev/null differ
diff --git a/templates/static/img/pictograms/picto-support-grey.png b/templates/static/img/pictograms/picto-support-grey.png
deleted file mode 100755
index aa3a4484176..00000000000
Binary files a/templates/static/img/pictograms/picto-support-grey.png and /dev/null differ
diff --git a/templates/static/img/pictograms/picto-ubuntu-orange.png b/templates/static/img/pictograms/picto-ubuntu-orange.png
deleted file mode 100644
index e4cb74773fa..00000000000
Binary files a/templates/static/img/pictograms/picto-ubuntu-orange.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-Jumpstart-calendar-illustration-270x242.png b/templates/static/img/pictograms/pictogram-Jumpstart-calendar-illustration-270x242.png
deleted file mode 100644
index 75a968f7074..00000000000
Binary files a/templates/static/img/pictograms/pictogram-Jumpstart-calendar-illustration-270x242.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-Jumpstart-calendar-illustration-86x77.png b/templates/static/img/pictograms/pictogram-Jumpstart-calendar-illustration-86x77.png
deleted file mode 100644
index 309168d1d93..00000000000
Binary files a/templates/static/img/pictograms/pictogram-Jumpstart-calendar-illustration-86x77.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-advantage-113x113.png b/templates/static/img/pictograms/pictogram-advantage-113x113.png
deleted file mode 100644
index b3f784d68f8..00000000000
Binary files a/templates/static/img/pictograms/pictogram-advantage-113x113.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-android-129x129.png b/templates/static/img/pictograms/pictogram-android-129x129.png
deleted file mode 100644
index 96c24fd986d..00000000000
Binary files a/templates/static/img/pictograms/pictogram-android-129x129.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-android-36x36.png b/templates/static/img/pictograms/pictogram-android-36x36.png
deleted file mode 100644
index 13807b7e4dd..00000000000
Binary files a/templates/static/img/pictograms/pictogram-android-36x36.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-android-ready-135x155.png b/templates/static/img/pictograms/pictogram-android-ready-135x155.png
deleted file mode 100644
index e65184ca780..00000000000
Binary files a/templates/static/img/pictograms/pictogram-android-ready-135x155.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-ask-ubuntu-113x113.png b/templates/static/img/pictograms/pictogram-ask-ubuntu-113x113.png
deleted file mode 100644
index 99da59bd4d6..00000000000
Binary files a/templates/static/img/pictograms/pictogram-ask-ubuntu-113x113.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-awsome-100x100.png b/templates/static/img/pictograms/pictogram-awsome-100x100.png
deleted file mode 100644
index 7cabeaefc4b..00000000000
Binary files a/templates/static/img/pictograms/pictogram-awsome-100x100.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-calendar-164x145.gif b/templates/static/img/pictograms/pictogram-calendar-164x145.gif
deleted file mode 100644
index 0508368c480..00000000000
Binary files a/templates/static/img/pictograms/pictogram-calendar-164x145.gif and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-calendar-187x166.png b/templates/static/img/pictograms/pictogram-calendar-187x166.png
deleted file mode 100644
index d5fde4e00ce..00000000000
Binary files a/templates/static/img/pictograms/pictogram-calendar-187x166.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-case-studies-336x217.png b/templates/static/img/pictograms/pictogram-case-studies-336x217.png
deleted file mode 100644
index 9680253c6f4..00000000000
Binary files a/templates/static/img/pictograms/pictogram-case-studies-336x217.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-casestudy-reducecosts190x190.png b/templates/static/img/pictograms/pictogram-casestudy-reducecosts190x190.png
deleted file mode 100644
index b8267650629..00000000000
Binary files a/templates/static/img/pictograms/pictogram-casestudy-reducecosts190x190.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-cd-grey-113x113.png b/templates/static/img/pictograms/pictogram-cd-grey-113x113.png
deleted file mode 100644
index a5c8bb664de..00000000000
Binary files a/templates/static/img/pictograms/pictogram-cd-grey-113x113.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-cloud-100x100.png b/templates/static/img/pictograms/pictogram-cloud-100x100.png
deleted file mode 100644
index 5d886c73f05..00000000000
Binary files a/templates/static/img/pictograms/pictogram-cloud-100x100.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-cloud-101X101.png b/templates/static/img/pictograms/pictogram-cloud-101X101.png
deleted file mode 100644
index 807e870e984..00000000000
Binary files a/templates/static/img/pictograms/pictogram-cloud-101X101.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-cloud-113x113.png b/templates/static/img/pictograms/pictogram-cloud-113x113.png
deleted file mode 100644
index fe180541560..00000000000
Binary files a/templates/static/img/pictograms/pictogram-cloud-113x113.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-cloud-443x119.png b/templates/static/img/pictograms/pictogram-cloud-443x119.png
deleted file mode 100644
index 5c3afacdd2a..00000000000
Binary files a/templates/static/img/pictograms/pictogram-cloud-443x119.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-cloud-90.png b/templates/static/img/pictograms/pictogram-cloud-90.png
deleted file mode 100644
index 7a657937a83..00000000000
Binary files a/templates/static/img/pictograms/pictogram-cloud-90.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-cloud-90x90.png b/templates/static/img/pictograms/pictogram-cloud-90x90.png
deleted file mode 100644
index 404d7d45b18..00000000000
Binary files a/templates/static/img/pictograms/pictogram-cloud-90x90.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-cloud-certification.png b/templates/static/img/pictograms/pictogram-cloud-certification.png
deleted file mode 100644
index ab2b81f6da7..00000000000
Binary files a/templates/static/img/pictograms/pictogram-cloud-certification.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-cloud-computing-350.png b/templates/static/img/pictograms/pictogram-cloud-computing-350.png
deleted file mode 100644
index 9aa719db78d..00000000000
Binary files a/templates/static/img/pictograms/pictogram-cloud-computing-350.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-cloud-computing-grey-199x199.png b/templates/static/img/pictograms/pictogram-cloud-computing-grey-199x199.png
deleted file mode 100644
index c614ad5e687..00000000000
Binary files a/templates/static/img/pictograms/pictogram-cloud-computing-grey-199x199.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-cloud-grey-113x113.png b/templates/static/img/pictograms/pictogram-cloud-grey-113x113.png
deleted file mode 100644
index e34fdf00289..00000000000
Binary files a/templates/static/img/pictograms/pictogram-cloud-grey-113x113.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-cloud-tools-288x187.png b/templates/static/img/pictograms/pictogram-cloud-tools-288x187.png
deleted file mode 100644
index cb8ee2c3976..00000000000
Binary files a/templates/static/img/pictograms/pictogram-cloud-tools-288x187.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-community-124x124.gif b/templates/static/img/pictograms/pictogram-community-124x124.gif
deleted file mode 100644
index 8451c14a004..00000000000
Binary files a/templates/static/img/pictograms/pictogram-community-124x124.gif and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-community-136.png b/templates/static/img/pictograms/pictogram-community-136.png
deleted file mode 100644
index cc629f69b9b..00000000000
Binary files a/templates/static/img/pictograms/pictogram-community-136.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-community-187x170.png b/templates/static/img/pictograms/pictogram-community-187x170.png
deleted file mode 100644
index fe761313a18..00000000000
Binary files a/templates/static/img/pictograms/pictogram-community-187x170.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-community-193x174.png b/templates/static/img/pictograms/pictogram-community-193x174.png
deleted file mode 100644
index b53fc3d247f..00000000000
Binary files a/templates/static/img/pictograms/pictogram-community-193x174.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-community-243x217.png b/templates/static/img/pictograms/pictogram-community-243x217.png
deleted file mode 100644
index c7957eebfd6..00000000000
Binary files a/templates/static/img/pictograms/pictogram-community-243x217.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-compatible-226x65.png b/templates/static/img/pictograms/pictogram-compatible-226x65.png
deleted file mode 100644
index ccdebaf32b9..00000000000
Binary files a/templates/static/img/pictograms/pictogram-compatible-226x65.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-compliance-290x175.png b/templates/static/img/pictograms/pictogram-compliance-290x175.png
deleted file mode 100644
index 1c7a148f8b6..00000000000
Binary files a/templates/static/img/pictograms/pictogram-compliance-290x175.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-consulting-113x113.png b/templates/static/img/pictograms/pictogram-consulting-113x113.png
deleted file mode 100644
index 99dfdab8e9f..00000000000
Binary files a/templates/static/img/pictograms/pictogram-consulting-113x113.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-contact-grey-113x113.png b/templates/static/img/pictograms/pictogram-contact-grey-113x113.png
deleted file mode 100644
index 1b60cc98763..00000000000
Binary files a/templates/static/img/pictograms/pictogram-contact-grey-113x113.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-contact-usx115x111.png b/templates/static/img/pictograms/pictogram-contact-usx115x111.png
deleted file mode 100644
index fa1e84a93c8..00000000000
Binary files a/templates/static/img/pictograms/pictogram-contact-usx115x111.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-contacts-90x90.png b/templates/static/img/pictograms/pictogram-contacts-90x90.png
deleted file mode 100644
index 1f2002b6181..00000000000
Binary files a/templates/static/img/pictograms/pictogram-contacts-90x90.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-deploy-182x180.png b/templates/static/img/pictograms/pictogram-deploy-182x180.png
deleted file mode 100644
index 9ab9ad7eee4..00000000000
Binary files a/templates/static/img/pictograms/pictogram-deploy-182x180.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-deploy-352x352.png b/templates/static/img/pictograms/pictogram-deploy-352x352.png
deleted file mode 100644
index f513d08d38f..00000000000
Binary files a/templates/static/img/pictograms/pictogram-deploy-352x352.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-deploy-64.png b/templates/static/img/pictograms/pictogram-deploy-64.png
deleted file mode 100644
index e6f82734bcf..00000000000
Binary files a/templates/static/img/pictograms/pictogram-deploy-64.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-desktop-101X101.png b/templates/static/img/pictograms/pictogram-desktop-101X101.png
deleted file mode 100644
index 06a860ef82d..00000000000
Binary files a/templates/static/img/pictograms/pictogram-desktop-101X101.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-desktop-113.png b/templates/static/img/pictograms/pictogram-desktop-113.png
deleted file mode 100644
index 1369df6b8da..00000000000
Binary files a/templates/static/img/pictograms/pictogram-desktop-113.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-desktop-113x113.png b/templates/static/img/pictograms/pictogram-desktop-113x113.png
deleted file mode 100644
index 8a1dde779fd..00000000000
Binary files a/templates/static/img/pictograms/pictogram-desktop-113x113.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-desktop-143x143.png b/templates/static/img/pictograms/pictogram-desktop-143x143.png
deleted file mode 100644
index 34e10ce8b78..00000000000
Binary files a/templates/static/img/pictograms/pictogram-desktop-143x143.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-desktop-90.png b/templates/static/img/pictograms/pictogram-desktop-90.png
deleted file mode 100644
index 14215387f8b..00000000000
Binary files a/templates/static/img/pictograms/pictogram-desktop-90.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-desktop-developer-support-grey-193x193.png b/templates/static/img/pictograms/pictogram-desktop-developer-support-grey-193x193.png
deleted file mode 100644
index fe14d621568..00000000000
Binary files a/templates/static/img/pictograms/pictogram-desktop-developer-support-grey-193x193.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-develop-125x125.png b/templates/static/img/pictograms/pictogram-develop-125x125.png
deleted file mode 100644
index d9fcc357c31..00000000000
Binary files a/templates/static/img/pictograms/pictogram-develop-125x125.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-discussion-115x115.png b/templates/static/img/pictograms/pictogram-discussion-115x115.png
deleted file mode 100644
index 40956ca5dfe..00000000000
Binary files a/templates/static/img/pictograms/pictogram-discussion-115x115.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-discussion-124x124.gif b/templates/static/img/pictograms/pictogram-discussion-124x124.gif
deleted file mode 100644
index 81c07e17738..00000000000
Binary files a/templates/static/img/pictograms/pictogram-discussion-124x124.gif and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-download-115x115.png b/templates/static/img/pictograms/pictogram-download-115x115.png
deleted file mode 100644
index fd915b86f25..00000000000
Binary files a/templates/static/img/pictograms/pictogram-download-115x115.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-download-124x124.gif b/templates/static/img/pictograms/pictogram-download-124x124.gif
deleted file mode 100644
index 543c86112b1..00000000000
Binary files a/templates/static/img/pictograms/pictogram-download-124x124.gif and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-download-136.png b/templates/static/img/pictograms/pictogram-download-136.png
deleted file mode 100644
index a59a060e869..00000000000
Binary files a/templates/static/img/pictograms/pictogram-download-136.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-download-165x165.png b/templates/static/img/pictograms/pictogram-download-165x165.png
deleted file mode 100644
index f676ec651d5..00000000000
Binary files a/templates/static/img/pictograms/pictogram-download-165x165.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-download-tip-60x49.png b/templates/static/img/pictograms/pictogram-download-tip-60x49.png
deleted file mode 100644
index 80fb7916306..00000000000
Binary files a/templates/static/img/pictograms/pictogram-download-tip-60x49.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-engineering-124x124.png b/templates/static/img/pictograms/pictogram-engineering-124x124.png
deleted file mode 100644
index 8c87c1146c2..00000000000
Binary files a/templates/static/img/pictograms/pictogram-engineering-124x124.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-enterprise-blog-134x94.png b/templates/static/img/pictograms/pictogram-enterprise-blog-134x94.png
deleted file mode 100644
index 92ab2f0e9a5..00000000000
Binary files a/templates/static/img/pictograms/pictogram-enterprise-blog-134x94.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-grey-ask-ubuntu-56x50.png b/templates/static/img/pictograms/pictogram-grey-ask-ubuntu-56x50.png
deleted file mode 100644
index a73a3de2bfe..00000000000
Binary files a/templates/static/img/pictograms/pictogram-grey-ask-ubuntu-56x50.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-grey-cloud-37x37.png b/templates/static/img/pictograms/pictogram-grey-cloud-37x37.png
deleted file mode 100644
index 36f34ca3899..00000000000
Binary files a/templates/static/img/pictograms/pictogram-grey-cloud-37x37.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-grey-contact-37x37.png b/templates/static/img/pictograms/pictogram-grey-contact-37x37.png
deleted file mode 100644
index eb6db89d053..00000000000
Binary files a/templates/static/img/pictograms/pictogram-grey-contact-37x37.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-grey-desktop-37x37.png b/templates/static/img/pictograms/pictogram-grey-desktop-37x37.png
deleted file mode 100644
index fadce7529cd..00000000000
Binary files a/templates/static/img/pictograms/pictogram-grey-desktop-37x37.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-grey-download-37x37.png b/templates/static/img/pictograms/pictogram-grey-download-37x37.png
deleted file mode 100644
index 00aa0d489c2..00000000000
Binary files a/templates/static/img/pictograms/pictogram-grey-download-37x37.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-grey-jumpstart-110x114.png b/templates/static/img/pictograms/pictogram-grey-jumpstart-110x114.png
deleted file mode 100644
index 70ac8012eb9..00000000000
Binary files a/templates/static/img/pictograms/pictogram-grey-jumpstart-110x114.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-grey-logo-ubuntu-110.png b/templates/static/img/pictograms/pictogram-grey-logo-ubuntu-110.png
deleted file mode 100644
index 6d1ea0ae048..00000000000
Binary files a/templates/static/img/pictograms/pictogram-grey-logo-ubuntu-110.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-grey-partners.png b/templates/static/img/pictograms/pictogram-grey-partners.png
deleted file mode 100644
index 90f591aaffc..00000000000
Binary files a/templates/static/img/pictograms/pictogram-grey-partners.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-grey-server-37x37.png b/templates/static/img/pictograms/pictogram-grey-server-37x37.png
deleted file mode 100644
index b77d4033096..00000000000
Binary files a/templates/static/img/pictograms/pictogram-grey-server-37x37.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-headphones-78x78.png b/templates/static/img/pictograms/pictogram-headphones-78x78.png
deleted file mode 100644
index 64429972a0a..00000000000
Binary files a/templates/static/img/pictograms/pictogram-headphones-78x78.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-heart-166.png b/templates/static/img/pictograms/pictogram-heart-166.png
deleted file mode 100644
index 64df8826797..00000000000
Binary files a/templates/static/img/pictograms/pictogram-heart-166.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-help-135.png b/templates/static/img/pictograms/pictogram-help-135.png
deleted file mode 100644
index 08f753d2643..00000000000
Binary files a/templates/static/img/pictograms/pictogram-help-135.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-how-it-works-402x113.png b/templates/static/img/pictograms/pictogram-how-it-works-402x113.png
deleted file mode 100644
index ec63a8773c6..00000000000
Binary files a/templates/static/img/pictograms/pictogram-how-it-works-402x113.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-hyperspeed-100x100.png b/templates/static/img/pictograms/pictogram-hyperspeed-100x100.png
deleted file mode 100644
index 24310115039..00000000000
Binary files a/templates/static/img/pictograms/pictogram-hyperspeed-100x100.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-insights-310x216.png b/templates/static/img/pictograms/pictogram-insights-310x216.png
deleted file mode 100644
index 19009dfe3b9..00000000000
Binary files a/templates/static/img/pictograms/pictogram-insights-310x216.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-ios-36x36.png b/templates/static/img/pictograms/pictogram-ios-36x36.png
deleted file mode 100644
index 47f4a9887d5..00000000000
Binary files a/templates/static/img/pictograms/pictogram-ios-36x36.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-juju-100x100.png b/templates/static/img/pictograms/pictogram-juju-100x100.png
deleted file mode 100644
index f747e45cf82..00000000000
Binary files a/templates/static/img/pictograms/pictogram-juju-100x100.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-juju-113x113.png b/templates/static/img/pictograms/pictogram-juju-113x113.png
deleted file mode 100644
index 03b269628c8..00000000000
Binary files a/templates/static/img/pictograms/pictogram-juju-113x113.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-jumpstart-113x113.png b/templates/static/img/pictograms/pictogram-jumpstart-113x113.png
deleted file mode 100644
index 91479086cf4..00000000000
Binary files a/templates/static/img/pictograms/pictogram-jumpstart-113x113.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-jumpstart-205x205.png b/templates/static/img/pictograms/pictogram-jumpstart-205x205.png
deleted file mode 100644
index 60e93b91a05..00000000000
Binary files a/templates/static/img/pictograms/pictogram-jumpstart-205x205.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-jumpstart.png b/templates/static/img/pictograms/pictogram-jumpstart.png
deleted file mode 100644
index d08b236e245..00000000000
Binary files a/templates/static/img/pictograms/pictogram-jumpstart.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-laptop-78x78.png b/templates/static/img/pictograms/pictogram-laptop-78x78.png
deleted file mode 100644
index cac24563338..00000000000
Binary files a/templates/static/img/pictograms/pictogram-laptop-78x78.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-local-184x182.png b/templates/static/img/pictograms/pictogram-local-184x182.png
deleted file mode 100644
index 0464cff3d37..00000000000
Binary files a/templates/static/img/pictograms/pictogram-local-184x182.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-logo-ubuntu.png b/templates/static/img/pictograms/pictogram-logo-ubuntu.png
deleted file mode 100644
index bead3ca9ea7..00000000000
Binary files a/templates/static/img/pictograms/pictogram-logo-ubuntu.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-maas-100x100.png b/templates/static/img/pictograms/pictogram-maas-100x100.png
deleted file mode 100644
index bebb0943665..00000000000
Binary files a/templates/static/img/pictograms/pictogram-maas-100x100.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-manage-64.png b/templates/static/img/pictograms/pictogram-manage-64.png
deleted file mode 100644
index b5faa72ea7e..00000000000
Binary files a/templates/static/img/pictograms/pictogram-manage-64.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-mercadolibre-220x142.png b/templates/static/img/pictograms/pictogram-mercadolibre-220x142.png
deleted file mode 100644
index 510a625838a..00000000000
Binary files a/templates/static/img/pictograms/pictogram-mercadolibre-220x142.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-monitor-78x78.png b/templates/static/img/pictograms/pictogram-monitor-78x78.png
deleted file mode 100644
index c5f4942c1c4..00000000000
Binary files a/templates/static/img/pictograms/pictogram-monitor-78x78.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-music-90x90.png b/templates/static/img/pictograms/pictogram-music-90x90.png
deleted file mode 100644
index aaff596602d..00000000000
Binary files a/templates/static/img/pictograms/pictogram-music-90x90.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-notes-108x114.png b/templates/static/img/pictograms/pictogram-notes-108x114.png
deleted file mode 100644
index cd9d7b14212..00000000000
Binary files a/templates/static/img/pictograms/pictogram-notes-108x114.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-notes-love-41x41.png b/templates/static/img/pictograms/pictogram-notes-love-41x41.png
deleted file mode 100644
index ad94868e923..00000000000
Binary files a/templates/static/img/pictograms/pictogram-notes-love-41x41.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-notes-ratings-41x41.png b/templates/static/img/pictograms/pictogram-notes-ratings-41x41.png
deleted file mode 100644
index 60bcc193cab..00000000000
Binary files a/templates/static/img/pictograms/pictogram-notes-ratings-41x41.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-notes-thanks-41x41.png b/templates/static/img/pictograms/pictogram-notes-thanks-41x41.png
deleted file mode 100644
index b908d253e4d..00000000000
Binary files a/templates/static/img/pictograms/pictogram-notes-thanks-41x41.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-office-90x90.png b/templates/static/img/pictograms/pictogram-office-90x90.png
deleted file mode 100644
index 3975d8a647d..00000000000
Binary files a/templates/static/img/pictograms/pictogram-office-90x90.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-orange-desktop-113x113.png b/templates/static/img/pictograms/pictogram-orange-desktop-113x113.png
deleted file mode 100644
index 9d543b5554e..00000000000
Binary files a/templates/static/img/pictograms/pictogram-orange-desktop-113x113.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-osx-36x36.png b/templates/static/img/pictograms/pictogram-osx-36x36.png
deleted file mode 100644
index 154ec7cdb12..00000000000
Binary files a/templates/static/img/pictograms/pictogram-osx-36x36.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-partner-124x124.png b/templates/static/img/pictograms/pictogram-partner-124x124.png
deleted file mode 100644
index 2e936cff849..00000000000
Binary files a/templates/static/img/pictograms/pictogram-partner-124x124.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-plan-64.png b/templates/static/img/pictograms/pictogram-plan-64.png
deleted file mode 100644
index 75e0d66fd92..00000000000
Binary files a/templates/static/img/pictograms/pictogram-plan-64.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-public-cloud-350x350.png b/templates/static/img/pictograms/pictogram-public-cloud-350x350.png
deleted file mode 100644
index 33ef93793d2..00000000000
Binary files a/templates/static/img/pictograms/pictogram-public-cloud-350x350.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-public-or-private-cloud.png b/templates/static/img/pictograms/pictogram-public-or-private-cloud.png
deleted file mode 100644
index 7f96260e136..00000000000
Binary files a/templates/static/img/pictograms/pictogram-public-or-private-cloud.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-reduce-costs-115x115.png b/templates/static/img/pictograms/pictogram-reduce-costs-115x115.png
deleted file mode 100644
index b049b200a0d..00000000000
Binary files a/templates/static/img/pictograms/pictogram-reduce-costs-115x115.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-reduce-costs-199x199.png b/templates/static/img/pictograms/pictogram-reduce-costs-199x199.png
deleted file mode 100644
index d1f1862f442..00000000000
Binary files a/templates/static/img/pictograms/pictogram-reduce-costs-199x199.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-reduce-costs-300x300.png b/templates/static/img/pictograms/pictogram-reduce-costs-300x300.png
deleted file mode 100644
index 49d52c94013..00000000000
Binary files a/templates/static/img/pictograms/pictogram-reduce-costs-300x300.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-server-101X101.png b/templates/static/img/pictograms/pictogram-server-101X101.png
deleted file mode 100644
index 34bb52fe820..00000000000
Binary files a/templates/static/img/pictograms/pictogram-server-101X101.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-server-113x113.png b/templates/static/img/pictograms/pictogram-server-113x113.png
deleted file mode 100644
index 389ff5eddf4..00000000000
Binary files a/templates/static/img/pictograms/pictogram-server-113x113.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-server-143x143.png b/templates/static/img/pictograms/pictogram-server-143x143.png
deleted file mode 100644
index f2104c1f5b6..00000000000
Binary files a/templates/static/img/pictograms/pictogram-server-143x143.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-server-320x320.png b/templates/static/img/pictograms/pictogram-server-320x320.png
deleted file mode 100644
index bb3a945ffe9..00000000000
Binary files a/templates/static/img/pictograms/pictogram-server-320x320.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-server-350.png b/templates/static/img/pictograms/pictogram-server-350.png
deleted file mode 100644
index 4625433c955..00000000000
Binary files a/templates/static/img/pictograms/pictogram-server-350.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-server-446x120.png b/templates/static/img/pictograms/pictogram-server-446x120.png
deleted file mode 100644
index 2851999087e..00000000000
Binary files a/templates/static/img/pictograms/pictogram-server-446x120.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-server-grey-113x113.png b/templates/static/img/pictograms/pictogram-server-grey-113x113.png
deleted file mode 100644
index 15a66754c30..00000000000
Binary files a/templates/static/img/pictograms/pictogram-server-grey-113x113.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-server-grey-124.png b/templates/static/img/pictograms/pictogram-server-grey-124.png
deleted file mode 100644
index 37d1bae8a6a..00000000000
Binary files a/templates/static/img/pictograms/pictogram-server-grey-124.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-server-grey-143x143.png b/templates/static/img/pictograms/pictogram-server-grey-143x143.png
deleted file mode 100644
index 0172ccc7b7e..00000000000
Binary files a/templates/static/img/pictograms/pictogram-server-grey-143x143.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-server-grey-90.png b/templates/static/img/pictograms/pictogram-server-grey-90.png
deleted file mode 100644
index e321cb7cbb0..00000000000
Binary files a/templates/static/img/pictograms/pictogram-server-grey-90.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-server-integration-352x90.png b/templates/static/img/pictograms/pictogram-server-integration-352x90.png
deleted file mode 100644
index 5beab2f9ac0..00000000000
Binary files a/templates/static/img/pictograms/pictogram-server-integration-352x90.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-service-already-74x74.png b/templates/static/img/pictograms/pictogram-service-already-74x74.png
deleted file mode 100644
index 0ba894fc84d..00000000000
Binary files a/templates/static/img/pictograms/pictogram-service-already-74x74.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-service-switching-74x74.png b/templates/static/img/pictograms/pictogram-service-switching-74x74.png
deleted file mode 100644
index 30be7f89791..00000000000
Binary files a/templates/static/img/pictograms/pictogram-service-switching-74x74.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-share-124x124.png b/templates/static/img/pictograms/pictogram-share-124x124.png
deleted file mode 100644
index 4fbbda1fbe2..00000000000
Binary files a/templates/static/img/pictograms/pictogram-share-124x124.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-start-153.png b/templates/static/img/pictograms/pictogram-start-153.png
deleted file mode 100644
index 1c5821f6293..00000000000
Binary files a/templates/static/img/pictograms/pictogram-start-153.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-support-113x113.png b/templates/static/img/pictograms/pictogram-support-113x113.png
deleted file mode 100644
index 592614e909a..00000000000
Binary files a/templates/static/img/pictograms/pictogram-support-113x113.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-support-199x199.png b/templates/static/img/pictograms/pictogram-support-199x199.png
deleted file mode 100644
index a31250d5a4a..00000000000
Binary files a/templates/static/img/pictograms/pictogram-support-199x199.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-support.-62x58.png b/templates/static/img/pictograms/pictogram-support.-62x58.png
deleted file mode 100644
index 0aaef62f805..00000000000
Binary files a/templates/static/img/pictograms/pictogram-support.-62x58.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-train-64.png b/templates/static/img/pictograms/pictogram-train-64.png
deleted file mode 100644
index bcce3d66e76..00000000000
Binary files a/templates/static/img/pictograms/pictogram-train-64.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-tweet-109x132.png b/templates/static/img/pictograms/pictogram-tweet-109x132.png
deleted file mode 100644
index 4962e12bf49..00000000000
Binary files a/templates/static/img/pictograms/pictogram-tweet-109x132.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-twitter-115x139.png b/templates/static/img/pictograms/pictogram-twitter-115x139.png
deleted file mode 100644
index 2d20ad197cf..00000000000
Binary files a/templates/static/img/pictograms/pictogram-twitter-115x139.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-twitter-54x63.png b/templates/static/img/pictograms/pictogram-twitter-54x63.png
deleted file mode 100644
index af678c72022..00000000000
Binary files a/templates/static/img/pictograms/pictogram-twitter-54x63.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-ubuntu-36x36.png b/templates/static/img/pictograms/pictogram-ubuntu-36x36.png
deleted file mode 100644
index a5149b42f8a..00000000000
Binary files a/templates/static/img/pictograms/pictogram-ubuntu-36x36.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-ubuntu-business-case-studies-287x210.png b/templates/static/img/pictograms/pictogram-ubuntu-business-case-studies-287x210.png
deleted file mode 100644
index e837cb02caa..00000000000
Binary files a/templates/static/img/pictograms/pictogram-ubuntu-business-case-studies-287x210.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-ubuntu-guest.png b/templates/static/img/pictograms/pictogram-ubuntu-guest.png
deleted file mode 100644
index f7ecc438365..00000000000
Binary files a/templates/static/img/pictograms/pictogram-ubuntu-guest.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-ubuntu-one-113x113.png b/templates/static/img/pictograms/pictogram-ubuntu-one-113x113.png
deleted file mode 100644
index 7d24ba04ce7..00000000000
Binary files a/templates/static/img/pictograms/pictogram-ubuntu-one-113x113.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-upgrade-124x124.png b/templates/static/img/pictograms/pictogram-upgrade-124x124.png
deleted file mode 100644
index 505fe5264d2..00000000000
Binary files a/templates/static/img/pictograms/pictogram-upgrade-124x124.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-upgrade-grey-113x113.png b/templates/static/img/pictograms/pictogram-upgrade-grey-113x113.png
deleted file mode 100644
index a5f28f304c3..00000000000
Binary files a/templates/static/img/pictograms/pictogram-upgrade-grey-113x113.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-use-a-cloud.png b/templates/static/img/pictograms/pictogram-use-a-cloud.png
deleted file mode 100644
index 7e0fafda633..00000000000
Binary files a/templates/static/img/pictograms/pictogram-use-a-cloud.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-virtualise-100x100.png b/templates/static/img/pictograms/pictogram-virtualise-100x100.png
deleted file mode 100644
index 14fc8e45a83..00000000000
Binary files a/templates/static/img/pictograms/pictogram-virtualise-100x100.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-virtualise-135x135.png b/templates/static/img/pictograms/pictogram-virtualise-135x135.png
deleted file mode 100644
index 973d9e3bf6b..00000000000
Binary files a/templates/static/img/pictograms/pictogram-virtualise-135x135.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-virtualise-205x205.png b/templates/static/img/pictograms/pictogram-virtualise-205x205.png
deleted file mode 100644
index 2a2d888c95e..00000000000
Binary files a/templates/static/img/pictograms/pictogram-virtualise-205x205.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-web-36x36.png b/templates/static/img/pictograms/pictogram-web-36x36.png
deleted file mode 100644
index aa6ee7b5e1e..00000000000
Binary files a/templates/static/img/pictograms/pictogram-web-36x36.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-windows-136.png b/templates/static/img/pictograms/pictogram-windows-136.png
deleted file mode 100644
index ae7e68230d7..00000000000
Binary files a/templates/static/img/pictograms/pictogram-windows-136.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-windows-143x143.png b/templates/static/img/pictograms/pictogram-windows-143x143.png
deleted file mode 100644
index eec946c0f29..00000000000
Binary files a/templates/static/img/pictograms/pictogram-windows-143x143.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-windows-36x36.png b/templates/static/img/pictograms/pictogram-windows-36x36.png
deleted file mode 100644
index 2fca8de238f..00000000000
Binary files a/templates/static/img/pictograms/pictogram-windows-36x36.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-windows-44x44.png b/templates/static/img/pictograms/pictogram-windows-44x44.png
deleted file mode 100644
index ea634de3ad1..00000000000
Binary files a/templates/static/img/pictograms/pictogram-windows-44x44.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-windows-grey-113x113.png b/templates/static/img/pictograms/pictogram-windows-grey-113x113.png
deleted file mode 100644
index ac279ff5ae5..00000000000
Binary files a/templates/static/img/pictograms/pictogram-windows-grey-113x113.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-workloads.png b/templates/static/img/pictograms/pictogram-workloads.png
deleted file mode 100644
index 50dff61cd0d..00000000000
Binary files a/templates/static/img/pictograms/pictogram-workloads.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-your-cloud-80x80.png b/templates/static/img/pictograms/pictogram-your-cloud-80x80.png
deleted file mode 100644
index 1ed52fca552..00000000000
Binary files a/templates/static/img/pictograms/pictogram-your-cloud-80x80.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-your-music-80x80.png b/templates/static/img/pictograms/pictogram-your-music-80x80.png
deleted file mode 100644
index b023e37bd8f..00000000000
Binary files a/templates/static/img/pictograms/pictogram-your-music-80x80.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-your-network-80x80.png b/templates/static/img/pictograms/pictogram-your-network-80x80.png
deleted file mode 100644
index c8b6bad6f68..00000000000
Binary files a/templates/static/img/pictograms/pictogram-your-network-80x80.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictogram-your-photos-80x80.png b/templates/static/img/pictograms/pictogram-your-photos-80x80.png
deleted file mode 100644
index f381090cec1..00000000000
Binary files a/templates/static/img/pictograms/pictogram-your-photos-80x80.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictograms-certified.png b/templates/static/img/pictograms/pictograms-certified.png
deleted file mode 100644
index 08d16ec0ed2..00000000000
Binary files a/templates/static/img/pictograms/pictograms-certified.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictograms-insights.png b/templates/static/img/pictograms/pictograms-insights.png
deleted file mode 100644
index 89e2ce0065f..00000000000
Binary files a/templates/static/img/pictograms/pictograms-insights.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictograms-public-cloud-353x119.png b/templates/static/img/pictograms/pictograms-public-cloud-353x119.png
deleted file mode 100644
index 3ef0debe73a..00000000000
Binary files a/templates/static/img/pictograms/pictograms-public-cloud-353x119.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictograms-updates-400x107.png b/templates/static/img/pictograms/pictograms-updates-400x107.png
deleted file mode 100644
index 4ac2182725c..00000000000
Binary files a/templates/static/img/pictograms/pictograms-updates-400x107.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictograms-wide-industry-participation.png b/templates/static/img/pictograms/pictograms-wide-industry-participation.png
deleted file mode 100644
index c717ae5a447..00000000000
Binary files a/templates/static/img/pictograms/pictograms-wide-industry-participation.png and /dev/null differ
diff --git a/templates/static/img/pictograms/pictorgram-upgrade-44x44.png b/templates/static/img/pictograms/pictorgram-upgrade-44x44.png
deleted file mode 100644
index 8360aab8974..00000000000
Binary files a/templates/static/img/pictograms/pictorgram-upgrade-44x44.png and /dev/null differ
diff --git a/templates/static/img/pictograms/sprite-pictograms-get-ubuntu-66x772.png b/templates/static/img/pictograms/sprite-pictograms-get-ubuntu-66x772.png
deleted file mode 100644
index 9460d82fd5e..00000000000
Binary files a/templates/static/img/pictograms/sprite-pictograms-get-ubuntu-66x772.png and /dev/null differ
diff --git a/templates/static/img/pictograms/ubuntu-kylin-chinese-grey.png b/templates/static/img/pictograms/ubuntu-kylin-chinese-grey.png
deleted file mode 100644
index c3d22797ead..00000000000
Binary files a/templates/static/img/pictograms/ubuntu-kylin-chinese-grey.png and /dev/null differ
diff --git a/templates/static/img/pictograms/ubuntu-kylin-chinese.png b/templates/static/img/pictograms/ubuntu-kylin-chinese.png
deleted file mode 100644
index bebcd59e6df..00000000000
Binary files a/templates/static/img/pictograms/ubuntu-kylin-chinese.png and /dev/null differ
diff --git a/templates/static/img/project/ubuntu-font.jpg b/templates/static/img/project/ubuntu-font.jpg
deleted file mode 100644
index 0af702eba1c..00000000000
Binary files a/templates/static/img/project/ubuntu-font.jpg and /dev/null differ
diff --git a/templates/static/img/resources/image-resource-hub-corner.png b/templates/static/img/resources/image-resource-hub-corner.png
deleted file mode 100644
index 2aa65d8dd5f..00000000000
Binary files a/templates/static/img/resources/image-resource-hub-corner.png and /dev/null differ
diff --git a/templates/static/img/search.png b/templates/static/img/search.png
deleted file mode 100644
index 7fb750f0657..00000000000
Binary files a/templates/static/img/search.png and /dev/null differ
diff --git a/templates/static/img/search.svg b/templates/static/img/search.svg
deleted file mode 100644
index cb391870724..00000000000
--- a/templates/static/img/search.svg
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="90"
-   height="90.000015"
-   id="svg3133"
-   version="1.1"
-   inkscape:version="0.48+devel r12262"
-   sodipodi:docname="search.svg">
-  <defs
-     id="defs3135">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3803">
-      <stop
-         style="stop-color:#e7e5e5;stop-opacity:1;"
-         offset="0"
-         id="stop3805" />
-      <stop
-         style="stop-color:#e2dfdf;stop-opacity:1"
-         offset="1"
-         id="stop3807" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3803"
-       id="linearGradient3809"
-       x1="53.012165"
-       y1="-102.79017"
-       x2="53.012165"
-       y2="-66.661224"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3803"
-       id="linearGradient3813"
-       gradientUnits="userSpaceOnUse"
-       x1="53.012165"
-       y1="-102.79017"
-       x2="53.012165"
-       y2="-66.661224"
-       gradientTransform="translate(-625,0)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#ffffff"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9580781"
-     inkscape:cx="47.57328"
-     inkscape:cy="40.531144"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3842"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1029"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:snap-grids="true"
-     inkscape:snap-global="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-center="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3016"
-       empspacing="6"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-2.98e-06px"
-       originy="2.6171874e-06px" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3138">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-2.98e-6,-962.36219)"
-     style="display:inline">
-    <g
-       transform="matrix(0.99934414,0,0,1,-106.92982,549.00002)"
-       id="g3842"
-       style="display:inline">
-      <rect
-         style="opacity:0.05;color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect3844"
-         width="90.059067"
-         height="90.000015"
-         x="107"
-         y="-503.36218"
-         transform="scale(1,-1)" />
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:10.49972248;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path2995"
-         sodipodi:cx="35.999996"
-         sodipodi:cy="36.500011"
-         sodipodi:rx="33"
-         sodipodi:ry="33.5"
-         d="m 68.999996,36.500011 a 33,33.5 0 1 1 -65.9999998,0 A 33,33.5 0 1 1 68.999996,36.500011 Z"
-         transform="matrix(0.86331274,0,0,0.85161915,120.95028,427.27807)" />
-      <path
-         style="font-size:xx-small;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         d="m 175.1697,477.23717 -4.25279,4.25 12.00787,12 L 187.17757,489.23717 Z"
-         id="path3765"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="font-size:xx-small;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:11.80387211;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-         d="m 180.97203,481.40625 c -2.32437,0.012 -4.57033,1.53501 -5.44162,3.68994 -0.87128,2.15492 -0.31496,4.81092 1.34787,6.43506 l 8.79632,8.79991 c 4.02735,4.27401 4.89575,3.69726 8.46955,0.1258 3.57381,-3.57146 4.15747,-4.18909 -0.1258,-8.46955 l -8.79632,-8.79991 C 184.12024,482.05781 182.55003,481.39971 180.97203,481.40625 Z"
-         id="path3767"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cscczccc" />
-    </g>
-  </g>
-</svg>
diff --git a/templates/static/img/search_icon_white_64.png b/templates/static/img/search_icon_white_64.png
deleted file mode 100644
index 2d495f4642f..00000000000
Binary files a/templates/static/img/search_icon_white_64.png and /dev/null differ
diff --git a/templates/static/img/server/server-management-pictos.png b/templates/static/img/server/server-management-pictos.png
deleted file mode 100644
index 532ee980802..00000000000
Binary files a/templates/static/img/server/server-management-pictos.png and /dev/null differ
diff --git a/templates/static/img/share.svg b/templates/static/img/share.svg
deleted file mode 100644
index 3539189f5f7..00000000000
--- a/templates/static/img/share.svg
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="90"
-   height="90"
-   id="svg3140"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="share@30.svg">
-  <defs
-     id="defs3142" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="6.3664629"
-     inkscape:cx="42.15056"
-     inkscape:cy="44.663717"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3441-4"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1029"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3178"
-       empspacing="6"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0px"
-       originy="-1.7382813e-05px" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3145">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-962.36218)">
-    <g
-       id="g4978"
-       transform="translate(-60,548.00002)">
-      <g
-         style="display:inline"
-         inkscape:label="Layer 1"
-         id="g3441-4"
-         transform="matrix(0.99999833,0,0,1,60,-548.00002)">
-        <path
-           sodipodi:type="inkscape:offset"
-           inkscape:radius="-0.31838349"
-           inkscape:original="M 24.5 1017.375 C 21.683495 1017.386 19.129252 1019.8328 19.15625 1022.6875 C 19.10523 1024.7025 18.477924 1026.8931 16.6875 1028.0312 C 14.928548 1029.3646 12.623753 1028.7898 10.59375 1028.875 C 8.0503952 1029.1104 6.0137365 1031.4714 5.875 1033.9375 C 5.5443658 1036.9979 8.260099 1040.0778 11.40625 1039.875 C 13.365705 1039.7298 15.622444 1039.6396 17.15625 1041.0938 C 18.814084 1042.3961 19.09263 1044.5982 19.21875 1046.5625 C 19.461671 1049.9937 23.46779 1052.2857 26.59375 1051 C 29.575663 1049.9779 31.072138 1046.1852 29.59375 1043.4062 C 28.600866 1041.3589 26.30781 1040.0344 24.03125 1040.3438 C 22.04021 1040.5857 19.786406 1040.2924 18.40625 1038.6875 C 16.702625 1036.8125 16.61443 1033.9255 17.40625 1031.625 C 18.25454 1029.3292 20.800946 1027.9984 23.1875 1028.3125 C 24.95755 1028.5278 26.909137 1028.3777 28.25 1027.0625 C 30.728542 1025.0571 30.788794 1020.8982 28.375 1018.8125 C 27.334787 1017.8485 25.916691 1017.3405 24.5 1017.375 z "
-           style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path2991"
-           d="m 24.5,1017.6875 c -2.632867,0.01 -5.056436,2.3369 -5.03125,5 -0.05219,2.0614 -0.70521,4.3682 -2.59375,5.5937 -0.01213,0.01 -0.01908,0.022 -0.03125,0.031 -0.941881,0.6982 -2.026015,0.9033 -3.09375,0.9375 -1.07083,0.034 -2.152687,-0.1001 -3.125,-0.062 -0.0097,4e-4 -0.02155,-4e-4 -0.03125,0 -2.3505987,0.2351 -4.2772414,2.4881 -4.40625,4.7813 -0.3081864,2.8526 2.2595836,5.7824 5.1875,5.5937 1.954564,-0.1448 4.318532,-0.252 5.96875,1.2813 0.01112,0.01 0.0202,0.021 0.03125,0.031 1.748744,1.4022 2.030053,3.6908 2.15625,5.6562 0.226212,3.1952 4.023145,5.3862 6.9375,4.1876 a 0.31841532,0.31841532 0 0 1 0.03125,-0.031 c 2.784288,-0.9544 4.192635,-4.5307 2.8125,-7.125 a 0.31841532,0.31841532 0 0 1 0,-0.031 c -0.932425,-1.9226 -3.121855,-3.1642 -5.25,-2.875 -2.050184,0.2491 -4.426871,-0.03 -5.90625,-1.75 -1.809332,-1.9913 -1.883366,-4.9901 -1.0625,-7.375 a 0.31841532,0.31841532 0 0 1 0,-0.031 c 0.906221,-2.4526 3.594049,-3.8331 6.125,-3.5 1.724598,0.2098 3.573245,0.059 4.8125,-1.1562 a 0.31841532,0.31841532 0 0 1 0.03125,-0.031 c 2.31317,-1.8716 2.347131,-5.8029 0.09375,-7.75 a 0.31841532,0.31841532 0 0 1 0,-0.031 c -0.975302,-0.9038 -2.320772,-1.3762 -3.65625,-1.3437 z"
-           transform="matrix(2.5495252,0,0,2.5175823,-0.90522399,-1596.7459)" />
-        <rect
-           style="opacity:0.1;color:#000000;fill:none;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="rect2988"
-           width="90.000153"
-           height="90"
-           x="0"
-           y="962.36218" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/templates/static/img/tertiary-arrow.png b/templates/static/img/tertiary-arrow.png
deleted file mode 100644
index 48867e694bd..00000000000
Binary files a/templates/static/img/tertiary-arrow.png and /dev/null differ
diff --git a/templates/static/img/test-logo.png b/templates/static/img/test-logo.png
deleted file mode 100644
index b2634a58046..00000000000
Binary files a/templates/static/img/test-logo.png and /dev/null differ
diff --git a/templates/static/img/test.png b/templates/static/img/test.png
deleted file mode 100644
index f857bd05c95..00000000000
Binary files a/templates/static/img/test.png and /dev/null differ
diff --git a/templates/static/img/test/logo.png b/templates/static/img/test/logo.png
deleted file mode 100644
index b2634a58046..00000000000
Binary files a/templates/static/img/test/logo.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-10gen-75x35.png b/templates/static/img/third-party-logos/logo-10gen-75x35.png
deleted file mode 100755
index 35645617856..00000000000
Binary files a/templates/static/img/third-party-logos/logo-10gen-75x35.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-IBM-19x46.gif b/templates/static/img/third-party-logos/logo-IBM-19x46.gif
deleted file mode 100755
index d96713e082f..00000000000
Binary files a/templates/static/img/third-party-logos/logo-IBM-19x46.gif and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-adobe-30x35.png b/templates/static/img/third-party-logos/logo-adobe-30x35.png
deleted file mode 100755
index 927f11e30d6..00000000000
Binary files a/templates/static/img/third-party-logos/logo-adobe-30x35.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-amazon-118x45.png b/templates/static/img/third-party-logos/logo-amazon-118x45.png
deleted file mode 100755
index 28491f6b019..00000000000
Binary files a/templates/static/img/third-party-logos/logo-amazon-118x45.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-amazon-211x100.png b/templates/static/img/third-party-logos/logo-amazon-211x100.png
deleted file mode 100755
index 82a69adb0f6..00000000000
Binary files a/templates/static/img/third-party-logos/logo-amazon-211x100.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-amazon-44x72.png b/templates/static/img/third-party-logos/logo-amazon-44x72.png
deleted file mode 100755
index 70b13cd723c..00000000000
Binary files a/templates/static/img/third-party-logos/logo-amazon-44x72.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-amazon-90x32.png b/templates/static/img/third-party-logos/logo-amazon-90x32.png
deleted file mode 100755
index 31b671dd7e9..00000000000
Binary files a/templates/static/img/third-party-logos/logo-amazon-90x32.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-amazon-grey-207x90.png b/templates/static/img/third-party-logos/logo-amazon-grey-207x90.png
deleted file mode 100755
index b2865a7a8ca..00000000000
Binary files a/templates/static/img/third-party-logos/logo-amazon-grey-207x90.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-arkeia-60x45.png b/templates/static/img/third-party-logos/logo-arkeia-60x45.png
deleted file mode 100755
index 82dc202d3b9..00000000000
Binary files a/templates/static/img/third-party-logos/logo-arkeia-60x45.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-asus-130x28.png b/templates/static/img/third-party-logos/logo-asus-130x28.png
deleted file mode 100755
index 2dd22298242..00000000000
Binary files a/templates/static/img/third-party-logos/logo-asus-130x28.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-asus-210x43.png b/templates/static/img/third-party-logos/logo-asus-210x43.png
deleted file mode 100755
index f87e456f6aa..00000000000
Binary files a/templates/static/img/third-party-logos/logo-asus-210x43.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-atandt-108x48.png b/templates/static/img/third-party-logos/logo-atandt-108x48.png
deleted file mode 100755
index ddd2e9bbb54..00000000000
Binary files a/templates/static/img/third-party-logos/logo-atandt-108x48.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-aws-131x48.png b/templates/static/img/third-party-logos/logo-aws-131x48.png
deleted file mode 100755
index 778a0174dca..00000000000
Binary files a/templates/static/img/third-party-logos/logo-aws-131x48.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-azure-100x45.png b/templates/static/img/third-party-logos/logo-azure-100x45.png
deleted file mode 100755
index 9bf18e58a5b..00000000000
Binary files a/templates/static/img/third-party-logos/logo-azure-100x45.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-azure-150x28.png b/templates/static/img/third-party-logos/logo-azure-150x28.png
deleted file mode 100755
index 8e5430a77e8..00000000000
Binary files a/templates/static/img/third-party-logos/logo-azure-150x28.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-azure-168x76.png b/templates/static/img/third-party-logos/logo-azure-168x76.png
deleted file mode 100755
index 516622e9af0..00000000000
Binary files a/templates/static/img/third-party-logos/logo-azure-168x76.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-azure-196x36.png b/templates/static/img/third-party-logos/logo-azure-196x36.png
deleted file mode 100755
index e957ea1992d..00000000000
Binary files a/templates/static/img/third-party-logos/logo-azure-196x36.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-azure-211x100.png b/templates/static/img/third-party-logos/logo-azure-211x100.png
deleted file mode 100755
index 05895e5776e..00000000000
Binary files a/templates/static/img/third-party-logos/logo-azure-211x100.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-azure-89x40.png b/templates/static/img/third-party-logos/logo-azure-89x40.png
deleted file mode 100755
index 33affbc10ff..00000000000
Binary files a/templates/static/img/third-party-logos/logo-azure-89x40.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-baidu-reflex-48x88.png b/templates/static/img/third-party-logos/logo-baidu-reflex-48x88.png
deleted file mode 100755
index 6f2857db15d..00000000000
Binary files a/templates/static/img/third-party-logos/logo-baidu-reflex-48x88.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-centrify-94x45.png b/templates/static/img/third-party-logos/logo-centrify-94x45.png
deleted file mode 100755
index 4c9ec5c5018..00000000000
Binary files a/templates/static/img/third-party-logos/logo-centrify-94x45.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-chrome-reflex-48x88.png b/templates/static/img/third-party-logos/logo-chrome-reflex-48x88.png
deleted file mode 100755
index 6f62e22a750..00000000000
Binary files a/templates/static/img/third-party-logos/logo-chrome-reflex-48x88.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-chromium-35x35.gif b/templates/static/img/third-party-logos/logo-chromium-35x35.gif
deleted file mode 100755
index e65a303d2c4..00000000000
Binary files a/templates/static/img/third-party-logos/logo-chromium-35x35.gif and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-citrix-74x30.png b/templates/static/img/third-party-logos/logo-citrix-74x30.png
deleted file mode 100755
index 41f6f6e4ba3..00000000000
Binary files a/templates/static/img/third-party-logos/logo-citrix-74x30.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-cloud-foundry-44x72.png b/templates/static/img/third-party-logos/logo-cloud-foundry-44x72.png
deleted file mode 100755
index 25f53c55141..00000000000
Binary files a/templates/static/img/third-party-logos/logo-cloud-foundry-44x72.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-cloud-foundry-92x89.png b/templates/static/img/third-party-logos/logo-cloud-foundry-92x89.png
deleted file mode 100755
index 4982f31763a..00000000000
Binary files a/templates/static/img/third-party-logos/logo-cloud-foundry-92x89.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-cloud-hadoop-92x89.png b/templates/static/img/third-party-logos/logo-cloud-hadoop-92x89.png
deleted file mode 100755
index dbb3fe795d9..00000000000
Binary files a/templates/static/img/third-party-logos/logo-cloud-hadoop-92x89.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-cloudera-100x35.png b/templates/static/img/third-party-logos/logo-cloudera-100x35.png
deleted file mode 100755
index 159e2e39b6a..00000000000
Binary files a/templates/static/img/third-party-logos/logo-cloudera-100x35.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-couchbase-100x35.png b/templates/static/img/third-party-logos/logo-couchbase-100x35.png
deleted file mode 100755
index 2694f20e828..00000000000
Binary files a/templates/static/img/third-party-logos/logo-couchbase-100x35.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-datastax-129x35.png b/templates/static/img/third-party-logos/logo-datastax-129x35.png
deleted file mode 100755
index 671dadc640f..00000000000
Binary files a/templates/static/img/third-party-logos/logo-datastax-129x35.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-dell-160.png b/templates/static/img/third-party-logos/logo-dell-160.png
deleted file mode 100755
index 9f2da61ace3..00000000000
Binary files a/templates/static/img/third-party-logos/logo-dell-160.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-dell-17x54.gif b/templates/static/img/third-party-logos/logo-dell-17x54.gif
deleted file mode 100755
index 2244a3802c7..00000000000
Binary files a/templates/static/img/third-party-logos/logo-dell-17x54.gif and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-dell-45x45.png b/templates/static/img/third-party-logos/logo-dell-45x45.png
deleted file mode 100755
index b0100a1527b..00000000000
Binary files a/templates/static/img/third-party-logos/logo-dell-45x45.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-dell-67x67.png b/templates/static/img/third-party-logos/logo-dell-67x67.png
deleted file mode 100755
index af2a863bcec..00000000000
Binary files a/templates/static/img/third-party-logos/logo-dell-67x67.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-dell-69x69.jpg b/templates/static/img/third-party-logos/logo-dell-69x69.jpg
deleted file mode 100755
index 0552cd8e8ff..00000000000
Binary files a/templates/static/img/third-party-logos/logo-dell-69x69.jpg and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-ema-300x95.jpg b/templates/static/img/third-party-logos/logo-ema-300x95.jpg
deleted file mode 100755
index 1573155a52d..00000000000
Binary files a/templates/static/img/third-party-logos/logo-ema-300x95.jpg and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-emc-160.png b/templates/static/img/third-party-logos/logo-emc-160.png
deleted file mode 100755
index 1d984e61c0e..00000000000
Binary files a/templates/static/img/third-party-logos/logo-emc-160.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-emulex-160.png b/templates/static/img/third-party-logos/logo-emulex-160.png
deleted file mode 100755
index f07706e0836..00000000000
Binary files a/templates/static/img/third-party-logos/logo-emulex-160.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-ericsson-56x49.png b/templates/static/img/third-party-logos/logo-ericsson-56x49.png
deleted file mode 100755
index ea66a34d9c1..00000000000
Binary files a/templates/static/img/third-party-logos/logo-ericsson-56x49.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-firefox-reflex-48x88.png b/templates/static/img/third-party-logos/logo-firefox-reflex-48x88.png
deleted file mode 100755
index c106a41d709..00000000000
Binary files a/templates/static/img/third-party-logos/logo-firefox-reflex-48x88.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-flash-35x35.gif b/templates/static/img/third-party-logos/logo-flash-35x35.gif
deleted file mode 100755
index cba1e068d23..00000000000
Binary files a/templates/static/img/third-party-logos/logo-flash-35x35.gif and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-fusion-io-160.png b/templates/static/img/third-party-logos/logo-fusion-io-160.png
deleted file mode 100755
index 64d0c49c4cd..00000000000
Binary files a/templates/static/img/third-party-logos/logo-fusion-io-160.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-gogrid-102x32.png b/templates/static/img/third-party-logos/logo-gogrid-102x32.png
deleted file mode 100755
index 0ebfbb7e2a2..00000000000
Binary files a/templates/static/img/third-party-logos/logo-gogrid-102x32.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-hortonworks-93x35.png b/templates/static/img/third-party-logos/logo-hortonworks-93x35.png
deleted file mode 100755
index 23e20ee9edf..00000000000
Binary files a/templates/static/img/third-party-logos/logo-hortonworks-93x35.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-hp-160.png b/templates/static/img/third-party-logos/logo-hp-160.png
deleted file mode 100755
index 23223d99fb1..00000000000
Binary files a/templates/static/img/third-party-logos/logo-hp-160.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-hp-211x100.png b/templates/static/img/third-party-logos/logo-hp-211x100.png
deleted file mode 100755
index 63ca037aa9a..00000000000
Binary files a/templates/static/img/third-party-logos/logo-hp-211x100.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-hp-41x45.png b/templates/static/img/third-party-logos/logo-hp-41x45.png
deleted file mode 100755
index fb110a5021d..00000000000
Binary files a/templates/static/img/third-party-logos/logo-hp-41x45.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-hp-45x45.png b/templates/static/img/third-party-logos/logo-hp-45x45.png
deleted file mode 100755
index a2274f83519..00000000000
Binary files a/templates/static/img/third-party-logos/logo-hp-45x45.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-hp-45x50.png b/templates/static/img/third-party-logos/logo-hp-45x50.png
deleted file mode 100755
index a9f7d937672..00000000000
Binary files a/templates/static/img/third-party-logos/logo-hp-45x50.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-hp-49x49.png b/templates/static/img/third-party-logos/logo-hp-49x49.png
deleted file mode 100755
index 3e2974277ed..00000000000
Binary files a/templates/static/img/third-party-logos/logo-hp-49x49.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-hp-61x61.png b/templates/static/img/third-party-logos/logo-hp-61x61.png
deleted file mode 100755
index 8efcaa43d2a..00000000000
Binary files a/templates/static/img/third-party-logos/logo-hp-61x61.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-hp-66x69.jpg b/templates/static/img/third-party-logos/logo-hp-66x69.jpg
deleted file mode 100755
index 1ac2d7a1521..00000000000
Binary files a/templates/static/img/third-party-logos/logo-hp-66x69.jpg and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-hp-grey-31x49.gif b/templates/static/img/third-party-logos/logo-hp-grey-31x49.gif
deleted file mode 100755
index 46178f800e8..00000000000
Binary files a/templates/static/img/third-party-logos/logo-hp-grey-31x49.gif and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-ibm-160.png b/templates/static/img/third-party-logos/logo-ibm-160.png
deleted file mode 100755
index 9bf5b4daee6..00000000000
Binary files a/templates/static/img/third-party-logos/logo-ibm-160.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-ibm-211x100.png b/templates/static/img/third-party-logos/logo-ibm-211x100.png
deleted file mode 100755
index 5382b4082af..00000000000
Binary files a/templates/static/img/third-party-logos/logo-ibm-211x100.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-ibm-211x84.png b/templates/static/img/third-party-logos/logo-ibm-211x84.png
deleted file mode 100755
index e3c9687ee5f..00000000000
Binary files a/templates/static/img/third-party-logos/logo-ibm-211x84.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-ibm-46x45.png b/templates/static/img/third-party-logos/logo-ibm-46x45.png
deleted file mode 100755
index f3db176c755..00000000000
Binary files a/templates/static/img/third-party-logos/logo-ibm-46x45.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-inktank-160.png b/templates/static/img/third-party-logos/logo-inktank-160.png
deleted file mode 100755
index 8525ae99fd4..00000000000
Binary files a/templates/static/img/third-party-logos/logo-inktank-160.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-intel-101x69.jpg b/templates/static/img/third-party-logos/logo-intel-101x69.jpg
deleted file mode 100755
index 97eaaa02205..00000000000
Binary files a/templates/static/img/third-party-logos/logo-intel-101x69.jpg and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-intel-160.png b/templates/static/img/third-party-logos/logo-intel-160.png
deleted file mode 100755
index d83e94b4866..00000000000
Binary files a/templates/static/img/third-party-logos/logo-intel-160.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-intel-50x45.png b/templates/static/img/third-party-logos/logo-intel-50x45.png
deleted file mode 100755
index 99c9db10b69..00000000000
Binary files a/templates/static/img/third-party-logos/logo-intel-50x45.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-iplayer-96x96.jpg b/templates/static/img/third-party-logos/logo-iplayer-96x96.jpg
deleted file mode 100755
index 6db5676e88f..00000000000
Binary files a/templates/static/img/third-party-logos/logo-iplayer-96x96.jpg and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-jenkins-176x63.png b/templates/static/img/third-party-logos/logo-jenkins-176x63.png
deleted file mode 100755
index 8fc3d22f5f4..00000000000
Binary files a/templates/static/img/third-party-logos/logo-jenkins-176x63.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-joyent-211x100.png b/templates/static/img/third-party-logos/logo-joyent-211x100.png
deleted file mode 100755
index d275024519d..00000000000
Binary files a/templates/static/img/third-party-logos/logo-joyent-211x100.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-joyent-211x57.png b/templates/static/img/third-party-logos/logo-joyent-211x57.png
deleted file mode 100755
index 376ccba85f6..00000000000
Binary files a/templates/static/img/third-party-logos/logo-joyent-211x57.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-kvm-116x36.png b/templates/static/img/third-party-logos/logo-kvm-116x36.png
deleted file mode 100755
index 7c5903da060..00000000000
Binary files a/templates/static/img/third-party-logos/logo-kvm-116x36.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-lenovo-108x45.png b/templates/static/img/third-party-logos/logo-lenovo-108x45.png
deleted file mode 100755
index d3884740940..00000000000
Binary files a/templates/static/img/third-party-logos/logo-lenovo-108x45.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-lexisnexis-135x35.png b/templates/static/img/third-party-logos/logo-lexisnexis-135x35.png
deleted file mode 100755
index 09d6efab027..00000000000
Binary files a/templates/static/img/third-party-logos/logo-lexisnexis-135x35.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-libreoffice-106x45.png b/templates/static/img/third-party-logos/logo-libreoffice-106x45.png
deleted file mode 100755
index 799eb3af877..00000000000
Binary files a/templates/static/img/third-party-logos/logo-libreoffice-106x45.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-liferea-35x35.gif b/templates/static/img/third-party-logos/logo-liferea-35x35.gif
deleted file mode 100755
index 68d35be00ba..00000000000
Binary files a/templates/static/img/third-party-logos/logo-liferea-35x35.gif and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-likewise-100x45.png b/templates/static/img/third-party-logos/logo-likewise-100x45.png
deleted file mode 100755
index 72780ab45ec..00000000000
Binary files a/templates/static/img/third-party-logos/logo-likewise-100x45.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-lsi-160.png b/templates/static/img/third-party-logos/logo-lsi-160.png
deleted file mode 100755
index 37521170c12..00000000000
Binary files a/templates/static/img/third-party-logos/logo-lsi-160.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-mapr-60x35.png b/templates/static/img/third-party-logos/logo-mapr-60x35.png
deleted file mode 100755
index fe9b1e42a63..00000000000
Binary files a/templates/static/img/third-party-logos/logo-mapr-60x35.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-mongo-150x57.png b/templates/static/img/third-party-logos/logo-mongo-150x57.png
deleted file mode 100755
index f266dd4890b..00000000000
Binary files a/templates/static/img/third-party-logos/logo-mongo-150x57.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-nagios.png b/templates/static/img/third-party-logos/logo-nagios.png
deleted file mode 100755
index f5e34f252ab..00000000000
Binary files a/templates/static/img/third-party-logos/logo-nagios.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-open-compute-160.png b/templates/static/img/third-party-logos/logo-open-compute-160.png
deleted file mode 100755
index f42b958d346..00000000000
Binary files a/templates/static/img/third-party-logos/logo-open-compute-160.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-openbravo-112x45.png b/templates/static/img/third-party-logos/logo-openbravo-112x45.png
deleted file mode 100755
index 604c3695a4e..00000000000
Binary files a/templates/static/img/third-party-logos/logo-openbravo-112x45.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-openstack-120x122.png b/templates/static/img/third-party-logos/logo-openstack-120x122.png
deleted file mode 100755
index 9579f217bd5..00000000000
Binary files a/templates/static/img/third-party-logos/logo-openstack-120x122.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-openstack-150x43.png b/templates/static/img/third-party-logos/logo-openstack-150x43.png
deleted file mode 100755
index 2f63a2d14ea..00000000000
Binary files a/templates/static/img/third-party-logos/logo-openstack-150x43.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-openstack-44x72.png b/templates/static/img/third-party-logos/logo-openstack-44x72.png
deleted file mode 100755
index 6332946e9be..00000000000
Binary files a/templates/static/img/third-party-logos/logo-openstack-44x72.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-openstack-45x45.png b/templates/static/img/third-party-logos/logo-openstack-45x45.png
deleted file mode 100755
index b022cf49f86..00000000000
Binary files a/templates/static/img/third-party-logos/logo-openstack-45x45.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-openstack-90x87.png b/templates/static/img/third-party-logos/logo-openstack-90x87.png
deleted file mode 100755
index a4e6e83d8f7..00000000000
Binary files a/templates/static/img/third-party-logos/logo-openstack-90x87.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-openstack-grey-120x122.png b/templates/static/img/third-party-logos/logo-openstack-grey-120x122.png
deleted file mode 100755
index 45e7c3e17fa..00000000000
Binary files a/templates/static/img/third-party-logos/logo-openstack-grey-120x122.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-puppet.png b/templates/static/img/third-party-logos/logo-puppet.png
deleted file mode 100755
index 489cb5e4af3..00000000000
Binary files a/templates/static/img/third-party-logos/logo-puppet.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-qualcomm-20x88.gif b/templates/static/img/third-party-logos/logo-qualcomm-20x88.gif
deleted file mode 100755
index 2f4a3df10c1..00000000000
Binary files a/templates/static/img/third-party-logos/logo-qualcomm-20x88.gif and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-rackspace-110x32.png b/templates/static/img/third-party-logos/logo-rackspace-110x32.png
deleted file mode 100755
index b7685e79af8..00000000000
Binary files a/templates/static/img/third-party-logos/logo-rackspace-110x32.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-rackspace-113x50.png b/templates/static/img/third-party-logos/logo-rackspace-113x50.png
deleted file mode 100755
index 1569962c770..00000000000
Binary files a/templates/static/img/third-party-logos/logo-rackspace-113x50.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-rackspace-127x49.png b/templates/static/img/third-party-logos/logo-rackspace-127x49.png
deleted file mode 100755
index 6d96fc80f09..00000000000
Binary files a/templates/static/img/third-party-logos/logo-rackspace-127x49.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-rackspace-211x100.png b/templates/static/img/third-party-logos/logo-rackspace-211x100.png
deleted file mode 100755
index d1a6305e350..00000000000
Binary files a/templates/static/img/third-party-logos/logo-rackspace-211x100.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-rackspace-249x71.png b/templates/static/img/third-party-logos/logo-rackspace-249x71.png
deleted file mode 100755
index 72b052f39de..00000000000
Binary files a/templates/static/img/third-party-logos/logo-rackspace-249x71.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-rackspace-grey-194x71.png b/templates/static/img/third-party-logos/logo-rackspace-grey-194x71.png
deleted file mode 100755
index 5116af584d5..00000000000
Binary files a/templates/static/img/third-party-logos/logo-rackspace-grey-194x71.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-seamicro-160.png b/templates/static/img/third-party-logos/logo-seamicro-160.png
deleted file mode 100755
index 7f28257502f..00000000000
Binary files a/templates/static/img/third-party-logos/logo-seamicro-160.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-steam-206x150.png b/templates/static/img/third-party-logos/logo-steam-206x150.png
deleted file mode 100755
index 440e9bf16a6..00000000000
Binary files a/templates/static/img/third-party-logos/logo-steam-206x150.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-steam-365.png b/templates/static/img/third-party-logos/logo-steam-365.png
deleted file mode 100644
index db1fc237486..00000000000
Binary files a/templates/static/img/third-party-logos/logo-steam-365.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-toshiba-109x45.png b/templates/static/img/third-party-logos/logo-toshiba-109x45.png
deleted file mode 100755
index 4d601e357e7..00000000000
Binary files a/templates/static/img/third-party-logos/logo-toshiba-109x45.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-vmware-108x38.png b/templates/static/img/third-party-logos/logo-vmware-108x38.png
deleted file mode 100755
index 53ca03d49e2..00000000000
Binary files a/templates/static/img/third-party-logos/logo-vmware-108x38.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-vmware-160.png b/templates/static/img/third-party-logos/logo-vmware-160.png
deleted file mode 100755
index 3af5adc3f5e..00000000000
Binary files a/templates/static/img/third-party-logos/logo-vmware-160.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-weta-38x54.gif b/templates/static/img/third-party-logos/logo-weta-38x54.gif
deleted file mode 100755
index 78e30f86ea8..00000000000
Binary files a/templates/static/img/third-party-logos/logo-weta-38x54.gif and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-wikimedia-47x46.gif b/templates/static/img/third-party-logos/logo-wikimedia-47x46.gif
deleted file mode 100755
index e62ce4f8282..00000000000
Binary files a/templates/static/img/third-party-logos/logo-wikimedia-47x46.gif and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-xen-94x43.png b/templates/static/img/third-party-logos/logo-xen-94x43.png
deleted file mode 100755
index 606626c1177..00000000000
Binary files a/templates/static/img/third-party-logos/logo-xen-94x43.png and /dev/null differ
diff --git a/templates/static/img/third-party-logos/logo-youtube-96x96.jpg b/templates/static/img/third-party-logos/logo-youtube-96x96.jpg
deleted file mode 100755
index 0e5fb366505..00000000000
Binary files a/templates/static/img/third-party-logos/logo-youtube-96x96.jpg and /dev/null differ
diff --git a/templates/static/img/twitter.svg b/templates/static/img/twitter.svg
deleted file mode 100644
index 0024781e2c5..00000000000
--- a/templates/static/img/twitter.svg
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="90"
-   height="90"
-   id="svg3289"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="twitter@30.svg">
-  <defs
-     id="defs3291" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#808080"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9580787"
-     inkscape:cx="26.369431"
-     inkscape:cy="45.758564"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4451"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1029"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3061"
-       empspacing="6"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0px"
-       originy="2.5e-05px" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3294">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-962.36223)">
-    <g
-       style="display:inline"
-       transform="translate(-789,604.3622)"
-       id="g4451">
-      <g
-         transform="matrix(1.875,0,0,1.875,249,-1435.1791)"
-         id="g4143">
-        <rect
-           style="opacity:0.21171169;fill:none;stroke:none"
-           id="rect4145"
-           width="48"
-           height="48"
-           x="288"
-           y="152"
-           transform="translate(0,804.3622)" />
-      </g>
-      <path
-         style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
-         d="m 844.41567,367.4855 c -6.73882,2.04333 -13.22339,11.13593 -11.18912,21.42226 -22.36574,-1.3457 -32.24295,-13.32027 -38.1825,-19.05078 -6.05365,10.6772 0.15439,21.055 5.57685,24.41421 -2.86174,0.15721 -6.32317,-1.07865 -8.0412,-2.15388 -0.65287,9.85032 7.38065,16.6786 14.21522,18.44837 -2.18487,0.65113 -4.2439,0.73868 -7.76369,0.21545 2.99737,9.9069 11.05007,12.5584 17.04859,12.99475 -7.72242,6.69538 -16.99612,8.15516 -27.07982,7.66275 26.14467,15.98158 52.54667,6.14923 65.39713,-6.3927 10.79083,-10.53214 15.61488,-26.30305 15.78183,-40.4143 2.46986,-2.00555 7.46387,-6.25642 8.82104,-9.5834 -1.9697,0.75706 -5.86629,2.5581 -9.9324,2.72005 3.34876,-2.19234 7.18633,-6.58563 7.5883,-10.02024 -3.70785,2.0177 -7.99855,3.76591 -11.67352,4.32342 -6.92784,-6.68195 -13.67377,-6.67616 -20.5667,-4.58593 z"
-         id="path6437"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sccccccccscccccs" />
-    </g>
-  </g>
-</svg>
diff --git a/templates/static/img/ubuntu-logo.png b/templates/static/img/ubuntu-logo.png
deleted file mode 100644
index 6b84e6b9d54..00000000000
Binary files a/templates/static/img/ubuntu-logo.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/bg-whyuse-desktop-wallpaper-976x320.jpg b/templates/static/img/ubuntu/bg-whyuse-desktop-wallpaper-976x320.jpg
deleted file mode 100644
index af93a921e5d..00000000000
Binary files a/templates/static/img/ubuntu/bg-whyuse-desktop-wallpaper-976x320.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/bg-usc-ratings-288x285.jpg b/templates/static/img/ubuntu/features/bg-usc-ratings-288x285.jpg
deleted file mode 100644
index bd913c5b008..00000000000
Binary files a/templates/static/img/ubuntu/features/bg-usc-ratings-288x285.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/bg-usc-stellarium-268x440.jpg b/templates/static/img/ubuntu/features/bg-usc-stellarium-268x440.jpg
deleted file mode 100644
index 060c241e984..00000000000
Binary files a/templates/static/img/ubuntu/features/bg-usc-stellarium-268x440.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/bubble-and-laptop-features-fast-600x312.png b/templates/static/img/ubuntu/features/bubble-and-laptop-features-fast-600x312.png
deleted file mode 100644
index ce8ea556d8b..00000000000
Binary files a/templates/static/img/ubuntu/features/bubble-and-laptop-features-fast-600x312.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/features-laptop.jpg b/templates/static/img/ubuntu/features/features-laptop.jpg
deleted file mode 100644
index abd52984465..00000000000
Binary files a/templates/static/img/ubuntu/features/features-laptop.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/features-u1-banner-900x346.png b/templates/static/img/ubuntu/features/features-u1-banner-900x346.png
deleted file mode 100644
index 5052bbb9fdf..00000000000
Binary files a/templates/static/img/ubuntu/features/features-u1-banner-900x346.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/icon-find-more-apps-64x64.png b/templates/static/img/ubuntu/features/icon-find-more-apps-64x64.png
deleted file mode 100644
index 6b19f44873c..00000000000
Binary files a/templates/static/img/ubuntu/features/icon-find-more-apps-64x64.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/icon-music-and-mobile-64x64.png b/templates/static/img/ubuntu/features/icon-music-and-mobile-64x64.png
deleted file mode 100644
index 59397746154..00000000000
Binary files a/templates/static/img/ubuntu/features/icon-music-and-mobile-64x64.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/icon-office-applications-64x64.png b/templates/static/img/ubuntu/features/icon-office-applications-64x64.png
deleted file mode 100644
index 135428f0af6..00000000000
Binary files a/templates/static/img/ubuntu/features/icon-office-applications-64x64.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/icon-personal-cloud-64x64.png b/templates/static/img/ubuntu/features/icon-personal-cloud-64x64.png
deleted file mode 100644
index 8c5a069bbab..00000000000
Binary files a/templates/static/img/ubuntu/features/icon-personal-cloud-64x64.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/icon-photos-and-videos-64x64.png b/templates/static/img/ubuntu/features/icon-photos-and-videos-64x64.png
deleted file mode 100644
index bb4315b823d..00000000000
Binary files a/templates/static/img/ubuntu/features/icon-photos-and-videos-64x64.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/icon-social-and-email-64x64.png b/templates/static/img/ubuntu/features/icon-social-and-email-64x64.png
deleted file mode 100644
index ed900df071e..00000000000
Binary files a/templates/static/img/ubuntu/features/icon-social-and-email-64x64.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/icon-web-browsing-64x64.png b/templates/static/img/ubuntu/features/icon-web-browsing-64x64.png
deleted file mode 100644
index 3e30ba5a221..00000000000
Binary files a/templates/static/img/ubuntu/features/icon-web-browsing-64x64.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/logo-ubuntu-one-118x115.png b/templates/static/img/ubuntu/features/logo-ubuntu-one-118x115.png
deleted file mode 100644
index 007256a3ad9..00000000000
Binary files a/templates/static/img/ubuntu/features/logo-ubuntu-one-118x115.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/photo-shotwell-288x218.jpg b/templates/static/img/ubuntu/features/photo-shotwell-288x218.jpg
deleted file mode 100644
index b2bf9d30cae..00000000000
Binary files a/templates/static/img/ubuntu/features/photo-shotwell-288x218.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/photos-device-compatible-904x301.gif b/templates/static/img/ubuntu/features/photos-device-compatible-904x301.gif
deleted file mode 100644
index fa1d28fb2cb..00000000000
Binary files a/templates/static/img/ubuntu/features/photos-device-compatible-904x301.gif and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/photos-shotwell-288x218.jpg b/templates/static/img/ubuntu/features/photos-shotwell-288x218.jpg
deleted file mode 100644
index 5608c0763f3..00000000000
Binary files a/templates/static/img/ubuntu/features/photos-shotwell-288x218.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/pictograms-features-compatible-306x120.png b/templates/static/img/ubuntu/features/pictograms-features-compatible-306x120.png
deleted file mode 100644
index 77589b4ce39..00000000000
Binary files a/templates/static/img/ubuntu/features/pictograms-features-compatible-306x120.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/precise-features-overview-banner-music.jpg b/templates/static/img/ubuntu/features/precise-features-overview-banner-music.jpg
deleted file mode 100644
index 4ece9996ffc..00000000000
Binary files a/templates/static/img/ubuntu/features/precise-features-overview-banner-music.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/precise-features-overview-banner-office.jpg b/templates/static/img/ubuntu/features/precise-features-overview-banner-office.jpg
deleted file mode 100644
index e3050873a48..00000000000
Binary files a/templates/static/img/ubuntu/features/precise-features-overview-banner-office.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/precise-features-overview-banner-photos.jpg b/templates/static/img/ubuntu/features/precise-features-overview-banner-photos.jpg
deleted file mode 100644
index b335085b3ce..00000000000
Binary files a/templates/static/img/ubuntu/features/precise-features-overview-banner-photos.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/precise-features-overview-banner-social.jpg b/templates/static/img/ubuntu/features/precise-features-overview-banner-social.jpg
deleted file mode 100644
index d657e5351b0..00000000000
Binary files a/templates/static/img/ubuntu/features/precise-features-overview-banner-social.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/precise-features-overview-banner-u1.jpg b/templates/static/img/ubuntu/features/precise-features-overview-banner-u1.jpg
deleted file mode 100644
index 1e592230f0c..00000000000
Binary files a/templates/static/img/ubuntu/features/precise-features-overview-banner-u1.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/precise-features-overview-banner-usc.jpg b/templates/static/img/ubuntu/features/precise-features-overview-banner-usc.jpg
deleted file mode 100644
index 011494146ac..00000000000
Binary files a/templates/static/img/ubuntu/features/precise-features-overview-banner-usc.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/precise-features-overview-banner-web.jpg b/templates/static/img/ubuntu/features/precise-features-overview-banner-web.jpg
deleted file mode 100644
index 2b375e608b1..00000000000
Binary files a/templates/static/img/ubuntu/features/precise-features-overview-banner-web.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-feartures-photos-main-616x326.png b/templates/static/img/ubuntu/features/screenshot-feartures-photos-main-616x326.png
deleted file mode 100644
index 06ce0449d08..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-feartures-photos-main-616x326.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-features-accessibility-442x242.jpg b/templates/static/img/ubuntu/features/screenshot-features-accessibility-442x242.jpg
deleted file mode 100644
index b82f67bf5e7..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-features-accessibility-442x242.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-features-accessible-470x265.png b/templates/static/img/ubuntu/features/screenshot-features-accessible-470x265.png
deleted file mode 100644
index f1087de9512..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-features-accessible-470x265.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-features-hud-274x165.jpg b/templates/static/img/ubuntu/features/screenshot-features-hud-274x165.jpg
deleted file mode 100644
index f0b38830065..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-features-hud-274x165.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-features-music-anywhere-285x181.png b/templates/static/img/ubuntu/features/screenshot-features-music-anywhere-285x181.png
deleted file mode 100644
index 87ba5e5125f..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-features-music-anywhere-285x181.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-features-music-main-614x326.png b/templates/static/img/ubuntu/features/screenshot-features-music-main-614x326.png
deleted file mode 100644
index 56405ac8d67..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-features-music-main-614x326.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-features-music-menu-286x233.jpg b/templates/static/img/ubuntu/features/screenshot-features-music-menu-286x233.jpg
deleted file mode 100644
index b2832184699..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-features-music-menu-286x233.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-features-music-musicstore-266x233.jpg b/templates/static/img/ubuntu/features/screenshot-features-music-musicstore-266x233.jpg
deleted file mode 100644
index 615a7b94fac..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-features-music-musicstore-266x233.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-features-music-preview-288x180.png b/templates/static/img/ubuntu/features/screenshot-features-music-preview-288x180.png
deleted file mode 100644
index 419675a8b29..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-features-music-preview-288x180.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-features-music-streaming-266x233.jpg b/templates/static/img/ubuntu/features/screenshot-features-music-streaming-266x233.jpg
deleted file mode 100644
index 94239ac13a9..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-features-music-streaming-266x233.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-features-music-web-apps-266x232.png b/templates/static/img/ubuntu/features/screenshot-features-music-web-apps-266x232.png
deleted file mode 100644
index 5899e47592f..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-features-music-web-apps-266x232.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-features-office-gtd-288x283.png b/templates/static/img/ubuntu/features/screenshot-features-office-gtd-288x283.png
deleted file mode 100644
index 182a5fba807..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-features-office-gtd-288x283.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-features-office-main-616-326.png b/templates/static/img/ubuntu/features/screenshot-features-office-main-616-326.png
deleted file mode 100644
index b9c5d6d8313..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-features-office-main-616-326.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-features-photos-main-616x326.png b/templates/static/img/ubuntu/features/screenshot-features-photos-main-616x326.png
deleted file mode 100644
index 2ad79b15c62..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-features-photos-main-616x326.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-features-preview-287x165.png b/templates/static/img/ubuntu/features/screenshot-features-preview-287x165.png
deleted file mode 100644
index e408f4ef0b0..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-features-preview-287x165.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-features-suggestions-287x165.png b/templates/static/img/ubuntu/features/screenshot-features-suggestions-287x165.png
deleted file mode 100644
index cd1ef124cf9..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-features-suggestions-287x165.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-features-usc-274x165.jpg b/templates/static/img/ubuntu/features/screenshot-features-usc-274x165.jpg
deleted file mode 100644
index a956d5268c6..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-features-usc-274x165.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-features-usc-developer-442x281.jpg b/templates/static/img/ubuntu/features/screenshot-features-usc-developer-442x281.jpg
deleted file mode 100644
index 47538896286..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-features-usc-developer-442x281.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-features-usc-main-616x326.png b/templates/static/img/ubuntu/features/screenshot-features-usc-main-616x326.png
deleted file mode 100644
index e2833ff49b5..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-features-usc-main-616x326.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-features-videolens-274x165.jpg b/templates/static/img/ubuntu/features/screenshot-features-videolens-274x165.jpg
deleted file mode 100644
index 846e5b4bfab..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-features-videolens-274x165.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-features-web-616x326.png b/templates/static/img/ubuntu/features/screenshot-features-web-616x326.png
deleted file mode 100644
index 4d7c3f1b2d5..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-features-web-616x326.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-features-webapps-287x165.png b/templates/static/img/ubuntu/features/screenshot-features-webapps-287x165.png
deleted file mode 100644
index c593356be97..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-features-webapps-287x165.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-photos-watch-288x253.jpg b/templates/static/img/ubuntu/features/screenshot-photos-watch-288x253.jpg
deleted file mode 100644
index 16768155c64..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-photos-watch-288x253.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-social-main-616x326.png b/templates/static/img/ubuntu/features/screenshot-social-main-616x326.png
deleted file mode 100644
index 01b424fb5de..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-social-main-616x326.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-social-skype-280x218.jpg b/templates/static/img/ubuntu/features/screenshot-social-skype-280x218.jpg
deleted file mode 100644
index 0f4534f92a7..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-social-skype-280x218.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-social-skype-337x267.png b/templates/static/img/ubuntu/features/screenshot-social-skype-337x267.png
deleted file mode 100644
index f002ebc0862..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-social-skype-337x267.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-usc-fungames-328x559.jpg b/templates/static/img/ubuntu/features/screenshot-usc-fungames-328x559.jpg
deleted file mode 100644
index eda5b7f901f..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-usc-fungames-328x559.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshot-web-secure-288x218.gif b/templates/static/img/ubuntu/features/screenshot-web-secure-288x218.gif
deleted file mode 100644
index 0cf80bd31b7..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshot-web-secure-288x218.gif and /dev/null differ
diff --git a/templates/static/img/ubuntu/features/screenshots-photos-organise-288x232.png b/templates/static/img/ubuntu/features/screenshots-photos-organise-288x232.png
deleted file mode 100644
index 97628eeb65d..00000000000
Binary files a/templates/static/img/ubuntu/features/screenshots-photos-organise-288x232.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/notes-457x185.png b/templates/static/img/ubuntu/notes-457x185.png
deleted file mode 100644
index 36079c60d5f..00000000000
Binary files a/templates/static/img/ubuntu/notes-457x185.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/precise-whatsnew-hud.jpg b/templates/static/img/ubuntu/precise-whatsnew-hud.jpg
deleted file mode 100644
index ed55cc62901..00000000000
Binary files a/templates/static/img/ubuntu/precise-whatsnew-hud.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/precise-whatsnew-usc.jpg b/templates/static/img/ubuntu/precise-whatsnew-usc.jpg
deleted file mode 100644
index 906bdca84ab..00000000000
Binary files a/templates/static/img/ubuntu/precise-whatsnew-usc.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/precise-whatsnew-videolens.png b/templates/static/img/ubuntu/precise-whatsnew-videolens.png
deleted file mode 100644
index a8ae6fcbfa3..00000000000
Binary files a/templates/static/img/ubuntu/precise-whatsnew-videolens.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/screenshot-web-main-616x326.png b/templates/static/img/ubuntu/screenshot-web-main-616x326.png
deleted file mode 100644
index fcf11106e70..00000000000
Binary files a/templates/static/img/ubuntu/screenshot-web-main-616x326.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/screenshot-whats-new-dash-preview-906x509.png b/templates/static/img/ubuntu/screenshot-whats-new-dash-preview-906x509.png
deleted file mode 100644
index 15afcf11cab..00000000000
Binary files a/templates/static/img/ubuntu/screenshot-whats-new-dash-preview-906x509.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/screenshot-whats-new-online-search-906x509.png b/templates/static/img/ubuntu/screenshot-whats-new-online-search-906x509.png
deleted file mode 100644
index 56805ccf499..00000000000
Binary files a/templates/static/img/ubuntu/screenshot-whats-new-online-search-906x509.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/screenshot-whats-new-web-apps-906x509.png b/templates/static/img/ubuntu/screenshot-whats-new-web-apps-906x509.png
deleted file mode 100644
index a21370123a0..00000000000
Binary files a/templates/static/img/ubuntu/screenshot-whats-new-web-apps-906x509.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/screenshot-whyfree-music-464x304.jpg b/templates/static/img/ubuntu/screenshot-whyfree-music-464x304.jpg
deleted file mode 100644
index 646dc663ae4..00000000000
Binary files a/templates/static/img/ubuntu/screenshot-whyfree-music-464x304.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/screenshot-whyfree-music-464x304.png b/templates/static/img/ubuntu/screenshot-whyfree-music-464x304.png
deleted file mode 100644
index 2d9983cff75..00000000000
Binary files a/templates/static/img/ubuntu/screenshot-whyfree-music-464x304.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/screenshot-whyuse-464x334.png b/templates/static/img/ubuntu/screenshot-whyuse-464x334.png
deleted file mode 100644
index cc8aa850900..00000000000
Binary files a/templates/static/img/ubuntu/screenshot-whyuse-464x334.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/screenshot-whyuse-laptop-456x223.jpg b/templates/static/img/ubuntu/screenshot-whyuse-laptop-456x223.jpg
deleted file mode 100644
index 43ff829fe12..00000000000
Binary files a/templates/static/img/ubuntu/screenshot-whyuse-laptop-456x223.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/screenshot-whyuse-usc-464x303.png b/templates/static/img/ubuntu/screenshot-whyuse-usc-464x303.png
deleted file mode 100644
index ed23cda2d4a..00000000000
Binary files a/templates/static/img/ubuntu/screenshot-whyuse-usc-464x303.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/test-U.png b/templates/static/img/ubuntu/test-U.png
deleted file mode 100644
index d665e6a157e..00000000000
Binary files a/templates/static/img/ubuntu/test-U.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/tour-screen-1.jpg b/templates/static/img/ubuntu/tour-screen-1.jpg
deleted file mode 100644
index 9de7e7735a5..00000000000
Binary files a/templates/static/img/ubuntu/tour-screen-1.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/tour-shots/screenshot-calc-460X257.jpg b/templates/static/img/ubuntu/tour-shots/screenshot-calc-460X257.jpg
deleted file mode 100644
index 8fa9402c7aa..00000000000
Binary files a/templates/static/img/ubuntu/tour-shots/screenshot-calc-460X257.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/tour-shots/screenshot-calc-900X503.png b/templates/static/img/ubuntu/tour-shots/screenshot-calc-900X503.png
deleted file mode 100644
index 3661774dc8d..00000000000
Binary files a/templates/static/img/ubuntu/tour-shots/screenshot-calc-900X503.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/tour-shots/screenshot-email-460X257.jpg b/templates/static/img/ubuntu/tour-shots/screenshot-email-460X257.jpg
deleted file mode 100644
index c7e2002c710..00000000000
Binary files a/templates/static/img/ubuntu/tour-shots/screenshot-email-460X257.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/tour-shots/screenshot-email-900X503.png b/templates/static/img/ubuntu/tour-shots/screenshot-email-900X503.png
deleted file mode 100644
index 07d885883b1..00000000000
Binary files a/templates/static/img/ubuntu/tour-shots/screenshot-email-900X503.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/tour-shots/screenshot-folders-460X257.jpg b/templates/static/img/ubuntu/tour-shots/screenshot-folders-460X257.jpg
deleted file mode 100644
index 8b280f4f516..00000000000
Binary files a/templates/static/img/ubuntu/tour-shots/screenshot-folders-460X257.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/tour-shots/screenshot-folders-900X503.png b/templates/static/img/ubuntu/tour-shots/screenshot-folders-900X503.png
deleted file mode 100644
index eedf9625559..00000000000
Binary files a/templates/static/img/ubuntu/tour-shots/screenshot-folders-900X503.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/tour-shots/screenshot-impress-460x257.jpg b/templates/static/img/ubuntu/tour-shots/screenshot-impress-460x257.jpg
deleted file mode 100644
index fe571a0cd44..00000000000
Binary files a/templates/static/img/ubuntu/tour-shots/screenshot-impress-460x257.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/tour-shots/screenshot-impress-900X503.png b/templates/static/img/ubuntu/tour-shots/screenshot-impress-900X503.png
deleted file mode 100644
index 1bee5199253..00000000000
Binary files a/templates/static/img/ubuntu/tour-shots/screenshot-impress-900X503.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/tour-shots/screenshot-internet-460x257.jpg b/templates/static/img/ubuntu/tour-shots/screenshot-internet-460x257.jpg
deleted file mode 100644
index 5252389b415..00000000000
Binary files a/templates/static/img/ubuntu/tour-shots/screenshot-internet-460x257.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/tour-shots/screenshot-internet-900X503.png b/templates/static/img/ubuntu/tour-shots/screenshot-internet-900X503.png
deleted file mode 100644
index 6cbdc8cf7cf..00000000000
Binary files a/templates/static/img/ubuntu/tour-shots/screenshot-internet-900X503.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/tour-shots/screenshot-photos-460-257.jpg b/templates/static/img/ubuntu/tour-shots/screenshot-photos-460-257.jpg
deleted file mode 100644
index 4f52586694d..00000000000
Binary files a/templates/static/img/ubuntu/tour-shots/screenshot-photos-460-257.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/tour-shots/screenshot-photos-900X503.png b/templates/static/img/ubuntu/tour-shots/screenshot-photos-900X503.png
deleted file mode 100644
index 3e8767b2d83..00000000000
Binary files a/templates/static/img/ubuntu/tour-shots/screenshot-photos-900X503.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/tour-shots/screenshot-software-centre-460x257.jpg b/templates/static/img/ubuntu/tour-shots/screenshot-software-centre-460x257.jpg
deleted file mode 100644
index 7c2d85d9de4..00000000000
Binary files a/templates/static/img/ubuntu/tour-shots/screenshot-software-centre-460x257.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/tour-shots/screenshot-software-centre-900X503.png b/templates/static/img/ubuntu/tour-shots/screenshot-software-centre-900X503.png
deleted file mode 100644
index 003f7bd6db0..00000000000
Binary files a/templates/static/img/ubuntu/tour-shots/screenshot-software-centre-900X503.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/tour-shots/screenshot-video-460x257.jpg b/templates/static/img/ubuntu/tour-shots/screenshot-video-460x257.jpg
deleted file mode 100644
index aa82f447212..00000000000
Binary files a/templates/static/img/ubuntu/tour-shots/screenshot-video-460x257.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/tour-shots/screenshot-video-900X503.png b/templates/static/img/ubuntu/tour-shots/screenshot-video-900X503.png
deleted file mode 100644
index e9d46eb326a..00000000000
Binary files a/templates/static/img/ubuntu/tour-shots/screenshot-video-900X503.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/tour-shots/screenshot-welcome-500x279.jpg b/templates/static/img/ubuntu/tour-shots/screenshot-welcome-500x279.jpg
deleted file mode 100644
index 07f1caea20d..00000000000
Binary files a/templates/static/img/ubuntu/tour-shots/screenshot-welcome-500x279.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/tour-shots/screenshot-welcome-900X503.png b/templates/static/img/ubuntu/tour-shots/screenshot-welcome-900X503.png
deleted file mode 100644
index 8aedfa66c16..00000000000
Binary files a/templates/static/img/ubuntu/tour-shots/screenshot-welcome-900X503.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/tour-shots/screenshot-writer-460x257.jpg b/templates/static/img/ubuntu/tour-shots/screenshot-writer-460x257.jpg
deleted file mode 100644
index 677e3560110..00000000000
Binary files a/templates/static/img/ubuntu/tour-shots/screenshot-writer-460x257.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/tour-shots/screenshot-writer-900X503.png b/templates/static/img/ubuntu/tour-shots/screenshot-writer-900X503.png
deleted file mode 100644
index 4291936a69d..00000000000
Binary files a/templates/static/img/ubuntu/tour-shots/screenshot-writer-900X503.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/ubuntu-screenshot-altgrav-900x506.jpg b/templates/static/img/ubuntu/ubuntu-screenshot-altgrav-900x506.jpg
deleted file mode 100644
index 4b2407273b2..00000000000
Binary files a/templates/static/img/ubuntu/ubuntu-screenshot-altgrav-900x506.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/ubuntu-screenshot-launcher-900x506.jpg b/templates/static/img/ubuntu/ubuntu-screenshot-launcher-900x506.jpg
deleted file mode 100644
index eb94290df9d..00000000000
Binary files a/templates/static/img/ubuntu/ubuntu-screenshot-launcher-900x506.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/ubuntu-screenshot-musiclens-900x506.jpg b/templates/static/img/ubuntu/ubuntu-screenshot-musiclens-900x506.jpg
deleted file mode 100644
index ae529b7fa92..00000000000
Binary files a/templates/static/img/ubuntu/ubuntu-screenshot-musiclens-900x506.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/ubuntu-screenshot-softwarecentre-900x506.jpg b/templates/static/img/ubuntu/ubuntu-screenshot-softwarecentre-900x506.jpg
deleted file mode 100644
index 75440ab9ff8..00000000000
Binary files a/templates/static/img/ubuntu/ubuntu-screenshot-softwarecentre-900x506.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/ubuntuforyou-laptop-bubble.jpg b/templates/static/img/ubuntu/ubuntuforyou-laptop-bubble.jpg
deleted file mode 100644
index 594ece9dd1f..00000000000
Binary files a/templates/static/img/ubuntu/ubuntuforyou-laptop-bubble.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/ubuntuforyou-only-freeapps.jpg b/templates/static/img/ubuntu/ubuntuforyou-only-freeapps.jpg
deleted file mode 100644
index cc9754d3dc9..00000000000
Binary files a/templates/static/img/ubuntu/ubuntuforyou-only-freeapps.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/ubuntuforyou-only-freeapps.png b/templates/static/img/ubuntu/ubuntuforyou-only-freeapps.png
deleted file mode 100644
index f4cd1dcd4d0..00000000000
Binary files a/templates/static/img/ubuntu/ubuntuforyou-only-freeapps.png and /dev/null differ
diff --git a/templates/static/img/ubuntu/ubuntuforyou-only-musicstore.jpg b/templates/static/img/ubuntu/ubuntuforyou-only-musicstore.jpg
deleted file mode 100644
index c65febcc8f1..00000000000
Binary files a/templates/static/img/ubuntu/ubuntuforyou-only-musicstore.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/ubuntuforyou-only-protection.jpg b/templates/static/img/ubuntu/ubuntuforyou-only-protection.jpg
deleted file mode 100644
index 3e48f5655ab..00000000000
Binary files a/templates/static/img/ubuntu/ubuntuforyou-only-protection.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/ubuntuforyou-only-upgrades.jpg b/templates/static/img/ubuntu/ubuntuforyou-only-upgrades.jpg
deleted file mode 100644
index d0ae377cc15..00000000000
Binary files a/templates/static/img/ubuntu/ubuntuforyou-only-upgrades.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/whats-new-laptop.jpg b/templates/static/img/ubuntu/whats-new-laptop.jpg
deleted file mode 100644
index a00922134ee..00000000000
Binary files a/templates/static/img/ubuntu/whats-new-laptop.jpg and /dev/null differ
diff --git a/templates/static/img/ubuntu/whyuse-laptop-356x217.jpg b/templates/static/img/ubuntu/whyuse-laptop-356x217.jpg
deleted file mode 100644
index 8990808bd94..00000000000
Binary files a/templates/static/img/ubuntu/whyuse-laptop-356x217.jpg and /dev/null differ
diff --git a/templates/static/js/plugins/jquery.countdown.min.js b/templates/static/js/plugins/jquery.countdown.min.js
deleted file mode 100644
index 5216a4d66d0..00000000000
--- a/templates/static/js/plugins/jquery.countdown.min.js
+++ /dev/null
@@ -1,800 +0,0 @@
-/* http://keith-wood.name/countdown.html
-   Countdown for jQuery v1.6.1.
-   Written by Keith Wood (kbwood{at}iinet.com.au) January 2008.
-   Available under the MIT (https://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt) license. 
-   Please attribute the author if you use it. */
-
-/* Display a countdown timer.
-   Attach it with options like:
-   $('div selector').countdown(
-       {until: new Date(2009, 1 - 1, 1, 0, 0, 0), onExpiry: happyNewYear}); */
-
-(function($) { // Hide scope, no $ conflict
-
-/* Countdown manager. */
-function Countdown() {
-	this.regional = []; // Available regional settings, indexed by language code
-	this.regional[''] = { // Default regional settings
-		// The display texts for the counters
-		labels: ['Years', 'Months', 'Weeks', 'Days', 'Hours', 'Minutes', 'Seconds'],
-		// The display texts for the counters if only one
-		labels1: ['Year', 'Month', 'Week', 'Day', 'Hour', 'Minute', 'Second'],
-		compactLabels: ['y', 'm', 'w', 'd'], // The compact texts for the counters
-		whichLabels: null, // Function to determine which labels to use
-		digits: ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'], // The digits to display
-		timeSeparator: ':', // Separator for time periods
-		isRTL: false // True for right-to-left languages, false for left-to-right
-	};
-	this._defaults = {
-		until: null, // new Date(year, mth - 1, day, hr, min, sec) - date/time to count down to
-			// or numeric for seconds offset, or string for unit offset(s):
-			// 'Y' years, 'O' months, 'W' weeks, 'D' days, 'H' hours, 'M' minutes, 'S' seconds
-		since: null, // new Date(year, mth - 1, day, hr, min, sec) - date/time to count up from
-			// or numeric for seconds offset, or string for unit offset(s):
-			// 'Y' years, 'O' months, 'W' weeks, 'D' days, 'H' hours, 'M' minutes, 'S' seconds
-		timezone: null, // The timezone (hours or minutes from GMT) for the target times,
-			// or null for client local
-		serverSync: null, // A function to retrieve the current server time for synchronisation
-		format: 'dHMS', // Format for display - upper case for always, lower case only if non-zero,
-			// 'Y' years, 'O' months, 'W' weeks, 'D' days, 'H' hours, 'M' minutes, 'S' seconds
-		layout: '', // Build your own layout for the countdown
-		compact: false, // True to display in a compact format, false for an expanded one
-		significant: 0, // The number of periods with values to show, zero for all
-		description: '', // The description displayed for the countdown
-		expiryUrl: '', // A URL to load upon expiry, replacing the current page
-		expiryText: '', // Text to display upon expiry, replacing the countdown
-		alwaysExpire: false, // True to trigger onExpiry even if never counted down
-		onExpiry: null, // Callback when the countdown expires -
-			// receives no parameters and 'this' is the containing division
-		onTick: null, // Callback when the countdown is updated -
-			// receives int[7] being the breakdown by period (based on format)
-			// and 'this' is the containing division
-		tickInterval: 1 // Interval (seconds) between onTick callbacks
-	};
-	$.extend(this._defaults, this.regional['']);
-	this._serverSyncs = [];
-	// Shared timer for all countdowns
-	function timerCallBack(timestamp) {
-		var drawStart = (timestamp < 1e12 ? // New HTML5 high resolution timer
-			(drawStart = performance.now ?
-			(performance.now() + performance.timing.navigationStart) : Date.now()) :
-			// Integer milliseconds since unix epoch
-			timestamp || new Date().getTime());
-		if (drawStart - animationStartTime >= 1000) {
-			plugin._updateTargets();
-			animationStartTime = drawStart;
-		}
-		requestAnimationFrame(timerCallBack);
-	}
-	var requestAnimationFrame = window.requestAnimationFrame ||
-		window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame ||
-		window.oRequestAnimationFrame || window.msRequestAnimationFrame || null;
-		// This is when we expect a fall-back to setInterval as it's much more fluid
-	var animationStartTime = 0;
-	if (!requestAnimationFrame || $.noRequestAnimationFrame) {
-		$.noRequestAnimationFrame = null;
-		setInterval(function() { plugin._updateTargets(); }, 980); // Fall back to good old setInterval
-	}
-	else {
-		animationStartTime = window.animationStartTime ||
-			window.webkitAnimationStartTime || window.mozAnimationStartTime ||
-			window.oAnimationStartTime || window.msAnimationStartTime || new Date().getTime();
-		requestAnimationFrame(timerCallBack);
-	}
-}
-
-var Y = 0; // Years
-var O = 1; // Months
-var W = 2; // Weeks
-var D = 3; // Days
-var H = 4; // Hours
-var M = 5; // Minutes
-var S = 6; // Seconds
-
-$.extend(Countdown.prototype, {
-	/* Class name added to elements to indicate already configured with countdown. */
-	markerClassName: 'hasCountdown',
-	/* Name of the data property for instance settings. */
-	propertyName: 'countdown',
-
-	/* Class name for the right-to-left marker. */
-	_rtlClass: 'countdown_rtl',
-	/* Class name for the countdown section marker. */
-	_sectionClass: 'countdown_section',
-	/* Class name for the period amount marker. */
-	_amountClass: 'countdown_amount',
-	/* Class name for the countdown row marker. */
-	_rowClass: 'countdown_row',
-	/* Class name for the holding countdown marker. */
-	_holdingClass: 'countdown_holding',
-	/* Class name for the showing countdown marker. */
-	_showClass: 'countdown_show',
-	/* Class name for the description marker. */
-	_descrClass: 'countdown_descr',
-
-	/* List of currently active countdown targets. */
-	_timerTargets: [],
-	
-	/* Override the default settings for all instances of the countdown widget.
-	   @param  options  (object) the new settings to use as defaults */
-	setDefaults: function(options) {
-		this._resetExtraLabels(this._defaults, options);
-		$.extend(this._defaults, options || {});
-	},
-
-	/* Convert a date/time to UTC.
-	   @param  tz     (number) the hour or minute offset from GMT, e.g. +9, -360
-	   @param  year   (Date) the date/time in that timezone or
-	                  (number) the year in that timezone
-	   @param  month  (number, optional) the month (0 - 11) (omit if year is a Date)
-	   @param  day    (number, optional) the day (omit if year is a Date)
-	   @param  hours  (number, optional) the hour (omit if year is a Date)
-	   @param  mins   (number, optional) the minute (omit if year is a Date)
-	   @param  secs   (number, optional) the second (omit if year is a Date)
-	   @param  ms     (number, optional) the millisecond (omit if year is a Date)
-	   @return  (Date) the equivalent UTC date/time */
-	UTCDate: function(tz, year, month, day, hours, mins, secs, ms) {
-		if (typeof year == 'object' && year.constructor == Date) {
-			ms = year.getMilliseconds();
-			secs = year.getSeconds();
-			mins = year.getMinutes();
-			hours = year.getHours();
-			day = year.getDate();
-			month = year.getMonth();
-			year = year.getFullYear();
-		}
-		var d = new Date();
-		d.setUTCFullYear(year);
-		d.setUTCDate(1);
-		d.setUTCMonth(month || 0);
-		d.setUTCDate(day || 1);
-		d.setUTCHours(hours || 0);
-		d.setUTCMinutes((mins || 0) - (Math.abs(tz) < 30 ? tz * 60 : tz));
-		d.setUTCSeconds(secs || 0);
-		d.setUTCMilliseconds(ms || 0);
-		return d;
-	},
-
-	/* Convert a set of periods into seconds.
-	   Averaged for months and years.
-	   @param  periods  (number[7]) the periods per year/month/week/day/hour/minute/second
-	   @return  (number) the corresponding number of seconds */
-	periodsToSeconds: function(periods) {
-		return periods[0] * 31557600 + periods[1] * 2629800 + periods[2] * 604800 +
-			periods[3] * 86400 + periods[4] * 3600 + periods[5] * 60 + periods[6];
-	},
-
-	/* Attach the countdown widget to a div.
-	   @param  target   (element) the containing division
-	   @param  options  (object) the initial settings for the countdown */
-	_attachPlugin: function(target, options) {
-		target = $(target);
-		if (target.hasClass(this.markerClassName)) {
-			return;
-		}
-		var inst = {options: $.extend({}, this._defaults), _periods: [0, 0, 0, 0, 0, 0, 0]};
-		target.addClass(this.markerClassName).data(this.propertyName, inst);
-		this._optionPlugin(target, options);
-	},
-
-	/* Add a target to the list of active ones.
-	   @param  target  (element) the countdown target */
-	_addTarget: function(target) {
-		if (!this._hasTarget(target)) {
-			this._timerTargets.push(target);
-		}
-	},
-
-	/* See if a target is in the list of active ones.
-	   @param  target  (element) the countdown target
-	   @return  (boolean) true if present, false if not */
-	_hasTarget: function(target) {
-		return ($.inArray(target, this._timerTargets) > -1);
-	},
-
-	/* Remove a target from the list of active ones.
-	   @param  target  (element) the countdown target */
-	_removeTarget: function(target) {
-		this._timerTargets = $.map(this._timerTargets,
-			function(value) { return (value == target ? null : value); }); // delete entry
-	},
-
-	/* Update each active timer target. */
-	_updateTargets: function() {
-		for (var i = this._timerTargets.length - 1; i >= 0; i--) {
-			this._updateCountdown(this._timerTargets[i]);
-		}
-	},
-
-	/* Reconfigure the settings for a countdown div.
-	   @param  target   (element) the control to affect
-	   @param  options  (object) the new options for this instance or
-	                    (string) an individual property name
-	   @param  value    (any) the individual property value (omit if options
-	                    is an object or to retrieve the value of a setting)
-	   @return  (any) if retrieving a value */
-	_optionPlugin: function(target, options, value) {
-		target = $(target);
-		var inst = target.data(this.propertyName);
-		if (!options || (typeof options == 'string' && value == null)) { // Get option
-			var name = options;
-			options = (inst || {}).options;
-			return (options && name ? options[name] : options);
-		}
-
-		if (!target.hasClass(this.markerClassName)) {
-			return;
-		}
-		options = options || {};
-		if (typeof options == 'string') {
-			var name = options;
-			options = {};
-			options[name] = value;
-		}
-		this._resetExtraLabels(inst.options, options);
-		$.extend(inst.options, options);
-		this._adjustSettings(target, inst);
-		var now = new Date();
-		if ((inst._since && inst._since < now) || (inst._until && inst._until > now)) {
-			this._addTarget(target[0]);
-		}
-		this._updateCountdown(target, inst);
-	},
-
-	/* Redisplay the countdown with an updated display.
-	   @param  target  (jQuery) the containing division
-	   @param  inst    (object) the current settings for this instance */
-	_updateCountdown: function(target, inst) {
-		var $target = $(target);
-		inst = inst || $target.data(this.propertyName);
-		if (!inst) {
-			return;
-		}
-		$target.html(this._generateHTML(inst)).toggleClass(this._rtlClass, inst.options.isRTL);
-		if ($.isFunction(inst.options.onTick)) {
-			var periods = inst._hold != 'lap' ? inst._periods :
-				this._calculatePeriods(inst, inst._show, inst.options.significant, new Date());
-			if (inst.options.tickInterval == 1 ||
-					this.periodsToSeconds(periods) % inst.options.tickInterval == 0) {
-				inst.options.onTick.apply(target, [periods]);
-			}
-		}
-		var expired = inst._hold != 'pause' &&
-			(inst._since ? inst._now.getTime() < inst._since.getTime() :
-			inst._now.getTime() >= inst._until.getTime());
-		if (expired && !inst._expiring) {
-			inst._expiring = true;
-			if (this._hasTarget(target) || inst.options.alwaysExpire) {
-				this._removeTarget(target);
-				if ($.isFunction(inst.options.onExpiry)) {
-					inst.options.onExpiry.apply(target, []);
-				}
-				if (inst.options.expiryText) {
-					var layout = inst.options.layout;
-					inst.options.layout = inst.options.expiryText;
-					this._updateCountdown(target, inst);
-					inst.options.layout = layout;
-				}
-				if (inst.options.expiryUrl) {
-					window.location = inst.options.expiryUrl;
-				}
-			}
-			inst._expiring = false;
-		}
-		else if (inst._hold == 'pause') {
-			this._removeTarget(target);
-		}
-		$target.data(this.propertyName, inst);
-	},
-
-	/* Reset any extra labelsn and compactLabelsn entries if changing labels.
-	   @param  base     (object) the options to be updated
-	   @param  options  (object) the new option values */
-	_resetExtraLabels: function(base, options) {
-		var changingLabels = false;
-		for (var n in options) {
-			if (n != 'whichLabels' && n.match(/[Ll]abels/)) {
-				changingLabels = true;
-				break;
-			}
-		}
-		if (changingLabels) {
-			for (var n in base) { // Remove custom numbered labels
-				if (n.match(/[Ll]abels[02-9]/)) {
-					base[n] = null;
-				}
-			}
-		}
-	},
-	
-	/* Calculate interal settings for an instance.
-	   @param  target  (element) the containing division
-	   @param  inst    (object) the current settings for this instance */
-	_adjustSettings: function(target, inst) {
-		var now;
-		var serverOffset = 0;
-		var serverEntry = null;
-		for (var i = 0; i < this._serverSyncs.length; i++) {
-			if (this._serverSyncs[i][0] == inst.options.serverSync) {
-				serverEntry = this._serverSyncs[i][1];
-				break;
-			}
-		}
-		if (serverEntry != null) {
-			serverOffset = (inst.options.serverSync ? serverEntry : 0);
-			now = new Date();
-		}
-		else {
-			var serverResult = ($.isFunction(inst.options.serverSync) ?
-				inst.options.serverSync.apply(target, []) : null);
-			now = new Date();
-			serverOffset = (serverResult ? now.getTime() - serverResult.getTime() : 0);
-			this._serverSyncs.push([inst.options.serverSync, serverOffset]);
-		}
-		var timezone = inst.options.timezone;
-		timezone = (timezone == null ? -now.getTimezoneOffset() : timezone);
-		inst._since = inst.options.since;
-		if (inst._since != null) {
-			inst._since = this.UTCDate(timezone, this._determineTime(inst._since, null));
-			if (inst._since && serverOffset) {
-				inst._since.setMilliseconds(inst._since.getMilliseconds() + serverOffset);
-			}
-		}
-		inst._until = this.UTCDate(timezone, this._determineTime(inst.options.until, now));
-		if (serverOffset) {
-			inst._until.setMilliseconds(inst._until.getMilliseconds() + serverOffset);
-		}
-		inst._show = this._determineShow(inst);
-	},
-
-	/* Remove the countdown widget from a div.
-	   @param  target  (element) the containing division */
-	_destroyPlugin: function(target) {
-		target = $(target);
-		if (!target.hasClass(this.markerClassName)) {
-			return;
-		}
-		this._removeTarget(target[0]);
-		target.removeClass(this.markerClassName).empty().removeData(this.propertyName);
-	},
-
-	/* Pause a countdown widget at the current time.
-	   Stop it running but remember and display the current time.
-	   @param  target  (element) the containing division */
-	_pausePlugin: function(target) {
-		this._hold(target, 'pause');
-	},
-
-	/* Pause a countdown widget at the current time.
-	   Stop the display but keep the countdown running.
-	   @param  target  (element) the containing division */
-	_lapPlugin: function(target) {
-		this._hold(target, 'lap');
-	},
-
-	/* Resume a paused countdown widget.
-	   @param  target  (element) the containing division */
-	_resumePlugin: function(target) {
-		this._hold(target, null);
-	},
-
-	/* Pause or resume a countdown widget.
-	   @param  target  (element) the containing division
-	   @param  hold    (string) the new hold setting */
-	_hold: function(target, hold) {
-		var inst = $.data(target, this.propertyName);
-		if (inst) {
-			if (inst._hold == 'pause' && !hold) {
-				inst._periods = inst._savePeriods;
-				var sign = (inst._since ? '-' : '+');
-				inst[inst._since ? '_since' : '_until'] =
-					this._determineTime(sign + inst._periods[0] + 'y' +
-						sign + inst._periods[1] + 'o' + sign + inst._periods[2] + 'w' +
-						sign + inst._periods[3] + 'd' + sign + inst._periods[4] + 'h' + 
-						sign + inst._periods[5] + 'm' + sign + inst._periods[6] + 's');
-				this._addTarget(target);
-			}
-			inst._hold = hold;
-			inst._savePeriods = (hold == 'pause' ? inst._periods : null);
-			$.data(target, this.propertyName, inst);
-			this._updateCountdown(target, inst);
-		}
-	},
-
-	/* Return the current time periods.
-	   @param  target  (element) the containing division
-	   @return  (number[7]) the current periods for the countdown */
-	_getTimesPlugin: function(target) {
-		var inst = $.data(target, this.propertyName);
-		return (!inst ? null : (!inst._hold ? inst._periods :
-			this._calculatePeriods(inst, inst._show, inst.options.significant, new Date())));
-	},
-
-	/* A time may be specified as an exact value or a relative one.
-	   @param  setting      (string or number or Date) - the date/time value
-	                        as a relative or absolute value
-	   @param  defaultTime  (Date) the date/time to use if no other is supplied
-	   @return  (Date) the corresponding date/time */
-	_determineTime: function(setting, defaultTime) {
-		var offsetNumeric = function(offset) { // e.g. +300, -2
-			var time = new Date();
-			time.setTime(time.getTime() + offset * 1000);
-			return time;
-		};
-		var offsetString = function(offset) { // e.g. '+2d', '-4w', '+3h +30m'
-			offset = offset.toLowerCase();
-			var time = new Date();
-			var year = time.getFullYear();
-			var month = time.getMonth();
-			var day = time.getDate();
-			var hour = time.getHours();
-			var minute = time.getMinutes();
-			var second = time.getSeconds();
-			var pattern = /([+-]?[0-9]+)\s*(s|m|h|d|w|o|y)?/g;
-			var matches = pattern.exec(offset);
-			while (matches) {
-				switch (matches[2] || 's') {
-					case 's': second += parseInt(matches[1], 10); break;
-					case 'm': minute += parseInt(matches[1], 10); break;
-					case 'h': hour += parseInt(matches[1], 10); break;
-					case 'd': day += parseInt(matches[1], 10); break;
-					case 'w': day += parseInt(matches[1], 10) * 7; break;
-					case 'o':
-						month += parseInt(matches[1], 10); 
-						day = Math.min(day, plugin._getDaysInMonth(year, month));
-						break;
-					case 'y':
-						year += parseInt(matches[1], 10);
-						day = Math.min(day, plugin._getDaysInMonth(year, month));
-						break;
-				}
-				matches = pattern.exec(offset);
-			}
-			return new Date(year, month, day, hour, minute, second, 0);
-		};
-		var time = (setting == null ? defaultTime :
-			(typeof setting == 'string' ? offsetString(setting) :
-			(typeof setting == 'number' ? offsetNumeric(setting) : setting)));
-		if (time) time.setMilliseconds(0);
-		return time;
-	},
-
-	/* Determine the number of days in a month.
-	   @param  year   (number) the year
-	   @param  month  (number) the month
-	   @return  (number) the days in that month */
-	_getDaysInMonth: function(year, month) {
-		return 32 - new Date(year, month, 32).getDate();
-	},
-
-	/* Determine which set of labels should be used for an amount.
-	   @param  num  (number) the amount to be displayed
-	   @return  (number) the set of labels to be used for this amount */
-	_normalLabels: function(num) {
-		return num;
-	},
-
-	/* Generate the HTML to display the countdown widget.
-	   @param  inst  (object) the current settings for this instance
-	   @return  (string) the new HTML for the countdown display */
-	_generateHTML: function(inst) {
-		var self = this;
-		// Determine what to show
-		inst._periods = (inst._hold ? inst._periods :
-			this._calculatePeriods(inst, inst._show, inst.options.significant, new Date()));
-		// Show all 'asNeeded' after first non-zero value
-		var shownNonZero = false;
-		var showCount = 0;
-		var sigCount = inst.options.significant;
-		var show = $.extend({}, inst._show);
-		for (var period = Y; period <= S; period++) {
-			shownNonZero |= (inst._show[period] == '?' && inst._periods[period] > 0);
-			show[period] = (inst._show[period] == '?' && !shownNonZero ? null : inst._show[period]);
-			showCount += (show[period] ? 1 : 0);
-			sigCount -= (inst._periods[period] > 0 ? 1 : 0);
-		}
-		var showSignificant = [false, false, false, false, false, false, false];
-		for (var period = S; period >= Y; period--) { // Determine significant periods
-			if (inst._show[period]) {
-				if (inst._periods[period]) {
-					showSignificant[period] = true;
-				}
-				else {
-					showSignificant[period] = sigCount > 0;
-					sigCount--;
-				}
-			}
-		}
-		var labels = (inst.options.compact ? inst.options.compactLabels : inst.options.labels);
-		var whichLabels = inst.options.whichLabels || this._normalLabels;
-		var showCompact = function(period) {
-			var labelsNum = inst.options['compactLabels' + whichLabels(inst._periods[period])];
-			return (show[period] ? self._translateDigits(inst, inst._periods[period]) +
-				(labelsNum ? labelsNum[period] : labels[period]) + ' ' : '');
-		};
-		var showFull = function(period) {
-			var labelsNum = inst.options['labels' + whichLabels(inst._periods[period])];
-			return ((!inst.options.significant && show[period]) ||
-				(inst.options.significant && showSignificant[period]) ?
-				'<span class="' + plugin._sectionClass + '">' +
-				'<span class="' + plugin._amountClass + '">' +
-				self._translateDigits(inst, inst._periods[period]) + '</span><br/>' +
-				(labelsNum ? labelsNum[period] : labels[period]) + '</span>' : '');
-		};
-		return (inst.options.layout ? this._buildLayout(inst, show, inst.options.layout,
-			inst.options.compact, inst.options.significant, showSignificant) :
-			((inst.options.compact ? // Compact version
-			'<span class="' + this._rowClass + ' ' + this._amountClass +
-			(inst._hold ? ' ' + this._holdingClass : '') + '">' + 
-			showCompact(Y) + showCompact(O) + showCompact(W) + showCompact(D) + 
-			(show[H] ? this._minDigits(inst, inst._periods[H], 2) : '') +
-			(show[M] ? (show[H] ? inst.options.timeSeparator : '') +
-			this._minDigits(inst, inst._periods[M], 2) : '') +
-			(show[S] ? (show[H] || show[M] ? inst.options.timeSeparator : '') +
-			this._minDigits(inst, inst._periods[S], 2) : '') :
-			// Full version
-			'<span class="' + this._rowClass + ' ' + this._showClass + (inst.options.significant || showCount) +
-			(inst._hold ? ' ' + this._holdingClass : '') + '">' +
-			showFull(Y) + showFull(O) + showFull(W) + showFull(D) +
-			showFull(H) + showFull(M) + showFull(S)) + '</span>' +
-			(inst.options.description ? '<span class="' + this._rowClass + ' ' + this._descrClass + '">' +
-			inst.options.description + '</span>' : '')));
-	},
-
-	/* Construct a custom layout.
-	   @param  inst             (object) the current settings for this instance
-	   @param  show             (string[7]) flags indicating which periods are requested
-	   @param  layout           (string) the customised layout
-	   @param  compact          (boolean) true if using compact labels
-	   @param  significant      (number) the number of periods with values to show, zero for all
-	   @param  showSignificant  (boolean[7]) other periods to show for significance
-	   @return  (string) the custom HTML */
-	_buildLayout: function(inst, show, layout, compact, significant, showSignificant) {
-		var labels = inst.options[compact ? 'compactLabels' : 'labels'];
-		var whichLabels = inst.options.whichLabels || this._normalLabels;
-		var labelFor = function(index) {
-			return (inst.options[(compact ? 'compactLabels' : 'labels') +
-				whichLabels(inst._periods[index])] || labels)[index];
-		};
-		var digit = function(value, position) {
-			return inst.options.digits[Math.floor(value / position) % 10];
-		};
-		var subs = {desc: inst.options.description, sep: inst.options.timeSeparator,
-			yl: labelFor(Y), yn: this._minDigits(inst, inst._periods[Y], 1),
-			ynn: this._minDigits(inst, inst._periods[Y], 2),
-			ynnn: this._minDigits(inst, inst._periods[Y], 3), y1: digit(inst._periods[Y], 1),
-			y10: digit(inst._periods[Y], 10), y100: digit(inst._periods[Y], 100),
-			y1000: digit(inst._periods[Y], 1000),
-			ol: labelFor(O), on: this._minDigits(inst, inst._periods[O], 1),
-			onn: this._minDigits(inst, inst._periods[O], 2),
-			onnn: this._minDigits(inst, inst._periods[O], 3), o1: digit(inst._periods[O], 1),
-			o10: digit(inst._periods[O], 10), o100: digit(inst._periods[O], 100),
-			o1000: digit(inst._periods[O], 1000),
-			wl: labelFor(W), wn: this._minDigits(inst, inst._periods[W], 1),
-			wnn: this._minDigits(inst, inst._periods[W], 2),
-			wnnn: this._minDigits(inst, inst._periods[W], 3), w1: digit(inst._periods[W], 1),
-			w10: digit(inst._periods[W], 10), w100: digit(inst._periods[W], 100),
-			w1000: digit(inst._periods[W], 1000),
-			dl: labelFor(D), dn: this._minDigits(inst, inst._periods[D], 1),
-			dnn: this._minDigits(inst, inst._periods[D], 2),
-			dnnn: this._minDigits(inst, inst._periods[D], 3), d1: digit(inst._periods[D], 1),
-			d10: digit(inst._periods[D], 10), d100: digit(inst._periods[D], 100),
-			d1000: digit(inst._periods[D], 1000),
-			hl: labelFor(H), hn: this._minDigits(inst, inst._periods[H], 1),
-			hnn: this._minDigits(inst, inst._periods[H], 2),
-			hnnn: this._minDigits(inst, inst._periods[H], 3), h1: digit(inst._periods[H], 1),
-			h10: digit(inst._periods[H], 10), h100: digit(inst._periods[H], 100),
-			h1000: digit(inst._periods[H], 1000),
-			ml: labelFor(M), mn: this._minDigits(inst, inst._periods[M], 1),
-			mnn: this._minDigits(inst, inst._periods[M], 2),
-			mnnn: this._minDigits(inst, inst._periods[M], 3), m1: digit(inst._periods[M], 1),
-			m10: digit(inst._periods[M], 10), m100: digit(inst._periods[M], 100),
-			m1000: digit(inst._periods[M], 1000),
-			sl: labelFor(S), sn: this._minDigits(inst, inst._periods[S], 1),
-			snn: this._minDigits(inst, inst._periods[S], 2),
-			snnn: this._minDigits(inst, inst._periods[S], 3), s1: digit(inst._periods[S], 1),
-			s10: digit(inst._periods[S], 10), s100: digit(inst._periods[S], 100),
-			s1000: digit(inst._periods[S], 1000)};
-		var html = layout;
-		// Replace period containers: {p<}...{p>}
-		for (var i = Y; i <= S; i++) {
-			var period = 'yowdhms'.charAt(i);
-			var re = new RegExp('\\{' + period + '<\\}(.*)\\{' + period + '>\\}', 'g');
-			html = html.replace(re, ((!significant && show[i]) ||
-				(significant && showSignificant[i]) ? '$1' : ''));
-		}
-		// Replace period values: {pn}
-		$.each(subs, function(n, v) {
-			var re = new RegExp('\\{' + n + '\\}', 'g');
-			html = html.replace(re, v);
-		});
-		return html;
-	},
-
-	/* Ensure a numeric value has at least n digits for display.
-	   @param  inst   (object) the current settings for this instance
-	   @param  value  (number) the value to display
-	   @param  len    (number) the minimum length
-	   @return  (string) the display text */
-	_minDigits: function(inst, value, len) {
-		value = '' + value;
-		if (value.length >= len) {
-			return this._translateDigits(inst, value);
-		}
-		value = '0000000000' + value;
-		return this._translateDigits(inst, value.substr(value.length - len));
-	},
-
-	/* Translate digits into other representations.
-	   @param  inst   (object) the current settings for this instance
-	   @param  value  (string) the text to translate
-	   @return  (string) the translated text */
-	_translateDigits: function(inst, value) {
-		return ('' + value).replace(/[0-9]/g, function(digit) {
-				return inst.options.digits[digit];
-			});
-	},
-
-	/* Translate the format into flags for each period.
-	   @param  inst  (object) the current settings for this instance
-	   @return  (string[7]) flags indicating which periods are requested (?) or
-	            required (!) by year, month, week, day, hour, minute, second */
-	_determineShow: function(inst) {
-		var format = inst.options.format;
-		var show = [];
-		show[Y] = (format.match('y') ? '?' : (format.match('Y') ? '!' : null));
-		show[O] = (format.match('o') ? '?' : (format.match('O') ? '!' : null));
-		show[W] = (format.match('w') ? '?' : (format.match('W') ? '!' : null));
-		show[D] = (format.match('d') ? '?' : (format.match('D') ? '!' : null));
-		show[H] = (format.match('h') ? '?' : (format.match('H') ? '!' : null));
-		show[M] = (format.match('m') ? '?' : (format.match('M') ? '!' : null));
-		show[S] = (format.match('s') ? '?' : (format.match('S') ? '!' : null));
-		return show;
-	},
-	
-	/* Calculate the requested periods between now and the target time.
-	   @param  inst         (object) the current settings for this instance
-	   @param  show         (string[7]) flags indicating which periods are requested/required
-	   @param  significant  (number) the number of periods with values to show, zero for all
-	   @param  now          (Date) the current date and time
-	   @return  (number[7]) the current time periods (always positive)
-	            by year, month, week, day, hour, minute, second */
-	_calculatePeriods: function(inst, show, significant, now) {
-		// Find endpoints
-		inst._now = now;
-		inst._now.setMilliseconds(0);
-		var until = new Date(inst._now.getTime());
-		if (inst._since) {
-			if (now.getTime() < inst._since.getTime()) {
-				inst._now = now = until;
-			}
-			else {
-				now = inst._since;
-			}
-		}
-		else {
-			until.setTime(inst._until.getTime());
-			if (now.getTime() > inst._until.getTime()) {
-				inst._now = now = until;
-			}
-		}
-		// Calculate differences by period
-		var periods = [0, 0, 0, 0, 0, 0, 0];
-		if (show[Y] || show[O]) {
-			// Treat end of months as the same
-			var lastNow = plugin._getDaysInMonth(now.getFullYear(), now.getMonth());
-			var lastUntil = plugin._getDaysInMonth(until.getFullYear(), until.getMonth());
-			var sameDay = (until.getDate() == now.getDate() ||
-				(until.getDate() >= Math.min(lastNow, lastUntil) &&
-				now.getDate() >= Math.min(lastNow, lastUntil)));
-			var getSecs = function(date) {
-				return (date.getHours() * 60 + date.getMinutes()) * 60 + date.getSeconds();
-			};
-			var months = Math.max(0,
-				(until.getFullYear() - now.getFullYear()) * 12 + until.getMonth() - now.getMonth() +
-				((until.getDate() < now.getDate() && !sameDay) ||
-				(sameDay && getSecs(until) < getSecs(now)) ? -1 : 0));
-			periods[Y] = (show[Y] ? Math.floor(months / 12) : 0);
-			periods[O] = (show[O] ? months - periods[Y] * 12 : 0);
-			// Adjust for months difference and end of month if necessary
-			now = new Date(now.getTime());
-			var wasLastDay = (now.getDate() == lastNow);
-			var lastDay = plugin._getDaysInMonth(now.getFullYear() + periods[Y],
-				now.getMonth() + periods[O]);
-			if (now.getDate() > lastDay) {
-				now.setDate(lastDay);
-			}
-			now.setFullYear(now.getFullYear() + periods[Y]);
-			now.setMonth(now.getMonth() + periods[O]);
-			if (wasLastDay) {
-				now.setDate(lastDay);
-			}
-		}
-		var diff = Math.floor((until.getTime() - now.getTime()) / 1000);
-		var extractPeriod = function(period, numSecs) {
-			periods[period] = (show[period] ? Math.floor(diff / numSecs) : 0);
-			diff -= periods[period] * numSecs;
-		};
-		extractPeriod(W, 604800);
-		extractPeriod(D, 86400);
-		extractPeriod(H, 3600);
-		extractPeriod(M, 60);
-		extractPeriod(S, 1);
-		if (diff > 0 && !inst._since) { // Round up if left overs
-			var multiplier = [1, 12, 4.3482, 7, 24, 60, 60];
-			var lastShown = S;
-			var max = 1;
-			for (var period = S; period >= Y; period--) {
-				if (show[period]) {
-					if (periods[lastShown] >= max) {
-						periods[lastShown] = 0;
-						diff = 1;
-					}
-					if (diff > 0) {
-						periods[period]++;
-						diff = 0;
-						lastShown = period;
-						max = 1;
-					}
-				}
-				max *= multiplier[period];
-			}
-		}
-		if (significant) { // Zero out insignificant periods
-			for (var period = Y; period <= S; period++) {
-				if (significant && periods[period]) {
-					significant--;
-				}
-				else if (!significant) {
-					periods[period] = 0;
-				}
-			}
-		}
-		return periods;
-	}
-});
-
-// The list of commands that return values and don't permit chaining
-var getters = ['getTimes'];
-
-/* Determine whether a command is a getter and doesn't permit chaining.
-   @param  command    (string, optional) the command to run
-   @param  otherArgs  ([], optional) any other arguments for the command
-   @return  true if the command is a getter, false if not */
-function isNotChained(command, otherArgs) {
-	if (command == 'option' && (otherArgs.length == 0 ||
-			(otherArgs.length == 1 && typeof otherArgs[0] == 'string'))) {
-		return true;
-	}
-	return $.inArray(command, getters) > -1;
-}
-
-/* Process the countdown functionality for a jQuery selection.
-   @param  options  (object) the new settings to use for these instances (optional) or
-                    (string) the command to run (optional)
-   @return  (jQuery) for chaining further calls or
-            (any) getter value */
-$.fn.countdown = function(options) {
-	var otherArgs = Array.prototype.slice.call(arguments, 1);
-	if (isNotChained(options, otherArgs)) {
-		return plugin['_' + options + 'Plugin'].
-			apply(plugin, [this[0]].concat(otherArgs));
-	}
-	return this.each(function() {
-		if (typeof options == 'string') {
-			if (!plugin['_' + options + 'Plugin']) {
-				throw 'Unknown command: ' + options;
-			}
-			plugin['_' + options + 'Plugin'].
-				apply(plugin, [this].concat(otherArgs));
-		}
-		else {
-			plugin._attachPlugin(this, options || {});
-		}
-	});
-};
-
-/* Initialise the countdown functionality. */
-var plugin = $.countdown = new Countdown(); // Singleton instance
-
-})(jQuery);
\ No newline at end of file
diff --git a/templates/static/js/plugins/yui-combined.min.js b/templates/static/js/plugins/yui-combined.min.js
deleted file mode 100644
index 2070ca03723..00000000000
--- a/templates/static/js/plugins/yui-combined.min.js
+++ /dev/null
@@ -1,497 +0,0 @@
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-typeof YUI!="undefined"&&(YUI._YUI=YUI);var YUI=function(){var e=0,t=this,n=arguments,r=n.length,i=function(e,t){return e&&e.hasOwnProperty&&e instanceof t},s=typeof YUI_config!="undefined"&&YUI_config;i(t,YUI)?(t._init(),YUI.GlobalConfig&&t.applyConfig(YUI.GlobalConfig),s&&t.applyConfig(s),r||t._setup()):t=new YUI;if(r){for(;e<r;e++)t.applyConfig(n[e]);t._setup()}return t.instanceOf=i,t};(function(){var e,t,n="3.15.0",r=".",i="http://yui.yahooapis.com/",s="yui3-js-enabled",o="yui3-css-stamp",u=function(){},a=Array.prototype.slice,f={"io.xdrReady":1,"io.xdrResponse":1,"SWF.eventHandler":1},l=typeof window!="undefined",c=l?window:null,h=l?c.document:null,p=h&&h.documentElement,d=p&&p.className,v={},m=(new Date).getTime(),g=function(e,t,n,r){e&&e.addEventListener?e.addEventListener(t,n,r):e&&e.attachEvent&&e.attachEvent("on"+t,n)},y=function(e,t,n,r){if(e&&e.removeEventListener)try{e.removeEventListener(t,n,r)}catch(i){}else e&&e.detachEvent&&e.detachEvent("on"+t,n)},b=function(){YUI.Env.DOMReady=!0,l&&y(h,"DOMContentLoaded",b)},w=function(){YUI.Env.windowLoaded=!0,YUI.Env.DOMReady=!0,l&&y(window,"load",w)},E=function(e,t){var n=e.Env._loader,r=["loader-base"],i=YUI.Env,s=i.mods;return n?(n.ignoreRegistered=!1,n.onEnd=null,n.data=null,n.required=[],n.loadType=null):(n=new e.Loader(e.config),e.Env._loader=n),s&&s.loader&&(r=[].concat(r,YUI.Env.loaderExtras)),YUI.Env.core=e.Array.dedupe([].concat(YUI.Env.core,r)),n},S=function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])},x={success:!0};p&&d.indexOf(s)==-1&&(d&&(d+=" "),d+=s,p.className=d),n.indexOf("@")>-1&&(n="3.5.0"),e={applyConfig:function(e){e=e||u;var t,n,r=this.config,i=r.modules,s=r.groups,o=r.aliases,a=this.Env._loader;for(n in e)e.hasOwnProperty(n)&&(t=e[n],i&&n=="modules"?S(i,t):o&&n=="aliases"?S(o,t):s&&n=="groups"?S(s,t):n=="win"?(r[n]=t&&t.contentWindow||t,r.doc=r[n]?r[n].document:null):n!="_yuid"&&(r[n]=t));a&&a._config(e)},_config:function(e){this.applyConfig(e)},_init:function(){var e,t,r=this,s=YUI.Env,u=r.Env,a;r.version=n;if(!u){r.Env={core:["get","features","intl-base","yui-log","yui-later","loader-base","loader-rollup","loader-yui3"],loaderExtras:["loader-rollup","loader-yui3"],mods:{},versions:{},base:i,cdn:i+n+"/build/",_idx:0,_used:{},_attached:{},_exported:{},_missed:[],_yidx:0,_uidx:0,_guidp:"y",_loaded:{},_BASE_RE:/(?:\?(?:[^&]*&)*([^&]*))?\b(yui(?:-\w+)?)\/\2(?:-(min|debug))?\.js/,parseBasePath:function(e,t){var n=e.match(t),r,i;return n&&(r=RegExp.leftContext||e.slice(0,e.indexOf(n[0])),i=n[3],n[1]&&(r+="?"+n[1]),r={filter:i,path:r}),r},getBase:s&&s.getBase||function(t){var n=h&&h.getElementsByTagName("script")||[],i=u.cdn,s,o,a,f;for(o=0,a=n.length;o<a;++o){f=n[o].src;if(f){s=r.Env.parseBasePath(f,t);if(s){e=s.filter,i=s.path;break}}}return i}},u=r.Env,u._loaded[n]={};if(s&&r!==YUI)u._yidx=++s._yidx,u._guidp=("yui_"+n+"_"+u._yidx+"_"+m).replace(/[^a-z0-9_]+/g,"_");else if(YUI._YUI){s=YUI._YUI.Env,u._yidx+=s._yidx,u._uidx+=s._uidx;for(a in s)a in u||(u[a]=s[a]);delete YUI._YUI}r.id=r.stamp(r),v[r.id]=r}r.constructor=YUI,r.config=r.config||{bootstrap:!0,cacheUse:!0,debug:!0,doc:h,fetchCSS:!0,throwFail:!0,useBrowserConsole:!0,useNativeES5:!0,win:c,global:Function("return this")()},h&&!h.getElementById(o)?(t=h.createElement("div"),t.innerHTML='<div id="'+o+'" style="position: absolute !important; visibility: hidden !important"></div>',YUI.Env.cssStampEl=t.firstChild,h.body?h.body.appendChild(YUI.Env.cssStampEl):p.insertBefore(YUI.Env.cssStampEl,p.firstChild)):h&&h.getElementById(o)&&!YUI.Env.cssStampEl&&(YUI.Env.cssStampEl=h.getElementById(o)),r.config.lang=r.config.lang||"en-US",r.config.base=YUI.config.base||r.Env.getBase(r.Env._BASE_RE);if(!e||!"mindebug".indexOf(e))e="min";e=e?"-"+e:e,r.config.loaderPath=YUI.config.loaderPath||"loader/loader"+e+".js"},_setup:function(){var e,t=this,n=[],r=YUI.Env.mods,i=t.config.core||[].concat(YUI.Env.core);for(e=0;e<i.length;e++)r[i[e]]&&n.push(i[e]);t._attach(["yui-base"]),t._attach(n),t.Loader&&E(t)},applyTo:function(e,t,n){if(t in f){var r=v[e],i,s,o;if(r){i=t.split("."),s=r;for(o=0;o<i.length;o+=1)s=s[i[o]],s||this.log("applyTo not found: "+t,"warn","yui");return s&&s.apply(r,n)}return null}return this.log(t+": applyTo not allowed","warn","yui"),null},add:function(e,t,n,r){r=r||{};var i=YUI.Env,s={name:e,fn:t,version:n,details:r},o={},u,a,f,l=i.versions;i.mods[e]=s,l[n]=l[n]||{},l[n][e]=s;for(f in v)v.hasOwnProperty(f)&&(a=v[f],o[a.id]||(o[a.id]=!0,u=a.Env._loader,u&&(!u.moduleInfo[e]||u.moduleInfo[e].temp)&&u.addModule(r,e)));return this},_attach:function(e,t){var n,r,i,s,o,u,a,f=YUI.Env.mods,l=YUI.Env.aliases,c=this,h,p=YUI.Env._renderedMods,d=c.Env._loader,v=c.Env._attached,m=c.Env._exported,g=e.length,d,y,b,w=[],E,S,x,T,N,C;for(n=0;n<g;n++){r=e[n],i=f[r],w.push(r);if(d&&d.conditions[r])for(h in d.conditions[r])d.conditions[r].hasOwnProperty(h)&&(y=d.conditions[r][h],b=y&&(y.ua&&c.UA[y.ua]||y.test&&y.test(c)),b&&w.push(y.name))}e=w,g=e.length;for(n=0;n<g;n++)if(!v[e[n]]){r=e[n],i=f[r];if(l&&l[r]&&!i){c._attach(l[r]);continue}if(!i)d&&d.moduleInfo[r]&&(i=d.moduleInfo[r],t=!0),!t&&r&&r.indexOf("skin-")===-1&&r.indexOf("css")===-1&&(c.Env._missed.push(r),c.Env._missed=c.Array.dedupe(c.Env._missed),c.message("NOT loaded: "+r,"warn","yui"));else{v[r]=!0;for(h=0;h<c.Env._missed.length;h++)c.Env._missed[h]===r&&(c.message("Found: "+r+" (was reported as missing earlier)","warn","yui"),c.Env._missed.splice(h,1));if(d&&p&&p[r]&&p[r].temp){d.getRequires(p[r]),o=[];for(h in d.moduleInfo[r].expanded_map)d.moduleInfo[r].expanded_map.hasOwnProperty(h)&&o.push(h);c._attach(o)}s=i.details,o=s.requires,S=s.es,u=s.use,a=s.after,s.lang&&(o=o||[],o.unshift("intl"));if(o){x=o.length;for(h=0;h<x;h++)if(!v[o[h]]){if(!c._attach(o))return!1;break}}if(a)for(h=0;h<a.length;h++)if(!v[a[h]]){if(!c._attach(a,!0))return!1;break}if(i.fn){E=[c,r];if(S){C={},N={},E.push(C,N);if(o){x=o.length;for(h=0;h<x;h++)C[o[h]]=m.hasOwnProperty(o[h])?m[o[h]]:c}}if(c.config.throwFail)N=i.fn.apply(S?undefined:i
-,E);else try{N=i.fn.apply(S?undefined:i,E)}catch(k){return c.error("Attach error: "+r,k,r),!1}S&&(m[r]=N,T=i.details.condition,T&&T.when==="instead"&&(m[T.trigger]=N))}if(u)for(h=0;h<u.length;h++)if(!v[u[h]]){if(!c._attach(u))return!1;break}}}return!0},_delayCallback:function(e,t){var n=this,r=["event-base"];return t=n.Lang.isObject(t)?t:{event:t},t.event==="load"&&r.push("event-synthetic"),function(){var i=arguments;n._use(r,function(){n.on(t.event,function(){i[1].delayUntil=t.event,e.apply(n,i)},t.args)})}},use:function(){var e=a.call(arguments,0),t=e[e.length-1],n=this,r=0,i,s=n.Env,o=!0;n.Lang.isFunction(t)?(e.pop(),n.config.delayUntil&&(t=n._delayCallback(t,n.config.delayUntil))):t=null,n.Lang.isArray(e[0])&&(e=e[0]);if(n.config.cacheUse){while(i=e[r++])if(!s._attached[i]){o=!1;break}if(o)return e.length,n._notify(t,x,e),n}return n._loading?(n._useQueue=n._useQueue||new n.Queue,n._useQueue.add([e,t])):n._use(e,function(n,r){n._notify(t,r,e)}),n},require:function(){var e=a.call(arguments),t;typeof e[e.length-1]=="function"&&(t=e.pop(),e.push(function(n){var r,i=e.length,s=n.Env._exported,o={};for(r=0;r<i;r++)s.hasOwnProperty(e[r])&&(o[e[r]]=s[e[r]]);t.call(undefined,n,o)})),this.use.apply(this,e)},_notify:function(e,t,n){if(!t.success&&this.config.loadErrorFn)this.config.loadErrorFn.call(this,this,e,t,n);else if(e){this.Env._missed&&this.Env._missed.length&&(t.msg="Missing modules: "+this.Env._missed.join(),t.success=!1);if(this.config.throwFail)e(this,t);else try{e(this,t)}catch(r){this.error("use callback error",r,n)}}},_use:function(e,t){this.Array||this._attach(["yui-base"]);var r,i,s,o=this,u=YUI.Env,a=u.mods,f=o.Env,l=f._used,c=u.aliases,h=u._loaderQueue,p=e[0],d=o.Array,v=o.config,m=v.bootstrap,g=[],y,b=[],w=!0,S=v.fetchCSS,x=function(e,t){var r=0,i=[],s,o,f,h,p;if(!e.length)return;if(c){o=e.length;for(r=0;r<o;r++)c[e[r]]&&!a[e[r]]?i=[].concat(i,c[e[r]]):i.push(e[r]);e=i}o=e.length;for(r=0;r<o;r++){s=e[r],t||b.push(s);if(l[s])continue;f=a[s],h=null,p=null,f?(l[s]=!0,h=f.details.requires,p=f.details.use):u._loaded[n][s]?l[s]=!0:g.push(s),h&&h.length&&x(h),p&&p.length&&x(p,1)}},T=function(n){var r=n||{success:!0,msg:"not dynamic"},i,s,u=!0,a=r.data;o._loading=!1,a&&(s=g,g=[],b=[],x(a),i=g.length,i&&[].concat(g).sort().join()==s.sort().join()&&(i=!1)),i&&a?(o._loading=!0,o._use(g,function(){o._attach(a)&&o._notify(t,r,a)})):(a&&(u=o._attach(a)),u&&o._notify(t,r,e)),o._useQueue&&o._useQueue.size()&&!o._loading&&o._use.apply(o,o._useQueue.next())};if(p==="*"){e=[];for(y in a)a.hasOwnProperty(y)&&e.push(y);return w=o._attach(e),w&&T(),o}return(a.loader||a["loader-base"])&&!o.Loader&&o._attach(["loader"+(a.loader?"":"-base")]),m&&o.Loader&&e.length&&(i=E(o),i.require(e),i.ignoreRegistered=!0,i._boot=!0,i.calculate(null,S?null:"js"),e=i.sorted,i._boot=!1),x(e),r=g.length,r&&(g=d.dedupe(g),r=g.length),m&&r&&o.Loader?(o._loading=!0,i=E(o),i.onEnd=T,i.context=o,i.data=e,i.ignoreRegistered=!1,i.require(g),i.insert(null,S?null:"js")):m&&r&&o.Get&&!f.bootstrapped?(o._loading=!0,s=function(){o._loading=!1,h.running=!1,f.bootstrapped=!0,u._bootstrapping=!1,o._attach(["loader"])&&o._use(e,t)},u._bootstrapping?h.add(s):(u._bootstrapping=!0,o.Get.script(v.base+v.loaderPath,{onEnd:s}))):(w=o._attach(e),w&&T()),o},namespace:function(){var e=arguments,t,n=0,i,s,o;for(;n<e.length;n++){t=this,o=e[n];if(o.indexOf(r)>-1){s=o.split(r);for(i=s[0]=="YAHOO"?1:0;i<s.length;i++)t[s[i]]=t[s[i]]||{},t=t[s[i]]}else t[o]=t[o]||{},t=t[o]}return t},log:u,message:u,dump:function(e){return""+e},error:function(e,t,n){var r=this,i;r.config.errorFn&&(i=r.config.errorFn.apply(r,arguments));if(!i)throw t||new Error(e);return r.message(e,"error",""+n),r},guid:function(e){var t=this.Env._guidp+"_"+ ++this.Env._uidx;return e?e+t:t},stamp:function(e,t){var n;if(!e)return e;e.uniqueID&&e.nodeType&&e.nodeType!==9?n=e.uniqueID:n=typeof e=="string"?e:e._yuid;if(!n){n=this.guid();if(!t)try{e._yuid=n}catch(r){n=null}}return n},destroy:function(){var e=this;e.Event&&e.Event._unload(),delete v[e.id],delete e.Env,delete e.config}},YUI.prototype=e;for(t in e)e.hasOwnProperty(t)&&(YUI[t]=e[t]);YUI.applyConfig=function(e){if(!e)return;YUI.GlobalConfig&&this.prototype.applyConfig.call(this,YUI.GlobalConfig),this.prototype.applyConfig.call(this,e),YUI.GlobalConfig=this.config},YUI._init(),l?(g(h,"DOMContentLoaded",b),g(window,"load",w)):(b(),w()),YUI.Env.add=g,YUI.Env.remove=y,typeof exports=="object"&&(exports.YUI=YUI,YUI.setLoadHook=function(e){YUI._getLoadHook=e},YUI._getLoadHook=null),YUI.Env[n]={}})(),YUI.add("yui-base",function(e,t){function m(e,t,n){var r,i;t||(t=0);if(n||m.test(e))try{return d.slice.call(e,t)}catch(s){i=[];for(r=e.length;t<r;++t)i.push(e[t]);return i}return[e]}function g(){this._init(),this.add.apply(this,arguments)}var n=e.Lang||(e.Lang={}),r=String.prototype,i=Object.prototype.toString,s={"undefined":"undefined",number:"number","boolean":"boolean",string:"string","[object Function]":"function","[object RegExp]":"regexp","[object Array]":"array","[object Date]":"date","[object Error]":"error"},o=/\{\s*([^|}]+?)\s*(?:\|([^}]*))?\s*\}/g,u="	\n\f\r \u00a0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000\ufeff",a="[	-\r \u00a0\u1680\u180e\u2000-\u200a\u2028\u2029\u202f\u205f\u3000\ufeff]+",f=new RegExp("^"+a),l=new RegExp(a+"$"),c=new RegExp(f.source+"|"+l.source,"g"),h=/\{\s*\[(?:native code|function)\]\s*\}/i;n._isNative=function(t){return!!(e.config.useNativeES5&&t&&h.test(t))},n.isArray=n._isNative(Array.isArray)?Array.isArray:function(e){return n.type(e)==="array"},n.isBoolean=function(e){return typeof e=="boolean"},n.isDate=function(e){return n.type(e)==="date"&&e.toString()!=="Invalid Date"&&!isNaN(e)},n.isFunction=function(e){return n.type(e)==="function"},n.isNull=function(e){return e===null},n.isNumber=function(e){return typeof e=="number"&&isFinite(e)},n.isObject=function(e,t){var r=typeof e;return e&&(r==="object"||!t&&(r==="function"||n.isFunction
-(e)))||!1},n.isRegExp=function(e){return n.type(e)==="regexp"},n.isString=function(e){return typeof e=="string"},n.isUndefined=function(e){return typeof e=="undefined"},n.isValue=function(e){var t=n.type(e);switch(t){case"number":return isFinite(e);case"null":case"undefined":return!1;default:return!!t}},n.now=Date.now||function(){return(new Date).getTime()},n.sub=function(e,t){return e.replace?e.replace(o,function(e,r){return n.isUndefined(t[r])?e:t[r]}):e},n.trim=n._isNative(r.trim)&&!u.trim()?function(e){return e&&e.trim?e.trim():e}:function(e){try{return e.replace(c,"")}catch(t){return e}},n.trimLeft=n._isNative(r.trimLeft)&&!u.trimLeft()?function(e){return e.trimLeft()}:function(e){return e.replace(f,"")},n.trimRight=n._isNative(r.trimRight)&&!u.trimRight()?function(e){return e.trimRight()}:function(e){return e.replace(l,"")},n.type=function(e){return s[typeof e]||s[i.call(e)]||(e?"object":"null")};var p=e.Lang,d=Array.prototype,v=Object.prototype.hasOwnProperty;e.Array=m,m.dedupe=p._isNative(Object.create)?function(e){var t=Object.create(null),n=[],r,i,s;for(r=0,s=e.length;r<s;++r)i=e[r],t[i]||(t[i]=1,n.push(i));return n}:function(e){var t={},n=[],r,i,s;for(r=0,s=e.length;r<s;++r)i=e[r],v.call(t,i)||(t[i]=1,n.push(i));return n},m.each=m.forEach=p._isNative(d.forEach)?function(t,n,r){return d.forEach.call(t||[],n,r||e),e}:function(t,n,r){for(var i=0,s=t&&t.length||0;i<s;++i)i in t&&n.call(r||e,t[i],i,t);return e},m.hash=function(e,t){var n={},r=t&&t.length||0,i,s;for(i=0,s=e.length;i<s;++i)i in e&&(n[e[i]]=r>i&&i in t?t[i]:!0);return n},m.indexOf=p._isNative(d.indexOf)?function(e,t,n){return d.indexOf.call(e,t,n)}:function(e,t,n){var r=e.length;n=+n||0,n=(n>0||-1)*Math.floor(Math.abs(n)),n<0&&(n+=r,n<0&&(n=0));for(;n<r;++n)if(n in e&&e[n]===t)return n;return-1},m.numericSort=function(e,t){return e-t},m.some=p._isNative(d.some)?function(e,t,n){return d.some.call(e,t,n)}:function(e,t,n){for(var r=0,i=e.length;r<i;++r)if(r in e&&t.call(n,e[r],r,e))return!0;return!1},m.test=function(e){var t=0;if(p.isArray(e))t=1;else if(p.isObject(e))try{"length"in e&&!e.tagName&&(!e.scrollTo||!e.document)&&!e.apply&&(t=2)}catch(n){}return t},g.prototype={_init:function(){this._q=[]},next:function(){return this._q.shift()},last:function(){return this._q.pop()},add:function(){return this._q.push.apply(this._q,arguments),this},size:function(){return this._q.length}},e.Queue=g,YUI.Env._loaderQueue=YUI.Env._loaderQueue||new g;var y="__",v=Object.prototype.hasOwnProperty,b=e.Lang.isObject;e.cached=function(e,t,n){return t||(t={}),function(r){var i=arguments.length>1?Array.prototype.join.call(arguments,y):String(r);if(!(i in t)||n&&t[i]==n)t[i]=e.apply(e,arguments);return t[i]}},e.getLocation=function(){var t=e.config.win;return t&&t.location},e.merge=function(){var e=0,t=arguments.length,n={},r,i;for(;e<t;++e){i=arguments[e];for(r in i)v.call(i,r)&&(n[r]=i[r])}return n},e.mix=function(t,n,r,i,s,o){var u,a,f,l,c,h,p;if(!t||!n)return t||e;if(s){s===2&&e.mix(t.prototype,n.prototype,r,i,0,o),f=s===1||s===3?n.prototype:n,p=s===1||s===4?t.prototype:t;if(!f||!p)return t}else f=n,p=t;u=r&&!o;if(i)for(l=0,h=i.length;l<h;++l){c=i[l];if(!v.call(f,c))continue;a=u?!1:c in p;if(o&&a&&b(p[c],!0)&&b(f[c],!0))e.mix(p[c],f[c],r,null,0,o);else if(r||!a)p[c]=f[c]}else{for(c in f){if(!v.call(f,c))continue;a=u?!1:c in p;if(o&&a&&b(p[c],!0)&&b(f[c],!0))e.mix(p[c],f[c],r,null,0,o);else if(r||!a)p[c]=f[c]}e.Object._hasEnumBug&&e.mix(p,f,r,e.Object._forceEnum,s,o)}return t};var p=e.Lang,v=Object.prototype.hasOwnProperty,w,E=e.Object=p._isNative(Object.create)?function(e){return Object.create(e)}:function(){function e(){}return function(t){return e.prototype=t,new e}}(),S=E._forceEnum=["hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toString","toLocaleString","valueOf"],x=E._hasEnumBug=!{valueOf:0}.propertyIsEnumerable("valueOf"),T=E._hasProtoEnumBug=function(){}.propertyIsEnumerable("prototype"),N=E.owns=function(e,t){return!!e&&v.call(e,t)};E.hasKey=N,E.keys=p._isNative(Object.keys)&&!T?Object.keys:function(e){if(!p.isObject(e))throw new TypeError("Object.keys called on a non-object");var t=[],n,r,i;if(T&&typeof e=="function")for(r in e)N(e,r)&&r!=="prototype"&&t.push(r);else for(r in e)N(e,r)&&t.push(r);if(x)for(n=0,i=S.length;n<i;++n)r=S[n],N(e,r)&&t.push(r);return t},E.values=function(e){var t=E.keys(e),n=0,r=t.length,i=[];for(;n<r;++n)i.push(e[t[n]]);return i},E.size=function(e){try{return E.keys(e).length}catch(t){return 0}},E.hasValue=function(t,n){return e.Array.indexOf(E.values(t),n)>-1},E.each=function(t,n,r,i){var s;for(s in t)(i||N(t,s))&&n.call(r||e,t[s],s,t);return e},E.some=function(t,n,r,i){var s;for(s in t)if(i||N(t,s))if(n.call(r||e,t[s],s,t))return!0;return!1},E.getValue=function(t,n){if(!p.isObject(t))return w;var r,i=e.Array(n),s=i.length;for(r=0;t!==w&&r<s;r++)t=t[i[r]];return t},E.setValue=function(t,n,r){var i,s=e.Array(n),o=s.length-1,u=t;if(o>=0){for(i=0;u!==w&&i<o;i++)u=u[s[i]];if(u===w)return w;u[s[i]]=r}return t},E.isEmpty=function(e){return!E.keys(Object(e)).length},YUI.Env.parseUA=function(t){var n=function(e){var t=0;return parseFloat(e.replace(/\./g,function(){return t++===1?"":"."}))},r=e.config.win,i=r&&r.navigator,s={ie:0,opera:0,gecko:0,webkit:0,safari:0,chrome:0,mobile:null,air:0,phantomjs:0,ipad:0,iphone:0,ipod:0,ios:null,android:0,silk:0,accel:!1,webos:0,caja:i&&i.cajaVersion,secure:!1,os:null,nodejs:0,winjs:typeof Windows!="undefined"&&!!Windows.System,touchEnabled:!1},o=t||i&&i.userAgent,u=r&&r.location,a=u&&u.href,f;return s.userAgent=o,s.secure=a&&a.toLowerCase().indexOf("https")===0,o&&(/windows|win32/i.test(o)?s.os="windows":/macintosh|mac_powerpc/i.test(o)?s.os="macintosh":/android/i.test(o)?s.os="android":/symbos/i.test(o)?s.os="symbos":/linux/i.test(o)?s.os="linux":/rhino/i.test(o)&&(s.os="rhino"),/KHTML/.test(o)&&(s.webkit=1),/IEMobile|XBLWP7/.test(o)&&(s.mobile="windows"),/Fennec/.test(o)&&(s.mobile="gecko"),f=o.match(/AppleWebKit\/([^\s]*)/),f&&f[1]&&(s.webkit=n(f[1]),s.safari=
-s.webkit,/PhantomJS/.test(o)&&(f=o.match(/PhantomJS\/([^\s]*)/),f&&f[1]&&(s.phantomjs=n(f[1]))),/ Mobile\//.test(o)||/iPad|iPod|iPhone/.test(o)?(s.mobile="Apple",f=o.match(/OS ([^\s]*)/),f&&f[1]&&(f=n(f[1].replace("_","."))),s.ios=f,s.os="ios",s.ipad=s.ipod=s.iphone=0,f=o.match(/iPad|iPod|iPhone/),f&&f[0]&&(s[f[0].toLowerCase()]=s.ios)):(f=o.match(/NokiaN[^\/]*|webOS\/\d\.\d/),f&&(s.mobile=f[0]),/webOS/.test(o)&&(s.mobile="WebOS",f=o.match(/webOS\/([^\s]*);/),f&&f[1]&&(s.webos=n(f[1]))),/ Android/.test(o)&&(/Mobile/.test(o)&&(s.mobile="Android"),f=o.match(/Android ([^\s]*);/),f&&f[1]&&(s.android=n(f[1]))),/Silk/.test(o)&&(f=o.match(/Silk\/([^\s]*)/),f&&f[1]&&(s.silk=n(f[1])),s.android||(s.android=2.34,s.os="Android"),/Accelerated=true/.test(o)&&(s.accel=!0))),f=o.match(/OPR\/(\d+\.\d+)/),f&&f[1]?s.opera=n(f[1]):(f=o.match(/(Chrome|CrMo|CriOS)\/([^\s]*)/),f&&f[1]&&f[2]?(s.chrome=n(f[2]),s.safari=0,f[1]==="CrMo"&&(s.mobile="chrome")):(f=o.match(/AdobeAIR\/([^\s]*)/),f&&(s.air=f[0])))),s.webkit||(/Opera/.test(o)?(f=o.match(/Opera[\s\/]([^\s]*)/),f&&f[1]&&(s.opera=n(f[1])),f=o.match(/Version\/([^\s]*)/),f&&f[1]&&(s.opera=n(f[1])),/Opera Mobi/.test(o)&&(s.mobile="opera",f=o.replace("Opera Mobi","").match(/Opera ([^\s]*)/),f&&f[1]&&(s.opera=n(f[1]))),f=o.match(/Opera Mini[^;]*/),f&&(s.mobile=f[0])):(f=o.match(/MSIE ([^;]*)|Trident.*; rv:([0-9.]+)/),f&&(f[1]||f[2])?s.ie=n(f[1]||f[2]):(f=o.match(/Gecko\/([^\s]*)/),f&&(s.gecko=1,f=o.match(/rv:([^\s\)]*)/),f&&f[1]&&(s.gecko=n(f[1]),/Mobile|Tablet/.test(o)&&(s.mobile="ffos"))))))),r&&i&&!(s.chrome&&s.chrome<6)&&(s.touchEnabled="ontouchstart"in r||"msMaxTouchPoints"in i&&i.msMaxTouchPoints>0),t||(typeof process=="object"&&process.versions&&process.versions.node&&(s.os=process.platform,s.nodejs=n(process.versions.node)),YUI.Env.UA=s),s},e.UA=YUI.Env.UA||YUI.Env.parseUA(),e.UA.compareVersions=function(e,t){var n,r,i,s,o,u;if(e===t)return 0;r=(e+"").split("."),s=(t+"").split(".");for(o=0,u=Math.max(r.length,s.length);o<u;++o){n=parseInt(r[o],10),i=parseInt(s[o],10),isNaN(n)&&(n=0),isNaN(i)&&(i=0);if(n<i)return-1;if(n>i)return 1}return 0},YUI.Env.aliases={anim:["anim-base","anim-color","anim-curve","anim-easing","anim-node-plugin","anim-scroll","anim-xy"],"anim-shape-transform":["anim-shape"],app:["app-base","app-content","app-transitions","lazy-model-list","model","model-list","model-sync-rest","model-sync-local","router","view","view-node-map"],attribute:["attribute-base","attribute-complex"],"attribute-events":["attribute-observable"],autocomplete:["autocomplete-base","autocomplete-sources","autocomplete-list","autocomplete-plugin"],axes:["axis-numeric","axis-category","axis-time","axis-stacked"],"axes-base":["axis-numeric-base","axis-category-base","axis-time-base","axis-stacked-base"],base:["base-base","base-pluginhost","base-build"],cache:["cache-base","cache-offline","cache-plugin"],charts:["charts-base"],collection:["array-extras","arraylist","arraylist-add","arraylist-filter","array-invoke"],color:["color-base","color-hsl","color-harmony"],controller:["router"],dataschema:["dataschema-base","dataschema-json","dataschema-xml","dataschema-array","dataschema-text"],datasource:["datasource-local","datasource-io","datasource-get","datasource-function","datasource-cache","datasource-jsonschema","datasource-xmlschema","datasource-arrayschema","datasource-textschema","datasource-polling"],datatable:["datatable-core","datatable-table","datatable-head","datatable-body","datatable-base","datatable-column-widths","datatable-message","datatable-mutable","datatable-sort","datatable-datasource"],datatype:["datatype-date","datatype-number","datatype-xml"],"datatype-date":["datatype-date-parse","datatype-date-format","datatype-date-math"],"datatype-number":["datatype-number-parse","datatype-number-format"],"datatype-xml":["datatype-xml-parse","datatype-xml-format"],dd:["dd-ddm-base","dd-ddm","dd-ddm-drop","dd-drag","dd-proxy","dd-constrain","dd-drop","dd-scroll","dd-delegate"],dom:["dom-base","dom-screen","dom-style","selector-native","selector"],editor:["frame","editor-selection","exec-command","editor-base","editor-para","editor-br","editor-bidi","editor-tab","createlink-base"],event:["event-base","event-delegate","event-synthetic","event-mousewheel","event-mouseenter","event-key","event-focus","event-resize","event-hover","event-outside","event-touch","event-move","event-flick","event-valuechange","event-tap"],"event-custom":["event-custom-base","event-custom-complex"],"event-gestures":["event-flick","event-move"],handlebars:["handlebars-compiler"],highlight:["highlight-base","highlight-accentfold"],history:["history-base","history-hash","history-html5"],io:["io-base","io-xdr","io-form","io-upload-iframe","io-queue"],json:["json-parse","json-stringify"],loader:["loader-base","loader-rollup","loader-yui3"],node:["node-base","node-event-delegate","node-pluginhost","node-screen","node-style"],pluginhost:["pluginhost-base","pluginhost-config"],querystring:["querystring-parse","querystring-stringify"],recordset:["recordset-base","recordset-sort","recordset-filter","recordset-indexer"],resize:["resize-base","resize-proxy","resize-constrain"],slider:["slider-base","slider-value-range","clickable-rail","range-slider"],template:["template-base","template-micro"],text:["text-accentfold","text-wordbreak"],widget:["widget-base","widget-htmlparser","widget-skin","widget-uievents"]}},"3.15.0",{use:["yui-base","get","features","intl-base","yui-log","yui-later","loader-base","loader-rollup","loader-yui3"]}),YUI.add("get",function(e,t){var n=e.Lang,r,i,s;e.Get=i={cssOptions:{attributes:{rel:"stylesheet"},doc:e.config.linkDoc||e.config.doc,pollInterval:50},jsOptions:{autopurge:!0,doc:e.config.scriptDoc||e.config.doc},options:{attributes:{charset:"utf-8"},purgethreshold:20},REGEX_CSS:/\.css(?:[?;].*)?$/i,REGEX_JS:/\.js(?:[?;].*)?$/i,_insertCache:{},_pending:null,_purgeNodes:[],_queue:[],abort:function(e){var t,n,r,i,s;if(!e.abort){n=e,s=this._pending,e=null;if(s&&s.transaction.
-id===n)e=s.transaction,this._pending=null;else for(t=0,i=this._queue.length;t<i;++t){r=this._queue[t].transaction;if(r.id===n){e=r,this._queue.splice(t,1);break}}}e&&e.abort()},css:function(e,t,n){return this._load("css",e,t,n)},js:function(e,t,n){return this._load("js",e,t,n)},load:function(e,t,n){return this._load(null,e,t,n)},_autoPurge:function(e){e&&this._purgeNodes.length>=e&&this._purge(this._purgeNodes)},_getEnv:function(){var t=e.config.doc,n=e.UA;return this._env={async:t&&t.createElement("script").async===!0||n.ie>=10,cssFail:n.gecko>=9||n.compareVersions(n.webkit,535.24)>=0,cssLoad:(!n.gecko&&!n.webkit||n.gecko>=9||n.compareVersions(n.webkit,535.24)>=0)&&!(n.chrome&&n.chrome<=18),preservesScriptOrder:!!(n.gecko||n.opera||n.ie&&n.ie>=10)}},_getTransaction:function(t,r){var i=[],o,u,a,f;n.isArray(t)||(t=[t]),r=e.merge(this.options,r),r.attributes=e.merge(this.options.attributes,r.attributes);for(o=0,u=t.length;o<u;++o){f=t[o],a={attributes:{}};if(typeof f=="string")a.url=f;else{if(!f.url)continue;e.mix(a,f,!1,null,0,!0),f=f.url}e.mix(a,r,!1,null,0,!0),a.type||(this.REGEX_CSS.test(f)?a.type="css":(!this.REGEX_JS.test(f),a.type="js")),e.mix(a,a.type==="js"?this.jsOptions:this.cssOptions,!1,null,0,!0),a.attributes.id||(a.attributes.id=e.guid()),a.win?a.doc=a.win.document:a.win=a.doc.defaultView||a.doc.parentWindow,a.charset&&(a.attributes.charset=a.charset),i.push(a)}return new s(i,r)},_load:function(e,t,n,r){var s;return typeof n=="function"&&(r=n,n={}),n||(n={}),n.type=e,n._onFinish=i._onTransactionFinish,this._env||this._getEnv(),s=this._getTransaction(t,n),this._queue.push({callback:r,transaction:s}),this._next(),s},_onTransactionFinish:function(){i._pending=null,i._next()},_next:function(){var e;if(this._pending)return;e=this._queue.shift(),e&&(this._pending=e,e.transaction.execute(e.callback))},_purge:function(t){var n=this._purgeNodes,r=t!==n,i,s;while(s=t.pop()){if(!s._yuiget_finished)continue;s.parentNode&&s.parentNode.removeChild(s),r&&(i=e.Array.indexOf(n,s),i>-1&&n.splice(i,1))}}},i.script=i.js,i.Transaction=s=function(t,n){var r=this;r.id=s._lastId+=1,r.data=n.data,r.errors=[],r.nodes=[],r.options=n,r.requests=t,r._callbacks=[],r._queue=[],r._reqsWaiting=0,r.tId=r.id,r.win=n.win||e.config.win},s._lastId=0,s.prototype={_state:"new",abort:function(e){this._pending=null,this._pendingCSS=null,this._pollTimer=clearTimeout(this._pollTimer),this._queue=[],this._reqsWaiting=0,this.errors.push({error:e||"Aborted"}),this._finish()},execute:function(e){var t=this,n=t.requests,r=t._state,i,s,o,u;if(r==="done"){e&&e(t.errors.length?t.errors:null,t);return}e&&t._callbacks.push(e);if(r==="executing")return;t._state="executing",t._queue=o=[],t.options.timeout&&(t._timeout=setTimeout(function(){t.abort("Timeout")},t.options.timeout)),t._reqsWaiting=n.length;for(i=0,s=n.length;i<s;++i)u=n[i],u.async||u.type==="css"?t._insert(u):o.push(u);t._next()},purge:function(){i._purge(this.nodes)},_createNode:function(e,t,n){var i=n.createElement(e),s,o;r||(o=n.createElement("div"),o.setAttribute("class","a"),r=o.className==="a"?{}:{"for":"htmlFor","class":"className"});for(s in t)t.hasOwnProperty(s)&&i.setAttribute(r[s]||s,t[s]);return i},_finish:function(){var e=this.errors.length?this.errors:null,t=this.options,n=t.context||this,r,i,s;if(this._state==="done")return;this._state="done";for(i=0,s=this._callbacks.length;i<s;++i)this._callbacks[i].call(n,e,this);r=this._getEventData(),e?(t.onTimeout&&e[e.length-1].error==="Timeout"&&t.onTimeout.call(n,r),t.onFailure&&t.onFailure.call(n,r)):t.onSuccess&&t.onSuccess.call(n,r),t.onEnd&&t.onEnd.call(n,r),t._onFinish&&t._onFinish()},_getEventData:function(t){return t?e.merge(this,{abort:this.abort,purge:this.purge,request:t,url:t.url,win:t.win}):this},_getInsertBefore:function(t){var n=t.doc,r=t.insertBefore,s,o;return r?typeof r=="string"?n.getElementById(r):r:(s=i._insertCache,o=e.stamp(n),(r=s[o])?r:(r=n.getElementsByTagName("base")[0])?s[o]=r:(r=n.head||n.getElementsByTagName("head")[0],r?(r.appendChild(n.createTextNode("")),s[o]=r.lastChild):s[o]=n.getElementsByTagName("script")[0]))},_insert:function(t){function c(){u._progress("Failed to load "+t.url,t)}function h(){f&&clearTimeout(f),u._progress(null,t)}var n=i._env,r=this._getInsertBefore(t),s=t.type==="js",o=t.node,u=this,a=e.UA,f,l;o||(s?l="script":!n.cssLoad&&a.gecko?l="style":l="link",o=t.node=this._createNode(l,t.attributes,t.doc)),s?(o.setAttribute("src",t.url),t.async?o.async=!0:(n.async&&(o.async=!1),n.preservesScriptOrder||(this._pending=t))):!n.cssLoad&&a.gecko?o.innerHTML=(t.attributes.charset?'@charset "'+t.attributes.charset+'";':"")+'@import "'+t.url+'";':o.setAttribute("href",t.url),s&&a.ie&&(a.ie<9||document.documentMode&&document.documentMode<9)?o.onreadystatechange=function(){/loaded|complete/.test(o.readyState)&&(o.onreadystatechange=null,h())}:!s&&!n.cssLoad?this._poll(t):(a.ie>=10?(o.onerror=function(){setTimeout(c,0)},o.onload=function(){setTimeout(h,0)}):(o.onerror=c,o.onload=h),!n.cssFail&&!s&&(f=setTimeout(c,t.timeout||3e3))),this.nodes.push(o),r.parentNode.insertBefore(o,r)},_next:function(){if(this._pending)return;this._queue.length?this._insert(this._queue.shift()):this._reqsWaiting||this._finish()},_poll:function(t){var n=this,r=n._pendingCSS,i=e.UA.webkit,s,o,u,a,f,l;if(t){r||(r=n._pendingCSS=[]),r.push(t);if(n._pollTimer)return}n._pollTimer=null;for(s=0;s<r.length;++s){f=r[s];if(i){l=f.doc.styleSheets,u=l.length,a=f.node.href;while(--u>=0)if(l[u].href===a){r.splice(s,1),s-=1,n._progress(null,f);break}}else try{o=!!f.node.sheet.cssRules,r.splice(s,1),s-=1,n._progress(null,f)}catch(c){}}r.length&&(n._pollTimer=setTimeout(function(){n._poll.call(n)},n.options.pollInterval))},_progress:function(e,t){var n=this.options;e&&(t.error=e,this.errors.push({error:e,request:t})),t.node._yuiget_finished=t.finished=!0,n.onProgress&&n.onProgress.call(n.context||this,this._getEventData(t)),t.autopurge&&(i._autoPurge(this.options.purgethreshold),i._purgeNodes.push(t.node)),this._pending===
-t&&(this._pending=null),this._reqsWaiting-=1,this._next()}}},"3.15.0",{requires:["yui-base"]}),YUI.add("features",function(e,t){var n={};e.mix(e.namespace("Features"),{tests:n,add:function(e,t,r){n[e]=n[e]||{},n[e][t]=r},all:function(t,r){var i=n[t],s=[];return i&&e.Object.each(i,function(n,i){s.push(i+":"+(e.Features.test(t,i,r)?1:0))}),s.length?s.join(";"):""},test:function(t,r,i){i=i||[];var s,o,u,a=n[t],f=a&&a[r];return!f||(s=f.result,e.Lang.isUndefined(s)&&(o=f.ua,o&&(s=e.UA[o]),u=f.test,u&&(!o||s)&&(s=u.apply(e,i)),f.result=s)),s}});var r=e.Features.add;r("load","0",{name:"app-transitions-native",test:function(e){var t=e.config.doc,n=t?t.documentElement:null;return n&&n.style?"MozTransition"in n.style||"WebkitTransition"in n.style||"transition"in n.style:!1},trigger:"app-transitions"}),r("load","1",{name:"autocomplete-list-keys",test:function(e){return!e.UA.ios&&!e.UA.android},trigger:"autocomplete-list"}),r("load","2",{name:"dd-gestures",trigger:"dd-drag",ua:"touchEnabled"}),r("load","3",{name:"dom-style-ie",test:function(e){var t=e.Features.test,n=e.Features.add,r=e.config.win,i=e.config.doc,s="documentElement",o=!1;return n("style","computedStyle",{test:function(){return r&&"getComputedStyle"in r}}),n("style","opacity",{test:function(){return i&&"opacity"in i[s].style}}),o=!t("style","opacity")&&!t("style","computedStyle"),o},trigger:"dom-style"}),r("load","4",{name:"editor-para-ie",trigger:"editor-para",ua:"ie",when:"instead"}),r("load","5",{name:"event-base-ie",test:function(e){var t=e.config.doc&&e.config.doc.implementation;return t&&!t.hasFeature("Events","2.0")},trigger:"node-base"}),r("load","6",{name:"graphics-canvas",test:function(e){var t=e.config.doc,n=e.config.defaultGraphicEngine&&e.config.defaultGraphicEngine=="canvas",r=t&&t.createElement("canvas"),i=t&&t.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1");return(!i||n)&&r&&r.getContext&&r.getContext("2d")},trigger:"graphics"}),r("load","7",{name:"graphics-canvas-default",test:function(e){var t=e.config.doc,n=e.config.defaultGraphicEngine&&e.config.defaultGraphicEngine=="canvas",r=t&&t.createElement("canvas"),i=t&&t.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1");return(!i||n)&&r&&r.getContext&&r.getContext("2d")},trigger:"graphics"}),r("load","8",{name:"graphics-svg",test:function(e){var t=e.config.doc,n=!e.config.defaultGraphicEngine||e.config.defaultGraphicEngine!="canvas",r=t&&t.createElement("canvas"),i=t&&t.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1");return i&&(n||!r)},trigger:"graphics"}),r("load","9",{name:"graphics-svg-default",test:function(e){var t=e.config.doc,n=!e.config.defaultGraphicEngine||e.config.defaultGraphicEngine!="canvas",r=t&&t.createElement("canvas"),i=t&&t.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1");return i&&(n||!r)},trigger:"graphics"}),r("load","10",{name:"graphics-vml",test:function(e){var t=e.config.doc,n=t&&t.createElement("canvas");return t&&!t.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1")&&(!n||!n.getContext||!n.getContext("2d"))},trigger:"graphics"}),r("load","11",{name:"graphics-vml-default",test:function(e){var t=e.config.doc,n=t&&t.createElement("canvas");return t&&!t.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1")&&(!n||!n.getContext||!n.getContext("2d"))},trigger:"graphics"}),r("load","12",{name:"history-hash-ie",test:function(e){var t=e.config.doc&&e.config.doc.documentMode;return e.UA.ie&&(!("onhashchange"in e.config.win)||!t||t<8)},trigger:"history-hash"}),r("load","13",{name:"io-nodejs",trigger:"io-base",ua:"nodejs"}),r("load","14",{name:"json-parse-shim",test:function(e){function i(e,t){return e==="ok"?!0:t}var t=e.config.global.JSON,n=Object.prototype.toString.call(t)==="[object JSON]"&&t,r=e.config.useNativeJSONParse!==!1&&!!n;if(r)try{r=n.parse('{"ok":false}',i).ok}catch(s){r=!1}return!r},trigger:"json-parse"}),r("load","15",{name:"json-stringify-shim",test:function(e){var t=e.config.global.JSON,n=Object.prototype.toString.call(t)==="[object JSON]"&&t,r=e.config.useNativeJSONStringify!==!1&&!!n;if(r)try{r="0"===n.stringify(0)}catch(i){r=!1}return!r},trigger:"json-stringify"}),r("load","16",{name:"scrollview-base-ie",trigger:"scrollview-base",ua:"ie"}),r("load","17",{name:"selector-css2",test:function(e){var t=e.config.doc,n=t&&!("querySelectorAll"in t);return n},trigger:"selector"}),r("load","18",{name:"transition-timer",test:function(e){var t=e.config.doc,n=t?t.documentElement:null,r=!0;return n&&n.style&&(r=!("MozTransition"in n.style||"WebkitTransition"in n.style||"transition"in n.style)),r},trigger:"transition"}),r("load","19",{name:"widget-base-ie",trigger:"widget-base",ua:"ie"}),r("load","20",{name:"yql-jsonp",test:function(e){return!e.UA.nodejs&&!e.UA.winjs},trigger:"yql",when:"after"}),r("load","21",{name:"yql-nodejs",trigger:"yql",ua:"nodejs",when:"after"}),r("load","22",{name:"yql-winjs",trigger:"yql",ua:"winjs",when:"after"})},"3.15.0",{requires:["yui-base"]}),YUI.add("intl-base",function(e,t){var n=/[, ]/;e.mix(e.namespace("Intl"),{lookupBestLang:function(t,r){function a(e){var t;for(t=0;t<r.length;t+=1)if(e.toLowerCase()===r[t].toLowerCase())return r[t]}var i,s,o,u;e.Lang.isString(t)&&(t=t.split(n));for(i=0;i<t.length;i+=1){s=t[i];if(!s||s==="*")continue;while(s.length>0){o=a(s);if(o)return o;u=s.lastIndexOf("-");if(!(u>=0))break;s=s.substring(0,u),u>=2&&s.charAt(u-2)==="-"&&(s=s.substring(0,u-2))}}return""}})},"3.15.0",{requires:["yui-base"]}),YUI.add("yui-log",function(e,t){var n=e,r="yui:log",i="undefined",s={debug:1,info:2,warn:4,error:8};n.log=function(e,t,o,u){var a,f,l,c,h,p,d=n,v=d.config,m=d.fire?d:YUI.Env.globalEvents;if(v.debug){o=o||"";if(typeof o!="undefined"){f=v.logExclude,l=v.logInclude,!l||o in l?l&&o in l?a=!l[o]:f&&o in f&&(a=f[o]):a=1;if(typeof t=="undefined"||!(t in s))t="info";d.config.logLevel=d.config.logLevel||"debug"
-,p=s[d.config.logLevel.toLowerCase()],t in s&&s[t]<p&&(a=1)}a||(v.useBrowserConsole&&(c=o?o+": "+e:e,d.Lang.isFunction(v.logFn)?v.logFn.call(d,e,t,o):typeof console!==i&&console.log?(h=t&&console[t]&&t in s?t:"log",console[h](c)):typeof opera!==i&&opera.postError(c)),m&&!u&&(m===d&&!m.getEvent(r)&&m.publish(r,{broadcast:2}),m.fire(r,{msg:e,cat:t,src:o})))}return d},n.message=function(){return n.log.apply(n,arguments)}},"3.15.0",{requires:["yui-base"]}),YUI.add("yui-later",function(e,t){var n=[];e.later=function(t,r,i,s,o){t=t||0,s=e.Lang.isUndefined(s)?n:e.Array(s),r=r||e.config.win||e;var u=!1,a=r&&e.Lang.isString(i)?r[i]:i,f=function(){u||(a.apply?a.apply(r,s||n):a(s[0],s[1],s[2],s[3]))},l=o?setInterval(f,t):setTimeout(f,t);return{id:l,interval:o,cancel:function(){u=!0,this.interval?clearInterval(l):clearTimeout(l)}}},e.Lang.later=e.later},"3.15.0",{requires:["yui-base"]}),YUI.add("loader-base",function(e,t){(function(){var t=e.version,n="/build/",r=t+"/",i=e.Env.base,s="gallery-2014.02.20-23-55",o="2in3",u="4",a="2.9.0",f=i+"combo?",l={version:t,root:r,base:e.Env.base,comboBase:f,skin:{defaultSkin:"sam",base:"assets/skins/",path:"skin.css",after:["cssreset","cssfonts","cssgrids","cssbase","cssreset-context","cssfonts-context"]},groups:{},patterns:{}},c=l.groups,h=function(e,t,r){var s=o+"."+(e||u)+"/"+(t||a)+n,l=r&&r.base?r.base:i,h=r&&r.comboBase?r.comboBase:f;c.yui2.base=l+s,c.yui2.root=s,c.yui2.comboBase=h},p=function(e,t){var r=(e||s)+n,o=t&&t.base?t.base:i,u=t&&t.comboBase?t.comboBase:f;c.gallery.base=o+r,c.gallery.root=r,c.gallery.comboBase=u};c[t]={},c.gallery={ext:!1,combine:!0,comboBase:f,update:p,patterns:{"gallery-":{},"lang/gallery-":{},"gallerycss-":{type:"css"}}},c.yui2={combine:!0,ext:!1,comboBase:f,update:h,patterns:{"yui2-":{configFn:function(e){/-skin|reset|fonts|grids|base/.test(e.name)&&(e.type="css",e.path=e.path.replace(/\.js/,".css"),e.path=e.path.replace(/\/yui2-skin/,"/assets/skins/sam/yui2-skin"))}}}},p(),h(),YUI.Env[t]&&e.mix(l,YUI.Env[t],!1,["modules","groups","skin"],0,!0),YUI.Env[t]=l})();var n={},r=[],i=1024,s=YUI.Env,o=s._loaded,u="css",a="js",f="intl",l="sam",c=e.version,h="",p=e.Object,d=p.each,v=e.Array,m=s._loaderQueue,g=s[c],y="skin-",b=e.Lang,w=s.mods,E,S=function(e,t,n,r){var i=e+"/"+t;return r||(i+="-min"),i+="."+(n||u),i};YUI.Env._cssLoaded||(YUI.Env._cssLoaded={}),e.Env.meta=g,e.Loader=function(t){var n=this;t=t||{},E=g.md5,n.context=e,n.base=e.Env.meta.base+e.Env.meta.root,n.comboBase=e.Env.meta.comboBase,n.combine=t.base&&t.base.indexOf(n.comboBase.substr(0,20))>-1,n.comboSep="&",n.maxURLLength=i,n.ignoreRegistered=t.ignoreRegistered,n.root=e.Env.meta.root,n.timeout=0,n.forceMap={},n.allowRollup=!1,n.filters={},n.required={},n.patterns={},n.moduleInfo={},n.groups=e.merge(e.Env.meta.groups),n.skin=e.merge(e.Env.meta.skin),n.conditions={},n.config=t,n._internal=!0,n._populateCache(),n.loaded=o[c],n.async=!0,n._inspectPage(),n._internal=!1,n._config(t),n.forceMap=n.force?e.Array.hash(n.force):{},n.testresults=null,e.config.tests&&(n.testresults=e.config.tests),n.sorted=[],n.dirty=!0,n.inserted={},n.skipped={},n.tested={},n.ignoreRegistered&&n._resetModules()},e.Loader.prototype={_populateCache:function(){var t=this,n=g.modules,r=s._renderedMods,i;if(r&&!t.ignoreRegistered){for(i in r)r.hasOwnProperty(i)&&(t.moduleInfo[i]=e.merge(r[i]));r=s._conditions;for(i in r)r.hasOwnProperty(i)&&(t.conditions[i]=e.merge(r[i]))}else for(i in n)n.hasOwnProperty(i)&&t.addModule(n[i],i)},_resetModules:function(){var e=this,t,n,r,i,s;for(t in e.moduleInfo)if(e.moduleInfo.hasOwnProperty(t)){r=e.moduleInfo[t],i=r.name,s=YUI.Env.mods[i]?YUI.Env.mods[i].details:null,s&&(e.moduleInfo[i]._reset=!0,e.moduleInfo[i].requires=s.requires||[],e.moduleInfo[i].optional=s.optional||[],e.moduleInfo[i].supersedes=s.supercedes||[]);if(r.defaults)for(n in r.defaults)r.defaults.hasOwnProperty(n)&&r[n]&&(r[n]=r.defaults[n]);delete r.langCache,delete r.skinCache,r.skinnable&&e._addSkin(e.skin.defaultSkin,r.name)}},REGEX_CSS:/\.css(?:[?;].*)?$/i,FILTER_DEFS:{RAW:{searchExp:"-min\\.js",replaceStr:".js"},DEBUG:{searchExp:"-min\\.js",replaceStr:"-debug.js"},COVERAGE:{searchExp:"-min\\.js",replaceStr:"-coverage.js"}},_inspectPage:function(){var e=this,t,n,r,i,s;for(s in e.moduleInfo)e.moduleInfo.hasOwnProperty(s)&&(t=e.moduleInfo[s],t.type&&t.type===u&&e.isCSSLoaded(t.name)&&(e.loaded[s]=!0));for(s in w)w.hasOwnProperty(s)&&(t=w[s],t.details&&(n=e.moduleInfo[t.name],r=t.details.requires,i=n&&n.requires,n?!n._inspected&&r&&i.length!==r.length&&delete n.expanded:n=e.addModule(t.details,s),n._inspected=!0))},_requires:function(e,t){var n,r,i,s,o=this.moduleInfo,a=o[e],f=o[t];if(!a||!f)return!1;r=a.expanded_map,i=a.after_map;if(i&&t in i)return!0;i=f.after_map;if(i&&e in i)return!1;s=o[t]&&o[t].supersedes;if(s)for(n=0;n<s.length;n++)if(this._requires(e,s[n]))return!0;s=o[e]&&o[e].supersedes;if(s)for(n=0;n<s.length;n++)if(this._requires(t,s[n]))return!1;return r&&t in r?!0:a.ext&&a.type===u&&!f.ext&&f.type===u?!0:!1},_config:function(t){var n,r,i,s,o,u,a,f=this,l=[],c;if(t)for(n in t)if(t.hasOwnProperty(n)){i=t[n];if(n==="require")f.require(i);else if(n==="skin")typeof i=="string"&&(f.skin.defaultSkin=t.skin,i={defaultSkin:i}),e.mix(f.skin,i,!0);else if(n==="groups"){for(r in i)if(i.hasOwnProperty(r)){a=r,u=i[r],f.addGroup(u,a);if(u.aliases)for(s in u.aliases)u.aliases.hasOwnProperty(s)&&f.addAlias(u.aliases[s],s)}}else if(n==="modules")for(r in i)i.hasOwnProperty(r)&&f.addModule(i[r],r);else if(n==="aliases")for(r in i)i.hasOwnProperty(r)&&f.addAlias(i[r],r);else n==="gallery"?this.groups.gallery.update&&this.groups.gallery.update(i,t):n==="yui2"||n==="2in3"?this.groups.yui2.update&&this.groups.yui2.update(t["2in3"],t.yui2,t):f[n]=i}o=f.filter,b.isString(o)&&(o=o.toUpperCase(),f.filterName=o,f.filter=f.FILTER_DEFS[o],o==="DEBUG"&&f.require("yui-log","dump"));if(f.filterName&&f.coverage&&f.filterName==="COVERAGE"&&b.isArray(f.coverage)&&f.coverage.length){for(n=0;n<f.coverage.length;n++)c=f.coverage
-[n],f.moduleInfo[c]&&f.moduleInfo[c].use?l=[].concat(l,f.moduleInfo[c].use):l.push(c);f.filters=f.filters||{},e.Array.each(l,function(e){f.filters[e]=f.FILTER_DEFS.COVERAGE}),f.filterName="RAW",f.filter=f.FILTER_DEFS[f.filterName]}},formatSkin:function(e,t){var n=y+e;return t&&(n=n+"-"+t),n},_addSkin:function(e,t,n){var r,i,s,o,u=this.moduleInfo,a=this.skin,f=u[t]&&u[t].ext;return t&&(s=this.formatSkin(e,t),u[s]||(r=u[t],i=r.pkg||t,o={skin:!0,name:s,group:r.group,type:"css",after:a.after,path:(n||i)+"/"+a.base+e+"/"+t+".css",ext:f},r.base&&(o.base=r.base),r.configFn&&(o.configFn=r.configFn),this.addModule(o,s))),s},addAlias:function(e,t){YUI.Env.aliases[t]=e,this.addModule({name:t,use:e})},addGroup:function(e,t){var n=e.modules,r=this,i,s;t=t||e.name,e.name=t,r.groups[t]=e;if(e.patterns)for(i in e.patterns)e.patterns.hasOwnProperty(i)&&(e.patterns[i].group=t,r.patterns[i]=e.patterns[i]);if(n)for(i in n)n.hasOwnProperty(i)&&(s=n[i],typeof s=="string"&&(s={name:i,fullpath:s}),s.group=t,r.addModule(s,i))},addModule:function(t,n){n=n||t.name,typeof t=="string"&&(t={name:n,fullpath:t});var r,i,o,f,l,c,p,d,m,g,y,b,w,E,x,T,N,C,k,L,A,O,M=this.conditions,_;this.moduleInfo[n]&&this.moduleInfo[n].temp&&(t=e.merge(this.moduleInfo[n],t)),t.name=n;if(!t||!t.name)return null;t.type||(t.type=a,O=t.path||t.fullpath,O&&this.REGEX_CSS.test(O)&&(t.type=u)),!t.path&&!t.fullpath&&(t.path=S(n,n,t.type)),t.supersedes=t.supersedes||t.use,t.ext="ext"in t?t.ext:this._internal?!1:!0,r=t.submodules,this.moduleInfo[n]=t,t.requires=t.requires||[];if(this.requires)for(i=0;i<this.requires.length;i++)t.requires.push(this.requires[i]);if(t.group&&this.groups&&this.groups[t.group]){A=this.groups[t.group];if(A.requires)for(i=0;i<A.requires.length;i++)t.requires.push(A.requires[i])}t.defaults||(t.defaults={requires:t.requires?[].concat(t.requires):null,supersedes:t.supersedes?[].concat(t.supersedes):null,optional:t.optional?[].concat(t.optional):null}),t.skinnable&&t.ext&&t.temp&&(k=this._addSkin(this.skin.defaultSkin,n),t.requires.unshift(k)),t.requires.length&&(t.requires=this.filterRequires(t.requires)||[]);if(!t.langPack&&t.lang){y=v(t.lang);for(g=0;g<y.length;g++)T=y[g],b=this.getLangPackName(T,n),p=this.moduleInfo[b],p||(p=this._addLangPack(T,t,b))}if(r){l=t.supersedes||[],o=0;for(i in r)if(r.hasOwnProperty(i)){c=r[i],c.path=c.path||S(n,i,t.type),c.pkg=n,c.group=t.group,c.supersedes&&(l=l.concat(c.supersedes)),p=this.addModule(c,i),l.push(i);if(p.skinnable){t.skinnable=!0,C=this.skin.overrides;if(C&&C[i])for(g=0;g<C[i].length;g++)k=this._addSkin(C[i][g],i,n),l.push(k);k=this._addSkin(this.skin.defaultSkin,i,n),l.push(k)}if(c.lang&&c.lang.length){y=v(c.lang);for(g=0;g<y.length;g++)T=y[g],b=this.getLangPackName(T,n),w=this.getLangPackName(T,i),p=this.moduleInfo[b],p||(p=this._addLangPack(T,t,b)),E=E||v.hash(p.supersedes),w in E||p.supersedes.push(w),t.lang=t.lang||[],x=x||v.hash(t.lang),T in x||t.lang.push(T),b=this.getLangPackName(h,n),w=this.getLangPackName(h,i),p=this.moduleInfo[b],p||(p=this._addLangPack(T,t,b)),w in E||p.supersedes.push(w)}o++}t.supersedes=v.dedupe(l),this.allowRollup&&(t.rollup=o<4?o:Math.min(o-1,4))}d=t.plugins;if(d)for(i in d)d.hasOwnProperty(i)&&(m=d[i],m.pkg=n,m.path=m.path||S(n,i,t.type),m.requires=m.requires||[],m.group=t.group,this.addModule(m,i),t.skinnable&&this._addSkin(this.skin.defaultSkin,i,n));if(t.condition){f=t.condition.trigger,YUI.Env.aliases[f]&&(f=YUI.Env.aliases[f]),e.Lang.isArray(f)||(f=[f]);for(i=0;i<f.length;i++)_=f[i],L=t.condition.when,M[_]=M[_]||{},M[_][n]=t.condition,L&&L!=="after"?L==="instead"&&(t.supersedes=t.supersedes||[],t.supersedes.push(_)):(t.after=t.after||[],t.after.push(_))}return t.supersedes&&(t.supersedes=this.filterRequires(t.supersedes)),t.after&&(t.after=this.filterRequires(t.after),t.after_map=v.hash(t.after)),t.configFn&&(N=t.configFn(t),N===!1&&(delete this.moduleInfo[n],delete s._renderedMods[n],t=null)),t&&(s._renderedMods||(s._renderedMods={}),s._renderedMods[n]=e.mix(s._renderedMods[n]||{},t),s._conditions=M),t},require:function(t){var n=typeof t=="string"?v(arguments):t;this.dirty=!0,this.required=e.merge(this.required,v.hash(this.filterRequires(n))),this._explodeRollups()},_explodeRollups:function(){var e=this,t,n,r,i,s,o,u,a=e.required;if(!e.allowRollup){for(r in a)if(a.hasOwnProperty(r)){t=e.getModule(r);if(t&&t.use){o=t.use.length;for(i=0;i<o;i++){n=e.getModule(t.use[i]);if(n&&n.use){u=n.use.length;for(s=0;s<u;s++)a[n.use[s]]=!0}else a[t.use[i]]=!0}}}e.required=a}},filterRequires:function(t){if(t){e.Lang.isArray(t)||(t=[t]),t=e.Array(t);var n=[],r,i,s,o;for(r=0;r<t.length;r++){i=this.getModule(t[r]);if(i&&i.use)for(s=0;s<i.use.length;s++)o=this.getModule(i.use[s]),o&&o.use&&o.name!==i.name?n=e.Array.dedupe([].concat(n,this.filterRequires(o.use))):n.push(i.use[s]);else n.push(t[r])}t=n}return t},getRequires:function(t){if(!t)return r;if(t._parsed)return t.expanded||r;var n,i,s,o,u,a,l=this.testresults,c=t.name,m,g=w[c]&&w[c].details,y,b,E,S,x,T,N,C,k,L,A=t.lang||t.intl,O=this.moduleInfo,M=e.Features&&e.Features.tests.load,_,D;t.temp&&g&&(x=t,t=this.addModule(g,c),t.group=x.group,t.pkg=x.pkg,delete t.expanded),D=!!this.lang&&t.langCache!==this.lang||t.skinCache!==this.skin.defaultSkin;if(t.expanded&&!D)return t.expanded;y=[],_={},S=this.filterRequires(t.requires),t.lang&&(y.unshift("intl"),S.unshift("intl"),A=!0),T=this.filterRequires(t.optional),t._parsed=!0,t.langCache=this.lang,t.skinCache=this.skin.defaultSkin;for(n=0;n<S.length;n++)if(!_[S[n]]){y.push(S[n]),_[S[n]]=!0,i=this.getModule(S[n]);if(i){o=this.getRequires(i),A=A||i.expanded_map&&f in i.expanded_map;for(s=0;s<o.length;s++)y.push(o[s])}}S=this.filterRequires(t.supersedes);if(S)for(n=0;n<S.length;n++)if(!_[S[n]]){t.submodules&&y.push(S[n]),_[S[n]]=!0,i=this.getModule(S[n]);if(i){o=this.getRequires(i),A=A||i.expanded_map&&f in i.expanded_map;for(s=0;s<o.length;s++)y.push(o[s])}}if(T&&this.loadOptional)for(n=0;n<T.length;n++)if(!_[T[n]]){y.push(T[n]),_[T[n]]=!0,i=O[T[n]];if(i){o=this.
-getRequires(i),A=A||i.expanded_map&&f in i.expanded_map;for(s=0;s<o.length;s++)y.push(o[s])}}m=this.conditions[c];if(m){t._parsed=!1;if(l&&M)d(l,function(e,t){var n=M[t].name;!_[n]&&M[t].trigger===c&&e&&M[t]&&(_[n]=!0,y.push(n))});else for(n in m)if(m.hasOwnProperty(n)&&!_[n]){E=m[n],b=E&&(!E.ua&&!E.test||E.ua&&e.UA[E.ua]||E.test&&E.test(e,S));if(b){_[n]=!0,y.push(n),i=this.getModule(n);if(i){o=this.getRequires(i);for(s=0;s<o.length;s++)y.push(o[s])}}}}if(t.skinnable){C=this.skin.overrides;for(n in YUI.Env.aliases)YUI.Env.aliases.hasOwnProperty(n)&&e.Array.indexOf(YUI.Env.aliases[n],c)>-1&&(k=n);if(C&&(C[c]||k&&C[k])){L=c,C[k]&&(L=k);for(n=0;n<C[L].length;n++)N=this._addSkin(C[L][n],c),this.isCSSLoaded(N,this._boot)||y.push(N)}else N=this._addSkin(this.skin.defaultSkin,c),this.isCSSLoaded(N,this._boot)||y.push(N)}return t._parsed=!1,A&&(t.lang&&!t.langPack&&e.Intl&&(a=e.Intl.lookupBestLang(this.lang||h,t.lang),u=this.getLangPackName(a,c),u&&y.unshift(u)),y.unshift(f)),t.expanded_map=v.hash(y),t.expanded=p.keys(t.expanded_map),t.expanded},isCSSLoaded:function(t,n){if(!t||!YUI.Env.cssStampEl||!n&&this.ignoreRegistered)return!1;var r=YUI.Env.cssStampEl,i=!1,s=YUI.Env._cssLoaded[t],o=r.currentStyle;return s!==undefined?s:(r.className=t,o||(o=e.config.doc.defaultView.getComputedStyle(r,null)),o&&o.display==="none"&&(i=!0),r.className="",YUI.Env._cssLoaded[t]=i,i)},getProvides:function(t){var r=this.getModule(t),i,s;return r?(r&&!r.provides&&(i={},s=r.supersedes,s&&v.each(s,function(t){e.mix(i,this.getProvides(t))},this),i[t]=!0,r.provides=i),r.provides):n},calculate:function(e,t){if(e||t||this.dirty)e&&this._config(e),this._init||this._setup(),this._explode(),this.allowRollup?this._rollup():this._explodeRollups(),this._reduce(),this._sort()},_addLangPack:function(t,n,r){var i=n.name,s,o,u=this.moduleInfo[r];return u||(s=S(n.pkg||i,r,a,!0),o={path:s,intl:!0,langPack:!0,ext:n.ext,group:n.group,supersedes:[]},n.root&&(o.root=n.root),n.base&&(o.base=n.base),n.configFn&&(o.configFn=n.configFn),this.addModule(o,r),t&&(e.Env.lang=e.Env.lang||{},e.Env.lang[t]=e.Env.lang[t]||{},e.Env.lang[t][i]=!0)),this.moduleInfo[r]},_setup:function(){var t=this.moduleInfo,n,r,i,o,u,a;for(n in t)t.hasOwnProperty(n)&&(o=t[n],o&&(o.requires=v.dedupe(o.requires),o.lang&&(a=this.getLangPackName(h,n),this._addLangPack(null,o,a))));u={},this.ignoreRegistered||e.mix(u,s.mods),this.ignore&&e.mix(u,v.hash(this.ignore));for(i in u)u.hasOwnProperty(i)&&e.mix(u,this.getProvides(i));if(this.force)for(r=0;r<this.force.length;r++)this.force[r]in u&&delete u[this.force[r]];e.mix(this.loaded,u),this._init=!0},getLangPackName:function(e,t){return"lang/"+t+(e?"_"+e:"")},_explode:function(){var t=this.required,n,r,i={},s=this,o,u;s.dirty=!1,s._explodeRollups(),t=s.required;for(o in t)t.hasOwnProperty(o)&&(i[o]||(i[o]=!0,n=s.getModule(o),n&&(u=n.expound,u&&(t[u]=s.getModule(u),r=s.getRequires(t[u]),e.mix(t,v.hash(r))),r=s.getRequires(n),e.mix(t,v.hash(r)))))},_patternTest:function(e,t){return e.indexOf(t)>-1},getModule:function(t){if(!t)return null;var n,r,i,s=this.moduleInfo[t],o=this.patterns;if(!s||s&&s.ext)for(i in o)if(o.hasOwnProperty(i)){n=o[i],n.test||(n.test=this._patternTest);if(n.test(t,i)){r=n;break}}return s?r&&s&&r.configFn&&!s.configFn&&(s.configFn=r.configFn,s.configFn(s)):r&&(n.action?n.action.call(this,t,i):(s=this.addModule(e.merge(r),t),r.configFn&&(s.configFn=r.configFn),s.temp=!0)),s},_rollup:function(){},_reduce:function(e){e=e||this.required;var t,n,r,i,s=this.loadType,o=this.ignore?v.hash(this.ignore):!1;for(t in e)if(e.hasOwnProperty(t)){i=this.getModule(t),((this.loaded[t]||w[t])&&!this.forceMap[t]&&!this.ignoreRegistered||s&&i&&i.type!==s)&&delete e[t],o&&o[t]&&delete e[t],r=i&&i.supersedes;if(r)for(n=0;n<r.length;n++)r[n]in e&&delete e[r[n]]}return e},_finish:function(e,t){m.running=!1;var n=this.onEnd;n&&n.call(this.context,{msg:e,data:this.data,success:t}),this._continue()},_onSuccess:function(){var t=this,n=e.merge(t.skipped),r,i=[],s=t.requireRegistration,o,u,f,l;for(f in n)n.hasOwnProperty(f)&&delete t.inserted[f];t.skipped={};for(f in t.inserted)t.inserted.hasOwnProperty(f)&&(l=t.getModule(f),!l||!s||l.type!==a||f in YUI.Env.mods?e.mix(t.loaded,t.getProvides(f)):i.push(f));r=t.onSuccess,u=i.length?"notregistered":"success",o=!i.length,r&&r.call(t.context,{msg:u,data:t.data,success:o,failed:i,skipped:n}),t._finish(u,o)},_onProgress:function(e){var t=this,n;if(e.data&&e.data.length)for(n=0;n<e.data.length;n++)e.data[n]=t.getModule(e.data[n].name);t.onProgress&&t.onProgress.call(t.context,{name:e.url,data:e.data})},_onFailure:function(e){var t=this.onFailure,n=[],r=0,i=e.errors.length;for(r;r<i;r++)n.push(e.errors[r].error);n=n.join(","),t&&t.call(this.context,{msg:n,data:this.data,success:!1}),this._finish(n,!1)},_onTimeout:function(e){var t=this.onTimeout;t&&t.call(this.context,{msg:"timeout",data:this.data,success:!1,transaction:e})},_sort:function(){var e,t=this.required,n={};this.sorted=[];for(e in t)!n[e]&&t.hasOwnProperty(e)&&this._visit(e,n)},_visit:function(e,t){var n,r,i,s,o,u;t[e]=!0,n=this.required,r=this.moduleInfo[e];if(r){s=r.requires;for(o=0,u=s.length;o<u;++o)i=s[o],n[i]&&!t[i]&&this._visit(i,t)}this.sorted.push(e)},_insert:function(t,n,r,i){t&&this._config(t);var s=this.resolve(!i),o=this,f=0,l=0,c={},h,p;o._refetch=[],r&&(s[r===a?u:a]=[]),o.fetchCSS||(s.css=[]),s.js.length&&f++,s.css.length&&f++,p=function(t){l++;var n={},r=0,i=0,s="",u,a,p;if(t&&t.errors)for(r=0;r<t.errors.length;r++)t.errors[r].request?s=t.errors[r].request.url:s=t.errors[r],n[s]=s;if(t&&t.data&&t.data.length&&t.type==="success")for(r=0;r<t.data.length;r++){o.inserted[t.data[r].name]=!0;if(t.data[r].lang||t.data[r].skinnable)delete o.inserted[t.data[r].name],o._refetch.push(t.data[r].name)}if(l===f){o._loading=null;if(o._refetch.length){for(r=0;r<o._refetch.length;r++){h=o.getRequires(o.getModule(o._refetch[r]));for(i=0;i<h.length;i++)o.inserted[h[i]]||(c[h[i]]=h[i])}c=e.Object.keys(c);if(c.length){o.require(c),p=o.resolve
-(!0);if(p.cssMods.length){for(r=0;r<p.cssMods.length;r++)a=p.cssMods[r].name,delete YUI.Env._cssLoaded[a],o.isCSSLoaded(a)&&(o.inserted[a]=!0,delete o.required[a]);o.sorted=[],o._sort()}t=null,o._insert()}}t&&t.fn&&(u=t.fn,delete t.fn,u.call(o,t))}},this._loading=!0;if(!s.js.length&&!s.css.length){l=-1,p({fn:o._onSuccess});return}s.css.length&&e.Get.css(s.css,{data:s.cssMods,attributes:o.cssAttributes,insertBefore:o.insertBefore,charset:o.charset,timeout:o.timeout,context:o,onProgress:function(e){o._onProgress.call(o,e)},onTimeout:function(e){o._onTimeout.call(o,e)},onSuccess:function(e){e.type="success",e.fn=o._onSuccess,p.call(o,e)},onFailure:function(e){e.type="failure",e.fn=o._onFailure,p.call(o,e)}}),s.js.length&&e.Get.js(s.js,{data:s.jsMods,insertBefore:o.insertBefore,attributes:o.jsAttributes,charset:o.charset,timeout:o.timeout,autopurge:!1,context:o,async:o.async,onProgress:function(e){o._onProgress.call(o,e)},onTimeout:function(e){o._onTimeout.call(o,e)},onSuccess:function(e){e.type="success",e.fn=o._onSuccess,p.call(o,e)},onFailure:function(e){e.type="failure",e.fn=o._onFailure,p.call(o,e)}})},_continue:function(){!m.running&&m.size()>0&&(m.running=!0,m.next()())},insert:function(t,n,r){var i=this,s=e.merge(this);delete s.require,delete s.dirty,m.add(function(){i._insert(s,t,n,r)}),this._continue()},loadNext:function(){return},_filter:function(e,t,n){var r=this.filter,i=t&&t in this.filters,s=i&&this.filters[t],o=n||(this.moduleInfo[t]?this.moduleInfo[t].group:null);return o&&this.groups[o]&&this.groups[o].filter&&(s=this.groups[o].filter,i=!0),e&&(i&&(r=b.isString(s)?this.FILTER_DEFS[s.toUpperCase()]||null:s),r&&(e=e.replace(new RegExp(r.searchExp,"g"),r.replaceStr))),e},_url:function(e,t,n){return this._filter((n||this.base||"")+e,t)},resolve:function(e,t){var r,s,o,f,c,h,p,d,v,m,g,y,w,E,S=[],x,T,N={},C=this,k,A,O=C.ignoreRegistered?{}:C.inserted,M={js:[],jsMods:[],css:[],cssMods:[]},_=C.loadType||"js",D;(C.skin.overrides||C.skin.defaultSkin!==l||C.ignoreRegistered)&&C._resetModules(),e&&C.calculate(),t=t||C.sorted,D=function(e){if(e){c=e.group&&C.groups[e.group]||n,c.async===!1&&(e.async=c.async),f=e.fullpath?C._filter(e.fullpath,t[s]):C._url(e.path,t[s],c.base||e.base);if(e.attributes||e.async===!1)f={url:f,async:e.async},e.attributes&&(f.attributes=e.attributes);M[e.type].push(f),M[e.type+"Mods"].push(e)}},r=t.length,y=C.comboBase,f=y,m={};for(s=0;s<r;s++){v=y,o=C.getModule(t[s]),h=o&&o.group,c=C.groups[h];if(h&&c){if(!c.combine||o.fullpath){D(o);continue}o.combine=!0,c.comboBase&&(v=c.comboBase),"root"in c&&b.isValue(c.root)&&(o.root=c.root),o.comboSep=c.comboSep||C.comboSep,o.maxURLLength=c.maxURLLength||C.maxURLLength}else if(!C.combine){D(o);continue}m[v]=m[v]||[],m[v].push(o)}for(p in m)if(m.hasOwnProperty(p)){N[p]=N[p]||{js:[],jsMods:[],css:[],cssMods:[]},f=p,g=m[p],r=g.length;if(r)for(s=0;s<r;s++){if(O[g[s]])continue;o=g[s],o&&(o.combine||!o.ext)?(N[p].comboSep=o.comboSep,N[p].group=o.group,N[p].maxURLLength=o.maxURLLength,d=(b.isValue(o.root)?o.root:C.root)+(o.path||o.fullpath),d=C._filter(d,o.name),N[p][o.type].push(d),N[p][o.type+"Mods"].push(o)):g[s]&&D(g[s])}}for(p in N)if(N.hasOwnProperty(p)){w=p,k=N[w].comboSep||C.comboSep,A=N[w].maxURLLength||C.maxURLLength;for(_ in N[w])if(_===a||_===u){E=N[w][_],g=N[w][_+"Mods"],r=E.length,x=w+E.join(k),T=x.length,A<=w.length&&(A=i);if(r)if(T>A){S=[];for(t=0;t<r;t++)S.push(E[t]),x=w+S.join(k),x.length>A&&(o=S.pop(),x=w+S.join(k),M[_].push(C._filter(x,null,N[w].group)),S=[],o&&S.push(o));S.length&&(x=w+S.join(k),M[_].push(C._filter(x,null,N[w].group)))}else M[_].push(C._filter(x,null,N[w].group));M[_+"Mods"]=M[_+"Mods"].concat(g)}}return N=null,M},load:function(e){if(!e)return;var t=this,n=t.resolve(!0);t.data=n,t.onEnd=function(){e.apply(t.context||t,arguments)},t.insert()}}},"3.15.0",{requires:["get","features"]}),YUI.add("loader-rollup",function(e,t){e.Loader.prototype._rollup=function(){var e,t,n,r,i=this.required,s,o=this.moduleInfo,u,a,f;if(this.dirty||!this.rollups){this.rollups={};for(e in o)o.hasOwnProperty(e)&&(n=this.getModule(e),n&&n.rollup&&(this.rollups[e]=n))}for(;;){u=!1;for(e in this.rollups)if(this.rollups.hasOwnProperty(e)&&!i[e]&&(!this.loaded[e]||this.forceMap[e])){n=this.getModule(e),r=n.supersedes||[],s=!1;if(!n.rollup)continue;a=0;for(t=0;t<r.length;t++){f=o[r[t]];if(this.loaded[r[t]]&&!this.forceMap[r[t]]){s=!1;break}if(i[r[t]]&&n.type===f.type){a++,s=a>=n.rollup;if(s)break}}s&&(i[e]=!0,u=!0,this.getRequires(n))}if(!u)break}}},"3.15.0",{requires:["loader-base"]}),YUI.add("loader-yui3",function(e,t){YUI.Env[e.version].modules=YUI.Env[e.version].modules||{},e.mix(YUI.Env[e.version].modules,{"align-plugin":{requires:["node-screen","node-pluginhost"]},anim:{use:["anim-base","anim-color","anim-curve","anim-easing","anim-node-plugin","anim-scroll","anim-xy"]},"anim-base":{requires:["base-base","node-style"]},"anim-color":{requires:["anim-base"]},"anim-curve":{requires:["anim-xy"]},"anim-easing":{requires:["anim-base"]},"anim-node-plugin":{requires:["node-pluginhost","anim-base"]},"anim-scroll":{requires:["anim-base"]},"anim-shape":{requires:["anim-base","anim-easing","anim-color","matrix"]},"anim-shape-transform":{use:["anim-shape"]},"anim-xy":{requires:["anim-base","node-screen"]},app:{use:["app-base","app-content","app-transitions","lazy-model-list","model","model-list","model-sync-rest","model-sync-local","router","view","view-node-map"]},"app-base":{requires:["classnamemanager","pjax-base","router","view"]},"app-content":{requires:["app-base","pjax-content"]},"app-transitions":{requires:["app-base"]},"app-transitions-css":{type:"css"},"app-transitions-native":{condition:{name:"app-transitions-native",test:function(e){var t=e.config.doc,n=t?t.documentElement:null;return n&&n.style?"MozTransition"in n.style||"WebkitTransition"in n.style||"transition"in n.style:!1},trigger:"app-transitions"},requires:["app-transitions","app-transitions-css","parallel","transition"]},"array-extras":{requires:["yui-base"]},"array-invoke"
-:{requires:["yui-base"]},arraylist:{requires:["yui-base"]},"arraylist-add":{requires:["arraylist"]},"arraylist-filter":{requires:["arraylist"]},arraysort:{requires:["yui-base"]},"async-queue":{requires:["event-custom"]},attribute:{use:["attribute-base","attribute-complex"]},"attribute-base":{requires:["attribute-core","attribute-observable","attribute-extras"]},"attribute-complex":{requires:["attribute-base"]},"attribute-core":{requires:["oop"]},"attribute-events":{use:["attribute-observable"]},"attribute-extras":{requires:["oop"]},"attribute-observable":{requires:["event-custom"]},autocomplete:{use:["autocomplete-base","autocomplete-sources","autocomplete-list","autocomplete-plugin"]},"autocomplete-base":{optional:["autocomplete-sources"],requires:["array-extras","base-build","escape","event-valuechange","node-base"]},"autocomplete-filters":{requires:["array-extras","text-wordbreak"]},"autocomplete-filters-accentfold":{requires:["array-extras","text-accentfold","text-wordbreak"]},"autocomplete-highlighters":{requires:["array-extras","highlight-base"]},"autocomplete-highlighters-accentfold":{requires:["array-extras","highlight-accentfold"]},"autocomplete-list":{after:["autocomplete-sources"],lang:["en","es","hu","it"],requires:["autocomplete-base","event-resize","node-screen","selector-css3","shim-plugin","widget","widget-position","widget-position-align"],skinnable:!0},"autocomplete-list-keys":{condition:{name:"autocomplete-list-keys",test:function(e){return!e.UA.ios&&!e.UA.android},trigger:"autocomplete-list"},requires:["autocomplete-list","base-build"]},"autocomplete-plugin":{requires:["autocomplete-list","node-pluginhost"]},"autocomplete-sources":{optional:["io-base","json-parse","jsonp","yql"],requires:["autocomplete-base"]},axes:{use:["axis-numeric","axis-category","axis-time","axis-stacked"]},"axes-base":{use:["axis-numeric-base","axis-category-base","axis-time-base","axis-stacked-base"]},axis:{requires:["dom","widget","widget-position","widget-stack","graphics","axis-base"]},"axis-base":{requires:["classnamemanager","datatype-number","datatype-date","base","event-custom"]},"axis-category":{requires:["axis","axis-category-base"]},"axis-category-base":{requires:["axis-base"]},"axis-numeric":{requires:["axis","axis-numeric-base"]},"axis-numeric-base":{requires:["axis-base"]},"axis-stacked":{requires:["axis-numeric","axis-stacked-base"]},"axis-stacked-base":{requires:["axis-numeric-base"]},"axis-time":{requires:["axis","axis-time-base"]},"axis-time-base":{requires:["axis-base"]},base:{use:["base-base","base-pluginhost","base-build"]},"base-base":{requires:["attribute-base","base-core","base-observable"]},"base-build":{requires:["base-base"]},"base-core":{requires:["attribute-core"]},"base-observable":{requires:["attribute-observable","base-core"]},"base-pluginhost":{requires:["base-base","pluginhost"]},button:{requires:["button-core","cssbutton","widget"]},"button-core":{requires:["attribute-core","classnamemanager","node-base","escape"]},"button-group":{requires:["button-plugin","cssbutton","widget"]},"button-plugin":{requires:["button-core","cssbutton","node-pluginhost"]},cache:{use:["cache-base","cache-offline","cache-plugin"]},"cache-base":{requires:["base"]},"cache-offline":{requires:["cache-base","json"]},"cache-plugin":{requires:["plugin","cache-base"]},calendar:{requires:["calendar-base","calendarnavigator"],skinnable:!0},"calendar-base":{lang:["de","en","es","es-AR","fr","hu","it","ja","nb-NO","nl","pt-BR","ru","zh-Hans","zh-Hans-CN","zh-Hant","zh-Hant-HK","zh-HANT-TW"],requires:["widget","datatype-date","datatype-date-math","cssgrids"],skinnable:!0},calendarnavigator:{requires:["plugin","classnamemanager","datatype-date","node"],skinnable:!0},charts:{use:["charts-base"]},"charts-base":{requires:["dom","event-mouseenter","event-touch","graphics-group","axes","series-pie","series-line","series-marker","series-area","series-spline","series-column","series-bar","series-areaspline","series-combo","series-combospline","series-line-stacked","series-marker-stacked","series-area-stacked","series-spline-stacked","series-column-stacked","series-bar-stacked","series-areaspline-stacked","series-combo-stacked","series-combospline-stacked"]},"charts-legend":{requires:["charts-base"]},classnamemanager:{requires:["yui-base"]},"clickable-rail":{requires:["slider-base"]},collection:{use:["array-extras","arraylist","arraylist-add","arraylist-filter","array-invoke"]},color:{use:["color-base","color-hsl","color-harmony"]},"color-base":{requires:["yui-base"]},"color-harmony":{requires:["color-hsl"]},"color-hsl":{requires:["color-base"]},"color-hsv":{requires:["color-base"]},console:{lang:["en","es","hu","it","ja"],requires:["yui-log","widget"],skinnable:!0},"console-filters":{requires:["plugin","console"],skinnable:!0},"content-editable":{requires:["node-base","editor-selection","stylesheet","plugin"]},controller:{use:["router"]},cookie:{requires:["yui-base"]},"createlink-base":{requires:["editor-base"]},cssbase:{after:["cssreset","cssfonts","cssgrids","cssreset-context","cssfonts-context","cssgrids-context"],type:"css"},"cssbase-context":{after:["cssreset","cssfonts","cssgrids","cssreset-context","cssfonts-context","cssgrids-context"],type:"css"},cssbutton:{type:"css"},cssfonts:{type:"css"},"cssfonts-context":{type:"css"},cssgrids:{optional:["cssnormalize"],type:"css"},"cssgrids-base":{optional:["cssnormalize"],type:"css"},"cssgrids-responsive":{optional:["cssnormalize"],requires:["cssgrids","cssgrids-responsive-base"],type:"css"},"cssgrids-units":{optional:["cssnormalize"],requires:["cssgrids-base"],type:"css"},cssnormalize:{type:"css"},"cssnormalize-context":{type:"css"},cssreset:{type:"css"},"cssreset-context":{type:"css"},dataschema:{use:["dataschema-base","dataschema-json","dataschema-xml","dataschema-array","dataschema-text"]},"dataschema-array":{requires:["dataschema-base"]},"dataschema-base":{requires:["base"]},"dataschema-json":{requires:["dataschema-base","json"]},"dataschema-text":{requires
-:["dataschema-base"]},"dataschema-xml":{requires:["dataschema-base"]},datasource:{use:["datasource-local","datasource-io","datasource-get","datasource-function","datasource-cache","datasource-jsonschema","datasource-xmlschema","datasource-arrayschema","datasource-textschema","datasource-polling"]},"datasource-arrayschema":{requires:["datasource-local","plugin","dataschema-array"]},"datasource-cache":{requires:["datasource-local","plugin","cache-base"]},"datasource-function":{requires:["datasource-local"]},"datasource-get":{requires:["datasource-local","get"]},"datasource-io":{requires:["datasource-local","io-base"]},"datasource-jsonschema":{requires:["datasource-local","plugin","dataschema-json"]},"datasource-local":{requires:["base"]},"datasource-polling":{requires:["datasource-local"]},"datasource-textschema":{requires:["datasource-local","plugin","dataschema-text"]},"datasource-xmlschema":{requires:["datasource-local","plugin","datatype-xml","dataschema-xml"]},datatable:{use:["datatable-core","datatable-table","datatable-head","datatable-body","datatable-base","datatable-column-widths","datatable-message","datatable-mutable","datatable-sort","datatable-datasource"]},"datatable-base":{requires:["datatable-core","datatable-table","datatable-head","datatable-body","base-build","widget"],skinnable:!0},"datatable-body":{requires:["datatable-core","view","classnamemanager"]},"datatable-column-widths":{requires:["datatable-base"]},"datatable-core":{requires:["escape","model-list","node-event-delegate"]},"datatable-datasource":{requires:["datatable-base","plugin","datasource-local"]},"datatable-foot":{requires:["datatable-core","view"]},"datatable-formatters":{requires:["datatable-body","datatype-number-format","datatype-date-format","escape"]},"datatable-head":{requires:["datatable-core","view","classnamemanager"]},"datatable-highlight":{requires:["datatable-base","event-hover"],skinnable:!0},"datatable-keynav":{requires:["datatable-base"]},"datatable-message":{lang:["en","fr","es","hu","it"],requires:["datatable-base"],skinnable:!0},"datatable-mutable":{requires:["datatable-base"]},"datatable-paginator":{lang:["en","fr"],requires:["model","view","paginator-core","datatable-foot","datatable-paginator-templates"],skinnable:!0},"datatable-paginator-templates":{requires:["template"]},"datatable-scroll":{requires:["datatable-base","datatable-column-widths","dom-screen"],skinnable:!0},"datatable-sort":{lang:["en","fr","es","hu"],requires:["datatable-base"],skinnable:!0},"datatable-table":{requires:["datatable-core","datatable-head","datatable-body","view","classnamemanager"]},datatype:{use:["datatype-date","datatype-number","datatype-xml"]},"datatype-date":{use:["datatype-date-parse","datatype-date-format","datatype-date-math"]},"datatype-date-format":{lang:["ar","ar-JO","ca","ca-ES","da","da-DK","de","de-AT","de-DE","el","el-GR","en","en-AU","en-CA","en-GB","en-IE","en-IN","en-JO","en-MY","en-NZ","en-PH","en-SG","en-US","es","es-AR","es-BO","es-CL","es-CO","es-EC","es-ES","es-MX","es-PE","es-PY","es-US","es-UY","es-VE","fi","fi-FI","fr","fr-BE","fr-CA","fr-FR","hi","hi-IN","hu","id","id-ID","it","it-IT","ja","ja-JP","ko","ko-KR","ms","ms-MY","nb","nb-NO","nl","nl-BE","nl-NL","pl","pl-PL","pt","pt-BR","ro","ro-RO","ru","ru-RU","sv","sv-SE","th","th-TH","tr","tr-TR","vi","vi-VN","zh-Hans","zh-Hans-CN","zh-Hant","zh-Hant-HK","zh-Hant-TW"]},"datatype-date-math":{requires:["yui-base"]},"datatype-date-parse":{},"datatype-number":{use:["datatype-number-parse","datatype-number-format"]},"datatype-number-format":{},"datatype-number-parse":{requires:["escape"]},"datatype-xml":{use:["datatype-xml-parse","datatype-xml-format"]},"datatype-xml-format":{},"datatype-xml-parse":{},dd:{use:["dd-ddm-base","dd-ddm","dd-ddm-drop","dd-drag","dd-proxy","dd-constrain","dd-drop","dd-scroll","dd-delegate"]},"dd-constrain":{requires:["dd-drag"]},"dd-ddm":{requires:["dd-ddm-base","event-resize"]},"dd-ddm-base":{requires:["node","base","yui-throttle","classnamemanager"]},"dd-ddm-drop":{requires:["dd-ddm"]},"dd-delegate":{requires:["dd-drag","dd-drop-plugin","event-mouseenter"]},"dd-drag":{requires:["dd-ddm-base"]},"dd-drop":{requires:["dd-drag","dd-ddm-drop"]},"dd-drop-plugin":{requires:["dd-drop"]},"dd-gestures":{condition:{name:"dd-gestures",trigger:"dd-drag",ua:"touchEnabled"},requires:["dd-drag","event-synthetic","event-gestures"]},"dd-plugin":{optional:["dd-constrain","dd-proxy"],requires:["dd-drag"]},"dd-proxy":{requires:["dd-drag"]},"dd-scroll":{requires:["dd-drag"]},dial:{lang:["en","es","hu"],requires:["widget","dd-drag","event-mouseenter","event-move","event-key","transition","intl"],skinnable:!0},dom:{use:["dom-base","dom-screen","dom-style","selector-native","selector"]},"dom-base":{requires:["dom-core"]},"dom-core":{requires:["oop","features"]},"dom-screen":{requires:["dom-base","dom-style"]},"dom-style":{requires:["dom-base","color-base"]},"dom-style-ie":{condition:{name:"dom-style-ie",test:function(e){var t=e.Features.test,n=e.Features.add,r=e.config.win,i=e.config.doc,s="documentElement",o=!1;return n("style","computedStyle",{test:function(){return r&&"getComputedStyle"in r}}),n("style","opacity",{test:function(){return i&&"opacity"in i[s].style}}),o=!t("style","opacity")&&!t("style","computedStyle"),o},trigger:"dom-style"},requires:["dom-style"]},dump:{requires:["yui-base"]},editor:{use:["frame","editor-selection","exec-command","editor-base","editor-para","editor-br","editor-bidi","editor-tab","createlink-base"]},"editor-base":{requires:["base","frame","node","exec-command","editor-selection"]},"editor-bidi":{requires:["editor-base"]},"editor-br":{requires:["editor-base"]},"editor-inline":{requires:["editor-base","content-editable"]},"editor-lists":{requires:["editor-base"]},"editor-para":{requires:["editor-para-base"]},"editor-para-base":{requires:["editor-base"]},"editor-para-ie":{condition:{name:"editor-para-ie",trigger:"editor-para",ua:"ie",when:"instead"},requires:["editor-para-base"]},"editor-selection"
-:{requires:["node"]},"editor-tab":{requires:["editor-base"]},escape:{requires:["yui-base"]},event:{after:["node-base"],use:["event-base","event-delegate","event-synthetic","event-mousewheel","event-mouseenter","event-key","event-focus","event-resize","event-hover","event-outside","event-touch","event-move","event-flick","event-valuechange","event-tap"]},"event-base":{after:["node-base"],requires:["event-custom-base"]},"event-base-ie":{after:["event-base"],condition:{name:"event-base-ie",test:function(e){var t=e.config.doc&&e.config.doc.implementation;return t&&!t.hasFeature("Events","2.0")},trigger:"node-base"},requires:["node-base"]},"event-contextmenu":{requires:["event-synthetic","dom-screen"]},"event-custom":{use:["event-custom-base","event-custom-complex"]},"event-custom-base":{requires:["oop"]},"event-custom-complex":{requires:["event-custom-base"]},"event-delegate":{requires:["node-base"]},"event-flick":{requires:["node-base","event-touch","event-synthetic"]},"event-focus":{requires:["event-synthetic"]},"event-gestures":{use:["event-flick","event-move"]},"event-hover":{requires:["event-mouseenter"]},"event-key":{requires:["event-synthetic"]},"event-mouseenter":{requires:["event-synthetic"]},"event-mousewheel":{requires:["node-base"]},"event-move":{requires:["node-base","event-touch","event-synthetic"]},"event-outside":{requires:["event-synthetic"]},"event-resize":{requires:["node-base","event-synthetic"]},"event-simulate":{requires:["event-base"]},"event-synthetic":{requires:["node-base","event-custom-complex"]},"event-tap":{requires:["node-base","event-base","event-touch","event-synthetic"]},"event-touch":{requires:["node-base"]},"event-valuechange":{requires:["event-focus","event-synthetic"]},"exec-command":{requires:["frame"]},features:{requires:["yui-base"]},file:{requires:["file-flash","file-html5"]},"file-flash":{requires:["base"]},"file-html5":{requires:["base"]},frame:{requires:["base","node","plugin","selector-css3","yui-throttle"]},"gesture-simulate":{requires:["async-queue","event-simulate","node-screen"]},get:{requires:["yui-base"]},graphics:{requires:["node","event-custom","pluginhost","matrix","classnamemanager"]},"graphics-canvas":{condition:{name:"graphics-canvas",test:function(e){var t=e.config.doc,n=e.config.defaultGraphicEngine&&e.config.defaultGraphicEngine=="canvas",r=t&&t.createElement("canvas"),i=t&&t.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1");return(!i||n)&&r&&r.getContext&&r.getContext("2d")},trigger:"graphics"},requires:["graphics"]},"graphics-canvas-default":{condition:{name:"graphics-canvas-default",test:function(e){var t=e.config.doc,n=e.config.defaultGraphicEngine&&e.config.defaultGraphicEngine=="canvas",r=t&&t.createElement("canvas"),i=t&&t.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1");return(!i||n)&&r&&r.getContext&&r.getContext("2d")},trigger:"graphics"}},"graphics-group":{requires:["graphics"]},"graphics-svg":{condition:{name:"graphics-svg",test:function(e){var t=e.config.doc,n=!e.config.defaultGraphicEngine||e.config.defaultGraphicEngine!="canvas",r=t&&t.createElement("canvas"),i=t&&t.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1");return i&&(n||!r)},trigger:"graphics"},requires:["graphics"]},"graphics-svg-default":{condition:{name:"graphics-svg-default",test:function(e){var t=e.config.doc,n=!e.config.defaultGraphicEngine||e.config.defaultGraphicEngine!="canvas",r=t&&t.createElement("canvas"),i=t&&t.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1");return i&&(n||!r)},trigger:"graphics"}},"graphics-vml":{condition:{name:"graphics-vml",test:function(e){var t=e.config.doc,n=t&&t.createElement("canvas");return t&&!t.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1")&&(!n||!n.getContext||!n.getContext("2d"))},trigger:"graphics"},requires:["graphics"]},"graphics-vml-default":{condition:{name:"graphics-vml-default",test:function(e){var t=e.config.doc,n=t&&t.createElement("canvas");return t&&!t.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1")&&(!n||!n.getContext||!n.getContext("2d"))},trigger:"graphics"}},handlebars:{use:["handlebars-compiler"]},"handlebars-base":{requires:[]},"handlebars-compiler":{requires:["handlebars-base"]},highlight:{use:["highlight-base","highlight-accentfold"]},"highlight-accentfold":{requires:["highlight-base","text-accentfold"]},"highlight-base":{requires:["array-extras","classnamemanager","escape","text-wordbreak"]},history:{use:["history-base","history-hash","history-html5"]},"history-base":{requires:["event-custom-complex"]},"history-hash":{after:["history-html5"],requires:["event-synthetic","history-base","yui-later"]},"history-hash-ie":{condition:{name:"history-hash-ie",test:function(e){var t=e.config.doc&&e.config.doc.documentMode;return e.UA.ie&&(!("onhashchange"in e.config.win)||!t||t<8)},trigger:"history-hash"},requires:["history-hash","node-base"]},"history-html5":{optional:["json"],requires:["event-base","history-base","node-base"]},imageloader:{requires:["base-base","node-style","node-screen"]},intl:{requires:["intl-base","event-custom"]},"intl-base":{requires:["yui-base"]},io:{use:["io-base","io-xdr","io-form","io-upload-iframe","io-queue"]},"io-base":{requires:["event-custom-base","querystring-stringify-simple"]},"io-form":{requires:["io-base","node-base"]},"io-nodejs":{condition:{name:"io-nodejs",trigger:"io-base",ua:"nodejs"},requires:["io-base"]},"io-queue":{requires:["io-base","queue-promote"]},"io-upload-iframe":{requires:["io-base","node-base"]},"io-xdr":{requires:["io-base","datatype-xml-parse"]},json:{use:["json-parse","json-stringify"]},"json-parse":{requires:["yui-base"]},"json-parse-shim":{condition:{name:"json-parse-shim",test:function(e){function i(e,t){return e==="ok"?!0:t}var t=e.config.global.JSON,n=Object.prototype.toString.call(t)==="[object JSON]"&&t,r=e.config.useNativeJSONParse!==!1&&!!
-n;if(r)try{r=n.parse('{"ok":false}',i).ok}catch(s){r=!1}return!r},trigger:"json-parse"},requires:["json-parse"]},"json-stringify":{requires:["yui-base"]},"json-stringify-shim":{condition:{name:"json-stringify-shim",test:function(e){var t=e.config.global.JSON,n=Object.prototype.toString.call(t)==="[object JSON]"&&t,r=e.config.useNativeJSONStringify!==!1&&!!n;if(r)try{r="0"===n.stringify(0)}catch(i){r=!1}return!r},trigger:"json-stringify"},requires:["json-stringify"]},jsonp:{requires:["get","oop"]},"jsonp-url":{requires:["jsonp"]},"lazy-model-list":{requires:["model-list"]},loader:{use:["loader-base","loader-rollup","loader-yui3"]},"loader-base":{requires:["get","features"]},"loader-rollup":{requires:["loader-base"]},"loader-yui3":{requires:["loader-base"]},matrix:{requires:["yui-base"]},model:{requires:["base-build","escape","json-parse"]},"model-list":{requires:["array-extras","array-invoke","arraylist","base-build","escape","json-parse","model"]},"model-sync-local":{requires:["model","json-stringify"]},"model-sync-rest":{requires:["model","io-base","json-stringify"]},node:{use:["node-base","node-event-delegate","node-pluginhost","node-screen","node-style"]},"node-base":{requires:["event-base","node-core","dom-base","dom-style"]},"node-core":{requires:["dom-core","selector"]},"node-event-delegate":{requires:["node-base","event-delegate"]},"node-event-html5":{requires:["node-base"]},"node-event-simulate":{requires:["node-base","event-simulate","gesture-simulate"]},"node-flick":{requires:["classnamemanager","transition","event-flick","plugin"],skinnable:!0},"node-focusmanager":{requires:["attribute","node","plugin","node-event-simulate","event-key","event-focus"]},"node-load":{requires:["node-base","io-base"]},"node-menunav":{requires:["node","classnamemanager","plugin","node-focusmanager"],skinnable:!0},"node-pluginhost":{requires:["node-base","pluginhost"]},"node-screen":{requires:["dom-screen","node-base"]},"node-scroll-info":{requires:["array-extras","base-build","event-resize","node-pluginhost","plugin","selector"]},"node-style":{requires:["dom-style","node-base"]},oop:{requires:["yui-base"]},overlay:{requires:["widget","widget-stdmod","widget-position","widget-position-align","widget-stack","widget-position-constrain"],skinnable:!0},paginator:{requires:["paginator-core"]},"paginator-core":{requires:["base"]},"paginator-url":{requires:["paginator"]},panel:{requires:["widget","widget-autohide","widget-buttons","widget-modality","widget-position","widget-position-align","widget-position-constrain","widget-stack","widget-stdmod"],skinnable:!0},parallel:{requires:["yui-base"]},pjax:{requires:["pjax-base","pjax-content"]},"pjax-base":{requires:["classnamemanager","node-event-delegate","router"]},"pjax-content":{requires:["io-base","node-base","router"]},"pjax-plugin":{requires:["node-pluginhost","pjax","plugin"]},plugin:{requires:["base-base"]},pluginhost:{use:["pluginhost-base","pluginhost-config"]},"pluginhost-base":{requires:["yui-base"]},"pluginhost-config":{requires:["pluginhost-base"]},promise:{requires:["timers"]},querystring:{use:["querystring-parse","querystring-stringify"]},"querystring-parse":{requires:["yui-base","array-extras"]},"querystring-parse-simple":{requires:["yui-base"]},"querystring-stringify":{requires:["yui-base"]},"querystring-stringify-simple":{requires:["yui-base"]},"queue-promote":{requires:["yui-base"]},"range-slider":{requires:["slider-base","slider-value-range","clickable-rail"]},recordset:{use:["recordset-base","recordset-sort","recordset-filter","recordset-indexer"]},"recordset-base":{requires:["base","arraylist"]},"recordset-filter":{requires:["recordset-base","array-extras","plugin"]},"recordset-indexer":{requires:["recordset-base","plugin"]},"recordset-sort":{requires:["arraysort","recordset-base","plugin"]},resize:{use:["resize-base","resize-proxy","resize-constrain"]},"resize-base":{requires:["base","widget","event","oop","dd-drag","dd-delegate","dd-drop"],skinnable:!0},"resize-constrain":{requires:["plugin","resize-base"]},"resize-plugin":{optional:["resize-constrain"],requires:["resize-base","plugin"]},"resize-proxy":{requires:["plugin","resize-base"]},router:{optional:["querystring-parse"],requires:["array-extras","base-build","history"]},scrollview:{requires:["scrollview-base","scrollview-scrollbars"]},"scrollview-base":{requires:["widget","event-gestures","event-mousewheel","transition"],skinnable:!0},"scrollview-base-ie":{condition:{name:"scrollview-base-ie",trigger:"scrollview-base",ua:"ie"},requires:["scrollview-base"]},"scrollview-list":{requires:["plugin","classnamemanager"],skinnable:!0},"scrollview-paginator":{requires:["plugin","classnamemanager"]},"scrollview-scrollbars":{requires:["classnamemanager","transition","plugin"],skinnable:!0},selector:{requires:["selector-native"]},"selector-css2":{condition:{name:"selector-css2",test:function(e){var t=e.config.doc,n=t&&!("querySelectorAll"in t);return n},trigger:"selector"},requires:["selector-native"]},"selector-css3":{requires:["selector-native","selector-css2"]},"selector-native":{requires:["dom-base"]},"series-area":{requires:["series-cartesian","series-fill-util"]},"series-area-stacked":{requires:["series-stacked","series-area"]},"series-areaspline":{requires:["series-area","series-curve-util"]},"series-areaspline-stacked":{requires:["series-stacked","series-areaspline"]},"series-bar":{requires:["series-marker","series-histogram-base"]},"series-bar-stacked":{requires:["series-stacked","series-bar"]},"series-base":{requires:["graphics","axis-base"]},"series-candlestick":{requires:["series-range"]},"series-cartesian":{requires:["series-base"]},"series-column":{requires:["series-marker","series-histogram-base"]},"series-column-stacked":{requires:["series-stacked","series-column"]},"series-combo":{requires:["series-cartesian","series-line-util","series-plot-util","series-fill-util"]},"series-combo-stacked":{requires:["series-stacked","series-combo"]},"series-combospline":{requires:["series-combo"
-,"series-curve-util"]},"series-combospline-stacked":{requires:["series-combo-stacked","series-curve-util"]},"series-curve-util":{},"series-fill-util":{},"series-histogram-base":{requires:["series-cartesian","series-plot-util"]},"series-line":{requires:["series-cartesian","series-line-util"]},"series-line-stacked":{requires:["series-stacked","series-line"]},"series-line-util":{},"series-marker":{requires:["series-cartesian","series-plot-util"]},"series-marker-stacked":{requires:["series-stacked","series-marker"]},"series-ohlc":{requires:["series-range"]},"series-pie":{requires:["series-base","series-plot-util"]},"series-plot-util":{},"series-range":{requires:["series-cartesian"]},"series-spline":{requires:["series-line","series-curve-util"]},"series-spline-stacked":{requires:["series-stacked","series-spline"]},"series-stacked":{requires:["axis-stacked"]},"shim-plugin":{requires:["node-style","node-pluginhost"]},slider:{use:["slider-base","slider-value-range","clickable-rail","range-slider"]},"slider-base":{requires:["widget","dd-constrain","event-key"],skinnable:!0},"slider-value-range":{requires:["slider-base"]},sortable:{requires:["dd-delegate","dd-drop-plugin","dd-proxy"]},"sortable-scroll":{requires:["dd-scroll","sortable"]},stylesheet:{requires:["yui-base"]},substitute:{optional:["dump"],requires:["yui-base"]},swf:{requires:["event-custom","node","swfdetect","escape"]},swfdetect:{requires:["yui-base"]},tabview:{requires:["widget","widget-parent","widget-child","tabview-base","node-pluginhost","node-focusmanager"],skinnable:!0},"tabview-base":{requires:["node-event-delegate","classnamemanager"]},"tabview-plugin":{requires:["tabview-base"]},template:{use:["template-base","template-micro"]},"template-base":{requires:["yui-base"]},"template-micro":{requires:["escape"]},test:{requires:["event-simulate","event-custom","json-stringify"]},"test-console":{requires:["console-filters","test","array-extras"],skinnable:!0},text:{use:["text-accentfold","text-wordbreak"]},"text-accentfold":{requires:["array-extras","text-data-accentfold"]},"text-data-accentfold":{requires:["yui-base"]},"text-data-wordbreak":{requires:["yui-base"]},"text-wordbreak":{requires:["array-extras","text-data-wordbreak"]},timers:{requires:["yui-base"]},transition:{requires:["node-style"]},"transition-timer":{condition:{name:"transition-timer",test:function(e){var t=e.config.doc,n=t?t.documentElement:null,r=!0;return n&&n.style&&(r=!("MozTransition"in n.style||"WebkitTransition"in n.style||"transition"in n.style)),r},trigger:"transition"},requires:["transition"]},tree:{requires:["base-build","tree-node"]},"tree-labelable":{requires:["tree"]},"tree-lazy":{requires:["base-pluginhost","plugin","tree"]},"tree-node":{},"tree-openable":{requires:["tree"]},"tree-selectable":{requires:["tree"]},"tree-sortable":{requires:["tree"]},uploader:{requires:["uploader-html5","uploader-flash"]},"uploader-flash":{requires:["swfdetect","escape","widget","base","cssbutton","node","event-custom","uploader-queue"]},"uploader-html5":{requires:["widget","node-event-simulate","file-html5","uploader-queue"]},"uploader-queue":{requires:["base"]},view:{requires:["base-build","node-event-delegate"]},"view-node-map":{requires:["view"]},widget:{use:["widget-base","widget-htmlparser","widget-skin","widget-uievents"]},"widget-anim":{requires:["anim-base","plugin","widget"]},"widget-autohide":{requires:["base-build","event-key","event-outside","widget"]},"widget-base":{requires:["attribute","base-base","base-pluginhost","classnamemanager","event-focus","node-base","node-style"],skinnable:!0},"widget-base-ie":{condition:{name:"widget-base-ie",trigger:"widget-base",ua:"ie"},requires:["widget-base"]},"widget-buttons":{requires:["button-plugin","cssbutton","widget-stdmod"]},"widget-child":{requires:["base-build","widget"]},"widget-htmlparser":{requires:["widget-base"]},"widget-modality":{requires:["base-build","event-outside","widget"],skinnable:!0},"widget-parent":{requires:["arraylist","base-build","widget"]},"widget-position":{requires:["base-build","node-screen","widget"]},"widget-position-align":{requires:["widget-position"]},"widget-position-constrain":{requires:["widget-position"]},"widget-skin":{requires:["widget-base"]},"widget-stack":{requires:["base-build","widget"],skinnable:!0},"widget-stdmod":{requires:["base-build","widget"]},"widget-uievents":{requires:["node-event-delegate","widget-base"]},yql:{requires:["oop"]},"yql-jsonp":{condition:{name:"yql-jsonp",test:function(e){return!e.UA.nodejs&&!e.UA.winjs},trigger:"yql",when:"after"},requires:["jsonp","jsonp-url"]},"yql-nodejs":{condition:{name:"yql-nodejs",trigger:"yql",ua:"nodejs",when:"after"}},"yql-winjs":{condition:{name:"yql-winjs",trigger:"yql",ua:"winjs",when:"after"}},yui:{},"yui-base":{},"yui-later":{requires:["yui-base"]},"yui-log":{requires:["yui-base"]},"yui-throttle":{requires:["yui-base"]}}),YUI.Env[e.version].md5="8e471689779fc84718f6dad481790b59"},"3.15.0",{requires:["loader-base"]}),YUI.add("yui",function(e,t){},"3.15.0",{use:["yui-base","get","features","intl-base","yui-log","yui-later","loader-base","loader-rollup","loader-yui3"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("event-custom-complex",function(e,t){var n,r,i=e.Object,s,o={},u=e.CustomEvent.prototype,a=e.EventTarget.prototype,f=function(e,t){var n;for(n in t)r.hasOwnProperty(n)||(e[n]=t[n])};e.EventFacade=function(e,t){e||(e=o),this._event=e,this.details=e.details,this.type=e.type,this._type=e.type,this.target=e.target,this.currentTarget=t,this.relatedTarget=e.relatedTarget},e.mix(e.EventFacade.prototype,{stopPropagation:function(){this._event.stopPropagation(),this.stopped=1},stopImmediatePropagation:function(){this._event.stopImmediatePropagation(),this.stopped=2},preventDefault:function(){this._event.preventDefault(),this.prevented=1},halt:function(e){this._event.halt(e),this.prevented=1,this.stopped=e?2:1}}),u.fireComplex=function(t){var n,r,i,s,o,u=!0,a,f,l,c,h,p,d,v,m,g=this,y=g.host||g,b,w,E=g.stack,S=y._yuievt,x;if(E&&g.queuable&&g.type!==E.next.type)return E.queue||(E.queue=[]),E.queue.push([g,t]),!0;x=g.hasSubs()||S.hasTargets||g.broadcast,g.target=g.target||y,g.currentTarget=y,g.details=t.concat();if(x){n=E||{id:g.id,next:g,silent:g.silent,stopped:0,prevented:0,bubbling:null,type:g.type,defaultTargetOnly:g.defaultTargetOnly},f=g.getSubs(),l=f[0],c=f[1],g.stopped=g.type!==n.type?0:n.stopped,g.prevented=g.type!==n.type?0:n.prevented,g.stoppedFn&&(a=new e.EventTarget({fireOnce:!0,context:y}),g.events=a,a.on("stopped",g.stoppedFn)),g._facade=null,r=g._createFacade(t),l&&g._procSubs(l,t,r),g.bubbles&&y.bubble&&!g.stopped&&(w=n.bubbling,n.bubbling=g.type,n.type!==g.type&&(n.stopped=0,n.prevented=0),u=y.bubble(g,t,null,n),g.stopped=Math.max(g.stopped,n.stopped),g.prevented=Math.max(g.prevented,n.prevented),n.bubbling=w),d=g.prevented,d?(v=g.preventedFn,v&&v.apply(y,t)):(m=g.defaultFn,m&&(!g.defaultTargetOnly&&!n.defaultTargetOnly||y===r.target)&&m.apply(y,t)),g.broadcast&&g._broadcast(t);if(c&&!g.prevented&&g.stopped<2){h=n.afterQueue;if(n.id===g.id||g.type!==S.bubbling){g._procSubs(c,t,r);if(h)while(b=h.last())b()}else p=c,n.execDefaultCnt&&(p=e.merge(p),e.each(p,function(e){e.postponed=!0})),h||(n.afterQueue=new e.Queue),n.afterQueue.add(function(){g._procSubs(p,t,r)})}g.target=null;if(n.id===g.id){s=n.queue;if(s)while(s.length)i=s.pop(),o=i[0],n.next=o,o._fire(i[1]);g.stack=null}u=!g.stopped,g.type!==S.bubbling&&(n.stopped=0,n.prevented=0,g.stopped=0,g.prevented=0)}else m=g.defaultFn,m&&(r=g._createFacade(t),(!g.defaultTargetOnly||y===r.target)&&m.apply(y,t));return g._facade=null,u},u._hasPotentialSubscribers=function(){return this.hasSubs()||this.host._yuievt.hasTargets||this.broadcast},u._createFacade=u._getFacade=function(t){var n=this.details,r=n&&n[0],i=r&&typeof r=="object",s=this._facade;return s||(s=new e.EventFacade(this,this.currentTarget)),i?(f(s,r),r.type&&(s.type=r.type),t&&(t[0]=s)):t&&t.unshift(s),s.details=this.details,s.target=this.originalTarget||this.target,s.currentTarget=this.currentTarget,s.stopped=0,s.prevented=0,this._facade=s,this._facade},u._addFacadeToArgs=function(e){var t=e[0];t&&t.halt&&t.stopImmediatePropagation&&t.stopPropagation&&t._event||this._createFacade(e)},u.stopPropagation=function(){this.stopped=1,this.stack&&(this.stack.stopped=1),this.events&&this.events.fire("stopped",this)},u.stopImmediatePropagation=function(){this.stopped=2,this.stack&&(this.stack.stopped=2),this.events&&this.events.fire("stopped",this)},u.preventDefault=function(){this.preventable&&(this.prevented=1,this.stack&&(this.stack.prevented=1))},u.halt=function(e){e?this.stopImmediatePropagation():this.stopPropagation(),this.preventDefault()},a.addTarget=function(t){var n=this._yuievt;return n.targets||(n.targets={}),n.targets[e.stamp(t)]=t,n.hasTargets=!0,this},a.getTargets=function(){var e=this._yuievt.targets;return e?i.values(e):[]},a.removeTarget=function(t){var n=this._yuievt.targets;return n&&(delete n[e.stamp(t,!0)],i.size(n)===0&&(this._yuievt.hasTargets=!1)),this},a.bubble=function(e,t,n,r){var i=this._yuievt.targets,s=!0,o,u,a,f,l,c=e&&e.type,h=n||e&&e.target||this,p;if(!e||!e.stopped&&i)for(a in i)if(i.hasOwnProperty(a)){o=i[a],u=o._yuievt.events[c],o._hasSiblings&&(l=o.getSibling(c,u)),l&&!u&&(u=o.publish(c)),p=o._yuievt.bubbling,o._yuievt.bubbling=c;if(!u)o._yuievt.hasTargets&&o.bubble(e,t,h,r);else{l&&(u.sibling=l),u.target=h,u.originalTarget=h,u.currentTarget=o,f=u.broadcast,u.broadcast=!1,u.emitFacade=!0,u.stack=r,s=s&&u.fire.apply(u,t||e.details||[]),u.broadcast=f,u.originalTarget=null;if(u.stopped)break}o._yuievt.bubbling=p}return s},a._hasPotentialSubscribers=function(e){var t=this._yuievt,n=t.events[e];return n?n.hasSubs()||t.hasTargets||n.broadcast:!1},n=new e.EventFacade,r={};for(s in n)r[s]=!0},"3.15.0",{requires:["event-custom-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("event-synthetic",function(e,t){function c(e,t){this.handle=e,this.emitFacade=t}function h(e,t,n){this.handles=[],this.el=e,this.key=n,this.domkey=t}function p(){this._init.apply(this,arguments)}var n=e.CustomEvent,r=e.Env.evt.dom_map,i=e.Array,s=e.Lang,o=s.isObject,u=s.isString,a=s.isArray,f=e.Selector.query,l=function(){};c.prototype.fire=function(t){var n=i(arguments,0,!0),r=this.handle,s=r.evt,u=r.sub,a=u.context,f=u.filter,l=t||{},c;if(this.emitFacade){if(!t||!t.preventDefault)l=s._getFacade(),o(t)&&!t.preventDefault?(e.mix(l,t,!0),n[0]=l):n.unshift(l);l.type=s.type,l.details=n.slice(),f&&(l.container=s.host)}else f&&o(t)&&t.currentTarget&&n.shift();return u.context=a||l.currentTarget||s.host,c=s.fire.apply(s,n),t.prevented&&s.preventedFn&&s.preventedFn.apply(s,n),t.stopped&&s.stoppedFn&&s.stoppedFn.apply(s,n),u.context=a,c},h.prototype={constructor:h,type:"_synth",fn:l,capture:!1,register:function(e){e.evt.registry=this,this.handles.push(e)},unregister:function(t){var n=this.handles,i=r[this.domkey],s;for(s=n.length-1;s>=0;--s)if(n[s].sub===t){n.splice(s,1);break}n.length||(delete i[this.key],e.Object.size(i)||delete r[this.domkey])},detachAll:function(){var e=this.handles,t=e.length;while(--t>=0)e[t].detach()}},e.mix(p,{Notifier:c,SynthRegistry:h,getRegistry:function(t,n,i){var s=t._node,o=e.stamp(s),u="event:"+o+n+"_synth",a=r[o];return i&&(a||(a=r[o]={}),a[u]||(a[u]=new h(s,o,u))),a&&a[u]||null},_deleteSub:function(e){if(e&&e.fn){var t=this.eventDef,r=e.filter?"detachDelegate":"detach";this._subscribers=[],n.keepDeprecatedSubs&&(this.subscribers={}),t[r](e.node,e,this.notifier,e.filter),this.registry.unregister(e),delete e.fn,delete e.node,delete e.context}},prototype:{constructor:p,_init:function(){var e=this.publishConfig||(this.publishConfig={});this.emitFacade="emitFacade"in e?e.emitFacade:!0,e.emitFacade=!1},processArgs:l,on:l,detach:l,delegate:l,detachDelegate:l,_on:function(t,n){var r=[],s=t.slice(),o=this.processArgs(t,n),a=t[2],l=n?"delegate":"on",c,h;return c=u(a)?f(a):i(a||e.one(e.config.win)),!c.length&&u(a)?(h=e.on("available",function(){e.mix(h,e[l].apply(e,s),!0)},a),h):(e.Array.each(c,function(i){var s=t.slice(),u;i=e.one(i),i&&(n&&(u=s.splice(3,1)[0]),s.splice(0,4,s[1],s[3]),(!this.preventDups||!this.getSubs(i,t,null,!0))&&r.push(this._subscribe(i,l,s,o,u)))},this),r.length===1?r[0]:new e.EventHandle(r))},_subscribe:function(t,n,r,i,s){var o=new e.CustomEvent(this.type,this.publishConfig),u=o.on.apply(o,r),a=new c(u,this.emitFacade),f=p.getRegistry(t,this.type,!0),l=u.sub;return l.node=t,l.filter=s,i&&this.applyArgExtras(i,l),e.mix(o,{eventDef:this,notifier:a,host:t,currentTarget:t,target:t,el:t._node,_delete:p._deleteSub},!0),u.notifier=a,f.register(u),this[n](t,l,a,s),u},applyArgExtras:function(e,t){t._extra=e},_detach:function(t){var n=t[2],r=u(n)?f(n):i(n),s,o,a,l,c;t.splice(2,1);for(o=0,a=r.length;o<a;++o){s=e.one(r[o]);if(s){l=this.getSubs(s,t);if(l)for(c=l.length-1;c>=0;--c)l[c].detach()}}},getSubs:function(e,t,n,r){var i=p.getRegistry(e,this.type),s=[],o,u,a,f;if(i){o=i.handles,n||(n=this.subMatch);for(u=0,a=o.length;u<a;++u){f=o[u];if(n.call(this,f.sub,t)){if(r)return f;s.push(o[u])}}}return s.length&&s},subMatch:function(e,t){return!t[1]||e.fn===t[1]}}},!0),e.SyntheticEvent=p,e.Event.define=function(t,n,r){var s,o,f;t&&t.type?(s=t,r=n):n&&(s=e.merge({type:t},n));if(s){if(r||!e.Node.DOM_EVENTS[s.type])o=function(){p.apply(this,arguments)},e.extend(o,p,s),f=new o,t=f.type,e.Node.DOM_EVENTS[t]=e.Env.evt.plugins[t]={eventDef:f,on:function(){return f._on(i(arguments))},delegate:function(){return f._on(i(arguments),!0)},detach:function(){return f._detach(i(arguments))}}}else(u(t)||a(t))&&e.Array.each(i(t),function(t){e.Node.DOM_EVENTS[t]=1});return f}},"3.15.0",{requires:["node-base","event-custom-complex"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("event-key",function(e,t){var n="+alt",r="+ctrl",i="+meta",s="+shift",o=e.Lang.trim,u={KEY_MAP:{enter:13,esc:27,backspace:8,tab:9,pageup:33,pagedown:34},_typeRE:/^(up|down|press):/,_keysRE:/^(?:up|down|press):|\+(alt|ctrl|meta|shift)/g,processArgs:function(t){var n=t.splice(3,1)[0],r=e.Array.hash(n.match(/\+(?:alt|ctrl|meta|shift)\b/g)||[]),i={type:this._typeRE.test(n)?RegExp.$1:null,mods:r,keys:null},s=n.replace(this._keysRE,""),u,a,f,l;if(s){s=s.split(","),i.keys={};for(l=s.length-1;l>=0;--l){u=o(s[l]);if(!u)continue;+u==u?i.keys[u]=r:(f=u.toLowerCase(),this.KEY_MAP[f]?(i.keys[this.KEY_MAP[f]]=r,i.type||(i.type="down")):(u=u.charAt(0),a=u.toUpperCase(),r["+shift"]&&(u=a),i.keys[u.charCodeAt(0)]=u===a?e.merge(r,{"+shift":!0}):r))}}return i.type||(i.type="press"),i},on:function(e,t,o,u){var a=t._extra,f="key"+a.type,l=a.keys,c=u?"delegate":"on";t._detach=e[c](f,function(e){var t=l?l[e.which]:a.mods;t&&(!t[n]||t[n]&&e.altKey)&&(!t[r]||t[r]&&e.ctrlKey)&&(!t[i]||t[i]&&e.metaKey)&&(!t[s]||t[s]&&e.shiftKey)&&o.fire(e)},u)},detach:function(e,t,n){t._detach.detach()}};u.delegate=u.on,u.detachDelegate=u.detach,e.Event.define("key",u,!0)},"3.15.0",{requires:["event-synthetic"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("slider-base",function(e,t){function r(){r.superclass.constructor.apply(this,arguments)}var n=e.Attribute.INVALID_VALUE;e.SliderBase=e.extend(r,e.Widget,{initializer:function(){this.axis=this.get("axis"),this._key={dim:this.axis==="y"?"height":"width",minEdge:this.axis==="y"?"top":"left",maxEdge:this.axis==="y"?"bottom":"right",xyIndex:this.axis==="y"?1:0},this.publish("thumbMove",{defaultFn:this._defThumbMoveFn,queuable:!0})},renderUI:function(){var e=this.get("contentBox");this.rail=this.renderRail(),this._uiSetRailLength(this.get("length")),this.thumb=this.renderThumb(),this.rail.appendChild(this.thumb),e.appendChild(this.rail),e.addClass(this.getClassName(this.axis))},renderRail:function(){var t=this.getClassName("rail","cap",this._key.minEdge),n=this.getClassName("rail","cap",this._key.maxEdge);return e.Node.create(e.Lang.sub(this.RAIL_TEMPLATE,{railClass:this.getClassName("rail"),railMinCapClass:t,railMaxCapClass:n}))},_uiSetRailLength:function(e){this.rail.setStyle(this._key.dim,e)},renderThumb:function(){this._initThumbUrl();var t=this.get("thumbUrl");return e.Node.create(e.Lang.sub(this.THUMB_TEMPLATE,{thumbClass:this.getClassName("thumb"),thumbShadowClass:this.getClassName("thumb","shadow"),thumbImageClass:this.getClassName("thumb","image"),thumbShadowUrl:t,thumbImageUrl:t,thumbAriaLabelId:this.getClassName("label",e.guid())}))},_onThumbClick:function(e){this.thumb.focus()},bindUI:function(){var t=this.get("boundingBox"),n=e.UA.opera?"press:":"down:",r=n+"38,40,33,34,35,36",i=n+"37,39",s=n+"37+meta,39+meta";t.on("key",this._onDirectionKey,r,this),t.on("key",this._onLeftRightKey,i,this),t.on("key",this._onLeftRightKeyMeta,s,this),this.thumb.on("click",this._onThumbClick,this),this._bindThumbDD(),this._bindValueLogic(),this.after("disabledChange",this._afterDisabledChange),this.after("lengthChange",this._afterLengthChange)},_incrMinor:function(){this.set("value",this.get("value")+this.get("minorStep"))},_decrMinor:function(){this.set("value",this.get("value")-this.get("minorStep"))},_incrMajor:function(){this.set("value",this.get("value")+this.get("majorStep"))},_decrMajor:function(){this.set("value",this.get("value")-this.get("majorStep"))},_setToMin:function(e){this.set("value",this.get("min"))},_setToMax:function(e){this.set("value",this.get("max"))},_onDirectionKey:function(e){e.preventDefault();if(this.get("disabled")===!1)switch(e.charCode){case 38:this._incrMinor();break;case 40:this._decrMinor();break;case 36:this._setToMin();break;case 35:this._setToMax();break;case 33:this._incrMajor();break;case 34:this._decrMajor()}},_onLeftRightKey:function(e){e.preventDefault();if(this.get("disabled")===!1)switch(e.charCode){case 37:this._decrMinor();break;case 39:this._incrMinor()}},_onLeftRightKeyMeta:function(e){e.preventDefault();if(this.get("disabled")===!1)switch(e.charCode){case 37:this._setToMin();break;case 39:this._setToMax()}},_bindThumbDD:function(){var t={constrain:this.rail};t["stick"+this.axis.toUpperCase()]=!0,this._dd=new e.DD.Drag({node:this.thumb,bubble:!1,on:{"drag:start":e.bind(this._onDragStart,this)},after:{"drag:drag":e.bind(this._afterDrag,this),"drag:end":e.bind(this._afterDragEnd,this)}}),this._dd.plug(e.Plugin.DDConstrained,t)},_bindValueLogic:function(){},_uiMoveThumb:function(e,t){this.thumb&&(this.thumb.setStyle(this._key.minEdge,e+"px"),t||(t={}),t.offset=e,this.fire("thumbMove",t))},_onDragStart:function(e){this.fire("slideStart",{ddEvent:e,originEvent:e})},_afterDrag:function(e){var t=e.info.xy[this._key.xyIndex],n=e.target.con._regionCache[this._key.minEdge];this.fire("thumbMove",{offset:t-n,ddEvent:e,originEvent:e})},_afterDragEnd:function(e){this.fire("slideEnd",{ddEvent:e,originEvent:e})},_afterDisabledChange:function(e){this._dd.set("lock",e.newVal)},_afterLengthChange:function(e){this.get("rendered")&&(this._uiSetRailLength(e.newVal),this.syncUI())},syncUI:function(){this._dd.con.resetCache(),this._syncThumbPosition(),this.thumb.set("aria-valuemin",this.get("min")),this.thumb.set("aria-valuemax",this.get("max")),this._dd.set("lock",this.get("disabled"))},_syncThumbPosition:function(){},_setAxis:function(e){return e=(e+"").toLowerCase(),e==="x"||e==="y"?e:n},_setLength:function(e){e=(e+"").toLowerCase();var t=parseFloat(e,10),r=e.replace(/[\d\.\-]/g,"")||this.DEF_UNIT;return t>0?t+r:n},_initThumbUrl:function(){if(!this.get("thumbUrl")){var t=this.getSkinName()||"sam",n=e.config.base;n.indexOf("http://yui.yahooapis.com/combo")===0&&(n="http://yui.yahooapis.com/"+e.version+"/build/"),this.set("thumbUrl",n+"slider-base/assets/skins/"+t+"/thumb-"+this.axis+".png")}},BOUNDING_TEMPLATE:"<span></span>",CONTENT_TEMPLATE:"<span></span>",RAIL_TEMPLATE:'<span class="{railClass}"><span class="{railMinCapClass}"></span><span class="{railMaxCapClass}"></span></span>',THUMB_TEMPLATE:'<span class="{thumbClass}" aria-labelledby="{thumbAriaLabelId}" aria-valuetext="" aria-valuemax="" aria-valuemin="" aria-valuenow="" role="slider" tabindex="0"><img src="{thumbShadowUrl}" alt="Slider thumb shadow" class="{thumbShadowClass}"><img src="{thumbImageUrl}" alt="Slider thumb" class="{thumbImageClass}"></span>'},{NAME:"sliderBase",ATTRS:{axis:{value:"x",writeOnce:!0,setter:"_setAxis",lazyAdd:!1},length:{value:"150px",setter:"_setLength"},thumbUrl:{value:null,validator:e.Lang.isString}}})},"3.15.0",{requires:["widget","dd-constrain","event-key"],skinnable:!0});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("slider-value-range",function(e,t){function o(){this._initSliderValueRange()}var n="min",r="max",i="value",s=Math.round;e.SliderValueRange=e.mix(o,{prototype:{_factor:1,_initSliderValueRange:function(){},_bindValueLogic:function(){this.after({minChange:this._afterMinChange,maxChange:this._afterMaxChange,valueChange:this._afterValueChange})},_syncThumbPosition:function(){this._calculateFactor(),this._setPosition(this.get(i))},_calculateFactor:function(){var e=this.get("length"),t=this.thumb.getStyle(this._key.dim),i=this.get(n),s=this.get(r);e=parseFloat(e)||150,t=parseFloat(t)||15,this._factor=(s-i)/(e-t)},_defThumbMoveFn:function(e){e.source!=="set"&&this.set(i,this._offsetToValue(e.offset))},_offsetToValue:function(e){var t=s(e*this._factor)+this.get(n);return s(this._nearestValue(t))},_valueToOffset:function(e){var t=s((e-this.get(n))/this._factor);return t},getValue:function(){return this.get(i)},setValue:function(e){return this.set(i,e)},_afterMinChange:function(e){this._verifyValue(),this._syncThumbPosition()},_afterMaxChange:function(e){this._verifyValue(),this._syncThumbPosition()},_verifyValue:function(){var e=this.get(i),t=this._nearestValue(e);e!==t&&this.set(i,t)},_afterValueChange:function(e){var t=e.newVal;this._setPosition(t,{source:"set"})},_setPosition:function(e,t){this._uiMoveThumb(this._valueToOffset(e),t),this.thumb.set("aria-valuenow",e),this.thumb.set("aria-valuetext",e)},_validateNewMin:function(t){return e.Lang.isNumber(t)},_validateNewMax:function(t){return e.Lang.isNumber(t)},_setNewValue:function(t){return e.Lang.isNumber(t)?s(this._nearestValue(t)):e.Attribute.INVALID_VALUE},_nearestValue:function(e){var t=this.get(n),i=this.get(r),s;return s=i>t?i:t,t=i>t?t:i,i=s,e<t?t:e>i?i:e}},ATTRS:{min:{value:0,validator:"_validateNewMin"},max:{value:100,validator:"_validateNewMax"},minorStep:{value:1},majorStep:{value:10},value:{value:0,setter:"_setNewValue"}}},!0)},"3.15.0",{requires:["slider-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("clickable-rail",function(e,t){function n(){this._initClickableRail()}e.ClickableRail=e.mix(n,{prototype:{_initClickableRail:function(){this._evtGuid=this._evtGuid||e.guid()+"|",this.publish("railMouseDown",{defaultFn:this._defRailMouseDownFn}),this.after("render",this._bindClickableRail),this.on("destroy",this._unbindClickableRail)},_bindClickableRail:function(){this._dd.addHandle(this.rail),this.rail.on(this._evtGuid+e.DD.Drag.START_EVENT,e.bind(this._onRailMouseDown,this))},_unbindClickableRail:function(){if(this.get("rendered")){var e=this.get("contentBox"),t=e.one("."+this.getClassName("rail"));t.detach(this.evtGuid+"*")}},_onRailMouseDown:function(e){this.get("clickableRail")&&!this.get("disabled")&&(this.fire("railMouseDown",{ev:e}),this.thumb.focus())},_defRailMouseDownFn:function(e){e=e.ev;var t=this._resolveThumb(e),n=this._key.xyIndex,r=parseFloat(this.get("length"),10),i,s,o;t&&(i=t.get("dragNode"),s=parseFloat(i.getStyle(this._key.dim),10),o=this._getThumbDestination(e,i),o=o[n]-this.rail.getXY()[n],o=Math.min(Math.max(o,0),r-s),this._uiMoveThumb(o,{source:"rail"}),e.target=this.thumb.one("img")||this.thumb,t._handleMouseDownEvent(e))},_resolveThumb:function(e){return this._dd},_getThumbDestination:function(e,t){var n=t.get("offsetWidth"),r=t.get("offsetHeight");return[e.pageX-Math.round(n/2),e.pageY-Math.round(r/2)]}},ATTRS:{clickableRail:{value:!0,validator:e.Lang.isBoolean}}},!0)},"3.15.0",{requires:["slider-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("range-slider",function(e,t){e.Slider=e.Base.build("slider",e.SliderBase,[e.SliderValueRange,e.ClickableRail])},"3.15.0",{requires:["slider-base","slider-value-range","clickable-rail"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("event-delegate",function(e,t){function f(t,r,u,l){var c=n(arguments,0,!0),h=i(u)?u:null,p,d,v,m,g,y,b,w,E;if(s(t)){w=[];if(o(t))for(y=0,b=t.length;y<b;++y)c[0]=t[y],w.push(e.delegate.apply(e,c));else{c.unshift(null);for(y in t)t.hasOwnProperty(y)&&(c[0]=y,c[1]=t[y],w.push(e.delegate.apply(e,c)))}return new e.EventHandle(w)}p=t.split(/\|/),p.length>1&&(g=p.shift(),c[0]=t=p.shift()),d=e.Node.DOM_EVENTS[t],s(d)&&d.delegate&&(E=d.delegate.apply(d,arguments));if(!E){if(!t||!r||!u||!l)return;v=h?e.Selector.query(h,null,!0):u,!v&&i(u)&&(E=e.on("available",function(){e.mix(E,e.delegate.apply(e,c),!0)},u)),!E&&v&&(c.splice(2,2,v),E=e.Event._attach(c,{facade:!1}),E.sub.filter=l,E.sub._notify=f.notifySub)}return E&&g&&(m=a[g]||(a[g]={}),m=m[t]||(m[t]=[]),m.push(E)),E}var n=e.Array,r=e.Lang,i=r.isString,s=r.isObject,o=r.isArray,u=e.Selector.test,a=e.Env.evt.handles;f.notifySub=function(t,r,i){r=r.slice(),this.args&&r.push.apply(r,this.args);var s=f._applyFilter(this.filter,r,i),o,u,a,l;if(s){s=n(s),o=r[0]=new e.DOMEventFacade(r[0],i.el,i),o.container=e.one(i.el);for(u=0,a=s.length;u<a&&!o.stopped;++u){o.currentTarget=e.one(s[u]),l=this.fn.apply(this.context||o.currentTarget,r);if(l===!1)break}return l}},f.compileFilter=e.cached(function(e){return function(t,n){return u(t._node,e,n.currentTarget===n.target?null:n.currentTarget._node)}}),f._disabledRE=/^(?:button|input|select|textarea)$/i,f._applyFilter=function(t,n,r){var s=n[0],o=r.el,a=s.target||s.srcElement,l=[],c=!1;a.nodeType===3&&(a=a.parentNode);if(a.disabled&&f._disabledRE.test(a.nodeName))return l;n.unshift(a);if(i(t))while(a){c=a===o,u(a,t,c?null:o)&&l.push(a);if(c)break;a=a.parentNode}else{n[0]=e.one(a),n[1]=new e.DOMEventFacade(s,o,r);while(a){t.apply(n[0],n)&&l.push(a);if(a===o)break;a=a.parentNode,n[0]=e.one(a)}n[1]=s}return l.length<=1&&(l=l[0]),n.shift(),l},e.delegate=e.Event.delegate=f},"3.15.0",{requires:["node-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("node-event-delegate",function(e,t){e.Node.prototype.delegate=function(t){var n=e.Array(arguments,0,!0),r=e.Lang.isObject(t)&&!e.Lang.isArray(t)?1:2;return n.splice(r,0,this._node),e.delegate.apply(e,n)}},"3.15.0",{requires:["node-base","event-delegate"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("node-pluginhost",function(e,t){e.Node.plug=function(){var t=e.Array(arguments);return t.unshift(e.Node),e.Plugin.Host.plug.apply(e.Base,t),e.Node},e.Node.unplug=function(){var t=e.Array(arguments);return t.unshift(e.Node),e.Plugin.Host.unplug.apply(e.Base,t),e.Node},e.mix(e.Node,e.Plugin.Host,!1,null,1),e.Object.each(e.Node._instances,function(t){e.Plugin.Host.apply(t)}),e.NodeList.prototype.plug=function(){var t=arguments;return e.NodeList.each(this,function(n){e.Node.prototype.plug.apply(e.one(n),t)}),this},e.NodeList.prototype.unplug=function(){var t=arguments;return e.NodeList.each(this,function(n){e.Node.prototype.unplug.apply(e.one(n),t)}),this}},"3.15.0",{requires:["node-base","pluginhost"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("dom-screen",function(e,t){(function(e){var t="documentElement",n="compatMode",r="position",i="fixed",s="relative",o="left",u="top",a="BackCompat",f="medium",l="borderLeftWidth",c="borderTopWidth",h="getBoundingClientRect",p="getComputedStyle",d=e.DOM,v=/^t(?:able|d|h)$/i,m;e.UA.ie&&(e.config.doc[n]!=="BackCompat"?m=t:m="body"),e.mix(d,{winHeight:function(e){var t=d._getWinSize(e).height;return t},winWidth:function(e){var t=d._getWinSize(e).width;return t},docHeight:function(e){var t=d._getDocSize(e).height;return Math.max(t,d._getWinSize(e).height)},docWidth:function(e){var t=d._getDocSize(e).width;return Math.max(t,d._getWinSize(e).width)},docScrollX:function(n,r){r=r||n?d._getDoc(n):e.config.doc;var i=r.defaultView,s=i?i.pageXOffset:0;return Math.max(r[t].scrollLeft,r.body.scrollLeft,s)},docScrollY:function(n,r){r=r||n?d._getDoc(n):e.config.doc;var i=r.defaultView,s=i?i.pageYOffset:0;return Math.max(r[t].scrollTop,r.body.scrollTop,s)},getXY:function(){return e.config.doc[t][h]?function(r){var i=null,s,o,u,f,l,c,p,v,g,y;if(r&&r.tagName){p=r.ownerDocument,u=p[n],u!==a?y=p[t]:y=p.body,y.contains?g=y.contains(r):g=e.DOM.contains(y,r);if(g){v=p.defaultView,v&&"pageXOffset"in v?(s=v.pageXOffset,o=v.pageYOffset):(s=m?p[m].scrollLeft:d.docScrollX(r,p),o=m?p[m].scrollTop:d.docScrollY(r,p)),e.UA.ie&&(!p.documentMode||p.documentMode<8||u===a)&&(l=y.clientLeft,c=y.clientTop),f=r[h](),i=[f.left,f.top];if(l||c)i[0]-=l,i[1]-=c;if(o||s)if(!e.UA.ios||e.UA.ios>=4.2)i[0]+=s,i[1]+=o}else i=d._getOffset(r)}return i}:function(t){var n=null,s,o,u,a,f;if(t)if(d.inDoc(t)){n=[t.offsetLeft,t.offsetTop],s=t.ownerDocument,o=t,u=e.UA.gecko||e.UA.webkit>519?!0:!1;while(o=o.offsetParent)n[0]+=o.offsetLeft,n[1]+=o.offsetTop,u&&(n=d._calcBorders(o,n));if(d.getStyle(t,r)!=i){o=t;while(o=o.parentNode){a=o.scrollTop,f=o.scrollLeft,e.UA.gecko&&d.getStyle(o,"overflow")!=="visible"&&(n=d._calcBorders(o,n));if(a||f)n[0]-=f,n[1]-=a}n[0]+=d.docScrollX(t,s),n[1]+=d.docScrollY(t,s)}else n[0]+=d.docScrollX(t,s),n[1]+=d.docScrollY(t,s)}else n=d._getOffset(t);return n}}(),getScrollbarWidth:e.cached(function(){var t=e.config.doc,n=t.createElement("div"),r=t.getElementsByTagName("body")[0],i=.1;return r&&(n.style.cssText="position:absolute;visibility:hidden;overflow:scroll;width:20px;",n.appendChild(t.createElement("p")).style.height="1px",r.insertBefore(n,r.firstChild),i=n.offsetWidth-n.clientWidth,r.removeChild(n)),i},null,.1),getX:function(e){return d.getXY(e)[0]},getY:function(e){return d.getXY(e)[1]},setXY:function(e,t,n){var i=d.setStyle,a,f,l,c;e&&t&&(a=d.getStyle(e,r),f=d._getOffset(e),a=="static"&&(a=s,i(e,r,a)),c=d.getXY(e),t[0]!==null&&i(e,o,t[0]-c[0]+f[0]+"px"),t[1]!==null&&i(e,u,t[1]-c[1]+f[1]+"px"),n||(l=d.getXY(e),(l[0]!==t[0]||l[1]!==t[1])&&d.setXY(e,t,!0)))},setX:function(e,t){return d.setXY(e,[t,null])},setY:function(e,t){return d.setXY(e,[null,t])},swapXY:function(e,t){var n=d.getXY(e);d.setXY(e,d.getXY(t)),d.setXY(t,n)},_calcBorders:function(t,n){var r=parseInt(d[p](t,c),10)||0,i=parseInt(d[p](t,l),10)||0;return e.UA.gecko&&v.test(t.tagName)&&(r=0,i=0),n[0]+=i,n[1]+=r,n},_getWinSize:function(r,i){i=i||r?d._getDoc(r):e.config.doc;var s=i.defaultView||i.parentWindow,o=i[n],u=s.innerHeight,a=s.innerWidth,f=i[t];return o&&!e.UA.opera&&(o!="CSS1Compat"&&(f=i.body),u=f.clientHeight,a=f.clientWidth),{height:u,width:a}},_getDocSize:function(r){var i=r?d._getDoc(r):e.config.doc,s=i[t];return i[n]!="CSS1Compat"&&(s=i.body),{height:s.scrollHeight,width:s.scrollWidth}}})})(e),function(e){var t="top",n="right",r="bottom",i="left",s=function(e,s){var o=Math.max(e[t],s[t]),u=Math.min(e[n],s[n]),a=Math.min(e[r],s[r]),f=Math.max(e[i],s[i]),l={};return l[t]=o,l[n]=u,l[r]=a,l[i]=f,l},o=e.DOM;e.mix(o,{region:function(e){var t=o.getXY(e),n=!1;return e&&t&&(n=o._getRegion(t[1],t[0]+e.offsetWidth,t[1]+e.offsetHeight,t[0])),n},intersect:function(u,a,f){var l=f||o.region(u),c={},h=a,p;if(h.tagName)c=o.region(h);else{if(!e.Lang.isObject(a))return!1;c=a}return p=s(c,l),{top:p[t],right:p[n],bottom:p[r],left:p[i],area:(p[r]-p[t])*(p[n]-p[i]),yoff:p[r]-p[t],xoff:p[n]-p[i],inRegion:o.inRegion(u,a,!1,f)}},inRegion:function(u,a,f,l){var c={},h=l||o.region(u),p=a,d;if(p.tagName)c=o.region(p);else{if(!e.Lang.isObject(a))return!1;c=a}return f?h[i]>=c[i]&&h[n]<=c[n]&&h[t]>=c[t]&&h[r]<=c[r]:(d=s(c,h),d[r]>=d[t]&&d[n]>=d[i]?!0:!1)},inViewportRegion:function(e,t,n){return o.inRegion(e,o.viewportRegion(e),t,n)},_getRegion:function(e,s,o,u){var a={};return a[t]=a[1]=e,a[i]=a[0]=u,a[r]=o,a[n]=s,a.width=a[n]-a[i],a.height=a[r]-a[t],a},viewportRegion:function(t){t=t||e.config.doc.documentElement;var n=!1,r,i;return t&&(r=o.docScrollX(t),i=o.docScrollY(t),n=o._getRegion(i,o.winWidth(t)+r,i+o.winHeight(t),r)),n}})}(e)},"3.15.0",{requires:["dom-base","dom-style"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("node-screen",function(e,t){e.each(["winWidth","winHeight","docWidth","docHeight","docScrollX","docScrollY"],function(t){e.Node.ATTRS[t]={getter:function(){var n=Array.prototype.slice.call(arguments);return n.unshift(e.Node.getDOMNode(this)),e.DOM[t].apply(this,n)}}}),e.Node.ATTRS.scrollLeft={getter:function(){var t=e.Node.getDOMNode(this);return"scrollLeft"in t?t.scrollLeft:e.DOM.docScrollX(t)},setter:function(t){var n=e.Node.getDOMNode(this);n&&("scrollLeft"in n?n.scrollLeft=t:(n.document||n.nodeType===9)&&e.DOM._getWin(n).scrollTo(t,e.DOM.docScrollY(n)))}},e.Node.ATTRS.scrollTop={getter:function(){var t=e.Node.getDOMNode(this);return"scrollTop"in t?t.scrollTop:e.DOM.docScrollY(t)},setter:function(t){var n=e.Node.getDOMNode(this);n&&("scrollTop"in n?n.scrollTop=t:(n.document||n.nodeType===9)&&e.DOM._getWin(n).scrollTo(e.DOM.docScrollX(n),t))}},e.Node.importMethod(e.DOM,["getXY","setXY","getX","setX","getY","setY","swapXY"]),e.Node.ATTRS.region={getter:function(){var t=this.getDOMNode(),n;return t&&!t.tagName&&t.nodeType===9&&(t=t.documentElement),e.DOM.isWindow(t)?n=e.DOM.viewportRegion(t):n=e.DOM.region(t),n}},e.Node.ATTRS.viewportRegion={getter:function(){return e.DOM.viewportRegion(e.Node.getDOMNode(this))}},e.Node.importMethod(e.DOM,"inViewportRegion"),e.Node.prototype.intersect=function(t,n){var r=e.Node.getDOMNode(this);return e.instanceOf(t,e.Node)&&(t=e.Node.getDOMNode(t)),e.DOM.intersect(r,t,n)},e.Node.prototype.inRegion=function(t,n,r){var i=e.Node.getDOMNode(this);return e.instanceOf(t,e.Node)&&(t=e.Node.getDOMNode(t)),e.DOM.inRegion(i,t,n,r)}},"3.15.0",{requires:["dom-screen","node-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("node-style",function(e,t){(function(e){e.mix(e.Node.prototype,{setStyle:function(t,n){return e.DOM.setStyle(this._node,t,n),this},setStyles:function(t){return e.DOM.setStyles(this._node,t),this},getStyle:function(t){return e.DOM.getStyle(this._node,t)},getComputedStyle:function(t){return e.DOM.getComputedStyle(this._node,t)}}),e.NodeList.importMethod(e.Node.prototype,["getStyle","getComputedStyle","setStyle","setStyles"])})(e);var n=e.Node;e.mix(n.prototype,{show:function(e){return e=arguments[arguments.length-1],this.toggleView(!0,e),this},_show:function(){this.removeAttribute("hidden"),this.setStyle("display","")},_isHidden:function(){return this.hasAttribute("hidden")||e.DOM.getComputedStyle(this._node,"display")==="none"},toggleView:function(e,t){return this._toggleView.apply(this,arguments),this},_toggleView:function(e,t){return t=arguments[arguments.length-1],typeof e!="boolean"&&(e=this._isHidden()?1:0),e?this._show():this._hide(),typeof t=="function"&&t.call(this),this},hide:function(e){return e=arguments[arguments.length-1],this.toggleView(!1,e),this},_hide:function(){this.setAttribute("hidden","hidden"),this.setStyle("display","none")}}),e.NodeList.importMethod(e.Node.prototype,["show","hide","toggleView"])},"3.15.0",{requires:["dom-style","node-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("anim-base",function(e,t){var n="running",r="startTime",i="elapsedTime",s="start",o="tween",u="end",a="node",f="paused",l="reverse",c="iterationCount",h=Number,p={},d;e.Anim=function(){e.Anim.superclass.constructor.apply(this,arguments),e.Anim._instances[e.stamp(this)]=this},e.Anim.NAME="anim",e.Anim._instances={},e.Anim.RE_DEFAULT_UNIT=/^width|height|top|right|bottom|left|margin.*|padding.*|border.*$/i,e.Anim.DEFAULT_UNIT="px",e.Anim.DEFAULT_EASING=function(e,t,n,r){return n*e/r+t},e.Anim._intervalTime=20,e.Anim.behaviors={left:{get:function(e,t){return e._getOffset(t)}}},e.Anim.behaviors.top=e.Anim.behaviors.left,e.Anim.DEFAULT_SETTER=function(t,n,r,i,s,o,u,a){var f=t._node,l=f._node,c=u(s,h(r),h(i)-h(r),o);l?"style"in l&&(n in l.style||n in e.DOM.CUSTOM_STYLES)?(a=a||"",f.setStyle(n,c+a)):"attributes"in l&&n in l.attributes?f.setAttribute(n,c):n in l&&(l[n]=c):f.set?f.set(n,c):n in f&&(f[n]=c)},e.Anim.DEFAULT_GETTER=function(t,n){var r=t._node,i=r._node,s="";return i?"style"in i&&(n in i.style||n in e.DOM.CUSTOM_STYLES)?s=r.getComputedStyle(n):"attributes"in i&&n in i.attributes?s=r.getAttribute(n):n in i&&(s=i[n]):r.get?s=r.get(n):n in r&&(s=r[n]),s},e.Anim.ATTRS={node:{setter:function(t){return t&&(typeof t=="string"||t.nodeType)&&(t=e.one(t)),this._node=t,!t,t}},duration:{value:1},easing:{value:e.Anim.DEFAULT_EASING,setter:function(t){if(typeof t=="string"&&e.Easing)return e.Easing[t]}},from:{},to:{},startTime:{value:0,readOnly:!0},elapsedTime:{value:0,readOnly:!0},running:{getter:function(){return!!p[e.stamp(this)]},value:!1,readOnly:!0},iterations:{value:1},iterationCount:{value:0,readOnly:!0},direction:{value:"normal"},paused:{readOnly:!0,value:!1},reverse:{value:!1}},e.Anim.run=function(){var t=e.Anim._instances,n;for(n in t)t[n].run&&t[n].run()},e.Anim.pause=function(){for(var t in p)p[t].pause&&p[t].pause();e.Anim._stopTimer()},e.Anim.stop=function(){for(var t in p)p[t].stop&&p[t].stop();e.Anim._stopTimer()},e.Anim._startTimer=function(){d||(d=setInterval(e.Anim._runFrame,e.Anim._intervalTime))},e.Anim._stopTimer=function(){clearInterval(d),d=0},e.Anim._runFrame=function(){var t=!0,n;for(n in p)p[n]._runFrame&&(t=!1,p[n]._runFrame());t&&e.Anim._stopTimer()},e.Anim.RE_UNITS=/^(-?\d*\.?\d*){1}(em|ex|px|in|cm|mm|pt|pc|%)*$/;var v={run:function(){return this.get(f)?this._resume():this.get(n)||this._start(),this},pause:function(){return this.get(n)&&this._pause(),this},stop:function(e){return(this.get(n)||this.get(f))&&this._end(e),this},_added:!1,_start:function(){this._set(r,new Date-this.get(i)),this._actualFrames=0,this.get(f)||this._initAnimAttr(),p[e.stamp(this)]=this,e.Anim._startTimer(),this.fire(s)},_pause:function(){this._set(r,null),this._set(f,!0),delete p[e.stamp(this)],this.fire("pause")},_resume:function(){this._set(f,!1),p[e.stamp(this)]=this,this._set(r,new Date-this.get(i)),e.Anim._startTimer(),this.fire("resume")},_end:function(t){var n=this.get("duration")*1e3;t&&this._runAttrs(n,n,this.get(l)),this._set(r,null),this._set(i,0),this._set(f,!1),delete p[e.stamp(this)],this.fire(u,{elapsed:this.get(i)})},_runFrame:function(){var e=this._runtimeAttr.duration,t=new Date-this.get(r),n=this.get(l),s=t>=e;this._runAttrs(t,e,n),this._actualFrames+=1,this._set(i,t),this.fire(o),s&&this._lastFrame()},_runAttrs:function(t,n,r){var i=this._runtimeAttr,s=e.Anim.behaviors,o=i.easing,u=n,a=!1,f,l,c;t>=n&&(a=!0),r&&(t=n-t,u=0);for(c in i)i[c].to&&(f=i[c],l=c in s&&"set"in s[c]?s[c].set:e.Anim.DEFAULT_SETTER,a?l(this,c,f.from,f.to,u,n,o,f.unit):l(this,c,f.from,f.to,t,n,o,f.unit))},_lastFrame:function(){var e=this.get("iterations"),t=this.get(c);t+=1,e==="infinite"||t<e?(this.get("direction")==="alternate"&&this.set(l,!this.get(l)),this.fire("iteration")):(t=0,this._end()),this._set(r,new Date),this._set(c,t)},_initAnimAttr:function(){var t=this.get("from")||{},n=this.get("to")||{},r={duration:this.get("duration")*1e3,easing:this.get("easing")},i=e.Anim.behaviors,s=this.get(a),o,u,f;e.each(n,function(n,a){typeof n=="function"&&(n=n.call(this,s)),u=t[a],u===undefined?u=a in i&&"get"in i[a]?i[a].get(this,a):e.Anim.DEFAULT_GETTER(this,a):typeof u=="function"&&(u=u.call(this,s));var l=e.Anim.RE_UNITS.exec(u),c=e.Anim.RE_UNITS.exec(n);u=l?l[1]:u,f=c?c[1]:n,o=c?c[2]:l?l[2]:"",!o&&e.Anim.RE_DEFAULT_UNIT.test(a)&&(o=e.Anim.DEFAULT_UNIT);if(!u||!f){e.error('invalid "from" or "to" for "'+a+'"',"Anim");return}r[a]={from:e.Lang.isObject(u)?e.clone(u):u,to:f,unit:o}},this),this._runtimeAttr=r},_getOffset:function(e){var t=this._node,n=t.getComputedStyle(e),r=e==="left"?"getX":"getY",i=e==="left"?"setX":"setY",s;return n==="auto"&&(s=t.getStyle("position"),s==="absolute"||s==="fixed"?(n=t[r](),t[i](n)):n=0),n},destructor:function(){delete e.Anim._instances[e.stamp(this)]}};e.extend(e.Anim,e.Base,v)},"3.15.0",{requires:["base-base","node-style"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("anim-color",function(e,t){var n=Number;e.Anim.getUpdatedColorValue=function(t,r,i,s,o){return t=e.Color.re_RGB.exec(e.Color.toRGB(t)),r=e.Color.re_RGB.exec(e.Color.toRGB(r)),(!t||t.length<3||!r||r.length<3)&&e.error("invalid from or to passed to color behavior"),"rgb("+[Math.floor(o(i,n(t[1]),n(r[1])-n(t[1]),s)),Math.floor(o(i,n(t[2]),n(r[2])-n(t[2]),s)),Math.floor(o(i,n(t[3]),n(r[3])-n(t[3]),s))].join(", ")+")"},e.Anim.behaviors.color={set:function(t,n,r,i,s,o,u){t._node.setStyle(n,e.Anim.getUpdatedColorValue(r,i,s,o,u))},get:function(e,t){var n=e._node.getComputedStyle(t);return n=n==="transparent"?"rgb(255, 255, 255)":n,n}},e.each(["backgroundColor","borderColor","borderTopColor","borderRightColor","borderBottomColor","borderLeftColor"],function(t){e.Anim.behaviors[t]=e.Anim.behaviors.color})},"3.15.0",{requires:["anim-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("anim-xy",function(e,t){var n=Number;e.Anim.behaviors.xy={set:function(e,t,r,i,s,o,u){e._node.setXY([u(s,n(r[0]),n(i[0])-n(r[0]),o),u(s,n(r[1]),n(i[1])-n(r[1]),o)])},get:function(e){return e._node.getXY()}}},"3.15.0",{requires:["anim-base","node-screen"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("anim-curve",function(e,t){e.Anim.behaviors.curve={set:function(t,n,r,i,s,o,u){r=r.slice.call(r),i=i.slice.call(i);var a=u(s,0,100,o)/100;i.unshift(r),t._node.setXY(e.Anim.getBezier(i,a))},get:function(e){return e._node.getXY()}},e.Anim.getBezier=function(e,t){var n=e.length,r=[],i,s;for(i=0;i<n;++i)r[i]=[e[i][0],e[i][1]];for(s=1;s<n;++s)for(i=0;i<n-s;++i)r[i][0]=(1-t)*r[i][0]+t*r[parseInt(i+1,10)][0],r[i][1]=(1-t)*r[i][1]+t*r[parseInt(i+1,10)][1];return[r[0][0],r[0][1]]}},"3.15.0",{requires:["anim-xy"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("anim-easing",function(e,t){var n={easeNone:function(e,t,n,r){return n*e/r+t},easeIn:function(e,t,n,r){return n*(e/=r)*e+t},easeOut:function(e,t,n,r){return-n*(e/=r)*(e-2)+t},easeBoth:function(e,t,n,r){return(e/=r/2)<1?n/2*e*e+t:-n/2*(--e*(e-2)-1)+t},easeInStrong:function(e,t,n,r){return n*(e/=r)*e*e*e+t},easeOutStrong:function(e,t,n,r){return-n*((e=e/r-1)*e*e*e-1)+t},easeBothStrong:function(e,t,n,r){return(e/=r/2)<1?n/2*e*e*e*e+t:-n/2*((e-=2)*e*e*e-2)+t},elasticIn:function(e,t,n,r,i,s){var o;return e===0?t:(e/=r)===1?t+n:(s||(s=r*.3),!i||i<Math.abs(n)?(i=n,o=s/4):o=s/(2*Math.PI)*Math.asin(n/i),-(i*Math.pow(2,10*(e-=1))*Math.sin((e*r-o)*2*Math.PI/s))+t)},elasticOut:function(e,t,n,r,i,s){var o;return e===0?t:(e/=r)===1?t+n:(s||(s=r*.3),!i||i<Math.abs(n)?(i=n,o=s/4):o=s/(2*Math.PI)*Math.asin(n/i),i*Math.pow(2,-10*e)*Math.sin((e*r-o)*2*Math.PI/s)+n+t)},elasticBoth:function(e,t,n,r,i,s){var o;return e===0?t:(e/=r/2)===2?t+n:(s||(s=r*.3*1.5),!i||i<Math.abs(n)?(i=n,o=s/4):o=s/(2*Math.PI)*Math.asin(n/i),e<1?-0.5*i*Math.pow(2,10*(e-=1))*Math.sin((e*r-o)*2*Math.PI/s)+t:i*Math.pow(2,-10*(e-=1))*Math.sin((e*r-o)*2*Math.PI/s)*.5+n+t)},backIn:function(e,t,n,r,i){return i===undefined&&(i=1.70158),e===r&&(e-=.001),n*(e/=r)*e*((i+1)*e-i)+t},backOut:function(e,t,n,r,i){return typeof i=="undefined"&&(i=1.70158),n*((e=e/r-1)*e*((i+1)*e+i)+1)+t},backBoth:function(e,t,n,r,i){return typeof i=="undefined"&&(i=1.70158),(e/=r/2)<1?n/2*e*e*(((i*=1.525)+1)*e-i)+t:n/2*((e-=2)*e*(((i*=1.525)+1)*e+i)+2)+t},bounceIn:function(t,n,r,i){return r-e.Easing.bounceOut(i-t,0,r,i)+n},bounceOut:function(e,t,n,r){return(e/=r)<1/2.75?n*7.5625*e*e+t:e<2/2.75?n*(7.5625*(e-=1.5/2.75)*e+.75)+t:e<2.5/2.75?n*(7.5625*(e-=2.25/2.75)*e+.9375)+t:n*(7.5625*(e-=2.625/2.75)*e+.984375)+t},bounceBoth:function(t,n,r,i){return t<i/2?e.Easing.bounceIn(t*2,0,r,i)*.5+n:e.Easing.bounceOut(t*2-i,0,r,i)*.5+r*.5+n}};e.Easing=n},"3.15.0",{requires:["anim-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("anim-node-plugin",function(e,t){var n=function(t){t=t?e.merge(t):{},t.node=t.host,n.superclass.constructor.apply(this,arguments)};n.NAME="nodefx",n.NS="fx",e.extend(n,e.Anim),e.namespace("Plugin"),e.Plugin.NodeFX=n},"3.15.0",{requires:["node-pluginhost","anim-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("anim-scroll",function(e,t){var n=Number;e.Anim.behaviors.scroll={set:function(e,t,r,i,s,o,u){var a=e._node,f=[u(s,n(r[0]),n(i[0])-n(r[0]),o),u(s,n(r[1]),n(i[1])-n(r[1]),o)];f[0]&&a.set("scrollLeft",f[0]),f[1]&&a.set("scrollTop",f[1])},get:function(e){var t=e._node;return[t.get("scrollLeft"),t.get("scrollTop")]}}},"3.15.0",{requires:["anim-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("cookie",function(e,t){function h(e){throw new TypeError(e)}function p(e){(!s(e)||e==="")&&h("Cookie name must be a non-empty string.")}function d(e){(!s(e)||e==="")&&h("Subcookie name must be a non-empty string.")}var n=e.Lang,r=e.Object,i=null,s=n.isString,o=n.isObject,u=n.isUndefined,a=n.isFunction,f=encodeURIComponent,l=decodeURIComponent,c=e.config.doc;e.Cookie={_createCookieString:function(e,t,n,r){r=r||{};var i=f(e)+"="+(n?f(t):t),u=r.expires,a=r.path,l=r.domain;return o(r)&&(u instanceof Date&&(i+="; expires="+u.toUTCString()),s(a)&&a!==""&&(i+="; path="+a),s(l)&&l!==""&&(i+="; domain="+l),r.secure===!0&&(i+="; secure")),i},_createCookieHashString:function(e){o(e)||h("Cookie._createCookieHashString(): Argument must be an object.");var t=[];return r.each(e,function(e,n){!a(e)&&!u(e)&&t.push(f(n)+"="+f(String(e)))}),t.join("&")},_parseCookieHash:function(e){var t=e.split("&"),n=i,r={};if(e.length)for(var s=0,o=t.length;s<o;s++)n=t[s].split("="),r[l(n[0])]=l(n[1]);return r},_parseCookieString:function(e,t,n){var r={};if(s(e)&&e.length>0){var o=t===!1?function(e){return e}:l,a=e.split(/;\s/g),f=i,c=i,h=i;for(var p=0,d=a.length;p<d;p++){h=a[p].match(/([^=]+)=/i);if(h instanceof Array)try{f=l(h[1]),c=o(a[p].substring(h[1].length+1))}catch(v){}else f=l(a[p]),c="";!u(n)&&n.reverseCookieLoading?u(r[f])&&(r[f]=c):r[f]=c}}return r},_setDoc:function(e){c=e},exists:function(e){p(e);var t=this._parseCookieString(c.cookie,!0);return t.hasOwnProperty(e)},get:function(e,t){p(e);var n,r,s;return a(t)?(s=t,t={}):o(t)?s=t.converter:t={},n=this._parseCookieString(c.cookie,!t.raw,t),r=n[e],u(r)?i:a(s)?s(r):r},getSub:function(e,t,n,r){var s=this.getSubs(e,r);return s!==i?(d(t),u(s[t])?i:a(n)?n(s[t]):s[t]):i},getSubs:function(e,t){p(e);var n=this._parseCookieString(c.cookie,!1,t);return s(n[e])?this._parseCookieHash(n[e]):i},remove:function(t,n){return p(t),n=e.merge(n||{},{expires:new Date(0)}),this.set(t,"",n)},removeSub:function(e,t,n){p(e),d(t),n=n||{};var r=this.getSubs(e);if(o(r)&&r.hasOwnProperty(t)){delete r[t];if(!n.removeIfEmpty)return this.setSubs(e,r,n);for(var i in r)if(r.hasOwnProperty(i)&&!a(r[i])&&!u(r[i]))return this.setSubs(e,r,n);return this.remove(e,n)}return""},set:function(e,t,n){p(e),u(t)&&h("Cookie.set(): Value cannot be undefined."),n=n||{};var r=this._createCookieString(e,t,!n.raw,n);return c.cookie=r,r},setSub:function(e,t,n,r){p(e),d(t),u(n)&&h("Cookie.setSub(): Subcookie value cannot be undefined.");var i=this.getSubs(e);return o(i)||(i={}),i[t]=n,this.setSubs(e,i,r)},setSubs:function(e,t,n){p(e),o(t)||h("Cookie.setSubs(): Cookie value must be an object.");var r=this._createCookieString(e,this._createCookieHashString(t),!1,n);return c.cookie=r,r}}},"3.15.0",{requires:["yui-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("event-resize",function(e,t){e.Event.define("windowresize",{on:e.UA.gecko&&e.UA.gecko<1.91?function(t,n,r){n._handle=e.Event.attach("resize",function(e){r.fire(e)})}:function(t,n,r){var i=e.config.windowResizeDelay||100;n._handle=e.Event.attach("resize",function(t){n._timer&&n._timer.cancel(),n._timer=e.later(i,e,function(){r.fire(t)})})},detach:function(e,t){t._timer&&t._timer.cancel(),t._handle.detach()}})},"3.15.0",{requires:["node-base","event-synthetic"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("attribute-complex",function(e,t){var n=e.Attribute;n.Complex=function(){},n.Complex.prototype={_normAttrVals:n.prototype._normAttrVals,_getAttrInitVal:n.prototype._getAttrInitVal},e.AttributeComplex=n.Complex},"3.15.0",{requires:["attribute-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("event-focus",function(e,t){function u(t,r,u){var a="_"+t+"Notifiers";e.Event.define(t,{_useActivate:o,_attach:function(i,s,o){return e.DOM.isWindow(i)?n._attach([t,function(e){s.fire(e)},i]):n._attach([r,this._proxy,i,this,s,o],{capture:!0})},_proxy:function(t,r,i){var s=t.target,f=t.currentTarget,l=s.getData(a),c=e.stamp(f._node),h=o||s!==f,p;r.currentTarget=i?s:f,r.container=i?f:null,l?h=!0:(l={},s.setData(a,l),h&&(p=n._attach([u,this._notify,s._node]).sub,p.once=!0)),l[c]||(l[c]=[]),l[c].push(r),h||this._notify(t)},_notify:function(t,n){var r=t.currentTarget,i=r.getData(a),o=r.ancestors(),u=r.get("ownerDocument"),f=[],l=i?e.Object.keys(i).length:0,c,h,p,d,v,m,g,y,b,w;r.clearData(a),o.push(r),u&&o.unshift(u),o._nodes.reverse(),l&&(m=l,o.some(function(t){var n=e.stamp(t),r=i[n],s,o;if(r){l--;for(s=0,o=r.length;s<o;++s)r[s].handle.sub.filter&&f.push(r[s])}return!l}),l=m);while(l&&(c=o.shift())){d=e.stamp(c),h=i[d];if(h){for(g=0,y=h.length;g<y;++g){p=h[g],b=p.handle.sub,v=!0,t.currentTarget=c,b.filter&&(v=b.filter.apply(c,[c,t].concat(b.args||[])),f.splice(s(f,p),1)),v&&(t.container=p.container,w=p.fire(t));if(w===!1||t.stopped===2)break}delete h[d],l--}if(t.stopped!==2)for(g=0,y=f.length;g<y;++g){p=f[g],b=p.handle.sub,b.filter.apply(c,[c,t].concat(b.args||[]))&&(t.container=p.container,t.currentTarget=c,w=p.fire(t));if(w===!1||t.stopped===2||t.stopped&&f[g+1]&&f[g+1].container!==p.container)break}if(t.stopped)break}},on:function(e,t,n){t.handle=this._attach(e._node,n)},detach:function(e,t){t.handle.detach()},delegate:function(t,n,r,s){i(s)&&(n.filter=function(n){return e.Selector.test(n._node,s,t===n?null:t._node)}),n.handle=this._attach(t._node,r,!0)},detachDelegate:function(e,t){t.handle.detach()}},!0)}var n=e.Event,r=e.Lang,i=r.isString,s=e.Array.indexOf,o=function(){var t=!1,n=e.config.doc,r;return n&&(r=n.createElement("p"),r.setAttribute("onbeforeactivate",";"),t=r.onbeforeactivate!==undefined),t}();o?(u("focus","beforeactivate","focusin"),u("blur","beforedeactivate","focusout")):(u("focus","focus","focus"),u("blur","blur","blur"))},"3.15.0",{requires:["event-synthetic"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("oop",function(e,t){function a(t,n,i,s,o){if(t&&t[o]&&t!==e)return t[o].call(t,n,i);switch(r.test(t)){case 1:return r[o](t,n,i);case 2:return r[o](e.Array(t,0,!0),n,i);default:return e.Object[o](t,n,i,s)}}var n=e.Lang,r=e.Array,i=Object.prototype,s="_~yuim~_",o=i.hasOwnProperty,u=i.toString;e.augment=function(t,n,r,i,s){var a=t.prototype,f=a&&n,l=n.prototype,c=a||t,h,p,d,v,m;return s=s?e.Array(s):[],f&&(p={},d={},v={},h=function(e,t){if(r||!(t in a))u.call(e)==="[object Function]"?(v[t]=e,p[t]=d[t]=function(){return m(this,e,arguments)}):p[t]=e},m=function(e,t,r){for(var i in v)o.call(v,i)&&e[i]===d[i]&&(e[i]=v[i]);return n.apply(e,s),t.apply(e,r)},i?e.Array.each(i,function(e){e in l&&h(l[e],e)}):e.Object.each(l,h,null,!0)),e.mix(c,p||l,r,i),f||n.apply(c,s),t},e.aggregate=function(t,n,r,i){return e.mix(t,n,r,i,0,!0)},e.extend=function(t,n,r,s){(!n||!t)&&e.error("extend failed, verify dependencies");var o=n.prototype,u=e.Object(o);return t.prototype=u,u.constructor=t,t.superclass=o,n!=Object&&o.constructor==i.constructor&&(o.constructor=n),r&&e.mix(u,r,!0),s&&e.mix(t,s,!0),t},e.each=function(e,t,n,r){return a(e,t,n,r,"each")},e.some=function(e,t,n,r){return a(e,t,n,r,"some")},e.clone=function(t,r,i,o,u,a){var f,l,c;if(!n.isObject(t)||e.instanceOf(t,YUI)||t.addEventListener||t.attachEvent)return t;l=a||{};switch(n.type(t)){case"date":return new Date(t);case"regexp":return t;case"function":return t;case"array":f=[];break;default:if(t[s])return l[t[s]];c=e.guid(),f=r?{}:e.Object(t),t[s]=c,l[c]=t}return e.each(t,function(n,a){(a||a===0)&&(!i||i.call(o||this,n,a,this,t)!==!1)&&a!==s&&a!="prototype"&&(this[a]=e.clone(n,r,i,o,u||t,l))},f),a||(e.Object.each(l,function(e,t){if(e[s])try{delete e[s]}catch(n){e[s]=null}},this),l=null),f},e.bind=function(t,r){var i=arguments.length>2?e.Array(arguments,2,!0):null;return function(){var s=n.isString(t)?r[t]:t,o=i?i.concat(e.Array(arguments,0,!0)):arguments;return s.apply(r||s,o)}},e.rbind=function(t,r){var i=arguments.length>2?e.Array(arguments,2,!0):null;return function(){var s=n.isString(t)?r[t]:t,o=i?e.Array(arguments,0,!0).concat(i):arguments;return s.apply(r||s,o)}}},"3.15.0",{requires:["yui-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("attribute-core",function(e,t){function b(e,t,n){this._yuievt=null,this._initAttrHost(e,t,n)}e.State=function(){this.data={}},e.State.prototype={add:function(e,t,n){var r=this.data[e];r||(r=this.data[e]={}),r[t]=n},addAll:function(e,t){var n=this.data[e],r;n||(n=this.data[e]={});for(r in t)t.hasOwnProperty(r)&&(n[r]=t[r])},remove:function(e,t){var n=this.data[e];n&&delete n[t]},removeAll:function(t,n){var r;n?e.each(n,function(e,n){this.remove(t,typeof n=="string"?n:e)},this):(r=this.data,t in r&&delete r[t])},get:function(e,t){var n=this.data[e];if(n)return n[t]},getAll:function(e,t){var n=this.data[e],r,i;if(t)i=n;else if(n){i={};for(r in n)n.hasOwnProperty(r)&&(i[r]=n[r])}return i}};var n=e.Object,r=e.Lang,i=".",s="getter",o="setter",u="readOnly",a="writeOnce",f="initOnly",l="validator",c="value",h="valueFn",p="lazyAdd",d="added",v="_bypassProxy",m="initValue",g="lazy",y;b.INVALID_VALUE={},y=b.INVALID_VALUE,b._ATTR_CFG=[o,s,l,c,h,a,u,p,v],b.protectAttrs=function(t){if(t){t=e.merge(t);for(var n in t)t.hasOwnProperty(n)&&(t[n]=e.merge(t[n]))}return t},b.prototype={_initAttrHost:function(t,n,r){this._state=new e.State,this._initAttrs(t,n,r)},addAttr:function(e,t,n){var r=this,i=r._state,s=i.data,o,u,a;t=t||{},p in t&&(n=t[p]),u=i.get(e,d);if(n&&!u)i.data[e]={lazy:t,added:!0};else if(!u||t.isLazyAdd)a=c in t,a&&(o=t.value,t.value=undefined),t.added=!0,t.initializing=!0,s[e]=t,a&&r.set(e,o),t.initializing=!1;return r},attrAdded:function(e){return!!this._state.get(e,d)},get:function(e){return this._getAttr(e)},_isLazyAttr:function(e){return this._state.get(e,g)},_addLazyAttr:function(e,t){var n=this._state;t=t||n.get(e,g),t&&(n.data[e].lazy=undefined,t.isLazyAdd=!0,this.addAttr(e,t))},set:function(e,t,n){return this._setAttr(e,t,n)},_set:function(e,t,n){return this._setAttr(e,t,n,!0)},_setAttr:function(t,r,s,o){var u=!0,a=this._state,l=this._stateProxy,c=this._tCfgs,h,p,d,v,m,g,y;return t.indexOf(i)!==-1&&(d=t,v=t.split(i),t=v.shift()),c&&c[t]&&this._addOutOfOrder(t,c[t]),h=a.data[t]||{},h.lazy&&(h=h.lazy,this._addLazyAttr(t,h)),p=h.value===undefined,l&&t in l&&!h._bypassProxy&&(p=!1),g=h.writeOnce,y=h.initializing,!p&&!o&&(g&&(u=!1),h.readOnly&&(u=!1)),!y&&!o&&g===f&&(u=!1),u&&(p||(m=this.get(t)),v&&(r=n.setValue(e.clone(m),v,r),r===undefined&&(u=!1)),u&&(!this._fireAttrChange||y?this._setAttrVal(t,d,m,r,s,h):this._fireAttrChange(t,d,m,r,s,h))),this},_addOutOfOrder:function(e,t){var n={};n[e]=t,delete this._tCfgs[e],this._addAttrs(n,this._tVals)},_getAttr:function(e){var t=e,r=this._tCfgs,s,o,u,a;return e.indexOf(i)!==-1&&(s=e.split(i),e=s.shift()),r&&r[e]&&this._addOutOfOrder(e,r[e]),a=this._state.data[e]||{},a.lazy&&(a=a.lazy,this._addLazyAttr(e,a)),u=this._getStateVal(e,a),o=a.getter,o&&!o.call&&(o=this[o]),u=o?o.call(this,u,t):u,u=s?n.getValue(u,s):u,u},_getStateVal:function(e,t){var n=this._stateProxy;return t||(t=this._state.getAll(e)||{}),n&&e in n&&!t._bypassProxy?n[e]:t.value},_setStateVal:function(e,t){var n=this._stateProxy;n&&e in n&&!this._state.get(e,v)?n[e]=t:this._state.add(e,c,t)},_setAttrVal:function(e,t,n,i,s,o){var u=this,a=!0,f=o||this._state.data[e]||{},l=f.validator,c=f.setter,h=f.initializing,p=this._getStateVal(e,f),d=t||e,v,g;return l&&(l.call||(l=this[l]),l&&(g=l.call(u,i,d,s),!g&&h&&(i=f.defaultValue,g=!0))),!l||g?(c&&(c.call||(c=this[c]),c&&(v=c.call(u,i,d,s),v===y?h?i=f.defaultValue:a=!1:v!==undefined&&(i=v))),a&&(!t&&i===p&&!r.isObject(i)?a=!1:(m in f||(f.initValue=i),u._setStateVal(e,i)))):a=!1,a},setAttrs:function(e,t){return this._setAttrs(e,t)},_setAttrs:function(e,t){var n;for(n in e)e.hasOwnProperty(n)&&this.set(n,e[n],t);return this},getAttrs:function(e){return this._getAttrs(e)},_getAttrs:function(e){var t={},r,i,s,o=e===!0;if(!e||o)e=n.keys(this._state.data);for(i=0,s=e.length;i<s;i++){r=e[i];if(!o||this._getStateVal(r)!=this._state.get(r,m))t[r]=this.get(r)}return t},addAttrs:function(e,t,n){return e&&(this._tCfgs=e,this._tVals=t?this._normAttrVals(t):null,this._addAttrs(e,this._tVals,n),this._tCfgs=this._tVals=null),this},_addAttrs:function(e,t,n){var r=this._tCfgs,i=this._tVals,s,o,u;for(s in e)e.hasOwnProperty(s)&&(o=e[s],o.defaultValue=o.value,u=this._getAttrInitVal(s,o,i),u!==undefined&&(o.value=u),r[s]&&(r[s]=undefined),this.addAttr(s,o,n))},_protectAttrs:b.protectAttrs,_normAttrVals:function(e){var t,n,r,s,o,u;if(!e)return null;t={};for(u in e)e.hasOwnProperty(u)&&(u.indexOf(i)!==-1?(r=u.split(i),s=r.shift(),n=n||{},o=n[s]=n[s]||[],o[o.length]={path:r,value:e[u]}):t[u]=e[u]);return{simple:t,complex:n}},_getAttrInitVal:function(e,t,r){var i=t.value,s=t.valueFn,o,u=!1,a=t.readOnly,f,l,c,h,p,d,v;!a&&r&&(f=r.simple,f&&f.hasOwnProperty(e)&&(i=f[e],u=!0)),s&&!u&&(s.call||(s=this[s]),s&&(o=s.call(this,e),i=o));if(!a&&r){l=r.complex;if(l&&l.hasOwnProperty(e)&&i!==undefined&&i!==null){v=l[e];for(c=0,h=v.length;c<h;++c)p=v[c].path,d=v[c].value,n.setValue(i,p,d)}}return i},_initAttrs:function(t,n,r){t=t||this.constructor.ATTRS;var i=e.Base,s=e.BaseCore,o=i&&e.instanceOf(this,i),u=!o&&s&&e.instanceOf(this,s);t&&!o&&!u&&this.addAttrs(e.AttributeCore.protectAttrs(t),n,r)}},e.AttributeCore=b},"3.15.0",{requires:["oop"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("attribute-observable",function(e,t){function s(){this._ATTR_E_FACADE={},n.call(this,{emitFacade:!0})}var n=e.EventTarget,r="Change",i="broadcast";s._ATTR_CFG=[i],s.prototype={set:function(e,t,n){return this._setAttr(e,t,n)},_set:function(e,t,n){return this._setAttr(e,t,n,!0)},setAttrs:function(e,t){return this._setAttrs(e,t)},_setAttrs:function(e,t){var n;for(n in e)e.hasOwnProperty(n)&&this.set(n,e[n],t);return this},_fireAttrChange:function(t,n,i,s,o,u){var a=this,f=this._getFullType(t+r),l=a._state,c,h,p;u||(u=l.data[t]||{}),u.published||(p=a._publish(f),p.emitFacade=!0,p.defaultTargetOnly=!0,p.defaultFn=a._defAttrChangeFn,h=u.broadcast,h!==undefined&&(p.broadcast=h),u.published=!0),o?(c=e.merge(o),c._attrOpts=o):c=a._ATTR_E_FACADE,c.attrName=t,c.subAttrName=n,c.prevVal=i,c.newVal=s,a._hasPotentialSubscribers(f)?a.fire(f,c):this._setAttrVal(t,n,i,s,o,u)},_defAttrChangeFn:function(e,t){var n=e._attrOpts;n&&delete e._attrOpts,this._setAttrVal(e.attrName,e.subAttrName,e.prevVal,e.newVal,n)?t||(e.newVal=this.get(e.attrName)):t||e.stopImmediatePropagation()}},e.mix(s,n,!1,null,1),e.AttributeObservable=s,e.AttributeEvents=s},"3.15.0",{requires:["event-custom"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("attribute-extras",function(e,t){function o(){}var n="broadcast",r="published",i="initValue",s={readOnly:1,writeOnce:1,getter:1,broadcast:1};o.prototype={modifyAttr:function(e,t){var i=this,o,u;if(i.attrAdded(e)){i._isLazyAttr(e)&&i._addLazyAttr(e),u=i._state;for(o in t)s[o]&&t.hasOwnProperty(o)&&(u.add(e,o,t[o]),o===n&&u.remove(e,r))}},removeAttr:function(e){this._state.removeAll(e)},reset:function(t){var n=this;return t?(n._isLazyAttr(t)&&n._addLazyAttr(t),n.set(t,n._state.get(t,i))):e.Object.each(n._state.data,function(e,t){n.reset(t)}),n},_getAttrCfg:function(t){var n,r=this._state;return t?n=r.getAll(t)||{}:(n={},e.each(r.data,function(e,t){n[t]=r.getAll(t)})),n}},e.AttributeExtras=o},"3.15.0",{requires:["oop"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("attribute-base",function(e,t){function n(){e.AttributeCore.apply(this,arguments),e.AttributeObservable.apply(this,arguments),e.AttributeExtras.apply(this,arguments)}e.mix(n,e.AttributeCore,!1,null,1),e.mix(n,e.AttributeExtras,!1,null,1),e.mix(n,e.AttributeObservable,!0,null,1),n.INVALID_VALUE=e.AttributeCore.INVALID_VALUE,n._ATTR_CFG=e.AttributeCore._ATTR_CFG.concat(e.AttributeObservable._ATTR_CFG),n.protectAttrs=e.AttributeCore.protectAttrs,e.Attribute=n},"3.15.0",{requires:["attribute-core","attribute-observable","attribute-extras"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("base-core",function(e,t){function v(e){this._BaseInvoked||(this._BaseInvoked=!0,this._initBase(e))}var n=e.Object,r=e.Lang,i=".",s="initialized",o="destroyed",u="initializer",a="value",f=Object.prototype.constructor,l="deep",c="shallow",h="destructor",p=e.AttributeCore,d=function(e,t,n){var r;for(r in t)n[r]&&(e[r]=t[r]);return e};v._ATTR_CFG=p._ATTR_CFG.concat("cloneDefaultValue"),v._NON_ATTRS_CFG=["plugins"],v.NAME="baseCore",v.ATTRS={initialized:{readOnly:!0,value:!1},destroyed:{readOnly:!0,value:!1}},v.modifyAttrs=function(t,n){typeof t!="function"&&(n=t,t=this);var r,i,s;r=t.ATTRS||(t.ATTRS={});if(n){t._CACHED_CLASS_DATA=null;for(s in n)n.hasOwnProperty(s)&&(i=r[s]||(r[s]={}),e.mix(i,n[s],!0))}},v.prototype={_initBase:function(t){e.stamp(this),this._initAttribute(t);var n=e.Plugin&&e.Plugin.Host;this._initPlugins&&n&&n.call(this),this._lazyAddAttrs!==!1&&(this._lazyAddAttrs=!0),this.name=this.constructor.NAME,this.init.apply(this,arguments)},_initAttribute:function(){p.call(this)},init:function(e){return this._baseInit(e),this},_baseInit:function(e){this._initHierarchy(e),this._initPlugins&&this._initPlugins(e),this._set(s,!0)},destroy:function(){return this._baseDestroy(),this},_baseDestroy:function(){this._destroyPlugins&&this._destroyPlugins(),this._destroyHierarchy(),this._set(o,!0)},_getClasses:function(){return this._classes||this._initHierarchyData(),this._classes},_getAttrCfgs:function(){return this._attrs||this._initHierarchyData(),this._attrs},_getInstanceAttrCfgs:function(e){var t={},r,i,s,o,u,a,f,l=e._subAttrs,c=this._attrCfgHash();for(a in e)if(e.hasOwnProperty(a)&&a!=="_subAttrs"){f=e[a],r=t[a]=d({},f,c),i=r.value,i&&typeof i=="object"&&this._cloneDefaultValue(a,r);if(l&&l.hasOwnProperty(a)){o=e._subAttrs[a];for(u in o)s=o[u],s.path&&n.setValue(r.value,s.path,s.value)}}return t},_filterAdHocAttrs:function(e,t){var n,r=this._nonAttrs,i;if(t){n={};for(i in t)!e[i]&&!r[i]&&t.hasOwnProperty(i)&&(n[i]={value:t[i]})}return n},_initHierarchyData:function(){var e=this.constructor,t=e._CACHED_CLASS_DATA,n,r,i,s,o,u=!e._ATTR_CFG_HASH,a,f={},l=[],c=[];n=e;if(!t){while(n){l[l.length]=n,n.ATTRS&&(c[c.length]=n.ATTRS);if(u){s=n._ATTR_CFG,o=o||{};if(s)for(r=0,i=s.length;r<i;r+=1)o[s[r]]=!0}a=n._NON_ATTRS_CFG;if(a)for(r=0,i=a.length;r<i;r++)f[a[r]]=!0;n=n.superclass?n.superclass.constructor:null}u&&(e._ATTR_CFG_HASH=o),t=e._CACHED_CLASS_DATA={classes:l,nonAttrs:f,attrs:this._aggregateAttrs(c)}}this._classes=t.classes,this._attrs=t.attrs,this._nonAttrs=t.nonAttrs},_attrCfgHash:function(){return this.constructor._ATTR_CFG_HASH},_cloneDefaultValue:function(t,n){var i=n.value,s=n.cloneDefaultValue;s===l||s===!0?n.value=e.clone(i):s===c?n.value=e.merge(i):s===undefined&&(f===i.constructor||r.isArray(i))&&(n.value=e.clone(i))},_aggregateAttrs:function(e){var t,n,r,s,o,u,f=this._attrCfgHash(),l,c={};if(e)for(u=e.length-1;u>=0;--u){n=e[u];for(t in n)n.hasOwnProperty(t)&&(s=d({},n[t],f),o=null,t.indexOf(i)!==-1&&(o=t.split(i),t=o.shift()),l=c[t],o&&l&&l.value?(r=c._subAttrs,r||(r=c._subAttrs={}),r[t]||(r[t]={}),r[t][o.join(i)]={value:s.value,path:o}):o||(l?(l.valueFn&&a in s&&(l.valueFn=null),d(l,s,f)):c[t]=s))}return c},_initHierarchy:function(e){var t=this._lazyAddAttrs,n,r,i,s,o,a,f,l,c,h,p,d=[],v=this._getClasses(),m=this._getAttrCfgs(),g=v.length-1;for(o=g;o>=0;o--){n=v[o],r=n.prototype,h=n._yuibuild&&n._yuibuild.exts,r.hasOwnProperty(u)&&(d[d.length]=r.initializer);if(h)for(a=0,f=h.length;a<f;a++)l=h[a],l.apply(this,arguments),c=l.prototype,c.hasOwnProperty(u)&&(d[d.length]=c.initializer)}p=this._getInstanceAttrCfgs(m),this._preAddAttrs&&this._preAddAttrs(p,e,t),this._allowAdHocAttrs&&this.addAttrs(this._filterAdHocAttrs(m,e),e,t),this.addAttrs(p,e,t);for(i=0,s=d.length;i<s;i++)d[i].apply(this,arguments)},_destroyHierarchy:function(){var e,t,n,r,i,s,o,u,a=this._getClasses();for(n=0,r=a.length;n<r;n++){e=a[n],t=e.prototype,o=e._yuibuild&&e._yuibuild.exts;if(o)for(i=0,s=o.length;i<s;i++)u=o[i].prototype,u.hasOwnProperty(h)&&u.destructor.apply(this,arguments);t.hasOwnProperty(h)&&t.destructor.apply(this,arguments)}},toString:function(){return this.name+"["+e.stamp(this,!0)+"]"}},e.mix(v,p,!1,null,1),v.prototype.constructor=v,e.BaseCore=v},"3.15.0",{requires:["attribute-core"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("base-observable",function(e,t){function f(){}var n=e.Lang,r="destroy",i="init",s="bubbleTargets",o="_bubbleTargets",u=e.AttributeObservable,a=e.BaseCore;f._ATTR_CFG=u._ATTR_CFG.concat(),f._NON_ATTRS_CFG=["on","after","bubbleTargets"],f.prototype={_initAttribute:function(){a.prototype._initAttribute.apply(this,arguments),u.call(this),this._eventPrefix=this.constructor.EVENT_PREFIX||this.constructor.NAME,this._yuievt.config.prefix=this._eventPrefix},init:function(e){var t=this._getFullType(i),n=this._publish(t);return n.emitFacade=!0,n.fireOnce=!0,n.defaultTargetOnly=!0,n.defaultFn=this._defInitFn,this._preInitEventCfg(e),n._hasPotentialSubscribers()?this.fire(t,{cfg:e}):(this._baseInit(e),n.fired=!0,n.firedWith=[{cfg:e}]),this},_preInitEventCfg:function(e){e&&(e.on&&this.on(e.on),e.after&&this.after(e.after));var t,r,i,u=e&&s in e;if(u||o in this){i=u?e&&e.bubbleTargets:this._bubbleTargets;if(n.isArray(i))for(t=0,r=i.length;t<r;t++)this.addTarget(i[t]);else i&&this.addTarget(i)}},destroy:function(){return this.publish(r,{fireOnce:!0,defaultTargetOnly:!0,defaultFn:this._defDestroyFn}),this.fire(r),this.detachAll(),this},_defInitFn:function(e){this._baseInit(e.cfg)},_defDestroyFn:function(e){this._baseDestroy(e.cfg)}},e.mix(f,u,!1,null,1),e.BaseObservable=f},"3.15.0",{requires:["attribute-observable","base-core"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("base-base",function(e,t){function o(){i.apply(this,arguments),s.apply(this,arguments),r.apply(this,arguments)}var n=e.AttributeCore,r=e.AttributeExtras,i=e.BaseCore,s=e.BaseObservable;o._ATTR_CFG=i._ATTR_CFG.concat(s._ATTR_CFG),o._NON_ATTRS_CFG=i._NON_ATTRS_CFG.concat(s._NON_ATTRS_CFG),o.NAME="base",o.ATTRS=n.protectAttrs(i.ATTRS),o.modifyAttrs=i.modifyAttrs,e.mix(o,i,!1,null,1),e.mix(o,r,!1,null,1),e.mix(o,s,!0,null,1),o.prototype.constructor=o,e.Base=o},"3.15.0",{requires:["attribute-base","base-core","base-observable"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("base-pluginhost",function(e,t){var n=e.Base,r=e.Plugin.Host;e.mix(n,r,!1,null,1),n.plug=r.plug,n.unplug=r.unplug},"3.15.0",{requires:["base-base","pluginhost"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("base-build",function(e,t){function f(e,t,n){n[e]&&(t[e]=(t[e]||[]).concat(n[e]))}function l(e,t,n){n._ATTR_CFG&&(t._ATTR_CFG_HASH=null,f.apply(null,arguments))}function c(e,t,r){n.modifyAttrs(t,r.ATTRS)}var n=e.BaseCore,r=e.Base,i=e.Lang,s="initializer",o="destructor",u=["_PLUG","_UNPLUG"],a;r._build=function(t,n,i,u,a,f){var l=r._build,c=l._ctor(n,f),h=l._cfg(n,f,i),p=l._mixCust,d=c._yuibuild.dynamic,v,m,g,y,b,w;for(v=0,m=i.length;v<m;v++)g=i[v],y=g.prototype,b=y[s],w=y[o],delete y[s],delete y[o],e.mix(c,g,!0,null,1),p(c,g,h),b&&(y[s]=b),w&&(y[o]=w),c._yuibuild.exts.push(g);return u&&e.mix(c.prototype,u,!0),a&&(e.mix(c,l._clean(a,h),!0),p(c,a,h)),c.prototype.hasImpl=l._impl,d&&(c.NAME=t,c.prototype.constructor=c,c.modifyAttrs=n.modifyAttrs),c},a=r._build,e.mix(a,{_mixCust:function(t,n,r){var s,o,u,a,f,l;r&&(s=r.aggregates,o=r.custom,u=r.statics),u&&e.mix(t,n,!0,u);if(s)for(l=0,f=s.length;l<f;l++)a=s[l],!t.hasOwnProperty(a)&&n.hasOwnProperty(a)&&(t[a]=i.isArray(n[a])?[]:{}),e.aggregate(t,n,!0,[a]);if(o)for(l in o)o.hasOwnProperty(l)&&o[l](l,t,n)},_tmpl:function(t){function n(){n.superclass.constructor.apply(this,arguments)}return e.extend(n,t),n},_impl:function(e){var t=this._getClasses(),n,r,i,s,o,u;for(n=0,r=t.length;n<r;n++){i=t[n];if(i._yuibuild){s=i._yuibuild.exts,o=s.length;for(u=0;u<o;u++)if(s[u]===e)return!0}}return!1},_ctor:function(e,t){var n=t&&!1===t.dynamic?!1:!0,r=n?a._tmpl(e):e,i=r._yuibuild;return i||(i=r._yuibuild={}),i.id=i.id||null,i.exts=i.exts||[],i.dynamic=n,r},_cfg:function(t,n,r){var i=[],s={},o=[],u,a=n&&n.aggregates,f=n&&n.custom,l=n&&n.statics,c=t,h,p;while(c&&c.prototype)u=c._buildCfg,u&&(u.aggregates&&(i=i.concat(u.aggregates)),u.custom&&e.mix(s,u.custom,!0),u.statics&&(o=o.concat(u.statics))),c=c.superclass?c.superclass.constructor:null;if(r)for(h=0,p=r.length;h<p;h++)c=r[h],u=c._buildCfg,u&&(u.aggregates&&(i=i.concat(u.aggregates)),u.custom&&e.mix(s,u.custom,!0),u.statics&&(o=o.concat(u.statics)));return a&&(i=i.concat(a)),f&&e.mix(s,n.cfgBuild,!0),l&&(o=o.concat(l)),{aggregates:i,custom:s,statics:o}},_clean:function(t,n){var r,i,s,o=e.merge(t),u=n.aggregates,a=n.custom;for(r in a)o.hasOwnProperty(r)&&delete o[r];for(i=0,s=u.length;i<s;i++)r=u[i],o.hasOwnProperty(r)&&delete o[r];return o}}),r.build=function(e,t,n,r){return a(e,t,n,null,null,r)},r.create=function(e,t,n,r,i){return a(e,t,n,r,i)},r.mix=function(e,t){return e._CACHED_CLASS_DATA&&(e._CACHED_CLASS_DATA=null),a(null,e,t,null,null,{dynamic:!1})},n._buildCfg={aggregates:u.concat(),custom:{ATTRS:c,_ATTR_CFG:l,_NON_ATTRS_CFG:f}},r._buildCfg={aggregates:u.concat(),custom:{ATTRS:c,_ATTR_CFG:l,_NON_ATTRS_CFG:f}}},"3.15.0",{requires:["base-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("yui-throttle",function(e,t){
-/*! Based on work by Simon Willison: http://gist.github.com/292562 */
-;e.throttle=function(t,n){n=n?n:e.config.throttleTime||150;if(n===-1)return function(){t.apply(this,arguments)};var r=e.Lang.now();return function(){var i=e.Lang.now();i-r>n&&(r=i,t.apply(this,arguments))}}},"3.15.0",{requires:["yui-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("classnamemanager",function(e,t){var n="classNamePrefix",r="classNameDelimiter",i=e.config;i[n]=i[n]||"yui3",i[r]=i[r]||"-",e.ClassNameManager=function(){var t=i[n],s=i[r];return{getClassName:e.cached(function(){var n=e.Array(arguments);return n[n.length-1]!==!0?n.unshift(t):n.pop(),n.join(s)})}}()},"3.15.0",{requires:["yui-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("dd-ddm-base",function(e,t){var n=function(){n.superclass.constructor.apply(this,arguments)};n.NAME="ddm",n.ATTRS={dragCursor:{value:"move"},clickPixelThresh:{value:3},clickTimeThresh:{value:1e3},throttleTime:{value:-1},dragMode:{value:"point",setter:function(e){return this._setDragMode(e),e}}},e.extend(n,e.Base,{_createPG:function(){},_active:null,_setDragMode:function(t){t===null&&(t=e.DD.DDM.get("dragMode"));switch(t){case 1:case"intersect":return 1;case 2:case"strict":return 2;case 0:case"point":return 0}return 0},CSS_PREFIX:e.ClassNameManager.getClassName("dd"),_activateTargets:function(){},_drags:[],activeDrag:!1,_regDrag:function(e){return this.getDrag(e.get("node"))?!1:(this._active||this._setupListeners(),this._drags.push(e),!0)},_unregDrag:function(t){var n=[];e.Array.each(this._drags,function(e){e!==t&&(n[n.length]=e)}),this._drags=n},_setupListeners:function(){this._createPG(),this._active=!0;var t=e.one(e.config.doc);t.on("mousemove",e.throttle(e.bind(this._docMove,this),this.get("throttleTime"))),t.on("mouseup",e.bind(this._end,this))},_start:function(){this.fire("ddm:start"),this._startDrag()},_startDrag:function(){},_endDrag:function(){},_dropMove:function(){},_end:function(){this.activeDrag&&(this._shimming=!1,this._endDrag(),this.fire("ddm:end"),this.activeDrag.end.call(this.activeDrag),this.activeDrag=null)},stopDrag:function(){return this.activeDrag&&this._end(),this},_shimming:!1,_docMove:function(e){this._shimming||this._move(e)},_move:function(e){this.activeDrag&&(this.activeDrag._move.call(this.activeDrag,e),this._dropMove())},cssSizestoObject:function(e){var t=e.split(" ");switch(t.length){case 1:t[1]=t[2]=t[3]=t[0];break;case 2:t[2]=t[0],t[3]=t[1];break;case 3:t[3]=t[1]}return{top:parseInt(t[0],10),right:parseInt(t[1],10),bottom:parseInt(t[2],10),left:parseInt(t[3],10)}},getDrag:function(t){var n=!1,r=e.one(t);return r instanceof e.Node&&e.Array.each(this._drags,function(e){r.compareTo(e.get("node"))&&(n=e)}),n},swapPosition:function(t,n){t=e.DD.DDM.getNode(t),n=e.DD.DDM.getNode(n);var r=t.getXY(),i=n.getXY();return t.setXY(i),n.setXY(r),t},getNode:function(t){return t instanceof e.Node?t:(t&&t.get?e.Widget&&t instanceof e.Widget?t=t.get("boundingBox"):t=t.get("node"):t=e.one(t),t)},swapNode:function(t,n){t=e.DD.DDM.getNode(t),n=e.DD.DDM.getNode(n);var r=n.get("parentNode"),i=n.get("nextSibling");return i===t?r.insertBefore(t,n):n===t.get("nextSibling")?r.insertBefore(n,t):(t.get("parentNode").replaceChild(n,t),r.insertBefore(t,i)),t}}),e.namespace("DD"),e.DD.DDM=new n},"3.15.0",{requires:["node","base","yui-throttle","classnamemanager"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("dd-drag",function(e,t){var n=e.DD.DDM,r="node",i="dragging",s="dragNode",o="offsetHeight",u="offsetWidth",a="drag:mouseDown",f="drag:afterMouseDown",l="drag:removeHandle",c="drag:addHandle",h="drag:removeInvalid",p="drag:addInvalid",d="drag:start",v="drag:end",m="drag:drag",g="drag:align",y=function(t){this._lazyAddAttrs=!1,y.superclass.constructor.apply(this,arguments);var r=n._regDrag(this);r||e.error("Failed to register node, already in use: "+t.node)};y.NAME="drag",y.START_EVENT="mousedown",y.ATTRS={node:{setter:function(t){if(this._canDrag(t))return t;var n=e.one(t);return n||e.error("DD.Drag: Invalid Node Given: "+t),n}},dragNode:{setter:function(t){if(this._canDrag(t))return t;var n=e.one(t);return n||e.error("DD.Drag: Invalid dragNode Given: "+t),n}},offsetNode:{value:!0},startCentered:{value:!1},clickPixelThresh:{value:n.get("clickPixelThresh")},clickTimeThresh:{value:n.get("clickTimeThresh")},lock:{value:!1,setter:function(e){return e?this.get(r).addClass(n.CSS_PREFIX+"-locked"):this.get(r).removeClass(n.CSS_PREFIX+"-locked"),e}},data:{value:!1},move:{value:!0},useShim:{value:!0},activeHandle:{value:!1},primaryButtonOnly:{value:!0},dragging:{value:!1},parent:{value:!1},target:{value:!1,setter:function(e){return this._handleTarget(e),e}},dragMode:{value:null,setter:function(e){return n._setDragMode(e)}},groups:{value:["default"],getter:function(){return this._groups?e.Object.keys(this._groups):(this._groups={},[])},setter:function(t){return this._groups=e.Array.hash(t),t}},handles:{value:null,setter:function(t){return t?(this._handles={},e.Array.each(t,function(t){var n=t;if(t instanceof e.Node||t instanceof e.NodeList)n=t._yuid;this._handles[n]=t},this)):this._handles=null,t}},bubbles:{setter:function(e){return this.addTarget(e),e}},haltDown:{value:!0}},e.extend(y,e.Base,{_canDrag:function(e){return e&&e.setXY&&e.getXY&&e.test&&e.contains?!0:!1},_bubbleTargets:e.DD.DDM,addToGroup:function(e){return this._groups[e]=!0,n._activateTargets(),this},removeFromGroup:function(e){return delete this._groups[e],n._activateTargets(),this},target:null,_handleTarget:function(t){e.DD.Drop&&(t===!1?this.target&&(n._unregTarget(this.target),this.target=null):(e.Lang.isObject(t)||(t={}),t.bubbleTargets=t.bubbleTargets||this.getTargets(),t.node=this.get(r),t.groups=t.groups||this.get("groups"),this.target=new e.DD.Drop(t)))},_groups:null,_createEvents:function(){this.publish(a,{defaultFn:this._defMouseDownFn,queuable:!1,emitFacade:!0,bubbles:!0,prefix:"drag"}),this.publish(g,{defaultFn:this._defAlignFn,queuable:!1,emitFacade:!0,bubbles:!0,prefix:"drag"}),this.publish(m,{defaultFn:this._defDragFn,queuable:!1,emitFacade:!0,bubbles:!0,prefix:"drag"}),this.publish(v,{defaultFn:this._defEndFn,preventedFn:this._prevEndFn,queuable:!1,emitFacade:!0,bubbles:!0,prefix:"drag"});var t=[f,l,c,h,p,d,"drag:drophit","drag:dropmiss","drag:over","drag:enter","drag:exit"];e.Array.each(t,function(e){this.publish(e,{type:e,emitFacade:!0,bubbles:!0,preventable:!1,queuable:!1,prefix:"drag"})},this)},_ev_md:null,_startTime:null,_endTime:null,_handles:null,_invalids:null,_invalidsDefault:{textarea:!0,input:!0,a:!0,button:!0,select:!0},_dragThreshMet:null,_fromTimeout:null,_clickTimeout:null,deltaXY:null,startXY:null,nodeXY:null,lastXY:null,actXY:null,realXY:null,mouseXY:null,region:null,_handleMouseUp:function(){this.fire("drag:mouseup"),this._fixIEMouseUp(),n.activeDrag&&n._end()},_fixDragStart:function(e){this.validClick(e)&&e.preventDefault()},_ieSelectFix:function(){return!1},_ieSelectBack:null,_fixIEMouseDown:function(){e.UA.ie&&(this._ieSelectBack=e.config.doc.body.onselectstart,e.config.doc.body.onselectstart=this._ieSelectFix)},_fixIEMouseUp:function(){e.UA.ie&&(e.config.doc.body.onselectstart=this._ieSelectBack)},_handleMouseDownEvent:function(e){this.fire(a,{ev:e})},_defMouseDownFn:function(t){var r=t.ev;this._dragThreshMet=!1,this._ev_md=r;if(this.get("primaryButtonOnly")&&r.button>1)return!1;this.validClick(r)&&(this._fixIEMouseDown(r),y.START_EVENT.indexOf("gesture")!==0&&(this.get("haltDown")?r.halt():r.preventDefault()),this._setStartPosition([r.pageX,r.pageY]),n.activeDrag=this,this._clickTimeout=e.later(this.get("clickTimeThresh"),this,this._timeoutCheck)),this.fire(f,{ev:r})},validClick:function(t){var n=!1,i=!1,s=t.target,o=null,u=null,a=null,f=!1;if(this._handles)e.Object.each(this._handles,function(t,r){t instanceof e.Node||t instanceof e.NodeList?n||(a=t,a instanceof e.Node&&(a=new e.NodeList(t._node)),a.each(function(e){e.contains(s)&&(n=!0)})):e.Lang.isString(r)&&s.test(r+", "+r+" *")&&!o&&(o=r,n=!0)});else{i=this.get(r);if(i.contains(s)||i.compareTo(s))n=!0}return n&&this._invalids&&e.Object.each(this._invalids,function(t,r){e.Lang.isString(r)&&s.test(r+", "+r+" *")&&(n=!1)}),n&&(o?(u=t.currentTarget.all(o),f=!1,u.each(function(e){(e.contains(s)||e.compareTo(s))&&!f&&(f=!0,this.set("activeHandle",e))},this)):this.set("activeHandle",this.get(r))),n},_setStartPosition:function(e){this.startXY=e,this.nodeXY=this.lastXY=this.realXY=this.get(r).getXY(),this.get("offsetNode")?this.deltaXY=[this.startXY[0]-this.nodeXY[0],this.startXY[1]-this.nodeXY[1]]:this.deltaXY=[0,0]},_timeoutCheck:function(){!this.get("lock")&&!this._dragThreshMet&&this._ev_md&&(this._fromTimeout=this._dragThreshMet=!0,this.start(),this._alignNode([this._ev_md.pageX,this._ev_md.pageY],!0))},removeHandle:function(t){var n=t;if(t instanceof e.Node||t instanceof e.NodeList)n=t._yuid;return this._handles[n]&&(delete this._handles[n],this.fire(l,{handle:t})),this},addHandle:function(t){this._handles||(this._handles={});var n=t;if(t instanceof e.Node||t instanceof e.NodeList)n=t._yuid;return this._handles[n]=t,this.fire(c,{handle:t}),this},removeInvalid:function(e){return this._invalids[e]&&(this._invalids[e]=null,delete this._invalids[e],this.fire(h,{handle:e})),this},addInvalid:function(t){return e.Lang.isString(t)&&(this._invalids[t]=!0,this.fire(p,{handle:t})),this},initializer:function(){this.get(r).dd=this;if(!this.get(r).get
-("id")){var t=e.stamp(this.get(r));this.get(r).set("id",t)}this.actXY=[],this._invalids=e.clone(this._invalidsDefault,!0),this._createEvents(),this.get(s)||this.set(s,this.get(r)),this.on("initializedChange",e.bind(this._prep,this)),this.set("groups",this.get("groups"))},_prep:function(){this._dragThreshMet=!1;var t=this.get(r);t.addClass(n.CSS_PREFIX+"-draggable"),t.on(y.START_EVENT,e.bind(this._handleMouseDownEvent,this)),t.on("mouseup",e.bind(this._handleMouseUp,this)),t.on("dragstart",e.bind(this._fixDragStart,this))},_unprep:function(){var e=this.get(r);e.removeClass(n.CSS_PREFIX+"-draggable"),e.detachAll("mouseup"),e.detachAll("dragstart"),e.detachAll(y.START_EVENT),this.mouseXY=[],this.deltaXY=[0,0],this.startXY=[],this.nodeXY=[],this.lastXY=[],this.actXY=[],this.realXY=[]},start:function(){if(!this.get("lock")&&!this.get(i)){var e=this.get(r),t,a,f;this._startTime=(new Date).getTime(),n._start(),e.addClass(n.CSS_PREFIX+"-dragging"),this.fire(d,{pageX:this.nodeXY[0],pageY:this.nodeXY[1],startTime:this._startTime}),e=this.get(s),f=this.nodeXY,t=e.get(u),a=e.get(o),this.get("startCentered")&&this._setStartPosition([f[0]+t/2,f[1]+a/2]),this.region={0:f[0],1:f[1],area:0,top:f[1],right:f[0]+t,bottom:f[1]+a,left:f[0]},this.set(i,!0)}return this},end:function(){return this._endTime=(new Date).getTime(),this._clickTimeout&&this._clickTimeout.cancel(),this._dragThreshMet=this._fromTimeout=!1,!this.get("lock")&&this.get(i)&&this.fire(v,{pageX:this.lastXY[0],pageY:this.lastXY[1],startTime:this._startTime,endTime:this._endTime}),this.get(r).removeClass(n.CSS_PREFIX+"-dragging"),this.set(i,!1),this.deltaXY=[0,0],this},_defEndFn:function(){this._fixIEMouseUp(),this._ev_md=null},_prevEndFn:function(){this._fixIEMouseUp(),this.get(s).setXY(this.nodeXY),this._ev_md=null,this.region=null},_align:function(e){this.fire(g,{pageX:e[0],pageY:e[1]})},_defAlignFn:function(e){this.actXY=[e.pageX-this.deltaXY[0],e.pageY-this.deltaXY[1]]},_alignNode:function(e,t){this._align(e),t||this._moveNode()},_moveNode:function(e){var t=[],n=[],r=this.nodeXY,i=this.actXY;t[0]=i[0]-this.lastXY[0],t[1]=i[1]-this.lastXY[1],n[0]=i[0]-this.nodeXY[0],n[1]=i[1]-this.nodeXY[1],this.region={0:i[0],1:i[1],area:0,top:i[1],right:i[0]+this.get(s).get(u),bottom:i[1]+this.get(s).get(o),left:i[0]},this.fire(m,{pageX:i[0],pageY:i[1],scroll:e,info:{start:r,xy:i,delta:t,offset:n}}),this.lastXY=i},_defDragFn:function(t){if(this.get("move")){if(t.scroll&&t.scroll.node){var n=t.scroll.node.getDOMNode();n===e.config.win?n.scrollTo(t.scroll.left,t.scroll.top):(t.scroll.node.set("scrollTop",t.scroll.top),t.scroll.node.set("scrollLeft",t.scroll.left))}this.get(s).setXY([t.pageX,t.pageY]),this.realXY=[t.pageX,t.pageY]}},_move:function(e){if(this.get("lock"))return!1;this.mouseXY=[e.pageX,e.pageY];if(!this._dragThreshMet){var t=Math.abs(this.startXY[0]-e.pageX),n=Math.abs(this.startXY[1]-e.pageY);if(t>this.get("clickPixelThresh")||n>this.get("clickPixelThresh"))this._dragThreshMet=!0,this.start(),e&&e.preventDefault&&e.preventDefault(),this._alignNode([e.pageX,e.pageY])}else this._clickTimeout&&this._clickTimeout.cancel(),this._alignNode([e.pageX,e.pageY])},stopDrag:function(){return this.get(i)&&n._end(),this},destructor:function(){this._unprep(),this.target&&this.target.destroy(),n._unregDrag(this)}}),e.namespace("DD"),e.DD.Drag=y},"3.15.0",{requires:["dd-ddm-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("dd-constrain",function(e,t){var n="dragNode",r="offsetHeight",i="offsetWidth",s="host",o="tickXArray",u="tickYArray",a=e.DD.DDM,f="top",l="right",c="bottom",h="left",p="view",d=null,v="drag:tickAlignX",m="drag:tickAlignY",g=function(){this._lazyAddAttrs=!1,g.superclass.constructor.apply(this,arguments)};g.NAME="ddConstrained",g.NS="con",g.ATTRS={host:{},stickX:{value:!1},stickY:{value:!1},tickX:{value:!1},tickY:{value:!1},tickXArray:{value:!1},tickYArray:{value:!1},gutter:{value:"0",setter:function(t){return e.DD.DDM.cssSizestoObject(t)}},constrain:{value:p,setter:function(t){var n=e.one(t);return n&&(t=n),t}},constrain2region:{setter:function(e){return this.set("constrain",e)}},constrain2node:{setter:function(t){return this.set("constrain",e.one(t))}},constrain2view:{setter:function(){return this.set("constrain",p)}},cacheRegion:{value:!0}},d={_lastTickXFired:null,_lastTickYFired:null,initializer:function(){this._createEvents(),this._eventHandles=[this.get(s).on("drag:end",e.bind(this._handleEnd,this)),this.get(s).on("drag:start",e.bind(this._handleStart,this)),this.get(s).after("drag:align",e.bind(this.align,this)),this.get(s).after("drag:drag",e.bind(this.drag,this))]},destructor:function(){e.Array.each(this._eventHandles,function(e){e.detach()}),this._eventHandles.length=0},_createEvents:function(){var t=[v,m];e.Array.each(t,function(e){this.publish(e,{type:e,emitFacade:!0,bubbles:!0,queuable:!1,prefix:"drag"})},this)},_handleEnd:function(){this._lastTickYFired=null,this._lastTickXFired=null},_handleStart:function(){this.resetCache()},_regionCache:null,_cacheRegion:function(){this._regionCache=this.get("constrain").get("region")},resetCache:function(){this._regionCache=null},_getConstraint:function(){var t=this.get("constrain"),r=this.get("gutter"),i;t&&(t instanceof e.Node?(this._regionCache||(this._eventHandles.push(e.on("resize",e.bind(this._cacheRegion,this),e.config.win)),this._cacheRegion()),i=e.clone(this._regionCache),this.get("cacheRegion")||this.resetCache()):e.Lang.isObject(t)&&(i=e.clone(t)));if(!t||!i)t=p;return t===p&&(i=this.get(s).get(n).get("viewportRegion")),e.Object.each(r,function(e,t){t===l||t===c?i[t]-=e:i[t]+=e}),i},getRegion:function(e){var t={},o=null,u=null,a=this.get(s);return t=this._getConstraint(),e&&(o=a.get(n).get(r),u=a.get(n).get(i),t[l]=t[l]-u,t[c]=t[c]-o),t},_checkRegion:function(e){var t=e,o=this.getRegion(),u=this.get(s),a=u.get(n).get(r),p=u.get(n).get(i);return t[1]>o[c]-a&&(e[1]=o[c]-a),o[f]>t[1]&&(e[1]=o[f]),t[0]>o[l]-p&&(e[0]=o[l]-p),o[h]>t[0]&&(e[0]=o[h]),e},inRegion:function(e){e=e||this.get(s).get(n).getXY();var t=this._checkRegion([e[0],e[1]]),r=!1;return e[0]===t[0]&&e[1]===t[1]&&(r=!0),r},align:function(){var e=this.get(s),t=[e.actXY[0],e.actXY[1]],n=this.getRegion(!0);this.get("stickX")&&(t[1]=e.startXY[1]-e.deltaXY[1]),this.get("stickY")&&(t[0]=e.startXY[0]-e.deltaXY[0]),n&&(t=this._checkRegion(t)),t=this._checkTicks(t,n),e.actXY=t},drag:function(){var t=this.get(s),n=this.get("tickX"),r=this.get("tickY"),i=[t.actXY[0],t.actXY[1]];(e.Lang.isNumber(n)||this.get(o))&&this._lastTickXFired!==i[0]&&(this._tickAlignX(),this._lastTickXFired=i[0]),(e.Lang.isNumber(r)||this.get(u))&&this._lastTickYFired!==i[1]&&(this._tickAlignY(),this._lastTickYFired=i[1])},_checkTicks:function(e,t){var n=this.get(s),r=n.startXY[0]-n.deltaXY[0],i=n.startXY[1]-n.deltaXY[1],p=this.get("tickX"),d=this.get("tickY");return p&&!this.get(o)&&(e[0]=a._calcTicks(e[0],r,p,t[h],t[l])),d&&!this.get(u)&&(e[1]=a._calcTicks(e[1],i,d,t[f],t[c])),this.get(o)&&(e[0]=a._calcTickArray(e[0],this.get(o),t[h],t[l])),this.get(u)&&(e[1]=a._calcTickArray(e[1],this.get(u),t[f],t[c])),e},_tickAlignX:function(){this.fire(v)},_tickAlignY:function(){this.fire(m)}},e.namespace("Plugin"),e.extend(g,e.Base,d),e.Plugin.DDConstrained=g,e.mix(a,{_calcTicks:function(e,t,n,r,i){var s=(e-t)/n,o=Math.floor(s),u=Math.ceil(s);return(o!==0||u!==0)&&s>=o&&s<=u&&(e=t+n*o,r&&i&&(e<r&&(e=t+n*(o+1)),e>i&&(e=t+n*(o-1)))),e},_calcTickArray:function(e,t,n,r){var i=0,s=t.length,o=0,u,a,f;if(!t||t.length===0)return e;if(t[0]>=e)return t[0];for(i=0;i<s;i++){o=i+1;if(t[o]&&t[o]>=e)return u=e-t[i],a=t[o]-e,f=a>u?t[i]:t[o],n&&r&&f>r&&(t[i]?f=t[i]:f=t[s-1]),f}return t[t.length-1]}})},"3.15.0",{requires:["dd-drag"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("event-custom-base",function(e,t){e.Env.evt={handles:{},plugins:{}};var n=0,r=1,i={objs:null,before:function(t,r,i,s){var o=t,u;return s&&(u=[t,s].concat(e.Array(arguments,4,!0)),o=e.rbind.apply(e,u)),this._inject(n,o,r,i)},after:function(t,n,i,s){var o=t,u;return s&&(u=[t,s].concat(e.Array(arguments,4,!0)),o=e.rbind.apply(e,u)),this._inject(r,o,n,i)},_inject:function(t,n,r,i){var s=e.stamp(r),o,u;return r._yuiaop||(r._yuiaop={}),o=r._yuiaop,o[i]||(o[i]=new e.Do.Method(r,i),r[i]=function(){return o[i].exec.apply(o[i],arguments)}),u=s+e.stamp(n)+i,o[i].register(u,n,t),new e.EventHandle(o[i],u)},detach:function(e){e.detach&&e.detach()}};e.Do=i,i.Method=function(e,t){this.obj=e,this.methodName=t,this.method=e[t],this.before={},this.after={}},i.Method.prototype.register=function(e,t,n){n?this.after[e]=t:this.before[e]=t},i.Method.prototype._delete=function(e){delete this.before[e],delete this.after[e]},i.Method.prototype.exec=function(){var t=e.Array(arguments,0,!0),n,r,s,o=this.before,u=this.after,a=!1;for(n in o)if(o.hasOwnProperty(n)){r=o[n].apply(this.obj,t);if(r)switch(r.constructor){case i.Halt:return r.retVal;case i.AlterArgs:t=r.newArgs;break;case i.Prevent:a=!0;break;default:}}a||(r=this.method.apply(this.obj,t)),i.originalRetVal=r,i.currentRetVal=r;for(n in u)if(u.hasOwnProperty(n)){s=u[n].apply(this.obj,t);if(s&&s.constructor===i.Halt)return s.retVal;s&&s.constructor===i.AlterReturn&&(r=s.newRetVal,i.currentRetVal=r)}return r},i.AlterArgs=function(e,t){this.msg=e,this.newArgs=t},i.AlterReturn=function(e,t){this.msg=e,this.newRetVal=t},i.Halt=function(e,t){this.msg=e,this.retVal=t},i.Prevent=function(e){this.msg=e},i.Error=i.Halt;var s=e.Array,o="after",u=["broadcast","monitored","bubbles","context","contextFn","currentTarget","defaultFn","defaultTargetOnly","details","emitFacade","fireOnce","async","host","preventable","preventedFn","queuable","silent","stoppedFn","target","type"],a=s.hash(u),f=Array.prototype.slice,l=9,c="yui:log",h=function(e,t,n){var r;for(r in t)a[r]&&(n||!(r in e))&&(e[r]=t[r]);return e};e.CustomEvent=function(t,n){this._kds=e.CustomEvent.keepDeprecatedSubs,this.id=e.guid(),this.type=t,this.silent=this.logSystem=t===c,this._kds&&(this.subscribers={},this.afters={}),n&&h(this,n,!0)},e.CustomEvent.keepDeprecatedSubs=!1,e.CustomEvent.mixConfigs=h,e.CustomEvent.prototype={constructor:e.CustomEvent,signature:l,context:e,preventable:!0,bubbles:!0,hasSubs:function(e){var t=0,n=0,r=this._subscribers,i=this._afters,s=this.sibling;return r&&(t=r.length),i&&(n=i.length),s&&(r=s._subscribers,i=s._afters,r&&(t+=r.length),i&&(n+=i.length)),e?e==="after"?n:t:t+n},monitor:function(e){this.monitored=!0;var t=this.id+"|"+this.type+"_"+e,n=f.call(arguments,0);return n[0]=t,this.host.on.apply(this.host,n)},getSubs:function(){var e=this.sibling,t=this._subscribers,n=this._afters,r,i;return e&&(r=e._subscribers,i=e._afters),r?t?t=t.concat(r):t=r.concat():t?t=t.concat():t=[],i?n?n=n.concat(i):n=i.concat():n?n=n.concat():n=[],[t,n]},applyConfig:function(e,t){h(this,e,t)},_on:function(t,n,r,i){var s=new e.Subscriber(t,n,r,i),u;return this.fireOnce&&this.fired&&(u=this.firedWith,this.emitFacade&&this._addFacadeToArgs&&this._addFacadeToArgs(u),this.async?setTimeout(e.bind(this._notify,this,s,u),0):this._notify(s,u)),i===o?(this._afters||(this._afters=[]),this._afters.push(s)):(this._subscribers||(this._subscribers=[]),this._subscribers.push(s)),this._kds&&(i===o?this.afters[s.id]=s:this.subscribers[s.id]=s),new e.EventHandle(this,s)},subscribe:function(e,t){var n=arguments.length>2?f.call(arguments,2):null;return this._on(e,t,n,!0)},on:function(e,t){var n=arguments.length>2?f.call(arguments,2):null;return this.monitored&&this.host&&this.host._monitor("attach",this,{args:arguments}),this._on(e,t,n,!0)},after:function(e,t){var n=arguments.length>2?f.call(arguments,2):null;return this._on(e,t,n,o)},detach:function(e,t){if(e&&e.detach)return e.detach();var n,r,i=0,s=this._subscribers,o=this._afters;if(s)for(n=s.length;n>=0;n--)r=s[n],r&&(!e||e===r.fn)&&(this._delete(r,s,n),i++);if(o)for(n=o.length;n>=0;n--)r=o[n],r&&(!e||e===r.fn)&&(this._delete(r,o,n),i++);return i},unsubscribe:function(){return this.detach.apply(this,arguments)},_notify:function(e,t,n){var r;return r=e.notify(t,this),!1===r||this.stopped>1?!1:!0},log:function(e,t){},fire:function(){var e=[];return e.push.apply(e,arguments),this._fire(e)},_fire:function(e){return this.fireOnce&&this.fired?!0:(this.fired=!0,this.fireOnce&&(this.firedWith=e),this.emitFacade?this.fireComplex(e):this.fireSimple(e))},fireSimple:function(e){this.stopped=0,this.prevented=0;if(this.hasSubs()){var t=this.getSubs();this._procSubs(t[0],e),this._procSubs(t[1],e)}return this.broadcast&&this._broadcast(e),this.stopped?!1:!0},fireComplex:function(e){return e[0]=e[0]||{},this.fireSimple(e)},_procSubs:function(e,t,n){var r,i,s;for(i=0,s=e.length;i<s;i++){r=e[i];if(r&&r.fn){!1===this._notify(r,t,n)&&(this.stopped=2);if(this.stopped===2)return!1}}return!0},_broadcast:function(t){if(!this.stopped&&this.broadcast){var n=t.concat();n.unshift(this.type),this.host!==e&&e.fire.apply(e,n),this.broadcast===2&&e.Global.fire.apply(e.Global,n)}},unsubscribeAll:function(){return this.detachAll.apply(this,arguments)},detachAll:function(){return this.detach()},_delete:function(e,t,n){var r=e._when;t||(t=r===o?this._afters:this._subscribers),t&&(n=s.indexOf(t,e,0),e&&t[n]===e&&t.splice(n,1)),this._kds&&(r===o?delete this.afters[e.id]:delete this.subscribers[e.id]),this.monitored&&this.host&&this.host._monitor("detach",this,{ce:this,sub:e}),e&&(e.deleted=!0)}},e.Subscriber=function(t,n,r,i){this.fn=t,this.context=n,this.id=e.guid(),this.args=r,this._when=i},e.Subscriber.prototype={constructor:e.Subscriber,_notify:function(e,t,n){if(this.deleted&&!this.postponed){if(!this.postponed)return delete this.postponed,null;delete this.fn,delete this.context}var r=this.args,i;switch(n.signature){case 0:i=this.fn.call(e,n.type,t,e);break;case 1:i=this.fn.call(e,t[0]||null,e);break;
-default:r||t?(t=t||[],r=r?t.concat(r):t,i=this.fn.apply(e,r)):i=this.fn.call(e)}return this.once&&n._delete(this),i},notify:function(t,n){var r=this.context,i=!0;r||(r=n.contextFn?n.contextFn():n.context);if(e.config&&e.config.throwFail)i=this._notify(r,t,n);else try{i=this._notify(r,t,n)}catch(s){e.error(this+" failed: "+s.message,s)}return i},contains:function(e,t){return t?this.fn===e&&this.context===t:this.fn===e},valueOf:function(){return this.id}},e.EventHandle=function(e,t){this.evt=e,this.sub=t},e.EventHandle.prototype={batch:function(t,n){t.call(n||this,this),e.Lang.isArray(this.evt)&&e.Array.each(this.evt,function(e){e.batch.call(n||e,t)})},detach:function(){var t=this.evt,n=0,r;if(t)if(e.Lang.isArray(t))for(r=0;r<t.length;r++)n+=t[r].detach();else t._delete(this.sub),n=1;return n},monitor:function(e){return this.evt.monitor.apply(this.evt,arguments)}};var p=e.Lang,d=":",v="|",m="~AFTER~",g=/(.*?)(:)(.*?)/,y=e.cached(function(e){return e.replace(g,"*$2$3")}),b=function(e,t){return!t||!e||e.indexOf(d)>-1?e:t+d+e},w=e.cached(function(e,t){var n=e,r,i,s;return p.isString(n)?(s=n.indexOf(m),s>-1&&(i=!0,n=n.substr(m.length)),s=n.indexOf(v),s>-1&&(r=n.substr(0,s),n=n.substr(s+1),n==="*"&&(n=null)),[r,t?b(n,t):n,i,n]):n}),E=function(t){var n=this._yuievt,r;n||(n=this._yuievt={events:{},targets:null,config:{host:this,context:this},chain:e.config.chain}),r=n.config,t&&(h(r,t,!0),t.chain!==undefined&&(n.chain=t.chain),t.prefix&&(r.prefix=t.prefix))};E.prototype={constructor:E,once:function(){var e=this.on.apply(this,arguments);return e.batch(function(e){e.sub&&(e.sub.once=!0)}),e},onceAfter:function(){var e=this.after.apply(this,arguments);return e.batch(function(e){e.sub&&(e.sub.once=!0)}),e},parseType:function(e,t){return w(e,t||this._yuievt.config.prefix)},on:function(t,n,r){var i=this._yuievt,s=w(t,i.config.prefix),o,u,a,l,c,h,d,v=e.Env.evt.handles,g,y,b,E=e.Node,S,x,T;this._monitor("attach",s[1],{args:arguments,category:s[0],after:s[2]});if(p.isObject(t))return p.isFunction(t)?e.Do.before.apply(e.Do,arguments):(o=n,u=r,a=f.call(arguments,0),l=[],p.isArray(t)&&(T=!0),g=t._after,delete t._after,e.each(t,function(e,t){p.isObject(e)&&(o=e.fn||(p.isFunction(e)?e:o),u=e.context||u);var n=g?m:"";a[0]=n+(T?e:t),a[1]=o,a[2]=u,l.push(this.on.apply(this,a))},this),i.chain?this:new e.EventHandle(l));h=s[0],g=s[2],b=s[3];if(E&&e.instanceOf(this,E)&&b in E.DOM_EVENTS)return a=f.call(arguments,0),a.splice(2,0,E.getDOMNode(this)),e.on.apply(e,a);t=s[1];if(e.instanceOf(this,YUI)){y=e.Env.evt.plugins[t],a=f.call(arguments,0),a[0]=b,E&&(S=a[2],e.instanceOf(S,e.NodeList)?S=e.NodeList.getDOMNodes(S):e.instanceOf(S,E)&&(S=E.getDOMNode(S)),x=b in E.DOM_EVENTS,x&&(a[2]=S));if(y)d=y.on.apply(e,a);else if(!t||x)d=e.Event._attach(a)}return d||(c=i.events[t]||this.publish(t),d=c._on(n,r,arguments.length>3?f.call(arguments,3):null,g?"after":!0),t.indexOf("*:")!==-1&&(this._hasSiblings=!0)),h&&(v[h]=v[h]||{},v[h][t]=v[h][t]||[],v[h][t].push(d)),i.chain?this:d},subscribe:function(){return this.on.apply(this,arguments)},detach:function(t,n,r){var i=this._yuievt.events,s,o=e.Node,u=o&&e.instanceOf(this,o);if(!t&&this!==e){for(s in i)i.hasOwnProperty(s)&&i[s].detach(n,r);return u&&e.Event.purgeElement(o.getDOMNode(this)),this}var a=w(t,this._yuievt.config.prefix),l=p.isArray(a)?a[0]:null,c=a?a[3]:null,h,d=e.Env.evt.handles,v,m,g,y,b=function(e,t,n){var r=e[t],i,s;if(r)for(s=r.length-1;s>=0;--s)i=r[s].evt,(i.host===n||i.el===n)&&r[s].detach()};if(l){m=d[l],t=a[1],v=u?e.Node.getDOMNode(this):this;if(m){if(t)b(m,t,v);else for(s in m)m.hasOwnProperty(s)&&b(m,s,v);return this}}else{if(p.isObject(t)&&t.detach)return t.detach(),this;if(u&&(!c||c in o.DOM_EVENTS))return g=f.call(arguments,0),g[2]=o.getDOMNode(this),e.detach.apply(e,g),this}h=e.Env.evt.plugins[c];if(e.instanceOf(this,YUI)){g=f.call(arguments,0);if(h&&h.detach)return h.detach.apply(e,g),this;if(!t||!h&&o&&t in o.DOM_EVENTS)return g[0]=t,e.Event.detach.apply(e.Event,g),this}return y=i[a[1]],y&&y.detach(n,r),this},unsubscribe:function(){return this.detach.apply(this,arguments)},detachAll:function(e){return this.detach(e)},unsubscribeAll:function(){return this.detachAll.apply(this,arguments)},publish:function(t,n){var r,i=this._yuievt,s=i.config,o=s.prefix;return typeof t=="string"?(o&&(t=b(t,o)),r=this._publish(t,s,n)):(r={},e.each(t,function(e,t){o&&(t=b(t,o)),r[t]=this._publish(t,s,e||n)},this)),r},_getFullType:function(e){var t=this._yuievt.config.prefix;return t?t+d+e:e},_publish:function(t,n,r){var i,s=this._yuievt,o=s.config,u=o.host,a=o.context,f=s.events;return i=f[t],(o.monitored&&!i||i&&i.monitored)&&this._monitor("publish",t,{args:arguments}),i||(i=f[t]=new e.CustomEvent(t,n),n||(i.host=u,i.context=a)),r&&h(i,r,!0),i},_monitor:function(e,t,n){var r,i,s;if(t){typeof t=="string"?(s=t,i=this.getEvent(t,!0)):(i=t,s=t.type);if(this._yuievt.config.monitored&&(!i||i.monitored)||i&&i.monitored)r=s+"_"+e,n.monitored=e,this.fire.call(this,r,n)}},fire:function(e){var t=typeof e=="string",n=arguments.length,r=e,i=this._yuievt,s=i.config,o=s.prefix,u,a,l,c;t&&n<=3?n===2?c=[arguments[1]]:n===3?c=[arguments[1],arguments[2]]:c=[]:c=f.call(arguments,t?1:0),t||(r=e&&e.type),o&&(r=b(r,o)),a=i.events[r],this._hasSiblings&&(l=this.getSibling(r,a),l&&!a&&(a=this.publish(r))),(s.monitored&&(!a||a.monitored)||a&&a.monitored)&&this._monitor("fire",a||r,{args:c});if(!a){if(i.hasTargets)return this.bubble({type:r},c,this);u=!0}else l&&(a.sibling=l),u=a._fire(c);return i.chain?this:u},getSibling:function(e,t){var n;return e.indexOf(d)>-1&&(e=y(e),n=this.getEvent(e,!0),n&&(n.applyConfig(t),n.bubbles=!1,n.broadcast=0)),n},getEvent:function(e,t){var n,r;return t||(n=this._yuievt.config.prefix,e=n?b(e,n):e),r=this._yuievt.events,r[e]||null},after:function(t,n){var r=f.call(arguments,0);switch(p.type(t)){case"function":return e.Do.after.apply(e.Do,arguments);case"array":case"object":r[0]._after=!0;break;default:r[0]=m+t}return this.on.apply(this,r)},before:function(){return this.on.apply
-(this,arguments)}},e.EventTarget=E,e.mix(e,E.prototype),E.call(e,{bubbles:!1}),YUI.Env.globalEvents=YUI.Env.globalEvents||new E,e.Global=YUI.Env.globalEvents},"3.15.0",{requires:["oop"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("event-base",function(e,t){e.publish("domready",{fireOnce:!0,async:!0}),YUI.Env.DOMReady?e.fire("domready"):e.Do.before(function(){e.fire("domready")},YUI.Env,"_ready");var n=e.UA,r={},i={63232:38,63233:40,63234:37,63235:39,63276:33,63277:34,25:9,63272:46,63273:36,63275:35},s=function(t){if(!t)return t;try{t&&3==t.nodeType&&(t=t.parentNode)}catch(n){return null}return e.one(t)},o=function(e,t,n){this._event=e,this._currentTarget=t,this._wrapper=n||r,this.init()};e.extend(o,Object,{init:function(){var e=this._event,t=this._wrapper.overrides,r=e.pageX,o=e.pageY,u,a=this._currentTarget;this.altKey=e.altKey,this.ctrlKey=e.ctrlKey,this.metaKey=e.metaKey,this.shiftKey=e.shiftKey,this.type=t&&t.type||e.type,this.clientX=e.clientX,this.clientY=e.clientY,this.pageX=r,this.pageY=o,u=e.keyCode||e.charCode,n.webkit&&u in i&&(u=i[u]),this.keyCode=u,this.charCode=u,this.which=e.which||e.charCode||u,this.button=this.which,this.target=s(e.target),this.currentTarget=s(a),this.relatedTarget=s(e.relatedTarget);if(e.type=="mousewheel"||e.type=="DOMMouseScroll")this.wheelDelta=e.detail?e.detail*-1:Math.round(e.wheelDelta/80)||(e.wheelDelta<0?-1:1);this._touch&&this._touch(e,a,this._wrapper)},stopPropagation:function(){this._event.stopPropagation(),this._wrapper.stopped=1,this.stopped=1},stopImmediatePropagation:function(){var e=this._event;e.stopImmediatePropagation?e.stopImmediatePropagation():this.stopPropagation(),this._wrapper.stopped=2,this.stopped=2},preventDefault:function(e){var t=this._event;t.preventDefault(),e&&(t.returnValue=e),this._wrapper.prevented=1,this.prevented=1},halt:function(e){e?this.stopImmediatePropagation():this.stopPropagation(),this.preventDefault()}}),o.resolve=s,e.DOM2EventFacade=o,e.DOMEventFacade=o,function(){e.Env.evt.dom_wrappers={},e.Env.evt.dom_map={};var t=e.Env.evt,n=e.config,r=n.win,i=YUI.Env.add,s=YUI.Env.remove,o=function(){YUI.Env.windowLoaded=!0,e.Event._load(),s(r,"load",o)},u=function(){e.Event._unload()},a="domready",f="~yui|2|compat~",l=function(t){try{return t&&typeof t!="string"&&e.Lang.isNumber(t.length)&&!t.tagName&&!e.DOM.isWindow(t)}catch(n){return!1}},c=e.CustomEvent.prototype._delete,h=function(t){var n=c.apply(this,arguments);return this.hasSubs()||e.Event._clean(this),n},p=function(){var n=!1,o=0,c=[],d=t.dom_wrappers,v=null,m=t.dom_map;return{POLL_RETRYS:1e3,POLL_INTERVAL:40,lastError:null,_interval:null,_dri:null,DOMReady:!1,startInterval:function(){p._interval||(p._interval=setInterval(p._poll,p.POLL_INTERVAL))},onAvailable:function(t,n,r,i,s,u){var a=e.Array(t),f,l;for(f=0;f<a.length;f+=1)c.push({id:a[f],fn:n,obj:r,override:i,checkReady:s,compat:u});return o=this.POLL_RETRYS,setTimeout(p._poll,0),l=new e.EventHandle({_delete:function(){if(l.handle){l.handle.detach();return}var e,t;for(e=0;e<a.length;e++)for(t=0;t<c.length;t++)a[e]===c[t].id&&c.splice(t,1)}}),l},onContentReady:function(e,t,n,r,i){return p.onAvailable(e,t,n,r,!0,i)},attach:function(t,n,r,i){return p._attach(e.Array(arguments,0,!0))},_createWrapper:function(t,n,s,o,u){var a,f=e.stamp(t),l="event:"+f+n;return!1===u&&(l+="native"),s&&(l+="capture"),a=d[l],a||(a=e.publish(l,{silent:!0,bubbles:!1,emitFacade:!1,contextFn:function(){return o?a.el:(a.nodeRef=a.nodeRef||e.one(a.el),a.nodeRef)}}),a.overrides={},a.el=t,a.key=l,a.domkey=f,a.type=n,a.fn=function(e){a.fire(p.getEvent(e,t,o||!1===u))},a.capture=s,t==r&&n=="load"&&(a.fireOnce=!0,v=l),a._delete=h,d[l]=a,m[f]=m[f]||{},m[f][l]=a,i(t,n,a.fn,s)),a},_attach:function(t,n){var i,s,o,u,a,c=!1,h,d=t[0],v=t[1],m=t[2]||r,g=n&&n.facade,y=n&&n.capture,b=n&&n.overrides;t[t.length-1]===f&&(i=!0);if(!v||!v.call)return!1;if(l(m))return s=[],e.each(m,function(e,r){t[2]=e,s.push(p._attach(t.slice(),n))}),new e.EventHandle(s);if(e.Lang.isString(m)){if(i)o=e.DOM.byId(m);else{o=e.Selector.query(m);switch(o.length){case 0:o=null;break;case 1:o=o[0];break;default:return t[2]=o,p._attach(t,n)}}if(!o)return h=p.onAvailable(m,function(){h.handle=p._attach(t,n)},p,!0,!1,i),h;m=o}return m?(e.Node&&e.instanceOf(m,e.Node)&&(m=e.Node.getDOMNode(m)),u=p._createWrapper(m,d,y,i,g),b&&e.mix(u.overrides,b),m==r&&d=="load"&&YUI.Env.windowLoaded&&(c=!0),i&&t.pop(),a=t[3],h=u._on(v,a,t.length>4?t.slice(4):null),c&&u.fire(),h):!1},detach:function(t,n,r,i){var s=e.Array(arguments,0,!0),o,u,a,c,h,v;s[s.length-1]===f&&(o=!0);if(t&&t.detach)return t.detach();typeof r=="string"&&(o?r=e.DOM.byId(r):(r=e.Selector.query(r),u=r.length,u<1?r=null:u==1&&(r=r[0])));if(!r)return!1;if(r.detach)return s.splice(2,1),r.detach.apply(r,s);if(l(r)){a=!0;for(c=0,u=r.length;c<u;++c)s[2]=r[c],a=e.Event.detach.apply(e.Event,s)&&a;return a}return!t||!n||!n.call?p.purgeElement(r,!1,t):(h="event:"+e.stamp(r)+t,v=d[h],v?v.detach(n):!1)},getEvent:function(t,n,i){var s=t||r.event;return i?s:new e.DOMEventFacade(s,n,d["event:"+e.stamp(n)+t.type])},generateId:function(t){return e.DOM.generateID(t)},_isValidCollection:l,_load:function(t){n||(n=!0,e.fire&&e.fire(a),p._poll())},_poll:function(){if(p.locked)return;if(e.UA.ie&&!YUI.Env.DOMReady){p.startInterval();return}p.locked=!0;var t,r,i,s,u,a,f=!n;f||(f=o>0),u=[],a=function(t,n){var r,i=n.override;try{n.compat?(n.override?i===!0?r=n.obj:r=i:r=t,n.fn.call(r,n.obj)):(r=n.obj||e.one(t),n.fn.apply(r,e.Lang.isArray(i)?i:[]))}catch(s){}};for(t=0,r=c.length;t<r;++t)i=c[t],i&&!i.checkReady&&(s=i.compat?e.DOM.byId(i.id):e.Selector.query(i.id,null,!0),s?(a(s,i),c[t]=null):u.push(i));for(t=0,r=c.length;t<r;++t){i=c[t];if(i&&i.checkReady){s=i.compat?e.DOM.byId(i.id):e.Selector.query(i.id,null,!0);if(s){if(n||s.get&&s.get("nextSibling")||s.nextSibling)a(s,i),c[t]=null}else u.push(i)}}o=u.length===0?0:o-1,f?p.startInterval():(clearInterval(p._interval),p._interval=null),p.locked=!1;return},purgeElement:function(t,n,r){var i=e.Lang.isString(t)?e.Selector.query(t,null,!0):t,s=p.getListeners(i,r),o,u,a,f;if(n&&i){s=s||[],a=e.Selector.query("*",i),u=a.length;for(o=0;o<u;++o)f=p.getListeners(a[o],r),f&&(s=s.concat(f))}if(s)for(o=0,u=s.length;o<u;++o)s[o].detachAll()}
-,_clean:function(t){var n=t.key,r=t.domkey;s(t.el,t.type,t.fn,t.capture),delete d[n],delete e._yuievt.events[n],m[r]&&(delete m[r][n],e.Object.size(m[r])||delete m[r])},getListeners:function(n,r){var i=e.stamp(n,!0),s=m[i],o=[],u=r?"event:"+i+r:null,a=t.plugins;return s?(u?(a[r]&&a[r].eventDef&&(u+="_synth"),s[u]&&o.push(s[u]),u+="native",s[u]&&o.push(s[u])):e.each(s,function(e,t){o.push(e)}),o.length?o:null):null},_unload:function(t){e.each(d,function(e,n){e.type=="unload"&&e.fire(t),e.detachAll()}),s(r,"unload",u)},nativeAdd:i,nativeRemove:s}}();e.Event=p,n.injected||YUI.Env.windowLoaded?o():i(r,"load",o);if(e.UA.ie){e.on(a,p._poll);if(e.UA.ie<7)try{i(r,"unload",u)}catch(d){}}p.Custom=e.CustomEvent,p.Subscriber=e.Subscriber,p.Target=e.EventTarget,p.Handle=e.EventHandle,p.Facade=e.EventFacade,p._poll()}(),e.Env.evt.plugins.available={on:function(t,n,r,i){var s=arguments.length>4?e.Array(arguments,4,!0):null;return e.Event.onAvailable.call(e.Event,r,n,i,s)}},e.Env.evt.plugins.contentready={on:function(t,n,r,i){var s=arguments.length>4?e.Array(arguments,4,!0):null;return e.Event.onContentReady.call(e.Event,r,n,i,s)}}},"3.15.0",{requires:["event-custom-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("dom-core",function(e,t){var n="nodeType",r="ownerDocument",i="documentElement",s="defaultView",o="parentWindow",u="tagName",a="parentNode",f="previousSibling",l="nextSibling",c="contains",h="compareDocumentPosition",p=[],d=function(){var t=e.config.doc.createElement("div"),n=t.appendChild(e.config.doc.createTextNode("")),r=!1;try{r=t.contains(n)}catch(i){}return r}(),v={byId:function(e,t){return v.allById(e,t)[0]||null},getId:function(e){var t;return e.id&&!e.id.tagName&&!e.id.item?t=e.id:e.attributes&&e.attributes.id&&(t=e.attributes.id.value),t},setId:function(e,t){e.setAttribute?e.setAttribute("id",t):e.id=t},ancestor:function(e,t,n,r){var i=null;return n&&(i=!t||t(e)?e:null),i||v.elementByAxis(e,a,t,null,r)},ancestors:function(e,t,n,r){var i=e,s=[];while(i=v.ancestor(i,t,n,r)){n=!1;if(i){s.unshift(i);if(r&&r(i))return s}}return s},elementByAxis:function(e,t,n,r,i){while(e&&(e=e[t])){if((r||e[u])&&(!n||n(e)))return e;if(i&&i(e))return null}return null},contains:function(e,t){var r=!1;if(!t||!e||!t[n]||!e[n])r=!1;else if(e[c]&&(t[n]===1||d))r=e[c](t);else if(e[h]){if(e===t||!!(e[h](t)&16))r=!0}else r=v._bruteContains(e,t);return r},inDoc:function(e,t){var n=!1,s;return e&&e.nodeType&&(t||(t=e[r]),s=t[i],s&&s.contains&&e.tagName?n=s.contains(e):n=v.contains(s,e)),n},allById:function(t,n){n=n||e.config.doc;var r=[],i=[],s,o;if(n.querySelectorAll)i=n.querySelectorAll('[id="'+t+'"]');else if(n.all){r=n.all(t);if(r){r.nodeName&&(r.id===t?(i.push(r),r=p):r=[r]);if(r.length)for(s=0;o=r[s++];)(o.id===t||o.attributes&&o.attributes.id&&o.attributes.id.value===t)&&i.push(o)}}else i=[v._getDoc(n).getElementById(t)];return i},isWindow:function(e){return!!(e&&e.scrollTo&&e.document)},_removeChildNodes:function(e){while(e.firstChild)e.removeChild(e.firstChild)},siblings:function(e,t){var n=[],r=e;while(r=r[f])r[u]&&(!t||t(r))&&n.unshift(r);r=e;while(r=r[l])r[u]&&(!t||t(r))&&n.push(r);return n},_bruteContains:function(e,t){while(t){if(e===t)return!0;t=t.parentNode}return!1},_getRegExp:function(e,t){return t=t||"",v._regexCache=v._regexCache||{},v._regexCache[e+t]||(v._regexCache[e+t]=new RegExp(e,t)),v._regexCache[e+t]},_getDoc:function(t){var i=e.config.doc;return t&&(i=t[n]===9?t:t[r]||t.document||e.config.doc),i},_getWin:function(t){var n=v._getDoc(t);return n[s]||n[o]||e.config.win},_batch:function(e,t,n,r,i,s){t=typeof t=="string"?v[t]:t;var o,u=0,a,f;if(t&&e)while(a=e[u++])o=o=t.call(v,a,n,r,i,s),typeof o!="undefined"&&(f||(f=[]),f.push(o));return typeof f!="undefined"?f:e},generateID:function(t){var n=t.id;return n||(n=e.stamp(t),t.id=n),n}};e.DOM=v},"3.15.0",{requires:["oop","features"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("dom-base",function(e,t){var n=e.config.doc.documentElement,r=e.DOM,i="tagName",s="ownerDocument",o="",u=e.Features.add,a=e.Features.test;e.mix(r,{getText:n.textContent!==undefined?function(e){var t="";return e&&(t=e.textContent),t||""}:function(e){var t="";return e&&(t=e.innerText||e.nodeValue),t||""},setText:n.textContent!==undefined?function(e,t){e&&(e.textContent=t)}:function(e,t){"innerText"in e?e.innerText=t:"nodeValue"in e&&(e.nodeValue=t)},CUSTOM_ATTRIBUTES:n.hasAttribute?{htmlFor:"for",className:"class"}:{"for":"htmlFor","class":"className"},setAttribute:function(e,t,n,i){e&&t&&e.setAttribute&&(t=r.CUSTOM_ATTRIBUTES[t]||t,e.setAttribute(t,n,i))},getAttribute:function(e,t,n){n=n!==undefined?n:2;var i="";return e&&t&&e.getAttribute&&(t=r.CUSTOM_ATTRIBUTES[t]||t,i=e.tagName==="BUTTON"&&t==="value"?r.getValue(e):e.getAttribute(t,n),i===null&&(i="")),i},VALUE_SETTERS:{},VALUE_GETTERS:{},getValue:function(e){var t="",n;return e&&e[i]&&(n=r.VALUE_GETTERS[e[i].toLowerCase()],n?t=n(e):t=e.value),t===o&&(t=o),typeof t=="string"?t:""},setValue:function(e,t){var n;e&&e[i]&&(n=r.VALUE_SETTERS[e[i].toLowerCase()],t=t===null?"":t,n?n(e,t):e.value=t)},creators:{}}),u("value-set","select",{test:function(){var t=e.config.doc.createElement("select");return t.innerHTML="<option>1</option><option>2</option>",t.value="2",t.value&&t.value==="2"}}),a("value-set","select")||(r.VALUE_SETTERS.select=function(e,t){for(var n=0,i=e.getElementsByTagName("option"),s;s=i[n++];)if(r.getValue(s)===t){s.selected=!0;break}}),e.mix(r.VALUE_GETTERS,{button:function(e){return e.attributes&&e.attributes.value?e.attributes.value.value:""}}),e.mix(r.VALUE_SETTERS,{button:function(e,t){var n=e.attributes.value;n||(n=e[s].createAttribute("value"),e.setAttributeNode(n)),n.value=t}}),e.mix(r.VALUE_GETTERS,{option:function(e){var t=e.attributes;return t.value&&t.value.specified?e.value:e.text},select:function(e){var t=e.value,n=e.options;return n&&n.length&&(e.multiple||e.selectedIndex>-1&&(t=r.getValue(n[e.selectedIndex]))),t}});var f,l,c;e.mix(e.DOM,{hasClass:function(t,n){var r=e.DOM._getRegExp("(?:^|\\s+)"+n+"(?:\\s+|$)");return r.test(t.className)},addClass:function(t,n){e.DOM.hasClass(t,n)||(t.className=e.Lang.trim([t.className,n].join(" ")))},removeClass:function(t,n){n&&l(t,n)&&(t.className=e.Lang.trim(t.className.replace(e.DOM._getRegExp("(?:^|\\s+)"+n+"(?:\\s+|$)")," ")),l(t,n)&&c(t,n))},replaceClass:function(e,t,n){c(e,t),f(e,n)},toggleClass:function(e,t,n){var r=n!==undefined?n:!l(e,t);r?f(e,t):c(e,t)}}),l=e.DOM.hasClass,c=e.DOM.removeClass,f=e.DOM.addClass;var h=/<([a-z]+)/i,r=e.DOM,u=e.Features.add,a=e.Features.test,p={},d=function(t,n){var r=e.config.doc.createElement("div"),i=!0;r.innerHTML=t;if(!r.firstChild||r.firstChild.tagName!==n.toUpperCase())i=!1;return i},v=/(?:\/(?:thead|tfoot|tbody|caption|col|colgroup)>)+\s*<tbody/,m="<table>",g="</table>",y;e.mix(e.DOM,{_fragClones:{},_create:function(e,t,n){n=n||"div";var i=r._fragClones[n];return i?i=i.cloneNode(!1):i=r._fragClones[n]=t.createElement(n),i.innerHTML=e,i},_children:function(e,t){var n=0,r=e.children,i,s,o;r&&r.tags&&(t?r=e.children.tags(t):s=r.tags("!").length);if(!r||!r.tags&&t||s){i=r||e.childNodes,r=[];while(o=i[n++])o.nodeType===1&&(!t||t===o.tagName)&&r.push(o)}return r||[]},create:function(t,n){typeof t=="string"&&(t=e.Lang.trim(t)),n=n||e.config.doc;var i=h.exec(t),s=r._create,o=p,u=null,a,f,l,c;return t!=undefined&&(i&&i[1]&&(a=o[i[1].toLowerCase()],typeof a=="function"?s=a:f=a),l=s(t,n,f),c=l.childNodes,c.length===1?u=l.removeChild(c[0]):c[0]&&c[0].className==="yui3-big-dummy"?(y=l.selectedIndex,c.length===2?u=c[0].nextSibling:(l.removeChild(c[0]),u=r._nl2frag(c,n))):u=r._nl2frag(c,n)),u},_nl2frag:function(t,n){var r=null,i,s;if(t&&(t.push||t.item)&&t[0]){n=n||t[0].ownerDocument,r=n.createDocumentFragment(),t.item&&(t=e.Array(t,0,!0));for(i=0,s=t.length;i<s;i++)r.appendChild(t[i])}return r},addHTML:function(t,n,i){var s=t.parentNode,o=0,u,a=n,f;if(n!=undefined)if(n.nodeType)f=n;else if(typeof n=="string"||typeof n=="number")a=f=r.create(n);else if(n[0]&&n[0].nodeType){f=e.config.doc.createDocumentFragment();while(u=n[o++])f.appendChild(u)}if(i)if(f&&i.parentNode)i.parentNode.insertBefore(f,i);else switch(i){case"replace":while(t.firstChild)t.removeChild(t.firstChild);f&&t.appendChild(f);break;case"before":f&&s.insertBefore(f,t);break;case"after":f&&(t.nextSibling?s.insertBefore(f,t.nextSibling):s.appendChild(f));break;default:f&&t.appendChild(f)}else f&&t.appendChild(f);return t.nodeName=="SELECT"&&y>0&&(t.selectedIndex=y-1),a},wrap:function(t,n){var r=n&&n.nodeType?n:e.DOM.create(n),i=r.getElementsByTagName("*");i.length&&(r=i[i.length-1]),t.parentNode&&t.parentNode.replaceChild(r,t),r.appendChild(t)},unwrap:function(e){var t=e.parentNode,n=t.lastChild,r=e,i;if(t){i=t.parentNode;if(i){e=t.firstChild;while(e!==n)r=e.nextSibling,i.insertBefore(e,t),e=r;i.replaceChild(n,t)}else t.removeChild(e)}}}),u("innerhtml","table",{test:function(){var t=e.config.doc.createElement("table");try{t.innerHTML="<tbody></tbody>"}catch(n){return!1}return t.firstChild&&t.firstChild.nodeName==="TBODY"}}),u("innerhtml-div","tr",{test:function(){return d("<tr></tr>","tr")}}),u("innerhtml-div","script",{test:function(){return d("<script></script>","script")}}),a("innerhtml","table")||(p.tbody=function(t,n){var i=r.create(m+t+g,n),s=e.DOM._children(i,"tbody")[0];return i.children.length>1&&s&&!v.test(t)&&s.parentNode.removeChild(s),i}),a("innerhtml-div","script")||(p.script=function(e,t){var n=t.createElement("div");return n.innerHTML="-"+e,n.removeChild(n.firstChild),n},p.link=p.style=p.script),a("innerhtml-div","tr")||(e.mix(p,{option:function(e,t){return r.create('<select><option class="yui3-big-dummy" selected></option>'+e+"</select>",t)},tr:function(e,t){return r.create("<tbody>"+e+"</tbody>",t)},td:function(e,t){return r.create("<tr>"+e+"</tr>",t)},col:function(e,t){return r.create("<colgroup>"+e+"</colgroup>",t)},tbody:"table"}),e.mix(p,{legend:"fieldset"
-,th:p.td,thead:p.tbody,tfoot:p.tbody,caption:p.tbody,colgroup:p.tbody,optgroup:p.option})),r.creators=p,e.mix(e.DOM,{setWidth:function(t,n){e.DOM._setSize(t,"width",n)},setHeight:function(t,n){e.DOM._setSize(t,"height",n)},_setSize:function(e,t,n){n=n>0?n:0;var r=0;e.style[t]=n+"px",r=t==="height"?e.offsetHeight:e.offsetWidth,r>n&&(n-=r-n,n<0&&(n=0),e.style[t]=n+"px")}})},"3.15.0",{requires:["dom-core"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("selector-native",function(e,t){(function(e){e.namespace("Selector");var t="compareDocumentPosition",n="ownerDocument",r={_types:{esc:{token:"\ue000",re:/\\[:\[\]\(\)#\.\'\>+~"]/gi},attr:{token:"\ue001",re:/(\[[^\]]*\])/g},pseudo:{token:"\ue002",re:/(\([^\)]*\))/g}},useNative:!0,_escapeId:function(e){return e&&(e=e.replace(/([:\[\]\(\)#\.'<>+~"])/g,"\\$1")),e},_compare:"sourceIndex"in e.config.doc.documentElement?function(e,t){var n=e.sourceIndex,r=t.sourceIndex;return n===r?0:n>r?1:-1}:e.config.doc.documentElement[t]?function(e,n){return e[t](n)&4?-1:1}:function(e,t){var r,i,s;return e&&t&&(r=e[n].createRange(),r.setStart(e,0),i=t[n].createRange(),i.setStart(t,0),s=r.compareBoundaryPoints(1,i)),s},_sort:function(t){return t&&(t=e.Array(t,0,!0),t.sort&&t.sort(r._compare)),t},_deDupe:function(e){var t=[],n,r;for(n=0;r=e[n++];)r._found||(t[t.length]=r,r._found=!0);for(n=0;r=t[n++];)r._found=null,r.removeAttribute("_found");return t},query:function(t,n,i,s){n=n||e.config.doc;var o=[],u=e.Selector.useNative&&e.config.doc.querySelector&&!s,a=[[t,n]],f,l,c,h=u?e.Selector._nativeQuery:e.Selector._bruteQuery;if(t&&h){!s&&(!u||n.tagName)&&(a=r._splitQueries(t,n));for(c=0;f=a[c++];)l=h(f[0],f[1],i),i||(l=e.Array(l,0,!0)),l&&(o=o.concat(l));a.length>1&&(o=r._sort(r._deDupe(o)))}return i?o[0]||null:o},_replaceSelector:function(t){var n=e.Selector._parse("esc",t),i,s;return t=e.Selector._replace("esc",t),s=e.Selector._parse("pseudo",t),t=r._replace("pseudo",t),i=e.Selector._parse("attr",t),t=e.Selector._replace("attr",t),{esc:n,attrs:i,pseudos:s,selector:t}},_restoreSelector:function(t){var n=t.selector;return n=e.Selector._restore("attr",n,t.attrs),n=e.Selector._restore("pseudo",n,t.pseudos),n=e.Selector._restore("esc",n,t.esc),n},_replaceCommas:function(t){var n=e.Selector._replaceSelector(t),t=n.selector;return t&&(t=t.replace(/,/g,"\ue007"),n.selector=t,t=e.Selector._restoreSelector(n)),t},_splitQueries:function(t,n){t.indexOf(",")>-1&&(t=e.Selector._replaceCommas(t));var r=t.split("\ue007"),i=[],s="",o,u,a;if(n){n.nodeType===1&&(o=e.Selector._escapeId(e.DOM.getId(n)),o||(o=e.guid(),e.DOM.setId(n,o)),s='[id="'+o+'"] ');for(u=0,a=r.length;u<a;++u)t=s+r[u],i.push([t,n])}return i},_nativeQuery:function(t,n,r){if((e.UA.webkit||e.UA.opera)&&t.indexOf(":checked")>-1&&e.Selector.pseudos&&e.Selector.pseudos.checked)return e.Selector.query(t,n,r,!0);try{return n["querySelector"+(r?"":"All")](t)}catch(i){return e.Selector.query(t,n,r,!0)}},filter:function(t,n){var r=[],i,s;if(t&&n)for(i=0;s=t[i++];)e.Selector.test(s,n)&&(r[r.length]=s);return r},test:function(t,r,i){var s=!1,o=!1,u,a,f,l,c,h,p,d,v;if(t&&t.tagName)if(typeof r=="function")s=r.call(t,t);else{u=r.split(","),!i&&!e.DOM.inDoc(t)&&(a=t.parentNode,a?i=a:(c=t[n].createDocumentFragment(),c.appendChild(t),i=c,o=!0)),i=i||t[n],h=e.Selector._escapeId(e.DOM.getId(t)),h||(h=e.guid(),e.DOM.setId(t,h));for(p=0;v=u[p++];){v+='[id="'+h+'"]',l=e.Selector.query(v,i);for(d=0;f=l[d++];)if(f===t){s=!0;break}if(s)break}o&&c.removeChild(t)}return s},ancestor:function(t,n,r){return e.DOM.ancestor(t,function(t){return e.Selector.test(t,n)},r)},_parse:function(t,n){return n.match(e.Selector._types[t].re)},_replace:function(t,n){var r=e.Selector._types[t];return n.replace(r.re,r.token)},_restore:function(t,n,r){if(r){var i=e.Selector._types[t].token,s,o;for(s=0,o=r.length;s<o;++s)n=n.replace(i,r[s])}return n}};e.mix(e.Selector,r,!0)})(e)},"3.15.0",{requires:["dom-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("selector",function(e,t){},"3.15.0",{requires:["selector-native"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("node-core",function(e,t){var n=".",r="nodeName",i="nodeType",s="ownerDocument",o="tagName",u="_yuid",a={},f=Array.prototype.slice,l=e.DOM,c=function(t){if(!this.getDOMNode)return new c(t);if(typeof t=="string"){t=c._fromString(t);if(!t)return null}var n=t.nodeType!==9?t.uniqueID:t[u];n&&c._instances[n]&&c._instances[n]._node!==t&&(t[u]=null),n=n||e.stamp(t),n||(n=e.guid()),this[u]=n,this._node=t,this._stateProxy=t,this._initPlugins&&this._initPlugins()},h=function(t){var n=null;return t&&(n=typeof t=="string"?function(n){return e.Selector.test(n,t)}:function(n){return t(e.one(n))}),n};c.ATTRS={},c.DOM_EVENTS={},c._fromString=function(t){return t&&(t.indexOf("doc")===0?t=e.config.doc:t.indexOf("win")===0?t=e.config.win:t=e.Selector.query(t,null,!0)),t||null},c.NAME="node",c.re_aria=/^(?:role$|aria-)/,c.SHOW_TRANSITION="fadeIn",c.HIDE_TRANSITION="fadeOut",c._instances={},c.getDOMNode=function(e){return e?e.nodeType?e:e._node||null:null},c.scrubVal=function(t,n){if(t){if(typeof t=="object"||typeof t=="function")if(i in t||l.isWindow(t))t=e.one(t);else if(t.item&&!t._nodes||t[0]&&t[0][i])t=e.all(t)}else typeof t=="undefined"?t=n:t===null&&(t=null);return t},c.addMethod=function(e,t,n){e&&t&&typeof t=="function"&&(c.prototype[e]=function(){var e=f.call(arguments),r=this,i;return e[0]&&e[0]._node&&(e[0]=e[0]._node),e[1]&&e[1]._node&&(e[1]=e[1]._node),e.unshift(r._node),i=t.apply(n||r,e),i&&(i=c.scrubVal(i,r)),typeof i!="undefined"||(i=r),i})},c.importMethod=function(t,n,r){typeof n=="string"?(r=r||n,c.addMethod(r,t[n],t)):e.Array.each(n,function(e){c.importMethod(t,e)})},c.one=function(t){var n=null,r,i;if(t){if(typeof t=="string"){t=c._fromString(t);if(!t)return null}else if(t.getDOMNode)return t;if(t.nodeType||e.DOM.isWindow(t)){i=t.uniqueID&&t.nodeType!==9?t.uniqueID:t._yuid,n=c._instances[i],r=n?n._node:null;if(!n||r&&t!==r)n=new c(t),t.nodeType!=11&&(c._instances[n[u]]=n)}}return n},c.DEFAULT_SETTER=function(t,r){var i=this._stateProxy,s;return t.indexOf(n)>-1?(s=t,t=t.split(n),e.Object.setValue(i,t,r)):typeof i[t]!="undefined"&&(i[t]=r),r},c.DEFAULT_GETTER=function(t){var r=this._stateProxy,i;return t.indexOf&&t.indexOf(n)>-1?i=e.Object.getValue(r,t.split(n)):typeof r[t]!="undefined"&&(i=r[t]),i},e.mix(c.prototype,{DATA_PREFIX:"data-",toString:function(){var e=this[u]+": not bound to a node",t=this._node,n,i,s;return t&&(n=t.attributes,i=n&&n.id?t.getAttribute("id"):null,s=n&&n.className?t.getAttribute("className"):null,e=t[r],i&&(e+="#"+i),s&&(e+="."+s.replace(" ",".")),e+=" "+this[u]),e},get:function(e){var t;return this._getAttr?t=this._getAttr(e):t=this._get(e),t?t=c.scrubVal(t,this):t===null&&(t=null),t},_get:function(e){var t=c.ATTRS[e],n;return t&&t.getter?n=t.getter.call(this):c.re_aria.test(e)?n=this._node.getAttribute(e,2):n=c.DEFAULT_GETTER.apply(this,arguments),n},set:function(e,t){var n=c.ATTRS[e];return this._setAttr?this._setAttr.apply(this,arguments):n&&n.setter?n.setter.call(this,t,e):c.re_aria.test(e)?this._node.setAttribute(e,t):c.DEFAULT_SETTER.apply(this,arguments),this},setAttrs:function(t){return this._setAttrs?this._setAttrs(t):e.Object.each(t,function(e,t){this.set(t,e)},this),this},getAttrs:function(t){var n={};return this._getAttrs?this._getAttrs(t):e.Array.each(t,function(e,t){n[e]=this.get(e)},this),n},compareTo:function(e){var t=this._node;return e&&e._node&&(e=e._node),t===e},inDoc:function(e){var t=this._node;if(t){e=e?e._node||e:t[s];if(e.documentElement)return l.contains(e.documentElement,t)}return!1},getById:function(t){var n=this._node,r=l.byId(t,n[s]);return r&&l.contains(n,r)?r=e.one(r):r=null,r},ancestor:function(t,n,r){return arguments.length===2&&(typeof n=="string"||typeof n=="function")&&(r=n),e.one(l.ancestor(this._node,h(t),n,h(r)))},ancestors:function(t,n,r){return arguments.length===2&&(typeof n=="string"||typeof n=="function")&&(r=n),e.all(l.ancestors(this._node,h(t),n,h(r)))},previous:function(t,n){return e.one(l.elementByAxis(this._node,"previousSibling",h(t),n))},next:function(t,n){return e.one(l.elementByAxis(this._node,"nextSibling",h(t),n))},siblings:function(t){return e.all(l.siblings(this._node,h(t)))},one:function(t){return e.one(e.Selector.query(t,this._node,!0))},all:function(t){var n;return this._node&&(n=e.all(e.Selector.query(t,this._node)),n._query=t,n._queryRoot=this._node),n||e.all([])},test:function(t){return e.Selector.test(this._node,t)},remove:function(e){var t=this._node;return t&&t.parentNode&&t.parentNode.removeChild(t),e&&this.destroy(),this},replace:function(e){var t=this._node;return typeof e=="string"&&(e=c.create(e)),t.parentNode.replaceChild(c.getDOMNode(e),t),this},replaceChild:function(t,n){return typeof t=="string"&&(t=l.create(t)),e.one(this._node.replaceChild(c.getDOMNode(t),c.getDOMNode(n)))},destroy:function(t){var n=e.config.doc.uniqueID?"uniqueID":"_yuid",r;this.purge(),this.unplug&&this.unplug(),this.clearData(),t&&e.NodeList.each(this.all("*"),function(t){r=c._instances[t[n]],r?r.destroy():e.Event.purgeElement(t)}),this._node=null,this._stateProxy=null,delete c._instances[this._yuid]},invoke:function(e,t,n,r,i,s){var o=this._node,u;return t&&t._node&&(t=t._node),n&&n._node&&(n=n._node),u=o[e](t,n,r,i,s),c.scrubVal(u,this)},swap:e.config.doc.documentElement.swapNode?function(e){this._node.swapNode(c.getDOMNode(e))}:function(e){e=c.getDOMNode(e);var t=this._node,n=e.parentNode,r=e.nextSibling;return r===t?n.insertBefore(t,e):e===t.nextSibling?n.insertBefore(e,t):(t.parentNode.replaceChild(e,t),l.addHTML(n,t,r)),this},hasMethod:function(e){var t=this._node;return!(!(t&&e in t&&typeof t[e]!="unknown")||typeof t[e]!="function"&&String(t[e]).indexOf("function")!==1)},isFragment:function(){return this.get("nodeType")===11},empty:function(){return this.get("childNodes").remove().destroy(!0),this},getDOMNode:function(){return this._node}},!0),e.Node=c,e.one=c.one;var p=function(t){var n=[];t&&(typeof t=="string"?(this._query=t,t=e.Selector.query(t)):t.nodeType||l.isWindow(t)?t=[t]:t._node?t=[t._node]:
-t[0]&&t[0]._node?(e.Array.each(t,function(e){e._node&&n.push(e._node)}),t=n):t=e.Array(t,0,!0)),this._nodes=t||[]};p.NAME="NodeList",p.getDOMNodes=function(e){return e&&e._nodes?e._nodes:e},p.each=function(t,n,r){var i=t._nodes;i&&i.length&&e.Array.each(i,n,r||t)},p.addMethod=function(t,n,r){t&&n&&(p.prototype[t]=function(){var t=[],i=arguments;return e.Array.each(this._nodes,function(s){var o=s.uniqueID&&s.nodeType!==9?"uniqueID":"_yuid",u=e.Node._instances[s[o]],a,f;u||(u=p._getTempNode(s)),a=r||u,f=n.apply(a,i),f!==undefined&&f!==u&&(t[t.length]=f)}),t.length?t:this})},p.importMethod=function(t,n,r){typeof n=="string"?(r=r||n,p.addMethod(n,t[n])):e.Array.each(n,function(e){p.importMethod(t,e)})},p._getTempNode=function(t){var n=p._tempNode;return n||(n=e.Node.create("<div></div>"),p._tempNode=n),n._node=t,n._stateProxy=t,n},e.mix(p.prototype,{_invoke:function(e,t,n){var r=n?[]:this;return this.each(function(i){var s=i[e].apply(i,t);n&&r.push(s)}),r},item:function(t){return e.one((this._nodes||[])[t])},each:function(t,n){var r=this;return e.Array.each(this._nodes,function(i,s){return i=e.one(i),t.call(n||i,i,s,r)}),r},batch:function(t,n){var r=this;return e.Array.each(this._nodes,function(i,s){var o=e.Node._instances[i[u]];return o||(o=p._getTempNode(i)),t.call(n||o,o,s,r)}),r},some:function(t,n){var r=this;return e.Array.some(this._nodes,function(i,s){return i=e.one(i),n=n||i,t.call(n,i,s,r)})},toFrag:function(){return e.one(e.DOM._nl2frag(this._nodes))},indexOf:function(t){return e.Array.indexOf(this._nodes,e.Node.getDOMNode(t))},filter:function(t){return e.all(e.Selector.filter(this._nodes,t))},modulus:function(t,n){n=n||0;var r=[];return p.each(this,function(e,i){i%t===n&&r.push(e)}),e.all(r)},odd:function(){return this.modulus(2,1)},even:function(){return this.modulus(2)},destructor:function(){},refresh:function(){var t,n=this._nodes,r=this._query,i=this._queryRoot;return r&&(i||n&&n[0]&&n[0].ownerDocument&&(i=n[0].ownerDocument),this._nodes=e.Selector.query(r,i)),this},size:function(){return this._nodes.length},isEmpty:function(){return this._nodes.length<1},toString:function(){var e="",t=this[u]+": not bound to any nodes",n=this._nodes,i;return n&&n[0]&&(i=n[0],e+=i[r],i.id&&(e+="#"+i.id),i.className&&(e+="."+i.className.replace(" ",".")),n.length>1&&(e+="...["+n.length+" items]")),e||t},getDOMNodes:function(){return this._nodes}},!0),p.importMethod(e.Node.prototype,["destroy","empty","remove","set"]),p.prototype.get=function(t){var n=[],r=this._nodes,i=!1,s=p._getTempNode,o,u;return r[0]&&(o=e.Node._instances[r[0]._yuid]||s(r[0]),u=o._get(t),u&&u.nodeType&&(i=!0)),e.Array.each(r,function(r){o=e.Node._instances[r._yuid],o||(o=s(r)),u=o._get(t),i||(u=e.Node.scrubVal(u,o)),n.push(u)}),i?e.all(n):n},e.NodeList=p,e.all=function(e){return new p(e)},e.Node.all=e.all;var d=e.NodeList,v=Array.prototype,m={concat:1,pop:0,push:0,shift:0,slice:1,splice:1,unshift:0};e.Object.each(m,function(t,n){d.prototype[n]=function(){var r=[],i=0,s,o;while(typeof (s=arguments[i++])!="undefined")r.push(s._node||s._nodes||s);return o=v[n].apply(this._nodes,r),t?o=e.all(o):o=e.Node.scrubVal(o),o}}),e.Array.each(["removeChild","hasChildNodes","cloneNode","hasAttribute","scrollIntoView","getElementsByTagName","focus","blur","submit","reset","select","createCaption"],function(t){e.Node.prototype[t]=function(e,n,r){var i=this.invoke(t,e,n,r);return i}}),e.Node.prototype.removeAttribute=function(e){var t=this._node;return t&&t.removeAttribute(e,0),this},e.Node.importMethod(e.DOM,["contains","setAttribute","getAttribute","wrap","unwrap","generateID"]),e.NodeList.importMethod(e.Node.prototype,["getAttribute","setAttribute","removeAttribute","unwrap","wrap","generateID"])},"3.15.0",{requires:["dom-core","selector"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("color-base",function(e,t){var n=/^#?([\da-fA-F]{2})([\da-fA-F]{2})([\da-fA-F]{2})(\ufffe)?/,r=/^#?([\da-fA-F]{1})([\da-fA-F]{1})([\da-fA-F]{1})(\ufffe)?/,i=/rgba?\(([\d]{1,3}), ?([\d]{1,3}), ?([\d]{1,3}),? ?([.\d]*)?\)/,s={HEX:"hex",RGB:"rgb",RGBA:"rgba"},o={hex:"toHex",rgb:"toRGB",rgba:"toRGBA"};e.Color={KEYWORDS:{black:"000",silver:"c0c0c0",gray:"808080",white:"fff",maroon:"800000",red:"f00",purple:"800080",fuchsia:"f0f",green:"008000",lime:"0f0",olive:"808000",yellow:"ff0",navy:"000080",blue:"00f",teal:"008080",aqua:"0ff"},REGEX_HEX:n,REGEX_HEX3:r,REGEX_RGB:i,re_RGB:i,re_hex:n,re_hex3:r,STR_HEX:"#{*}{*}{*}",STR_RGB:"rgb({*}, {*}, {*})",STR_RGBA:"rgba({*}, {*}, {*}, {*})",TYPES:s,CONVERTS:o,convert:function(t,n){var r=e.Color.CONVERTS[n.toLowerCase()],i=t;return r&&e.Color[r]&&(i=e.Color[r](t)),i},toHex:function(t){var n=e.Color._convertTo(t,"hex"),r=n.toLowerCase()==="transparent";return n.charAt(0)!=="#"&&!r&&(n="#"+n),r?n.toLowerCase():n.toUpperCase()},toRGB:function(t){var n=e.Color._convertTo(t,"rgb");return n.toLowerCase()},toRGBA:function(t){var n=e.Color._convertTo(t,"rgba");return n.toLowerCase()},toArray:function(t){var n=e.Color.findType(t).toUpperCase(),r,i,s,o;return n==="HEX"&&t.length<5&&(n="HEX3"),n.charAt(n.length-1)==="A"&&(n=n.slice(0,-1)),r=e.Color["REGEX_"+n],r&&(i=r.exec(t)||[],s=i.length,s&&(i.shift(),s--,n==="HEX3"&&(i[0]+=i[0],i[1]+=i[1],i[2]+=i[2]),o=i[s-1],o||(i[s-1]=1))),i},fromArray:function(t,n){t=t.concat();if(typeof n=="undefined")return t.join(", ");var r="{*}";n=e.Color["STR_"+n.toUpperCase()],t.length===3&&n.match(/\{\*\}/g).length===4&&t.push(1);while(n.indexOf(r)>=0&&t.length>0)n=n.replace(r,t.shift());return n},findType:function(t){if(e.Color.KEYWORDS[t])return"keyword";var n=t.indexOf("("),r;return n>0&&(r=t.substr(0,n)),r&&e.Color.TYPES[r.toUpperCase()]?e.Color.TYPES[r.toUpperCase()]:"hex"},_getAlpha:function(t){var n,r=e.Color.toArray(t);return r.length>3&&(n=r.pop()),+n||1},_keywordToHex:function(t){var n=e.Color.KEYWORDS[t];if(n)return n},_convertTo:function(t,n){if(t==="transparent")return t;var r=e.Color.findType(t),i=n,s,o,u,a;return r==="keyword"&&(t=e.Color._keywordToHex(t),r="hex"),r==="hex"&&t.length<5&&(t.charAt(0)==="#"&&(t=t.substr(1)),t="#"+t.charAt(0)+t.charAt(0)+t.charAt(1)+t.charAt(1)+t.charAt(2)+t.charAt(2)),r===n?t:(r.charAt(r.length-1)==="a"&&(r=r.slice(0,-1)),s=n.charAt(n.length-1)==="a",s&&(n=n.slice(0,-1),o=e.Color._getAlpha(t)),a=n.charAt(0).toUpperCase()+n.substr(1).toLowerCase(),u=e.Color["_"+r+"To"+a],u||r!=="rgb"&&n!=="rgb"&&(t=e.Color["_"+r+"ToRgb"](t),r="rgb",u=e.Color["_"+r+"To"+a]),u&&(t=u(t,s)),s&&(e.Lang.isArray(t)||(t=e.Color.toArray(t)),t.push(o),t=e.Color.fromArray(t,i.toUpperCase())),t)},_hexToRgb:function(e,t){var n,r,i;return e.charAt(0)==="#"&&(e=e.substr(1)),e=parseInt(e,16),n=e>>16,r=e>>8&255,i=e&255,t?[n,r,i]:"rgb("+n+", "+r+", "+i+")"},_rgbToHex:function(t){var n=e.Color.toArray(t),r=n[2]|n[1]<<8|n[0]<<16;r=(+r).toString(16);while(r.length<6)r="0"+r;return"#"+r}}},"3.15.0",{requires:["yui-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("dom-style",function(e,t){(function(e){var t="documentElement",n="defaultView",r="ownerDocument",i="style",s="float",o="cssFloat",u="styleFloat",a="transparent",f="getComputedStyle",l="getBoundingClientRect",c=e.config.win,h=e.config.doc,p=undefined,d=e.DOM,v="transform",m="transformOrigin",g=["WebkitTransform","MozTransform","OTransform","msTransform"],y=/color$/i,b=/width|height|top|left|right|bottom|margin|padding/i;e.Array.each(g,function(e){e in h[t].style&&(v=e,m=e+"Origin")}),e.mix(d,{DEFAULT_UNIT:"px",CUSTOM_STYLES:{},setStyle:function(e,t,n,r){r=r||e.style;var i=d.CUSTOM_STYLES;if(r){n===null||n===""?n="":!isNaN(new Number(n))&&b.test(t)&&(n+=d.DEFAULT_UNIT);if(t in i){if(i[t].set){i[t].set(e,n,r);return}typeof i[t]=="string"&&(t=i[t])}else t===""&&(t="cssText",n="");r[t]=n}},getStyle:function(e,t,n){n=n||e.style;var r=d.CUSTOM_STYLES,i="";if(n){if(t in r){if(r[t].get)return r[t].get(e,t,n);typeof r[t]=="string"&&(t=r[t])}i=n[t],i===""&&(i=d[f](e,t))}return i},setStyles:function(t,n){var r=t.style;e.each(n,function(e,n){d.setStyle(t,n,e,r)},d)},getComputedStyle:function(e,t){var s="",o=e[r],u;return e[i]&&o[n]&&o[n][f]&&(u=o[n][f](e,null),u&&(s=u[t])),s}}),h[t][i][o]!==p?d.CUSTOM_STYLES[s]=o:h[t][i][u]!==p&&(d.CUSTOM_STYLES[s]=u),e.UA.opera&&(d[f]=function(t,i){var s=t[r][n],o=s[f](t,"")[i];return y.test(i)&&(o=e.Color.toRGB(o)),o}),e.UA.webkit&&(d[f]=function(e,t){var i=e[r][n],s=i[f](e,"")[t];return s==="rgba(0, 0, 0, 0)"&&(s=a),s}),e.DOM._getAttrOffset=function(t,n){var r=e.DOM[f](t,n),i=t.offsetParent,s,o,u;return r==="auto"&&(s=e.DOM.getStyle(t,"position"),s==="static"||s==="relative"?r=0:i&&i[l]&&(o=i[l]()[n],u=t[l]()[n],n==="left"||n==="top"?r=u-o:r=o-t[l]()[n])),r},e.DOM._getOffset=function(e){var t,n=null;return e&&(t=d.getStyle(e,"position"),n=[parseInt(d[f](e,"left"),10),parseInt(d[f](e,"top"),10)],isNaN(n[0])&&(n[0]=parseInt(d.getStyle(e,"left"),10),isNaN(n[0])&&(n[0]=t==="relative"?0:e.offsetLeft||0)),isNaN(n[1])&&(n[1]=parseInt(d.getStyle(e,"top"),10),isNaN(n[1])&&(n[1]=t==="relative"?0:e.offsetTop||0))),n},d.CUSTOM_STYLES.transform={set:function(e,t,n){n[v]=t},get:function(e,t){return d[f](e,v)}},d.CUSTOM_STYLES.transformOrigin={set:function(e,t,n){n[m]=t},get:function(e,t){return d[f](e,m)}}})(e)},"3.15.0",{requires:["dom-base","color-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("node-base",function(e,t){var n=["hasClass","addClass","removeClass","replaceClass","toggleClass"];e.Node.importMethod(e.DOM,n),e.NodeList.importMethod(e.Node.prototype,n);var r=e.Node,i=e.DOM;r.create=function(t,n){return n&&n._node&&(n=n._node),e.one(i.create(t,n))},e.mix(r.prototype,{create:r.create,insert:function(e,t){return this._insert(e,t),this},_insert:function(e,t){var n=this._node,r=null;return typeof t=="number"?t=this._node.childNodes[t]:t&&t._node&&(t=t._node),e&&typeof e!="string"&&(e=e._node||e._nodes||e),r=i.addHTML(n,e,t),r},prepend:function(e){return this.insert(e,0)},append:function(e){return this.insert(e,null)},appendChild:function(e){return r.scrubVal(this._insert(e))},insertBefore:function(t,n){return e.Node.scrubVal(this._insert(t,n))},appendTo:function(t){return e.one(t).append(this),this},setContent:function(e){return this._insert(e,"replace"),this},getContent:function(){var e=this;return e._node.nodeType===11&&(e=e.create("<div/>").append(e.cloneNode(!0))),e.get("innerHTML")}}),e.Node.prototype.setHTML=e.Node.prototype.setContent,e.Node.prototype.getHTML=e.Node.prototype.getContent,e.NodeList.importMethod(e.Node.prototype,["append","insert","appendChild","insertBefore","prepend","setContent","getContent","setHTML","getHTML"]);var r=e.Node,i=e.DOM;r.ATTRS={text:{getter:function(){return i.getText(this._node)},setter:function(e){return i.setText(this._node,e),e}},"for":{getter:function(){return i.getAttribute(this._node,"for")},setter:function(e){return i.setAttribute(this._node,"for",e),e}},options:{getter:function(){return this._node.getElementsByTagName("option")}},children:{getter:function(){var t=this._node,n=t.children,r,i,s;if(!n){r=t.childNodes,n=[];for(i=0,s=r.length;i<s;++i)r[i].tagName&&(n[n.length]=r[i])}return e.all(n)}},value:{getter:function(){return i.getValue(this._node)},setter:function(e){return i.setValue(this._node,e),e}}},e.Node.importMethod(e.DOM,["setAttribute","getAttribute"]);var r=e.Node,s=e.NodeList;r.DOM_EVENTS={abort:1,beforeunload:1,blur:1,change:1,click:1,close:1,command:1,contextmenu:1,copy:1,cut:1,dblclick:1,DOMMouseScroll:1,drag:1,dragstart:1,dragenter:1,dragover:1,dragleave:1,dragend:1,drop:1,error:1,focus:1,key:1,keydown:1,keypress:1,keyup:1,load:1,message:1,mousedown:1,mouseenter:1,mouseleave:1,mousemove:1,mousemultiwheel:1,mouseout:1,mouseover:1,mouseup:1,mousewheel:1,orientationchange:1,paste:1,reset:1,resize:1,select:1,selectstart:1,submit:1,scroll:1,textInput:1,unload:1},e.mix(r.DOM_EVENTS,e.Env.evt.plugins),e.augment(r,e.EventTarget),e.mix(r.prototype,{purge:function(t,n){return e.Event.purgeElement(this._node,t,n),this}}),e.mix(e.NodeList.prototype,{_prepEvtArgs:function(t,n,r){var i=e.Array(arguments,0,!0);return i.length<2?i[2]=this._nodes:i.splice(2,0,this._nodes),i[3]=r||this,i},on:function(t,n,r){return e.on.apply(e,this._prepEvtArgs.apply(this,arguments))},once:function(t,n,r){return e.once.apply(e,this._prepEvtArgs.apply(this,arguments))},after:function(t,n,r){return e.after.apply(e,this._prepEvtArgs.apply(this,arguments))},onceAfter:function(t,n,r){return e.onceAfter.apply(e,this._prepEvtArgs.apply(this,arguments))}}),s.importMethod(e.Node.prototype,["detach","detachAll"]),e.mix(e.Node.ATTRS,{offsetHeight:{setter:function(t){return e.DOM.setHeight(this._node,t),t},getter:function(){return this._node.offsetHeight}},offsetWidth:{setter:function(t){return e.DOM.setWidth(this._node,t),t},getter:function(){return this._node.offsetWidth}}}),e.mix(e.Node.prototype,{sizeTo:function(t,n){var r;arguments.length<2&&(r=e.one(t),t=r.get("offsetWidth"),n=r.get("offsetHeight")),this.setAttrs({offsetWidth:t,offsetHeight:n})}}),e.config.doc.documentElement.hasAttribute||(e.Node.prototype.hasAttribute=function(e){return e==="value"&&this.get("value")!==""?!0:!!this._node.attributes[e]&&!!this._node.attributes[e].specified}),e.Node.prototype.focus=function(){try{this._node.focus()}catch(e){}return this},e.Node.ATTRS.type={setter:function(e){if(e==="hidden")try{this._node.type="hidden"}catch(t){this._node.style.display="none",this._inputType="hidden"}else try{this._node.type=e}catch(t){}return e},getter:function(){return this._inputType||this._node.type},_bypassProxy:!0},e.config.doc.createElement("form").elements.nodeType&&(e.Node.ATTRS.elements={getter:function(){return this.all("input, textarea, button, select")}}),e.mix(e.Node.prototype,{_initData:function(){"_data"in this||(this._data={})},getData:function(t){this._initData();var n=this._data,r=n;return arguments.length?t in n?r=n[t]:r=this._getDataAttribute(t):typeof n=="object"&&n!==null&&(r={},e.Object.each(n,function(e,t){r[t]=e}),r=this._getDataAttributes(r)),r},_getDataAttributes:function(e){e=e||{};var t=0,n=this._node.attributes,r=n.length,i=this.DATA_PREFIX,s=i.length,o;while(t<r)o=n[t].name,o.indexOf(i)===0&&(o=o.substr(s),o in e||(e[o]=this._getDataAttribute(o))),t+=1;return e},_getDataAttribute:function(e){e=this.DATA_PREFIX+e;var t=this._node,n=t.attributes,r=n&&n[e]&&n[e].value;return r},setData:function(e,t){return this._initData(),arguments.length>1?this._data[e]=t:this._data=e,this},clearData:function(e){return"_data"in this&&(typeof e!="undefined"?delete this._data[e]:delete this._data),this}}),e.mix(e.NodeList.prototype,{getData:function(e){var t=arguments.length?[e]:[];return this._invoke("getData",t,!0)},setData:function(e,t){var n=arguments.length>1?[e,t]:[e];return this._invoke("setData",n)},clearData:function(e){var t=arguments.length?[e]:[];return this._invoke("clearData",[e])}})},"3.15.0",{requires:["event-base","node-core","dom-base","dom-style"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("widget-base",function(e,t){function R(e){var t=this,n,r,i=t.constructor;t._strs={},t._cssPrefix=i.CSS_PREFIX||s(i.NAME.toLowerCase()),e=e||{},R.superclass.constructor.call(t,e),r=t.get(T),r&&(r!==P&&(n=r),t.render(n))}var n=e.Lang,r=e.Node,i=e.ClassNameManager,s=i.getClassName,o,u=e.cached(function(e){return e.substring(0,1).toUpperCase()+e.substring(1)}),a="content",f="visible",l="hidden",c="disabled",h="focused",p="width",d="height",v="boundingBox",m="contentBox",g="parentNode",y="ownerDocument",b="auto",w="srcNode",E="body",S="tabIndex",x="id",T="render",N="rendered",C="destroyed",k="strings",L="<div></div>",A="Change",O="loading",M="_uiSet",_="",D=function(){},P=!0,H=!1,B,j={},F=[f,c,d,p,h,S],I=e.UA.webkit,q={};R.NAME="widget",B=R.UI_SRC="ui",R.ATTRS=j,j[x]={valueFn:"_guid",writeOnce:P},j[N]={value:H,readOnly:P},j[v]={valueFn:"_defaultBB",setter:"_setBB",writeOnce:P},j[m]={valueFn:"_defaultCB",setter:"_setCB",writeOnce:P},j[S]={value:null,validator:"_validTabIndex"},j[h]={value:H,readOnly:P},j[c]={value:H},j[f]={value:P},j[d]={value:_},j[p]={value:_},j[k]={value:{},setter:"_strSetter",getter:"_strGetter"},j[T]={value:H,writeOnce:P},R.CSS_PREFIX=s(R.NAME.toLowerCase()),R.getClassName=function(){return s.apply(i,[R.CSS_PREFIX].concat(e.Array(arguments),!0))},o=R.getClassName,R.getByNode=function(t){var n,i=o();return t=r.one(t),t&&(t=t.ancestor("."+i,!0),t&&(n=q[e.stamp(t,!0)])),n||null},e.extend(R,e.Base,{getClassName:function(){return s.apply(i,[this._cssPrefix].concat(e.Array(arguments),!0))},initializer:function(t){var n=this.get(v);n instanceof r&&this._mapInstance(e.stamp(n))},_mapInstance:function(e){q[e]=this},destructor:function(){var t=this.get(v),n;t instanceof r&&(n=e.stamp(t,!0),n in q&&delete q[n],this._destroyBox())},destroy:function(e){return this._destroyAllNodes=e,R.superclass.destroy.apply(this)},_destroyBox:function(){var e=this.get(v),t=this.get(m),n=this._destroyAllNodes,r;r=e&&e.compareTo(t),this.UI_EVENTS&&this._destroyUIEvents(),this._unbindUI(e),t&&(n&&t.empty(),t.remove(P)),r||(n&&e.empty(),e.remove(P))},render:function(e){return!this.get(C)&&!this.get(N)&&(this.publish(T,{queuable:H,fireOnce:P,defaultTargetOnly:P,defaultFn:this._defRenderFn}),this.fire(T,{parentNode:e?r.one(e):null})),this},_defRenderFn:function(e){this._parentNode=e.parentNode,this.renderer(),this._set(N,P),this._removeLoadingClassNames()},renderer:function(){var e=this;e._renderUI(),e.renderUI(),e._bindUI(),e.bindUI(),e._syncUI(),e.syncUI()},bindUI:D,renderUI:D,syncUI:D,hide:function(){return this.set(f,H)},show:function(){return this.set(f,P)},focus:function(){return this._set(h,P)},blur:function(){return this._set(h,H)},enable:function(){return this.set(c,H)},disable:function(){return this.set(c,P)},_uiSizeCB:function(e){this.get(m).toggleClass(o(a,"expanded"),e)},_renderBox:function(e){var t=this,n=t.get(m),i=t.get(v),s=t.get(w),o=t.DEF_PARENT_NODE,u=s&&s.get(y)||i.get(y)||n.get(y);s&&!s.compareTo(n)&&!n.inDoc(u)&&s.replace(n),!i.compareTo(n.get(g))&&!i.compareTo(n)&&(n.inDoc(u)&&n.replace(i),i.appendChild(n)),e=e||o&&r.one(o),e?e.appendChild(i):i.inDoc(u)||r.one(E).insert(i,0)},_setBB:function(e){return this._setBox(this.get(x),e,this.BOUNDING_TEMPLATE,!0)},_setCB:function(e){return this.CONTENT_TEMPLATE===null?this.get(v):this._setBox(null,e,this.CONTENT_TEMPLATE,!1)},_defaultBB:function(){var e=this.get(w),t=this.CONTENT_TEMPLATE===null;return e&&t?e:null},_defaultCB:function(e){return this.get(w)||null},_setBox:function(t,n,i,s){return n=r.one(n),n||(n=r.create(i),s?this._bbFromTemplate=!0:this._cbFromTemplate=!0),n.get(x)||n.set(x,t||e.guid()),n},_renderUI:function(){this._renderBoxClassNames(),this._renderBox(this._parentNode)},_renderBoxClassNames:function(){var e=this._getClasses(),t,n=this.get(v),r;n.addClass(o());for(r=e.length-3;r>=0;r--)t=e[r],n.addClass(t.CSS_PREFIX||s(t.NAME.toLowerCase()));this.get(m).addClass(this.getClassName(a))},_removeLoadingClassNames:function(){var e=this.get(v),t=this.get(m),n=this.getClassName(O),r=o(O);e.removeClass(r).removeClass(n),t.removeClass(r).removeClass(n)},_bindUI:function(){this._bindAttrUI(this._UI_ATTRS.BIND),this._bindDOM()},_unbindUI:function(e){this._unbindDOM(e)},_bindDOM:function(){var t=this.get(v).get(y),n=R._hDocFocus;n||(n=R._hDocFocus=t.on("focus",this._onDocFocus,this),n.listeners={count:0}),n.listeners[e.stamp(this,!0)]=!0,n.listeners.count++,I&&(this._hDocMouseDown=t.on("mousedown",this._onDocMouseDown,this))},_unbindDOM:function(t){var n=R._hDocFocus,r=e.stamp(this,!0),i,s=this._hDocMouseDown;n&&(i=n.listeners,i[r]&&(delete i[r],i.count--),i.count===0&&(n.detach(),R._hDocFocus=null)),I&&s&&s.detach()},_syncUI:function(){this._syncAttrUI(this._UI_ATTRS.SYNC)},_uiSetHeight:function(e){this._uiSetDim(d,e),this._uiSizeCB(e!==_&&e!==b)},_uiSetWidth:function(e){this._uiSetDim(p,e)},_uiSetDim:function(e,t){this.get(v).setStyle(e,n.isNumber(t)?t+this.DEF_UNIT:t)},_uiSetVisible:function(e){this.get(v).toggleClass(this.getClassName(l),!e)},_uiSetDisabled:function(e){this.get(v).toggleClass(this.getClassName(c),e)},_uiSetFocused:function(e,t){var n=this.get(v);n.toggleClass(this.getClassName(h),e),t!==B&&(e?n.focus():n.blur())},_uiSetTabIndex:function(e){var t=this.get(v);n.isNumber(e)?t.set(S,e):t.removeAttribute(S)},_onDocMouseDown:function(e){this._domFocus&&this._onDocFocus(e)},_onDocFocus:function(e){var t=R.getByNode(e.target),n=R._active;n&&n!==t&&(n._domFocus=!1,n._set(h,!1,{src:B}),R._active=null),t&&(t._domFocus=!0,t._set(h,!0,{src:B}),R._active=t)},toString:function(){return this.name+"["+this.get(x)+"]"},DEF_UNIT:"px",DEF_PARENT_NODE:null,CONTENT_TEMPLATE:L,BOUNDING_TEMPLATE:L,_guid:function(){return e.guid()},_validTabIndex:function(e){return n.isNumber(e)||n.isNull(e)},_bindAttrUI:function(e){var t,n=e.length;for(t=0;t<n;t++)this.after(e[t]+A,this._setAttrUI)},_syncAttrUI:function(e){var t,n=e.length,r;for(t=0;t<n;t++)r=e[t],this[M+u(r)](this.get(r))},_setAttrUI:function(e){e.target===this&&this[M+u(e.attrName
-)](e.newVal,e.src)},_strSetter:function(t){return e.merge(this.get(k),t)},getString:function(e){return this.get(k)[e]},getStrings:function(){return this.get(k)},_UI_ATTRS:{BIND:F,SYNC:F}}),e.Widget=R},"3.15.0",{requires:["attribute","base-base","base-pluginhost","classnamemanager","event-focus","node-base","node-style"],skinnable:!0});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("pluginhost-base",function(e,t){function r(){this._plugins={}}var n=e.Lang;r.prototype={plug:function(e,t){var r,i,s;if(n.isArray(e))for(r=0,i=e.length;r<i;r++)this.plug(e[r]);else e&&!n.isFunction(e)&&(t=e.cfg,e=e.fn),e&&e.NS&&(s=e.NS,t=t||{},t.host=this,this.hasPlugin(s)?this[s].setAttrs&&this[s].setAttrs(t):(this[s]=new e(t),this._plugins[s]=e));return this},unplug:function(e){var t=e,r=this._plugins;if(e)n.isFunction(e)&&(t=e.NS,t&&(!r[t]||r[t]!==e)&&(t=null)),t&&(this[t]&&(this[t].destroy&&this[t].destroy(),delete this[t]),r[t]&&delete r[t]);else for(t in this._plugins)this._plugins.hasOwnProperty(t)&&this.unplug(t);return this},hasPlugin:function(e){return this._plugins[e]&&this[e]},_initPlugins:function(e){this._plugins=this._plugins||{},this._initConfigPlugins&&this._initConfigPlugins(e)},_destroyPlugins:function(){this.unplug()}},e.namespace("Plugin").Host=r},"3.15.0",{requires:["yui-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("pluginhost-config",function(e,t){var n=e.Plugin.Host,r=e.Lang;n.prototype._initConfigPlugins=function(t){var n=this._getClasses?this._getClasses():[this.constructor],r=[],i={},s,o,u,a,f;for(o=n.length-1;o>=0;o--)s=n[o],a=s._UNPLUG,a&&e.mix(i,a,!0),u=s._PLUG,u&&e.mix(r,u,!0);for(f in r)r.hasOwnProperty(f)&&(i[f]||this.plug(r[f]));t&&t.plugins&&this.plug(t.plugins)},n.plug=function(t,n,i){var s,o,u,a;if(t!==e.Base){t._PLUG=t._PLUG||{},r.isArray(n)||(i&&(n={fn:n,cfg:i}),n=[n]);for(o=0,u=n.length;o<u;o++)s=n[o],a=s.NAME||s.fn.NAME,t._PLUG[a]=s}},n.unplug=function(t,n){var i,s,o,u;if(t!==e.Base){t._UNPLUG=t._UNPLUG||{},r.isArray(n)||(n=[n]);for(s=0,o=n.length;s<o;s++)i=n[s],u=i.NAME,t._PLUG[u]?delete t._PLUG[u]:t._UNPLUG[u]=i}}},"3.15.0",{requires:["pluginhost-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("dom-style-ie",function(e,t){(function(e){var t="hasLayout",n="px",r="filter",i="filters",s="opacity",o="auto",u="borderWidth",a="borderTopWidth",f="borderRightWidth",l="borderBottomWidth",c="borderLeftWidth",h="width",p="height",d="transparent",v="visible",m="getComputedStyle",g=undefined,y=e.config.doc.documentElement,b=e.Features.test,w=e.Features.add,E=/^(\d[.\d]*)+(em|ex|px|gd|rem|vw|vh|vm|ch|mm|cm|in|pt|pc|deg|rad|ms|s|hz|khz|%){1}?/i,S=e.UA.ie>=8,x=function(e){return e.currentStyle||e.style},T={CUSTOM_STYLES:{},get:function(t,r){var i="",o;return t&&(o=x(t)[r],r===s&&e.DOM.CUSTOM_STYLES[s]?i=e.DOM.CUSTOM_STYLES[s].get(t):!o||o.indexOf&&o.indexOf(n)>-1?i=o:e.DOM.IE.COMPUTED[r]?i=e.DOM.IE.COMPUTED[r](t,r):E.test(o)?i=T.getPixel(t,r)+n:i=o),i},sizeOffsets:{width:["Left","Right"],height:["Top","Bottom"],top:["Top"],bottom:["Bottom"]},getOffset:function(e,t){var r=x(e)[t],i=t.charAt(0).toUpperCase()+t.substr(1),s="offset"+i,u="pixel"+i,a=T.sizeOffsets[t],f=e.ownerDocument.compatMode,l="";return r===o||r.indexOf("%")>-1?(l=e["offset"+i],f!=="BackCompat"&&(a[0]&&(l-=T.getPixel(e,"padding"+a[0]),l-=T.getBorderWidth(e,"border"+a[0]+"Width",1)),a[1]&&(l-=T.getPixel(e,"padding"+a[1]),l-=T.getBorderWidth(e,"border"+a[1]+"Width",1)))):(!e.style[u]&&!e.style[t]&&(e.style[t]=r),l=e.style[u]),l+n},borderMap:{thin:S?"1px":"2px",medium:S?"3px":"4px",thick:S?"5px":"6px"},getBorderWidth:function(e,t,r){var i=r?"":n,s=e.currentStyle[t];return s.indexOf(n)<0&&(T.borderMap[s]&&e.currentStyle.borderStyle!=="none"?s=T.borderMap[s]:s=0),r?parseFloat(s):s},getPixel:function(e,t){var n=null,r=x(e),i=r.right,s=r[t];return e.style.right=s,n=e.style.pixelRight,e.style.right=i,n},getMargin:function(e,t){var r,i=x(e);return i[t]==o?r=0:r=T.getPixel(e,t),r+n},getVisibility:function(e,t){var n;while((n=e.currentStyle)&&n[t]=="inherit")e=e.parentNode;return n?n[t]:v},getColor:function(t,n){var r=x(t)[n];return(!r||r===d)&&e.DOM.elementByAxis(t,"parentNode",null,function(e){r=x(e)[n];if(r&&r!==d)return t=e,!0}),e.Color.toRGB(r)},getBorderColor:function(t,n){var r=x(t),i=r[n]||r.color;return e.Color.toRGB(e.Color.toHex(i))}},N={};w("style","computedStyle",{test:function(){return"getComputedStyle"in e.config.win}}),w("style","opacity",{test:function(){return"opacity"in y.style}}),w("style","filter",{test:function(){return"filters"in y}}),!b("style","opacity")&&b("style","filter")&&(e.DOM.CUSTOM_STYLES[s]={get:function(e){var t=100;try{t=e[i]["DXImageTransform.Microsoft.Alpha"][s]}catch(n){try{t=e[i]("alpha")[s]}catch(r){}}return t/100},set:function(e,n,i){var o,u=x(e),a=u[r];i=i||e.style,n===""&&(o=s in u?u[s]:1,n=o),typeof a=="string"&&(i[r]=a.replace(/alpha([^)]*\))/gi,"")+(n<=1?"alpha("+s+"="+n*100+")":""),i[r]||i.removeAttribute(r),u[t]||(i.zoom=1))}});try{e.config.doc.createElement("div").style.height="-1px"}catch(C){e.DOM.CUSTOM_STYLES.height={set:function(e,t,n){var r=parseFloat(t);if(r>=0||t==="auto"||t==="")n.height=t}},e.DOM.CUSTOM_STYLES.width={set:function(e,t,n){var r=parseFloat(t);if(r>=0||t==="auto"||t==="")n.width=t}}}b("style","computedStyle")||(N[h]=N[p]=T.getOffset,N.color=N.backgroundColor=T.getColor,N[u]=N[a]=N[f]=N[l]=N[c]=T.getBorderWidth,N.marginTop=N.marginRight=N.marginBottom=N.marginLeft=T.getMargin,N.visibility=T.getVisibility,N.borderColor=N.borderTopColor=N.borderRightColor=N.borderBottomColor=N.borderLeftColor=T.getBorderColor,e.DOM[m]=T.get,e.namespace("DOM.IE"),e.DOM.IE.COMPUTED=N,e.DOM.IE.ComputedStyle=T)})(e)},"3.15.0",{requires:["dom-style"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-(function(){var e,t=YUI.Env,n=YUI.config,r=n.doc,i=r&&r.documentElement,s="onreadystatechange",o=n.pollInterval||40;i.doScroll&&!t._ieready&&(t._ieready=function(){t._ready()},
-/*! DOMReady: based on work by: Dean Edwards/John Resig/Matthias Miller/Diego Perini */
-self!==self.top?(e=function(){r.readyState=="complete"&&(t.remove(r,s,e),t.ieready())},t.add(r,s,e)):t._dri=setInterval(function(){try{i.doScroll("left"),clearInterval(t._dri),t._dri=null,t._ieready()}catch(e){}},o))})(),YUI.add("event-base-ie",function(e,t){function n(){e.DOM2EventFacade.apply(this,arguments)}function r(t){var n=e.config.doc.createEventObject(t),i=r.prototype;return n.hasOwnProperty=function(){return!0},n.init=i.init,n.halt=i.halt,n.preventDefault=i.preventDefault,n.stopPropagation=i.stopPropagation,n.stopImmediatePropagation=i.stopImmediatePropagation,e.DOM2EventFacade.apply(n,arguments),n}var i=e.config.doc&&e.config.doc.implementation,s=e.config.lazyEventFacade,o={0:1,4:2,2:3},u={mouseout:"toElement",mouseover:"fromElement"},a=e.DOM2EventFacade.resolve,f={init:function(){n.superclass.init.apply(this,arguments);var t=this._event,r,i,s,u,f,l;this.target=a(t.srcElement),"clientX"in t&&!r&&0!==r&&(r=t.clientX,i=t.clientY,s=e.config.doc,u=s.body,f=s.documentElement,r+=f.scrollLeft||u&&u.scrollLeft||0,i+=f.scrollTop||u&&u.scrollTop||0,this.pageX=r,this.pageY=i),t.type=="mouseout"?l=t.toElement:t.type=="mouseover"&&(l=t.fromElement),this.relatedTarget=a(l||t.relatedTarget),this.which=this.button=t.keyCode||o[t.button]||t.button},stopPropagation:function(){this._event.cancelBubble=!0,this._wrapper.stopped=1,this.stopped=1},stopImmediatePropagation:function(){this.stopPropagation(),this._wrapper.stopped=2,this.stopped=2},preventDefault:function(e){this._event.returnValue=e||!1,this._wrapper.prevented=1,this.prevented=1}};e.extend(n,e.DOM2EventFacade,f),e.extend(r,e.DOM2EventFacade,f),r.prototype.init=function(){var e=this._event,t=this._wrapper.overrides,n=r._define,i=r._lazyProperties,s;this.altKey=e.altKey,this.ctrlKey=e.ctrlKey,this.metaKey=e.metaKey,this.shiftKey=e.shiftKey,this.type=t&&t.type||e.type,this.clientX=e.clientX,this.clientY=e.clientY,this.keyCode=this.charCode=e.keyCode,this.which=this.button=e.keyCode||o[e.button]||e.button;for(s in i)i.hasOwnProperty(s)&&n(this,s,i[s]);this._touch&&this._touch(e,this._currentTarget,this._wrapper)},r._lazyProperties={target:function(){return a(this._event.srcElement)},relatedTarget:function(){var e=this._event,t=u[e.type]||"relatedTarget";return a(e[t]||e.relatedTarget)},currentTarget:function(){return a(this._currentTarget)},wheelDelta:function(){var e=this._event;if(e.type==="mousewheel"||e.type==="DOMMouseScroll")return e.detail?e.detail*-1:Math.round(e.wheelDelta/80)||(e.wheelDelta<0?-1:1)},pageX:function(){var t=this._event,n=t.pageX,r,i,s;return n===undefined&&(r=e.config.doc,i=r.body&&r.body.scrollLeft,s=r.documentElement.scrollLeft,n=t.clientX+(s||i||0)),n},pageY:function(){var t=this._event,n=t.pageY,r,i,s;return n===undefined&&(r=e.config.doc,i=r.body&&r.body.scrollTop,s=r.documentElement.scrollTop,n=t.clientY+(s||i||0)),n}},r._define=function(e,t,n){function r(r){var i=arguments.length?r:n.call(this);return delete e[t],Object.defineProperty(e,t,{value:i,configurable:!0,writable:!0}),i}Object.defineProperty(e,t,{get:r,set:r,configurable:!0})};if(i&&!i.hasFeature("Events","2.0")){if(s)try{Object.defineProperty(e.config.doc.createEventObject(),"z",{})}catch(l){s=!1}e.DOMEventFacade=s?r:n}},"3.15.0",{requires:["node-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("widget-base-ie",function(e,t){var n="boundingBox",r="contentBox",i="height",s="offsetHeight",o="",u=e.UA.ie,a=u<7,f=e.Widget.getClassName("tmp","forcesize"),l=e.Widget.getClassName("content","expanded");e.Widget.prototype._uiSizeCB=function(e){var t=this.get(n),c=this.get(r),h=this._bbs;h===undefined&&(this._bbs=h=!(u&&u<8&&t.get("ownerDocument").get("compatMode")!="BackCompat")),h?c.toggleClass(l,e):e?(a&&t.addClass(f),c.set(s,t.get(s)),a&&t.removeClass(f)):c.setStyle(i,o)}},"3.15.0",{requires:["widget-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("widget-htmlparser",function(e,t){var n=e.Widget,r=e.Node,i=e.Lang,s="srcNode",o="contentBox";n.HTML_PARSER={},n._buildCfg={aggregates:["HTML_PARSER"]},n.ATTRS[s]={value:null,setter:r.one,getter:"_getSrcNode",writeOnce:!0},e.mix(n.prototype,{_getSrcNode:function(e){return e||this.get(o)},_preAddAttrs:function(e,t,n){var r={id:e.id,boundingBox:e.boundingBox,contentBox:e.contentBox,srcNode:e.srcNode};this.addAttrs(r,t,n),delete e.boundingBox,delete e.contentBox,delete e.srcNode,delete e.id,this._applyParser&&this._applyParser(t)},_applyParsedConfig:function(t,n,r){return r?e.mix(n,r,!1):n},_applyParser:function(t){var n=this,r=this._getNodeToParse(),s=n._getHtmlParser(),o,u;s&&r&&e.Object.each(s,function(e,t,s){u=null,i.isFunction(e)?u=e.call(n,r):i.isArray(e)?(u=r.all(e[0]),u.isEmpty()&&(u=null)):u=r.one(e),u!==null&&u!==undefined&&(o=o||{},o[t]=u)}),t=n._applyParsedConfig(r,t,o)},_getNodeToParse:function(){var e=this.get("srcNode");return this._cbFromTemplate?null:e},_getHtmlParser:function(){var t=this._getClasses(),n={},r,i;for(r=t.length-1;r>=0;r--)i=t[r].HTML_PARSER,i&&e.mix(n,i,!0);return n}})},"3.15.0",{requires:["widget-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("widget-skin",function(e,t){var n="boundingBox",r="contentBox",i="skin",s=e.ClassNameManager.getClassName;e.Widget.prototype.getSkinName=function(e){var t=this.get(r)||this.get(n),o,u;return e=e||s(i,""),u=new RegExp("\\b"+e+"(\\S+)"),t&&t.ancestor(function(e){return o=e.get("className").match(u),o}),o?o[1]:null}},"3.15.0",{requires:["widget-base"]});
-/*
-YUI 3.15.0 (build 834026e)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add("widget-uievents",function(e,t){var n="boundingBox",r=e.Widget,i="render",s=e.Lang,o=":",u=e.Widget._uievts=e.Widget._uievts||{};e.mix(r.prototype,{_destroyUIEvents:function(){var t=e.stamp(this,!0);e.each(u,function(n,r){n.instances[t]&&(delete n.instances[t],e.Object.isEmpty(n.instances)&&(n.handle.detach(),u[r]&&delete u[r]))})},UI_EVENTS:e.Node.DOM_EVENTS,_getUIEventNode:function(){return this.get(n)},_createUIEvent:function(t){var n=this._getUIEventNode(),i=e.stamp(n)+t,s=u[i],o;s||(o=n.delegate(t,function(e){var t=r.getByNode(this);t&&t._filterUIEvent(e)&&t.fire(e.type,{domEvent:e})},"."+e.Widget.getClassName()),u[i]=s={instances:{},handle:o}),s.instances[e.stamp(this)]=1},_filterUIEvent:function(e){return e.currentTarget.compareTo(e.container)||e.container.compareTo(this._getUIEventNode())},_getUIEvent:function(e){if(s.isString(e)){var t=this.parseType(e)[1],n,r;return t&&(n=t.indexOf(o),n>-1&&(t=t.substring(n+o.length)),this.UI_EVENTS[t]&&(r=t)),r}},_initUIEvent:function(e){var t=this._getUIEvent(e),n=this._uiEvtsInitQueue||{};t&&!n[t]&&(this._uiEvtsInitQueue=n[t]=1,this.after(i,function(){this._createUIEvent(t),delete this._uiEvtsInitQueue[t]}))},on:function(e){return this._initUIEvent(e),r.superclass.on.apply(this,arguments)},publish:function(e,t){var n=this._getUIEvent(e);return n&&t&&t.defaultFn&&this._initUIEvent(n),r.superclass.publish.apply(this,arguments)}},!0)},"3.15.0",{requires:["node-event-delegate","widget-base"]});
diff --git a/templates/static/js/scratch.js b/templates/static/js/scratch.js
deleted file mode 100644
index 348ab462051..00000000000
--- a/templates/static/js/scratch.js
+++ /dev/null
@@ -1,357 +0,0 @@
-YUI().use('node', 'cookie', 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')){
-
-			var edgeMagic = Y.all('.edge-magic');
-			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(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',''));
-			});
-
-			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',''));
-			});
-
-			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>');
-			});
-			Y.one('.close-video').on('click',function(e) {
-				e.preventDefault();
-				videoPanel.removeClass('show');
-				Y.one('.row-hero').setStyle('height','420px');
-				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{
-			Y.one('.'+$type).removeClass('run');
-			setTimeout(function(){ Y.one('.'+$type).addClass('run'); }, 400);
-		}
-	}
-
-	core.flipVideo = function(){
-		if(Y.one('body').hasClass('phone-home')) {
-			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);
-			});
-			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="/privacy-policy#cookies">see our 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) {
-				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');
-	}
-
-	core.removeNoJS();
-	core.resourceHubBoxes();
-	core.setupFeatureDisplay();
-	core.setupAnimations();
-	core.flipVideo();
-	core.externalLinks();
-	core.cookiePolicy();
-	core.setHTMLClasses();
-	// core.chineseDownload();
-});
diff --git a/templates/support/_base_support.html b/templates/support/_base_support.html
old mode 100644
new mode 100755
diff --git a/templates/support/_nav_secondary.html b/templates/support/_nav_secondary.html
old mode 100644
new mode 100755
index 40963cc9e0f..7ef71803f67
--- a/templates/support/_nav_secondary.html
+++ b/templates/support/_nav_secondary.html
@@ -1,5 +1,4 @@
-	<ul{% if list_class %} class="{{ list_class }}"{% endif %}>
+	<ul{% if list_class %} class="{{ list_class }}"{% endif %} class="second-level-nav">
 		<li class="first{% if level_1 == 'support' and not level_2 %}  active{% endif %}"><a href="/support">Overview</a></li>
-		<li{% if level_2 == 'community' %} class="active"{% endif %}><a href="/support/community">Community support</a></li>
-		<li><a href="http://www.ubuntu.com/usn">Security notices</a></li>
+		<li><a href="http://www.ubuntu.com/usn/">Security notices</a></li>
 	</ul>
\ No newline at end of file
diff --git a/templates/support/_nav_tertiary.html b/templates/support/_nav_tertiary.html
old mode 100644
new mode 100755
index 683682a12ec..e69de29bb2d
--- a/templates/support/_nav_tertiary.html
+++ b/templates/support/_nav_tertiary.html
@@ -1,9 +0,0 @@
-{% if level_2 == 'community' %}
-	<ul>
-		<li{% if level_3 == 'web-forums' %} class="active" {% endif %}><a href="/support/community/web-forums">Web forums</a></li>
-		<li{% if level_3 == 'mailing-lists' %} class="active" {% endif %}><a href="/support/community/mailing-lists">Mailing lists</a></li>
-		<li{% if level_3 == 'chat' %} class="active" {% endif %}><a href="/support/community/chat">Chat (IRC)</a></li>
-		<li{% if level_3 == 'launchpad' %} class="active" {% endif %}><a href="/support/community/launchpad">Launchpad</a></li>
-		<li{% if level_3 == 'local-language' %} class="active" {% endif %}><a href="/support/community/local-language">Local language support</a></li>
-	</ul>
-{% endif %}
diff --git a/templates/support/community/chat.html b/templates/support/community/chat.html
deleted file mode 100644
index 2da027ec324..00000000000
--- a/templates/support/community/chat.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% extends "support/_base_support.html" %}
-
-{% block title %}Chat (IRC) | Ubuntu{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Support" subsection_title="Community" page_title="Ubuntu IRC channels"  tertiary="true" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-border">
-	<h1>Ubuntu IRC channels</h1>
-</div>
-
-<div class="row no-border">
-	<div class="eight-col">
-		<p>There are several Internet relay chat (IRC) channels on the freenode network (irc.freenode.net) used for Ubuntu support and development.</p>
-		<p>The best place to start for general help with Ubuntu or just to meet other Ubuntu users is <strong>#ubuntu</strong> or one of the many local language channels.</p>
-		<p>Specific channels are available for Ubuntu derivatives: <strong>#kubuntu</strong>, <strong>#edubuntu</strong>, <strong>#lubuntu</strong> and <strong>#xubuntu</strong> and separate channels relate to development, bugs, local community (LoCo) teams, accessibility and documentation. Choose from the current <a href="https://wiki.ubuntu.com/IRC/ChannelList">list of channels</a>.</p>
-		<p>When participating in Ubuntu IRC channels, please follow the <a href="/about/about-ubuntu/conduct">Code of Conduct</a>.</p>
-	</div><!-- / .seven-col -->
-</div><!-- / .row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/support/community/index.html b/templates/support/community/index.html
deleted file mode 100644
index 8b782fcf760..00000000000
--- a/templates/support/community/index.html
+++ /dev/null
@@ -1,38 +0,0 @@
-{% extends "support/_base_support.html" %}
-
-{% block title %}Community | Ubuntu{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Support" page_title="Community"  tertiary="true" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-border">
-	<h1>Community support</h1>
-</div>
-
-<div class="row no-border">
-	<div class="eight-col">
-	 	<h3>Access free documentation</h3>
-		<p>If you are stuck on a problem, someone else has probably encountered it too. Take a look at the <a href="http://help.ubuntu.com/">official documentation</a> developed and maintained by the Ubuntu Documentation Team.</p>
-		
-		<h3>Live support chat</h3>
-		<p>If you would rather ask questions directly to the Ubuntu Community, you can <a href="https://help.ubuntu.com/community/InternetRelayChat">access our Internet relay chat (IRC) channel</a>. Simply join the #ubuntu channel on irc.freenode.net.</p>
-		<p>If you are new to Ubuntu, and have not used IRC before, you can use the application '<em>pidgin</em>' (or on some versions of Ubuntu '<em>gaim</em>') from the Applications-&gt;Internet menu on your Ubuntu desktop. Then login to irc.freenode.net and join the #ubuntu channel.</p>
-		<p>If you want a more specialised channel that deals with Ubuntu derivatives, you can join <strong>#kubuntu</strong>, <strong>#edubuntu</strong>, <strong>#xubuntu</strong>.</p>
-		<p>There are also dedicated channels for development, bugs, local community (LoCo) teams, accessibility and documentation.</p>
-		<p>Take a look at a list of our <a href="https://wiki.ubuntu.com/InternetRelayChat">current IRC channels</a></p>
-		<p>When participating in Ubuntu IRC channels, please follow the <a href="/about/about-ubuntu/conduct">Code of Conduct</a>.</p>
-		
-		<h3>Web forums</h3>
-		<p>If you prefer to use web forums, rather than mailing lists, especially for support-related issues, you can use or search the <a href="/support/community/web-forums">Ubuntu forums</a>. There are also <a href="/support/community/local-language">local language forums</a> available.</p>
-		
-		<h3>Mailing lists</h3>
-		<p>Ubuntu development, support and discussions continually take place within our IRC channels and mailing lists. To join a <a href="/support/community/mailing-lists">mailing list</a> simply click on the mailing list you wish to join for further instructions.</p>
-		
-			<h3>Ask Ubuntu</h3>
-		<p><a href="http://askubuntu.com/">http://askubuntu.com</a></p>
-		<p>This is a collaboratively edited question and answer site for Ubuntu users and developers. It's 100% free, no registration required.</p>
-	</div><!-- / .seven-col -->
-</div><!-- / .row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/support/community/launchpad.html b/templates/support/community/launchpad.html
deleted file mode 100644
index 9bfd5205a56..00000000000
--- a/templates/support/community/launchpad.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% extends "support/_base_support.html" %}
-
-{% block title %}Launchpad | Ubuntu{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Support" subsection_title="Community" page_title="Launchpad"  tertiary="true" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-border">
-	<h1>Launchpad</h1>
-</div>
-
-<div class="row no-border">
-	<div class="eight-col">
-		<p><a href="https://launchpad.net/">Launchpad</a>, developed by <a href="http://www.canonical.com/">Canonical</a>, is a system used to keep track of many aspects of open-source development. Launchpad's features include code hosting, bug tracking, translation, feature blueprints and a community-based answer tracker.</p> 
-		<p>Ubuntu uses Launchpad for project management. You can visit Ubuntu's Launchpad project page for more information.</p> 
-		<p>Launchpad also allows you to <a href="https://answers.launchpad.net/ubuntu">ask for community support</a> or <a href="https://bugs.launchpad.net/ubuntu">report any problems</a> you are experiencing with Ubuntu.</p>
-	</div><!-- / .seven-col -->
-</div><!-- / .row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/support/community/local-language.html b/templates/support/community/local-language.html
deleted file mode 100644
index 4a1c2b7e2a8..00000000000
--- a/templates/support/community/local-language.html
+++ /dev/null
@@ -1,414 +0,0 @@
-{% extends "support/_base_support.html" %}
-
-{% block title %}Local language support | Ubuntu{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Support" subsection_title="Community" page_title="Local language support"  tertiary="true" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-border">
-	<h1>Local language support</h1>
-</div>
-
-<div class="row no-border">
-	<div class="eight-col">
-		<p>Our worldwide network of local community (LoCo) teams provides a strong backbone to the Ubuntu community.</p>
-		<p>Many of these teams offer free, face-to-face local support, such as one-to-one troubleshooting, group sessions, and presentations about Ubuntu. Visit the <a href="https://wiki.ubuntu.com/LoCoTeamList">full list of LoCo teams </a> for more information.</p>
-	 
-		<h3 id="non-english">Non-English support</h3>
-		<p>Mailing lists and support channels on IRC exist for Ubuntu users who speak languages other than English. You are welcome to join one of these or start your own.</p>
-		<p>An important part of the Ubuntu manifesto is the ability to use your software in your local language. That's why we strive to provide Ubuntu in many languages. You can help create and improve these translations.</p>
-		<p>If you want to start a local team or join an existing one, visit <a href="https://wiki.ubuntu.com/LoCoTeams">https://wiki.ubuntu.com/LoCoTeams</a></p>
-	 
-		<h3>Contents</h3>
-			<ol>
-				<li><a href="#arabic">Arabic</a></li>
-				<li><a href="#bengali">Bengali (Bangladesh)</a></li>
-				<li><a href="#brazilian">Brazilian</a></li>
-				<li><a href="#catalan">Catalan</a></li>
-				<li><a href="#czech">Czech</a></li>
-				<li><a href="#chinese">Chinese</a></li>
-				<li><a href="#croation">Croatian</a></li>
-				<li><a href="#dutch">Dutch</a></li>
-				<li><a href="#finnish">Finnish</a></li>
-				<li><a href="#french">French</a></li>
-				<li><a href="#german">German</a></li>
-				<li><a href="#greek">Greek</a></li>
-				<li><a href="#hebrew">Hebrew</a></li>
-				<li><a href="#india">India (any Indian language)</a></li>
-				<li><a href="#indonesian">Indonesian</a></li>
-				<li><a href="#italian">Italian</a></li>
-				<li><a href="#japanese">Japanese</a></li>
-				<li><a href="#korean">Korean</a></li>
-				<li><a href="#kurdish">Kurdish</a></li>
-				<li><a href="#persian">Persian (Iran)</a></li>
-				<li><a href="#portuguese">Portuguese</a></li>
-				<li><a href="#romanian">Romanian</a></li>
-				<li><a href="#russian">Russian</a></li>
-				<li><a href="#slovak">Slovak</a></li>
-				<li><a href="#spanish">Spanish</a></li>
-				<li><a href="#swedish">Swedish</a></li>
-				<li><a href="#tamil">Tamil</a></li>
-				<li><a href="#turkish">Turkish</a></li>
-				<li><a href="#urdu">Urdu (Pakistan)</a></li>
-			</ol>
-			<h3 id="bengali">Bengali (Bangladesh)</h3>
-			<ul>
-				<li>
-					Website: <a href="http://www.ubuntu-bd.org/">http://www.ubuntu-bd.org/</a>
-				</li>
-				<li> 
-					Forum: <a href="http://forum.ubuntu-bd.org/">http://forum.ubuntu-bd.org/</a>
-				</li> 
-				<li> 
-					IRC: #ubuntu-bd on irc.freenode.net</li> 
-				<li> 
-					Mailing list: <a href="https://lists.ubuntu.com/mailman/listinfo/ubuntu-bd">https://lists.ubuntu.com/mailman/listinfo/ubuntu-bd</a>
-				</li>
-			</ul> 
-			<h3 id="brazilian">Brazilian</h3>
-			<ul>
-				<li>
-					Website: <a href="http://www.ubuntu-br.org/">http://www.ubuntu-br.org</a>
-				</li> 
-				<li> 
-					Forums: <a href="http://forum.ubuntu-br.org/">http://forum.ubuntu-br.org</a>
-				</li> 
-				<li>
-					Wiki documentation: <a href="http://wiki.ubuntu-br.org/">http://wiki.ubuntu-br.org</a>
-				</li>
-				<li>
-					IRC: #ubuntu-br on chat.freenode.net
-				</li>
-				<li>
-					Mailing list: <a href="http://lists.ubuntu.com/mailman/listinfo/ubuntu-br">http://lists.ubuntu.com/mailman/listinfo/ubuntu-br</a>
-				</li> 
-			</ul>
-			<h3 id="catalan">Catalan</h3> 
-			<ul> 
-				<li> 
-					Website: <a href="http://ubuntu.cat/">http://ubuntu.cat</a>
-				</li>
-				<li>
-					Forums: <a href="http://cat.ubuntuforums.org/">http://cat.ubuntuforums.org</a>
-				</li>
-				<li>
-					Wiki: <a href="https://wiki.ubuntu.com/CatalanTeam">https://wiki.ubuntu.com/CatalanTeam</a>
-				</li>
-				<li>
-					IRC: #ubuntu-cat on irc.freenode.net
-				</li>
-				<li>
-					Mailing list: <a href="https://lists.lafarga.cpl.upc.edu/mailman/listinfo/ubuntucat-info">https://lists.lafarga.cpl.upc.edu/mailman/listinfo/ubuntucat-info</a>
-				</li> 
-			</ul> 
-			<h3 id="czech">Czech</h3>
-			<ul> 
-				<li> 
-					Website: <a href="http://www.ubuntu.cz/">http://www.ubuntu.cz</a>
-				</li> 
-				<li>
-					Forums: <a href="http://forum.ubuntu.cz/">http://forum.ubuntu.cz</a>
-				</li>
-				<li>
-					Wiki: <a href="http://wiki.ubuntu.cz/">http://wiki.ubuntu.cz</a>
-				</li> 
-				<li>
-					Mailing list: <a href="http://lists.ubuntu.cz/mailman/listinfo/ubuntu">http://lists.ubuntu.cz/mailman/listinfo/ubuntu</a>
-				</li> 
-				<li>
-					IRC: #ubuntu-cz on irc.freenode.net <a href="http://wiki.ubuntu.cz/IRC">http://wiki.ubuntu.cz/IRC</a>
-				</li> 
-			</ul> 
-			<h3 id="chinese">Chinese</h3>
-			<ul>
-				<li>
-					IRC: #ubuntu-cn on irc.freenode.net
-				</li> 
-				<li>
-					Mailing list: <a href="http://lists.ubuntu.com/mailman/listinfo/ubuntu-zh">ubuntu-zh</a>
-				</li>
-				<li>
-					Website: <a href="http://www.ubuntu.org.cn/">ubuntu.org.cn</a>
-				</li>
-				<li>
-					Forums: <a href="http://forum.ubuntu.org.cn/">forum.ubuntu.org.cn</a>
-				</li> 
-				<li>
-					Wiki Documentation: <a href="http://wiki.ubuntu.org.cn/">wiki.ubuntu.org.cn</a>
-				</li> 
-			</ul>
-			<h3 id="croation">Croatian</h3>
-			<ul> 
-				<li> 
-					Website: <a href="http://www.ubuntu-hr.org/">www.ubuntu-hr.org</a>
-				</li>
-				<li>
-					Forums: <a href="http://www.ubuntu-hr.org/forum">www.ubuntu-hr.org/forum</a>
-				</li>
-				<li>
-					Wiki documentation: <a href="http://www.ubuntu-hr.org/wiki">www.ubuntu-hr.org/wiki</a>
-				</li>
-				<li>
-					IRC: #ubuntu-hr on irc.freenode.net
-				</li>
-				<li>
-					Mailing list: <a href="mailto:ubuntu@ubuntu-hr.org">ubuntu@ubuntu-hr.org</a>
-				</li>
-			</ul>  
-			<h3 id="dutch">Dutch</h3>
-			<ul>
-				<li>
-					Website: <a href="http://www.ubuntu-nl.org/">http://www.ubuntu-nl.org</a>
-				</li>
-				<li>
-					Mailinglijst: <a href="http://lists.ubuntu.com/mailman/listinfo/ubuntu-nl">http://lists.ubuntu.com/mailman/listinfo/ubuntu-nl</a>
-				</li> 
-				<li>
-					Forum: <a href="http://forum.ubuntu-nl.org/">http://forum.ubuntu-nl.org</a>
-				</li> 
-				<li>
-					Documentatie: <a href="http://wiki.ubuntu.com/NederlandstaligeDocumentatie">http://wiki.ubuntu.com/NederlandstaligeDocumentatie</a>
-				</li>
-				<li>
-					IRC kanaal: #ubuntu-nl op chat.freenode.net
-				</li> 
-			</ul>
-			<h3 id="finnish">Finnish</h3>
-			<ul>
-				<li>
-					Website: <a href="http://www.ubuntu-fi.org/">http://www.ubuntu-fi.org/</a>
-				</li>
-				<li>
-					Keskustelualueet: <a href="http://forum.ubuntu-fi.org/">http://forum.ubuntu-fi.org/</a>
-				</li>
-				<li>
-					IRC: #ubuntu-fi (irc.freenode.net)
-				</li>
-				<li>
-					Postituslista: <a href="https://lists.ubuntu.com/mailman/listinfo/ubuntu-fi">https://lists.ubuntu.com/mailman/listinfo/ubuntu-fi</a>
-				</li> 
-			</ul>
-			<h3 id="french">French</h3>
-			<ul> 
-				<li>
-					Website: <a href="http://www.ubuntu-fr.org/">ubuntu-fr.org</a>
-				</li> 
-				<li>
-					Forums: <a href="http://forum.ubuntu-fr.org/">forum.ubuntu-fr.org</a>
-				</li> 
-				<li>
-					Wiki documentation: <a href="http://doc.ubuntu-fr.org/">doc.ubuntu-fr.org</a>
-				</li> 
-				<li>
-					IRC: #ubuntu-fr on irc.freenode.net
-				</li>
-				<li>
-					Mailing list: <a href="http://lists.ubuntu.com/mailman/listinfo/ubuntu-fr">Ubuntu-fr</a>
-				</li>
-			</ul>
-			<h3 id="german">German</h3>
-			<ul>
-				<li>
-					Web/Wiki/Forums: <a href="http://www.ubuntuusers.de/">German Ubuntu users</a>
-				</li> 
-				<li>
-					IRC: #ubuntu-de on irc.freenode.net.
-				</li> 
-				<li>
-					Mailing list: <a href="http://lists.ubuntu.com/mailman/listinfo/ubuntu-de">ubuntu-diskussion</a>
-				</li>
-			</ul>
-			<h3 id="greek">Greek</h3> 
-			<p id="cyprus">Cyprus</p> 
-			<ul>
-				<li>Website: <a href="http://www.ubuntucy.org/">http://www.ubuntucy.org/</a></li> 
-				<li>Forum: <a href="http://www.ubuntucy.org/forum/">http://www.ubuntucy.org/forum/</a></li> 
-				<li>Mailing list: <a href="https://lists.ubuntu.com/mailman/listinfo/ubuntu-cy">https://lists.ubuntu.com/mailman/listinfo/ubuntu-cy</a></li> 
-				<li>Wiki: <a href="http://www.ubuntucy.org/wiki/">www.ubuntucy.org/wiki/</a></li> 
-				<li>IRC: #ubuntu-cy on irc.freenode.net </li>
-				<li>Photo gallery: <a href="http://www.ubuntucy.org/pictures.php">http://www.ubuntucy.org/pictures.php</a></li> 
-			</ul>
-			<br/>
-			<p>Greece</p>
-			<ul> 
-			<li>Website: <a href="https://ubuntu-gr.org/">https://ubuntu-gr.org/</a> </li> 
-			<li>Forum: <a href="https://forum.ubuntu-gr.org/">https://forum.ubuntu-gr.org/</a> </li>
-			<li>Mailing list: <a href="http://wiki.ubuntu-gr.org/MailingList">http://wiki.ubuntu-gr.org/MailingList</a> </li> 
-			<li>IRC: #ubuntu-gr on irc.freenode.net </li> 
-			<li>Wiki: <a href="http://wiki.ubuntu-gr.org/">http://wiki.ubuntu-gr.org/</a> </li>
-			<li>Magazine: <a href="http://ubuntistas.ubuntu-gr.org/">http://ubuntistas.ubuntu-gr.org/</a> </li>
-			<li>Documentation: <a href="https://help.ubuntu.com/12.04/ubuntu-help/index.html.el">https://help.ubuntu.com/12.04/ubuntu-help/index.html.el</a> </li>
-			<li>Planet: <a href="http://planet.ubuntu-gr.org/">http://planet.ubuntu-gr.org/</a> </li>
-			<li>Ubuntu Tour: <a href="http://ubuntu-gr.org/ubuntu/take-the-tour/12.04/el/">http://ubuntu-gr.org/ubuntu/take-the-tour/12.04/el/</a> </li>
-			<li>Photo gallery: <a href="https://ubuntu-gr.org/photogallery">https://ubuntu-gr.org/photogallery</a> </li> 
-			</ul>
-			<p>&nbsp;</p> 
-			
-			<h3 id="hebrew">Hebrew</h3><ul><li><p>IRC: #ubuntu-il on irc.freenode.net is for Hebrew and Arabic discussion and support.</p> </li><li> <p>WikiDocumentation:<a href="http://wiki.ubuntu.com/HebrewDocumentation">HebrewDocumentation</a></p></li><li><p>Ubuntu local Hebrew/Arabic website: <a href="http://www.ubuntulinux.org.il/">http://www.ubuntulinux.org.il</a></p></li></ul><p>&nbsp;</p> 
-			
-			<h3 id="arabic">Arabic</h3>
-			<p>Algeria</p> 
-			<ul>
-			<li>IRC: #ubuntu-dz on irc.freenode.net</li>
-			<li>Forum: <a href="http://algeria.ubuntuforums.org">http://algeria.ubuntuforums.org</a></li>
-			<li>Wiki: <a href="https://wiki.ubuntu.com/AlgerianTeam">https://wiki.ubuntu.com/AlgerianTeam</a></li>
-			<li>Mailing List: <a href="https://lists.launchpad.net/ubuntu-dz">https://lists.launchpad.net/ubuntu-dz</a>
-			</li>
-			</ul>
-			<p>Egypt</p> 
-			<ul>
-			<li>IRC: #ubuntu-eg on irc.freenode.net</li>
-			<li>Website: <a href="http://www.ubuntu-eg.org/">http://www.ubuntu-eg.org/</a></li>
-			<li>Forum: <a href="http://egypt.ubuntuforums.org/">http://egypt.ubuntuforums.org/</a></li>
-			<li>Mailing List: <a href="https://lists.ubuntu.com/mailman/listinfo/ubuntu-eg">https://lists.ubuntu.com/mailman/listinfo/ubuntu-eg</a></li></ul><br/><p>Jordan</p> <ul><li>IRC: #ubuntu-jo on irc.freenode.net</li><li>Website: <a href="http://www.ubuntu-jo.org/">http://www.ubuntu-jo.org/</a></li><li>Forum: <a href="http://ubuntuforums.org/forumdisplay.php?f=320">http://ubuntuforums.org/forumdisplay.php?f=320</a></li><li>Mailing List: <a href="https://lists.ubuntu.com/mailman/listinfo/ubuntu-jo">https://lists.ubuntu.com/mailman/listinfo/ubuntu-jo</a></li></ul><br/><p>Morocco</p> <ul><li>IRC: #ubuntu-ma on irc.freenode.net</li><li>Website: <a href="http://www.ubuntu-ma.org/">http://www.ubuntu-ma.org/</a></li><li>Forum: <a href="http://morocco.ubuntuforums.org">http://morocco.ubuntuforums.org</a></li><li>Mailing List: <a href="https://lists.ubuntu.com/mailman/listinfo/ubuntu-ma">https://lists.ubuntu.com/mailman/listinfo/ubuntu-ma</a></li></ul><br/><p>Saudi Arabia</p> <ul><li>IRC: #ubuntu-sa on irc.freenode.net</li><li>Forum: <a href="http://ubuntuforums.org/forumdisplay.php?f=264">http://ubuntuforums.org/forumdisplay.php?f=264</a></li><li>Mailing List: <a href="http://groups.google.com/group/ubuntu-sa">http://groups.google.com/group/ubuntu-sa</a></li><li>Wiki: <a href="http://wiki.ubuntu.com/SaudiTeam">http://wiki.ubuntu.com/SaudiTeam</a></li></ul><br/><p>Tunisia</p><ul><li>IRC: #ubuntu-tn on irc.freenode.net</li><li>Website: <a href="http://www.ubuntu-tn.org/">http://www.ubuntu-tn.org/</a></li><li>Forum: <a href="http://tunisie.ubuntuforums.org">http://tunisie.ubuntuforums.org</a></li><li>Mailing List: <a href="https://lists.ubuntu.com/mailman/listinfo/ubuntu-tn">https://lists.ubuntu.com/mailman/listinfo/ubuntu-tn</a></li></ul><br/><p>Yemen</p> <ul><li>IRC: #ubuntu-ye on irc.freenode.net</li><li>Forum: <a href="http://ubuntuforums.org/forumdisplay.php?f=387">http://ubuntuforums.org/forumdisplay.php?f=387</a></li><li>Mailing List: <a href="http://lists.launchpad.net/ubuntu-ye">http://lists.launchpad.net/ubuntu-ye</a></li><li>Wiki: <a href="https://wiki.ubuntu.com/YemenTeam">https://wiki.ubuntu.com/YemenTeam</a></li></ul><p>&nbsp;</p> 
-			<h3 id="india">India (any Indian language)</h3> 
-			<ul> 
-				<li><p>Website: <a href="http://www.ubuntu-in.org/">http://www.ubuntu-in.org/</a></p></li> 
-				<li><p>IRC: #ubuntu-in @ irc.freenode.net</p></li>
-				<li><p>Mailing List: <a href="https://lists.ubuntu.com/mailman/listinfo/ubuntu-in">https://lists.ubuntu.com/mailman/listinfo/ubuntu-in</a></p></li>
-			</ul> 
-			<p>&nbsp;</p> 
-			<h3 id="indonesian">Indonesian</h3> 
-			<ul> 
-				<li><p>Situs Web: <a href="http://www.ubuntu-id.org/">http://www.ubuntu-id.org</a> - <a href="http://ubuntulinux.or.id/">http://ubuntulinux.or.id</a></p></li> 
-				<li><p>Milis: <a href="http://groups.google.com/group/id-ubuntu">milis id-ubuntu</a> - <a href="https://lists.ubuntu.com/mailman/listinfo/ubuntu-id">milis ubuntu-id</a></p></li> 
-				<li><p>Forum: <a href="http://forum.ubuntulinux.or.id/">http://forum.ubuntulinux.or.id</a></p></li> 
-				<li><p>Wiki Dokumentasi: <a href="http://wiki.ubuntu-id.org/">http://wiki.ubuntu-id.org</a></p></li> 
-			</ul> 
-			<p>&nbsp;</p> 
-			<h3 id="italian">Italian</h3> 
-			<ul> 
-				<li><p>Sito/Documentazione/Forum: <a href="http://www.ubuntu-it.org/">ubuntu-it.org</a></p></li> 
-				<li><p>IRC: #ubuntu-it on irc.freenode.net per il Supporto in Italiano.</p></li> 
-				<li><p>Mailing list: <a href="http://lists.ubuntu.com/mailman/listinfo/ubuntu-it">Lista ubuntu-it</a></p></li>
-			</ul> 
-			<p>&nbsp;</p> 
-			<h3 id="japanese">Japanese</h3>
-			<ul> 
-				<li><p>Website: <a href="http://www.ubuntulinux.jp/">http://www.ubuntulinux.jp/ </a></p></li> 
-				<li><p>Forums: <a href="http://forum.ubuntulinux.jp/">http://forum.ubuntulinux.jp/ </a></p></li> 
-				<li><p>Wiki: <a href="https://wiki.ubuntulinux.jp/">https://wiki.ubuntulinux.jp/ </a></p></li> 
-				<li><p>IRC: #ubuntu-jp on irc.freenode.net</p> </li> <li> <p>Mailing list: <a href="https://lists.ubuntu.com/mailman/listinfo/ubuntu-jp">ubuntu-jp@lists.ubuntu.com</a></p></li> 
-			</ul> 
-			<p>&nbsp;</p> 
-			<h3 id="korean">Korean</h3> 
-			<ul> 
-				<li><p>Web bbs/Wiki: <a href="http://www.ubuntu.or.kr/">http://www.ubuntu.or.kr</a></p></li> 
-				<li> <p>IRC: #<a href="mailto:ubuntu@irc.hanirc.org">ubuntu@irc.hanirc.org</a> (cp949) / #<a href="mailto:ubuntu-ko@irc.freenode.net">ubuntu-ko@irc.freenode.net</a> (utf-8)</p> </li> 
-				<li> <p>Mailing list: <a href="https://lists.ubuntu.com/mailman/listinfo/ubuntu-ko">https://lists.ubuntu.com/mailman/listinfo/ubuntu-ko</a></p> </li> 
-			</ul> 
-			<p>&nbsp;</p> 
-			<h3 id="kurdish">Kurdish</h3> 
-			<ul> 
-				<li> <p>Website: <a href="http://linux.ferheng.org/ubuntu.html">http://linux.ferheng.org/ubuntu.html</a></p> </li> 
-				<li> <p>Forums: <a href="http://pckurd.net/">http://pckurd.net</a></p> </li> 
-				<li> <p>IRC: #pckurd at irc.freenode.net</p> </li> 
-			</ul> 
-			<p>&nbsp;</p> 
-			<h3 id="persian">Persian (Iran)</h3> 
-			<ul> 
-				<li> <p>Websites: <a href="http://www.ubuntu.ir/">http://www.ubuntu.ir</a> &ndash; <a href="http://www.ubuntu-ir.org/">http://www.ubuntu-ir.org</a></p> </li> 
-				<li> <p>Wiki: <a href="http://wiki.ubuntu-ir.org/">http://wiki.ubuntu-ir.org</a> - <a href="http://wiki.hezardastan.org/">http://wiki.hezardastan.org</a></p> </li> 
-				<li> <p>Documentation: <a href="http://wiki.ubuntu-ir.org/">http://wiki.ubuntu-ir.org</a> - <a href="http://wiki.hezardastan.org/">http://wiki.hezardastan.org</a></p> </li> 
-				<li> <p>Forums: <a href="http://forum.ubuntu-ir.org/">http://forum.ubuntu-ir.org</a></p> </li> 
-				<li> <p>Mailing List: <a href="http://lists.ubuntu.com/mailman/listinfo/ubuntu-ir">http://lists.ubuntu.com/mailman/listinfo/ubuntu-ir</a></p> </li> 
-				<li> <p>IRC: #ubuntu-ir on irc.freenode.net</p> </li> 
-			</ul> 
-			<p>&nbsp;</p> 
-			<h3 id="portuguese">Portuguese</h3> 
-			<ul> 
-				<li> <p>IRC: #ubuntu-pt on irc.freenode.net is for Portuguese discussion and support.</p> </li> 
-				<li> <p>Mailing list: <a href="http://lists.ubuntu.com/mailman/listinfo/ubuntu-pt">Portuguese-speaking Ubuntu mailing list</a></p> </li> 
-				<li> <p>Wiki documentation: <a href="http://wiki.ubuntu.com/PortugueseDocumentation">PortugueseDocumentation wiki page</a></p> </li> 
-			</ul> 
-			<p>&nbsp;</p> 
-			<h3 id="romanian">Romanian</h3> 
-			<ul> 
-				<li> <p>Website: <a href="http://www.ubuntu.ro/">http://www.ubuntu.ro</a></p> </li> 
-				<li> <p>Forum: <a href="http://forum.ubuntu.ro/">http://forum.ubuntu.ro</a></p> </li> 
-				<li> <p>Wiki documentation: <a href="http://wiki.ubuntu.ro/">http://wiki.ubuntu.ro</a></p> </li> 
-				<li> <p>Mailing list: <a href="https://lists.ubuntu.com/mailman/listinfo/ubuntu-ro">https://lists.ubuntu.com/mailman/listinfo/ubuntu-ro</a></p> </li> 
-				<li> <p>IRC channel: #ubuntu-ro on irc.ubuntu.com</p> </li> 
-			</ul> 
-			<p>&nbsp;</p> 
-			<h3 id="russian">Russian</h3> 
-			<ul> 
-				<li> <p>Website: <a href="http://ubuntu.ru/">http://ubuntu.ru</a></p> </li> 
-				<li> <p>Forum: <a href="http://forum.ubuntu.ru/">http://forum.ubuntu.ru</a></p> </li> 
-				<li> <p>Wiki documentation: <a href="http://help.ubuntu.ru/">http://help.ubuntu.ru</a></p> </li> 
-				<li> <p>Mailing list: <a href="https://lists.ubuntu.com/mailman/listinfo/ubuntu-ru">https://lists.ubuntu.com/mailman/listinfo/ubuntu-ru</a></p> </li> 
-				<li> <p>IRC channel: #ubuntu-ru on irc.freenode.net</p> </li> 
-				<li> <p>Jabber conference: ubuntu@conference.jabber.ru</p> </li> 
-			</ul>
-			<p>&nbsp;</p> 
-			<h3 id="slovak">Slovak</h3> 
-			<ul> 
-				<li> <p>Website: <a href="http://www.ubuntu-sk.org/">http://www.ubuntu-sk.org</a></p> </li> 
-				<li> <p>Forums: <a href="http://www.linuxos.sk/forum.php">http://www.linuxos.sk/forum.php</a></p> </li> 
-				<li> <p>Wiki documentation: <a href="http://wiki.ubuntu.cz/">http://wiki.ubuntu.cz</a></p> </li> 
-				<li> <p>IRC: #ubuntu-sk on ir.freenode.net</p> </li> 
-				<li> <p>Mailing list: <a href="mailto:ubuntu-i18n@lists.linux.sk">ubuntu-i18n@lists.linux.sk</a></p> </li> 
-			</ul>
-			<p>&nbsp;</p> 
-			<h3 id="spanish">Spanish</h3> 
-			<h4 id="spanish-general">General</h4> 
-			<ul> 
-				<li> <p>IRC: #ubuntu-es on irc.freenode.net is for Spanish discussion and support.</p> </li> 
-				<li> <p>Mailing list: <a href="http://lists.ubuntu.com/mailman/listinfo/ubuntu-es">Asistencia para usuarios de Ubuntu</a></p> </li> 
-				<li> <p>Website: <a href="http://www.ubuntu-es.org/">http://www.ubuntu-es.org/</a></p> </li> 
-				<li> <p>Forums: <a href="http://www.ubuntu-es.org/forum">ubuntu-es.org</a> <a href="http://ubuntu.linuxforo.org/">http://ubuntu.linuxforo.org/</a></p> </li> 
-				<li> <p>Documentación en el wiki: <a href="http://wiki.ubuntu.com/SpanishDocumentation">Página de wiki</a></p> </li> 
-			</ul> 
-			<h4 id="spanish-argentina">Argentina</h4> 
-			<ul> 
-				<li> <p>Sitio Web: <a href="http://ubuntu.org.ar/">http://ubuntu.org.ar/</a></p> </li> 
-				<li> <p>Foros: <a href="http://uluga.ubuntuforums.org/">http://uluga.ubuntuforums.org/</a></p> </li> 
-				<li> <p>IRC: #ubuntu-ar en irc.freenode.net</p> </li> 
-				<li> <p>Lista de Correo: <a href="https://lists.ubuntu.com/mailman/listinfo/ubuntu-ar">https://lists.ubuntu.com/mailman/listinfo/ubuntu-ar</a></p> </li> 
-			</ul> 
-			<h4 id="spanish-chile">Chile</h4> 
-			<ul> 
-				<li> <p>Website: <a href="http://www.ubuntu-cl.org/">http://www.ubuntu-cl.org</a></p> </li> 
-				<li> <p>Forums: <a href="http://foros.ubuntu-cl.org/">http://foros.ubuntu-cl.org</a></p> </li> 
-				<li> <p>Wiki documentation: <a href="http://wiki.ubuntu-cl.org/">http://wiki.ubuntu-cl.org</a></p> </li> 
-				<li> <p>IRC: #ubuntu-cl on irc.freenode.net</p> </li> 
-				<li> <p>Mailing list: <a href="http://lists.ubuntu.com/mailman/listinfo/ubuntu-cl">http://lists.ubuntu.com/mailman/listinfo/ubuntu-cl</a></p> </li> 
-			</ul> 
-			<p>&nbsp;</p> 
-			<h3 id="swedish">Swedish</h3> 
-			<ul> 
-				<li> <p>Web/Forum/Wiki: <a href="http://www.ubuntu-se.org/">http://www.ubuntu-se.org</a></p> </li> 
-				<li> <p>IRC #ubuntu-se on irc.freenode.net</p> </li> 
-				<li> <p>Mailinglist: <a href="http://lists.ubuntu.com/mailman/listinfo/ubuntu-se">http://lists.ubuntu.com/mailman/listinfo/ubuntu-se</a></p> </li> 
-			</ul> 
-			<p>&nbsp;</p> 
-			<h3 id="tamil">Tamil</h3> 
-			<ul> 
-				<li> <p>Website: <a href="http://www.ubuntu-tam.org/">http://www.ubuntu-tam.org/</a></p> </li> 
-				<li> <p>Forums: <a href="http://thamizh.ubuntuforums.org/">http://thamizh.ubuntuforums.org/</a></p> </li> 
-				<li> <p>Wiki Documentation: <a href="http://ubuntu-tam.org/wiki">http://ubuntu-tam.org/wiki</a></p> </li> 
-				<li> <p>IRC: #ubuntu-tam @ irc.freenode.net</p> </li> 
-				<li> <p>Mailing List: <a href="http://lists.ubuntu.com/ubuntu-tam">http://lists.ubuntu.com/ubuntu-tam</a></p> </li> 
-			</ul> 
-			<p>&nbsp;</p> 
-			<h3 id="turkish">Turkish</h3> 
-			<ul> 
-				<li> <p>Website: <a href="http://www.ubuntu-tr.net/">http://www.ubuntu-tr.net</a></p> </li> 
-				<li> <p>Forums: <a href="http://forum.ubuntu-tr.net/">http://forum.ubuntu-tr.net</a></p> </li> 
-				<li> <p>Wiki Documentation: <a href="http://wiki.ubuntu-tr.net/">http://wiki.ubuntu-tr.net</a></p> </li> 
-				<li> <p>IRC: #ubuntu-tr on irc.freenode.net</p> </li> 
-			</ul> 
-			<p>&nbsp;</p> 
-			<h3 id="urdu">Urdu (Pakistan)</h3> 
-			<ul> 
-				<li> <p>Websites: <a href="http://www.ubuntu-pk.org/">http://www.ubuntu-pk.org</a>, <a href="http://www.fossfp.org/">http://www.fossfp.org</a></p> </li> 
-				<li> <p>Mailing list: <a href="http://lists.ubuntu.com/mailman/listinfo/ubuntu-pk">http://lists.ubuntu.com/mailman/listinfo/ubuntu-pk</a></p> </li> 
-				<li> <p>Support E-mail: <a href="mailto:ubuntu@fossfp.org">ubuntu@fossfp.org</a></p> </li> 
-				<li> <p>Forums: <a href="http://www.fossfp.org/forum">http://www.fossfp.org/forum</a></p> </li>
-				<li>IRC: #ubuntu-pk on chat.freenode.net</li>
-			</ul>
-	</div>
-</div><!-- / .row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/support/community/mailing-lists.html b/templates/support/community/mailing-lists.html
deleted file mode 100644
index 556899474f2..00000000000
--- a/templates/support/community/mailing-lists.html
+++ /dev/null
@@ -1,111 +0,0 @@
-{% extends "support/_base_support.html" %}
-
-{% block title %}Mailing lists | Ubuntu{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Support" subsection_title="Community" page_title="Mailing lists"  tertiary="true" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-border">
-	<h1>Mailing lists</h1>
-</div>
-
-<div class="row no-border">
-	<div class="eight-col">
-		<h3>Much of the work that makes Ubuntu a success happens on mailing lists.</h3>
-		
-		<p>You can subscribe to a list in normal or digest mode, or review the archives for past discussions.Please read through some of the guidelines below when using the mailing lists. The full list of Ubuntu mailing lists can be found at <a href="http://lists.ubuntu.com/">lists.ubuntu.com</a> and on Gmane as <a href="http://news.gmane.org/index.php?prefix=gmane.linux.ubuntu">gmane.linux.ubuntu</a>.</p> 
-		
-		 <p>There is <a href="/support/community/local-language">local language support</a> information for mailing lists and internet relay chat (IRC) channels for non-English speaking users.</p> 
-	 
-		<h3>Announcement-only lists</h3>
-		<ul>
-			<li>
-				<p><strong>Ubuntu security announcement list:</strong></p>
-				<p>The <a href="http://lists.ubuntu.com/mailman/listinfo/ubuntu-security-announce">ubuntu-security-announce</a> receives only announcements of security updates to Ubuntu releases. If you are an administrator for multiple machines, we strongly recommend you subscribe to this list to be notified of critical updates that may affect your system security.</p>
-			</li>
-			<li>
-				<p><strong>Ubuntu announcement list:</strong></p>
-				<p>The <a href="http://lists.ubuntu.com/mailman/listinfo/ubuntu-announce">ubuntu-announce</a> list has very few emails (less than one a month, usually) and will keep you up-to-date on new releases of Ubuntu, and significant new developments.</p>
-			</li>
-			<li>
-				<p><strong>Ubuntu news</strong></p>
-				<p>The <a href="http://lists.ubuntu.com/mailman/listinfo/ubuntu-news">ubuntu-news</a> list is a low volume list, primarily for the Ubuntu Weekly News.</p>
-			</li>
-		</ul>
-	 
-		<h3>User lists</h3>
-		<p>The <a href="http://lists.ubuntu.com/mailman/listinfo/ubuntu-users">ubuntu-users</a> list is where most technical support discussions occur, and where users of Ubuntu meet to discuss new features and ideas they would like to see in Ubuntu. NB: this is a very high-traffic mailing list, generating around 200 messages a day. If you want to avoid a full inbox, try the <a href="http://www.ubuntuforums.org/">Ubuntu web forums</a>.</p> 
-	
-		<h3>Developer lists</h3>
-		<ul>
-			<li>The <a href="http://lists.ubuntu.com/mailman/listinfo/ubuntu-devel">ubuntu-devel</a> mailing list is for discussions among Ubuntu developers about their projects. This is a moderated mailing list.</li>
-			<li>The <a href="https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel-discuss">ubuntu-devel-discuss</a> mailing list is for community discussion and suggestions about the future development of Ubuntu.</li>
-			<li>The <a href="https://lists.ubuntu.com/#Package+Upload+and+Automatic+Notification+Lists">package upload and automatic notification</a> mailing lists contain the archive upload notifications for each version of Ubuntu. These lists are primarily used for Ubuntu development.</li>
-			<li>The <a href="http://lists.ubuntu.com/mailman/listinfo/ubuntu-motu">ubuntu-motu</a> mailing list is for getting involved in packaging and development on Ubuntu.</li>
-		</ul> 
-	
-		<h3>Mailing list etiquette</h3>
-		<p>These guidelines are designed to keep the productivity of the Ubuntu mailing lists at a high level. They represent the conventions currently used by the majority of participants in the mailing lists, and should be used as a frame of reference for mailing list etiquette.</p> 
-	
-		<h3>Summary</h3> 
-		<ul> 
-			<li>Observe the <a href="/about/about-ubuntu/conduct">Ubuntu Code of Conduct</a>.</li> 
-			<li>Before writing an email, consider whether it will further a discussion which is relevant for the particular mailing list.</li> 
-			<li>Observe the technical guidelines about emailing outlined in this page.</li>
-		</ul> 
-	
-		<h3>Code of Conduct</h3>
-		<p>The Ubuntu Code of Conduct governs all interaction within the Ubuntu community. Because mailing lists form an integral part of that interaction, it is especially important to bear the Code of Conduct in mind at all times. Mailing list users should <a href="/about/about-ubuntu/conduct">read the Code of Conduct in full</a>, and if possible, should <a href="https://launchpad.net/codeofconduct">digitally sign a copy </a>.</p>
-	 
-		<p>Fundamental aspects of the Code of Conduct relevant to mailing lists include:</p> 
-		<ul> 
-			<li>Be considerate</li> 
-			<li>Be respectful</li> 
-			<li>Be collaborative</li> 
-			<li>When you disagree, consult others</li> 
-			<li>When you are unsure, ask for help</li> 
-			<li>Step down considerately</li> 
-			<li>Avoid flamewars, trolling, personal attacks, and repetitive arguments</li> 
-		</ul> 
-	
-		<h3>Topic</h3>
-		<p>Every mailing list deals with a specific subject matter (a topic). It is important to limit discussion to that topic so that the mailing list remains productive. When writing to mailing lists, bear in mind that your email may be sent to hundreds of people, who have signed up to the mailing list for a specific reason, or interest. Avoid subjects which are not relevant to the individual mailing list, and each time you write an email, consider its relevance for the mailing list in question. A good rule of thumb is that each email should contribute positively to a relevant discussion.</p> 
-	 
-		<p>Specific examples:</p> 
-		<ul> 
-			<li>The <em>ubuntu-users</em> mailing list should be used for technical support.</li> 
-			<li>The <em>ubuntu-devel</em> mailing list should be used for discussion of the development of Ubuntu.</li> 
-		</ul> 
-	
-		<h3>Technical guidelines</h3> 
-		<h4>Proper quoting:</h4> 
-		<p>Proper quoting is very important on mailing lists, to ensure that it is easy to follow the conversation. There are four fundamental rules:</p> 
-		<ul> 
-			<li>When replying to an email, ensure that the email which you are replying to is indented with a symbol such as &gt; or | (this is usually done from the preferences of your email client - most should do this by default).</li> 
-			<li>When quoting, attribute the quoted text to the person who wrote it (again, most email clients will do this by default). Be careful to attribute the correct text to the correct person.</li> 
-			<li>Write your email underneath the email which you are replying to.</li> 
-			<li>Tailor your reply to fit the text which you are replying to. Do not quote the whole of the previous email - remove any unnecessary text. To avoid confusion, it's often a good idea to replace removed text with a brief indication that something has been removed, like <em>[snip]</em>.</li> 
-	 	</ul>
-	
-		<h3>HTML mail</h3>
-		<p>Avoid sending emails in HTML format, if possible. Some people may find it more difficult to read or reply to these emails. Also, HTML email takes up more space, so people with restricted Internet access will be happier to receive plain text emails.</p> 
-	
-		<h3>Threading</h3>
-		<p>Many users read mailing lists by the thread. This means that when reading, emails are placed in a tree structure according to the subject. For an example, <span>see <a href="http://news.gmane.org/gmane.linux.ubuntu.user">this page </a>. To permit this, email clients identify messages by a special hidden 'header' of the message. To assist those who read mailing lists in this way: </span></p> 
-	
-		<ul>
-			<li>Try to ensure that you use an email client which retains this 'hidden' part of the message. For example, avoid using Outlook Express.</li> 
-			<li>When replying to messages, use your email client's <strong>Reply To List</strong> function, rather than 'Reply' or 'Reply To All'. This is <strong>Ctrl + L</strong> in <em>Evolution</em> (Ubuntu's default email client), and <strong>Shift + L</strong> in Kmail (Kubuntu's default email client) and in mutt (a popular console email client). If your email client does not have this function, ask for it to be added! Mozilla's Thunderbird does not have this function, but if you read the mailing lists as a newsgroup in Thunderbird, you can simply use the "Reply" function.</li> 
-			<li>When starting a new subject, do not reply to a previous email from the mailing list. If you do, your email may form part of a previous thread. To start a new subject, use a clean email.</li> 
-			<li>Replying to <em>digest</em> emails breaks the threading.</li> 
-		</ul> 
-	
-		<h4>Changing the subject</h4> 
-		<p>When a reply takes the email away from the original subject, change the subject line in your email. This helps people reading the mailing list to identify the most relevant emails for them.</p> 
-	 
-		<p>When changing the subject, keep the original subject in brackets. For example, if the original subject was 'Ubuntu rocks', your subject should be 'Ubuntu could be made better (was Ubuntu rocks)'.</p> 
-	</div><!-- / .seven-col -->
-</div><!-- / .row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/support/community/web-forums.html b/templates/support/community/web-forums.html
deleted file mode 100644
index 5b0fc304bb4..00000000000
--- a/templates/support/community/web-forums.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% extends "support/_base_support.html" %}
-
-{% block title %}Web forums | Ubuntu{% endblock %}
-
-{% block second_level_nav_items %}
-	{% include "templates/_nav_breadcrumb.html" with section_title="Support" subsection_title="Community" page_title="Web forums"  tertiary="true" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-<div class="row row-hero no-border">
-	<h1>Web forums</h1>
-</div>
-
-<div class="row no-border">
-	<div class="eight-col">
-		<h3>We'd like to thank our volunteer community members who run the web forums devoted to Ubuntu.</h3>
-		<p>The forums are a great place to meet other Ubuntu users and developers. You can also learn about the Ubuntu community without subscribing to high-traffic mailing lists and cluttering your inbox.</p>
-		<p>Please observe the same <a href="/about/about-ubuntu/conduct">Code of Conduct</a> on these forums as you would on any Ubuntu list or site.</p>
-	  
-		<h3>English-language forums:</h3>
-		<p><a href="http://www.ubuntuforums.org/">Ubuntu web forums</a></p>
-	  
-		<h3>Other languages:</h3>
-		<p>View web forums for non-English speakers available in <a href="/support/community/local-language">local languages</a>.</p>
-		<p>Once again, thanks to the community members who look after these forums.</p>
-	</div><!-- / .seven-col -->
-</div><!-- / .row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/support/index.html b/templates/support/index.html
old mode 100644
new mode 100755
index 08f4b92a834..be1c7a3110f
--- a/templates/support/index.html
+++ b/templates/support/index.html
@@ -14,20 +14,20 @@ <h1>Support</h1>
 
 <div class="row equal-height no-border">
 	<div class="six-col box">
-		<h3><a href="https://help.ubuntu.com/">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">official documentation</a>.</p>
+		<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">
-		<h3><a href="https://answers.launchpad.net/ubuntu">Technical answers system</a></h3>
+		<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="/business/services">Buy professional support services</a></h3>
+		<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="/support/community">Get free community support</a></h3>
-		<p>Speak with the Ubuntu Community directly using our <a href="https://help.ubuntu.com/community/InternetRelayChat">Internet relay chat (IRC) channel</a>.</p>
+		<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>
 	</div><!-- /.six-col -->
 </div><!-- / .row -->
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/support/shared/_contextual_footer.html b/templates/support/shared/_contextual_footer.html
old mode 100644
new mode 100755
diff --git a/templates/tablet/_nav_secondary.html b/templates/tablet/_nav_secondary.html
old mode 100644
new mode 100755
index 18e6b3677c4..b0b400edc1c
--- a/templates/tablet/_nav_secondary.html
+++ b/templates/tablet/_nav_secondary.html
@@ -1,7 +1,5 @@
-	<ul{% if list_class %} class="{{ list_class }}"{% endif %}>
-		{% if arrow %} <li class="arrow-up"></li> {% endif %}
+	<ul{% if list_class %} class="{{ list_class }}"{% endif %} class="second-level-nav">
 		<li class="first{% if level_1 == 'tablet' and not level_2 %} active{% endif %}"><a href="/tablet">Design</a></li>
 		<li{% if level_2 == 'operators-and-oems' %} class="active"{% endif %}><a href="/tablet/operators-and-oems">Operators and OEMs</a></li>
 		<li{% if level_2 == 'backed-by-canonical' %} class="last-item"{% endif %}{% if level_2 == 'app-ecosystem' %} class="active"{% endif %}><a href="/tablet/app-ecosystem">App ecosystem</a></li>
-		{% if location != "footer" %}<li class="last-item{% if level_2 == 'backed-by-canonical' %} active{% endif %}"><a href="/tablet/backed-by-canonical">Backed by Canonical</a></li>{% endif %}
 	</ul>
diff --git a/templates/tablet/_nav_tertiary.html b/templates/tablet/_nav_tertiary.html
old mode 100644
new mode 100755
index 57dd8ea659c..4b205b724a3
--- a/templates/tablet/_nav_tertiary.html
+++ b/templates/tablet/_nav_tertiary.html
@@ -1,4 +1,4 @@
-<ul>
+<ul class="third-level-nav">
 {% if level_3 == 'thank-you' and not level_4 %}
 	<li{% if level_3 == 'thank-you' %} class="active"{% endif %}>Thank you</li>
 {% endif %}
diff --git a/templates/tablet/app-ecosystem.html b/templates/tablet/app-ecosystem.html
old mode 100644
new mode 100755
index 6421d2e59ba..ae46f45a133
--- a/templates/tablet/app-ecosystem.html
+++ b/templates/tablet/app-ecosystem.html
@@ -11,16 +11,19 @@
 
 {% block content %}
 <div class="row row-hero">
-	<h1>A fast-evolving <br />app ecosystem</h1>
-	<div class="four-col">
+		<h1>A fast-evolving app ecosystem</h1>
+	<div class="five-col">
 		<p>Already a very popular platform for web, Blackberry and Android mobile development, you&rsquo;ll want to bring all your apps to Ubuntu.</p>
-		<p>A great app will use the unique features in Ubuntu to create a fresh, uncluttered, purposeful and fast experience. Make one app binary for all form factors &ndash; web or native. You have it all at your fingertips when you run Ubuntu on <br />your workstation.</p>
+		<p>A great app will use the unique features in Ubuntu to create a fresh, uncluttered, purposeful and fast experience. Make one app binary for all form factors &ndash; web or native. You have it all at your fingertips when you run Ubuntu on your workstation.</p>
+	</div>
+	<div class="seven-col text-center last-col">
+		<img src="{{ STATIC_URL }}img/tablet/app-ecosystem/image-tablet-appecosystem.jpg" alt="Two Ubuntu tablets side by side" width="579" height="377" />
 	</div>
 </div><!-- / .row -->
 
 <div class="row">
 	<div class="twelve-col text-center">
-		<img class="shadow-fix" src="{{ STATIC_URL }}img/devices/tablet-app-carousel.png" width="984" height="288" alt="Carousel of app for Ubuntu tablet" />
+		<img src="{{ STATIC_URL }}img/tablet/app-ecosystem/image-tablet-welovetheweb.jpg" width="906" height="288" alt="Carousel of app for Ubuntu tablet" />
 	</div>
 	<h2>We love the web</h2>
 	<div class="six-col">
@@ -32,8 +35,8 @@ <h2>We love the web</h2>
 </div><!-- / .row -->
 
 <div class="row">
-	<div class="six-col">
-		<img class="shadow-fix" src="{{ STATIC_URL }}img/devices/tablet-app-native-ski-safari.png" width="512" height="322" alt="Ski Safari game running on an Ubuntu tablet" />
+	<div class="six-col text-center">
+		<img class="shadow-fix" src="{{ STATIC_URL }}img/tablet/app-ecosystem/image-tablet-wealsogonative.jpg" width="512" height="322" alt="Ski Safari game running on an Ubuntu tablet" />
 	</div>
 	<div class="six-col last-col">
 		<h2>We also go native</h2>
@@ -46,11 +49,14 @@ <h2>We also go native</h2>
 		<h2>One app on Ubuntu for all <br/>form factors</h2>
 		<p>Perhaps the most exciting thing about writing native apps for Ubuntu <br />is the opportunity to write and build a single app with responsive interfaces that allow it to run on any Ubuntu device. In other words, <br />you can use the Ubuntu SDK to build your app and, with some care and attention, make it available to users of Ubuntu PCs, phones and tablets &ndash; all in a single upload to the Ubuntu Software Centre.</p>
 	</div>
+	<div class="five-col last-col pull-right no-margin-bottom">
+		<img src="{{ STATIC_URL }}img/tablet/app-ecosystem/image-tablet-softwarecentre.jpg" alt="" width="390" height="401" class="for-tablet touch-border" />
+	</div>
 </div><!-- / .row -->
 
-<div class="row">
-	<div class="eight-col">
-		<img class="shadow-fix" src="{{ STATIC_URL }}img/devices/tablet-app-media-player.png" width="632" height="433" alt="Ubuntu tablet's media player" />
+<div class="row entertain-us">
+	<div class="eight-col text-center">
+		<img class="shadow-fix" src="{{ STATIC_URL }}img/tablet/app-ecosystem/image-tablet-entertainus.jpg" width="682" height="433" alt="Ubuntu tablet's media player" />
 	</div>
 	<div class="four-col last-col">
 		<h2>Entertain us</h2>
@@ -58,27 +64,15 @@ <h2>Entertain us</h2>
 	</div>
 </div><!-- / .row -->
 
-<div class="row row-image-centered">
-	<div class="seven-col">
-		<h2>Our cloud is your cloud</h2>
-		<p>The Ubuntu One personal cloud service provides every Ubuntu user with free storage space and the option to buy more. But for developers, Ubuntu One offers much more. The U1DB cloud-syncing database provides APIs to sync any kind of data to the cloud &ndash; not just files.</p>
-		<p>If you&rsquo;re a mobile operator and want a fast way to develop cloud-based services for your users, Ubuntu One enables you <br />to develop integrated, differentiating services, without the need to maintain your own infrastructure &ndash; manage identity, payments and service activation securely.</p>
-	</div>
-	
-	<span>
-		<img width="442" height="323" src="{{ STATIC_URL }}img/devices/UB1-diagram.png" alt="Ubuntu One syncing all Ubuntu devices together" />
-	</span>
-</div><!-- / .row -->
-
 <div class="row no-border row-image-centered">
-	
+
 	<span>
-		<img src="{{ STATIC_URL }}img/devices/phone-developer-pictograms.png" width="217" height="200" alt="Developer pictograms" />
+		<img src="{{ STATIC_URL }}img/tablet/app-ecosystem/image-tablet-startcreatingyourappnow.svg" width="217" height="200" alt="Developer pictograms" />
 	</span>
 	<div class="seven-col last-col">
 		<h2>Start creating your app now</h2>
 		<p>If you are writing apps for Ubuntu today, it&rsquo;s time to go mobile.  Download the Preview SDK and get started today.</p>
-		<p><a href="http://developer.ubuntu.com/gomobile">Go mobile &rsaquo;</a></p>
+		<p><a href="http://developer.ubuntu.com/gomobile">Go mobile&nbsp;&rsaquo;</a></p>
 	</div>
 </div><!-- / .row -->
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/tablet/backed-by-canonical.html b/templates/tablet/backed-by-canonical.html
deleted file mode 100644
index 41e16921e11..00000000000
--- a/templates/tablet/backed-by-canonical.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "tablet/base_tablet.html" %}
-
-{% block title %}Backed by Canonical | Ubuntu for tablets{% 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{% 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 "templates/_nav_breadcrumb.html" with section_title="Tablet" page_title="Backed by Canonical" %}
-{% endblock second_level_nav_items %}
-
-{% block content %}
-{% include "shared/_backed_by_canonical.html" %}
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/tablet/base_tablet.html b/templates/tablet/base_tablet.html
old mode 100644
new mode 100755
diff --git a/templates/tablet/contact-us.html b/templates/tablet/contact-us.html
old mode 100644
new mode 100755
index 07eccfca237..82a3ac600b1
--- a/templates/tablet/contact-us.html
+++ b/templates/tablet/contact-us.html
@@ -35,38 +35,38 @@ <h3>OEM partner, app developer or content partner</h3>
 			<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' /><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' /><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' /><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' /><span class='mktFormMsg'></span></span></li>
+					<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='text' value=""  maxlength='255' tabIndex='5' /><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="text"><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"><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='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'><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'><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'><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>
+					<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">					
+				<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>
@@ -102,10 +102,10 @@ <h3>Your organisation</h3>
 	<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 &rsaquo;</a></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 &rsaquo;</a></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
old mode 100644
new mode 100755
index 2fd28822ce9..1929f51b3ad
--- a/templates/tablet/index.html
+++ b/templates/tablet/index.html
@@ -12,29 +12,38 @@
 <div class="row row-hero">
 	<div class="the-video">
 		<p class="left">
-			<a href="http://v.youku.com/v_show/id_XNTE3Njc4MTM2">优酷视频 &rsaquo;</a>
+			<a href="http://v.youku.com/v_show/id_XNTE3Njc4MTM2">优酷视频&nbsp;&rsaquo;</a>
 		</p>
 		<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="Close icon" /></a>
 		</p>
 		<div></div>
 	</div>
-	<h1>Tastefully tactile</h1>
 	<div class="four-col">
+		<h1>Marvelously multi-talented</h1>
 		<h2>Ubuntu on tablets</h2>
-		<p>With unique multitasking productivity, effortless navigation and defence-ready security, Ubuntu raises the bar on tablet design and sets a new standard for the post-PC era. Bright. Brilliant. Beautiful. And naturally neat.</p>
-		<p class="video-link"><a href="https://www.youtube.com/watch?v=h384z7Ph0gU&hd=1" class="show-video"><img src="{{ STATIC_URL }}img/devices/play-video-icon.png" width="54" height="50" alt="Play icon" />Watch the video &rsaquo;</a></p>
+		<p>With unique multi-tasking productivity, secure sharing, and a beautiful interface which scales perfectly from 6.5&#8221; to 20&#8221; screens and beyond, Ubuntu releases new possibilities from the tablet, at work and at play.</p>
+		<p class="video-link"><a href="https://www.youtube.com/watch?v=h384z7Ph0gU&amp;hd=1" class="show-video"><img src="{{ STATIC_URL }}img/devices/play-video-icon.png" width="54" height="50" alt="Play icon" />Watch the video&nbsp;&rsaquo;</a></p>
+		<div class="video-container for-mobile">
+			<iframe width="100%" height="auto" src="//www.youtube.com/embed/h384z7Ph0gU" allowfullscreen></iframe>
+		</div>
 	</div><!-- /.four-col -->
+	<div class="eight-col last-col text-center priority-0">
+		<img src="{{ STATIC_URL }}img/devices/tablet-hero.jpg" alt="" width="625" height="363" />
+	</div>
 </div><!-- /.row -->
 
 <div class="row">
-	<img class="shadow-fix" src="{{ STATIC_URL }}img/devices/tablet-media-player-large.png" width="984" height="622" alt="Ubuntu tablet sharing a movie" />
+	<img src="{{ STATIC_URL }}img/tablet/image-tablet-music.jpg" width="976" height="622" alt="Ubuntu tablet sharing a movie" />
 	<div class="nine-col" id="multitasking-mojo">
 		<h2>Multitasking mojo</h2>
 		<p>Ubuntu&rsquo;s unique side stage places a phone and a tablet app on the same screen at the same time for amazing tablet productivity. True multitasking comes to the tablet.</p>
 	</div>
-	<div class="twelve-col">
-		<img class="shadow-fix" src="{{ STATIC_URL }}img/devices/tablet-multi-tasking.png" width="984" height="334" alt="Ubuntu tablet running multipule applications side by side" />
+	<div class="six-col">
+		<img class="shadow-fix" src="{{ STATIC_URL }}img/tablet/image-tablet-multitaskingmojo-1.jpg" width="512" height="321" alt="Ubuntu tablet running multiple applications side by side" />
+	</div>
+	<div class="six-col last-col">
+		<img class="shadow-fix" src="{{ STATIC_URL }}img/tablet/image-tablet-multitaskingmojo-2.jpg" width="512" height="321" alt="Ubuntu tablet running multipule applications side by side" />
 	</div>
 	<div class="six-col">
 		<p>Take calls in Skype while you work in a document, make notes&nbsp;on the side while you surf the web, tweet while you watch a movie.</p>
@@ -46,7 +55,15 @@ <h2>Multitasking mojo</h2>
 
 <div class="row safer-sharing row-image-centered">
 	<span>
-		<img src="{{ STATIC_URL }}img/devices/safer-sharing-login.png" width="239" height="225" alt="Ubuntu login screen with multiple users" />
+		<div class="safer-sharing-image-load" data-width="300" data-src="{{ STATIC_URL }}img/tablet/image-tablet-safersharing{width}.png" data-alt="Ubuntu login screen with multiple users"></div>
+		<script>
+		    new Imager('.safer-sharing-image-load', {
+		        availableWidths: {
+		            300: '-small',
+		            768: '-medium'
+		        }
+		    });
+		</script>
 	</span>
 	<div class="six-col last-col">
 		<h2>Safer sharing</h2>
@@ -62,7 +79,7 @@ <h2>Effortless navigation with magic edges</h2>
 	</div>
 </div>
 <div class="row row-tight no-border">
-	<div class="eight-col">
+	<div class="eight-col priority-0">
 		<div class="slider-animation instant-launch">
 			<div class="screen">
 				<div class="screen-fade"></div>
@@ -81,7 +98,7 @@ <h3>Instant launch</h3>
 		<h3>The system at your service</h3>
 		<p>Swipe through the top for any system service, search or setting. Switch networks, turn mobile data on, mute the volume, respond to incoming messages or block notifications without leaving your application. In fact, any system setting can be changed directly, without losing your place in the app. That makes Ubuntu the best tablet for staying focused in a connected world.</p>
 	</div>
-	<div class="eight-col last-col">
+	<div class="eight-col last-col priority-0">
 		<div class="slider-animation system-service">
 			<div class="screen">
 				<div class="screen-fade"></div>
@@ -92,7 +109,7 @@ <h3>The system at your service</h3>
 	</div>
 </div>
 <div class="row row-tight">
-	<div class="eight-col">
+	<div class="eight-col priority-0">
 		<div class="slider-animation content-controls">
 			<div class="screen">
 				<div class="menu"></div>
@@ -102,94 +119,95 @@ <h3>The system at your service</h3>
 	</div>
 	<div class="four-col last-col">
 		<h3>Celebrate content <br/>not controls</h3>
-		<p>Ubuntu feels cleaner, more spacious and less cluttered because we don&rsquo;t need buttons on every screen &ndash; your content is king. Swiping up from the bottom edge reveals app controls. <br />Don&rsquo;t swipe, you don&rsquo;t see any buttons or toolbars. You&rsquo;re free to focus on the stuff that matters &ndash; your photos, web pages, music, messages and apps.</p>
+		<p>Swiping up from the bottom edge reveals app controls. If you don&rsquo;t swipe, you don&rsquo;t see any buttons or toolbars &mdash; leaving you free to focus on the stuff that matters &mdash; your photos, web pages, music, messages and apps. Ubuntu feels cleaner, more spacious and less cluttered because we don’t need buttons on every screen &mdash; your content is king.</p>
 	</div>
 </div>
 
-<div class="row gorgeous-gallery">
+<div class="row gorgeous-gallery row-grey">
+	<div class="six-col for-mobile">
+		<img src="{{ STATIC_URL }}img/tablet/image-tablet-gorgeousgallery.jpg" alt="" />
+	</div>
 	<div class="six-col prepend-three">
 		<h2>A gorgeous gallery <br/>for your digital life</h2>
 		<p>The Gallery app is a stylish native Ubuntu application that <br />lets you organise and share photos. It&rsquo;s a great example of convergent app design and engineering: one app works on phone, tablet and desktop and it&rsquo;s equally beautiful and usable in every environment.</p>
-		<p>On the phone, you can browse photos, and on the tablet, <br />you can create albums &ndash; Ubuntu will organise your pictures into events by date or you can create custom collections.</p>
-		<p>Your photos are all instantly uploaded to your personal <br />cloud and available on all your devices &ndash; including those <br/>running iOS, Android and Windows. <br/>Share them with one touch.</p>
+		<p>Ubuntu will organise your pictures into events by date or you can create custom collections.</p>
+		<p>Your photos are all instantly uploaded to your personal cloud of choice and you can share them with one touch.</p>
 	</div>
 </div><!-- /.row -->
 
-<div class="row">
-	<img class="shadow-fix" src="{{ STATIC_URL }}img/devices/tablet-voice-control-HUD.png" width="984" height="334" alt="Using HUD to search to application functions" />
-	<h2>Voice control in the HUD</h2>
+<div class="row instant-share">
 	<div class="six-col">
-		<p>The Ubuntu HUD makes complex application workflows simple on touch devices. This brings all the power of the <br />PC to your touch device. And with voice control, it&rsquo;s as if <br />you had an extra set of hands &ndash; a truly personal assistant.</p>
+		<img src="{{ STATIC_URL }}img/tablet/image-tablet-videoplayershare.png" alt="Share popover on Ubuntu touch" width="516" height="449" class="touch-top-left for-tablet" />
 	</div>
 	<div class="six-col last-col">
-		<p>Take the tablet where it has never been before &ndash; image manipulation, movie editing, document management, CAD. With an interface that scales from the tablet to a PC, Ubuntu brings potent apps into focus on touch devices.</p>
-	</div>
-</div><!-- /.row -->
-
-<div class="row instant-share">
-	<div class="six-col last-col prepend-six">
 		<h2>Instant share and <br />cloud connections</h2>
 		<p>Sharing is now built-in, with support for all the major networks. So any app can let you share with friends, family and co-workers.  One touch is all it takes.</p>
-		<p>Facebook and Twitter aren&rsquo;t the only ways to share. <br />Ubuntu One already has millions of users on Ubuntu, Android, Windows and Mac. Deeply integrated on Ubuntu devices, it provides free storage, paid-for music streaming services and <br />a foundation for cloud-based services from operators and device makers.</p>
+		<p>Facebook and Twitter aren&rsquo;t the only ways to share. Content services like music and photo streaming can be connected via an OEM or third-party cloud service.</p>
 	</div>
 </div><!-- /.row -->
 
 <div class="row world-of-apps">
-	<div class="six-col">
+	<div class="six-col for-tablet">
+		<img src="{{ STATIC_URL }}img/tablet/image-tablet-worldofapps-small.jpg" alt=""/>
+	</div>
+	<div class="six-col last-col">
 		<h2>A whole world of apps</h2>
 		<p>Web applications sit alongside native apps as equal citizens <br />on Ubuntu &ndash; with their own icons and access to system services. Facebook, Twitter, Google Maps, Gmail and Spotify are all available from day one &ndash; thanks to Ubuntu&rsquo;s brilliant web app system, developers can easily make their site install on the tablet as an app.</p>
-		<p>We aren&rsquo;t limited to HTML5. Native apps are blazingly fast, taking advantage of the full capabilities of the tablet&rsquo;s processor and graphics hardware. A mobile SDK does most <br />of the work for you, giving you that Ubuntu style. It&rsquo;s easy for Android and Blackberry developers to publish for the Ubuntu audience too, and since you&rsquo;re already running Ubuntu on your development workstations, everything you need is at your fingertips.</p>
-		<p><a href="/tablet/app-ecosystem">Learn more about developing for Ubuntu on tablets &rsaquo;</a></p>
+		<p>We aren&rsquo;t limited to HTML5. Native apps are blazingly fast, taking advantage of the full capabilities of the tablet&rsquo;s processor and graphics hardware. A mobile SDK does most of the work for you, giving you that Ubuntu style.</p>
+		<p>Best of all, Ubuntu’s common platform enables development of one application which can then be published across phone, tablet, desktop and TV.  Developer upload to user download can take five minutes flat.</p>
+		<p><a href="/tablet/app-ecosystem">Learn more about developing for Ubuntu on tablets&nbsp;&rsaquo;</a></p>
 	</div>
 </div><!-- /.row -->
 
 <div class="row">
 	<div class="twelve-col no-margin-bottom">
-		<img class="shadow-fix" src="{{ STATIC_URL }}img/devices/tablet-search.png" width="984" height="622" alt="Searching for New york on Ubuntu tablet" />
+		<img src="{{ STATIC_URL }}img/tablet/image-tablet-videos.jpg" width="976" height="622" alt="Searching for New York on Ubuntu tablet" />
 	</div>
 	<h2>Savvy search</h2>
 	<div class="six-col">
-		<p>Ubuntu presents results from hundred of sources in <br />one gorgeous page, saving you the trouble of comparison shopping or hunting down the right provider. You&rsquo;ll see information from your email and phone contacts alongside Facebook friends and followers on Twitter. </p>
+		<p>Just ask and Ubuntu presents results from hundreds of sources in one, gorgeous page, saving you the trouble of comparison shopping or hunting down the right provider. Interested in Superman?  Ubuntu searches the tablet and the web through its scopes, including retailers like Amazon or eBay.  </p>
 	</div>
 	<div class="six-col last-col">
-		<p>Looking for music? Ubuntu doesn&rsquo;t just search the tunes <br />on your tablet, it also searches online, giving you a choice <br />of tracks you don&rsquo;t yet own. It&rsquo;s really one search to rule <br />them all.</p>
+		<p>The video scope will return the film, the music scope will return the soundtrack, finding exactly what you want has never been so easy.</p>
 	</div>
 </div><!-- /.row -->
 
 <div class="row naturally-neat">
-	<div class="six-col">
-		<img class="shadow-fix" src="{{ STATIC_URL }}img/devices/tablet-home-portrait.jpg" width="510" height="662" alt="Ubuntu home screen displayed portrait" />
+	<div class="twelve-col no-margin-bottom">
+		<img src="{{ STATIC_URL }}img/tablet/image-tablet-scopes.jpg" width="975" height="622" alt="Searching for New york on Ubuntu tablet" />
 	</div>
-	<div class="six-col last-col">
-		<h2>Naturally neat home screen</h2>
-		<p>The stylish home screen organises all your most important information, selected from hundreds of sources &ndash; online or <br />on board.</p>
-		<p>You can customise the screen and search for any kind of content. Watch what you want with a single touch &ndash; no need to worry which app to find it in.</p>
+	<h2>Naturally neat with scopes</h2>
+	<div class="eight-col">
+		<p>Ubuntu&rsquo;s stylish home brings together information from hundreds of sources. Any kind of content can be surfaced directly in a scopes page: apps, music, videos and scopes are showcased front and centre.  Open what you want with a single touch &mdash; no need to worry which app to find it in.</p>
 	</div>
 </div><!-- /.row -->
 
 <div class="row row-image-centered">
 	<div class="six-col last-col">
 		<h2>Convergence that just clicks</h2>
-		<p>Today&rsquo;s tablets are as powerful as ultra-light laptops. Ubuntu uniquely supports a new category of convergence device &ndash; add a keyboard and mouse and your Ubuntu tablet becomes <br />a full PC and thin client, with access to Windows apps over standard protocols from Microsoft, Citrix, VMware and Wyse. That lets enterprise IT deploy a single, secure, portable corporate device for all kinds of applications.</p>
-		<p>Since it is pure Ubuntu, the tablet can be managed via Landscape, giving enterprises complete control over the users, apps, updated and access using the same tool they <br />use for Ubuntu servers and desktops today.</p>
+		<p>Today&rsquo;s tablets are as powerful as ultra-light laptops.  Designed for convergence, the option to dock with a keyboard and mouse will provide a full Ubuntu PC desktop experience in future.</p>
+		<p>And since it is pure Ubuntu, tablets can be managed via Canonical&rsquo;s proven systems management tool Landscape. That lets enterprise IT deploy a single, secure, portable corporate device for all kinds of applications. </p>
 	</div>
 	<span>
-		<img src="{{ STATIC_URL }}img/devices/tablet-convergence-illustration.jpg" width="357" height="310" alt="Ubuntu convergence illustration" />
+		<img src="{{ STATIC_URL }}img/tablet/image-tablet-converged.svg" class="priority-0" width="348" height="300" alt="Ubuntu convergence illustration" />
 	</span>
 </div><!-- /.row -->
 
-<div class="row row-grey equal-height row-grey">
-	<h2>Build a tablet with us</h2>
-	<img class="shadow-fix" src="{{ STATIC_URL }}img/devices/tablet-branded-and-apps.png" width="984" height="334" alt="Ubuntu tablet's interface branded with partners and grid of apps" />
+<div class="row row-grey row-grey row-build-a-tablet">
+	<div class="twelve-col">
+		<h2>Build a tablet with us</h2>
+	</div>
 	<div class="six-col">
-		<h3>Perfect for partners</h3>
-		<p>Canonical and Ubuntu enable industry partners to build devices that span the range, from low-BOM consumer electronics to enterprise-grade convergence devices for <br />the office, ruggedized, industrial and military. Fully customisable with branding, content and apps, Ubuntu <br />is the best choice for whatever tablet you want to make.</p>
-		<p><a href="/tablet/operators-and-oems">Work with us &rsaquo;</a></p>
+		<img src="{{ STATIC_URL }}img/tablet/image-tablet-everythingdevelopersneed.jpg" alt="List of app logos" width="432" height="300" />
+		<h3>Everything developers need</h3>
+		<p>Create gorgeous apps easily with our SDK: HTML5, Apache Cordova, OpenGL and a native toolkit giving you a full range of options for modern app development. With one OS for all form factors, you can build a single app with interfaces for the tablet, PC and phone &ndash; all published in a single upload. That&rsquo;s why leading game engines support Ubuntu, and why we&rsquo;re the favourite developer desktop for both cloud and mobile engineering.</p>
+		<p><a href="/tablet/app-ecosystem">Create your first tablet app for Ubuntu&nbsp;&rsaquo;</a></p>
 	</div>
 	<div class="six-col last-col">
-		<h3>Everything developers need</h3>
-		<p>Create gorgeous apps easily with our SDK: HTML5, OpenGL and a native toolkit giving you a full range of options for modern app development. With one OS for all form factors, you can build a single app with interfaces for the tablet, PC and phone &ndash; all published in a single upload. That&rsquo;s why leading game engines support Ubuntu, and why we&rsquo;re the favourite developer desktop for both cloud and mobile.</p>
-		<p><a href="/tablet/app-ecosystem">Create your first tablet app for Ubuntu &rsaquo;</a></p>
+		<img src="{{ STATIC_URL }}img/tablet/image-tablet-perfectforpartners.jpg" alt="Partner styled greeter screen" width="504" height="321" />
+		<h3>Perfect for partners</h3>
+		<p>Canonical and Ubuntu enable industry partners to build devices that span the range, from low-BOM consumer electronics to enterprise-grade convergence devices for <br />the office, ruggedised, industrial and military. Fully customisable with branding, content and apps, Ubuntu <br />is the best choice for whatever tablet you want to make.</p>
+		<p><a href="/tablet/operators-and-oems">Work with us&nbsp;&rsaquo;</a></p>
 	</div>
 </div><!-- /.row -->
 
@@ -197,10 +215,10 @@ <h3>Everything developers need</h3>
 	<div class="eight-col">
 		<h2>Backed by Canonical</h2>
 		<p>We provide hardware enablement services to the world&rsquo;s biggest PC OEMs and, <br />as a result, Ubuntu is predicted to ship on almost 10% of the world&rsquo;s new branded PCs by 2014. With a global team of specialists covering enablement and optimisation, we have the resources you need to deliver amazing Ubuntu tablets.</p>
-		<p><a href="/tablet/backed-by-canonical">Learn more about Canonical &rsaquo;</a></p>
-	</div> 
+		<p><a href="/partners/backed-by-canonical">Learn more about Canonical&nbsp;&rsaquo;</a></p>
+	</div>
 	<span class="four-col last-col">
-		<img src="{{ STATIC_URL }}img/logos/canonical-symbol-167x167.png" width="167" height="167" alt="Canonical logo" />
+		<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/tablet/operators-and-oems.html b/templates/tablet/operators-and-oems.html
old mode 100644
new mode 100755
index bddcded7109..a45959b6377
--- a/templates/tablet/operators-and-oems.html
+++ b/templates/tablet/operators-and-oems.html
@@ -15,6 +15,9 @@
 		<h1>Ready to roll</h1>
 		<p>Our experience in the PC business makes us the perfect partner for a Linux based tablet. With its distinctive design and user experience, Ubuntu makes an incredible new platform for you to deliver class-leading devices quickly and easily. We support your need to tailor devices to your brand, integrating custom services, content and apps without fragmenting the ecosystem.</p>
 	</div>
+	<div class="eight-col last-col">
+		<img src="{{ STATIC_URL }}img/tablet/operators-and-oems/image-tablet-operatorsandoems.jpg" alt="Two Ubuntu tablets side by side" width="634" height="368" />
+	</div>
 </div><!-- /.row -->
 
 <div class="row">
@@ -24,7 +27,7 @@ <h2>Now it&rsquo;s easy to make a great tablet</h2>
 	</div>
 	<div class="six-col last-col">
 		<p>More powerful devices can switch from the tablet to a full <br />PC interface when a keyboard is connected, creating great opportunities for the enterprise market.</p>
-		<p><a href="/tablet/design">Learn more about the Ubuntu experience on tablets &rsaquo;</a></p>
+		<p><a href="/tablet">Learn more about the Ubuntu experience on tablets&nbsp;&rsaquo;</a></p>
 	</div>
 	<div class="twelve-col last-col no-margin">
 		<h3>Ubuntu tablet hardware requirements</h3>
@@ -64,8 +67,8 @@ <h3>Ubuntu tablet hardware requirements</h3>
 				</tr>
 				<tr>
 					<th rowspan="1" scope="row">Full 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>
+					<td><img width="16" height="16" alt="No" src="{{ STATIC_URL }}img/patterns/cross-warmgrey.svg"></td>
+					<td><img width="16" height="16" alt="Yes" src="{{ STATIC_URL }}img/patterns/tick-orange.svg"></td>
 				</tr>
 			</tbody>
 		</table>
@@ -79,13 +82,13 @@ <h2>Any size you want</h2>
 		<p>And since there are no physical buttons needed beyond the power switch, you have more flexibility for incredible device design with Ubuntu than any other platform today.</p>
 	</div>
 	<div class="six-col last-col">
-		<img src="{{ STATIC_URL }}img/devices/tablet-and-phone-side.png" width="467" height="291" alt="Ubuntu running on tablet and phone side by side" />
+		<img src="{{ STATIC_URL }}img/tablet/operators-and-oems/image-tablet-anysizeyouwant.png" width="467" height="291" alt="Ubuntu running on tablet and phone side by side" />
 	</div>
 </div><!-- /.row -->
 
 <div class="row row-image-centered">
 	<span>
-		<img src="{{ STATIC_URL }}img/devices/tablet-convergence-illustration.jpg" width="357" height="310" alt="Ubuntu convergence illustration" />
+		<img src="{{ STATIC_URL }}img/tablet/operators-and-oems/image-tablet-converged.svg" width="348" height="300" alt="Ubuntu convergence illustration" class="priority-0" />
 	</span>
 	<div class="six-col">
 		<h2>Converged</h2>
@@ -94,7 +97,12 @@ <h2>Converged</h2>
 </div><!-- /.row -->
 
 <div class="row">
-	<img class="shadow-fix" src="{{ STATIC_URL }}img/devices/tablet-branded-screens.png" width="984" height="334" alt="Ubuntu tablet branded screens" />
+	<div class="six-col">
+		<img class="shadow-fix" src="{{ STATIC_URL }}img/tablet/operators-and-oems/image-tablet-customisedbutnotfragmented-1.jpg" width="512" height="325" alt="Ubuntu tablet branded screen" />
+	</div>
+	<div class="six-col last-col">
+		<img class="shadow-fix" src="{{ STATIC_URL }}img/tablet/operators-and-oems/image-tablet-customisedbutnotfragmented-2.jpg" width="512" height="325" alt="Ubuntu tablet branded screen" />
+	</div>
 	<h2>Customised but not fragmented</h2>
 	<div class="six-col">
 		<p>Ubuntu can be differentiated with partner branding, <br />content, services and apps without breaking compatibility <br />in the broader app ecosystem. Brand the device, specify favourite apps, extend the home screen to include your music, films, shows, apps and stores. Connect your services <br />to the tablet, such as backup and photo sharing.</p>
@@ -117,29 +125,31 @@ <h2>We have the tools, teams and technology</h2>
 
 <div class="row">
 	<h2>Hundreds and thousands</h2>
-	<div class="six-col">
-		<ul class="list-ubuntu">
-			<li>Hundreds of developers are now creating Ubuntu <br/>mobile apps.</li>
-			<li>Thousands more use Ubuntu as their workstation <br/>of choice.</li>
-			<li class="last-item">Thousands of apps are already in our software centre.</li>
-		</ul>
-	</div>
-	<div class="six-col last-col">
-		<ul class="list-ubuntu">
-			<li>Hundreds of popular HTML5 apps will work with <br/>little modification.</li>
-			<li>Thousands of developers are already making apps <br/>for Ubuntu.</li>
-			<li class="last-item">Thousands of people have already registered their interest for Ubuntu mobile devices.</li>
-		</ul>
+	<div class="combined-list">
+		<div class="six-col">
+			<ul class="list-ubuntu">
+				<li>Hundreds of developers are now creating Ubuntu <br/>mobile apps.</li>
+				<li>Thousands more use Ubuntu as their workstation <br/>of choice.</li>
+				<li class="last-item">Thousands of apps are already in our software centre.</li>
+			</ul>
+		</div>
+		<div class="six-col last-col">
+			<ul class="list-ubuntu">
+				<li>Hundreds of popular HTML5 apps will work with <br/>little modification.</li>
+				<li>Thousands of developers are already making apps <br/>for Ubuntu.</li>
+				<li class="last-item">Thousands of people have already registered their interest for Ubuntu mobile devices.</li>
+			</ul>
+		</div>
 	</div>
 </div>
 
 <div class="row row-image-centered">
-	<span><img src="{{ STATIC_URL }}img/devices/phone-global-solutions-pictogram.png" width="229" height="203" alt="Hello written in a number of languages in Ubuntu speak bubbles" /></span>
+	<span><img src="{{ STATIC_URL }}img/tablet/operators-and-oems/image-tablet-globalbrand.svg" width="225" height="200" alt="Hello written in a number of languages in Ubuntu speak bubbles" /></span>
 	<div class="eight-col last-col">
 		<h2>A global brand</h2>
 		<p>Ubuntu has been translated into over 40 languages and is already used on <br />PCs in over 70 countries. With 20 million desktop uses around the world, it <br />is both an established technology platform and an established global brand.</p>
 	</div>
-	
+
 </div><!-- /.row -->
 
 <div class="row row-image-centered no-border">
@@ -147,8 +157,8 @@ <h2>A global brand</h2>
 		<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 <br />the pre-installation of Ubuntu on PCs from all the world&rsquo;s top PC manufacturers.</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="/tablet/backed-by-canonical">Learn more about how we support Ubuntu &rsaquo;</a></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/logos/canonical-symbol-167x167.png" width="167" height="167" alt="Canonical logo" /></span>
+	<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/tablet/register/index.html b/templates/tablet/register/index.html
old mode 100644
new mode 100755
index 0987e63fca8..8483b77318f
--- a/templates/tablet/register/index.html
+++ b/templates/tablet/register/index.html
@@ -13,7 +13,7 @@ <h1>Find out when it&rsquo;s here</h1>
 		<p>We are all excited about Ubuntu&rsquo;s arrival on tablet devices, but it will take some time to get into the marketplace. Leave us your email and country details, and we&rsquo;ll keep you informed. We expect to email you only once or twice and only ever with relevant information.</p>
 		<p><a href="http://www.ubuntu.com/aboutus/privacypolicy">Read our privacy policy.</a></p>
 		<p><span class="reqMark">*</span> required field</p>
-		
+
 		<script src="https://www.tfaforms.com/wForms/3.4/js/wforms.js"></script>
     <script src="https://www.tfaforms.com/wForms/3.4/js/wforms_custom_validation.js"></script>
     <script src="https://www.tfaforms.com/js/replace_variables.js"></script>
@@ -29,11 +29,11 @@ <h1>Find out when it&rsquo;s here</h1>
 		<h2>Your details</h2>
 		<ul class="no-bullets">
 			<li>
-				<label class="preField" for="tfa_Email">Your email <span class="reqMark">*</span></label> 
-				<input id="tfa_Email" name="tfa_Email" value="" size="60" class="validate-email required" type="text">
+				<label class="preField" for="tfa_Email">Your email <span class="reqMark">*</span></label>
+				<input id="tfa_Email" name="tfa_Email" value="" size="60" class="validate-email required" type="email">
 			</li>
 			<li>
-		<label class="preField" for="tfa_Country">Your country</label> 
+		<label class="preField" for="tfa_Country">Your country</label>
 			<select id="tfa_Country" name="tfa_Country" class="">
 				<option value="">Please select...</option>
 				<option value="AF" class="">Afghanistan</option>
diff --git a/templates/tablet/register/thank-you.html b/templates/tablet/register/thank-you.html
old mode 100644
new mode 100755
index d329bfa4283..db3807611fa
--- a/templates/tablet/register/thank-you.html
+++ b/templates/tablet/register/thank-you.html
@@ -12,8 +12,8 @@
 		<h1>Thank you for registering your interest.</h1>
 	    <p>Once we have news, we will pass it along.</p>
     </div>
-    <span>
-   		<img src="{{ STATIC_URL }}img/devices/pictogram-smile-purple.png" width="164" height="162" alt="Smile pictogram" />
-    </span>
+	<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/tablet/shared/_contextual_footer.html b/templates/tablet/shared/_contextual_footer.html
old mode 100644
new mode 100755
index 670cd64731e..4ae47e85372
--- a/templates/tablet/shared/_contextual_footer.html
+++ b/templates/tablet/shared/_contextual_footer.html
@@ -1,19 +1,19 @@
-	<div class="feature-two three-col">
+	<div class="feature-two 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 tablets, we can alert you by email when the first device is released.</p>
 		<p><a href="/tablet/register">Register to find out first&nbsp;&rsaquo;</a></p>
 	</div>
-	<div class="feature-three three-col">
+	<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>
 	</div>
-	<div class="feature-four three-col last-col">
+	<div class="feature-four four-col last-col">
 		<h3>Further reading</h3>
 		<ul class="no-bullets smaller">
 			<li><a href="http://www.ubuntu.com/2013/02/press-pack-ubuntu-tablet">Ubuntu tablet press pack&nbsp;&rsaquo;</a></li>
-			<li><a href="http://insights.ubuntu.com/mobile/ubuntu-for-smartphones-grabs-global-headlines/">Ubuntu for smartphones grabs global headlines&nbsp;&rsaquo;</a></li>
-			<li><a href="http://insights.ubuntu.com/mobile/get-the-faqs-about-ubuntu-on-smartphones/">Get the FAQs about Ubuntu on smartphones&nbsp;&rsaquo;</a></li>
-			<li><a href="http://insights.ubuntu.com/mobile/developers-get-the-full-support-they-need/">Developers get the full support they need&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>
 		</ul>
 	</div>
\ No newline at end of file
diff --git a/templates/tablet/thank-you.html b/templates/tablet/thank-you.html
old mode 100644
new mode 100755
index 964bb934c1c..a251a6490d7
--- a/templates/tablet/thank-you.html
+++ b/templates/tablet/thank-you.html
@@ -9,12 +9,12 @@
 {% 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 <br/>in Ubuntu on tablets.</h2>
+		<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.png" width="164" height="162" alt="Smile pictogram" />
-    </span>
+	<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/_1310_takeover.html b/templates/takeovers/_1310_takeover.html
old mode 100644
new mode 100755
diff --git a/templates/takeovers/_14.04_takeover.html b/templates/takeovers/_14.04_takeover.html
new file mode 100755
index 00000000000..f362a289901
--- /dev/null
+++ b/templates/takeovers/_14.04_takeover.html
@@ -0,0 +1,30 @@
+<section class="row strip no-border row-popular-cloud">
+	<div class="strip-inner-wrapper">
+		<div class="six-col">
+			<h1>The cloud platform of&nbsp;choice</h1>
+			<div class="six-col text-center for-mobile">
+				<img alt="Ubuntu Cloud" src="{{ STATIC_URL }}img/homepage/1404/image-cloud.svg" />
+			</div>
+			<p class="intro">Ubuntu 14.04 LTS with OpenStack raises the bar for reliability, performance and interoperability. </p>
+			<p><a class="link-cta-ubuntu cta-large" href="/download/cloud">Get Ubuntu for cloud</a></p>
+			<p><a href="/cloud">Learn more about Ubuntu for cloud&nbsp;&rsaquo;</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">
+			<h1>Your favourite desktop</h1>
+			<div class="six-col text-center for-mobile">
+				<img alt="Full-screen browser" src="{{ STATIC_URL }}img/homepage/1404/image-bbc.png" />
+			</div>
+			<p class="intro">All new support for touch and HiDPI&nbsp;screens.</p>
+			<p><a class="link-cta-ubuntu cta-large" href="/download/desktop">Get Ubuntu for desktop</a></p>
+			<p><a class="alternate" href="/tour">Take the tour&nbsp;&rsaquo;</a></p>
+		</div>
+	</div>
+	<div class="browser" />
+</section>
\ No newline at end of file
diff --git a/templates/takeovers/_asus.html b/templates/takeovers/_asus.html
old mode 100644
new mode 100755
diff --git a/templates/takeovers/_asus_footer_homepage.html b/templates/takeovers/_asus_footer_homepage.html
old mode 100644
new mode 100755
index ae53a712f4c..c8b703392ad
--- a/templates/takeovers/_asus_footer_homepage.html
+++ b/templates/takeovers/_asus_footer_homepage.html
@@ -2,18 +2,18 @@
 	<div class="four-col box box-textured box-feature-one">
 		<h2>Ubuntu phone and tablet</h2>
 		<p>Ubuntu wins <a href="http://reviews.cnet.com/8301-13970_7-57571750-78/ubuntu-touch-beats-firefox-os-to-win-best-of-mwc-from-cnet/" class="external-link">CNET&rsquo;s best of show</a> award at Mobile World Congress.</p>
-		<p><a href="/phone">Learn more &rsaquo;</a></p>
+		<p><a href="/phone">Learn more&nbsp;&rsaquo;</a></p>
 	</div>
 	
 	<div class="four-col box box-textured box-feature-two">
 		<h2>What is Ubuntu?</h2>
 		<p>Ubuntu is the world&rsquo;s favourite free operating system, with more than 20 million people preferring it to commercial alternatives.</p>
-		<p><a href="/desktop">Find out why &rsaquo;</a></p>
+		<p><a href="/desktop">Find out why&nbsp;&rsaquo;</a></p>
 	</div>
 	
 	<div class="four-col box last-col box-textured box-feature-three">
 		<h2>Fast, free and raring to go.</h2>
 		<p>From the desktop to the cloud, Ubuntu 13.04 is ready to deploy &mdash; our fastest and most visually polished release ever.</p>
-		<p><a href="/download">Download it now &rsaquo;</a></p>
+		<p><a href="/download">Download it now&nbsp;&rsaquo;</a></p>
 	</div>
 </div>
\ No newline at end of file
diff --git a/templates/takeovers/_azure_takeover.html b/templates/takeovers/_azure_takeover.html
old mode 100644
new mode 100755
index bcba36d2b4e..88ce7c02599
--- a/templates/takeovers/_azure_takeover.html
+++ b/templates/takeovers/_azure_takeover.html
@@ -3,7 +3,7 @@
 		<div itemscope itemtype="http://schema.org/Product">
 			<h1 itemprop="name">Ubuntu on <span class="logo-azure">Windows Azure</span></h1>
 			<p itemprop="description" class="tagline">Now you can deploy hundreds of workloads instantly with Juju.</p>
-			<p><a href="http://insights.ubuntu.com/?p=2610" onclick="_gaq.push(['_trackEvent', 'External Link', 'Windows Azure takeover', 'From Ubuntu homepage link']);">Read about it on <span>insights.ubuntu.com &rsaquo;</span></a></p>
+			<p><a href="http://insights.ubuntu.com/?p=2610" onclick="_gaq.push(['_trackEvent', 'External Link', 'Windows Azure takeover', 'From Ubuntu homepage link']);">Read about it on <span>insights.ubuntu.com&nbsp;&rsaquo;</span></a></p>
 		</div>
 	</div>
 </div><!-- /.row -->
diff --git a/templates/takeovers/_cag_takeover.html b/templates/takeovers/_cag_takeover.html
old mode 100644
new mode 100755
diff --git a/templates/takeovers/_cesg_takeover.html b/templates/takeovers/_cesg_takeover.html
old mode 100644
new mode 100755
index c91f81d9ebf..f8f840a4bd5
--- a/templates/takeovers/_cesg_takeover.html
+++ b/templates/takeovers/_cesg_takeover.html
@@ -3,7 +3,7 @@
 		<div class="six-col copy">
 			<h1>Ubuntu tops UK government security assessment</h1>
 			<p class="tagline">Ubuntu beats 10 consumer operating systems in government test.</p>
-			<p><a href="http://insights.ubuntu.com/resources/article/ubuntu-scores-highest-in-uk-gov-security-assessment/" title="Read our summary of the report" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'CESG takeover', 'From Ubuntu homepage']);">Read our summary of the report &rsaquo;</a></p>
+			<p><a href="http://insights.ubuntu.com/resources/article/ubuntu-scores-highest-in-uk-gov-security-assessment/" title="Read our summary of the report" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'CESG takeover', 'From Ubuntu homepage']);">Read our summary of the report&nbsp;&rsaquo;</a></p>
 		</div>
 		<noscript>
 			<img alt="CESG graph" src="{{ STATIC_URL }}img/homepage/cesg-graph.png" />
diff --git a/templates/takeovers/_charm_takeover.html b/templates/takeovers/_charm_takeover.html
old mode 100644
new mode 100755
index 0218350b784..72121507d4c
--- a/templates/takeovers/_charm_takeover.html
+++ b/templates/takeovers/_charm_takeover.html
@@ -4,7 +4,7 @@
 			<h1 itemprop="name">Instant cloud solutions</h1>
 			<p itemprop="description" class="tagline">Build, integrate and scale services on any cloud in seconds. Try it, use it, share your work and enter our &dollar;10,000 contest.</p>
 			<a href="https://juju.ubuntu.com/charm-championship/" class="link-cta-ubuntu" onclick="_gaq.push(['_trackEvent', 'External Link', 'Charm Championships takeover', 'From Ubuntu homepage Enter the contest link']);">Enter the contest<span class="accessibility-aid"> about the Charm championships</span></a>
-			<a onclick="_gaq.push(['_trackEvent', 'External Link', 'Charm Championships takeover', 'From Ubuntu homepage Try Juju today link']);" href="http://www.ubuntu.com/cloud/tools/juju">Try Juju today &rsaquo;</a>
+			<a onclick="_gaq.push(['_trackEvent', 'External Link', 'Charm Championships takeover', 'From Ubuntu homepage Try Juju today link']);" href="http://www.ubuntu.com/cloud/tools/juju">Try Juju today&nbsp;&rsaquo;</a>
 		</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/templates/takeovers/_cloud_default.html b/templates/takeovers/_cloud_default.html
new file mode 100755
index 00000000000..cd9e023875f
--- /dev/null
+++ b/templates/takeovers/_cloud_default.html
@@ -0,0 +1,15 @@
+<section class="row strip no-border row-popular-cloud">
+	<div class="strip-inner-wrapper">
+		<div class="six-col">
+			<h1>Ubuntu Cloud</h1>
+			<div class="six-col text-center for-mobile">
+				<img alt="Ubuntu Cloud" src="{{ STATIC_URL }}img/homepage/1404/image-cloud.svg" />
+			</div>
+			<p class="intro">Open source, OpenStack software and tools for private and public clouds.</p>
+			<p class="intro"><a href="/cloud">Build your cloud on Ubuntu &nbsp;&rsaquo;</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>
\ No newline at end of file
diff --git a/templates/takeovers/_cloud_survey.html b/templates/takeovers/_cloud_survey.html
old mode 100644
new mode 100755
diff --git a/templates/takeovers/_cloud_takeover.html b/templates/takeovers/_cloud_takeover.html
new file mode 100755
index 00000000000..0bc730e78dd
--- /dev/null
+++ b/templates/takeovers/_cloud_takeover.html
@@ -0,0 +1,10 @@
+<div class="box box-highlight box-hero no-border">
+	<div class="hero clearfix">
+		<div class="copy six-col">
+			<h1>As computing moves to the cloud, the world is moving to Ubuntu</h1>
+			<p>Ubuntu 14.04 LTS, with OpenStack.</p>
+			<p><a href="http://insights.ubuntu.com/uncategorized/ubuntu-14-04-lts-the-cloud-platform-of-choice" title="Read the press release" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'Cloud takeover - Ubuntu 14.04 LTS, with OpenStack', 'From Ubuntu homepage']);">Read the press release&nbsp;&rsaquo;</a></p>
+		</div>
+		<img  alt="Cloud" src="{{ STATIC_URL }}img/homepage/image-cloud.png" />
+	</div>
+</div>
diff --git a/templates/takeovers/_cn_mae_2014.html b/templates/takeovers/_cn_mae_2014.html
new file mode 100755
index 00000000000..43d9698ea0d
--- /dev/null
+++ b/templates/takeovers/_cn_mae_2014.html
@@ -0,0 +1,16 @@
+<section class="row strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="five-col">
+			<h1>Ubuntu 设备在 2014 年亚洲移动通信博览会 (MAE) 上惊艳亮相</h1>
+			<p class="intro">快来现场体验吧—展位 N2.A10， 6 月 11 日-13 日</p>
+			<p class="intro"><a href="https://insights.ubuntu.com/event/mobile-asia-expo-mae-2014/
+" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'MAE 2014 takeover', 'From Ubuntu homepage']);" class="external">了解更多</a></p>
+		<div class="box clear smaller">
+			<h2 class=""><a class="external" href="http://www.ubuntu-china.cn">Ubuntu 中国网站现已面世</a></h2>
+		</div>
+		</div>
+		<div class="seven-col last-col">
+			<img alt="MAE 2014" src="{{ STATIC_URL }}img/homepage/image-mae-ubuntu-phone.png" />
+		</div>
+	</div>
+</section>
diff --git a/templates/takeovers/_community_takeover.html b/templates/takeovers/_community_takeover.html
old mode 100644
new mode 100755
index deb755ad56d..926a6efa97d
--- a/templates/takeovers/_community_takeover.html
+++ b/templates/takeovers/_community_takeover.html
@@ -3,7 +3,7 @@
 		<div itemscope itemtype="http://schema.org/Product">
 			<h1 itemprop="name">Thank you!</h1>
 			<p itemprop="description" class="tagline">20 November is Ubuntu Community Appreciation Day</p>
-			<p><a href="http://community.ubuntu.com/" onclick="_gaq.push(['_trackEvent', 'External Link', 'UCAD takeover', 'From Ubuntu homepage 'Get involved' link']);">Get involved &rsaquo;</a></p>
+			<p><a href="http://community.ubuntu.com/" onclick="_gaq.push(['_trackEvent', 'External Link', 'UCAD takeover', 'From Ubuntu homepage 'Get involved' link']);">Get involved&nbsp;&rsaquo;</a></p>
 		</div>
 	</div>
 </div>
diff --git a/templates/takeovers/_default.html b/templates/takeovers/_default.html
old mode 100644
new mode 100755
diff --git a/templates/takeovers/_dell_server.html b/templates/takeovers/_dell_server.html
old mode 100644
new mode 100755
index c6220a1527f..22af4f2c1da
--- a/templates/takeovers/_dell_server.html
+++ b/templates/takeovers/_dell_server.html
@@ -3,7 +3,7 @@
 		<div class="seven-col">
 			<h1>Scale-out with confidence</h1>
 			<p class="tagline">Canonical and Dell team together on Dell PowerEdge 12G servers.</p>
-			<p><a href="/partners/dell#servers">Get the details &rsaquo;</a></p>
+			<p><a href="/partners/dell#servers">Get the details&nbsp;&rsaquo;</a></p>
 		</div>
 	</div>
 </div>
diff --git a/templates/takeovers/_edge.html b/templates/takeovers/_edge.html
old mode 100644
new mode 100755
diff --git a/templates/takeovers/_footer_homepage.html b/templates/takeovers/_footer_homepage.html
old mode 100644
new mode 100755
index 1ca9314f02b..05500247dc4
--- a/templates/takeovers/_footer_homepage.html
+++ b/templates/takeovers/_footer_homepage.html
@@ -1,27 +1,31 @@
-<div class="homepage-features equal-height no-border">
-
-	<div class="box-feature-one four-col box box-highlight">
-		<a href="/phone">
-			<h2>Ready for smartphones &rsaquo;</h2>
-			<p>Ubuntu on phones is now ready for the mobile phone industry.</p>
-		</a>
+<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">
+				<h2>Ready for smartphones &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" />
+				</div>
+			</a>
+		</div>
+		<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>
+				<div>
+					<img alt="OpenStack Developer Summit" src="{{ STATIC_URL }}img/homepage/image-cloud.png" />
+				</div>
+			</a>
+		</div>
+		<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>
+				<div>
+					<img alt="OpenStack Developer Summit" src="{{ STATIC_URL }}img/homepage/image-desktop.png" />
+				</div>
+			</a>
+		</div>
 	</div>
-	<div class="box-feature-two four-col box box-highlight">
-		<!--<a href="/desktop">
-			<h2>What is Ubuntu?</h2>
-			<p>Find out why Ubuntu is the World's favourite free operating system.</p>
-		</a>-->
-		<a href="/cloud">
-			<h2>Get Ubuntu OpenStack &rsaquo;</h2>
-			<p>Build your own cloud with OpenStack&lsquo;s Havana software today.</p>
-		</a>
-	</div>
-
-	<div class="box-feature-three four-col box box-highlight last-col">
-		<a href="/download">
-			<h2>Download Ubuntu &rsaquo;</h2>
-			<p>Smarter and faster than ever, get Ubuntu 13.10 today.</p>
-		</a>
-	</div>
-
-</div><!-- /.homepage-features -->
\ No newline at end of file
+</section>
\ No newline at end of file
diff --git a/templates/takeovers/_footer_homepage_kylin.html b/templates/takeovers/_footer_homepage_kylin.html
new file mode 100755
index 00000000000..bb3ac24b260
--- /dev/null
+++ b/templates/takeovers/_footer_homepage_kylin.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="http://ubuntu-china.cn/phone">
+				<h2>Ready for smartphones&nbsp;&rsaquo;</h2>
+				<p>Ubuntu手机版准备就绪，整装待发。</p>
+				<div>
+					<img alt="OpenStack Developer Summit" src="{{ STATIC_URL }}img/homepage/image-phone.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>
+				<div>
+					<img alt="OpenStack Developer Summit" src="{{ STATIC_URL }}img/homepage/image-cloud.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>
+				<div>
+					<img alt="OpenStack Developer Summit" src="{{ STATIC_URL }}img/homepage/image-desktop.png" />
+				</div>
+			</a>
+		</div>
+	</div>
+</section>
\ No newline at end of file
diff --git a/templates/takeovers/_gigaom_takeover.html b/templates/takeovers/_gigaom_takeover.html
new file mode 100755
index 00000000000..fa9a67496d2
--- /dev/null
+++ b/templates/takeovers/_gigaom_takeover.html
@@ -0,0 +1,11 @@
+<div class="box box-highlight box-hero no-border">
+	<div class="hero clearfix">
+		<div class="copy seven-col">
+			<h1>The state of <br />enterprise OpenStack</h1>
+			<p class="tagline">A new Gigaom report  looks at components <br />and costs of running OpenStack</p>
+			<p class="tagline"><a href="http://insights.ubuntu.com/?p=3559" title="Read the report" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'Gigaom takeover - the state of enterprise openstack', 'From Ubuntu homepage']);">Read the report&nbsp;&rsaquo;</a></p>
+			<img src="{{ STATIC_URL }}img/homepage/logo-gigaom.png" alt="Gigaom" class="logo" />
+		</div>
+		<img class="openstack" alt="OpenStack" src="{{ STATIC_URL }}img/homepage/image-enterpriseopenstack.png" />
+	</div>
+</div>
diff --git a/templates/takeovers/_hp.html b/templates/takeovers/_hp.html
old mode 100644
new mode 100755
diff --git a/templates/takeovers/_hp_emea_takeover.html b/templates/takeovers/_hp_emea_takeover.html
old mode 100644
new mode 100755
index aed4ca175be..6792655add9
--- a/templates/takeovers/_hp_emea_takeover.html
+++ b/templates/takeovers/_hp_emea_takeover.html
@@ -4,7 +4,7 @@
 			<h1 itemprop="name">Perfect for education</h1>
 			<p itemprop="description" class="intro">All over the world, people are learning with Ubuntu and HP. Meet us at HP Discover in Barcelona 10-12 December. </p>
 			<p><a href="http://insights.ubuntu.com/news/ubuntu-helps-millions-of-indian-students-to-learn/" class="link-cta-ubuntu" onclick="_gaq.push(['_trackEvent', 'External Link', 'Insights - Ubuntu helps millions of Indian students to learn', 'From Ubuntu homepage find out more link']);">Find out more</a></p>
-			<p><a href="http://insights.ubuntu.com/event/hp-discover/" onclick="_gaq.push(['_trackEvent', 'External Link', 'Ubuntu HP EMEA takeover', 'From Ubuntu homepage find out more link']);">Meet us in Barcelona &rsaquo;</a></p>
+			<p><a href="http://insights.ubuntu.com/event/hp-discover/" onclick="_gaq.push(['_trackEvent', 'External Link', 'Ubuntu HP EMEA takeover', 'From Ubuntu homepage find out more link']);">Meet us in Barcelona&nbsp;&rsaquo;</a></p>
 		</div>
 	</div>
 </div><!-- /.row -->
diff --git a/templates/takeovers/_humble_bundle.html b/templates/takeovers/_humble_bundle.html
old mode 100644
new mode 100755
diff --git a/templates/takeovers/_juju_bundles_takeover.html b/templates/takeovers/_juju_bundles_takeover.html
new file mode 100755
index 00000000000..438953e595c
--- /dev/null
+++ b/templates/takeovers/_juju_bundles_takeover.html
@@ -0,0 +1,13 @@
+<section class="row strip no-border row-popular-cloud">
+	<div class="hero strip-inner-wrapper">
+		<div class="five-col append-one">
+			<img alt="Juju logo" class="juju-logo" src="{{ STATIC_URL }}img/logos/logo-juju.png" />
+			<h1>Start, drag, drop, deploy, done!</h1>
+			<p class="intro">New Juju features take you from zero to cloud app in seconds.</p>
+			<p class="intro"><a href="http://insights.ubuntu.com/news/juju-bundles-and-quickstart-create-an-entire-cloud-environment-in-seconds" title="Learn more about bundles and quickstart" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'Juju bundles takeover', 'From Ubuntu homepage']);">Learn more about bundles and quickstart&nbsp;&rsaquo;</a></p>
+		</div>
+		<div class="six-col last-col text-center">
+			<img class="webinar" alt="Webinar" src="{{ STATIC_URL }}img/homepage/image-bundle-mediawikiscalable.png" />
+		</div>
+	</div><!-- /.hero -->
+</div><!-- /.box -->
diff --git a/templates/takeovers/_juju_takeover.html b/templates/takeovers/_juju_takeover.html
old mode 100644
new mode 100755
diff --git a/templates/takeovers/_jumpstart_takeover.html b/templates/takeovers/_jumpstart_takeover.html
new file mode 100644
index 00000000000..a3dfc5d1fe6
--- /dev/null
+++ b/templates/takeovers/_jumpstart_takeover.html
@@ -0,0 +1,15 @@
+<section class="row strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="six-col">
+			<h1>Jumpstart Training for&nbsp;OpenStack</h1>
+			<div class="six-col text-center for-mobile">
+				<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>
+		</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" />
+		</div>
+	</div>
+</section>
\ No newline at end of file
diff --git a/templates/takeovers/_kylin.html b/templates/takeovers/_kylin.html
new file mode 100755
index 00000000000..c620ce45444
--- /dev/null
+++ b/templates/takeovers/_kylin.html
@@ -0,0 +1,17 @@
+<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>
+			
+		<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>
+		</div>
+		</div>
+		<div class="six-col last-col">
+			<img class="webinar" alt="Webinar" src="{{ STATIC_URL }}img/homepage/kylin/image-kylin.png" />
+		</div>
+	</div>
+</section>
diff --git a/templates/takeovers/_landscape_takeover.html b/templates/takeovers/_landscape_takeover.html
old mode 100644
new mode 100755
index d7af428a23b..d01dbe95793
--- a/templates/takeovers/_landscape_takeover.html
+++ b/templates/takeovers/_landscape_takeover.html
@@ -3,7 +3,7 @@
 		<div itemscope itemtype="http://schema.org/Product">
 			<h1 itemprop="name">The more you like Ubuntu, the more you&rsquo;ll love Landscape.</h1>
 			<p itemprop="description" class="tagline">The world&rsquo;s most cost-effective solution for managing Ubuntu at scale.</p>
-			<p><a href="/management" title="Learn more about Landscape">Learn more about Landscape &rsaquo;</a></p>
+			<p><a href="/management" title="Learn more about Landscape">Learn more about Landscape&nbsp;&rsaquo;</a></p>
 			<img itemprop="image" alt="Ubuntu tablet" src="{{ STATIC_URL }}img/homepage/hero-landscape-screenshot.png" />
 		</div>
 	</div>
diff --git a/templates/takeovers/_mae_2014_takeover.html b/templates/takeovers/_mae_2014_takeover.html
new file mode 100755
index 00000000000..bb5b77c91b7
--- /dev/null
+++ b/templates/takeovers/_mae_2014_takeover.html
@@ -0,0 +1,13 @@
+<section class="row strip no-border">
+	<div class="strip-inner-wrapper">
+		<div class="five-col">
+			<h1>Stunning Ubuntu devices at MAE 2014</h1>
+			<p class="intro">Come and try for yourself &mdash; at stand N2.A10, from 11 to 13 June.</p>
+			<p class="intro"><a href="https://insights.ubuntu.com/event/mobile-asia-expo-mae-2014/
+" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'MAE 2014 takeover', 'From Ubuntu homepage']);" class="external">Learn more</a></p>
+		</div>
+		<div class="seven-col last-col">
+			<img alt="MAE 2014" src="{{ STATIC_URL }}img/homepage/image-mae-ubuntu-phone.png" />
+		</div>
+	</div>
+</section>
diff --git a/templates/takeovers/_moonshot_takeover.html b/templates/takeovers/_moonshot_takeover.html
old mode 100644
new mode 100755
index 64cf907a292..8856afceb05
--- a/templates/takeovers/_moonshot_takeover.html
+++ b/templates/takeovers/_moonshot_takeover.html
@@ -3,7 +3,7 @@
 	<div itemscope itemtype="http://schema.org/Product">
 		<h1 itemprop="name">Ubuntu scales out with HP Moonshot</h1>
 		<p itemprop="description" class="tagline">Servers designed to deliver breakthrough efficiency in density, energy and cost.</p>
-		<p><a href="/partners/hp/moonshot" title="Ubuntu scales out with HP Moonshot">Find out more &rsaquo;</a></p>
+		<p><a href="/partners/hp/moonshot" title="Ubuntu scales out with HP Moonshot">Find out more&nbsp;&rsaquo;</a></p>
 		<img itemprop="image" alt="Ubuntu scales out with HP Moonshot" src="{{ STATIC_URL }}img/homepage/moonshot-takeover-hero.png" />
 	</div>
 	</div>
diff --git a/templates/takeovers/_mwc1_takeover.html b/templates/takeovers/_mwc1_takeover.html
new file mode 100755
index 00000000000..72ea7f7ee59
--- /dev/null
+++ b/templates/takeovers/_mwc1_takeover.html
@@ -0,0 +1,15 @@
+<div class="box box-highlight box-hero no-border">
+	<div class="hero clearfix">
+		<div class="copy five-col">
+			<h1>Hear it first</h1>
+			<p>Get updated on Ubuntu progress before MWC 2014.</p>
+			<p><a href="http://ubunt.eu/mwctownhall" title="Join our call on 19 February" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'MWC1 takeover', 'From Ubuntu homepage']);">Join our call on 19 February&nbsp;&rsaquo;</a></p>
+		</div>
+		<div class="scopes">
+			<div id="scope-1"></div>
+			<div id="scope-2"></div>
+			<div id="scope-3"></div>
+			<div id="scope-4"></div>
+		</div>
+	</div>
+</div>
diff --git a/templates/takeovers/_mwc2_takeover.html b/templates/takeovers/_mwc2_takeover.html
new file mode 100755
index 00000000000..c1cf84d080e
--- /dev/null
+++ b/templates/takeovers/_mwc2_takeover.html
@@ -0,0 +1,17 @@
+<div class="box box-highlight box-hero no-border">
+	<div class="hero clearfix">
+		<div class="copy six-col">
+			<h1>Touchdown</h1>
+			<p class="tagline">Ubuntu phones are landing.</p>
+			<p><a href="http://ubunt.eu/mwcpartner" title="Find out more" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'MWC2 takeover - phones landing', 'From Ubuntu homepage']);">Read more</a> or <a href="http://www.youtube.com/watch?v=gGG_GHYzSLs" title="Ubuntu on air" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'Youtube - Ubuntu on air', 'From Ubuntu homepage']);">watch our Q&amp;A&nbsp;&rsaquo;</a></p>
+		</div>
+		<img class="bq" src="{{ STATIC_URL }}img/logos/logo-bq.png" alt="BQ" />
+		<img class="meizu" src="{{ STATIC_URL }}img/logos/logo-meizu.png" alt="Meizu" />
+		<div class="scopes">
+			<div id="scope-1"></div>
+			<div id="scope-2"></div>
+			<div id="scope-3"></div>
+			<div id="scope-4"></div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/takeovers/_mwc_2014_takeover.html b/templates/takeovers/_mwc_2014_takeover.html
new file mode 100755
index 00000000000..afdc7607ff8
--- /dev/null
+++ b/templates/takeovers/_mwc_2014_takeover.html
@@ -0,0 +1,45 @@
+<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>
+
+<div class="box box-highlight box-hero no-border">
+	<div class="hero clearfix">
+		<div class="four-col">
+			<h1>See you at MWC 2014</h1>
+			<p>Stand 8.1 E49<br />24-27 February</p>
+			<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" />
+			<div class="animated">
+				<ul class="mwc-icons">
+				    <li class="icon-1"></li>
+				    <li class="icon-2"></li>
+				    <li class="icon-3"></li>
+				    <li class="icon-4"></li>
+				    <li class="icon-5"></li>
+				    <li class="icon-6"></li>
+				    <li class="icon-7"></li>
+				    <li class="icon-8"></li>
+				    <li class="icon-9"></li>
+				    <li class="icon-10"></li>
+				    <li class="icon-11"></li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div><!-- /.row -->
diff --git a/templates/takeovers/_ods_2014_takeover.html b/templates/takeovers/_ods_2014_takeover.html
new file mode 100755
index 00000000000..acb4aed1829
--- /dev/null
+++ b/templates/takeovers/_ods_2014_takeover.html
@@ -0,0 +1,16 @@
+<section class="row strip no-border row-popular-cloud">
+	<div class="strip-inner-wrapper">
+		<div class="five-col">
+			<h1>The hottest cloud&nbsp;around</h1>
+			<div class="six-col text-center for-mobile">
+				<img alt="OpenStack Developer Summit" src="{{ STATIC_URL }}img/homepage/image-openstackdevelopersummit.png" />
+			</div>
+			<p class="intro">Visit us at booth #A4 at the Openstack Summit in Atlanta to learn how we are supporting Icehouse for five years with Ubuntu OpenStack 14.04 LTS.</p>
+			<p class="intro"><a href="https://insights.ubuntu.com/event/openstack-summit-atlanta/
+" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'OpenStack Summit 2014 takeover', 'From Ubuntu homepage']);">Find out more &rsaquo;</a></p>
+		</div>
+		<div class="seven-col last-col">
+			<img class="priority-0" alt="OpenStack Developer Summit" src="{{ STATIC_URL }}img/homepage/image-openstackdevelopersummit.png" />
+		</div>
+	</div>
+</section>
diff --git a/templates/takeovers/_ods_takeover.html b/templates/takeovers/_ods_takeover.html
old mode 100644
new mode 100755
index 5929be5207e..58016fbd98a
--- a/templates/takeovers/_ods_takeover.html
+++ b/templates/takeovers/_ods_takeover.html
@@ -3,7 +3,7 @@
 		<div itemscope itemtype="http://schema.org/Product">
 			<h1 itemprop="name">OpenStack in production &ndash; today</h1>
 			<p itemprop="description" class="tagline">Meet the Canonical team at the OpenStack Summit, 15-18 April <br/>to hear how we&rsquo;re bringing Grizzly <br/>to life with our 13.04 release.</p>
-			<p><a href="/cloud" title="OpenStack in production">Find out more &rsaquo;</a></p>
+			<p><a href="/cloud" title="OpenStack in production">Find out more&nbsp;&rsaquo;</a></p>
 			<img itemprop="image" alt="Ubuntu tablet" src="{{ STATIC_URL }}img/homepage/ods-takeover-hero.png" />
 		</div>
 	</div>
diff --git a/templates/takeovers/_openstack_summit_paris_takeover.html b/templates/takeovers/_openstack_summit_paris_takeover.html
new file mode 100644
index 00000000000..ebef381b37f
--- /dev/null
+++ b/templates/takeovers/_openstack_summit_paris_takeover.html
@@ -0,0 +1,16 @@
+<section class="row 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>
+		<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>
+	</div>
+</section>
\ No newline at end of file
diff --git a/templates/takeovers/_openstack_takeover.html b/templates/takeovers/_openstack_takeover.html
old mode 100644
new mode 100755
index 0839bdf1cd8..a4dfa467af2
--- a/templates/takeovers/_openstack_takeover.html
+++ b/templates/takeovers/_openstack_takeover.html
@@ -3,7 +3,7 @@
 		<div itemscope itemtype="http://schema.org/Product">
 			<h1 itemprop="name">Ubuntu is the <br />OpenStack favourite</h1>
 			<p itemprop="description" class="tagline">Discover the technologies chosen <br />by the OpenStack community.</p>
-			<p><a href="http://insights.ubuntu.com/?p=2923" onclick="_gaq.push(['_trackEvent', 'External Link', 'Ubuntu OpenStack takeover', 'From Ubuntu homepage learn more link']);">Learn more on insights.ubuntu.com &rsaquo;</a></p>
+			<p><a href="http://insights.ubuntu.com/?p=2923" onclick="_gaq.push(['_trackEvent', 'External Link', 'Ubuntu OpenStack takeover', 'From Ubuntu homepage learn more link']);">Learn more on insights.ubuntu.com&nbsp;&rsaquo;</a></p>
 		</div>
 	</div>
 </div><!-- /.row -->
diff --git a/templates/takeovers/_openstack_uk_2014.html b/templates/takeovers/_openstack_uk_2014.html
new file mode 100755
index 00000000000..b74798ad147
--- /dev/null
+++ b/templates/takeovers/_openstack_uk_2014.html
@@ -0,0 +1,16 @@
+<section class="row strip no-border row-popular-cloud">
+	<div class="strip-inner-wrapper">
+		<div class="five-col">
+			<h1>London calling!</h1>
+			<div class="six-col text-center for-mobile">
+				<img alt="OpenStack Developer Summit - London" src="{{ STATIC_URL }}img/homepage/image-openstackdevelopersummit-london.png" />
+			</div>
+			<h2 class="intro">See Mark Shuttleworth at OpenStack UK, 4 June.</h2>
+			<p class="intro"><a href="https://insights.ubuntu.com/event/openstack-uk-june-4th-london/
+" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'OpenStack UK 2014 takeover', 'From Ubuntu homepage']);">Find out more &rsaquo;</a></p>
+		</div>
+		<div class="seven-col last-col">
+			<img class="priority-0" alt="OpenStack Developer Summit" src="{{ STATIC_URL }}img/homepage/image-openstackdevelopersummit-london.png" />
+		</div>
+	</div>
+</section>
diff --git a/templates/takeovers/_power_takeover.html b/templates/takeovers/_power_takeover.html
new file mode 100755
index 00000000000..78b59d34029
--- /dev/null
+++ b/templates/takeovers/_power_takeover.html
@@ -0,0 +1,11 @@
+<section class="row strip no-border takeover">
+	<div class="strip-inner-wrapper">
+		<div class="four-col">
+			<h1>Power supplied</h1>
+			<p class="intro">Ubuntu, MAAS, Juju and Landscape come to IBM POWER8.</p>
+			<p class="intro"><a href="http://insights.ubuntu.com/2014/06/13/ubuntu-and-power8-the-best-of-both-worlds/ " onclick="_gaq.push(['_trackEvent', 'External Link', 'Power takeover', 'From Ubuntu homepage']);" class="external">Read more</a></p>
+			<img class="logo priority-0" src="{{ STATIC_URL }}img/logos/logo-ibm-50.png" alt="IBM" />
+		</div>
+		<img class="background" src="{{ STATIC_URL }}img/homepage/image-power8-takeover.png">
+	</div>
+</section>
diff --git a/templates/takeovers/_raring_takeover.html b/templates/takeovers/_raring_takeover.html
old mode 100644
new mode 100755
index c0c864b2f81..090709b74c5
--- a/templates/takeovers/_raring_takeover.html
+++ b/templates/takeovers/_raring_takeover.html
@@ -5,7 +5,7 @@ <h1 itemprop="name">Raring to go.</h1>
 			<p itemprop="description" class="tagline">From the desktop to the cloud, <br/>Ubuntu 13.04 is ready to deploy.</p>
 			<img itemprop="image" alt="Ubuntu tablet" src="{{ STATIC_URL }}img/homepage/1304-takeover-laptop.png" />
 			<a href="/download" class="link-cta-ubuntu cta-large" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'Raring takeover', 'From Ubuntu homepage Get Ubuntu now link']);">Get Ubuntu now</a>
-			<p><a href="/desktop" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'Raring takeover', 'From Ubuntu homepage Meet Ubuntu link']);">Meet Ubuntu &rsaquo;</a></p>
+			<p><a href="/desktop" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'Raring takeover', 'From Ubuntu homepage Meet Ubuntu link']);">Meet Ubuntu&nbsp;&rsaquo;</a></p>
 			{% include "takeovers/_share_this.html" %}
 		</div>
 	</div>
diff --git a/templates/takeovers/_share_this.html b/templates/takeovers/_share_this.html
old mode 100644
new mode 100755
diff --git a/templates/takeovers/_shop_xmas_2013.html b/templates/takeovers/_shop_xmas_2013.html
old mode 100644
new mode 100755
diff --git a/templates/takeovers/_sputnik.html b/templates/takeovers/_sputnik.html
old mode 100644
new mode 100755
diff --git a/templates/takeovers/_template.html b/templates/takeovers/_template.html
old mode 100644
new mode 100755
diff --git a/templates/takeovers/_ubuntu_countdown.html b/templates/takeovers/_ubuntu_countdown.html
old mode 100644
new mode 100755
diff --git a/templates/takeovers/_ubuntu_phone.html b/templates/takeovers/_ubuntu_phone.html
old mode 100644
new mode 100755
diff --git a/templates/takeovers/_ubuntu_tablet.html b/templates/takeovers/_ubuntu_tablet.html
old mode 100644
new mode 100755
diff --git a/templates/takeovers/_uoil_takeover.html b/templates/takeovers/_uoil_takeover.html
old mode 100644
new mode 100755
index fec8469cb21..972a6a5c2c6
--- a/templates/takeovers/_uoil_takeover.html
+++ b/templates/takeovers/_uoil_takeover.html
@@ -3,7 +3,7 @@
 		<div>
 			<h1>All working together</h1>
 			<p class="tagline">Announcing the Ubuntu OpenStack Interoperability Lab: integration and testing for cloud software and hardware.</p>
-			<p><a href="/cloud/ecosystem/ubuntu-oil">Learn more about the lab &rsaquo;</a></p>
+			<p><a href="/cloud/ecosystem/ubuntu-openstack-interoperability-lab">Learn more about the lab&nbsp;&rsaquo;</a></p>
 		</div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/templates/takeovers/_vmw1_takeover.html b/templates/takeovers/_vmw1_takeover.html
old mode 100644
new mode 100755
diff --git a/templates/takeovers/_vmw2_takeover.html b/templates/takeovers/_vmw2_takeover.html
new file mode 100755
index 00000000000..a36ca277fe3
--- /dev/null
+++ b/templates/takeovers/_vmw2_takeover.html
@@ -0,0 +1,10 @@
+<div class="box box-highlight box-hero no-border">
+	<div class="hero clearfix">
+		<div class="copy seven-col">
+			<h1>VMWare + OpenStack: the myth and reality</h1>
+			<p>Hear about our customer<br /> stories in this live webinar</p>
+			<p><a href="http://ubunt.eu/iJVXMA" title="Register now" onclick="_gaq.push(['_trackEvent', 'Internal Link', 'VMW2 takeover - VMWare + OpenStack', 'From Ubuntu homepage']);">Register now&nbsp;&rsaquo;</a></p>
+		</div>
+		<img class="webinar" alt="Webinar" src="{{ STATIC_URL }}img/homepage/image-webinar-vmw.png" />
+	</div>
+</div>
diff --git a/templates/takeovers/edge/_fri_takeover.html b/templates/takeovers/edge/_fri_takeover.html
old mode 100644
new mode 100755
diff --git a/templates/takeovers/edge/_mon_takeover.html b/templates/takeovers/edge/_mon_takeover.html
old mode 100644
new mode 100755
diff --git a/templates/takeovers/edge/_wed_takeover.html b/templates/takeovers/edge/_wed_takeover.html
old mode 100644
new mode 100755
diff --git a/templates/templates/404.html b/templates/templates/404.html
old mode 100644
new mode 100755
index 0278ba42490..3d82f7b5d00
--- a/templates/templates/404.html
+++ b/templates/templates/404.html
@@ -1,6 +1,6 @@
-{% extends "templates/one-column.html" %} 
+{% extends "templates/one-column.html" %}
 
-{% block title %}Ubuntu | 404 Page not found{% endblock %}
+{% block title %}404 Page not found{% endblock %}
 
 {% block extra_body_class %}error-page error404{% endblock %}
 
@@ -9,8 +9,7 @@
 {% block header %}
 <div class="row no-border hero-box">
 	<div class="six-col">
-		<img src="{{ STATIC_URL }}img/error/image-knowledge-365.png" alt="Error owl" />
-		<span>?</span>
+		<img src="{{ STATIC_URL }}img/error/image-404.svg" alt="Error owl" width="365" />
 	</div>
 	<div class="six-col last-col">
 		<h1>404: Page not found.</h1>
diff --git a/templates/templates/500.html b/templates/templates/500.html
old mode 100644
new mode 100755
index e9228aaa012..b2de921b926
--- a/templates/templates/500.html
+++ b/templates/templates/500.html
@@ -4,12 +4,18 @@
 
 {% block extra_body_class %}error-page error500{% endblock %}
 
-{% block head_extra %}{% endblock %}
+{% block head_extra %}
+	<link rel="stylesheet" type="text/css" media="screen" href="http://assets.ubuntu.com/sites/ubuntu/latest/u/css/styles.css" />
+	<link rel="shortcut icon" href="http://assets.ubuntu.com/sites/ubuntu/latest/u/img/favicon.ico" type="image/x-icon" />
+	<link rel="stylesheet" type="text/css" media="print" href="http://assets.ubuntu.com/sites/ubuntu/latest/u/css/core-print.css" />
+	<script src="http://assets.ubuntu.com/sites/ubuntu/latest/u/js/plugins/modernizr.2.7.1.js"></script>
+	<script src="http://assets.ubuntu.com/sites/ubuntu/latest/u/js/plugins/Imager.js"></script>
+{% endblock %}
 
 {% block content %}
 <div class="row no-border hero-box">
 	<div class="six-col">
-		<img src="{{ STATIC_URL }}img/error/image-knowledge-error-365.png" alt="Error owl" />
+		<img src="http://assets.ubuntu.com/sites/ubuntu/latest/u/img/error/image-knowledge-365.png" alt="Error owl" />
 		<span>!</span>
 	</div>
 	<div class="six-col last-col">
@@ -17,4 +23,12 @@ <h1>500: Server error.</h1>
 		<p>Something's gone wrong, try reloading.</p>
 	</div>
 </div><!-- / .row -->
-{% endblock content %}
\ No newline at end of file
+{% endblock content %}
+
+{% block footer_extra %}
+	<script src="http://assets.ubuntu.com/sites/ubuntu/latest/u/js/plugins/yui-min.js"></script>
+	<script src="http://assets.ubuntu.com/sites/ubuntu/latest/u/js/core.js"></script>
+	<script src="http://assets.ubuntu.com/sites/ubuntu/latest/u/js/global.js"></script>
+	<script src="http://assets.ubuntu.com/sites/ubuntu/latest/u/js/scratch.js"></script>
+	<script src="http://assets.ubuntu.com/sites/ubuntu/latest/u/js/plugins/respond.min.js"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/templates/_contextual_footer.html b/templates/templates/_contextual_footer.html
old mode 100644
new mode 100755
index 66037b43350..c2d437bc315
--- a/templates/templates/_contextual_footer.html
+++ b/templates/templates/_contextual_footer.html
@@ -3,13 +3,13 @@
 <div id="context-footer" class="{{ level_1 }}-context-footer no-border">
 <hr />
 	<div class="twelve-col vertical-divider">
-	{% with "ubuntu/"|add:level_1|add:"/shared/_contextual_footer.html" as contextual %}
-		<div class="feature-one three-col">
+	{% with ""|add:level_1|add:"/shared/_contextual_footer.html" as contextual %}
+		<!--<div class="feature-one three-col">
 			<h3>Explore further</h3>
-			{% with "ubuntu/"|add:level_1|add:"/_nav_secondary.html" as explore %}
+			{% with ""|add:level_1|add:"/_nav_secondary.html" as explore %}
 				{% include explore with list_class="list smaller" %}
 			{% endwith %}
-		</div>
+		</div>-->
 	{% include contextual %}
 	{% endwith %}
 	</div><!-- /.twelve-col -->
diff --git a/templates/templates/_further_reading_links.html b/templates/templates/_further_reading_links.html
old mode 100644
new mode 100755
index b63dd065778..f1ea3145acf
--- a/templates/templates/_further_reading_links.html
+++ b/templates/templates/_further_reading_links.html
@@ -29,4 +29,4 @@
 				window.onload=function(){
 				rssfeedsetup2()
 				}
-	</script>
+	</script>
\ No newline at end of file
diff --git a/templates/templates/_nav_breadcrumb.html b/templates/templates/_nav_breadcrumb.html
old mode 100644
new mode 100755
index 46c8e999cef..652caf37990
--- a/templates/templates/_nav_breadcrumb.html
+++ b/templates/templates/_nav_breadcrumb.html
@@ -1,49 +1,39 @@
 <ul class="breadcrumb">
 	{% if level_2 and not level_3 and not tertiary %}
-	<li><a href="/{{ level_1 }}/">{{ section_title }}</a> &rsaquo;</li>
-	{% else %}
-	{% if secondary %}
-	<li><a href="/{{ level_1 }}/">{{ section_title }}</a> &rsaquo;</li>
+	<li><a href="/{{ level_1 }}/">{{ section_title }}</a>&nbsp;&rsaquo;</li>
 	{% else %}
 	{% if level_3 %}
-	<li><a href="/{{ level_1 }}/">{{ section_title }}</a> &rsaquo;</li>
-	<li><a href="/{{ level_1 }}/{{ level_2 }}/">{{ subsection_title }}</a> &rsaquo;</li>
+	<li><a href="/{{ level_1 }}/">{{ section_title }}</a>&nbsp;&rsaquo;</li>
+	<li><a href="/{{ level_1 }}/{{ level_2 }}/">{{ subsection_title }}</a>&nbsp;&rsaquo;</li>
 	{% else %}
-	{% if level_2 %} 
-	<li><a href="/{{ level_1 }}/">{{ section_title }}</a> &rsaquo;</li>
-	<li class="active"><a href="/{{ level_1 }}/{{ level_2 }}/">{{ page_title }}</a> &rsaquo;</li>
+	{% if level_2 %}
+	<li><a href="/{{ level_1 }}/">{{ section_title }}</a>&nbsp;&rsaquo;</li>
+	<li class="active"><a href="/{{ level_1 }}/{{ level_2 }}/">{{ page_title }}</a>&nbsp;&rsaquo;</li>
 	{% else %}
-	<li><a href="/{{ level_1 }}/">{{ section_title }}</a> &rsaquo;</li>
-	{% endif %}
+	<li><a href="/{{ level_1 }}/">{{ section_title }}</a>&nbsp;&rsaquo;</li>
 	{% endif %}
 	{% endif %}
 	{% endif %}
 </ul>
 
-{% if secondary %}
-			{% with "ubuntu/"|add:level_1|add:"/_nav_secondary.html" as secondary %}
-			{% include secondary %}
-			{% endwith %}
-{% else %}
 {% if level_3 %}
-	{% with "ubuntu/"|add:level_1|add:"/_nav_tertiary.html" as tertiary %}
+	{% with ""|add:level_1|add:"/_nav_tertiary.html" as tertiary %}
 	{% include tertiary %}
 	{% endwith %}
 {% else %}
 	{% if level_2 %}
 		{% if tertiary %}
-			{% with "ubuntu/"|add:level_1|add:"/_nav_tertiary.html" as tertiary %}
+			{% with ""|add:level_1|add:"/_nav_tertiary.html" as tertiary %}
 			{% include tertiary %}
 			{% endwith %}
 		{% else %}
-			{% with "ubuntu/"|add:level_1|add:"/_nav_secondary.html" as secondary %}
+			{% with ""|add:level_1|add:"/_nav_secondary.html" as secondary %}
 			{% include secondary with icon="true" %}
 			{% endwith %}
 		{% endif %}
 	{% else %}
-		{% with "ubuntu/"|add:level_1|add:"/_nav_secondary.html" as secondary %}
+		{% with ""|add:level_1|add:"/_nav_secondary.html" as secondary %}
 		{% include secondary with icon="true" %}
 		{% endwith %}
 	{% endif %}
 {% endif %}
-{% endif %}
diff --git a/templates/templates/base.html b/templates/templates/base.html
old mode 100644
new mode 100755
index 6b8ac14540a..16b5d7f7ca5
--- a/templates/templates/base.html
+++ b/templates/templates/base.html
@@ -1,14 +1,16 @@
 <!doctype html>
-<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en" dir="ltr"> <![endif]-->
-<!--[if IE 7]>    <html class="no-js lt-ie9 lt-ie8" lang="en" dir="ltr"> <![endif]-->
-<!--[if IE 8]>    <html class="no-js lt-ie9" lang="en" dir="ltr"> <![endif]-->
+<!--[if lt IE 7]> <html class="no-js lt-ie10 lt-ie9 lt-ie8 lt-ie7" lang="en" dir="ltr"> <![endif]-->
+<!--[if IE 7]>    <html class="no-js lt-ie10 lt-ie9 lt-ie8" lang="en" dir="ltr"> <![endif]-->
+<!--[if IE 8]>    <html class="no-js lt-ie10 lt-ie9" lang="en" dir="ltr"> <![endif]-->
+<!--[if IE 9]>    <html class="no-js lt-ie10" lang="en" dir="ltr"> <![endif]-->
 <!--[if gt IE 8]><!--> <html class="no-js{% block extra_html_class %}{% endblock %}" lang="en" dir="ltr"> <!--<![endif]-->
 <head>
 
 <meta charset="UTF-8" />
-<meta name="description" content="{% block meta_description %}Fast, secure and stylishly simple, the Ubuntu operating system is used by 20 million people worldwide every day.{% endblock %}" />
-<meta name="keywords" content="{% block meta_keywords %}Ubuntu, Ubuntu operating system, OS, Linux, Windows alternative, Mac alternative, thin client{% endblock %}" />
+<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="author" content="Canonical" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
 
 <!--[if IE]>
 <meta http-equiv="X-UA-Compatible" content="IE=8">
@@ -17,29 +19,25 @@
 <title>{% block title %}{% endblock %} | Ubuntu</title>
 
 <link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico" type="image/x-icon" />
-<link href='//fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic|Ubuntu+Mono' rel='stylesheet' type='text/css' />
-<link rel="stylesheet" type="text/css" media="screen" href="//assets.ubuntu.com/sites/guidelines/css/latest/ubuntu-styles.css" />
-<link rel="stylesheet" type="text/css" media="screen" href="{{ STATIC_URL }}css/global.css" />
-<link rel="stylesheet" type="text/css" media="screen" href="{{ STATIC_URL }}css/styles.css" />
-<link rel="stylesheet" type="text/css" media="print" href="{{ STATIC_URL }}css/core-print.css" />
 
-<link rel="shortcut icon" href="{{ STATIC_URL }}img/favicon.ico">
 <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ STATIC_URL }}img/apple-touch-icon-144x144-precomposed.png">
 <link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ STATIC_URL }}img/apple-touch-icon-114x114-precomposed.png">
 <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ STATIC_URL }}img/apple-touch-icon-72x72-precomposed.png">
 <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" />
 
-<!--[if lt IE 9]>
-<script src="https://html5shim.googlecode.com/svn/trunk/html5.js" /></script>
-<![endif]-->
+<!-- google fonts -->
+<link href='https://fonts.googleapis.com/css?family=Ubuntu:400,300,300italic,400italic,700,700italic%7CUbuntu+Mono' rel='stylesheet' type='text/css' />
 
-<!-- Remove no-js class from <html> (Copied from Modernizr) -->
-<script>
-    var html = document.getElementsByTagName("html")[0];
-    var reJS = new RegExp('(^|\\s)no-js(\\s|$)');
-    html.className = html.className.replace(reJS, '$1js$2');
-</script>
+<!-- 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" />
+<link rel="stylesheet" type="text/css" media="screen" href="{{ STATIC_URL }}css/beta/global-responsive.css" />
+<link rel="stylesheet" type="text/css" media="print" href="{{ STATIC_URL }}css/core-print.css" />
+
+<!-- javascript -->
+<script src="{{ STATIC_URL }}js/plugins/modernizr.2.7.1.js"></script>
+<script src="{{ STATIC_URL }}js/plugins/Imager.js"></script>
 
 {% block head_extra %}{% endblock %}
 
@@ -49,37 +47,37 @@
 <header class="banner global" role="banner">
 {% block header_banner %}
 	<nav role="navigation" class="nav-primary nav-right">
+		<span id="main-navigation-link"><a href="#main-navigation">Jump to site nav</a></span>
 		<div class="logo">
 			<a class="logo-ubuntu" href="/">
-				<img width="106" height="25" src="{{ STATIC_URL }}img/logos/logo-ubuntu-orange.png" alt="" />
+				<img width="106" height="25" src="{{ STATIC_URL }}img/logos/logo-ubuntu-orange.svg" alt="" />
 			</a>
 		</div>
 		<ul>
 			<li class="accessibility-aid"><a accesskey="s" href="#main-content">Jump to content</a></li>
-
 			<li><a class="first{% if level_1 == 'cloud' %} active{% endif %}" href="/cloud">Cloud</a>
-				{% include "cloud/_nav_secondary.html" with arrow="true" promo="true" %}
+				{% include "cloud/_nav_secondary.html" with promo="true" %}
 			</li>
 			<li><a{% if level_1 == 'server' %} class="active"{% endif %} href="/server">Server</a>
-				{% include "server/_nav_secondary.html" with arrow="true" promo="true" %}
+				{% include "server/_nav_secondary.html" with promo="true" %}
 			</li>
 			<li><a {% if level_1 == 'desktop' %} class="active"{% endif %} href="/desktop">Desktop</a>
-				{% include "desktop/_nav_secondary.html" with arrow="true" promo="true" %}
+				{% include "desktop/_nav_secondary.html" with promo="true" %}
 			</li>
 			<li><a{% if level_1 == 'phone' %} class="active"{% endif %} href="/phone">Phone</a>
-				{% include "phone/_nav_secondary.html" with arrow="true" promo="true" %}
+				{% include "phone/_nav_secondary.html" with promo="true" %}
 			</li>
 			<li><a{% if level_1 == 'tablet' %} class="active"{% endif %} href="/tablet">Tablet</a>
-				{% include "tablet/_nav_secondary.html" with arrow="true" promo="true" %}
+				{% include "tablet/_nav_secondary.html" with promo="true" %}
 			</li>
 			<li><a{% if level_1 == 'tv' %} class="active"{% endif %} href="/tv">TV</a>
-				{% include "tv/_nav_secondary.html" with arrow="true" promo="true" %}
+				{% include "tv/_nav_secondary.html" with promo="true" %}
 			</li>
 			<li><a{% if level_1 == 'management' %} class="active"{% endif %} href="/management">Management</a>
-				{% include "management/_nav_secondary.html" with arrow="true" promo="true" %}
+				{% include "management/_nav_secondary.html" with promo="true" %}
 			</li>
 			<li><a{% if level_1 == 'download' %} class="active"{% endif %} href="/download">Download</a>
-				{% include "download/_nav_secondary.html" with arrow="true" promo="true" %}
+				{% include "download/_nav_secondary.html" with promo="true" %}
 			</li>
 		</ul>
 		{% include "templates/search.html" %}
@@ -90,9 +88,7 @@
 <div id="main-content" class="inner-wrapper">
 {% if level_1 %}
 {% block second_level_nav %}
-<nav role="navigation" class="nav-secondary clearfix">
-{% spaceless %}{% block second_level_nav_items %}{% endblock second_level_nav_items %}{% endspaceless %}
-</nav>
+<nav role="navigation" class="nav-secondary clearfix">{% spaceless %}{% block second_level_nav_items %}{% endblock second_level_nav_items %}{% endspaceless %}</nav>
 {% endblock second_level_nav %}
 {% endif %}
 
@@ -108,11 +104,24 @@
 <!-- footer content goes here -->
 {% include "templates/footer.html" %}
 
+<!-- Use this only until Modernizr fixes Opera Mini background-size detection -->
+<script>
+	var isOperaMini = (navigator.userAgent.indexOf('Opera Mini') > -1);
+	if(isOperaMini) {
+		var root = document.documentElement;
+		root.className += " opera-mini";
+	}
+</script>
 <script src="{{ STATIC_URL }}js/plugins/yui-combined.min.js"></script>
+<script>
+	if(!core){ var core = {}; }
+	core.globalPrepend = 'body';
+</script>
 
-<script src="{{ STATIC_URL }}js/core.js"></script>
-<script src="{{ STATIC_URL }}js/scratch.js"></script>
+<script src="//assets.ubuntu.com/sites/guidelines/js/responsive/core.js"></script>
 <script src="{{ STATIC_URL }}js/global.js"></script>
+<script src="{{ STATIC_URL }}js/scratch.js"></script>
+<script src="{{ STATIC_URL }}js/plugins/respond.min.js"></script>
 
 {% block footer_extra %}{% endblock %}
 
@@ -125,7 +134,7 @@
 
   (function() {
   var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-  ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+  ga.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'stats.g.doubleclick.net/dc.js';
   var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
   })();
 </script>
@@ -140,4 +149,4 @@
 </script>
 
 </body>
-</html>
\ No newline at end of file
+</html><!-- the end -->
\ No newline at end of file
diff --git a/templates/templates/body-class.html b/templates/templates/body-class.html
old mode 100644
new mode 100755
diff --git a/templates/templates/cookie-policy.html b/templates/templates/cookie-policy.html
old mode 100644
new mode 100755
diff --git a/templates/templates/footer.html b/templates/templates/footer.html
old mode 100644
new mode 100755
index 7f0774c03ec..92746be7b80
--- a/templates/templates/footer.html
+++ b/templates/templates/footer.html
@@ -1,6 +1,10 @@
 {% block footer %}
 <footer class="global clearfix">
-<nav role="navigation">
+
+<div class="footer-c">
+	<p class="top-link"><a href="#">Back to top</a></p>
+</div>
+<nav id="main-navigation" role="navigation" class="clearfix">
 <div class="footer-a">
 	<div class="clearfix">
 		<ul>
@@ -28,24 +32,24 @@
 		</ul>
 	</div>
 </div><!-- /.footer-a -->
-<div class="footer-b inline-lists twelve-col">
-	<ul>
-		<li><h2><a href="/download/">Download:</a></h2>
+<div class="footer-b inline-lists">
+	<ul class="clearfix">
+		<li><h2><a href="/download/">Download</a></h2>
 			{% include "download/_nav_secondary.html" %}
 		</li>
-		<li><h2><a href="/support/">Support:</a></h2>
+		<li><h2><a href="/support/">Support</a></h2>
 			{% include "support/_nav_secondary.html" %}
 		</li>
-		<li><h2><a href="/partners/">Partners:</a></h2>
+		<li><h2><a href="/partners/">Partners</a></h2>
 			{% include "partners/_nav_secondary.html" %}
 		</li>
-		<li><h2><a href="/about/">About:</a></h2>
-			<ul>
+		<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/about-canonical/careers">Careers</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://www.canonical.com/rss.xml">Canonical news feed</a></li>
+				<li><a accesskey="2" href="http://insights.ubuntu.com/feed/">Canonical news feed</a></li>
 			</ul>
 		</li>
 	</ul>
@@ -54,11 +58,10 @@
 <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="/intellectual-property-policy">Intellectual property rights policy</a></li>
 	 <li><a href="/legal">Legal information</a></li>
-	 <li><a accesskey="8" href="/privacy-policy">Privacy policy</a></li>
-	</ul>
+	 <li><a href="https://bugs.launchpad.net/ubuntu-website-content/+filebug">Report a bug</a></li>
+</ul>
 <span class="accessibility-aid"><a href="#">Got to the top of the page</a></span>
 </div><!-- /.legal -->
-</footer>	
+</footer>
 {% endblock footer %}
\ No newline at end of file
diff --git a/templates/templates/header.html b/templates/templates/header.html
old mode 100644
new mode 100755
diff --git a/templates/templates/marketo.html b/templates/templates/marketo.html
old mode 100644
new mode 100755
diff --git a/templates/templates/meta.html b/templates/templates/meta.html
old mode 100644
new mode 100755
diff --git a/templates/templates/one-column.html b/templates/templates/one-column.html
old mode 100644
new mode 100755
diff --git a/templates/templates/search.html b/templates/templates/search.html
old mode 100644
new mode 100755
index d5ef088f860..3937a376f27
--- a/templates/templates/search.html
+++ b/templates/templates/search.html
@@ -1,8 +1,5 @@
-<div id="box-search">
-	<form action="http://www.ubuntu.com/search/google-appliance/query" accept-charset="UTF-8" method="post" id="google-appliance-search-form" class="search-form">
-			<input type="text" maxlength="255" name="keys" id="edit-keys" class="form-text" />
-			<button type="submit" name="op" id="edit-submit-1" class="form-submit">Search</button>
-			<input type="hidden" name="form_build_id" id="form-57eed41bee926fb836d33507bdef1cef" value="form-57eed41bee926fb836d33507bdef1cef"  />
-			<input type="hidden" name="form_id" id="edit-google-appliance-search-form-1" value="google_appliance_search_form"  />	
-		</form>
-</div><!-- /#search-box -->
\ No newline at end of file
+<form action="/search" id="google-appliance-search-form" class="header-search">
+		<label for="edit-keys" class="accessibility-aid">Search</label>
+    <input type="search" maxlength="255" name="q" id="edit-keys" class="form-text" placeholder="Search" value="{{ query }}" />
+    <button type="submit"><img src="{{ STATIC_URL }}img/search-white.svg" alt="Search" height="28" /></button>
+</form>
\ No newline at end of file
diff --git a/templates/templates/two-column.html b/templates/templates/two-column.html
old mode 100644
new mode 100755
diff --git a/templates/tour/css/base.css b/templates/tour/css/base.css
deleted file mode 100644
index 42b30d4da36..00000000000
--- a/templates/tour/css/base.css
+++ /dev/null
@@ -1,765 +0,0 @@
-/*
- *  Main CSS
- *   author: Anthony Dillon
- */
-		
-		body { 
-			background-color: black;
-			background: url(../img/background.jpg) no-repeat center center fixed;
-	        -webkit-background-size: cover;
-	        -moz-background-size: cover;
-	        -o-background-size: cover;
-	        background-size: cover;
-			font-family:"Ubuntu","Ubuntu Beta",Ubuntu, UbuntuBeta !important;
-			color:white;
-			overflow: hidden;
-			overflow-x: hidden;
-			width:100%;
-			height:100%;
-			-webkit-user-select: none;
-			-khtml-user-select: none;
-			-moz-user-select: none;
-			-o-user-select: none;
-			user-select: none;
-		} 
-		
-		*{
-			cursor: default;
-			font-family:"Ubuntu","Ubuntu Beta",Ubuntu, UbuntuBeta;
-		}
-		
-		a {
-			outline: none;
-			color:#DD4814;
-			text-decoration: none;
-			cursor:pointer;
-		}
-		
-		.blurred *{
-			color: transparent !important;
-		    text-shadow: 0 0 5px #999 !important;
-		}
-		
-		.blurred{
-			 -ms-filter: "progid:DXImageTransform.Microsoft.Blur(pixelRadius=2)";
-		    filter: progid:DXImageTransform.Microsoft.Blur(pixelRadius=2);
-		}
-		
-		.window{
-				-moz-border-radius:4px 4px 0px 0px;
-				-webkit-border-radius:4px 4px 0px 0px;
-			border-radius:4px 4px 0px 0px;
-				-moz-box-shadow: 0px 0px 10px #000;
-			  	-webkit-box-shadow: 0px 0px 10px #000;
-			box-shadow: 0px 0px 10px #000;
-			position: absolute;
-			background:url(../img/folder/top-bg.jpg) repeat-x;
-			background-color:#f2f1f0;
-			color:#4C4C4C;
-			font-size:14px;
-			z-index:1;
-		}
-		
-		::-moz-selection { none; }
-		::-webkit-selection{ none; }
-	    ::selection { none; }
-	    
-	    input::-moz-selection { background:#f07746;color:#fff; }
-		input::-webkit-selection{ background:#f07746;color:#fff; }
-	    input:selection { background:#f07746;color:#fff; }
-	    
-	    textarea::-moz-selection { background:#f07746;color:#fff; }
-		textarea::-webkit-selection{ background:#f07746;color:#fff; }
-	    textarea:selection { background:#f07746;color:#fff; }
-	    
-	    textarea{
-			background-color:#fff;
-			border: 1px solid #ada9a5;
-			-webkit-border-radius:2px 2px 2px 2px;
-			-moz-border-radius:2px 2px 2px 2px;
-			border-radius:2px 2px 2px 2px;	
-			padding:2px;
-			font-family:"Ubuntu","Ubuntu Beta",UbuntuBeta,Ubuntu;
-	    }
-	    
-	    input{
-			background-color:#fff;
-			border: 1px solid #ada9a5;
-			-webkit-border-radius:2px 2px 2px 2px;
-			-moz-border-radius:2px 2px 2px 2px;
-			border-radius:2px 2px 2px 2px;	
-			padding:2px;
-			font-family:"Ubuntu","Ubuntu Beta",UbuntuBeta,Ubuntu;
-	    }
-	    
-	    #Translation-Strings{
-	    	display:none;
-	    }
-	    
-		#menu{
-			background:#500D28;
-			width:70px;
-			position:absolute;
-			left: 0px; 
-    		top: 24px;	
-    		border-right: 1px solid #6e3a4d;
-    		z-index: 10;
-    		overflow:hidden;
-			-webkit-user-select: none;
-			-khtml-user-select: none;
-			-moz-user-select: none;
-			-o-user-select: none;
-			user-select: none;
-		}
-		
-		#menu.dashOpen{
-			/*background:none;*/
-			border-right: 1px solid #333;
-		}
-		
-		#menu .scroll-up{
-			position:absolute;
-			left: 0px; 
-    		top: 0px;	
-			width:100%;
-			height:20px;
-		}
-		
-		#menu .scroll-down{
-			position:absolute;
-			left: 0px; 
-    		bottom: 0px;
-			width:100%;
-			height:20px;
-		}
-		
-		#tooltip{
-			z-index: 10;
-			height:20px;
-			background:url("../img/menu/tooltip-background.png") repeat-x;
-			/*background-color:rgba(0,0,0,0.2);*/
-			border:1px solid #4a3742;
-			border-left:none;
-			display:none;
-			position: absolute;
-			left:82px;
-			padding:3px 10px 2px 10px;
-			-moz-border-radius: 4px 4px 4px 4px;
-			-webkit-border-radius: 4px 4px 4px 4px;
-			border-radius: 4px 4px 4px 4px;
-			-moz-box-shadow: 0px 0px 5px #000;
-  			-webkit-box-shadow: 0px 0px 5px #000;
-			box-shadow: 0px 0px 5px #000;
-		}
-		#tooltip #tooltip-text{
-			font-size:14px;
-			white-space:nowrap;
-		}
-		.arrow-right,
-		.shadow-arrow {
-		        width: 0;
-		        height: 0;
-		        border-top: 10px solid transparent;
-		        border-bottom: 10px solid transparent; 
-				border-right:10px solid #1f171a;
-		        margin-left:-20px;
-		        /*opacity: .8;
-		        filter: alpha(opacity=80);
-		        -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";*/
-		        float:left;
-		}
-		.shadow-arrow{
-			border-right:12px solid #4a3742;
-			border-top: 12px solid transparent;
-		    border-bottom: 12px solid transparent; 
-			margin-left:-22px;
-			margin-top:-2px;
-		}
-		
-		#menu ul{
-			margin-top:6px;
-			padding-left: 12px;
-			position:absolute;
-			top:0px;
-			height:100%;
-		}
-		
-		#menu ul li{
-			list-style: none;
-			height:46px;
-			width:52px;
-			color:transparent;
-			padding-top:6px;
-			margin-bottom:6px;
-			background-repeat: no-repeat;
-			 -moz-transition:-moz-box-shadow .3s linear;
-			 -webkit-transition:-webkit-box-shadow .3s linear;
-			 transition:box-shadow .3s linear;
-		}
-		
-		#menu ul li.glow{
-		 box-shadow:0px 0px 7px #d0733b;
-		 -moz-box-shadow:0px 0px 7px #d0733b;
-		 -webkit-box-shadow:0px 0px 7px #d0733b;   
-		 background-color:rgba(208,115,59,0.5);
-		}
-		
-		#menu ul li img.open-arrow{
-			margin-left: -7px;
-    	    margin-top: 17px;
-    	    display:none;
-		}
-		
-		#menu ul li img.selected-window-arrow{
-    	    display:none;
-    	    float: right;
-		    margin-right: -6px;
-		    margin-top: 17px;
-		    position: relative;
-		}
-		#menu ul li span{
-			display:none;
-		}
-		#systemOverlay .copyDash{
-			position:absolute;
-			top:30px;
-			left:12px;
-			background-image:url(../img/menu/icon-dash.png);
-			background-repeat: no-repeat;
-			height:52px;
-			width:52px;
-		}
-		#menu .dash{
-			background-image:url(../img/menu/icon-dash.png);
-		}
-		#menu .home{
-			background-image:url(../img/menu/icon-folder.png);
-		}
-		#menu .firefox{
-			background-image:url(../img/menu/icon-firefox.png);
-		}
-		#menu .movieplayer{
-			background-image:url(../img/menu/icon-movieplayer.png);
-		}
-		#menu .shotwell{
-			background-image:url(../img/menu/icon-shotwell.png);
-		}
-		#menu .writer{
-			background-image:url(../img/menu/icon-writer.png);
-		}
-		#menu .impress{
-			background-image:url(../img/menu/icon-impress.png);
-		}
-		#menu .calc{
-			background-image:url(../img/menu/icon-calc.png);
-		}
-		#menu .uone{
-			background-image:url(../img/menu/icon-ubuntuone.png);
-		}
-		#menu .software{
-			background-image:url(../img/menu/icon-software.png);
-		}
-		#menu .email{
-			background-image:url(../img/menu/icon-thunderbird.png);
-		}
-		#menu .workspace{
-			background-image:url(../img/menu/icon-workspace.png);
-		}
-		#menu .applications{
-			background-image:url(../img/menu/icon-applications.png);
-		}
-		#menu .files{
-			background-image:url(../img/menu/icon-files.png);
-		}
-		#menu .rubbish{
-			background-image:url(../img/menu/icon-emptyrubbish.png);
-			position:absolute;
-		}
-		
-		#menu .bottom{
-			bottom:10px;
-		}
-		
-		#menu .temp{
-			display:none;
-		}
-		
-		#top{
-			background-image: url(../img/top-bg.jpg);
-			background-repeat:repeat-x;
-			position:absolute;
-			left: 0px; 
-    		top: 0px;
-    		width:100%;
-    		height:24px;
-    		color: #DFDBD2;
-			z-index:9;
-		}
-		
-		#top.dashOpen{
-			background-image: none;
-			background-color: transparent;
-			z-index: 13;
-		}
-		
-		#top.dashOpen #top-right #time{
-			color:#ffffff;
-		}
-		
-		#top.dashOpen #top-left #title{
-			color:transparent;
-		}
-		
-		#top #top-left #dash-control-buttons{
-			float:left;
-		}
-		
-		#top.dashOpen #top-left #dash-control-buttons div{
-			width:15px;
-			height:15px;
-			float:left;
-			margin-left: 4px;
-    		margin-top: 5px;
-		}
-		
-		#top.dashOpen #top-left #dash-control-buttons .close{
-			background:url(../img/dash/dash-close.png) no-repeat;
-			margin-left:10px;
-		}
-		
-		#top.dashOpen #top-left #dash-control-buttons .close:active{
-			background:url(../img/dash/dash-close-clicked.png) no-repeat;
-		}
-		
-		#top.dashOpen #top-left #dash-control-buttons .min{
-			background:url(../img/dash/dash-min.png) no-repeat;
-		}
-		
-		#top.dashOpen #top-left #dash-control-buttons .max{
-			background:url(../img/dash/dash-max.png) no-repeat;
-		}
-		
-		#top.dropShadow{
-				-moz-box-shadow: 10px 0px 10px #000;
-		  		-webkit-box-shadow: 10px 0px 10px #000;
-			box-shadow: 10px 0px 10px #000;
-		}
-		#top #top-button-bg #top-button{
-			background: url('../img/topleft-button.png') no-repeat center center;
-			width:70px;
-			height:100%;
-		}
-		#top #top-button-bg{
-			width:70px;
-			height:100%;
-			border-right: 1px double #333;
-			float:left;
-		}
-		#top  .open{
-			background: url('../img/top-bg-selected.jpg') repeat-x center center;
-		}
-		#top #top-left{
-			float:left;
-		}
-		#top #top-right{
-			float:right;
-			font-size:15px;
-		}
-		#top #top-right div{
-			float:left;
-			padding:0px 8px;
-			overflow:hidden;
-			
-		}
-		#top #top-right div .drop-down{
-			list-style-type:none;
-			background:#464641;
-			padding:0px 5px;
-			margin-top: 0px;
-			-moz-box-shadow: -1px 1px 5px #000000;
-		  	-webkit-box-shadow: -1px 1px 5px #000000;
-			box-shadow: -1px 1px 5px #000000;
-			position: absolute;
-			display:none;
-			z-index:10;
-		}
-		.fullscreenTransOverlay{
-			position: absolute;
-			left:0px;
-			top:0px;
-			width:100%;
-			height:100%;
-			background:url(../img/black-bg-00.png);
-			background:rgba(0, 0, 0, 0);
-			z-index:8;
-		}
-		.fullscreenErrorTransOverlay{
-			position: absolute;
-			left:0px;
-			top:0px;
-			width:100%;
-			height:100%;
-			background:url(../img/black-bg-00.png);
-			background:rgba(0, 0, 0, 0);
-			z-index:2;
-		}
-		#top #top-right div .drop-down li.disabled{
-			color:#666;
-		}
-		#top #top-right div .drop-down li.disabled:hover{
-			background:#464641;
-			color:#666;
-		}
-		#top #top-right div .drop-down li:hover{
-			background:url(../img/top/drop-down-hover.jpg) repeat-x;
-			color:white;
-		}
-		#top #top-right div ul li.divider:hover{
-			background:#3d3c39;
-		}
-		#top #top-right #power .drop-down{
-			margin-left:-235px;
-			width:247px;
-		}
-		#top #top-right #user .drop-down{
-			width:192px;
-			margin-left:-129px;
-		}
-		#top #top-right #time .drop-down{
-			width:300px;
-			margin-left:-241px;
-			margin-top:3px;
-		}
-		#top #top-right #message .drop-down{
-			margin-left: -45px;
-			margin-top: 3px;
-   			width: 240px;
-		}
-		#top #top-right #speakers .drop-down{
-			width:255px;
-			margin-left:-167px;
-		}
-		#top #top-right #connection .drop-down{
-			width:219px;
-			margin-left: -75px;
-		}
-		#top #top-right #bluetooth .drop-down{
-			width:208px;
-			margin-left: -45px;
-		}
-		#top #top-right #time p{
-			margin:0px;
-		}
-		#top #top-right #time .system-calendar{
-			background:url(../img/top/calendar.jpg) no-repeat;
-			width:254px;
-			height:185px;
-			margin-left:20px;
-			margin-top:10px;
-		}
-		#top #top-right div img.disabled{opacity:0.4;filter:alpha(opacity=40)}
-		#top #top-right div ul{
-			list-style-position:inside;
-		}
-		
-		#top #top-right div ul li{
-			height: 18px;
-    		padding: 3px 3px 3px 15px;
-		}
-		
-		#top #top-right div ul li img{
-			margin-left:-10px;
-			margin-right:5px;
-			vertical-align: middle;
-		}
-		
-		#top #top-right div ul li.ticked{
-			list-style-image:url('../img/top/tic7pxk.png');
-			padding-left:0px;
-		}
-		
-		#top #top-right div ul li.divider{
-			height:1px;
-			background:#3d3c39;
-			border-bottom:1px solid #484844;
-			padding:0px;
-			margin:4px 0px;
-		}
-		
-		#top #top-right #message{
-			padding-top:4px;
-		}
-		#top #top-right #connection,#top #top-right #speakers,#top #top-right #bluetooth{
-			padding-top:4px;
-		}
-		
-		#top #top-right #user{
-			padding-top:2px;
-		}
-		#top #top-right #power{
-			padding-top:2px;
-		}
-		
-		#top #top-right #time,#top #top-right #user{
-			padding-top:3px;
-		}
-		
-		#top #top-right #user img{
-			vertical-align: bottom;
-		}
-		
-		#top #top-right #speakers div{
-			float:left;
-		}
-		
-		#top #top-right #speakers .small-icon{
-			background:url(../img/top/0slider.jpg) no-repeat;
-			height:15px;
-			width: 7px;
-			margin-top: 12px;
-		}
-		
-		#top #top-right #speakers .system-volume{
-			height:37px;
-			padding:3px;
-		}
-		#top #top-right #speakers .system-volume:hover, #top #top-right #speakers .banshee:hover{
-			background:none;
-		}
-		
-		#top #top-right #speakers .banshee{
-			height:43px;
-			padding-left:50px;
-		}
-		
-		#top #top-right #speakers .banshee div:hover{
-			background-color:#4d4c48;
-		}
-		
-		#top #top-right #speakers .banshee .banshee-rewind{
-			background:url(../img/top/banshee-rewind.png) no-repeat scroll center center #43423f;
-			height:29px;
-			width:52px;
-			margin-top:7px;
-			-moz-border-radius: 14px 0px 0px 14px;
-			-webkit-border-radius: 14px 0px 0px 14px;
-			border-radius: 14px 0px 0px 14px;
-			border-top:1px solid #64625b;
-			border-bottom:1px solid #393836;
-		}
-		
-		#top #top-right #speakers .banshee .banshee-play{
-			background:url(../img/top/banshee-play.png) no-repeat scroll center center #43423f;
-			height:43px;
-			width:37px;
-			-moz-border-radius: 25px 25px 25px 25px;
-			-webkit-border-radius: 25px 25px 25px 25px;
-			border-radius: 25px 25px 25px 25px;
-			border-top:1px solid #64625b;
-			border-bottom:1px solid #393836;
-			margin-left:-100px;
-			
-		}
-		
-		#top #top-right #speakers .banshee .banshee-forward{
-			background:url(../img/top/banshee-forward.png) no-repeat scroll center center #43423f;
-			height:29px;
-			width:52px;
-			margin-top:7px;
-			-moz-border-radius: 0px 14px 14px 0px;
-			-webkit-border-radius: 0px 14px 14px 0px;
-			border-radius: 0px 14px 14px 0px;
-			border-top:1px solid #64625b;
-			border-bottom:1px solid #393836;
-			margin-left:30px;
-		}
-		
-		#top #top-right #speakers .slider{
-			width: 185px;
-			height:17px;
-			float:left;
-			overflow: visible;
-			cursor: default;
-			margin-top: 5px;
-   			 padding-top: 10px;
-		}
-		
-		#top #top-right #speakers .slider-active{
-			-moz-border-radius:5px 5px 5px 5px;
-			-webkit-border-radius:5px 5px 5px 5px;
-			border-radius:5px 5px 5px 5px;
-			background:#dd4814;
-			height: 5px;
-			width:60px;
-    		margin-left: 26px;
-  		 	margin-top: -15px;
-		    position: relative;
-		   z-index:1;
-		   padding:0px;
-		}
-		
-		#top #top-right #speakers .ui-slider-handle{
-			z-index:2;
-		}
-		
-		#top #top-right #speakers .large-icon{
-			background:url(../img/top/100slider.jpg) no-repeat;
-			height:15px;
-			width: 7px;
-			float:right;
-			margin-top: 12px;
-		}
-		
-		#top #top-right .selected{
-			background:url(../img/top/selected-bg.jpg) repeat-x;
-			-webkit-border-top-left-radius: 2px;
-			-webkit-border-top-right-radius: 2px;
-			-moz-border-radius-topleft: 2px;
-			-moz-border-radius-topright: 2px;
-			border-top-left-radius: 2px;
-			border-top-right-radius: 2px;
-		}
-		
-		#top-left #title{
-			font-weight:bold;
-			float:left;
-			color: #DFDBD2;
-		    font-size: 14px;
-		    margin-left: 10px;
-		    margin-top: 2px;
-		}
-		
-		
-		
-		#control-buttons{
-			margin-top:2px;
-			margin-left:8px;
-			float:left;
-			display:none;
-		}
-		
-		#control-buttons div{
-			width:19px;
-			height:19px;
-			background-repeat: no-repeat;
-			float:left;
-			margin-right:2px;
-		}
-		
-		#control-buttons div:hover{
-			background-position: 0px -19px;
-		}
-		
-		#control-buttons #close{
-			background-image:url(../img/close-button.jpg);
-		}
-		#control-buttons #min{
-			background-image:url(../img/min-button.jpg);
-		}
-		#control-buttons #max{
-			background-image:url(../img/max-button.jpg);
-		}
-		#top.dashOpen #control-buttons{
-			display:none;
-		}
-		
-.fullsize{
-	top:0px !important;
-	left:70px !important;
-}
-.fullsize .control .max{
-	background:url(../img/folder/resume.jpg) no-repeat;
-}
-
-.fullsize .control{
- }
- 
- .fullsize .buttons{
- 	margin-top:0px;
- }
-
-.ui-slider {
-	position: relative;
-	background: url('../img/speaker-bg-slider.png') 0 10px no-repeat transparent;
-	height: 10px;
-	width: 195px;
-}
-.ui-slider:hover {
-	cursor: pointer;
-}
-
-.ui-slider a {
-	margin: -6px 0 0 -5px;
-	position: absolute;
-	background: url('../img/button-slider.png') 0 0 no-repeat transparent;
-	width: 12px;
-	height: 20px;
-	display: block;
-}
-
-  .selected-window{
-		-moz-box-shadow: 0px 0px 20px #000;
-		-webkit-box-shadow: 0px 0px 20px #000;
-		box-shadow: 0px 0px 20px #000;
-  }
-    .selected-window .control .window-title{
-    	color: #DFDBD2;
-    }
-    
-    .folder{
-	width:730px;
-	height:500px;
-	top:200px;
-	left:600px;
-	display:none;
-}
-.control{
-	height:19px;
-	margin-left:10px;
-	margin-top: 6px;
-	/*margin-bottom:5px;*/
-}
-
-.control .folder-title{
-	font-weight:bold;
-	float:left;
-	color: #DFDBD2;
-    font-size: 14px;
-    margin-left: 10px;
-}
-
-.control .close{
-	background:url(../img/folder/close.jpg) no-repeat;
-	height:19px;
-	width:18px;
-	float:left;
-}
-
-.control div:hover{
-	background-position: 0px -19px !important;
-}
-
-.control .min{
-	background:url(../img/folder/minimise.jpg) no-repeat;
-	height:19px;
-	width:19px;
-	float:left;
-}
-
-.control .max{
-	background:url(../img/folder/maximise.jpg) no-repeat;
-	height:19px;
-	width:17px;
-	float:left;
-}
-
-.window-title{
-	color:#807d78;
-    float: left;
-    font-size: 14px;
-    font-weight: bold;
-    height: 18px;
-    margin-left: 10px;
-    overflow: hidden;
-    max-width:90%;
-}
diff --git a/templates/tour/css/demos.css b/templates/tour/css/demos.css
deleted file mode 100644
index 2d2ce1fc82c..00000000000
--- a/templates/tour/css/demos.css
+++ /dev/null
@@ -1,334 +0,0 @@
-body {
-	font-size: 62.5%;
-}
-
-table {
-	font-size: 1em;
-}
-
-/* Site
-   -------------------------------- */
-
-body {
-	font-family: "Trebuchet MS", "Helvetica", "Arial",  "Verdana", "sans-serif";
-}
-
-/* Layout
-   -------------------------------- */
-
-.layout-grid {
-	width: 960px;
-}
-
-.layout-grid td {
-	vertical-align: top;
-}
-
-.layout-grid td.left-nav {
-	width: 140px;
-}
-
-.layout-grid td.normal {
-	border-left: 1px solid #eee;
-	padding: 20px 24px;
-	font-family: "Trebuchet MS", "Helvetica", "Arial",  "Verdana", "sans-serif";
-}
-
-.layout-grid td.demos {
-	background: url('/images/demos_bg.jpg') no-repeat;
-	height: 337px;
-	overflow: hidden;
-}
-
-/* Normal
-   -------------------------------- */
-
-.normal h3,
-.normal h4 {
-	margin: 0;
-	font-weight: normal;
-}
-
-.normal h3 {
-	padding: 0 0 9px;
-	font-size: 1.8em;
-}
-
-.normal h4 {
-	padding-bottom: 21px;
-	border-bottom: 1px dashed #999;
-	font-size: 1.2em;
-	font-weight: bold;
-}
-
-.normal p {
-	font-size: 1.2em;
-}
-
-/* Demos */
-
-.demos-nav, .demos-nav dt, .demos-nav dd, .demos-nav ul, .demos-nav li {
-	margin: 0;
-	padding: 0
-}
-
-.demos-nav {
-	float: left;
-	width: 170px;
-	font-size: 1.3em;
-}
-
-.demos-nav dt,
-.demos-nav h4 {
-	margin: 0;
-	padding: 0;
-	font: normal 1.1em "Trebuchet MS", "Helvetica", "Arial",  "Verdana", "sans-serif";
-	color: #e87b10;
-}
-
-.demos-nav dt,
-.demos-nav h4 {
-	margin-top: 1.5em;
-	margin-bottom: 0;
-	padding-left: 8px;
-	padding-bottom:5px;
-	line-height: 1.2em;
-	border-bottom: 1px solid #F4F4F4;
-}
-
-.demos-nav dd a,
-.demos-nav li a {
-	border-bottom: 1px solid #F4F4F4;
-	display:block;
-	padding: 4px 3px 4px 8px;
-	font-size: 90%;
-	text-decoration: none;
-	color: #555 ;
-	margin:2px 0;
-	height:13px;
-}
-
-.demos-nav dd a:hover,
-.demos-nav dd a:focus,
-.demos-nav dd a:hover,
-.demos-nav dd a:focus {
-	background: #f3f3f3;
-	color:#000;
-	-moz-border-radius: 5px; -webkit-border-radius: 5px;
-}
- .demos-nav dd a.selected {
-	background: #555;
-	color:#ffffff;
-	-moz-border-radius: 5px; -webkit-border-radius: 5px;
-}
-
-
-/* new styles for demo pages, added by Filament 12.29.08
-eventually we should convert the font sizes to ems -- using px for now to minimize style conflicts
-*/
-
-.normal h3.demo-header { font-size:32px; padding:0 0 5px; border-bottom:1px solid #eee; text-transform: capitalize; }
-.normal h4.demo-subheader { font-size:10px; text-transform: uppercase; color:#999; padding:8px 0 3px; border:0; margin:0; }
-.normal a:link,
-.normal a:visited { color:#1b75bb; text-decoration:none; }
-.normal a:hover,
-.normal a:active { color:#0b559b; }
-
-#demo-config { padding:20px 0 0; }
-
-#demo-frame { float:left; width:540px; height:380px; border:1px solid #ddd; overflow: auto; position: relative; }
-#demo-frame h3, #demo-frame h4 { padding: 0; font-weight: bold; font-size: 1em; }
-
-#demo-config-menu { float:right; width:180px;  }
-#demo-config-menu h4 { font-size:13px; color:#666; font-weight:normal; border:0; padding-left:18px; }
-
-#demo-config-menu ul { list-style: none; padding: 0; margin: 0; }
-
-#demo-config-menu li { font-size:12px; padding:0 0 0 10px; margin:3px 0; zoom: 1; }
-
-#demo-config-menu li a:link,
-#demo-config-menu li a:visited { display:block; padding:1px 8px 4px; border-bottom:1px dotted #b3b3b3; }
-* html #demo-config-menu li a:link,
-* html #demo-config-menu li a:visited { padding:1px 8px 2px; }
-#demo-config-menu li a:hover,
-#demo-config-menu li a:active { background-color:#f6f6f6; }
-
-#demo-config-menu li.demo-config-on { background: url(images/demo-config-on-tile.gif) repeat-x left center; }
-
-#demo-config-menu li.demo-config-on a:link,
-#demo-config-menu li.demo-config-on a:visited,
-#demo-config-menu li.demo-config-on a:hover,
-#demo-config-menu li.demo-config-on a:active { background: url(images/demo-config-on.gif) no-repeat left; padding-left:18px; color:#fff; border:0; margin-left:-10px; margin-top: 0px; margin-bottom: 0px; }
-
-#demo-source, #demo-notes {
-	clear: both;
-	padding: 20px 0 0;
-	font-size: 1.3em;
-}
-
-#demo-notes { width:520px; color:#333; font-size: 1em; }
-#demo-notes p code, .demo-description p code { padding: 0; font-weight: bold; }
-#demo-source pre, #demo-source code { padding: 0; }
-code, pre { padding:8px 0 8px 20px ; font-size: 1.2em; line-height:130%;  }
-
-#demo-source a:link,
-#demo-source a:visited,
-#demo-source a:hover,
-#demo-source a:active { font-size:12px; padding-left:13px; background-position: left center; background-repeat: no-repeat; }
-
-#demo-source a.source-open:link,
-#demo-source a.source-open:visited,
-#demo-source a.source-open:hover,
-#demo-source a.source-open:active { background-image: url(images/demo-spindown-open.gif); }
-
-#demo-source a.source-closed:link,
-#demo-source a.source-closed:visited,
-#demo-source a.source-closed:hover,
-#demo-source a.source-closed:active { background-image: url(images/demo-spindown-closed.gif); }
-
-div.demo {
-	padding:12px;
-	font-family: "Trebuchet MS", "Arial", "Helvetica", "Verdana", "sans-serif";
-}
-
-div.demo h3.docs { clear:left; font-size:12px; font-weight:normal; padding:0 0 1em; margin:0; }
-
-div.demo-description {
-	clear:both;
-	padding:12px;
-	font-family: "Trebuchet MS", "Arial", "Helvetica", "Verdana", "sans-serif";
-	font-size: 1.3em;
-	line-height: 1.4em;
-}
-
-.ui-draggable, .ui-droppable {
-	background-position: top left;
-}
-
-.left-nav .demos-nav {
-	padding-right: 10px;
-}
-
-#demo-link { font-size:11px;  padding-top: 6px; clear: both; overflow: hidden; }
-#demo-link a span.ui-icon { float:left; margin-right:3px; }
-
-/* Component containers
-----------------------------------*/
-#widget-docs .ui-widget { font-family: Trebuchet MS,Verdana,Arial,sans-serif; font-size: 1em; }
-#widget-docs .ui-widget input, #widget-docs .ui-widget select, #widget-docs .ui-widget textarea, #widget-docs .ui-widget button { font-family: Trebuchet MS,Verdana,Arial,sans-serif; font-size: 1em; }
-#widget-docs .ui-widget-header { border: 1px solid #ffffff; background: #464646 url(images/464646_40x100_textures_01_flat_100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
-#widget-docs .ui-widget-header a { color: #ffffff; }
-#widget-docs .ui-widget-content { border: 1px solid #ffffff; background: #ffffff url(images/ffffff_40x100_textures_01_flat_75.png) 50% 50% repeat-x; color: #222222; }
-#widget-docs .ui-widget-content a { color: #222222; }
-
-/* Interaction states
-----------------------------------*/
-#widget-docs .ui-state-default, #widget-docs .ui-widget-content #widget-docs .ui-state-default { border: 1px solid #666666; background: #555555 url(images/555555_40x100_textures_03_highlight_soft_75.png) 50% 50% repeat-x; font-weight: normal; color: #ffffff; outline: none; }
-#widget-docs .ui-state-default a { color: #ffffff; text-decoration: none; outline: none; }
-#widget-docs .ui-state-hover, #widget-docs .ui-widget-content #widget-docs .ui-state-hover, #widget-docs .ui-state-focus, #widget-docs .ui-widget-content #widget-docs .ui-state-focus { border: 1px solid #666666; background: #444444 url(images/444444_40x100_textures_03_highlight_soft_60.png) 50% 50% repeat-x; font-weight: normal; color: #ffffff; outline: none; }
-#widget-docs .ui-state-hover a { color: #ffffff; text-decoration: none; outline: none; }
-#widget-docs .ui-state-active, #widget-docs .ui-widget-content #widget-docs .ui-state-active { border: 1px solid #666666; background: #ffffff url(images/ffffff_40x100_textures_01_flat_65.png) 50% 50% repeat-x; font-weight: normal; color: #F6921E; outline: none; }
-#widget-docs .ui-state-active a { color: #F6921E; outline: none; text-decoration: none; }
-
-/* Interaction Cues
-----------------------------------*/
-#widget-docs .ui-state-highlight, #widget-docs .ui-widget-content #widget-docs .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(images/fbf9ee_40x100_textures_02_glass_55.png) 50% 50% repeat-x; color: #363636; }
-#widget-docs .ui-state-error, #widget-docs .ui-widget-content #widget-docs .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/fef1ec_40x100_textures_05_inset_soft_95.png) 50% bottom repeat-x; color: #cd0a0a; }
-#widget-docs .ui-state-error-text, #widget-docs .ui-widget-content #widget-docs .ui-state-error-text { color: #cd0a0a; }
-#widget-docs .ui-state-disabled, #widget-docs .ui-widget-content #widget-docs .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
-#widget-docs .ui-priority-primary, #widget-docs .ui-widget-content #widget-docs .ui-priority-primary { font-weight: bold; }
-#widget-docs .ui-priority-secondary, #widget-docs .ui-widget-content #widget-docs .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-#demo-frame-wrapper .ui-icon, #widget-docs .ui-icon { width: 16px; height: 16px; background-image: url(images/222222_256x240_icons_icons.png); }
-#widget-docs .ui-widget-content .ui-icon {background-image: url(images/222222_256x240_icons_icons.png); }
-#widget-docs .ui-widget-header .ui-icon {background-image: url(images/222222_256x240_icons_icons.png); }
-#widget-docs .ui-state-default .ui-icon { background-image: url(images/888888_256x240_icons_icons.png); }
-#widget-docs .ui-state-hover .ui-icon, #widget-docs .ui-state-focus .ui-icon {background-image: url(images/454545_256x240_icons_icons.png); }
-#widget-docs .ui-state-active .ui-icon {background-image: url(images/454545_256x240_icons_icons.png); }
-#widget-docs .ui-state-highlight .ui-icon {background-image: url(images/2e83ff_256x240_icons_icons.png); }
-#widget-docs .ui-state-error .ui-icon, #widget-docs .ui-state-error-text .ui-icon {background-image: url(images/cd0a0a_256x240_icons_icons.png); }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-#widget-docs .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; }
-#widget-docs .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; }
-#widget-docs .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; }
-#widget-docs .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; }
-#widget-docs .ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; }
-#widget-docs .ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; }
-#widget-docs .ui-corner-right {  -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; }
-#widget-docs .ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; }
-#widget-docs .ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; }
-
-/* Overlays */
-#widget-docs .ui-widget-overlay { background: #aaaaaa url(images/aaaaaa_40x100_textures_01_flat_0.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
-#widget-docs .ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/aaaaaa_40x100_textures_01_flat_0.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; }
-
-/*
-----------------------------------*/
-
-#widget-docs { margin:20px 0 0; border: none; }
-
-#widget-docs h2, #widget-docs h3, #widget-docs h4, #widget-docs p, #widget-docs ul, #widget-docs code { margin:0; padding:0; }
-#widget-docs code { display:block; color:#444; font-size:.9em; margin:0 0 1em; }
-#widget-docs code strong { color:#000; }
-#widget-docs p { margin:0 3em 1.2em 0; }
-#widget-docs p.intro { font-size:13px; color:#666; line-height:1.3; }
-#widget-docs ul { list-style-type: none; }
-
-#widget-docs h2 { font-size:16px; margin:1.2em 0 .5em; }
-#widget-docs h3 { font-size:14px; color:#e6820E; margin:1.5em 0 .5em; }
-.normal #widget-docs h4 { font-size:12px; color:#000; border:0; margin:0 0 .5em; }
-
-#docs-overview-main { width:400px; }
-#docs-overview-sidebar { float:right; width:200px; }
-#docs-overview-sidebar a span { color:#666; }
-#widget-docs #docs-overview-main p { margin-right:0; }
-#widget-docs #docs-overview-sidebar h4 { padding-left:0; }
-
-.docs-list-header { float:left; width:100%; margin:10px 0 0; border-bottom:1px solid #eee; }
-#widget-docs .docs-list-header h2 { float:left; margin:0; }
-#widget-docs .docs-list-header p { float:right; margin:5px 0; font-size:11px; }
-
-.docs-list { float:left; width:100%; padding:0 0 10px; }
-.docs-list .param-header { float:left; clear:left; width:100%; padding:8px 0; border-top:1px solid #eee; }
-#widget-docs .param-header h3, #widget-docs .param-header p { margin:0; float:left; }
-#widget-docs .param-header h3 { width:50%; }
-#widget-docs .param-header h3 span { background: url(images/demo-spindown-closed.gif) no-repeat left; padding-left:13px; }
-#widget-docs .param-open .param-header h3 span { background: url(images/demo-spindown-open.gif) no-repeat left; }
-#widget-docs .param-header p { width:24%; }
-#widget-docs .param-header p.param-type span { background: url(images/icon-docs-info.gif) no-repeat left; cursor:pointer; border-bottom:1px dashed #ccc; padding-left:15px; }
-
-.param-details { padding-left:13px; }
-.param-args { margin:0 0 1.5em; border-top:1px dotted #ccc;}
-.param-args td { padding:3px 30px 3px 5px; border-bottom:1px dotted #ccc;  }
-
-
-/* overrides for ui-tab styles */
-#widget-docs ul.ui-tabs-nav { padding:0 0 0 8px; }
-#widget-docs .ui-tabs-nav li { margin:5px 5px 0 0; }
-
-#widget-docs .ui-tabs-nav li a:link,
-#widget-docs .ui-tabs-nav li a:visited,
-#widget-docs .ui-tabs-nav li a:hover,
-#widget-docs .ui-tabs-nav li a:active { font-size:14px; padding:4px 1.2em 3px; color:#fff; }
-
-#widget-docs .ui-tabs-nav li.ui-tabs-selected a:link,
-#widget-docs .ui-tabs-nav li.ui-tabs-selected a:visited,
-#widget-docs .ui-tabs-nav li.ui-tabs-selected a:hover,
-#widget-docs .ui-tabs-nav li.ui-tabs-selected a:active { color:#e6820E; }
-
-#widget-docs .ui-tabs-panel { padding:20px 9px; font-size:12px; line-height:1.4; color:#000; }
-
-#widget-docs .ui-widget-content a:link,
-#widget-docs .ui-widget-content a:visited { color:#1b75bb; text-decoration:none; }
-#widget-docs .ui-widget-content a:hover,
-#widget-docs .ui-widget-content a:active { color:#0b559b; }
-
diff --git a/templates/tour/css/email.css b/templates/tour/css/email.css
deleted file mode 100644
index 67031b5546a..00000000000
--- a/templates/tour/css/email.css
+++ /dev/null
@@ -1,511 +0,0 @@
-/*
- *  Email CSS
- *   author: Anthony Dillon
- */
-
-.email-window{
-    height: 600px;
-    left: 640px;
-    top: 240px;
-    width: 900px;
-    display:none;
-}
-
-#email-window .email-get-mail{
-	background:url(../img/email/get-mail.jpg) no-repeat;
-	font-size: 15px;
-    height: 26px;
-    overflow: hidden;
-    padding-left: 31px;
-    padding-top: 9px;
-    width: 77px;
-}
-#email-window .email-write{
-	height:26px;
-	width:45px;
-	overflow:hidden;
-	background:url(../img/email/write.jpg) no-repeat;
-	font-size: 15px;
-	padding-left: 31px;
-    padding-top: 9px;
-}
-#email-window .email-address-book{
-	height:35px;
-	width:132px;
-	overflow:hidden;
-	background:url(../img/email/address-book.jpg) no-repeat;
-}
-#email-window .email-divider, #email-write .email-divider{
-	height:35px;
-	width:16px;
-	overflow:hidden;
-	background:url("../img/email/divider.png") no-repeat scroll 8px 7px transparent;
-}
-#email-window .email-tag{
-	height:35px;
-	width:76px;
-	overflow:hidden;
-	background:url(../img/email/tag.jpg) no-repeat;
-}
-
-#email-window .buttons{
-	width:100%;
-	height:42px;
-	margin-top:6px;
-	background-color:#F2F1F0;
-}
-
-#email-window .buttons div, #email-write  .buttons div{
-	float:left;
-}
-
-#email-window .buttons div:hover{
-	background-position: 0px -35px;
-}
-
-#email-window .buttons .email-search input{
-	width:350px;
-	background:url(../img/firefox/search_icon.jpg) no-repeat center right;
-	background-color:#fff;
-}
-
-#email-window .buttons .email-search{
-	float:right;
-	margin-right:10px;
-}
-
-#email-window .bottom-buttons {
-    height: 24px;
-    margin: 5px;
-}
-
-#email-window .email-content{
-	border-top:1px solid #b8b4b0;
-}
-
-#email-window .folder-list{
-	float:left;
-}
-
-#email-window .list{
-	height: 470px;
-	background-color:white;
-	border: 1px solid #c4c1bd;
-	width:180px;
-	margin-right:4px;
-}
-
-#email-window .bottom-buttons {
-    height: 17px;
- }
- 
-#email-window .email-contents{
- 	float:left;
- 	border-top:0px;
- 	width: 710px;
- }
- 
-#email-window .email-contents .email-categories{
-	width:100%;
-	height:26px;
-	background:url(../img/email/header-bg.jpg) repeat-x;
-	border-bottom:1px solid #c4c1bd;
-	border-left:1px solid #c4c1bd;
-}
-
-#email-window .email-contents .email-categories .subject{
- 	width:38%;
- }
- 
- .email-categories .from,  .email-categories .date{
- 	width: 15%;
- }
-
-#email-window .email-contents .email-categories div{
-	float:left;
-	min-width: 25px;
-	border-right:1px solid #c4c1bd;
-	height:22px;
-	padding:2px 5px;
-}
-
-#email-window .email-contents .email-list{
-	background:#ffffff;
-	border:1px solid #c4c1bd;
-	border-top:0px;
-	width:100%;
-	height:175px;
-	overflow: scroll;
-	overflow-x: hidden; 
-}
-
-#email-window .email-contents .email-list div{
-	width:100%;
-	height:25px;
-	vertical-align: middle;
-}
-
-#email-window .email-contents .email-list .unread{
-	font-weight:bold;
-}
-
-#email-window .folder-list .list div{
-	padding:1px 10px;
-	height:20px;
-	border:1px dotted transparent;
-}
-
-.email-list div.grey{
-	background-color: rgb(238, 238, 238);
-}
-
-.email-list div.replied ul li.message-subject{
-	background:url(../img/email/reply-logo.png) no-repeat scroll 2px center;
-}
-
-.email-list div.forwarded ul li.message-subject{
-	background:url(../img/email/forward-logo.png) no-repeat scroll 2px center;
-}
-
-.email-list div.repliedforwarded ul li.message-subject{
-	background:url(../img/email/forward-reply-logo.png) no-repeat scroll 2px center;
-}
-
-.email-list div.selected{
-	background:#f07746;
-	color:white;
-}
-
-#email-window .folder-list .list div img{
-	vertical-align: middle;
-}
-
-#email-window .folder-list .list .selected{
-	background:#f07746;
-	border:1px dashed #f3d982;
-	color:white;
-}
-
-#email-window .email-contents .email-list  ul{
-	padding:0px;
-	margin:0px;
-}
-
-#email-window .email-contents .email-list  li{
-	float: left;
-	margin-right: 1px;
-    height: 16px;
-    min-width: 24px;
-    padding: 2px 5px;
-	overflow: hidden;
-}
-
-#email-window .email-contents .email-list  li.message-t{
-	min-width: 25px;
-}
-
-#email-window .email-contents .email-list  li.message-subject{
-	padding-left: 20px;
-    width: 37%;
-}
-.email-list  li.message-from{
-	width:15%;
-}
-
-.email-list  li.message-date{
-	width:15%;
-}
-
-.email-list  li.message-glasses{
-	background:url(../img/email/message-glasses.png) no-repeat center 0px;
-}
-
-.email-list  li.message-star{
-	background:url(../img/email/message-starred.png) no-repeat center 0px;
-}
-
-.email-list .attachment li.message-clip{
-	background:url(../img/email/clip.png) no-repeat center 0px;
-}
-
-.email-list .fire li.message-fire{
-	background:url(../img/email/fire.png) no-repeat center 0px;
-}
-
-.email-list .unread  li.message-glasses, 
-.email-list .starred  li.message-star{
-	background-position:center -20px;
-}
-
-#email-window .email-contents .email-body{
-	background:#ffffff;
-	border:1px solid #c4c1bd;
-	width:100%;
-	margin-top:5px;
-	height:288px;
-}
-#email-window .email-contents .email-body div{
-	display:none;
-}
-
-#email-window .email-contents .message-body{
-	padding:10px;
-	overflow: scroll;
-	overflow-x: hidden; 
-	height: 169px;
-}
-
-#email-window .email-contents .email-body .message-header{
-	background:#F2F1F0;
-	border-bottom:1px solid #c4c1bd;
-}
-
-#email-window .email-contents .email-body .message-header dl{
-	margin:0px 0px 5px 0px;
-	padding:0px;
-	
-}
-
-#email-window .email-contents .email-body .message-header dt{
-	display:inline-block;
-	width:50px;
-	text-align:right;
-	margin-right:10px;
-	color:#999;
-}
-
-#email-window .email-contents .email-body .message-header dl dd{
-	display:inline;
-	padding:2px 5px;
-	color:#4c4c4c;
-}
-
-#email-window .email-contents .email-body .message-header .subject  dd{
-	font-weight:bold;
-}
-
-#email-window .email-contents .email-body .message-header .from dd:hover{
-	background:#F07746;
-	color:white;
-}
-
-#email-window .email-contents .email-body .message-header .to dd:hover{
-	background:#F07746;
-	color:white;
-}
-
-#email-window .email-contents .email-body .message-header .cc dd:hover{
-	background:#F07746;
-	color:white;
-}
-
-#email-window .email-contents .email-body .message-header .email-buttons{
-	/*height:20px;
-	margin-top:5px;
-	height:20px;
-	background-color:#fff;
-	border: 1px solid #ada9a5;
-	-webkit-border-radius:2px 2px 2px 2px;
-	-moz-border-radius:2px 2px 2px 2px;
-	border-radius:2px 2px 2px 2px;	
-	padding:2px;*/
-	float:right;
-}
-
-
-
-#email-window .email-contents .email-body .message-header .email-buttons div span{
-	height:24px;
-	float:left;
-	padding-left:26px;
-	font-size: 15px;
-	padding-top: 3px;
-	margin:4px 4px 0 0;
-}
-
-#email-window .email-contents .email-body .message-header .email-buttons span:hover{
-	background-position: 0px -27px;
-}
-
-#email-window .email-contents .email-body .message-header .email-buttons .message-reply{
-	background:url(../img/email/reply.jpg) no-repeat;
-	width:42px;
-}
-#email-window .email-contents .email-body .message-header .email-buttons .message-forward{
-	background:url(../img/email/forward.jpg) no-repeat;
-	width:62px;
-}
-#email-window .email-contents .email-body .message-header .email-buttons .message-archive{
-	background:url(../img/email/archive.jpg) no-repeat;
-	width:55px;
-}
-#email-window .email-contents .email-body .message-header .email-buttons .message-junk{
-	background:url(../img/email/junk.jpg) no-repeat;
-	width:36px;
-}
-#email-window .email-contents .email-body .message-header .email-buttons .message-delete{
-	background:url(../img/email/delete.jpg) no-repeat;
-	width:50px;
-}
-
-#email-window .email-contents .email-body .message-header .date{
-	margin:30px 10px 0px 10px;
-	float:right;
-}
-
-#email-window .email-contents .junk-mail-banner{
-	height:34px;
-	width:100%;
-	background-color:#000;
-	color:#fff;
-	padding-top:5px;
-}
-
-#email-window .email-contents .junk-mail-banner img{
-	vertical-align:bottom;
-	margin-left:10px;
-}
-
-#email-window .email-contents .junk-mail-banner .not-junk{
-	float:right;
-	background:url(../img/email/not-junk.jpg) no-repeat;
-	width:76px;
-	height:23px;
-	overflow:hidden;
-	margin-right:10px;
-	color:#4C4C4C;
-	padding:6px 0 0 16px;
-}
-#email-window .email-contents .junk-mail-banner .not-junk:hover{
-	background-position: 0px -29px;
-}
-
-#email-window .emails-info{
-	background:url(../img/email/connection.jpg) no-repeat scroll 5px center;
-	width:100%;
-	height:27px;
-}
-
-#email-window .emails-info div{
-	float:right;
-	margin: 4px 20px 0px 0px;
-}
-
-#email-window .emails-info div #details-unread{
-	margin-right:20px;
-}
-
-#email-window.fullsize .buttons{
-	margin-top: 0px;
-}
-
-#email-write{
-    background: url("../img/folder/top-bg.jpg") repeat-x scroll 0 0 #F2F1F0;
-    border-radius: 4px 4px 0 0;
-    box-shadow: 0 0 10px #000000;
-    color: #666666;
-    font-size: 14px;
-    height: 610px;
-    left: 140px;
-    position: absolute;
-    top: 40px;
-    width: 900px;
-    display:none;
-}
-
-#email-write .buttons{
-	margin-top: -40px;
-	background: #3C3B37;
-	width: 100%;
-	height: 42px;
-	margin-bottom: 10px;
-}
-
-#email-write #write-send{
-	padding-left: 31px;
-    padding-top: 9px;
-    margin-left:10px;
-	height:25px;
-	width:38px;
-	color: #DFDBD2;
-	overflow:hidden;
-	background:url(../img/email/write-send.jpg) no-repeat;
-}
-
-#email-write #write-attach{
-	padding-left: 31px;
-    padding-top: 9px;
-	height:25px;
-	width:50px;
-	color: #DFDBD2;
-	overflow:hidden;
-	background:url(../img/email/attach.jpg) no-repeat;
-}
-#email-write #write-attach:hover{
-	background-position: 0px -34px;
-	color:#333;
-}
-
-#email-write #write-send:hover{
-	background-position: 0px -34px;
-	color:#333;
-}
-
-#write-to, #write-from, #write-subject{
-	padding-left:5px;
-	margin-bottom:10px;
-}
-
-#write-to div, #write-from div, #write-subject div{
-	float:left;
-	width:60px;
-	color:#333;
-	padding-top: 5px;
-}
-
-#write-subject input, #write-to input, #write-from input{
-	width:90%;
-}
-
-#write-body textarea{
-	width:894px;
-	height:350px;
-}
-
-#email-write input{
-	height:20px;
-	background-color:#fff;
-	border: 1px solid #ada9a5;
-	-webkit-border-radius:2px 2px 2px 2px;
-	-moz-border-radius:2px 2px 2px 2px;
-	border-radius:2px 2px 2px 2px;
-	padding:2px;
-}
-
-#email-write .loading-bar{
-	background:#e5e3e1;
-	-webkit-border-radius:6px 6px 6px 6px;
-	-moz-border-radius:6px 6px 6px 6px;
-	border-radius:6px 6px 6px 6px;
-	height:14px;
-	width:96px;
-	float:right;
-	margin:7px 20px 0px 0px;
-	border-top: 1px solid #bab6b2;
-	border-bottom: 1px solid #fefefe;
-}
-
-#email-write .loading-bar .progress{
-	-webkit-border-radius:6px 6px 6px 6px;
-	-moz-border-radius:6px 6px 6px 6px;
-	border-radius:6px 6px 6px 6px;
-	height:14px;
-	width:0px;
-	background:#dd4814 ;
-}
-
-#email-write .control{
-    margin-left: 0;
-    padding-bottom: 43px;
-    padding-left: 10px;
-}
diff --git a/templates/tour/css/error.css b/templates/tour/css/error.css
deleted file mode 100644
index 21272b097df..00000000000
--- a/templates/tour/css/error.css
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Error window CSS
- *   author: Anthony Dillon
- */
-
-.error-window{
-	left: 0;
-	width:600px;
-	top: 0;
-	display:none;
-	position: absolute;
-}
-
-.error-window .error-container{
-	padding: 63px 20px 20px 20px;
-	background: url("../img/error/background-download.png") no-repeat 0 -20px;
-	background-color: #efedec;
-	color: #4c4c4c;
-}
-
-.error-window  .control .close{
-	background:url(../img/error/close-button.png) no-repeat;
-}
-
-.error-window h1 {
-	color: #fff;
-	font-size: 24px;
-	font-weight:400;
-}
-
-.error-window  h2 {
-	padding: 10px 0;
-	font-size: 16px;
-	font-weight:400;
-	width:320px;
-	margin-top:50px;
-}
-
-.error-window .download {
-	padding: 10px 20px;
-		-moz-border-radius: 4px 4px 4px 4px;
-		-webkit-border-radius: 4px 4px 4px 4px;
-	border-radius: 4px 4px 4px 4px;
-	display: block;
-	float: right;
-	margin-top:50px;
-	font-size: 14px;
-	text-decoration: none;
-	border: 1px solid #c0b7b0;
-	cursor: pointer;
-	background: url("../img/welcome/background-link-download.png") center center repeat-x;
-	color: #fff;
-}
-
-.error-window .download:active {
-	position: relative;
-	top: 1px;
-}
diff --git a/templates/tour/css/firefox.css b/templates/tour/css/firefox.css
deleted file mode 100644
index ed391eee1d9..00000000000
--- a/templates/tour/css/firefox.css
+++ /dev/null
@@ -1,115 +0,0 @@
-/* 
- *  Firefox CSS 
- *   author: Anthony Dillon
- */
-
-#firefox-window{
-	width:900px;
-	height:600px;
-	top:100px;
-	left:400px;
-	display:none;
-}
-
-#firefox-window .buttons{
-	width:100%;
-	height:42px;
-	margin-top:6px;
-}
-
-#firefox-window .buttons div, #firefox-window  .bottom-buttons div{
-	float:left; 
-}
-
-#firefox-window .buttons .firefox-back{
-	height:36px;
-	width:35px;
-	overflow:hidden;
-	background:url(../img/firefox/backward-button.jpg) no-repeat;
-}
-
-#firefox-window .buttons .firefox-back:hover{
-	background-position: 0px -36px;
-}
-
-#firefox-window .buttons .firefox-forward{
-	height:36px;
-	width:35px;
-	overflow:hidden;
-	background:url(../img/firefox/forward-button.jpg) no-repeat;
-}
-
-#firefox-window .buttons .firefox-forward:hover{
-	background-position: 0px -36px;
-}
-
-#firefox-window .buttons .disabled{
-	background-position: 0px -72px !important;
-}
-
-#firefox-window .buttons input{
-	margin-top:5px;
-	height:20px;
-	background-color:#fff;
-	border: 1px solid #ada9a5;
-	-webkit-border-radius:2px 2px 2px 2px;
-	-moz-border-radius:2px 2px 2px 2px;
-	border-radius:2px 2px 2px 2px;	
-	padding:2px;
-}
-
-#firefox-window .buttons .firefox-url input{
-	width:420px;
-	margin-right:10px;
-	margin-left:10px;
-}
-
-#firefox-window .buttons .firefox-search input{
-	width:200px;
-	background:url(../img/firefox/search_icon.jpg) no-repeat center right;
-	background-color:#fff;
-}
-
-#firefox-window .buttons .firefox-search input.fade-text{
-	color:#666;
-	font-style:italic;
-}
-
-#firefox-window .buttons .inactive{
-	background-position: 0px -72px !important;
-}
-
-#firefox-window .firefox-internet .theIframe{
-	width:100%;
-	position: absolute;
-	left:0px;
-	top: 73px;
-	z-index:7;
-}
-
-#firefox-window .firefox-internet .theIframe iframe{
-	border:0px;
-}
-
-#firefox-window .firefox-internet .web-overlay-tran{
-	z-index:8;
-	width:100%;
-	height:200px;
-	position: absolute;
-	left:0px;
-	top: 73px;
-}
-
-#firefox-window .buttons .firefox-url input.fade-text{
-	color: #666;
-	font-style:italic;
-}
-
-#firefox-window.blurred .firefox-internet .theIframe{
-	display:none;
-}
-
-#firefoxInternet{
-	width:100%;
-	height:100%;
-}
diff --git a/templates/tour/css/folder.css b/templates/tour/css/folder.css
deleted file mode 100644
index 3b0d1932581..00000000000
--- a/templates/tour/css/folder.css
+++ /dev/null
@@ -1,245 +0,0 @@
-/* 
- *  Folder CSS 
- *   author: Anthony Dillon
- */
-
-#folder-window .buttons{
-	width:65px;
-	height:36px;
-	margin-top: 3px;
-	float:right;
-}
-
-#folder-window .bottom-buttons{
-	background:url(../img/folder/buttons-bg.jpg) repeat-x;
-	height:41px;
-	width:100%;
-}
-
-#folder-window .buttons div, #folder-window .bottom-buttons div{
-	float:left; 
-}
-
-#folder-window .folder-contents .bottom-buttons div{
-	color:white;
-	height:23px;
-	margin:2px 0 0 5px;
-	padding:5px;
-	line-height:24px;
-}
-
-#folder-window .folder-contents .bottom-buttons div.selected{
-	font-weight:bold;
-	border:1px solid #2c2c29;
-	background:#353531;
-		-moz-border-radius:4px 4px 4px 4px;
-		-webkit-border-radius:4px 4px 4px 4px;
-	border-radius:4px 4px 4px 4px;
-	background-position: 0 -29px;
-}
-#folder-window .folder-contents .bottom-buttons div img{
-	margin-top: -4px;
-	vertical-align: middle;
-	margin-right: 3px;
-}
-
-#folder-window .folder-contents .bottom-buttons span{
-	color:white;
-}
-
-.folder .folder-list{
-	float:left;
-}
-
-.folder .list{
-	height: 468px;
-	width:146px;
-}
-
-.folder .list p{
-	font-weight:bold;
-	margin:10px 0 0 20px;
-}
-
-.folder .list ul{
-	list-style: none;
-	padding:0px;
-	margin-top:5px;
-}
-
-.folder .list ul li{
-	padding:4px 0 4px 30px;
-	margin-right:5px;
-	vertical-align: middle;
-}
-
-.folder .list ul li.selected{
-	color:white;
-	background:#ed7543;
-}
-
-.folder .folder-contents{
-	float:left;
-}
-
-.folder .contents{
-	background-color:#f1f0ef;
-	height: 434px;
-    overflow: auto;
-    width: 584px;
-}
-
-.folder .selected-details{
-	min-width:25px;
-	height:19px;
-	float:right;
-	background:#fcfcbd;
-	margin-top:-21px;
-	border:1px solid #dbdb5a;
-	padding: 0 4px;
-	display:none;
-}
-
-.folder .file-details{
-	float:left;
-	height:20px;
-}
-
-#folder-window .buttons .folder-back{
-	width:30px;
-	height:37px;
-	overflow:hidden;
-	background: url(../img/folder/back.jpg) no-repeat 0px 0px;
-}
-
-#folder-window .buttons .folder-forward{
-	width:30px;
-	height:37px;
-	overflow:hidden;
-	background: url(../img/folder/forward.jpg) no-repeat 0px 0px;
-}
-
-#folder-window .buttons .folder-forward:hover,
-#folder-window .buttons .folder-back:hover {
-	background-position: 0px -39px;
-}
-#folder-window .buttons .disabled{
- 	background-position: 0px -78px !important;
- }
-#folder-window .buttons .folder-icon-view{
-	margin:5px 0px 0px 5px;
-}
-
-#folder-window.window{
-	background-color:#e6e4e3;
-}
-
- 
-  .folder .folder-contents .contents .file.display-icon p{
- 	width: 53px;
- 	overflow:hidden;
- 	margin:0 auto;
- 	padding:2px;
- 	-moz-border-radius: 4px 4px 4px 4px;
-  	-webkit-border-radius: 4px 4px 4px 4px;
-  	border-radius: 4px 4px 4px 4px;
-  }
-
-  .folder .buttons .folder-search{
-	width:36px;
-	height:38px;
-	overflow:hidden;
-	background: url(../img/folder/search.jpg) no-repeat 0px 0px;
-}
-.folder .buttons .folder-search:hover{
-	background-position: 0px -38px;
- }
- 
-.folder .folder-contents .contents .display-icon{
- 	width:130px;
- 	height:80px;
- 	float:left;
- 	text-align: center;
- 	margin:10px;
- 	line-height: 12px;
- }
- 
-.file-folder.display-icon p{
- 	background:url(../img/folder/folder-icon.png) no-repeat 0px 0px;
- 	height:38px;
- 	width:47px;
- 	overflow:hidden;
- 	margin:0 auto;
- }
- .display-compact{
- 	float:none;
- 	height: 28px;
- 	margin-top:5px;
- 	width:150px;
- }
- 
-.display-compact p{
- 	height:22px;
- 	width:24px;
- 	overflow:hidden;
- 	float:left;
- 	margin:0px 5px;
- 	
- }
-   .file-folder.display-compact p{
-   		background:url(../img/folder/folder-icon-list.png) no-repeat 0px 0px;
-   }
-    .file.display-compact p{
-   		background:url(../img/folder/file-icon-list.png) no-repeat 0px 0px;
-   }
- 
-.folder .folder-contents .contents .file p.border{
-   	border: 1px solid #bbbeb7;
-}
-
- 
-.folder .folder-contents .contents div h1{
- 	color:transparent;
- 	display:none;
- }
- 
-  .folder .folder-contents .contents  .display-icon span{
-  	-moz-border-radius: 4px 4px 4px 4px;
-  	-webkit-border-radius: 4px 4px 4px 4px;
-  	border-radius: 4px 4px 4px 4px;
-  	line-height: 22px;
-  }
-  
-  .folder .folder-contents .contents .display-icon.orange-overlay{
-  	background:url(../img/folder/orange-overlay.png);
-  	display:block;
-  	position:absolute;
-  	height:20px;
-  	width:37px;
-  	top:0px;
-  	left:0px;
-  }
-  
-  .contents .display-icon.over p{
-  	background-position: 0px -39px;
-  }
-  
-   .display-icon.selected p{
-   		background-position: 0px -78px !important;
-   }
-   
-  .contents .display-compact.over p{
-  	background-position: 0px -38px;
-  }
-  
-   .display-compact.selected p{
-   		background-position: 0px -44px !important;
-   }
-  
- .selected span{
- 	padding:2px 4px;
-  	background-color:#f08357;
-  	color:white;
-  }
-  
-
diff --git a/templates/tour/css/iefix.css b/templates/tour/css/iefix.css
deleted file mode 100644
index 787433dab92..00000000000
--- a/templates/tour/css/iefix.css
+++ /dev/null
@@ -1,18 +0,0 @@
-.window{
-	border-radius:4px;
-	behavior: url(pie/PIE.htc);
-}
-
-#tooltip{
-	background: url(../img/black-bg-40.png);
-	behavior: url(pie/PIE.htc);
-	box-shadow: none;
-}
-
-#tooltip .arrow-right{
-	margin-left: -15px;
-}
-
-#welcome-screen, .dropShadow, #shotwell .container .images div{
-	behavior: url(pie/PIE.htc);
-}
diff --git a/templates/tour/css/libre.css b/templates/tour/css/libre.css
deleted file mode 100644
index 609e1df44bf..00000000000
--- a/templates/tour/css/libre.css
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *  LIbreOffice CSS
- *   author: Anthony Dillon
- */
-
-#libreoffice-calc-window{
-	left:431px;
-	top:88px;
-	display:none;
-}
-
-#libreoffice-calc-window .content{
-	background:url(../img/librecalc.jpg) no-repeat;
-	width:805px;
-	height:569px;
-	margin-top:5px;
-}
-
-#libreoffice-calc-window  .control .close{
-	background:url(../img/error/close-button.png) no-repeat;
-}
-
-#libreoffice-calc-window .control .close:hover {
-    background-position: 0 -19px;
-}
-
-#libreoffice-writer-window{
-	left:431px;
-	top:88px;
-	display:none;
-}
-
-#libreoffice-writer-window .content{
-	background:url(../img/librewriter.jpg) no-repeat;
-	width:806px;
-	height:552px;
-	margin-top:5px;
-}
-
-#libreoffice-writer-window  .control .close{
-	background:url(../img/error/close-button.png) no-repeat;
-}
-
-#libreoffice-writer-window .control .close:hover {
-    background-position: 0 -19px;
-}
-
-#libreoffice-writer-window .content span, 
-#libreoffice-calc-window .content span, 
-#libreoffice-impress-window .content span{
-	color: #B3B4A6;
-    font-size: 15px;
-    margin-right: 13px;
-    position: relative;
-    top: 5px;
-    left:10px;
-}
-
-#libreoffice-impress-window{
-	left:431px;
-	top:88px;
-	display:none;
-}
-
-#libreoffice-impress-window .content{
-	background:url(../img/libreimpress.jpg) no-repeat;
-	width:802px;
-	height:551px;
-	margin-top:5px;
-}
-
-#libreoffice-impress-window  .control .close{
-	background:url(../img/error/close-button.png) no-repeat;
-}
-
-#libreoffice-impress-window .control .close:hover {
-    background-position: 0 -19px;
-}
\ No newline at end of file
diff --git a/templates/tour/css/loader.css b/templates/tour/css/loader.css
deleted file mode 100644
index e671b2eb9fd..00000000000
--- a/templates/tour/css/loader.css
+++ /dev/null
@@ -1,54 +0,0 @@
-/* 
- *  Loader CSS
- *  author: Anthony Dillon
- */
-
-#loader{
-	position:absolute;
-	top:0px;
-	left:0px;
-	width:100%;
-	height:100%;
-	z-index:1001;
-	background-color:  #210819;
-}
-
-#loader #dot-container{
-	position: absolute;
-	background:url(../img/loader/ubuntu-loader.gif) no-repeat;
-	width:300px;
-	height:169px;
-	top:40%;
-	left:40%;
-}
-
-#loader .dot{
-	background-color:#FFFFFF;
-	width:5px;
-	height:5px;
-		-moz-border-radius:5px 5px 5px 5px;
-		-webkit-border-radius:5px 5px 5px 5px;
-	border-radius:5px 5px 5px 5px;	
-		-moz-box-shadow: 0 0 1px 1px #FFFFFF;
-		-webkit-box-shadow: 0 0 1px 1px #FFFFFF;
-	box-shadow: 0 0 1px 1px #FFFFFF;
-	float:left;
-	margin-left:20px;
-	margin-top:55px;
-}
-
-#loader .dot.active{
-	background-color:#dd4814;
-		-moz-box-shadow: 0 0 1px 1px #dd4814;
-		-webkit-box-shadow: 0 0 1px 1px #dd4814;
-	box-shadow: 0 0 1px 1px #dd4814;
-}
-
-#loader noscript p{
-	margin-top:-170px;
-	margin-left:-30px;
-	border:1px solid #fff;
-	width:340px;
-	padding:20px;
-}
-
diff --git a/templates/tour/css/movieplayer.css b/templates/tour/css/movieplayer.css
deleted file mode 100644
index 914b26a7a99..00000000000
--- a/templates/tour/css/movieplayer.css
+++ /dev/null
@@ -1,120 +0,0 @@
-/* 
- *  Movie Player CSS
- *   author: Anthony Dillon
- */
-
-#movieplayer{
-	width:700px;
-	left: 317px; 
-	top: 57px;
-	font-size:15px;
-	display:none;
-}
-
-#movieplayer .container{
-	background-color: #000000;
-	height:100%;
-}
-
-#movieplayer .container .video{
-	background:url(../img/movieplayer/splash.jpg) no-repeat scroll center center #000;
-	width:100%;
-	height: 494px;
-	margin-top: 5px;
-}
-
-#movieplayer .container .tools{
-	height:80px;
-	width:100%;
-}
-
-#movieplayer .container .tools .controlbuttons{
-	margin: 5px 10px;
-}
-
-#movieplayer .container .tools .controlbuttons .right{
-	float:right;
-}
-
-#movieplayer .container .tools .controlbuttons .left{
-	float:left;
-}
-
-#movieplayer .container .tools .controlbuttons .left div{
-	height:36px;
-	width:36px;
-	overflow:hidden;
-	float:left;
-}
-
-#movieplayer .container .tools .controlbuttons .left .rewind{
-	background:url(../img/movieplayer/rewind.jpg) no-repeat;
-}
-
-#movieplayer .container .tools .controlbuttons .left .play{
-	background:url(../img/movieplayer/play.jpg) no-repeat;
-}
-
-#movieplayer .container .tools .controlbuttons .left .forward{
-	background:url(../img/movieplayer/forward.jpg) no-repeat;
-}
-
-#movieplayer .container .tools .controlbuttons .left .fullscreen{
-	background:url(../img/movieplayer/fullscreen.jpg) no-repeat;
-}
-
-#movieplayer .container .tools .controlbuttons .right .volume{
-	height:36px;
-	width:36px;
-	overflow:hidden;
-	background:url(../img/movieplayer/volume.jpg) no-repeat;
-	float:right;
-}
-
-#movieplayer .container .tools .controlbuttons .active:hover{
-	background-position: 0px -36px;
-}
-
-
-#movieplayer .container .tools .time{
-	height: 20px;
-	margin:10px;
-}
-
-#movieplayer.fullsize .control{
-	margin-top: 0px;
-}
-
-#movieplayer .container .tools .time p{
-	float:left;
-	margin: 9px 0px;
-}
-
-#movieplayer .container .tools .time .timeslider{
-	float:left;
-}
-
-#movieplayer .container .tools .time .slider{
-	width:438px;
-	float:left;
-	margin-top:15px;
-}
-
-
-#movieplayer .container .tools .time .slider-active{
-	-moz-border-radius:5px 5px 5px 5px;
-	-webkit-border-radius:5px 5px 5px 5px;
-	border-radius:5px 5px 5px 5px;
-	background:#dd4814;
-	height: 3px;
-    margin-left: 15px;
-    margin-top: 17px;
-    position: relative;
-   width: 53px;
-   z-index:1;
-}
-
-#movieplayer .container .tools .time .slider .ui-slider-handle{
-	z-index:2;
-}
-
diff --git a/templates/tour/css/notification.css b/templates/tour/css/notification.css
deleted file mode 100644
index e425d76e214..00000000000
--- a/templates/tour/css/notification.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Notification CSS
- *   author: Anthony Dillon
- */
-
-.notification{
-	position:absolute;
-	width:350px;
-	height:72px;
-	background:#383336;
-	-moz-border-radius:4px 4px 4px 4px;
-	-webkit-border-radius:4px 4px 4px 4px;
-	border-radius:4px 4px 4px 4px;
-	-moz-box-shadow: 0px 0px 5px #000;
-	-webkit-box-shadow: 0px 0px 5px #000;
-	box-shadow: 0px 0px 5px #000; 
-	overflow:hidden;
-	top:100px;
-	right:5px;
-	display:none;
-	z-index:10;
-}
-
-.notification img{
-	float:left;
-	margin:15px 15px 10px 10px;
-}
-
-.notification p{
-	margin:0px;
-}
-
-.notification .title{
-	font-weight: bold;
-	margin-top:10px;
-	font-size:14px;
-}
-
-.notification .description{
-	font-size:13px;
-}
-
-
diff --git a/templates/tour/css/shotwell.css b/templates/tour/css/shotwell.css
deleted file mode 100644
index 3a02847c69c..00000000000
--- a/templates/tour/css/shotwell.css
+++ /dev/null
@@ -1,208 +0,0 @@
-/* 
- *  Shotwell CSS
- *   author: Anthony Dillon
- */
-
-#shotwell{
-	width:800px;
-	height:550px;
-	top:200px;
-	left:600px;
-	font-size:15px;
-	display:none;
-}
-
-#shotwell .sidebar{
-	float:left;
-	width:215px;
-	margin-right:10px;
-	margin-top:5px;
-}
-
-#shotwell .nav{
-	height:379px;
-	padding:1px;
-	margin-bottom:6px;
-	width:100%;
-	border:1px solid #bdbab7;
-}
-
-#shotwell .nav ul{
-	list-style: none;
-	padding:5px 0px 5px 10px;
-	margin:0px;
-	background:#dfdddb;
-}
-
-#shotwell .nav .library{
-	background:url(../img/shotwell/library-icon.png) no-repeat scroll 0px 2px;
-	padding-left:20px;
-	
-}
-
-#shotwell .nav ul.selected{
-	background: #F07746;
-    color: white;
-}
-
-#shotwell .details{
-	border:1px solid #bdbab7;
-	height:93px;
-	width:100%;
-	font-weight:bold;
-	padding: 1px;
-	padding-top:35px;
-}
-#shotwell .details div{
-	margin-bottom:5px;
-}
-
-#shotwell .details span{
-	font-weight:normal;
-}
-
-#shotwell .container {
-	margin-top:5px;
-	float: left;
-	width:572px;
-	border-left:1px solid #bdbab7;
-	padding:1px;
-}
-
-#shotwell .container .images{
-	background:#434343;
-	width:100%;
-	height: 478px;
-	overflow:auto;
-}
-
-#shotwell .container .singleImage{
-	overflow:hidden;
-	background:#000;
-}
-
-#shotwell .container .images div{
-	text-align:center;
-	display:inline-block;
-	vertical-align:top;
-	width:185px;
-}
-
-#shotwell .container .images div.large{
-	width:100%;
-}
-
-#shotwell .container .images div.large img{
-	width:90%;
-	border:0px;
-	opacity: 1;
-	margin-top:20px;
-}
-
-#shotwell .container .images img{
-	width:158px;
-	border:1px solid #aaaaaa;
-	opacity: 0.8;
-	-moz-border-radius:2px 2px 2px 2px;
-	-webkit-border-radius:2px 2px 2px 2px;
-	border-radius:2px 2px 2px 2px;
-	margin:6px;
-}
-
-#shotwell .container .images img.selected{
-	border: 3px solid #22ddff;
-	margin:4px;
-}
-
-#shotwell .container .images img:hover{
-	opacity: 1;
-}
-
-#shotwell .container .tools{
-	height:40px;
-	width:100%;
-}
-
-#shotwell .container .tools .slider-container{
-	width:250px;
-	float:right;
-	height: 20px;
-}
-
-#shotwell .container .tools .slider-container .small-icon{
-	width:14px;
-	height:25px;
-	background:url(../img/shotwell/slider-small.jpg) no-repeat scroll 0px 10px;
-	float:left;
-}
-
-#shotwell .container .tools .slider-container .slider{
-	width:195px;
-	height:40px;
-	float:left;
-	margin-top:15px;
-}
-
-#shotwell .container .tools .slider-container .ui-slider {
-	background:url("../img/background-slider.png") no-repeat scroll 0 0px transparent;
-}
-
-
-#shotwell .container .tools .slider-container .slider-active{
-	-moz-border-radius:5px 5px 5px 5px;
-	-webkit-border-radius:5px 5px 5px 5px;
-	border-radius:5px 5px 5px 5px;
-	background:#dd4814;
-	height: 3px;
-    margin-left: 15px;
-    margin-top: 17px;
-    position: relative;
-   width: 53px;
-   z-index:1;
-}
-
-#shotwell .container .tools .slider-container .slider .ui-slider-handle{
-	z-index:2;
-}
-
-#shotwell .container .tools .slider-container .large-icon{
-	width:14px;
-	height:40px;
-	margin-left: 211px;
-    margin-top: -54px;
-	background:url(../img/shotwell/slider-large.jpg) no-repeat scroll 0px 10px;
-	float:left;
-}
-
-#shotwell .container .tools .jump-image{
-	float:right;
-	margin:2px 5px;
-}
-
-#shotwell .container .tools .jump-image .prev{
-	height:36px;
-	width:35px;
-	overflow:hidden;
-	background:url(../img/firefox/backward-button.jpg) no-repeat;
-	float:right;
-}
-
-#shotwell  .container .tools .jump-image .prev:hover{
-	background-position: 0px -36px;
-}
-
-#shotwell .container .tools .jump-image .next{
-	height:36px;
-	width:35px;
-	overflow:hidden;
-	background:url(../img/firefox/forward-button.jpg) no-repeat;
-	float:right;
-}
-
-#shotwell .container .tools .jump-image .next:hover{
-	background-position: 0px -36px;
-}
-
-#shotwell .container .tools .jump-image .disabled{
-	background-position: 0px -72px !important;
-}
\ No newline at end of file
diff --git a/templates/tour/css/shutdown.css b/templates/tour/css/shutdown.css
deleted file mode 100644
index 958069df682..00000000000
--- a/templates/tour/css/shutdown.css
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  Shut Down CSS
- *   author: Anthony Dillon
- */
-
-#shutdown-window{
-	width:349px;
-	min-height:155px;
-	top:100px;
-	left:400px;
-	display:none;
-}
-
-
-#shutdown-window  .control .close{
-	background:url(../img/error/close-button.png) no-repeat;
-}
-
-#shutdown-window  .control .close:hover {
-    background-position: 0 -19px;
-}
-
-#shutdown-window .content img{
-	float:left;
-	margin:20px 20px 0px 10px;
-}
-
-#shutdown-window .content .message p{
-	margin-top:20px;
-	font-size: 15px;
-}
-
-#shutdown-window .content .message{
-	float:left;
-	width:275px;
-	height:100%;
-}
-
-#shutdown-window .content .shutdown-buttons{
-	margin-right:7px;
-	clear:both;
-}
-
-#shutdown-window .content .shutdown-buttons div{
-	text-align:center;
-	float:right;
-	width:85px;
-	height:23px;
-	-moz-border-radius:4px 4px 4px 4px;
-	-webkit-border-radius:4px 4px 4px 4px;
-	border-radius:4px 4px 4px 4px;
-	border:1px solid #a6a6a6;
-	margin-right:8px;
-	padding-top:4px;
-	margin-top:20px;
-	background:url(../img/error/button-fade.png) repeat-x scroll 0 0 #dfdfdf;
-}
-
-#shutdown-window .content .shutdown-buttons div:hover{
-	background-position:0px -29px;
-}
-
-
-#shutdown-window .content .shutdown-buttons div.highlight{
-	background-color:#f8ab8b;
-	text-shadow: 0px 1px #fff;
-}
-
-#shutdown-window  .content .shutdown-buttons div.highlight:hover{
-	text-shadow: none;
-	background-position:0px 0px;
-}
-
diff --git a/templates/tour/css/software-centre.css b/templates/tour/css/software-centre.css
deleted file mode 100644
index c5fd6e4b360..00000000000
--- a/templates/tour/css/software-centre.css
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- *  Software Centre CSS
- *  author: Anthony Dillon
- */
-
-#software-centre{
-	width:800px;
-	height:555px;
-	top:200px;
-	left:600px;
-	display:none;
-}
-
-#software-centre .top-panel{
-	width:100%;
-	height:65px;
-	background:url(../img/software-centre/top-bg.jpg) repeat-x;
-	color: #DFDBD2;
-	text-align:center;
-}
-
-#software-centre .top-panel div{
-	float:left;
-}
-
-#software-centre .top-panel .back{
-	width:37px;
-	margin-top:15px;
-	margin-left:20px;
-	height:32px;
-	background:url(../img/software-centre/back.jpg) no-repeat scroll center center;
-}
-
-#software-centre .top-panel .forward{
-	width:37px;
-	height:32px;
-	margin-top:15px;
-	background:url(../img/software-centre/forward.jpg) no-repeat;
-}
-
-#software-centre .top-panel .forward:hover{
-	background-position: 0px -32px;
-}
-
-#software-centre .top-panel .back:hover{
-	background-position: 0px -32px;
-}
-
-#software-centre .top-panel .disabled{
-	background-position: 0px -64px !important;
-}
-
-#software-centre .top-panel img{
-	display:block;
-	margin:0px auto;
-}
-
-#software-centre .container{
-	height:460px;
-	overflow-y:auto;
-	overflow-x:hidden;
-}
-
-#software-centre .top-panel .all-software{
-	padding-top:10px;
-	width:98px;
-	height:54px;
-	margin-left:15px;
-	border-right:1px solid #373631;
-}
-
-#software-centre .top-panel .installed{
-	padding-top:10px;
-	width:98px;
-	height:54px;
-	color:#666;
-	margin-right:10px;
-	border-right:1px solid #373631;
-}
-
-#software-centre .top-panel .history{
-	padding-top:10px;
-	width:98px;
-	height:54px;
-	color:#666;
-	margin-right:10px;
-}
-
-#software-centre .top-panel .selected{
-	background:url(../img/software-centre/top-bg-selected.jpg) repeat-x;
-}
-
-#software-centre .header-image{
-	width:100%;
-	background: url("../img/software-centre/header.jpg") no-repeat scroll 0 0 #FFFFFF;
-    height: 188px;
-    	-moz-box-shadow: 0 1px 2px #888888;
-		-webkit-box-shadow: 0 1px 2px #888888;
-	box-shadow: 0 1px 2px #888888;
-}
-
-#software-centre .header-image span{
-	display:block;
-	position:relative;
-	left:241px;
-	top:63px;
-	color:#dd4814;
-	font-size:28px;
-}
-
-#software-centre .header-image .header-title{
-	font-size:48px;
-	font-weight:bold;
-	margin-bottom:7px;
-}
-
-#software-centre .navigation{
-	float:left;
-	width:144px;
-	background:#fff;
-		-moz-border-radius:10px 10px 10px 10px;
-		-webkit-border-radius:10px 10px 10px 10px;
-	border-radius:10px 10px 10px 10px;
-	border:1px solid #a9a5a7;
-	margin-left:15px;
-	margin-top:10px;
-	font-size: 12px;
-	height:348px;
-	margin-bottom:10px;
-		-moz-box-shadow: 0 2px 3px #888888;
-		-webkit-box-shadow: 0 2px 3px #888888;
-	box-shadow: 0 2px 3px #888888;
-}
-
-#software-centre .navigation ul{
-	padding-left:10px;
-	margin-top:5px;
-	list-style: none;
-}
-
-#software-centre .navigation ul li{
-	margin-bottom:10px;
-	color:#999;
-}
-
-#software-centre .whats-new{
-	float:left;
-	width: 602px;
-		-moz-border-radius:10px 10px 10px 10px;
-		-webkit-border-radius:10px 10px 10px 10px;
-	border-radius:10px 10px 10px 10px;
-	border:1px solid #a9a5a7;
-	font-size: 12px;
-	padding-bottom:5px;
-	margin:10px 0 0 10px;
-		-moz-box-shadow: 0 2px 3px #888888;
-		-webkit-box-shadow: 0 2px 3px #888888;
-	box-shadow: 0 2px 3px #888888;
-}
-
-#software-centre .whats-new h2{
-	width:100%;
-	padding:5px 0 0 5px;
-	height:26px;
-		-moz-border-radius:10px 10px 10px 10px;
-		-webkit-border-radius:10px 10px 10px 10px;
-	border-radius:10px 10px 10px 10px;
-	font-size: 14px;
-	overflow:hidden;
-	margin:0px;
-}
-
-#software-centre .whats-new .app-container div{
-	float:left;
-	height: 65px;
-	border-top:1px solid #e7e4e6;
-	border-left:1px solid #e7e4e6;
-	padding-left: 80px;
-    width: 119px;
-}
-
-#software-centre .whats-new .app-container div:active{
-	position:relative;
-	top:1px;
-	left:1px;
-}
-#software-centre .whats-new .app-container div h3{
-	margin:0px;
-	white-space:nowrap;
-	overflow:hidden;
-	margin-top:3px;
-}
-#software-centre .whats-new .app-container div p{
-	margin-top:5px;
-	margin-bottom:5px;
-}
-
-#software-centre .whats-new .app-container div p.cost{
-	color:#999;
-}
-
-#software-centre .whats-new .app-container .chromium{
-	background:url(../img/software-centre/logo-chromium.png) no-repeat scroll 10px 8px #ffffff;
-}
-#software-centre .whats-new .app-container .beep{
-	background:url(../img/software-centre/logo-beep.png) no-repeat scroll 10px 8px #ffffff;
-}
-#software-centre .whats-new .app-container .inkscape{
-	background:url(../img/software-centre/logo-inkscape.png) no-repeat scroll 10px 8px #ffffff;
-}
-#software-centre .whats-new .app-container .worldofgoo{
-	background:url(../img/software-centre/logo-world-of-goo.png) no-repeat scroll 10px 8px #ffffff;
-}
-#software-centre .whats-new .app-container .blender{
-	background:url(../img/software-centre/logo-blender.png) no-repeat scroll 10px 8px #ffffff;
-}
-#software-centre .whats-new .app-container .braid{
-	background:url(../img/software-centre/logo-braid.png) no-repeat scroll 10px 8px #ffffff;
-}
-
-#software-centre .whats-new .app-container .visolate{
-	background:url(../img/software-centre/visolate.png) no-repeat scroll 10px 8px #ffffff;
-}
-#software-centre .whats-new .app-container .okular{
-	background:url(../img/software-centre/okular.png) no-repeat scroll 10px 8px #ffffff;
-}
-#software-centre .whats-new .app-container .netSurf{
-	background:url(../img/software-centre/netsurf.png) no-repeat scroll 10px 8px #ffffff;
-}
-#software-centre .whats-new .app-container .vitables{
-	background:url(../img/software-centre/vitables.png) no-repeat scroll 10px 8px #ffffff;
-}
-#software-centre .whats-new .app-container .steadyflow{
-	background:url(../img/software-centre/steadyflow.png) no-repeat scroll 10px 8px #ffffff;
-}
-#software-centre .whats-new .app-container .openjdk{
-	background:url(../img/software-centre/openjdk.png) no-repeat scroll 10px 8px #ffffff;
-}
-
-#software-centre .detailed{
-	display:none;
-}
-
-#software-centre .detailed img.app-image{
-	float:left;
-	padding:0px 5px;
-}	
-
-#software-centre .detailed .title{
-	height:110px;
-	margin:0px 10px;
-}
-
-#software-centre .detailed .title h1{
-	margin-bottom:5px;
-}
-
-#software-centre .detailed .title p{
-	margin:0px;
-}
-
-#software-centre .detailed .title .rating{
-	color:#999999;
-	margin-top:10px;
-}
-#software-centre .detailed .title .rating img{
-	vertical-align:top;
-}
-
-#software-centre .detailed .price{
-	margin:0px 10px 20px 10px;
-	background:#f7f5f7;
-	border-top:1px dotted #999;
-	border-bottom:1px dotted #999;
-	padding: 10px 0px;
-}
-
-#software-centre .detailed .price .theprice{
-	font-weight:bold;
-}
-
-#software-centre .detailed .price .theprice.installed{
-	background:url('../img/software-centre/install-tick.png') no-repeat;
-	padding-left:30px;
-	padding-bottom: 10px;
-	padding-top:3px;
-}
-
-#software-centre .detailed .description{
-	margin:0px 10px;
-}
-
-#software-centre .detailed .description-container{
-	border-bottom:1px dotted #999;
-}
-
-#software-centre .detailed .description-image{
-	float:right;
-	padding:4px;
-	margin:10px;
-		-moz-border-radius:2px 2px 2px 2px;
-		-webkit-border-radius:2px 2px 2px 2px;
-	border-radius:2px 2px 2px 2px;
-	border:1px solid #b4b2b3;
-}
-
-#software-centre .detailed .button{
-	float:right;
-	margin-right:20px;
-	background:url(../img/software-centre/install-button.jpg) repeat-x;
-	padding:3px;
-	color:#666;
-		-moz-border-radius:2px;
-		-webkit-border-radius:2px;
-	border-radius:2px;
-	border:1px solid #b9b9b9;
-	margin-top:-3px;
-}
-
-#software-centre .detailed .button:hover{
-	background:url(../img/software-centre/install-button-over.jpg) repeat-x;
-}
-
-#software-centre .loading-bar{
-	background:#e5e3e1;
-	-webkit-border-radius:6px 6px 6px 6px;
-	-moz-border-radius:6px 6px 6px 6px;
-	border-radius:6px 6px 6px 6px;
-	height:20px;
-	width:150px;
-	float:right;
-	border-top: 1px solid #bab6b2;
-	border-bottom: 1px solid #fefefe;
-}
-
-#software-centre .loading-bar .progress{
-	-webkit-border-radius:6px 6px 6px 6px;
-	-moz-border-radius:6px 6px 6px 6px;
-	border-radius:6px 6px 6px 6px;
-	height:20px;
-	width:0px;
-	background:#dd4814 ;
-}
diff --git a/templates/tour/css/systemoverlay.css b/templates/tour/css/systemoverlay.css
deleted file mode 100644
index 1314c99463b..00000000000
--- a/templates/tour/css/systemoverlay.css
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
-* System Overlay CSS
-* author: Anthony Dillon
-*/
-
-#systemOverlay{
-	width:100%;
-	height:100%;
-	position: absolute;
-	/*background:url(../img/dash-bg-60.png);*/
-	background-color:rgba(60, 25, 59, 0.5);
-	top:0px;
-	left:0px;
-	z-index:12;
-	display:none;
-	font-size:17px;
-	color:white;
-}
-
-#systemOverlay input{
-	background:url(../img/overlay/search-logo.png) no-repeat 10px center;
-	position: relative;
-	width: 88%;
-	height:40px;
-	left:90px;
-	top:30px;
-	color:#eee;
-	font-style:italic;
-	padding:0px 50px;
-	font-size:18px;
-		-moz-border-radius:4px 4px 4px 4px;
-		-webkit-border-radius:4px 4px 4px 4px;
-	border-radius:4px 4px 4px 4px;
-	border:1px solid #fff;
-	background-color:rgba(0,0,0,0.2);
-	outline-style:none;
-}
-
-#systemOverlay input:active{
-	
-}
-
-#systemOverlay #shortcuts{
-	position: absolute;
-	left:100px;
-	top:110px;
-}
-
-#systemOverlay #shortcuts:hover{
-	background-position: 0px -17px;
-}
-#systemOverlay img{
-	vertical-align: text-top;
-	margin-right: 8px;
-}
-#systemOverlay #shortcuts img{
-	vertical-align: middle;
-	margin-right:15px;
-}
-
-#systemOverlay #shortcuts .shortcut-arrow{
-	width:13px;
-	height:17px;
-	overflow:hidden;
-	background:url(../img/overlay/shoutcurts-down.png) no-repeat;
-	display: inline-block;
-	margin:0px 0px 0px 15px;
-}
-
-#systemOverlay .app-container{
-	display:none;
-	position:absolute;
-	left:110px;
-	top:100px;
-	width:91%;
-}
-
-#systemOverlay #overlayContents{
-	margin-top:10px;
-}
-
-#systemOverlay #overlayContents .bottom{
-	margin-bottom:40px;
-} 
-
-#systemOverlay .app-container .app-list{
-	width:100%;
-	height:110px;
-	margin:20px;
-	overflow:hidden;
-}
-
-#systemOverlay .app-container .app-list div{
-	width:200px;
-	height:120px;
-	float:left;
-	text-align:center;
-}
-
-#systemOverlay .app-container .app-list div img{
-	padding:20px;
-	height:46px;
-}
-
-#systemOverlay .app-container .app-list div img.hover{
-	background-color:rgba(255,255,255,0.3);
-	-moz-border-radius:4px 4px 4px 4px;
-	-webkit-border-radius:4px 4px 4px 4px;
-	border-radius:4px 4px 4px 4px;
-}
-
-#systemOverlay .app-container .app-list div p{
-	font-size:14px;
-	margin-top: 0px;
-}
-
-#systemOverlay #shortcuts .hover{
-	background-position: 0px -17px !important;
-}
-
-#systemOverlay #shortcuts .closed{
-	background:url(../img/overlay/shoutcurts-right.png) no-repeat;
-}
-
-#systemOverlay #shortcuts #shortcut-contents{
-	width:870px;
-	position: absolute;
-	top:50px;
-}
-#systemOverlay #shortcuts #shortcut-contents .dashClear{
-	clear:both;
-	height:0px;
-	float:none;
-}
-
-#systemOverlay #shortcuts #shortcut-contents div div{
-	height:104px;
-	margin-bottom: 12px;
-	margin-left:0px;
-    width: 100%;
-}
-
-#systemOverlay #shortcuts #shortcut-contents div div.hover{
-	background-position: center -104px !important;
-}
-
-#systemOverlay #shortcuts #shortcut-contents #browse-the-web div{
-	background:url(../img/overlay/browse-the-web.png) no-repeat scroll center 0 transparent;
-}
-#systemOverlay #shortcuts #shortcut-contents #view-photos div{
-	background:url(../img/overlay/view-photos.png) no-repeat scroll center 0 transparent;
-}
-#systemOverlay #shortcuts #shortcut-contents #check-email div{
-	background:url(../img/overlay/check-email.png) no-repeat scroll center 0 transparent;
-}
-#systemOverlay #shortcuts #shortcut-contents #listen-to-music div{
-	background:url(../img/overlay/listen-to-music.png) no-repeat scroll center 0 transparent;
-}
-#systemOverlay #shortcuts #shortcut-contents #media-apps div{
-	background:url(../img/overlay/media-apps.png) no-repeat scroll center 0 transparent;
-}
-#systemOverlay #shortcuts #shortcut-contents #internet-apps div{
-	background:url(../img/overlay/internet-apps.png) no-repeat scroll center 0 transparent;
-}
-#systemOverlay #shortcuts #shortcut-contents #more-apps div{
-	background:url(../img/overlay/more-apps.png) no-repeat scroll center 0 transparent;
-}
-#systemOverlay #shortcuts #shortcut-contents #find-apps div{
-	background:url(../img/overlay/find-files.png) no-repeat scroll center 0 transparent;
-}
-#systemOverlay #shortcuts #shortcut-contents div {
-	margin-left:115px;
-	float:left;
-	text-align:center;
-	margin-bottom:70px;
-	width: 130px;
-}
-#systemOverlay #shortcuts #shortcut-contents div span{
-	display:block;
-	height: 40px;
-}
-
-#systemOverlay #shortcuts #shortcut-contents div.first{
-	margin-left:0px;
-}
-
-#systemOverlay #dash-bottom-bar{
-	width:100%;
-	height:44px;
-	position: absolute;
-	background:url(../img/black-bg-30.png);
-	background-color:rgba(0,0,0,0.3);
-	bottom:0px;
-}
-
-#systemOverlay #dash-bottom-bar .bottom-wrapper div{
-	width:60px;
-	height:44px;
-	float:left;
-}
-#systemOverlay #dash-bottom-bar .bottom-wrapper div.last{
-	margin-right:0px;
-}
-
-#systemOverlay #dash-bottom-bar .bottom-wrapper{
-	position: absolute;
-}
-
-#systemOverlay #dash-bottom-bar .home-icon{
-	background:url(../img/dash/dash-home.png) no-repeat scroll 0px -44px;
-}
-#systemOverlay #dash-bottom-bar .applications-icon{
-	background:url(../img/dash/dash-applications.png) no-repeat scroll 0px -44px;
-}
-#systemOverlay #dash-bottom-bar .music-icon{
-	background:url(../img/dash/dash-music.png) no-repeat scroll 0px -44px;
-}
-#systemOverlay #dash-bottom-bar .files-icon{
-	background:url(../img/dash/dash-files.png) no-repeat scroll 0px -44px;
-}
-#systemOverlay #dash-bottom-bar .video-icon{
-	background:url(../img/dash/dash-video.png) no-repeat scroll 0px -44px;
-}
-
-#systemOverlay #dash-bottom-bar .bottom-wrapper div:hover{
-	background-position: 0px -88px;
-}
-#systemOverlay #dash-bottom-bar div.active,
-#systemOverlay #dash-bottom-bar div.active:hover{
-	background-position: 0px 0px;
-}
-
-
diff --git a/templates/tour/css/tourguide.css b/templates/tour/css/tourguide.css
deleted file mode 100644
index 622bbbfa003..00000000000
--- a/templates/tour/css/tourguide.css
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-*  Tour System CSS
-*   author: Anthony Dillon
-*/
-
-#tour-guide{
-	position:absolute;
-	bottom:0px;
-	left:0px;
-	width:100%;
-	height:50px;
-	background-color:#111;
-	z-index:100;
-}
-
-#tour-guide .guide-container{ 
-	width:90%;
-}
-
-#tour-guide .next-button{
-	position: relative;
-    width: 50px;
-    z-index: 2;
-	height:50px;
-	margin-right:150px;
-	float:right;
-	cursor:pointer;
-}
-
-#tour-guide .prev-button{
-	position: relative;
-    width: 50px;
-    z-index: 2;
-	height:50px;
-	float:left;
-	cursor:pointer;
-}
-
-#tour-guide .prev-button img{
-	margin:10px 0 0 25px;
-	cursor:pointer;
-}
-
-#tour-guide .next-button img{
-	margin:10px 0 0 25px;
-	cursor:pointer;
-}
-
-#tour-guide .explore-to-welcome{
-	position:absolute;
-	right:80px;
-	bottom:3px;
-	width:45px;
-	height:45px;
-		-moz-border-radius:10px 10px 10px 10px;
-		-webkit-border-radius:10px 10px 10px 10px;
-	border-radius:10px 10px 10px 10px;
-	background:url(../img/tourguide/back-to-welcome.png) no-repeat;
-	cursor: pointer;
-		-webkit-box-shadow: 0 0 5px #000000;
-		-moz-box-shadow: 0 0 5px #000000;
-	box-shadow: 0 0 5px #000000;
-}
-
-#tour-guide .explore-to-download{
-	position:absolute;
-	right:20px;
-	bottom:3px;
-	width:45px;
-	height:45px;
-		-moz-border-radius:10px 10px 10px 10px;
-		-webkit-border-radius:10px 10px 10px 10px;
-	border-radius:10px 10px 10px 10px;
-	background:url(../img/tourguide/back-to-download.png) no-repeat;
-	cursor: pointer;
-			-webkit-box-shadow: 0 0 5px #000000;
-		-moz-box-shadow: 0 0 5px #000000;
-	box-shadow: 0 0 5px #000000;
-
-}
-
-#tour-guide .guide-logo{
-	width:50px;
-	height:50px;
-	float:left;
-	background-repeat:no-repeat;
-	margin:0px 20px;
-}
-
-#tour-guide .guide-logo img{
-	height:46px;
-}
-
-#tour-guide h3{
-	font-size:20px;
-	display:inline;
-	position:relative;
-	top:13px;
-	margin-bottom:0px;
-}
-
-#tour-guide p{
-	font-size:16px;
-	display:inline;
-	font-weight: normal;
-	margin-left: 20px;
-	position:relative;
-	top:13px;
-	margin-bottom:0px;
-}
-
-#tour-guide .explore-tooltip-download{
-	height:20px;
-	background:url(../img/black-bg-20.png);
-	background-color:rgba(0,0,0,0.2);
-	display:none;
-	position: absolute;
-	bottom:55px;
-	right:10px;
-	padding:5px;
-	-moz-border-radius: 4px 4px 4px 4px;
-	-webkit-border-radius: 4px 4px 4px 4px;
-	border-radius: 4px 4px 4px 4px;
-	-moz-box-shadow: 0px 0px 5px #000;
-	-webkit-box-shadow: 0px 0px 5px #000;
-	box-shadow: 0px 0px 5px #000;
-}
-
-#tour-guide .explore-tooltip-welcome{
-	height:20px;
-	background:url(../img/black-bg-20.png);
-	background-color:rgba(0,0,0,0.2);
-	display:none;
-	position: absolute;
-	bottom:55px;
-	right:40px;
-	padding:5px;
-	-moz-border-radius: 4px 4px 4px 4px;
-	-webkit-border-radius: 4px 4px 4px 4px;
-	border-radius: 4px 4px 4px 4px;
-	-moz-box-shadow: 0px 0px 5px #000;
-	-webkit-box-shadow: 0px 0px 5px #000;
-	box-shadow: 0px 0px 5px #000;
-}
-
diff --git a/templates/tour/css/ubuntuone.css b/templates/tour/css/ubuntuone.css
deleted file mode 100644
index 8ec8d2817b2..00000000000
--- a/templates/tour/css/ubuntuone.css
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- *  Ubuntu One CSS
- *    author: Anthony Dillon
- */
-
-#ubuntuone-window{
-	width:738px;
-	height:555px;
-	top:200px;
-	left:600px;
-	display:none;
-}
-
-#ubuntuone-window .control .close{
-	background:url(../img/error/close-button.png) no-repeat;
-}
-
-#ubuntuone-window .content .header{
-	background:url(../img/ubuntuone/header.jpg) no-repeat;
-	width:738px;
-	height:190px;
-}
-
-#ubuntuone-window .content .body h1{
-	text-align:center;	
-	font-weight:normal;
-	font-size:32px;
-   margin-top:15px;
-}
-
-#ubuntuone-window .content .body .features{
-	 margin-left:12px;
-	 width:440px;
-	 float:left;
-	 margin-top:10px;
-}
-
-#ubuntuone-window .content .body .features .logo{
-	float:left;
-	width:50px;
-	height:50px;
-	margin-right: 10px;
-}
-
-#ubuntuone-window .content .body .features .files-anywhere .logo{
-	background:url(../img/ubuntuone/files-anywhere.jpg) no-repeat;
-	margin-top:8px;
-}
-
-#ubuntuone-window .content .body .features .rock-out .logo{
-	background:url(../img/ubuntuone/rock-out.jpg) no-repeat;
-}
-
-#ubuntuone-window .content .body .features .keep-connected .logo{
-	background:url(../img/ubuntuone/keep-connected.jpg) no-repeat;
-}
-
-#ubuntuone-window .content .body .features .stay-productive .logo{
-	background:url(../img/ubuntuone/stay-productive.jpg) no-repeat;
-	margin-top:4px;
-}
-
-#ubuntuone-window .content .body .features .files-anywhere{
-	 width:260px;
-}
-
-#ubuntuone-window .content .body .features h3{
-	font-size:14px;
-	margin-bottom:0px;
-	margin-top:0px;
-	font-weight:normal;
-}
-
-#ubuntuone-window .content .body .features p{
-	color:#888;
-	margin-top:0px;
-	margin-bottom:7px;
-}
-
-#ubuntuone-window .content .body .features .keep-connected div{
-	padding-top:8px;
-	padding-bottom:5px;
-}
-
-#ubuntuone-window .content .body .features .stay-productive div{
-	padding-top:12px;
-	padding-bottom:5px;
-}
-
-#ubuntuone-window .content .body .features .rock-out {
-	width:360px;
-}
-
-#ubuntuone-window .content .body .ubuntuone-buttons{
-	float:right;
-	margin-right:38px;
-	width:180px;
-	margin-top:40px;
-	color:#888;
-}
-
-#ubuntuone-window .content .body .ubuntuone-buttons .learn-more{
-	width:180px;
-	height:70px;
-  	-moz-border-radius:4px 4px 4px 4px;
-  	-webkit-border-radius:4px 4px 4px 4px;
-  	border-radius:4px 4px 4px 4px;
-  	border:1px solid #bdbab7;
-  	text-align:center;
-  	padding-top:10px;
-  	margin-bottom:15px;
-  	background:url(../img/ubuntuone/learn-more-bg.jpg) repeat-x;
-}
-
-#ubuntuone-window .content .body .ubuntuone-buttons .learn-more:hover{
-	background-position: 0px -80px;
-}
-
-#ubuntuone-window .content .body .ubuntuone-buttons .join-now{
-	height:60px;
-	width:180px;
-  	-moz-border-radius:4px 4px 4px 4px;
-  	-webkit-border-radius:4px 4px 4px 4px;
-  	border-radius:4px 4px 4px 4px;
-  	border:1px solid #bdbab7;
-  	text-align:center;
-  	margin-bottom:15px;
-	background:url(../img/ubuntuone/join-now-bg.jpg) repeat-x;
-}
-
-#ubuntuone-window .content .body .ubuntuone-buttons .join-now:hover{
-	background-position: 0px -60px;
-}
-
-#ubuntuone-window .content .body .ubuntuone-buttons .join-now h2{
-	margin-bottom:4px;
-	font-weight:normal;
-	margin-top:15px;
-	color:#4C4C4C;
-	font-size:26px;
-}
-
-#ubuntuone-window .content .body .ubuntuone-buttons .have-account{
-	color:#dd4814;
-	text-decoration: underline;
-	border:1px solid #F2F1F0;
-	padding:4px 8px;
-}
-
-#ubuntuone-window .content .body .ubuntuone-buttons .have-account:hover{
-	-moz-border-radius:4px 4px 4px 4px;
-  	-webkit-border-radius:4px 4px 4px 4px;
-  	border-radius:4px 4px 4px 4px;
-  	border:1px solid #bdbab7;
-  	cursor:pointer;
-}
diff --git a/templates/tour/css/welcome.css b/templates/tour/css/welcome.css
deleted file mode 100644
index f13c49088ee..00000000000
--- a/templates/tour/css/welcome.css
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- *  Welcome Screen CSS
- *  author: Anthony Dillon
- */
-
-#welcome {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	z-index: 1000;
-	font-weight:400;
-	background:url(../img/black-bg-60.png);
-	background: rgba(0,0,0,0.6);
-	overflow:hidden;
-	display:none;
-}
-#welcome-screen {
-	width: 660px;
-	left: 0;
-	top: 0;
-		-moz-border-radius: 8px;
-		-webkit-border-radius: 8px;
-		-khtml-border-radius: 8px;
-	border-radius: 8px;
-		-moz-box-shadow: 0 0 10px #000;
-  		-webkit-box-shadow: 0 0 10px #000;
-	box-shadow: 0 0 10px #000;	
-	position: absolute;
-	color: #4c4c4c;
-	display: none;
-	padding: 30px 0 20px;
-	z-index:2;
-	background: url("../img/folder/chrome.png") repeat-x scroll 0 0 #fff;
-}
-#welcome-screen .control{
-	margin-bottom: 6px;
-    margin-top: -25px;
-}
-#welcome-screen .welcome-header{
-	background: url("../img/welcome/circle-of-friends.png") 20px 20px no-repeat #fff;
-	height: 108px;
-    padding: 7px 100px 0 110px;
-    border-bottom:1px solid #d5d5d5;
-}
-#welcome-screen .welcome-select{
-	border-top:1px solid #fff;
-	padding:15px;
-}
-#welcome-screen .welcome-select select{
-	margin-left:10px;
-}
-#welcome-screen h1 {
-	font-size: 25px;
-	line-height:1.3;
-	font-weight:500;
-	margin-bottom: 0px;
-	margin-top: 20px;
-}
-#welcome-screen h2 {
-	font-size: 16px;
-	font-weight:500;
-	margin-top: 5px;
-}
-#welcome-screen ul {
-	padding: 0;
-	overflow: hidden;
-	margin:0;
-	background-color: #F2F1F0;
-	border-bottom: 1px solid #D5D5D5;
-	margin-bottom:20px;
-}
-#welcome-screen li {
-	float: left;
-	list-style: none;
-}
-#welcome-screen li a {
-	padding: 28px 0 22px 57px;
-	display: block;
-	width: 160px;
-	text-decoration: none;
-	cursor: pointer;
-	font-size: 16px;
-	color: #333;
-	border-bottom:1px dotted #C0B7B0;
-	border-right:1px dotted #C0B7B0;
-}
-#welcome-screen li a:hover {
-	background-color: #fff;
-	color:#DD4814;
-}
-
-#welcome-screen li a.completed {
-	color:#AEA79F;
-	background: url("../img/welcome/completed.png") no-repeat 12px 15px !important;
-	background-color: #e8e8e8 !important;
-}
-#welcome-screen li img {
-	float:left;
-	margin-left: -48px;
-    margin-top: -20px;
-}
-#welcome-screen .browse-files {
-	background: url("../img/welcome/browse-files.png") no-repeat 12px 15px;
-}
-#welcome-screen .surf-the-web {
-	background: url("../img/welcome/surf-the-web.png") no-repeat 12px 15px;
-	border-right:0px;
-	border-top:1px solid #fff;
-}
-#welcome-screen .check-email {
-	background: url("../img/welcome/check-email.png") no-repeat 12px 15px;
-	border-top:1px solid #fff;
-}
-#welcome-screen .watch-video {
-	background: url("../img/welcome/watch-video.png") no-repeat 12px 15px;
-	border-right:0px;
-	border-bottom:0px;
-}
-#welcome-screen .view-photos {
-	background: url("../img/welcome/view-photos.png") no-repeat 12px 15px;
-	border-right:0px;
-}
-#welcome-screen .find-apps {
-	background: url("../img/welcome/find-apps.png") no-repeat 12px 15px;
-}
-#welcome-screen .create-documents {
-	background: url("../img/welcome/create-documents.png") no-repeat 15px 15px;
-}
-#welcome-screen .create-spreadsheets {
-	background: url("../img/welcome/create-spreadsheets.png") no-repeat 15px 15px;
-	border-bottom:0px;
-}
-#welcome-screen .create-presentations {
-	background: url("../img/welcome/create-presentations.png") no-repeat 15px 15px;
-	border-bottom: 0px;
-}
-#welcome-screen .listen-music{
-	background: url("../img/welcome/listen-to-music.png") no-repeat 12px 15px;
-}
-#welcome-screen .system-indicators{
-	background: url("../img/welcome/indicators.png") no-repeat 12px 15px;
-	border-bottom:1px solid #d5d5d5;
-}
-#welcome-screen .applications{
-	background: url("../img/welcome/applications.png") no-repeat 12px 15px;
-	border-right:0px;
-	border-bottom:1px solid #d5d5d5;
-}
-#welcome-screen .explore-mode, 
-#welcome-screen .tour-mode {
-	margin-right: 15px;
-	background: url("../img/welcome/background-link-explore.png") center center repeat-x;
-	color: #333;
-}
-#welcome-screen .download,
-#welcome-screen .explore-mode, 
-#welcome-screen .tour-mode {
-	padding: 10px 20px;
-		-moz-border-radius: 4px 4px 4px 4px;
-		-webkit-border-radius: 4px 4px 4px 4px;
-	border-radius: 4px 4px 4px 4px;
-	display: block;
-	float: right;
-	font-size: 14px;
-	text-decoration: none;
-	border: 1px solid #c0b7b0;
-	cursor: pointer;
-}
-#welcome-screen .download:active,
-#welcome-screen .explore-mode:active, 
-#welcome-screen .tour-mode:active {
-	position: relative;
-	top: -1px;
-}
-
-#welcome-screen .language-mode {
-		-moz-border-radius: 4px 4px 4px 4px;
-		-webkit-border-radius: 4px 4px 4px 4px;
-	border-radius: 4px 4px 4px 4px;
-	display: block;
-	float: left;
-	font-size: 14px;
-	text-decoration: none;
-	border: 1px solid #c0b7b0;
-	cursor: pointer;
-	margin-left: 15px;
-	background: url("../img/welcome/background-link-explore.png") center center repeat-x;
-	color: #333;
-	padding: 9px 0;
-	overflow:hidden;
-}
-
-#welcome-screen .language-mode a,
-#welcome-screen .language-mode span {
-	padding:11px;
-}
-
-#welcome-screen .primary,
-#welcome-screen .language-mode span {
-	background: url("../img/welcome/background-link-download.png") center center repeat-x;
-	color: #fff;
-}
-
-#welcome-screen .control {
-	background: url("../img/welcome/window-buttons.png") no-repeat;
-	padding-left:60px;
-}
diff --git a/templates/tour/css/workspaces.css b/templates/tour/css/workspaces.css
deleted file mode 100644
index 45253fd51c1..00000000000
--- a/templates/tour/css/workspaces.css
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *  Workspaces CSS
- * author: Anthony Dillon
- */
-
-#workspaces{
-	background:url(../img/workspaces/gradient.jpg) repeat-x scroll 0px 0px #707070;
-	width:100%;
-	height:100%;
-	position:absolute;
-	left:0px;
-	top:0px;
-	opacity:0;
-}
-
-#void{
-	background:#000;
-	width:100%;
-	float:left;
-	height:50%;
-}
-
-#workspace-container{
-	width:650px;
-	margin:auto auto;
-	margin-top:150px;
-}
-#workspace-container .fadedOverlay{
-	float:left;
-	background:url(../img/workspaces/overlay.png);
-	margin:0px;
-}
-
-#workspace-container .selected{
-	background:none;
-}
-
-#workspace-container div{
-	background:url(../img/background.jpg) no-repeat;
-	background-size:300px 200px;
-	margin-left:15px;
-	margin-top:15px;
-	width:300px;
-	height:200px;
-	float:left;
-}
-
-#workspace-container .reflection{
-	margin-top:70px;
-	background:url(../img/workspaces/reflection.png);
-}
-
-#workspace3{
-	clear:both;
-}
\ No newline at end of file
diff --git a/templates/tour/en/index.html b/templates/tour/en/index.html
deleted file mode 100644
index bf0698bafc5..00000000000
--- a/templates/tour/en/index.html
+++ /dev/null
@@ -1,1581 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="ltr">
-	<head>
-		<title>Ubuntu online tour</title>
-		<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />
-		<meta charset="UTF-8" />
-		<meta name="description" content="Enjoy the simplicity of Ubuntu's stylish, intuitive interface. Take Ubuntu for a test drive with our online tour and download when you're ready!" />
-		<meta name="keywords" content="ubuntu, ubuntu online, ubuntu tour" />
-		<link rel="stylesheet" href="../css/loader.css" type="text/css" />
-		<link rel="stylesheet" href="../css/error.css" type="text/css" />
-		<link rel="stylesheet" href="../css/base.css" type="text/css" />
-		<link rel="stylesheet" href="../css/folder.css" type="text/css" />
-		<link rel="stylesheet" href="../css/firefox.css" type="text/css" />
-		<link rel="stylesheet" href="../css/email.css" type="text/css" />
-		<link rel="stylesheet" href="../css/systemoverlay.css" type="text/css" />
-		<link rel="stylesheet" href="../css/ubuntuone.css" type="text/css" />
-		<link rel="stylesheet" href="../css/shotwell.css" type="text/css" />
-		<link rel="stylesheet" href="../css/tourguide.css" type="text/css" />
-		<link rel="stylesheet" href="../css/welcome.css" type="text/css" />
-		<link rel="stylesheet" href="../css/shutdown.css" type="text/css" />
-		<link rel="stylesheet" href="../css/movieplayer.css" type="text/css" />
-		<link rel="stylesheet" href="../css/libre.css" type="text/css" />
-		<link rel="stylesheet" href="../css/notification.css" type="text/css" />
-		<link rel="stylesheet" href="../css/software-centre.css" type="text/css" />
-		<!--[if IE 8]>
-		<link rel="stylesheet" href="../css/iefix.css" type="text/css" />
-		<![endif]-->
-		<link href='http://fonts.googleapis.com/css?family=Ubuntu:300,400,700' rel='stylesheet' type='text/css' />
-		<script type="text/javascript">
-			WebFontConfig = {
-				google : {
-					families : ['Ubuntu:400,700:latin']
-				}
-			}; (function() {
-				var wf = document.createElement('script');
-				wf.src = ('https:' == document.location.protocol ? 'https' : 'http') + '://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js';
-				wf.type = 'text/javascript';
-				wf.async = 'true';
-				var s = document.getElementsByTagName('script')[0];
-				s.parentNode.insertBefore(wf, s);
-			})();
-
-		</script>
-	</head>
-	<body>
-		<div id="loader">
-			<div id="dot-container">
-				<noscript>
-					<p>
-						This demo uses JavaScript. Either your browser doesn't support JavaScript, or it's currently switched off.
-						<br/>
-						<br/>
-						Don't panic. We've got <a href="/ubuntu/take-the-tour-gallery">a non-JavaScript version</a> of the online tour you can view instead. :)
-					</p>
-				</noscript>
-			</div>
-		</div>
-		<div id="top" class="dropShadow">
-			<div id="top-left">
-				<div id="control-buttons">
-					<div id="close"></div>
-					<div id="min"></div>
-					<div id="max"></div>
-				</div>
-				<div id="dash-control-buttons">
-					<div class="close"></div>
-					<div class="min"></div>
-					<div class="max"></div>
-				</div>
-				<div id="title"></div>
-			</div>
-			<div id="top-right">
-				<div id="message"><img src="../img/top/nomessage.png" class="message-logo" alt="" />
-					<ul class="drop-down">
-						<li class="disabled"><img src="../img/top/available.jpg" alt=""/> Available
-						</li>
-						<li class="disabled"><img src="../img/top/away.jpg" alt=""/> Away
-						</li>
-						<li class="disabled"><img src="../img/top/busy.jpg" alt=""/> Busy
-						</li>
-						<li class="disabled"><img src="../img/top/invisible.jpg" alt=""/> Invisible
-						</li>
-						<li class="disabled"><img src="../img/top/offline.jpg" alt=""/> Offline
-						</li>
-						<li class="divider"></li>
-						<li class="disabled"><img src="../img/top/chat.png" alt=""/> Chat
-						</li>
-						<li class="divider"></li>
-						<li class="disabled"><img src="../img/top/broadcast.png" alt=""/> Set Up Broadcast Account…
-						</li>
-						<li class="divider"></li>
-						<li class="disabled"><img src="../img/top/mail.png" alt=""/> Set Up Mail…
-						</li>
-						<li class="divider"></li>
-						<li class="disabled"><img src="../img/top/uone.png" alt=""/> Ubuntu One
-						</li>
-						<li class="divider"></li>
-						<li class="disabled">
-							Clear
-						</li>
-					</ul>
-				</div>
-				<div id="bluetooth"><img src="../img/top/bluetooth.png" alt=""/>
-					<ul class="drop-down">
-						<li class="disabled bluetooth">
-							Bluetooth On
-						</li>
-						<li>
-							Turn Off Bluetooth
-						</li>
-						<li class="divider"></li>
-						<li class="disabled BtOn">
-							Visible
-						</li>
-						<li class="divider BtOn"></li>
-						<li class="disabled BtOn">
-							Send files to device…
-						</li>
-						<li class="disabled BtOn">
-							Browse files on device…
-						</li>
-						<li class="divider"></li>
-						<li class="disabled BtOn">
-							Setup new device…
-						</li>
-						<li class="divider BtOn"></li>
-						<li class="disabled">
-							Preferences
-						</li>
-					</ul>
-				</div>
-				<div id="connection"><img src="../img/top/connection.png" alt=""/>
-					<ul class="drop-down">
-						<li class="disabled">
-							Auto eth0
-						</li>
-						<li class="disabled">
-							Disconnect
-						</li>
-						<li class="divider"></li>
-						<!--<li class="disabled"><img src="../img/top/wireless-icon.png" alt=""/> My Wireless Connection</li>
-						<li class="disabled">Disconnect</li>
-						<li class="divider"></li>-->
-						<li class="disabled">
-							Connection Information
-						</li>
-						<li class="disabled">
-							Edit Connections…
-						</li>
-					</ul>
-				</div>
-				<div id="speakers"><img src="../img/top/speakers3.png" class="speakers-logo"  alt=""/>
-					<ul class="drop-down">
-						<li>
-							Mute
-						</li>
-						<li class="system-volume">
-							<div class="large-icon"></div><div class="small-icon"></div><div class="slider"></div><div class="slider-active"></div>
-						</li>
-						<li class="divider"></li>
-						<li class="disabled"><img src="../img/top/rhythmbox.png" alt=""/> Rhythmbox
-						</li>
-						<li class="banshee">
-							<div class="banshee-rewind"></div><div class="banshee-forward"></div><div class="banshee-play"></div>
-						</li>
-						<li class="divider"></li>
-						<li class="disabled">
-							Sound Settings…
-						</li>
-					</ul>
-				</div>
-				<div id="time">
-					<p></p>
-					<ul class="drop-down">
-						<li class="system-calendar"></li>
-						<li class="divider"></li>
-						<li class="disabled">
-							Time &amp; Date Settings…
-						</li>
-					</ul>
-				</div>
-				<div id="power"><img src="../img/top/power.png"  alt=""/>
-					<ul class="drop-down">
-						<li class="disabled">
-							System Settings…
-						</li>
-						<li class="disabled">
-							Displays…
-						</li>
-						<li class="disabled">
-							Startup Applications…
-						</li>
-						<li class="disabled">
-							Software Up to Date
-						</li>
-						<li class="divider"></li>
-						<li class="disabled">
-							Attached Devices
-						</li>
-						<li class="disabled">
-							Printers
-						</li>
-						<li class="divider"></li>
-						<li class="disabled">
-							Lock Screen
-						</li>
-						<li class="disabled">
-							Log Out…
-						</li>
-						<li class="disabled">
-							Suspend
-						</li>
-						<li class="disabled">
-							Hibernate
-						</li>
-						<li>
-							Shut Down…
-						</li>
-					</ul>
-				</div>
-			</div>
-		</div>
-		<div id="tooltip">
-			<div class="shadow-arrow"></div>
-			<div class="arrow-right"></div>
-			<div id="tooltip-text"></div>
-		</div>
-		<div id="menu">
-			<ul>
-				<li class="dash">
-					<span>Dash home</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="home"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Home Folder</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="firefox"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Firefox Web Browser</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="software"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Ubuntu Software Centre</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="writer"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>LibreOffice Writer</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="impress"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>LibreOffice Impress</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="calc"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>LibreOffice Calc</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="uone"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Ubuntu One</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="email"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Thunderbird Mail</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="shotwell temp"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Shotwell Photo Manager</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="movieplayer temp"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Movie Player</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<!--<li class="workspace"><span>Workspace Switcher</span></li>-->
-				<li class="rubbish bottom">
-					<span>Rubbish bin</span>
-				</li>
-			</ul>
-		</div>
-		<div id="systemOverlay">
-			<div class="copyDash"></div>
-			<div id="overlayContents">
-				<input type="text" name="search" value="Search"/>
-				<div id="display-home" class="app-container">
-					<div class="recent-apps bottom"><img src="../img/overlay/recentapps.png" alt=""/> Applications <div class="app-list"></div>
-					</div>
-					<div class="recent-files bottom"><img src="../img/overlay/recentfiles.png" alt=""/> Files &amp; Folders<div class="app-list"></div>
-					</div>
-				</div>
-				<div id="display-apps" class="app-container">
-					<div class="frequently bottom"><img src="../img/overlay/recentapps.png" alt=""/> Recently Used <div class="app-list"></div>
-					</div>
-					<div class="installed"><img src="../img/overlay/installed.png" alt=""/> Installed<div class="app-list"></div>
-					</div>
-				</div>
-				<div id="display-find-files" class="app-container">
-					<div class="files bottom"><img src="../img/overlay/recentfiles.png" alt=""/> Recent<div class="app-list"></div>
-					</div>
-					<div class="downloads bottom"><img src="../img/overlay/downloaded.png" alt=""/> Downloads<div class="app-list"></div>
-					</div>
-					<div class="folders"><img src="../img/overlay/folders.png" alt=""/> Folders<div class="app-list"></div>
-					</div>
-					
-				</div>
-				<div id="display-find-music" class="app-container">
-					<div class="songs bottom"><img src="../img/overlay/folders.png" alt=""/> Songs<div class="app-list"></div>
-					</div>
-					<div class="albums"><img src="../img/overlay/folders.png" alt=""/> Albums<div class="app-list"></div>
-					</div>
-				</div>
-				<div id="display-find-video" class="app-container">
-					<div class="videos bottom"><img src="../img/overlay/folders.png" alt=""/> Videos<div class="app-list"></div>
-					</div>
-				</div>
-				<div id="display-search" class="app-container">
-					<div class="applications bottom"><img src="../img/overlay/search-apps-logo.jpg" alt=""/> Applications<div class="app-list"></div>
-					</div>
-					<div class="files"><img src="../img/overlay/search-files-logo.jpg" alt=""/> Files &amp; Folders<div class="app-list"></div>
-					</div>
-				</div>
-			</div>
-			<div id="dash-bottom-bar">
-				<div class="bottom-wrapper">
-					<div class="home-icon active"></div>
-					<div class="applications-icon"></div>
-					<div class="files-icon"></div>
-					<div class="music-icon"></div>
-					<div class="video-icon last"></div>
-				</div>
-			</div>
-		</div>
-		<div id="ubuntuone-window" class="uone window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="window-title">
-					Ubuntu One Control Panel
-				</div>
-			</div>
-			<div class="content">
-				<div class="header"></div>
-				<div class="body">
-					<h1>The Power of Your Personal Cloud</h1>
-					<div class="features">
-						<div class="files-anywhere">
-							<span class="logo"></span>
-							<div>
-								<h3>Files Anywhere</h3>
-								<p>
-									Backup and access your files from Ubuntu, Windows, Web or Mobile
-								</p>
-							</div>
-						</div>
-						<div class="rock-out">
-							<span class="logo"></span>
-							<div>
-								<h3>Rock Out</h3>
-								<p>
-									Your entire collection follows you around with music streaming to Android and iPhone
-								</p>
-							</div>
-						</div>
-						<div class="keep-connected">
-							<span class="logo"></span>
-							<div>
-								<h3>Keep Connected</h3>
-								<p>
-									Unify you contacts across Desktop, Mobile and Web
-								</p>
-							</div>
-						</div>
-						<div class="stay-productive">
-							<span class="logo"></span>
-							<div>
-								<h3>Stay Productive</h3>
-								<p>
-									Keep you firefox bookmarks and Tomboy notes synced
-								</p>
-							</div>
-						</div>
-					</div>
-					<div class="ubuntuone-buttons">
-						<div class="learn-more"><img src="../img/ubuntuone/ubuntuone-logo.jpg" width="47" height="48" alt=""/>
-							<div>
-								Learn More
-							</div>
-						</div>
-						<div class="join-now">
-							<h2>Join now</h2>
-						</div>
-						<div class="have-account">
-							I already have an account!
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div id="libreoffice-calc-window" class="calc window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="window-title">
-					Untitled 1 - LibreOffice Calc
-				</div>
-			</div>
-			<div class="content">
-				<span>File</span>
-				<span>Edit</span>
-				<span>View</span>
-				<span>Insert</span>
-				<span>Format</span>
-				<span>Table</span>
-				<span>Tools</span>
-				<span>Window</span>
-				<span>Help</span>
-			</div>
-		</div>
-		<div id="libreoffice-writer-window" class="writer window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="window-title">
-					Untitled 1 - LibreOffice Writer
-				</div>
-			</div>
-			<div class="content">
-				<span>File</span>
-				<span>Edit</span>
-				<span>View</span>
-				<span>Insert</span>
-				<span>Format</span>
-				<span>Table</span>
-				<span>Tools</span>
-				<span>Window</span>
-				<span>Help</span>
-			</div>
-		</div>
-		<div id="libreoffice-impress-window" class="impress window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="window-title">
-					Untitled 1 - LibreOffice Impress
-				</div>
-			</div>
-			<div class="content">
-				<span>File</span>
-				<span>Edit</span>
-				<span>View</span>
-				<span>Insert</span>
-				<span>Format</span>
-				<span>Table</span>
-				<span>Tools</span>
-				<span>Window</span>
-				<span>Help</span>
-			</div>
-		</div>
-		<div class="error-window window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="window-title"></div>
-			</div>
-			<div class="error-container">
-				<h1>Thanks for exploring Ubuntu!</h1>
-				<a class="download"  href="http://www.ubuntu.com/download/ubuntu/download?utm_source=tour&utm_medium=online&utm_campaign=tour">Download Ubuntu</a>
-				<h2>Remember, this is just a demo. You'll have to download it to enjoy the real thing!</h2>
-			</div>
-		</div>
-		<!--<div id="error-window" class="error-window window">
-		<div class="control">
-		<div class="close"></div>
-		<div class="window-title"></div>
-		</div>
-		<div class="content">
-		<img src="../img/error/warning.jpg"/>
-		<div class="message">
-		<p>Thanks for exploring Ubuntu</p>
-		<p>Remember, this is just a demo. You'll have to download it to enjoy the real thing!</p>
-		</div>
-		<div class="error-buttons"><div class="download highlight">Download Ubuntu</div></div>
-		</div>
-		</div>-->
-		<!--<div id="workspaces">
-		<div id="void">
-		<div id="workspace-container">
-		<div id="workspace1"><div class="fadedOverlay"></div></div>
-		<div id="workspace2"><div class="fadedOverlay"></div></div>
-		<div id="workspace3"><div class="fadedOverlay"></div></div>
-		<div id="workspace4"><div class="fadedOverlay"></div></div>
-		<div class="reflection" style="clear:both;"></div>
-		<div class="reflection"></div>
-		</div>
-		</div>
-		</div>-->
-		<div id="email-window" class="email-window window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="min"></div>
-				<div class="max"></div>
-				<div class="window-title">
-					Email
-				</div>
-			</div>
-			<div class="buttons">
-				<div class="email-get-mail">
-					Get Mail
-				</div>
-				<div class="email-divider"></div>
-				<div class="email-write">
-					Write
-				</div>
-				<!--<div class="email-address-book"></div>
-				<div class="email-divider"></div>
-				<div class="email-tag"></div>
-				<div class="email-search"><input type="text" name="submitEmailSearch" id="submitEmailSearch"/></div>-->
-			</div>
-			<div style="clear:both;"></div>
-			<div class="email-content">
-				<div class="folder-list">
-					<div class="bottom-buttons">
-						All Folders
-					</div>
-					<div style="clear:both;"></div>
-					<div class="list">
-						<div id="folder-inbox" class="selected"><img src="../img/email/inbox.png" alt=""/> Inbox
-						</div>
-						<div id="folder-draft"><img src="../img/email/drafts.png" alt=""/> Draft
-						</div>
-						<div id="folder-sent"><img src="../img/email/sent.png" alt=""/> Sent
-						</div>
-						<div id="folder-archive"><img src="../img/email/archive-logo.png" alt=""/> Archive
-						</div>
-						<div id="folder-trash"><img src="../img/email/trash.png" alt=""/> Trash
-						</div>
-					</div>
-				</div>
-				<div class="email-contents">
-					<div class="email-categories">
-						<div><img src="../img/email/t.png" alt=""/>
-						</div>
-						<div><img src="../img/email/star.png" alt=""/>
-						</div>
-						<div><img src="../img/email/clip.png" alt=""/>
-						</div>
-						<div class="subject">
-							Subject
-						</div>
-						<div><img src="../img/email/glasses.png" alt=""/>
-						</div>
-						<div class="from">
-							From
-						</div>
-						<div><img src="../img/email/fire.png" alt=""/>
-						</div>
-						<div class="date">
-							Date
-						</div>
-					</div>
-					<div style="clear:both;"></div>
-					<div class="email-list"></div>
-					<div class="email-body">
-						<div class="message-header">
-							<div class="email-buttons">
-								<div>
-									<span class="message-reply">reply</span>
-									<span class="message-forward">forward</span>
-									<span class="message-archive">archive</span>
-									<span class="message-junk">junk</span>
-									<span class="message-delete">delete</span>
-								</div>
-							</div>
-							<div style="clear:both;"></div>
-							<div class="date"></div>
-							<dl class="from">
-								<dt>
-									from
-								</dt><dd></dd>
-							</dl>
-							<dl class="subject">
-								<dt>
-									subject
-								</dt><dd></dd>
-							</dl>
-							<dl class="to">
-								<dt>
-									to
-								</dt><dd></dd>
-							</dl>
-							<dl class="cc">
-								<dt>
-									cc
-								</dt><dd></dd>
-							</dl>
-						</div>
-						<div class="junk-mail-banner"><img src="../img/email/large-fire.jpg" alt=""/> Junk Mail
-							<div class="not-junk">
-								Not Junk
-							</div>
-						</div>
-						<div class="message-body"></div>
-					</div>
-				</div>
-				<div style="clear:both;"></div>
-				<div class="emails-info">
-					<div>
-						Unread: <span id="details-unread">1</span> Total: <span id="details-total">1</span>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div id="email-write" class="email-write window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="min"></div>
-				<div class="max"></div>
-				<div class="window-title">
-					Write: (no subject)
-				</div>
-			</div>
-			<div class="buttons">
-				<div id="write-send">
-					Send
-				</div>
-				<div class="email-divider"></div>
-				<div id="write-attach">
-					Attach
-				</div>
-			</div>
-			<div style="clear:both;"></div>
-			<div id="write-from">
-				<div>
-					From:
-				</div>
-				<input type="text" name="from" value="You"/>
-			</div>
-			<div id="write-to">
-				<div>
-					To:
-				</div>
-				<input type="text" name="to"/>
-			</div>
-			<div id="write-subject">
-				<div>
-					Subject:
-				</div>
-				<input type="text" name="subject"/>
-			</div>
-			<div><img src="../img/email/disabled-format-buttons.jpg" width="853" height="32" alt=""/>
-			</div>
-			<div id="write-body">
-				<textarea name="body"></textarea>
-</div>			<div class="loading-bar">
-				<div class="progress"></div>
-			</div>
-		</div>
-		<div id="software-centre" class="software window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="min"></div>
-				<div class="max"></div>
-				<div class="window-title">
-					Ubuntu Software Centre
-				</div>
-			</div>
-			<div class="top-panel">
-				<div class="back disabled"></div>
-				<div class="forward disabled"></div>
-				<div class="all-software selected"><img src="../img/software-centre/all-software.png" alt=""/>All Software
-				</div>
-				<div class="installed"><img src="../img/software-centre/installed.png" alt=""/>Installed
-				</div>
-				<div class="history"><img src="../img/software-centre/history.png" alt=""/>History
-				</div>
-			</div>
-			<div class="container detailed">
-				<div class="title"><img src="../img/software-centre/visolate.png" class="app-image" width="100" alt=""/><h1>Visolate</h1>
-					<p class="subheading">
-						PCB CNC converter
-					</p>
-					<p class="rating"><img src="../img/software-centre/rating.jpg" alt="" /> (91 Ratings)
-					</p>
-				</div>
-				<div class="price">
-					<span class="theprice">Free</span><span class="button">Install</span>
-					<div class="loading-bar">
-						<div class="progress"></div>
-					</div>
-				</div>
-				<div class="description-container">
-					<div class="description-image"><img src="../img/software-centre/screenshot-blender.jpg" alt="" />
-					</div>
-					<div class="description"><img src="../img/software-centre/screenshot-blender.jpg" alt="" />Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse quam augue, convallis id commodo id, tristique ac mi. Ut dapibus, neque eget elementum pretium, nunc turpis congue eros, et interdum nisi nisi at diam. Duis dictum, justo eget imperdiet pulvinar, dolor est fermentum nisl, luctus imperdiet metus elit a purus. Quisque nisl enim, lacinia ut venenatis in, porttitor eget orci. Quisque non nibh nec risus tincidunt sollicitudin vitae et nisl. Proin odio lacus, vulputate non auctor sit amet, dapibus quis tortor. Donec elit libero, pellentesque quis dictum sed, hendrerit non libero. Aliquam eu diam id leo auctor tincidunt. Phasellus cursus felis at nulla facilisis semper. Cras mauris urna, adipiscing sed scelerisque ut, gravida id neque. Mauris ut vestibulum justo. Curabitur convallis elementum pellentesque. Duis sit amet arcu ac eros pretium scelerisque. Nunc nec nisi nulla.
-					</div>
-					<div style="clear:both;"></div>
-				</div>
-			</div>
-			<div class="container home">
-				<div class="header-image">
-					<span class="header-title">Our star apps</span>
-					<span class="header-subtitle">Come and explore our favourites</span>
-				</div>
-				<div class="navigation">
-					<ul>
-						<li>
-							Accessories
-						</li>
-						<li>
-							Developer Tools
-						</li>
-						<li>
-							Education
-						</li>
-						<li>
-							Fonts
-						</li>
-						<li>
-							Games
-						</li>
-						<li>
-							Graphics
-						</li>
-						<li>
-							Internet
-						</li>
-						<li>
-							Office
-						</li>
-						<li>
-							Science &amp; Engineering
-						</li>
-						<li>
-							Sound &amp; Video
-						</li>
-						<li>
-							System
-						</li>
-						<li>
-							Themes &amp; Tweaks
-						</li>
-					</ul>
-				</div>
-				<div class="whats-new">
-					<h2> What's New</h2>
-					<div class="app-container">
-						<div class="chromium">
-							<h3>Chromium</h3>
-							<p>
-								Internet
-							</p>
-							<p class="cost">
-								Free
-							</p>
-						</div>
-						<div class="beep">
-							<h3>BEEP</h3>
-							<p>
-								Games
-							</p>
-							<p class="cost">
-								$9.99
-							</p>
-						</div>
-						<div class="inkscape">
-							<h3>Inkscape</h3>
-							<p>
-								Graphics
-							</p>
-							<p class="cost">
-								Free
-							</p>
-						</div>
-						<div class="worldofgoo">
-							<h3>World of Goo</h3>
-							<p>
-								Games
-							</p>
-							<p class="cost">
-								$19.99
-							</p>
-						</div>
-						<div class="blender">
-							<h3>Blender</h3>
-							<p>
-								Graphics
-							</p>
-							<p class="cost">
-								Free
-							</p>
-						</div>
-						<div class="braid">
-							<h3>Braid</h3>
-							<p>
-								Games
-							</p>
-							<p class="cost">
-								$9.99
-							</p>
-						</div>
-					</div>
-				</div>
-				<div class="whats-new">
-					<h2> Top Rated</h2>
-					<div class="app-container">
-						<div class="beep">
-							<h3>BEEP</h3>
-							<p>
-								Games
-							</p>
-							<p class="cost">
-								$9.99
-							</p>
-						</div>
-						<div class="chromium">
-							<h3>Chromium</h3>
-							<p>
-								Internet
-							</p>
-							<p class="cost">
-								Free
-							</p>
-						</div>
-						<div class="worldofgoo">
-							<h3>World of Goo</h3>
-							<p>
-								Games
-							</p>
-							<p class="cost">
-								$19.99
-							</p>
-						</div>
-						<div class="braid">
-							<h3>Braid</h3>
-							<p>
-								Games
-							</p>
-							<p class="cost">
-								$9.99
-							</p>
-						</div>
-						<div class="inkscape">
-							<h3>Inkscape</h3>
-							<p>
-								Graphics
-							</p>
-							<p class="cost">
-								Free
-							</p>
-						</div>
-						<div class="blender">
-							<h3>Blender</h3>
-							<p>
-								Graphics
-							</p>
-							<p class="cost">
-								Free
-							</p>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div id="shotwell" class="shotwell window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="min"></div>
-				<div class="max"></div>
-				<div class="window-title">
-					Shotwell
-				</div>
-			</div>
-			<div class="sidebar">
-				<div class="nav">
-					<ul>
-						<li class="library">
-							Library
-						</li>
-					</ul>
-				</div>
-				<div class="details">
-					<div class="overall">
-						<div>
-							Items: <span class="items">16 Photos</span>
-						</div>
-						<div>
-							From: <span class="from">Fri 26 Oct, 2001</span>
-						</div>
-						<div>
-							To: <span class="to">Mon 11 October, 2010</span>
-						</div>
-					</div>
-					<div class="single">
-						<div>
-							Title: <span class="title"></span>
-						</div>
-						<div>
-							Date: <span class="date"></span>
-						</div>
-						<div>
-							Size: <span class="size"></span>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="container">
-				<div class="images"></div>
-				<div class="tools">
-					<div class="jump-image">
-						<div class="next"></div><div class="prev"></div>
-					</div>
-					<div class="slider-container">
-						<div class="small-icon"></div><div class="slider"></div><div class="slider-active"></div><div class="large-icon"></div>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div id="movieplayer" class="movieplayer window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="min"></div>
-				<div class="max"></div>
-				<div class="window-title">
-					Movie Player
-				</div>
-			</div>
-			<div class="container">
-				<div class="video"></div>
-			</div>
-		</div>
-		<div id="firefox-window" class="firefox-window window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="min"></div>
-				<div class="max"></div>
-				<div class="window-title">
-					Browse the web
-				</div>
-			</div>
-			<div class="buttons">
-				<div class="firefox-back"></div>
-				<div class="firefox-forward"></div>
-				<div class="firefox-url">
-					<input type="text" name="submitURL" id="submitURL" value="http://www.ubuntu.com"/>
-				</div>
-				<div class="firefox-search">
-					<input type="text" name="submitSearch" id="submitSearch" value="Wikipedia" class="fade-text"/>
-				</div>
-			</div>
-			<div style="clear:both;"></div>
-			<div class="firefox-internet">
-				<div class="web-overlay-tran"></div>
-				<div class="theIframe">
-					<iframe src="../http://www.ubuntu.com" id="firefoxInternet" >
-						<p>
-							Your browser does not support iframes.
-						</p>
-					</iframe>
-				</div>
-			</div>
-		</div>
-		<div id="shutdown-window" class="window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="window-title">
-					Shut Down
-				</div>
-			</div>
-			<div class="content">
-				<img src="../img/powerwarning.jpg" alt=""/>
-				<div class="message">
-					<p>
-						Are you sure you want to close all programs and shutdown the computer?
-					</p>
-				</div>
-				<div class="shutdown-buttons">
-					<div class="shutdown highlight">
-						Shut Down
-					</div>
-					<div class="cancel">
-						Cancel
-					</div>
-				</div>
-			</div>
-		</div>
-		<div id="folder-window" class="folder window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="min"></div>
-				<div class="max"></div>
-				<div class="window-title"></div>
-			</div>
-			<div style="clear:both;"></div>
-			<div class="folder-list">
-				<div class="list">
-					<p>
-						Computer
-					</p>
-					<ul>
-						<li class="home selected" data-folder="home"><img src="../img/folder/home-icon.png" alt=""/> Home
-						</li>
-						<li class="desktop" data-folder="5"><img src="../img/folder/desktop-icon.png"  alt=""/> Desktop
-						</li>
-						<li class="documents" data-folder="0"><img src="../img/folder/documents-icon.png"  alt=""/> Documents
-						</li>
-						<li class="downloads" data-folder="1"><img src="../img/folder/downloads-icon.png"  alt=""/> Downloads
-						</li>
-						<li class="music" data-folder="2"><img src="../img/folder/music-icon.png"  alt=""/> Music
-						</li>
-						<li class="pictures" data-folder="4"><img src="../img/folder/pictures-icon.png"  alt=""/> Pictures
-						</li>
-						<li class="videos" data-folder="3"><img src="../img/folder/videos-icon.png"  alt=""/> Videos
-						</li>
-						<li class="rubbish" data-folder="bin"><img src="../img/folder/rubbish-icon.png"  alt=""/> Rubbish bin
-						</li>
-					</ul>
-				</div>
-			</div>
-			<div class="folder-contents">
-				<div class="buttons">
-					<div class="folder-back"></div>
-					<div class="folder-forward"></div>
-				</div>
-				<div class="bottom-buttons"></div>
-				<div style="clear:both;"></div>
-				<div class="contents"></div>
-				<div class="selected-details"></div>
-			</div>
-		</div>
-		<!--<div id="welcome">
-			<div id="welcome-screen">
-				<div class="close"></div>
-				<h1>Welcome to the Ubuntu online tour!</h1>
-				<h2>Take Ubuntu for a test drive with our online demo.</h2>
-				<ul>
-					<li>
-						<a class="browse-files" href="#browse-files">Browse files</a>
-					</li>
-					<li>
-						<a class="surf-the-web" href="#surf-the-web">Surf the web</a>
-					</li>
-					<li>
-						<a class="check-email" href="#check-email">Check email</a>
-					</li>
-					<li>
-						<a class="view-photos" href="#view-photos">View photos</a>
-					</li>
-					<li>
-						<a class="find-apps" href="#find-apps">Find apps</a>
-					</li>
-					<li>
-						<a class="create-documents" href="#create-documents">Create documents</a>
-					</li>
-					<li>
-						<a class="create-spreadsheets" href="#create-spreadsheets">Create spreadsheets</a>
-					</li>
-					<li>
-						<a class="create-presentations" href="#create-presentations">Create presentations</a>
-					</li>
-				</ul>
-				<div class="language-mode">
-					<span class="active">English</span>
-					<a href="/tour/zh-CN/">中文</a>
-				</div>
-				<a class="explore-mode primary" href="#">Show yourself around</a>
-				<a class="tour-mode" href="#">Take the guided tour</a>
-			</div>
-		</div>-->
-		<div id="welcome">
-			<div id="welcome-screen" class="selected-window">
-				<div class="control">
-					<div class="window-title">Ubuntu tour</div>
-				</div>
-				<div class="welcome-header">
-					<h1>Welcome to the Ubuntu 12.10 tour!</h1>
-					<h2>Take Ubuntu for a test drive with our online demo.</h2>
-				</div>
-				<ul>
-					<li>
-						<a class="browse-files" href="#browse-files">Browse files</a>
-					</li>
-					<li>
-						<a class="check-email" href="#check-email">Check email</a>
-					</li>
-					<li>
-						<a class="surf-the-web" href="#surf-the-web">Surf the web</a>
-					</li>
-					<li>
-						<a class="find-apps" href="#find-apps">Find apps</a>
-					</li>
-					<li>
-						<a class="create-documents" href="#create-documents">Create documents</a>
-					</li>
-					<li>
-						<a class="view-photos" href="#view-photos">View photos</a>
-					</li>
-					<li>
-						<a class="create-presentations" href="#create-presentations">Create presentations</a>
-					</li>
-					<li>
-						<a class="create-spreadsheets" href="#create-spreadsheets">Create spreadsheets</a>
-					</li>
-					<li>
-						<a class="watch-video" href="#watch-video">Watch videos</a>
-					</li>
-				</ul>
-				<div class="language-mode">
-					<span class="active">English</span>
-					<a href="/tour/zh-CN/">中文</a>
-				</div>
-				<a class="explore-mode primary" href="#">Show yourself around</a>
-				<a class="tour-mode" href="#">Take the guided tour</a>
-			</div>
-		</div>
-		<div id="tour-guide">
-			<div class="next-button"><img src="../img/tourguide/arrow-next.png" alt="" />
-			</div>
-			<div class="prev-button"><img src="../img/tourguide/arrow-prev.png" alt="" />
-			</div>
-			<div class="guide-container welcome">
-				<div class="guide-logo"></div>
-				<h3></h3>
-				<p>
-					We hope you've enjoyed the Ubuntu online tour. <a href="http://www.ubuntu.com/download/ubuntu/download?utm_source=tour&utm_medium=online&utm_campaign=tour" target="_blank">Ready to download?</a> or <a href="/ubuntu/take-the-tour" >back to the site</a>
-				</p>
-			</div>
-			<div class="guide-container home">
-				<div class="guide-logo"><img src="../img/tourguide/file-small.png" />
-				</div>
-				<h3>Browse files</h3>
-				<p>
-					It’s quick and easy to access your folders and files from Ubuntu’s home folder.
-				</p>
-			</div>
-			<div class="guide-container firefox">
-				<div class="guide-logo"><img src="../img/tourguide/firefox-small.png" />
-				</div>
-				<h3>Surf the web</h3>
-				<p>
-					Browsing the web is fast and secure with Ubuntu and Firefox.
-				</p>
-			</div>
-			<div class="guide-container email">
-				<div class="guide-logo"><img src="../img/tourguide/mail-small.png" />
-				</div>
-				<h3>Check email</h3>
-				<p>
-					Read, write and send emails with Thunderbird. It’s easy and fast.
-				</p>
-			</div>
-			<div class="guide-container shotwell">
-				<div class="guide-logo"><img src="../img/tourguide/shotwell-small.png" />
-				</div>
-				<h3>View photos</h3>
-				<p>
-					You can upload, organise, edit and share your photos with Shotwell.
-				</p>
-			</div>
-			<div class="guide-container software">
-				<div class="guide-logo"><img src="../img/tourguide/apps-small.png" />
-				</div>
-				<h3>Find apps</h3>
-				<p>
-					Search and download apps fast from the Ubuntu Software Centre.
-				</p>
-			</div>
-			<div class="guide-container writer">
-				<div class="guide-logo"><img src="../img/tourguide/document-small.png" />
-				</div>
-				<h3>Create documents</h3>
-				<p>
-					LibreOffice Writer makes it easy to draft professional documents.
-				</p>
-			</div>
-			<div class="guide-container calc">
-				<div class="guide-logo"><img src="../img/tourguide/calc-small.png" />
-				</div>
-				<h3>Create spreadsheets</h3>
-				<p>
-					LibreOffice Calc has everything you need to create clear and accurate spreadsheets.
-				</p>
-			</div>
-			<div class="guide-container impress">
-				<div class="guide-logo"><img src="../img/tourguide/impress-small.png" />
-				</div>
-				<h3>Create presentations</h3>
-				<p>
-					Make a good impression with the intuitive LibreOffice Impress presentation tool.
-				</p>
-			</div>
-			<div class="guide-container movieplayer">
-				<div class="guide-logo"><img src="../img/tourguide/video-small.png" />
-				</div>
-				<h3>Watch videos</h3>
-				<p>
-					You can watch all your favourite films and videos, DVDs, downloads or movies you've created yourself.
-				</p>
-			</div>
-			<div class="explore-tooltip-download">
-				Download
-			</div>
-			<div class="explore-tooltip-welcome">
-				Welcome Screen
-			</div>
-			<div class="explore-to-welcome"></div>
-			<div class="explore-to-download"></div>
-		</div>
-		<div id="Translation-Strings">
-			<!--
-			* Email system
-			-->
-			<p class="_email_1_title_">
-				Accessible
-			</p>
-			<p class="_email_2_title_">
-				Fast
-			</p>
-			<p class="_email_3_title_">
-				Compatible
-			</p>
-			<p class="_email_4_title_">
-				Secure
-			</p>
-			<p class="_email_5_title_">
-				Your Ubuntu, your way
-			</p>
-			<p class="_email_1_body_">
-				Accessibility is central to the Ubuntu philosophy. We believe that computing is for everyone regardless of nationality, race, gender or disability. Fully translated into 38 languages, Ubuntu also includes essential assistive technologies, which are, of course, completely free.
-			</p>
-			<p class="_email_2_body_">
-				Ubuntu loads quickly on any computer, but it's super-fast on newer machines. With no unnecessary programs and trial software slowing things down, booting up and opening a browser takes seconds. Unlike other operating systems that leave you staring at the screen, waiting to get online. And Ubuntu won’t grow sluggish over time. It’s fast. And it stays fast.
-			</p>
-			<p class="_email_3_body_">
-				Ubuntu works brilliantly with a range of devices. Simply plug in your mp3 player, camera or printer and you’ll be up and running straight away. No installation CDs. No fuss. And it’s compatible with Windows too! So you can open, edit and share Microsoft Office documents stress-free.
-			</p>
-			<p class="_email_4_body_">
-				You can surf in safety with Ubuntu – confident that your files and data will stay protected. A built-in firewall and virus protection come as standard. And if a potential threat appears, we provide automatic updates which you can install in a single click. You get added security with AppArmor, which protects your important applications so attackers can’t access your system. And thanks to Firefox and gnome-keyring, Ubuntu helps you keep your private information private. So whether it’s accessing your bank account or sharing sensitive data with friends or colleagues, you’ll have peace of mind when you need it the most.
-			</p>
-			<p class="_email_5_body_">
-				Enjoy the simplicity of Ubuntu's stylish, intuitive interface. Fast, secure and with thousands of apps to choose from, Ubuntu gives you a clean and streamlined experience that you can really make your own.
-			</p>
-			<p class="_random_reply_">
-				Thanks for exploring Ubuntu! Remember, this is just a demo. You'll have to download it to enjoy the real thing!
-				<br/>
-				<br/>
-				<a href="http://www.ubuntu.com/download/ubuntu/download?utm_source=tour&utm_medium=online&utm_campaign=tour" target="_blank">Download Ubuntu</a>
-			</p>
-			<p class="_write_">
-				Write
-			</p>
-			<p class="_no_subject_">
-				no subject
-			</p>
-			<p class="_recipient_">
-				Recipient
-			</p>
-			<p class="_from_">
-				From
-			</p>
-			<p class="_you_">
-				You
-			</p>
-			<p class="_on_">
-				On
-			</p>
-			<p class="_wrote_">
-				wrote
-			</p>
-			<p class="_original_message_">
-				Original Message
-			</p>
-			<p class="_fwd_">
-				Fwd
-			</p>
-			<!--
-			* Folder System
-			-->
-			<p class="_home_folder_">
-				Home
-			</p>
-			<p class="_desktop_folder_">
-				Desktop
-			</p>
-			<p class="_pictures_folder_">
-				Pictures
-			</p>
-			<p class="_videos_folder_">
-				Videos
-			</p>
-			<p class="_music_folder_">
-				Music
-			</p>
-			<p class="_downloads_folder_">
-				Downloads
-			</p>
-			<p class="_documents_folder_">
-				Documents
-			</p>
-			<p class="_canonical_folder_">
-				Canonical
-			</p>
-			<p class="_backup_folder_">
-				Backup
-			</p>
-			<p class="_local_folder_">
-				Local
-			</p>
-			<p class="_work_folder_">
-				work
-			</p>
-			<p class="_branches_folder_">
-				branches
-			</p>
-			<p class="_rubbish_bin_folder_">
-				Rubbish bin
-			</p>
-			<!--
-			* Software Center System
-			-->
-			<p class="_remove_">
-				Remove
-			</p>
-			<p class="_price_free_">
-				Free
-			</p>
-			<p class="_installed_">
-				Installed
-			</p>
-			<p class="_install_">
-				Install
-			</p>
-			<p class="_installing_">
-				Installing
-			</p>
-			<p class="_chromium_app_">
-				Chromium Web Browser
-			</p>
-			<p class="_chromium_sub_">
-				Access the Internet
-			</p>
-			<p class="_chromium_desc_">
-				Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all Internet users to experience the web.
-				<br/>
-				<br/>
-				Chromium serves as a base for Google Chrome, which is Chromium rebranded (name and logo) with very few additions such as usage tracking and an auto-updater system.
-				<br/>
-				<br/>
-				This package contains the Chromium browser
-			</p>
-			<p class="_beep_app_">
-				BEEP
-			</p>
-			<p class="_beep_sub_">
-				A 2D platformer/shooter game with physics-based puzzles
-			</p>
-			<p class="_beep_desc_">
-				BEEP is a 2D side-scrolling platformer with physics-based gameplay. You control a small robot equipped with an anti-gravity device, a jet-pack and a gun. Drive, jump, fly, swim and shoot your way through 24 levels scattered across 6 unique environments.
-				<br/>
-				<br/>
-				Use BEEP’s anti-gravity device to directly manipulate the physics-based environments. The anti-gravity device is both a tool and a weapon. Use it to smash enemy robots, build towers and solve puzzles.
-				<br/>
-				<br/>
-				BEEP has traveled for thousands of years through deep space to explore the Galaxy. Traverse a foreign star system with the BEEP-ship and send robots to the surface of the planets.
-			</p>
-			<p class="_inkscape_app_">
-				Inkscape Vector Graphics Editor
-			</p>
-			<p class="_inkscape_sub_">
-				Create and edit Scalable Vector Graphics images
-			</p>
-			<p class="_inkscape_desc_">
-				Inkscape loads and saves a subset of the SVG (Scalable Vector Graphics) format, a standard maintained by the WWW consortium.
-				<br/>
-				<br/>
-				Inkscape user interface should be familiar from CorelDraw and similar drawing programs. There are rectangles, ellipses, text items, bitmap images and freehand curves. As an added bonus, both vector and bitmap objects can have alpha transparency and can be arbitrarily transformed.
-				<br/>
-				<br/>
-				Inkscape supports multiple opened files and multiple views per file. Graphics can be printed and exported to png bitmaps.
-				<br/>
-				<br/>
-				Some of the import and export features are provided using the packages dia, libwmf-bin, pstoedit, skencil, imagemagick, and perlmagick.
-				<br/>
-				<br/>
-				Other extensions use ruby, libxml-xql-perl, python-numpy, and python-lxml. You must have these packages to make full use of all extensions and effects.
-				<br/>
-				<br/>
-				If you want to use the spellchecker, you have to install aspell and the respective language-pack, e.g. aspell-en or aspell-de.
-			</p>
-			<p class="_world_of_goo_app_">
-				World of Goo
-			</p>
-			<p class="_world_of_goo_sub_">
-				Physics based puzzle/construction game
-			</p>
-			<p class="_world_of_goo_desc_">
-				Drag and drop living, squirming, talking globs of goo to build structures, bridges, cannonballs, zeppelins, and giant tongues. The millions of innocent goo balls that live in the beautiful World of Goo are curious to explore.
-				<br/>
-				<br/>
-				But they dont know that they are in a game, or that they are extremely delicious. The most addicting and awe-inspiring puzzle game will set you on an adventure that youll never forget!
-			</p>
-			<p class="_blender_app_">
-				Blender
-			</p>
-			<p class="_blender_sub_">
-				Create and edit 3D models and animations
-			</p>
-			<p class="_blender_desc_">
-				Blender is an integrated 3d suite for modelling, animation, rendering, post-production, interactive creation and playback (games). Blender has its own particular user interface, which is implemented entirely in OpenGL and designed with speed in mind. Python bindings are available for scripting; import/export features for popular file formats like 3D Studio and Wavefront Obj are implemented as scripts by the community. Stills, animations, models for games or other third party engines and interactive content in the form of a standalone binary and/or a web plug-in are common products of Blender use.
-			</p>
-			<p class="_braid_app_">
-				Braid
-			</p>
-			<p class="_braid_sub_">
-				Manipulate the flow of time to solve puzzles
-			</p>
-			<p class="_braid_desc_">
-				Manipulate the flow of time to solve puzzles Braid is a platform game in painterly style where you manipulate the flow of time to solve puzzles. Every puzzle in Braid is unique; there is no filler.
-				<br/>
-				<br/>
-				Braid treats your time and attention as precious, and it does everything it can to give you a mind-expanding experience.
-				<br/>
-				<br/>
-				All gameplay is based on time manipulation. Journey into worlds where time behaves strangely; observe, learn from, and then master these worlds.
-			</p>
-			<p class="_banshee_app_">
-				Banshee Media Player
-			</p>
-			<p class="_brasero_app_">
-				Brasero Disc Burner
-			</p>
-			<p class="_movie_player_app_">
-				Movie Player
-			</p>
-			<p class="_shotwell_app_">
-				Shotwell Photo Manager
-			</p>
-			<p class="_pitivi_app_">
-				PiTiVi Video Editor
-			</p>
-			<p class="_sound_recorder_app_">
-				Sound Recorder
-			</p>
-			<p class="_empathy_app_">
-				Empathy Internet Messageing
-			</p>
-			<p class="_thunderbird_app_">
-				Thunderbird Mail/News
-			</p>
-			<p class="_firefox_app_">
-				Firefox Web Browser
-			</p>
-			<p class="_gwibber_app_">
-				Gwibber Social Client
-			</p>
-			<p class="_remote_desktop_app_">
-				Remote Desktop Viewer
-			</p>
-			<p class="_terminal_app_">
-				Terminal Server Client
-			</p>
-			<p class="_about_me_app_">
-				About Me
-			</p>
-			<p class="_additional_drivers_app_">
-				Additional Drivers
-			</p>
-			<p class="_aisleroit_app_">
-				AisleRoit Solitaire
-			</p>
-			<p class="_appearance_app_">
-				Appearance
-			</p>
-			<p class="_bluetooth_app_">
-				Bluetooth
-			</p>
-			<!--
-			* Dash
-			-->
-			<p class="_search_">Search</p>
-			<!--
-			* Notifications
-			-->
-			<p class="_turn_off_bluetooth_">
-				Turn Off Bluetooth
-			</p>
-			<p class="_turn_on_bluetooth_">
-				Turn On Bluetooth
-			</p>
-			<p class="_visible_">
-				Visible
-			</p>
-			<p class="_mute_">
-				Mute
-			</p>
-			<p class="_unmute_">
-				Unmute
-			</p>
-			<p class="_shut_down_">
-				Shut Down…
-			</p>
-			<!--
-				Files Details - Images
-			-->
-			<p class="_photo_size_">
-				15.2KB	
-			</p>
-			<p class="_photo_date_">
-				Fri 26 Oct, 2001
-			</p>
-			<p class="_buck_off_title_">
-				Buck Off	
-			</p>
-			<p class="_darkening_clockwork_title_">
-				Darkening Clockwork
-			</p>
-			<p class="_dybbølsbro_station_title_">
-				Dybbølsbro Station
-			</p>
-			<p class="_federica_miglio_title_">
-				Federica Miglio
-			</p>
-			<p class="_jardin_polar_title_">
-				Jardin Polar
-			</p>
-			<p class="_langelinie_alle_title_">
-				Langelinie Alle
-			</p>
-			<p class="_momiji_dream_title_">
-				Momiji Dream
-			</p>
-			<p class="_mount_snowdon_title_">
-				Mount Snowdon
-			</p>
-			<p class="_not_alone_title_">
-				Not Alone
-			</p>
-			<p class="_power_of_words_title_">
-				Power Of Words
-			</p>
-			<p class="_purple_dancers_title_">
-				Purple Dancers
-			</p>
-			<p class="_sand_maze_title_">
-				Sand Maze
-			</p>
-			<p class="_small_flowers_title_">
-				Small Flowers
-			</p>
-			<p class="_stalking_ocelot_title_">
-				Stalking Ocelot
-			</p>
-			<p class="_the_grass_aint_greener_title_">
-				The Grass Aint Greener
-			</p>
-			<p class="_wildWheat_title_">
-				WildWheat
-			</p>
-			<!--
-				Files Details - Video
-			-->
-			<p class="_introduction_ubuntu_title_">
-				Introduction Ubuntu
-			</p>
-			<p class="_video_size_">
-				5.3MB
-			</p>
-			<p class="_video_date_">
-				Mon 11 October, 2010
-			</p>
-			<!--
-				Files Details - Music
-			-->
-			<p class="_happyness_title_">
-				Happyness
-			</p>
-			<p class="_music_size_">
-				3.3MB
-			</p>
-			<p class="_music_date_">
-				Weds 14 October, 2010
-			</p>
-		</div>
-		<script type="text/javascript" src="../js/jquery.min.js"></script>
-		<script type="text/javascript" src="../js/jquery-ui.min.js"></script>
-		<script type="text/javascript" src="../js/lang.js"></script>
-		<script type="text/javascript" src="../js/scripts.js"></script>
-		<script type="text/javascript" src="../js/welcomesystem.js"></script>
-		<script type="text/javascript" src="../js/guidedtoursystem.js"></script>
-		<script type="text/javascript" src="../js/filesystem.js"></script>
-		<script type="text/javascript" src="../js/folders.js"></script>
-		<script type="text/javascript" src="../js/systemoverlay.js"></script>
-		<script type="text/javascript" src="../js/systemmenu.js"></script>
-		<script type="text/javascript" src="../js/internetsystem.js"></script>
-		<script type="text/javascript" src="../js/emailsystem.js"></script>
-		<script type="text/javascript" src="../js/systemsettings.js"></script>
-		<script type="text/javascript" src="../js/email.js"></script>
-		<script type="text/javascript" src="../js/errormessage.js"></script>
-		<script type="text/javascript" src="../js/ubuntuonesystem.js"></script>
-		<script type="text/javascript" src="../js/file.js"></script>
-		<script type="text/javascript" src="../js/shotwellsystem.js"></script>
-		<script type="text/javascript" src="../js/shutdownSystem.js"></script>
-		<script type="text/javascript" src="../js/movieplayersystem.js"></script>
-		<script type="text/javascript" src="../js/libresystem.js"></script>
-		<script type="text/javascript" src="../js/softwaresystem.js"></script>
-		<script type="text/javascript" src="../js/notificationsystem.js"></script>
-		<script type="text/javascript" src="../js/analytics.js"></script>
-	</body>
-</html>
diff --git a/templates/tour/favicon.ico b/templates/tour/favicon.ico
deleted file mode 100644
index a5de17bfd40..00000000000
Binary files a/templates/tour/favicon.ico and /dev/null differ
diff --git a/templates/tour/img/LICENSE b/templates/tour/img/LICENSE
deleted file mode 100644
index 223821a266a..00000000000
--- a/templates/tour/img/LICENSE
+++ /dev/null
@@ -1,307 +0,0 @@
-All images copyright Canonical Ltd.
-
-Unless otherwise indicated, artwork is available under the Creative Commons
-Attribution Share-alike license v3.0 or any later version.  To view a copy of
-this license, visit http://creativecommons.org/licenses/by-sa/3.0/ or send a
-letter to Creative Commons, 171 Second Street, Suite 300, San Francisco,
-California, 94105, USA. 
-
-See below for the full text.
-
-Some Rights Reserved:
-
-The rights in the trademarks, logos, service marks of Canonical Ltd,
-as well as the look and feel of Ubuntu, are subject to the Canonical
-Trademark Policy at http://www.ubuntu.com/ubuntu/TrademarkPolicy
-
-
-
-CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
-SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
-RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
-CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND
-DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE. 
-
-License
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
-COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
-COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
-AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE
-BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE
-CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE
-IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other
-pre-existing works, such as a translation, adaptation, derivative work,
-arrangement of music or other alterations of a literary or artistic work, or
-phonogram or performance and includes cinematographic adaptations or any other
-form in which the Work may be recast, transformed, or adapted including in any
-form recognizably derived from the original, except that a work that
-constitutes a Collection will not be considered an Adaptation for the purpose
-of this License. For the avoidance of doubt, where the Work is a musical work,
-performance or phonogram, the synchronization of the Work in timed-relation
-with a moving image ("synching") will be considered an Adaptation for the
-purpose of this License.  2. "Collection" means a collection of literary or
-artistic works, such as encyclopedias and anthologies, or performances,
-phonograms or broadcasts, or other works or subject matter other than works
-listed in Section 1(f) below, which, by reason of the selection and arrangement
-of their contents, constitute intellectual creations, in which the Work is
-included in its entirety in unmodified form along with one or more other
-contributions, each constituting separate and independent works in themselves,
-which together are assembled into a collective whole. A work that constitutes a
-Collection will not be considered an Adaptation (as defined below) for the
-purposes of this License.  3. "Creative Commons Compatible License" means a
-license that is listed at http://creativecommons.org/compatiblelicenses that
-has been approved by Creative Commons as being essentially equivalent to this
-License, including, at a minimum, because that license: (i) contains terms that
-have the same purpose, meaning and effect as the License Elements of this
-License; and, (ii) explicitly permits the relicensing of adaptations of works
-made available under that license under this License or a Creative Commons
-jurisdiction license with the same License Elements as this License.  4.
-"Distribute" means to make available to the public the original and copies of
-the Work or Adaptation, as appropriate, through sale or other transfer of
-ownership.  5. "License Elements" means the following high-level license
-attributes as selected by Licensor and indicated in the title of this License:
-Attribution, ShareAlike.  6. "Licensor" means the individual, individuals,
-entity or entities that offer(s) the Work under the terms of this License.  7.
-"Original Author" means, in the case of a literary or artistic work, the
-individual, individuals, entity or entities who created the Work or if no
-individual or entity can be identified, the publisher; and in addition (i) in
-the case of a performance the actors, singers, musicians, dancers, and other
-persons who act, sing, deliver, declaim, play in, interpret or otherwise
-perform literary or artistic works or expressions of folklore; (ii) in the case
-of a phonogram the producer being the person or legal entity who first fixes
-the sounds of a performance or other sounds; and, (iii) in the case of
-broadcasts, the organization that transmits the broadcast.  8. "Work" means the
-literary and/or artistic work offered under the terms of this License including
-without limitation any production in the literary, scientific and artistic
-domain, whatever may be the mode or form of its expression including digital
-form, such as a book, pamphlet and other writing; a lecture, address, sermon or
-other work of the same nature; a dramatic or dramatico-musical work; a
-choreographic work or entertainment in dumb show; a musical composition with or
-without words; a cinematographic work to which are assimilated works expressed
-by a process analogous to cinematography; a work of drawing, painting,
-architecture, sculpture, engraving or lithography; a photographic work to which
-are assimilated works expressed by a process analogous to photography; a work
-of applied art; an illustration, map, plan, sketch or three-dimensional work
-relative to geography, topography, architecture or science; a performance; a
-broadcast; a phonogram; a compilation of data to the extent it is protected as
-a copyrightable work; or a work performed by a variety or circus performer to
-the extent it is not otherwise considered a literary or artistic work.  9.
-"You" means an individual or entity exercising rights under this License who
-has not previously violated the terms of this License with respect to the Work,
-or who has received express permission from the Licensor to exercise rights
-under this License despite a previous violation.  10. "Publicly Perform" means
-to perform public recitations of the Work and to communicate to the public
-those public recitations, by any means or process, including by wire or
-wireless means or public digital performances; to make available to the public
-Works in such a way that members of the public may access these Works from a
-place and at a place individually chosen by them; to perform the Work to the
-public by any means or process and the communication to the public of the
-performances of the Work, including by public digital performance; to broadcast
-and rebroadcast the Work by any means including signs, sounds or images.  11.
-"Reproduce" means to make copies of the Work by any means including without
-limitation by sound or visual recordings and the right of fixation and
-reproducing fixations of the Work, including storage of a protected performance
-or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit,
-or restrict any uses free from copyright or rights arising from limitations or
-exceptions that are provided for in connection with the copyright protection
-under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor
-hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the
-duration of the applicable copyright) license to exercise the rights in the
-Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more
-Collections, and to Reproduce the Work as incorporated in the Collections; 2.
-to create and Reproduce Adaptations provided that any such Adaptation,
-including any translation in any medium, takes reasonable steps to clearly
-label, demarcate or otherwise identify that changes were made to the original
-Work. For example, a translation could be marked "The original work was
-translated from English to Spanish," or a modification could indicate "The
-original work has been modified."; 3. to Distribute and Publicly Perform the
-Work including as incorporated in Collections; and, 4. to Distribute and
-Publicly Perform Adaptations.  5.
-
-      For the avoidance of doubt: 1. Non-waivable Compulsory License Schemes.
-In those jurisdictions in which the right to collect royalties through any
-statutory or compulsory licensing scheme cannot be waived, the Licensor
-reserves the exclusive right to collect such royalties for any exercise by You
-of the rights granted under this License; 2. Waivable Compulsory License
-Schemes. In those jurisdictions in which the right to collect royalties through
-any statutory or compulsory licensing scheme can be waived, the Licensor waives
-the exclusive right to collect such royalties for any exercise by You of the
-rights granted under this License; and, 3. Voluntary License Schemes. The
-Licensor waives the right to collect royalties, whether individually or, in the
-event that the Licensor is a member of a collecting society that administers
-voluntary licensing schemes, via that society, from any exercise by You of the
-rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or
-hereafter devised. The above rights include the right to make such
-modifications as are technically necessary to exercise the rights in other
-media and formats. Subject to Section 8(f), all rights not expressly granted by
-Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made
-subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of
-this License. You must include a copy of, or the Uniform Resource Identifier
-(URI) for, this License with every copy of the Work You Distribute or Publicly
-Perform. You may not offer or impose any terms on the Work that restrict the
-terms of this License or the ability of the recipient of the Work to exercise
-the rights granted to that recipient under the terms of the License. You may
-not sublicense the Work. You must keep intact all notices that refer to this
-License and to the disclaimer of warranties with every copy of the Work You
-Distribute or Publicly Perform. When You Distribute or Publicly Perform the
-Work, You may not impose any effective technological measures on the Work that
-restrict the ability of a recipient of the Work from You to exercise the rights
-granted to that recipient under the terms of the License. This Section 4(a)
-applies to the Work as incorporated in a Collection, but this does not require
-the Collection apart from the Work itself to be made subject to the terms of
-this License. If You create a Collection, upon notice from any Licensor You
-must, to the extent practicable, remove from the Collection any credit as
-required by Section 4(c), as requested. If You create an Adaptation, upon
-notice from any Licensor You must, to the extent practicable, remove from the
-Adaptation any credit as required by Section 4(c), as requested.  2. You may
-Distribute or Publicly Perform an Adaptation only under the terms of: (i) this
-License; (ii) a later version of this License with the same License Elements as
-this License; (iii) a Creative Commons jurisdiction license (either this or a
-later license version) that contains the same License Elements as this License
-(e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible
-License. If you license the Adaptation under one of the licenses mentioned in
-(iv), you must comply with the terms of that license. If you license the
-Adaptation under the terms of any of the licenses mentioned in (i), (ii) or
-(iii) (the "Applicable License"), you must comply with the terms of the
-Applicable License generally and the following provisions: (I) You must include
-a copy of, or the URI for, the Applicable License with every copy of each
-Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose
-any terms on the Adaptation that restrict the terms of the Applicable License
-or the ability of the recipient of the Adaptation to exercise the rights
-granted to that recipient under the terms of the Applicable License; (III) You
-must keep intact all notices that refer to the Applicable License and to the
-disclaimer of warranties with every copy of the Work as included in the
-Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or
-Publicly Perform the Adaptation, You may not impose any effective technological
-measures on the Adaptation that restrict the ability of a recipient of the
-Adaptation from You to exercise the rights granted to that recipient under the
-terms of the Applicable License. This Section 4(b) applies to the Adaptation as
-incorporated in a Collection, but this does not require the Collection apart
-from the Adaptation itself to be made subject to the terms of the Applicable
-License.  3. If You Distribute, or Publicly Perform the Work or any Adaptations
-or Collections, You must, unless a request has been made pursuant to Section
-4(a), keep intact all copyright notices for the Work and provide, reasonable to
-the medium or means You are utilizing: (i) the name of the Original Author (or
-pseudonym, if applicable) if supplied, and/or if the Original Author and/or
-Licensor designate another party or parties (e.g., a sponsor institute,
-publishing entity, journal) for attribution ("Attribution Parties") in
-Licensor's copyright notice, terms of service or by other reasonable means, the
-name of such party or parties; (ii) the title of the Work if supplied; (iii) to
-the extent reasonably practicable, the URI, if any, that Licensor specifies to
-be associated with the Work, unless such URI does not refer to the copyright
-notice or licensing information for the Work; and (iv) , consistent with
-Ssection 3(b), in the case of an Adaptation, a credit identifying the use of
-the Work in the Adaptation (e.g., "French translation of the Work by Original
-Author," or "Screenplay based on original Work by Original Author"). The credit
-required by this Section 4(c) may be implemented in any reasonable manner;
-provided, however, that in the case of a Adaptation or Collection, at a minimum
-such credit will appear, if a credit for all contributing authors of the
-Adaptation or Collection appears, then as part of these credits and in a manner
-at least as prominent as the credits for the other contributing authors. For
-the avoidance of doubt, You may only use the credit required by this Section
-for the purpose of attribution in the manner set out above and, by exercising
-Your rights under this License, You may not implicitly or explicitly assert or
-imply any connection with, sponsorship or endorsement by the Original Author,
-Licensor and/or Attribution Parties, as appropriate, of You or Your use of the
-Work, without the separate, express prior written permission of the Original
-Author, Licensor and/or Attribution Parties.  4. Except as otherwise agreed in
-writing by the Licensor or as may be otherwise permitted by applicable law, if
-You Reproduce, Distribute or Publicly Perform the Work either by itself or as
-part of any Adaptations or Collections, You must not distort, mutilate, modify
-or take other derogatory action in relation to the Work which would be
-prejudicial to the Original Author's honor or reputation. Licensor agrees that
-in those jurisdictions (e.g. Japan), in which any exercise of the right granted
-in Section 3(b) of this License (the right to make Adaptations) would be deemed
-to be a distortion, mutilation, modification or other derogatory action
-prejudicial to the Original Author's honor and reputation, the Licensor will
-waive or not assert, as appropriate, this Section, to the fullest extent
-permitted by the applicable national law, to enable You to reasonably exercise
-Your right under Section 3(b) of this License (right to make Adaptations) but
-not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
-THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND
-CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING,
-WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A
-PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS,
-ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE.
-SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH
-EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN
-NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL,
-INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS
-LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate
-automatically upon any breach by You of the terms of this License. Individuals
-or entities who have received Adaptations or Collections from You under this
-License, however, will not have their licenses terminated provided such
-individuals or entities remain in full compliance with those licenses. Sections
-1, 2, 5, 6, 7, and 8 will survive any termination of this License.  2. Subject
-to the above terms and conditions, the license granted here is perpetual (for
-the duration of the applicable copyright in the Work). Notwithstanding the
-above, Licensor reserves the right to release the Work under different license
-terms or to stop distributing the Work at any time; provided, however that any
-such election will not serve to withdraw this License (or any other license
-that has been, or is required to be, granted under the terms of this License),
-and this License will continue in full force and effect unless terminated as
-stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection,
-the Licensor offers to the recipient a license to the Work on the same terms
-and conditions as the license granted to You under this License.  2. Each time
-You Distribute or Publicly Perform an Adaptation, Licensor offers to the
-recipient a license to the original Work on the same terms and conditions as
-the license granted to You under this License.  3. If any provision of this
-License is invalid or unenforceable under applicable law, it shall not affect
-the validity or enforceability of the remainder of the terms of this License,
-and without further action by the parties to this agreement, such provision
-shall be reformed to the minimum extent necessary to make such provision valid
-and enforceable.  4. No term or provision of this License shall be deemed
-waived and no breach consented to unless such waiver or consent shall be in
-writing and signed by the party to be charged with such waiver or consent.  5.
-This License constitutes the entire agreement between the parties with respect
-to the Work licensed here. There are no understandings, agreements or
-representations with respect to the Work not specified here. Licensor shall not
-be bound by any additional provisions that may appear in any communication from
-You. This License may not be modified without the mutual written agreement of
-the Licensor and You.  6. The rights granted under, and the subject matter
-referenced, in this License were drafted utilizing the terminology of the Berne
-Convention for the Protection of Literary and Artistic Works (as amended on
-September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of
-1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal
-Copyright Convention (as revised on July 24, 1971). These rights and subject
-matter take effect in the relevant jurisdiction in which the License terms are
-sought to be enforced according to the corresponding provisions of the
-implementation of those treaty provisions in the applicable national law. If
-the standard suite of rights granted under applicable copyright law includes
-additional rights not granted under this License, such additional rights are
-deemed to be included in the License; this License is not intended to restrict
-the license of any rights under applicable law.
diff --git a/templates/tour/img/applications/aboutme.png b/templates/tour/img/applications/aboutme.png
deleted file mode 100644
index 55c48427835..00000000000
Binary files a/templates/tour/img/applications/aboutme.png and /dev/null differ
diff --git a/templates/tour/img/applications/aboutubuntu.png b/templates/tour/img/applications/aboutubuntu.png
deleted file mode 100644
index 38e2569ab76..00000000000
Binary files a/templates/tour/img/applications/aboutubuntu.png and /dev/null differ
diff --git a/templates/tour/img/applications/additionaldrivers.png b/templates/tour/img/applications/additionaldrivers.png
deleted file mode 100644
index f18bb8e3de2..00000000000
Binary files a/templates/tour/img/applications/additionaldrivers.png and /dev/null differ
diff --git a/templates/tour/img/applications/appearance.png b/templates/tour/img/applications/appearance.png
deleted file mode 100644
index b5b3ac3e103..00000000000
Binary files a/templates/tour/img/applications/appearance.png and /dev/null differ
diff --git a/templates/tour/img/applications/assistive.png b/templates/tour/img/applications/assistive.png
deleted file mode 100644
index 2ca9dcf8bd1..00000000000
Binary files a/templates/tour/img/applications/assistive.png and /dev/null differ
diff --git a/templates/tour/img/applications/audio.png b/templates/tour/img/applications/audio.png
deleted file mode 100644
index adfff3d410b..00000000000
Binary files a/templates/tour/img/applications/audio.png and /dev/null differ
diff --git a/templates/tour/img/applications/banshee.png b/templates/tour/img/applications/banshee.png
deleted file mode 100644
index 048cd4cf50e..00000000000
Binary files a/templates/tour/img/applications/banshee.png and /dev/null differ
diff --git a/templates/tour/img/applications/bluetooth.png b/templates/tour/img/applications/bluetooth.png
deleted file mode 100644
index ffb1f6122cf..00000000000
Binary files a/templates/tour/img/applications/bluetooth.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/aboutme.png b/templates/tour/img/applications/blur/aboutme.png
deleted file mode 100644
index ee998178c44..00000000000
Binary files a/templates/tour/img/applications/blur/aboutme.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/aboutubuntu.png b/templates/tour/img/applications/blur/aboutubuntu.png
deleted file mode 100644
index e03a0bf61fe..00000000000
Binary files a/templates/tour/img/applications/blur/aboutubuntu.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/additionaldrivers.png b/templates/tour/img/applications/blur/additionaldrivers.png
deleted file mode 100644
index e46e93cf819..00000000000
Binary files a/templates/tour/img/applications/blur/additionaldrivers.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/appearance.png b/templates/tour/img/applications/blur/appearance.png
deleted file mode 100644
index fe6e559ae39..00000000000
Binary files a/templates/tour/img/applications/blur/appearance.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/assistive.png b/templates/tour/img/applications/blur/assistive.png
deleted file mode 100644
index 2e4998727e5..00000000000
Binary files a/templates/tour/img/applications/blur/assistive.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/audio.png b/templates/tour/img/applications/blur/audio.png
deleted file mode 100644
index aeb41987d87..00000000000
Binary files a/templates/tour/img/applications/blur/audio.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/banshee.png b/templates/tour/img/applications/blur/banshee.png
deleted file mode 100644
index 8df5d327ffc..00000000000
Binary files a/templates/tour/img/applications/blur/banshee.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/bluetooth.png b/templates/tour/img/applications/blur/bluetooth.png
deleted file mode 100644
index 848cb96c0f9..00000000000
Binary files a/templates/tour/img/applications/blur/bluetooth.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/brasero.png b/templates/tour/img/applications/blur/brasero.png
deleted file mode 100644
index 0499e150a89..00000000000
Binary files a/templates/tour/img/applications/blur/brasero.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/calc.png b/templates/tour/img/applications/blur/calc.png
deleted file mode 100644
index a298b76e058..00000000000
Binary files a/templates/tour/img/applications/blur/calc.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/draw.png b/templates/tour/img/applications/blur/draw.png
deleted file mode 100644
index 1917a985364..00000000000
Binary files a/templates/tour/img/applications/blur/draw.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/empathy.png b/templates/tour/img/applications/blur/empathy.png
deleted file mode 100644
index f50736a1e5a..00000000000
Binary files a/templates/tour/img/applications/blur/empathy.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/firefox.png b/templates/tour/img/applications/blur/firefox.png
deleted file mode 100644
index f4ca3512546..00000000000
Binary files a/templates/tour/img/applications/blur/firefox.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/folder.png b/templates/tour/img/applications/blur/folder.png
deleted file mode 100644
index c667ee2011d..00000000000
Binary files a/templates/tour/img/applications/blur/folder.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/gimp.png b/templates/tour/img/applications/blur/gimp.png
deleted file mode 100644
index 254cf55cd12..00000000000
Binary files a/templates/tour/img/applications/blur/gimp.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/gwibber.png b/templates/tour/img/applications/blur/gwibber.png
deleted file mode 100644
index dbb45c1f364..00000000000
Binary files a/templates/tour/img/applications/blur/gwibber.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/impress.png b/templates/tour/img/applications/blur/impress.png
deleted file mode 100644
index b8da2bf387b..00000000000
Binary files a/templates/tour/img/applications/blur/impress.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/math.png b/templates/tour/img/applications/blur/math.png
deleted file mode 100644
index 61b94095375..00000000000
Binary files a/templates/tour/img/applications/blur/math.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/movieplayer.png b/templates/tour/img/applications/blur/movieplayer.png
deleted file mode 100644
index cc6e37d0b33..00000000000
Binary files a/templates/tour/img/applications/blur/movieplayer.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/pitivi.png b/templates/tour/img/applications/blur/pitivi.png
deleted file mode 100644
index 8bfd593c0b2..00000000000
Binary files a/templates/tour/img/applications/blur/pitivi.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/remotedesktop.png b/templates/tour/img/applications/blur/remotedesktop.png
deleted file mode 100644
index 2f7f81cd676..00000000000
Binary files a/templates/tour/img/applications/blur/remotedesktop.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/screenshot.png b/templates/tour/img/applications/blur/screenshot.png
deleted file mode 100644
index 46ad5d8d448..00000000000
Binary files a/templates/tour/img/applications/blur/screenshot.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/shotwell.png b/templates/tour/img/applications/blur/shotwell.png
deleted file mode 100644
index 9d788018230..00000000000
Binary files a/templates/tour/img/applications/blur/shotwell.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/solitaire.png b/templates/tour/img/applications/blur/solitaire.png
deleted file mode 100644
index 32f432cfdfd..00000000000
Binary files a/templates/tour/img/applications/blur/solitaire.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/soundrecorder.png b/templates/tour/img/applications/blur/soundrecorder.png
deleted file mode 100644
index 49152acb539..00000000000
Binary files a/templates/tour/img/applications/blur/soundrecorder.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/systemsettings.png b/templates/tour/img/applications/blur/systemsettings.png
deleted file mode 100644
index 10167c7cfb6..00000000000
Binary files a/templates/tour/img/applications/blur/systemsettings.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/terminalserver.png b/templates/tour/img/applications/blur/terminalserver.png
deleted file mode 100644
index 94285ca5a58..00000000000
Binary files a/templates/tour/img/applications/blur/terminalserver.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/thunderbird.png b/templates/tour/img/applications/blur/thunderbird.png
deleted file mode 100644
index e3380143f48..00000000000
Binary files a/templates/tour/img/applications/blur/thunderbird.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/unknown.png b/templates/tour/img/applications/blur/unknown.png
deleted file mode 100644
index 75579d5fda6..00000000000
Binary files a/templates/tour/img/applications/blur/unknown.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/writer.png b/templates/tour/img/applications/blur/writer.png
deleted file mode 100644
index c97c4c9a4ac..00000000000
Binary files a/templates/tour/img/applications/blur/writer.png and /dev/null differ
diff --git a/templates/tour/img/applications/blur/xchat.png b/templates/tour/img/applications/blur/xchat.png
deleted file mode 100644
index caec33d16db..00000000000
Binary files a/templates/tour/img/applications/blur/xchat.png and /dev/null differ
diff --git a/templates/tour/img/applications/brasero.png b/templates/tour/img/applications/brasero.png
deleted file mode 100644
index d2cb05987e8..00000000000
Binary files a/templates/tour/img/applications/brasero.png and /dev/null differ
diff --git a/templates/tour/img/applications/calc.png b/templates/tour/img/applications/calc.png
deleted file mode 100644
index 7de1c94b9f3..00000000000
Binary files a/templates/tour/img/applications/calc.png and /dev/null differ
diff --git a/templates/tour/img/applications/draw.png b/templates/tour/img/applications/draw.png
deleted file mode 100644
index ed50b39f067..00000000000
Binary files a/templates/tour/img/applications/draw.png and /dev/null differ
diff --git a/templates/tour/img/applications/empathy.png b/templates/tour/img/applications/empathy.png
deleted file mode 100644
index 54243d2a0b5..00000000000
Binary files a/templates/tour/img/applications/empathy.png and /dev/null differ
diff --git a/templates/tour/img/applications/firefox.png b/templates/tour/img/applications/firefox.png
deleted file mode 100644
index be7271b2a6a..00000000000
Binary files a/templates/tour/img/applications/firefox.png and /dev/null differ
diff --git a/templates/tour/img/applications/folder.png b/templates/tour/img/applications/folder.png
deleted file mode 100644
index 870f15b23aa..00000000000
Binary files a/templates/tour/img/applications/folder.png and /dev/null differ
diff --git a/templates/tour/img/applications/gimp.png b/templates/tour/img/applications/gimp.png
deleted file mode 100644
index 7184a88eeb5..00000000000
Binary files a/templates/tour/img/applications/gimp.png and /dev/null differ
diff --git a/templates/tour/img/applications/gwibber.png b/templates/tour/img/applications/gwibber.png
deleted file mode 100644
index 08ad0d5e103..00000000000
Binary files a/templates/tour/img/applications/gwibber.png and /dev/null differ
diff --git a/templates/tour/img/applications/impress.png b/templates/tour/img/applications/impress.png
deleted file mode 100644
index 73b91acedff..00000000000
Binary files a/templates/tour/img/applications/impress.png and /dev/null differ
diff --git a/templates/tour/img/applications/math.png b/templates/tour/img/applications/math.png
deleted file mode 100644
index d10fe06c43c..00000000000
Binary files a/templates/tour/img/applications/math.png and /dev/null differ
diff --git a/templates/tour/img/applications/movieplayer.png b/templates/tour/img/applications/movieplayer.png
deleted file mode 100644
index 2d8287439ce..00000000000
Binary files a/templates/tour/img/applications/movieplayer.png and /dev/null differ
diff --git a/templates/tour/img/applications/pitivi.png b/templates/tour/img/applications/pitivi.png
deleted file mode 100644
index 16ed39b7884..00000000000
Binary files a/templates/tour/img/applications/pitivi.png and /dev/null differ
diff --git a/templates/tour/img/applications/remotedesktop.png b/templates/tour/img/applications/remotedesktop.png
deleted file mode 100644
index 658fbaca58e..00000000000
Binary files a/templates/tour/img/applications/remotedesktop.png and /dev/null differ
diff --git a/templates/tour/img/applications/screenshot.png b/templates/tour/img/applications/screenshot.png
deleted file mode 100644
index 02e67e9afbe..00000000000
Binary files a/templates/tour/img/applications/screenshot.png and /dev/null differ
diff --git a/templates/tour/img/applications/shotwell.png b/templates/tour/img/applications/shotwell.png
deleted file mode 100644
index 20d58983d2e..00000000000
Binary files a/templates/tour/img/applications/shotwell.png and /dev/null differ
diff --git a/templates/tour/img/applications/solitaire.png b/templates/tour/img/applications/solitaire.png
deleted file mode 100644
index 5141afb0f01..00000000000
Binary files a/templates/tour/img/applications/solitaire.png and /dev/null differ
diff --git a/templates/tour/img/applications/soundrecorder.png b/templates/tour/img/applications/soundrecorder.png
deleted file mode 100644
index f458e7a71b5..00000000000
Binary files a/templates/tour/img/applications/soundrecorder.png and /dev/null differ
diff --git a/templates/tour/img/applications/systemsettings.png b/templates/tour/img/applications/systemsettings.png
deleted file mode 100644
index 88b50af1a9f..00000000000
Binary files a/templates/tour/img/applications/systemsettings.png and /dev/null differ
diff --git a/templates/tour/img/applications/terminalserver.png b/templates/tour/img/applications/terminalserver.png
deleted file mode 100644
index 447c4361e4a..00000000000
Binary files a/templates/tour/img/applications/terminalserver.png and /dev/null differ
diff --git a/templates/tour/img/applications/thunderbird.png b/templates/tour/img/applications/thunderbird.png
deleted file mode 100644
index 8750e673839..00000000000
Binary files a/templates/tour/img/applications/thunderbird.png and /dev/null differ
diff --git a/templates/tour/img/applications/unknown.png b/templates/tour/img/applications/unknown.png
deleted file mode 100644
index b6bc56dbeb5..00000000000
Binary files a/templates/tour/img/applications/unknown.png and /dev/null differ
diff --git a/templates/tour/img/applications/writer.png b/templates/tour/img/applications/writer.png
deleted file mode 100644
index 85111e222c4..00000000000
Binary files a/templates/tour/img/applications/writer.png and /dev/null differ
diff --git a/templates/tour/img/applications/xchat.png b/templates/tour/img/applications/xchat.png
deleted file mode 100644
index 647c78ddbe4..00000000000
Binary files a/templates/tour/img/applications/xchat.png and /dev/null differ
diff --git a/templates/tour/img/background-slider.png b/templates/tour/img/background-slider.png
deleted file mode 100644
index b8a48bd8483..00000000000
Binary files a/templates/tour/img/background-slider.png and /dev/null differ
diff --git a/templates/tour/img/background.jpg b/templates/tour/img/background.jpg
deleted file mode 100644
index 05ebf7080c0..00000000000
Binary files a/templates/tour/img/background.jpg and /dev/null differ
diff --git a/templates/tour/img/black-bg-00.png b/templates/tour/img/black-bg-00.png
deleted file mode 100644
index d1be506abca..00000000000
Binary files a/templates/tour/img/black-bg-00.png and /dev/null differ
diff --git a/templates/tour/img/black-bg-20.png b/templates/tour/img/black-bg-20.png
deleted file mode 100644
index 1027ae5fb7d..00000000000
Binary files a/templates/tour/img/black-bg-20.png and /dev/null differ
diff --git a/templates/tour/img/black-bg-30.png b/templates/tour/img/black-bg-30.png
deleted file mode 100644
index 0ac03e4df17..00000000000
Binary files a/templates/tour/img/black-bg-30.png and /dev/null differ
diff --git a/templates/tour/img/black-bg-40.png b/templates/tour/img/black-bg-40.png
deleted file mode 100644
index bb2636ba814..00000000000
Binary files a/templates/tour/img/black-bg-40.png and /dev/null differ
diff --git a/templates/tour/img/black-bg-60.png b/templates/tour/img/black-bg-60.png
deleted file mode 100644
index 63507276988..00000000000
Binary files a/templates/tour/img/black-bg-60.png and /dev/null differ
diff --git a/templates/tour/img/black-bg-80.png b/templates/tour/img/black-bg-80.png
deleted file mode 100644
index f11c3f381b8..00000000000
Binary files a/templates/tour/img/black-bg-80.png and /dev/null differ
diff --git a/templates/tour/img/blur/background-slider.png b/templates/tour/img/blur/background-slider.png
deleted file mode 100644
index 9c2f0776e4e..00000000000
Binary files a/templates/tour/img/blur/background-slider.png and /dev/null differ
diff --git a/templates/tour/img/blur/black-bg-40 (Anthony Dillon's conflicted copy 2011-10-03).png b/templates/tour/img/blur/black-bg-40 (Anthony Dillon's conflicted copy 2011-10-03).png
deleted file mode 100644
index 7f89dc19958..00000000000
Binary files a/templates/tour/img/blur/black-bg-40 (Anthony Dillon's conflicted copy 2011-10-03).png and /dev/null differ
diff --git a/templates/tour/img/blur/black-bg-40.png b/templates/tour/img/blur/black-bg-40.png
deleted file mode 100644
index bb2636ba814..00000000000
Binary files a/templates/tour/img/blur/black-bg-40.png and /dev/null differ
diff --git a/templates/tour/img/blur/black-bg-80 (Anthony Dillon's conflicted copy 2011-10-03).png b/templates/tour/img/blur/black-bg-80 (Anthony Dillon's conflicted copy 2011-10-03).png
deleted file mode 100644
index afc7933b9ac..00000000000
Binary files a/templates/tour/img/blur/black-bg-80 (Anthony Dillon's conflicted copy 2011-10-03).png and /dev/null differ
diff --git a/templates/tour/img/blur/black-bg-80.png b/templates/tour/img/blur/black-bg-80.png
deleted file mode 100644
index f11c3f381b8..00000000000
Binary files a/templates/tour/img/blur/black-bg-80.png and /dev/null differ
diff --git a/templates/tour/img/blur/button-slider.png b/templates/tour/img/blur/button-slider.png
deleted file mode 100644
index 99441705539..00000000000
Binary files a/templates/tour/img/blur/button-slider.png and /dev/null differ
diff --git a/templates/tour/img/blur/close-button.jpg b/templates/tour/img/blur/close-button.jpg
deleted file mode 100644
index 3ea3b0d8f76..00000000000
Binary files a/templates/tour/img/blur/close-button.jpg and /dev/null differ
diff --git a/templates/tour/img/blur/librecalc.jpg b/templates/tour/img/blur/librecalc.jpg
deleted file mode 100644
index baff2a8ea7c..00000000000
Binary files a/templates/tour/img/blur/librecalc.jpg and /dev/null differ
diff --git a/templates/tour/img/blur/libreimpress.jpg b/templates/tour/img/blur/libreimpress.jpg
deleted file mode 100644
index 3ac66e24280..00000000000
Binary files a/templates/tour/img/blur/libreimpress.jpg and /dev/null differ
diff --git a/templates/tour/img/blur/librewriter.jpg b/templates/tour/img/blur/librewriter.jpg
deleted file mode 100644
index 8a6a3ed3af6..00000000000
Binary files a/templates/tour/img/blur/librewriter.jpg and /dev/null differ
diff --git a/templates/tour/img/blur/max-button.jpg b/templates/tour/img/blur/max-button.jpg
deleted file mode 100644
index a57c5a5a4c7..00000000000
Binary files a/templates/tour/img/blur/max-button.jpg and /dev/null differ
diff --git a/templates/tour/img/blur/min-button.jpg b/templates/tour/img/blur/min-button.jpg
deleted file mode 100644
index 8503955e157..00000000000
Binary files a/templates/tour/img/blur/min-button.jpg and /dev/null differ
diff --git a/templates/tour/img/blur/powerwarning.jpg b/templates/tour/img/blur/powerwarning.jpg
deleted file mode 100644
index d09692fa76d..00000000000
Binary files a/templates/tour/img/blur/powerwarning.jpg and /dev/null differ
diff --git a/templates/tour/img/blur/speaker-bg-slider.png b/templates/tour/img/blur/speaker-bg-slider.png
deleted file mode 100644
index ce97b4e6f42..00000000000
Binary files a/templates/tour/img/blur/speaker-bg-slider.png and /dev/null differ
diff --git a/templates/tour/img/blur/top-bg-selected.jpg b/templates/tour/img/blur/top-bg-selected.jpg
deleted file mode 100644
index 5f356147b03..00000000000
Binary files a/templates/tour/img/blur/top-bg-selected.jpg and /dev/null differ
diff --git a/templates/tour/img/blur/top-bg.jpg b/templates/tour/img/blur/top-bg.jpg
deleted file mode 100644
index dee6580f61b..00000000000
Binary files a/templates/tour/img/blur/top-bg.jpg and /dev/null differ
diff --git a/templates/tour/img/blur/topleft-button.jpg b/templates/tour/img/blur/topleft-button.jpg
deleted file mode 100644
index 25b775b35f0..00000000000
Binary files a/templates/tour/img/blur/topleft-button.jpg and /dev/null differ
diff --git a/templates/tour/img/blur/topleft-button.png b/templates/tour/img/blur/topleft-button.png
deleted file mode 100644
index 4b7399f74ef..00000000000
Binary files a/templates/tour/img/blur/topleft-button.png and /dev/null differ
diff --git a/templates/tour/img/button-slider.png b/templates/tour/img/button-slider.png
deleted file mode 100644
index 4cd0d01a2a1..00000000000
Binary files a/templates/tour/img/button-slider.png and /dev/null differ
diff --git a/templates/tour/img/close-button.jpg b/templates/tour/img/close-button.jpg
deleted file mode 100644
index 0faeb7268b0..00000000000
Binary files a/templates/tour/img/close-button.jpg and /dev/null differ
diff --git a/templates/tour/img/dash-bg-60.png b/templates/tour/img/dash-bg-60.png
deleted file mode 100644
index 1bdd66789bd..00000000000
Binary files a/templates/tour/img/dash-bg-60.png and /dev/null differ
diff --git a/templates/tour/img/dash/dash-applications.png b/templates/tour/img/dash/dash-applications.png
deleted file mode 100644
index 347367ba5e5..00000000000
Binary files a/templates/tour/img/dash/dash-applications.png and /dev/null differ
diff --git a/templates/tour/img/dash/dash-close-clicked.png b/templates/tour/img/dash/dash-close-clicked.png
deleted file mode 100644
index 0c3bca4bedc..00000000000
Binary files a/templates/tour/img/dash/dash-close-clicked.png and /dev/null differ
diff --git a/templates/tour/img/dash/dash-close.png b/templates/tour/img/dash/dash-close.png
deleted file mode 100644
index f7eabce1d23..00000000000
Binary files a/templates/tour/img/dash/dash-close.png and /dev/null differ
diff --git a/templates/tour/img/dash/dash-files.png b/templates/tour/img/dash/dash-files.png
deleted file mode 100644
index bc9839a7f69..00000000000
Binary files a/templates/tour/img/dash/dash-files.png and /dev/null differ
diff --git a/templates/tour/img/dash/dash-home.png b/templates/tour/img/dash/dash-home.png
deleted file mode 100644
index 956afe9dfa3..00000000000
Binary files a/templates/tour/img/dash/dash-home.png and /dev/null differ
diff --git a/templates/tour/img/dash/dash-max.png b/templates/tour/img/dash/dash-max.png
deleted file mode 100644
index 08689c0ac9d..00000000000
Binary files a/templates/tour/img/dash/dash-max.png and /dev/null differ
diff --git a/templates/tour/img/dash/dash-min.png b/templates/tour/img/dash/dash-min.png
deleted file mode 100644
index 5fba787e8fc..00000000000
Binary files a/templates/tour/img/dash/dash-min.png and /dev/null differ
diff --git a/templates/tour/img/dash/dash-music.png b/templates/tour/img/dash/dash-music.png
deleted file mode 100644
index 4b59fbcd028..00000000000
Binary files a/templates/tour/img/dash/dash-music.png and /dev/null differ
diff --git a/templates/tour/img/dash/dash-video.png b/templates/tour/img/dash/dash-video.png
deleted file mode 100644
index 8e203b30451..00000000000
Binary files a/templates/tour/img/dash/dash-video.png and /dev/null differ
diff --git a/templates/tour/img/dash/min_normal.png b/templates/tour/img/dash/min_normal.png
deleted file mode 100644
index 54ef8099bb4..00000000000
Binary files a/templates/tour/img/dash/min_normal.png and /dev/null differ
diff --git a/templates/tour/img/dash/unmax_normal.png b/templates/tour/img/dash/unmax_normal.png
deleted file mode 100644
index 57917da1ef4..00000000000
Binary files a/templates/tour/img/dash/unmax_normal.png and /dev/null differ
diff --git a/templates/tour/img/email/address-book.jpg b/templates/tour/img/email/address-book.jpg
deleted file mode 100644
index 387468446e7..00000000000
Binary files a/templates/tour/img/email/address-book.jpg and /dev/null differ
diff --git a/templates/tour/img/email/archive-logo.jpg b/templates/tour/img/email/archive-logo.jpg
deleted file mode 100644
index a9bf1dca76c..00000000000
Binary files a/templates/tour/img/email/archive-logo.jpg and /dev/null differ
diff --git a/templates/tour/img/email/archive-logo.png b/templates/tour/img/email/archive-logo.png
deleted file mode 100644
index fd1e8acdcde..00000000000
Binary files a/templates/tour/img/email/archive-logo.png and /dev/null differ
diff --git a/templates/tour/img/email/archive.jpg b/templates/tour/img/email/archive.jpg
deleted file mode 100644
index ab1bb30ff39..00000000000
Binary files a/templates/tour/img/email/archive.jpg and /dev/null differ
diff --git a/templates/tour/img/email/attach.jpg b/templates/tour/img/email/attach.jpg
deleted file mode 100644
index ac26e634e10..00000000000
Binary files a/templates/tour/img/email/attach.jpg and /dev/null differ
diff --git a/templates/tour/img/email/blur/address-book.jpg b/templates/tour/img/email/blur/address-book.jpg
deleted file mode 100644
index df65a6e0653..00000000000
Binary files a/templates/tour/img/email/blur/address-book.jpg and /dev/null differ
diff --git a/templates/tour/img/email/blur/archive-logo.jpg b/templates/tour/img/email/blur/archive-logo.jpg
deleted file mode 100644
index f621b62d191..00000000000
Binary files a/templates/tour/img/email/blur/archive-logo.jpg and /dev/null differ
diff --git a/templates/tour/img/email/blur/archive-logo.png b/templates/tour/img/email/blur/archive-logo.png
deleted file mode 100644
index bbc2e2c09fb..00000000000
Binary files a/templates/tour/img/email/blur/archive-logo.png and /dev/null differ
diff --git a/templates/tour/img/email/blur/archive.jpg b/templates/tour/img/email/blur/archive.jpg
deleted file mode 100644
index edd20520cc7..00000000000
Binary files a/templates/tour/img/email/blur/archive.jpg and /dev/null differ
diff --git a/templates/tour/img/email/blur/archive.png b/templates/tour/img/email/blur/archive.png
deleted file mode 100644
index 88c7e5df669..00000000000
Binary files a/templates/tour/img/email/blur/archive.png and /dev/null differ
diff --git a/templates/tour/img/email/blur/attach.jpg b/templates/tour/img/email/blur/attach.jpg
deleted file mode 100644
index ffc2bd86864..00000000000
Binary files a/templates/tour/img/email/blur/attach.jpg and /dev/null differ
diff --git a/templates/tour/img/email/blur/clip.png b/templates/tour/img/email/blur/clip.png
deleted file mode 100644
index c110755cf33..00000000000
Binary files a/templates/tour/img/email/blur/clip.png and /dev/null differ
diff --git a/templates/tour/img/email/blur/connection.jpg b/templates/tour/img/email/blur/connection.jpg
deleted file mode 100644
index c7682385c12..00000000000
Binary files a/templates/tour/img/email/blur/connection.jpg and /dev/null differ
diff --git a/templates/tour/img/email/blur/delete.jpg b/templates/tour/img/email/blur/delete.jpg
deleted file mode 100644
index 30e1a7d7497..00000000000
Binary files a/templates/tour/img/email/blur/delete.jpg and /dev/null differ
diff --git a/templates/tour/img/email/blur/disabled-format-buttons.jpg b/templates/tour/img/email/blur/disabled-format-buttons.jpg
deleted file mode 100644
index 43f4e7f16e2..00000000000
Binary files a/templates/tour/img/email/blur/disabled-format-buttons.jpg and /dev/null differ
diff --git a/templates/tour/img/email/blur/divider.jpg b/templates/tour/img/email/blur/divider.jpg
deleted file mode 100644
index 81dfd1b43a5..00000000000
Binary files a/templates/tour/img/email/blur/divider.jpg and /dev/null differ
diff --git a/templates/tour/img/email/blur/divider.png b/templates/tour/img/email/blur/divider.png
deleted file mode 100644
index 6bd99943a64..00000000000
Binary files a/templates/tour/img/email/blur/divider.png and /dev/null differ
diff --git a/templates/tour/img/email/blur/drafts.png b/templates/tour/img/email/blur/drafts.png
deleted file mode 100644
index 698ecccd504..00000000000
Binary files a/templates/tour/img/email/blur/drafts.png and /dev/null differ
diff --git a/templates/tour/img/email/blur/fire.png b/templates/tour/img/email/blur/fire.png
deleted file mode 100644
index 2f0269ded99..00000000000
Binary files a/templates/tour/img/email/blur/fire.png and /dev/null differ
diff --git a/templates/tour/img/email/blur/forward-logo.png b/templates/tour/img/email/blur/forward-logo.png
deleted file mode 100644
index ca295cd8ff7..00000000000
Binary files a/templates/tour/img/email/blur/forward-logo.png and /dev/null differ
diff --git a/templates/tour/img/email/blur/forward-reply-logo.png b/templates/tour/img/email/blur/forward-reply-logo.png
deleted file mode 100644
index fde8a5a804a..00000000000
Binary files a/templates/tour/img/email/blur/forward-reply-logo.png and /dev/null differ
diff --git a/templates/tour/img/email/blur/forward.jpg b/templates/tour/img/email/blur/forward.jpg
deleted file mode 100644
index a8036f4e15e..00000000000
Binary files a/templates/tour/img/email/blur/forward.jpg and /dev/null differ
diff --git a/templates/tour/img/email/blur/get-mail.jpg b/templates/tour/img/email/blur/get-mail.jpg
deleted file mode 100644
index 86efa1739b9..00000000000
Binary files a/templates/tour/img/email/blur/get-mail.jpg and /dev/null differ
diff --git a/templates/tour/img/email/blur/glasses.png b/templates/tour/img/email/blur/glasses.png
deleted file mode 100644
index a3f5151f215..00000000000
Binary files a/templates/tour/img/email/blur/glasses.png and /dev/null differ
diff --git a/templates/tour/img/email/blur/header-bg.jpg b/templates/tour/img/email/blur/header-bg.jpg
deleted file mode 100644
index 99b227dd1d4..00000000000
Binary files a/templates/tour/img/email/blur/header-bg.jpg and /dev/null differ
diff --git a/templates/tour/img/email/blur/inbox.png b/templates/tour/img/email/blur/inbox.png
deleted file mode 100644
index 69192585dab..00000000000
Binary files a/templates/tour/img/email/blur/inbox.png and /dev/null differ
diff --git a/templates/tour/img/email/blur/junk.jpg b/templates/tour/img/email/blur/junk.jpg
deleted file mode 100644
index f9965e5e8c5..00000000000
Binary files a/templates/tour/img/email/blur/junk.jpg and /dev/null differ
diff --git a/templates/tour/img/email/blur/large-fire.jpg b/templates/tour/img/email/blur/large-fire.jpg
deleted file mode 100644
index 5319efec083..00000000000
Binary files a/templates/tour/img/email/blur/large-fire.jpg and /dev/null differ
diff --git a/templates/tour/img/email/blur/message-glasses.png b/templates/tour/img/email/blur/message-glasses.png
deleted file mode 100644
index 16e5bf2d7ec..00000000000
Binary files a/templates/tour/img/email/blur/message-glasses.png and /dev/null differ
diff --git a/templates/tour/img/email/blur/message-starred.png b/templates/tour/img/email/blur/message-starred.png
deleted file mode 100644
index b5cd5afdcb7..00000000000
Binary files a/templates/tour/img/email/blur/message-starred.png and /dev/null differ
diff --git a/templates/tour/img/email/blur/not-junk.jpg b/templates/tour/img/email/blur/not-junk.jpg
deleted file mode 100644
index da07c2a3de7..00000000000
Binary files a/templates/tour/img/email/blur/not-junk.jpg and /dev/null differ
diff --git a/templates/tour/img/email/blur/read.png b/templates/tour/img/email/blur/read.png
deleted file mode 100644
index c5499eb0fb2..00000000000
Binary files a/templates/tour/img/email/blur/read.png and /dev/null differ
diff --git a/templates/tour/img/email/blur/reply-logo.png b/templates/tour/img/email/blur/reply-logo.png
deleted file mode 100644
index 580c828f805..00000000000
Binary files a/templates/tour/img/email/blur/reply-logo.png and /dev/null differ
diff --git a/templates/tour/img/email/blur/reply.jpg b/templates/tour/img/email/blur/reply.jpg
deleted file mode 100644
index 86e02dddeea..00000000000
Binary files a/templates/tour/img/email/blur/reply.jpg and /dev/null differ
diff --git a/templates/tour/img/email/blur/sent.png b/templates/tour/img/email/blur/sent.png
deleted file mode 100644
index cd474668bbe..00000000000
Binary files a/templates/tour/img/email/blur/sent.png and /dev/null differ
diff --git a/templates/tour/img/email/blur/star.png b/templates/tour/img/email/blur/star.png
deleted file mode 100644
index 759dc22e276..00000000000
Binary files a/templates/tour/img/email/blur/star.png and /dev/null differ
diff --git a/templates/tour/img/email/blur/t.png b/templates/tour/img/email/blur/t.png
deleted file mode 100644
index ecf997a7a00..00000000000
Binary files a/templates/tour/img/email/blur/t.png and /dev/null differ
diff --git a/templates/tour/img/email/blur/tag.jpg b/templates/tour/img/email/blur/tag.jpg
deleted file mode 100644
index cee416c949f..00000000000
Binary files a/templates/tour/img/email/blur/tag.jpg and /dev/null differ
diff --git a/templates/tour/img/email/blur/trash.png b/templates/tour/img/email/blur/trash.png
deleted file mode 100644
index da07f299ea3..00000000000
Binary files a/templates/tour/img/email/blur/trash.png and /dev/null differ
diff --git a/templates/tour/img/email/blur/write-send.jpg b/templates/tour/img/email/blur/write-send.jpg
deleted file mode 100644
index 43138cdf352..00000000000
Binary files a/templates/tour/img/email/blur/write-send.jpg and /dev/null differ
diff --git a/templates/tour/img/email/blur/write.jpg b/templates/tour/img/email/blur/write.jpg
deleted file mode 100644
index 2012d18bb78..00000000000
Binary files a/templates/tour/img/email/blur/write.jpg and /dev/null differ
diff --git a/templates/tour/img/email/clip.png b/templates/tour/img/email/clip.png
deleted file mode 100644
index 706fedb3f3b..00000000000
Binary files a/templates/tour/img/email/clip.png and /dev/null differ
diff --git a/templates/tour/img/email/connection.jpg b/templates/tour/img/email/connection.jpg
deleted file mode 100644
index 5281063b0aa..00000000000
Binary files a/templates/tour/img/email/connection.jpg and /dev/null differ
diff --git a/templates/tour/img/email/delete.jpg b/templates/tour/img/email/delete.jpg
deleted file mode 100644
index b4bf5c9c05f..00000000000
Binary files a/templates/tour/img/email/delete.jpg and /dev/null differ
diff --git a/templates/tour/img/email/disabled-format-buttons.jpg b/templates/tour/img/email/disabled-format-buttons.jpg
deleted file mode 100644
index 9cc15a47b08..00000000000
Binary files a/templates/tour/img/email/disabled-format-buttons.jpg and /dev/null differ
diff --git a/templates/tour/img/email/divider.jpg b/templates/tour/img/email/divider.jpg
deleted file mode 100644
index 3f59d590a7c..00000000000
Binary files a/templates/tour/img/email/divider.jpg and /dev/null differ
diff --git a/templates/tour/img/email/divider.png b/templates/tour/img/email/divider.png
deleted file mode 100644
index 02932a1e631..00000000000
Binary files a/templates/tour/img/email/divider.png and /dev/null differ
diff --git a/templates/tour/img/email/drafts.png b/templates/tour/img/email/drafts.png
deleted file mode 100644
index 70d35f3f376..00000000000
Binary files a/templates/tour/img/email/drafts.png and /dev/null differ
diff --git a/templates/tour/img/email/fire.png b/templates/tour/img/email/fire.png
deleted file mode 100644
index 365a366b306..00000000000
Binary files a/templates/tour/img/email/fire.png and /dev/null differ
diff --git a/templates/tour/img/email/forward-logo.png b/templates/tour/img/email/forward-logo.png
deleted file mode 100644
index 25e9bf8709f..00000000000
Binary files a/templates/tour/img/email/forward-logo.png and /dev/null differ
diff --git a/templates/tour/img/email/forward-reply-logo.png b/templates/tour/img/email/forward-reply-logo.png
deleted file mode 100644
index b947ba1b38a..00000000000
Binary files a/templates/tour/img/email/forward-reply-logo.png and /dev/null differ
diff --git a/templates/tour/img/email/forward.jpg b/templates/tour/img/email/forward.jpg
deleted file mode 100644
index 5831f6faf49..00000000000
Binary files a/templates/tour/img/email/forward.jpg and /dev/null differ
diff --git a/templates/tour/img/email/get-mail.jpg b/templates/tour/img/email/get-mail.jpg
deleted file mode 100644
index f38953b5358..00000000000
Binary files a/templates/tour/img/email/get-mail.jpg and /dev/null differ
diff --git a/templates/tour/img/email/glasses.png b/templates/tour/img/email/glasses.png
deleted file mode 100644
index 5a74829b8a2..00000000000
Binary files a/templates/tour/img/email/glasses.png and /dev/null differ
diff --git a/templates/tour/img/email/header-bg.jpg b/templates/tour/img/email/header-bg.jpg
deleted file mode 100644
index 09546934b4c..00000000000
Binary files a/templates/tour/img/email/header-bg.jpg and /dev/null differ
diff --git a/templates/tour/img/email/inbox.png b/templates/tour/img/email/inbox.png
deleted file mode 100644
index 76c72596091..00000000000
Binary files a/templates/tour/img/email/inbox.png and /dev/null differ
diff --git a/templates/tour/img/email/junk.jpg b/templates/tour/img/email/junk.jpg
deleted file mode 100644
index a87814df1ed..00000000000
Binary files a/templates/tour/img/email/junk.jpg and /dev/null differ
diff --git a/templates/tour/img/email/large-fire.jpg b/templates/tour/img/email/large-fire.jpg
deleted file mode 100644
index d634ff6acf4..00000000000
Binary files a/templates/tour/img/email/large-fire.jpg and /dev/null differ
diff --git a/templates/tour/img/email/message-glasses.png b/templates/tour/img/email/message-glasses.png
deleted file mode 100644
index fe9379347ba..00000000000
Binary files a/templates/tour/img/email/message-glasses.png and /dev/null differ
diff --git a/templates/tour/img/email/message-starred.png b/templates/tour/img/email/message-starred.png
deleted file mode 100644
index f274be40a6c..00000000000
Binary files a/templates/tour/img/email/message-starred.png and /dev/null differ
diff --git a/templates/tour/img/email/not-junk.jpg b/templates/tour/img/email/not-junk.jpg
deleted file mode 100644
index 63ab4a621e4..00000000000
Binary files a/templates/tour/img/email/not-junk.jpg and /dev/null differ
diff --git a/templates/tour/img/email/read.png b/templates/tour/img/email/read.png
deleted file mode 100644
index 0874c34b0bf..00000000000
Binary files a/templates/tour/img/email/read.png and /dev/null differ
diff --git a/templates/tour/img/email/reply-logo.png b/templates/tour/img/email/reply-logo.png
deleted file mode 100644
index 947f6519cb0..00000000000
Binary files a/templates/tour/img/email/reply-logo.png and /dev/null differ
diff --git a/templates/tour/img/email/reply.jpg b/templates/tour/img/email/reply.jpg
deleted file mode 100644
index 8ef31b6450d..00000000000
Binary files a/templates/tour/img/email/reply.jpg and /dev/null differ
diff --git a/templates/tour/img/email/sent.png b/templates/tour/img/email/sent.png
deleted file mode 100644
index c50b23282e5..00000000000
Binary files a/templates/tour/img/email/sent.png and /dev/null differ
diff --git a/templates/tour/img/email/star.png b/templates/tour/img/email/star.png
deleted file mode 100644
index c57e0a3e399..00000000000
Binary files a/templates/tour/img/email/star.png and /dev/null differ
diff --git a/templates/tour/img/email/t.png b/templates/tour/img/email/t.png
deleted file mode 100644
index 9bde4ae9fb7..00000000000
Binary files a/templates/tour/img/email/t.png and /dev/null differ
diff --git a/templates/tour/img/email/tag.jpg b/templates/tour/img/email/tag.jpg
deleted file mode 100644
index 551304af8c6..00000000000
Binary files a/templates/tour/img/email/tag.jpg and /dev/null differ
diff --git a/templates/tour/img/email/trash.png b/templates/tour/img/email/trash.png
deleted file mode 100644
index 3b51d6f75c7..00000000000
Binary files a/templates/tour/img/email/trash.png and /dev/null differ
diff --git a/templates/tour/img/email/write-send.jpg b/templates/tour/img/email/write-send.jpg
deleted file mode 100644
index 00497361d56..00000000000
Binary files a/templates/tour/img/email/write-send.jpg and /dev/null differ
diff --git a/templates/tour/img/email/write.jpg b/templates/tour/img/email/write.jpg
deleted file mode 100644
index 82250574d7b..00000000000
Binary files a/templates/tour/img/email/write.jpg and /dev/null differ
diff --git a/templates/tour/img/error/background-download.png b/templates/tour/img/error/background-download.png
deleted file mode 100644
index 204b322e2f6..00000000000
Binary files a/templates/tour/img/error/background-download.png and /dev/null differ
diff --git a/templates/tour/img/error/blur/background-download.png b/templates/tour/img/error/blur/background-download.png
deleted file mode 100644
index e5707449f6f..00000000000
Binary files a/templates/tour/img/error/blur/background-download.png and /dev/null differ
diff --git a/templates/tour/img/error/blur/button-fade.png b/templates/tour/img/error/blur/button-fade.png
deleted file mode 100644
index e98e00fa737..00000000000
Binary files a/templates/tour/img/error/blur/button-fade.png and /dev/null differ
diff --git a/templates/tour/img/error/blur/close-button.png b/templates/tour/img/error/blur/close-button.png
deleted file mode 100644
index 66b0a08c3c0..00000000000
Binary files a/templates/tour/img/error/blur/close-button.png and /dev/null differ
diff --git a/templates/tour/img/error/blur/warning.jpg b/templates/tour/img/error/blur/warning.jpg
deleted file mode 100644
index 042b127c3da..00000000000
Binary files a/templates/tour/img/error/blur/warning.jpg and /dev/null differ
diff --git a/templates/tour/img/error/button-fade.png b/templates/tour/img/error/button-fade.png
deleted file mode 100644
index fc6c7de6181..00000000000
Binary files a/templates/tour/img/error/button-fade.png and /dev/null differ
diff --git a/templates/tour/img/error/close-button.png b/templates/tour/img/error/close-button.png
deleted file mode 100644
index e5a3ebfc185..00000000000
Binary files a/templates/tour/img/error/close-button.png and /dev/null differ
diff --git a/templates/tour/img/error/small-warning.png b/templates/tour/img/error/small-warning.png
deleted file mode 100644
index 2ba81c306fb..00000000000
Binary files a/templates/tour/img/error/small-warning.png and /dev/null differ
diff --git a/templates/tour/img/error/warning (Anthony Dillon's conflicted copy 2011-10-03).jpg b/templates/tour/img/error/warning (Anthony Dillon's conflicted copy 2011-10-03).jpg
deleted file mode 100644
index 9377fdb4ff9..00000000000
Binary files a/templates/tour/img/error/warning (Anthony Dillon's conflicted copy 2011-10-03).jpg and /dev/null differ
diff --git a/templates/tour/img/error/warning.jpg b/templates/tour/img/error/warning.jpg
deleted file mode 100644
index 876ab586c68..00000000000
Binary files a/templates/tour/img/error/warning.jpg and /dev/null differ
diff --git a/templates/tour/img/error/warning.png b/templates/tour/img/error/warning.png
deleted file mode 100644
index 59438d1e80d..00000000000
Binary files a/templates/tour/img/error/warning.png and /dev/null differ
diff --git a/templates/tour/img/firefox/backward-button.jpg b/templates/tour/img/firefox/backward-button.jpg
deleted file mode 100644
index 9b291029540..00000000000
Binary files a/templates/tour/img/firefox/backward-button.jpg and /dev/null differ
diff --git a/templates/tour/img/firefox/blur/backward-button.jpg b/templates/tour/img/firefox/blur/backward-button.jpg
deleted file mode 100644
index 527b76c3e89..00000000000
Binary files a/templates/tour/img/firefox/blur/backward-button.jpg and /dev/null differ
diff --git a/templates/tour/img/firefox/blur/forward-button.jpg b/templates/tour/img/firefox/blur/forward-button.jpg
deleted file mode 100644
index a29d87be16d..00000000000
Binary files a/templates/tour/img/firefox/blur/forward-button.jpg and /dev/null differ
diff --git a/templates/tour/img/firefox/blur/search_icon.jpg b/templates/tour/img/firefox/blur/search_icon.jpg
deleted file mode 100644
index ca80b2d6f60..00000000000
Binary files a/templates/tour/img/firefox/blur/search_icon.jpg and /dev/null differ
diff --git a/templates/tour/img/firefox/forward-button.jpg b/templates/tour/img/firefox/forward-button.jpg
deleted file mode 100644
index 5cd49ebc671..00000000000
Binary files a/templates/tour/img/firefox/forward-button.jpg and /dev/null differ
diff --git a/templates/tour/img/firefox/search_icon.jpg b/templates/tour/img/firefox/search_icon.jpg
deleted file mode 100644
index 4f912e495fa..00000000000
Binary files a/templates/tour/img/firefox/search_icon.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/100.jpg b/templates/tour/img/folder/100.jpg
deleted file mode 100644
index ced70216e06..00000000000
Binary files a/templates/tour/img/folder/100.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/audio.png b/templates/tour/img/folder/audio.png
deleted file mode 100644
index adfff3d410b..00000000000
Binary files a/templates/tour/img/folder/audio.png and /dev/null differ
diff --git a/templates/tour/img/folder/back.jpg b/templates/tour/img/folder/back.jpg
deleted file mode 100644
index fe84d80d8a8..00000000000
Binary files a/templates/tour/img/folder/back.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/100.jpg b/templates/tour/img/folder/blur/100.jpg
deleted file mode 100644
index 7f7c7d2504e..00000000000
Binary files a/templates/tour/img/folder/blur/100.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/audio.png b/templates/tour/img/folder/blur/audio.png
deleted file mode 100644
index bc61db8bd0f..00000000000
Binary files a/templates/tour/img/folder/blur/audio.png and /dev/null differ
diff --git a/templates/tour/img/folder/blur/back.jpg b/templates/tour/img/folder/blur/back.jpg
deleted file mode 100644
index 14dd1efb674..00000000000
Binary files a/templates/tour/img/folder/blur/back.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/breadcrumb-bg.jpg b/templates/tour/img/folder/blur/breadcrumb-bg.jpg
deleted file mode 100644
index 90af0c1012b..00000000000
Binary files a/templates/tour/img/folder/blur/breadcrumb-bg.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/breadcrumb-left-bg.jpg b/templates/tour/img/folder/blur/breadcrumb-left-bg.jpg
deleted file mode 100644
index 9453ce40616..00000000000
Binary files a/templates/tour/img/folder/blur/breadcrumb-left-bg.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/breadcrumb-right-bg.jpg b/templates/tour/img/folder/blur/breadcrumb-right-bg.jpg
deleted file mode 100644
index 41e915becd2..00000000000
Binary files a/templates/tour/img/folder/blur/breadcrumb-right-bg.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/buttons-bg.jpg b/templates/tour/img/folder/blur/buttons-bg.jpg
deleted file mode 100644
index 4d9d67572dd..00000000000
Binary files a/templates/tour/img/folder/blur/buttons-bg.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/chrome.png b/templates/tour/img/folder/blur/chrome.png
deleted file mode 100644
index 69d44865cf8..00000000000
Binary files a/templates/tour/img/folder/blur/chrome.png and /dev/null differ
diff --git a/templates/tour/img/folder/blur/close-side.jpg b/templates/tour/img/folder/blur/close-side.jpg
deleted file mode 100644
index f69254c716f..00000000000
Binary files a/templates/tour/img/folder/blur/close-side.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/close.jpg b/templates/tour/img/folder/blur/close.jpg
deleted file mode 100644
index ae1c58faf16..00000000000
Binary files a/templates/tour/img/folder/blur/close.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/computer.jpg b/templates/tour/img/folder/blur/computer.jpg
deleted file mode 100644
index 91092a5988c..00000000000
Binary files a/templates/tour/img/folder/blur/computer.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/cross.jpg b/templates/tour/img/folder/blur/cross.jpg
deleted file mode 100644
index c8a3d50ca1a..00000000000
Binary files a/templates/tour/img/folder/blur/cross.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/desktop-icon.png b/templates/tour/img/folder/blur/desktop-icon.png
deleted file mode 100644
index c2681c4e065..00000000000
Binary files a/templates/tour/img/folder/blur/desktop-icon.png and /dev/null differ
diff --git a/templates/tour/img/folder/blur/divider.jpg b/templates/tour/img/folder/blur/divider.jpg
deleted file mode 100644
index 047a4615159..00000000000
Binary files a/templates/tour/img/folder/blur/divider.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/documents-icon.png b/templates/tour/img/folder/blur/documents-icon.png
deleted file mode 100644
index e1d04595c26..00000000000
Binary files a/templates/tour/img/folder/blur/documents-icon.png and /dev/null differ
diff --git a/templates/tour/img/folder/blur/down-arrow.jpg b/templates/tour/img/folder/blur/down-arrow.jpg
deleted file mode 100644
index 27de3934c81..00000000000
Binary files a/templates/tour/img/folder/blur/down-arrow.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/downloads-icon.png b/templates/tour/img/folder/blur/downloads-icon.png
deleted file mode 100644
index c5e3ced2fb8..00000000000
Binary files a/templates/tour/img/folder/blur/downloads-icon.png and /dev/null differ
diff --git a/templates/tour/img/folder/blur/f-down-arrow.jpg b/templates/tour/img/folder/blur/f-down-arrow.jpg
deleted file mode 100644
index e4b54de4366..00000000000
Binary files a/templates/tour/img/folder/blur/f-down-arrow.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/folder-icon-list.png b/templates/tour/img/folder/blur/folder-icon-list.png
deleted file mode 100644
index 12f6f0bf9a4..00000000000
Binary files a/templates/tour/img/folder/blur/folder-icon-list.png and /dev/null differ
diff --git a/templates/tour/img/folder/blur/folder-icon.jpg b/templates/tour/img/folder/blur/folder-icon.jpg
deleted file mode 100644
index ac6f40d6155..00000000000
Binary files a/templates/tour/img/folder/blur/folder-icon.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/folder-icon.png b/templates/tour/img/folder/blur/folder-icon.png
deleted file mode 100644
index 537b3a638a5..00000000000
Binary files a/templates/tour/img/folder/blur/folder-icon.png and /dev/null differ
diff --git a/templates/tour/img/folder/blur/forward.jpg b/templates/tour/img/folder/blur/forward.jpg
deleted file mode 100644
index 81d551da370..00000000000
Binary files a/templates/tour/img/folder/blur/forward.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/grow.jpg b/templates/tour/img/folder/blur/grow.jpg
deleted file mode 100644
index 1a17905ff8c..00000000000
Binary files a/templates/tour/img/folder/blur/grow.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/home-icon.png b/templates/tour/img/folder/blur/home-icon.png
deleted file mode 100644
index 1e29f0578ae..00000000000
Binary files a/templates/tour/img/folder/blur/home-icon.png and /dev/null differ
diff --git a/templates/tour/img/folder/blur/home.jpg b/templates/tour/img/folder/blur/home.jpg
deleted file mode 100644
index c5bafbcc9f7..00000000000
Binary files a/templates/tour/img/folder/blur/home.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/icon-view.jpg b/templates/tour/img/folder/blur/icon-view.jpg
deleted file mode 100644
index 1cc5df65979..00000000000
Binary files a/templates/tour/img/folder/blur/icon-view.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/maximise.jpg b/templates/tour/img/folder/blur/maximise.jpg
deleted file mode 100644
index 5f266584374..00000000000
Binary files a/templates/tour/img/folder/blur/maximise.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/minimise.jpg b/templates/tour/img/folder/blur/minimise.jpg
deleted file mode 100644
index 0664a14207d..00000000000
Binary files a/templates/tour/img/folder/blur/minimise.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/music-icon.png b/templates/tour/img/folder/blur/music-icon.png
deleted file mode 100644
index 89d921ffaaa..00000000000
Binary files a/templates/tour/img/folder/blur/music-icon.png and /dev/null differ
diff --git a/templates/tour/img/folder/blur/orange-overlay.png b/templates/tour/img/folder/blur/orange-overlay.png
deleted file mode 100644
index 0fc1a46a436..00000000000
Binary files a/templates/tour/img/folder/blur/orange-overlay.png and /dev/null differ
diff --git a/templates/tour/img/folder/blur/pictures-icon.png b/templates/tour/img/folder/blur/pictures-icon.png
deleted file mode 100644
index 54e008e6444..00000000000
Binary files a/templates/tour/img/folder/blur/pictures-icon.png and /dev/null differ
diff --git a/templates/tour/img/folder/blur/refresh.jpg b/templates/tour/img/folder/blur/refresh.jpg
deleted file mode 100644
index 2e837f8dc5f..00000000000
Binary files a/templates/tour/img/folder/blur/refresh.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/resume.jpg b/templates/tour/img/folder/blur/resume.jpg
deleted file mode 100644
index 4d7bc067ce3..00000000000
Binary files a/templates/tour/img/folder/blur/resume.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/rubbish-icon.png b/templates/tour/img/folder/blur/rubbish-icon.png
deleted file mode 100644
index edcc8c164f9..00000000000
Binary files a/templates/tour/img/folder/blur/rubbish-icon.png and /dev/null differ
diff --git a/templates/tour/img/folder/blur/search.jpg b/templates/tour/img/folder/blur/search.jpg
deleted file mode 100644
index 8d2debeffbb..00000000000
Binary files a/templates/tour/img/folder/blur/search.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/shrink.jpg b/templates/tour/img/folder/blur/shrink.jpg
deleted file mode 100644
index a993c4bf6ad..00000000000
Binary files a/templates/tour/img/folder/blur/shrink.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/top-bg.jpg b/templates/tour/img/folder/blur/top-bg.jpg
deleted file mode 100644
index bdc69d11a0a..00000000000
Binary files a/templates/tour/img/folder/blur/top-bg.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/unknown.png b/templates/tour/img/folder/blur/unknown.png
deleted file mode 100644
index 49ae08f764b..00000000000
Binary files a/templates/tour/img/folder/blur/unknown.png and /dev/null differ
diff --git a/templates/tour/img/folder/blur/up.jpg b/templates/tour/img/folder/blur/up.jpg
deleted file mode 100644
index b06bf852051..00000000000
Binary files a/templates/tour/img/folder/blur/up.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/blur/videos-icon.png b/templates/tour/img/folder/blur/videos-icon.png
deleted file mode 100644
index a42df7b966b..00000000000
Binary files a/templates/tour/img/folder/blur/videos-icon.png and /dev/null differ
diff --git a/templates/tour/img/folder/breadcrumb-bg.jpg b/templates/tour/img/folder/breadcrumb-bg.jpg
deleted file mode 100644
index 8cf8e763429..00000000000
Binary files a/templates/tour/img/folder/breadcrumb-bg.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/breadcrumb-left-bg.jpg b/templates/tour/img/folder/breadcrumb-left-bg.jpg
deleted file mode 100644
index e4268b788fe..00000000000
Binary files a/templates/tour/img/folder/breadcrumb-left-bg.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/breadcrumb-right-bg.jpg b/templates/tour/img/folder/breadcrumb-right-bg.jpg
deleted file mode 100644
index 0aff95865e6..00000000000
Binary files a/templates/tour/img/folder/breadcrumb-right-bg.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/buttons-bg.jpg b/templates/tour/img/folder/buttons-bg.jpg
deleted file mode 100644
index babf08f0369..00000000000
Binary files a/templates/tour/img/folder/buttons-bg.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/chrome.png b/templates/tour/img/folder/chrome.png
deleted file mode 100644
index 69d44865cf8..00000000000
Binary files a/templates/tour/img/folder/chrome.png and /dev/null differ
diff --git a/templates/tour/img/folder/close-side.jpg b/templates/tour/img/folder/close-side.jpg
deleted file mode 100644
index d42487ac51c..00000000000
Binary files a/templates/tour/img/folder/close-side.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/close.jpg b/templates/tour/img/folder/close.jpg
deleted file mode 100644
index 9398055cdf9..00000000000
Binary files a/templates/tour/img/folder/close.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/computer.jpg b/templates/tour/img/folder/computer.jpg
deleted file mode 100644
index be1fdb1654b..00000000000
Binary files a/templates/tour/img/folder/computer.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/cross.jpg b/templates/tour/img/folder/cross.jpg
deleted file mode 100644
index ba45b1f9481..00000000000
Binary files a/templates/tour/img/folder/cross.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/desktop-icon.png b/templates/tour/img/folder/desktop-icon.png
deleted file mode 100644
index a0a2800c26c..00000000000
Binary files a/templates/tour/img/folder/desktop-icon.png and /dev/null differ
diff --git a/templates/tour/img/folder/divider.jpg b/templates/tour/img/folder/divider.jpg
deleted file mode 100644
index 9770556eed3..00000000000
Binary files a/templates/tour/img/folder/divider.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/documents-icon.png b/templates/tour/img/folder/documents-icon.png
deleted file mode 100644
index e0f54b71c0e..00000000000
Binary files a/templates/tour/img/folder/documents-icon.png and /dev/null differ
diff --git a/templates/tour/img/folder/down-arrow.jpg b/templates/tour/img/folder/down-arrow.jpg
deleted file mode 100644
index 8ce6d8af449..00000000000
Binary files a/templates/tour/img/folder/down-arrow.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/downloads-icon.png b/templates/tour/img/folder/downloads-icon.png
deleted file mode 100644
index 385e90c1b4d..00000000000
Binary files a/templates/tour/img/folder/downloads-icon.png and /dev/null differ
diff --git a/templates/tour/img/folder/f-down-arrow.jpg b/templates/tour/img/folder/f-down-arrow.jpg
deleted file mode 100644
index ec8b155b1f8..00000000000
Binary files a/templates/tour/img/folder/f-down-arrow.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/file-icon-list.png b/templates/tour/img/folder/file-icon-list.png
deleted file mode 100644
index 0c0d9b5d1a5..00000000000
Binary files a/templates/tour/img/folder/file-icon-list.png and /dev/null differ
diff --git a/templates/tour/img/folder/folder-icon-list.png b/templates/tour/img/folder/folder-icon-list.png
deleted file mode 100644
index b273dc3dd7d..00000000000
Binary files a/templates/tour/img/folder/folder-icon-list.png and /dev/null differ
diff --git a/templates/tour/img/folder/folder-icon.jpg b/templates/tour/img/folder/folder-icon.jpg
deleted file mode 100644
index c326b29a69f..00000000000
Binary files a/templates/tour/img/folder/folder-icon.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/folder-icon.png b/templates/tour/img/folder/folder-icon.png
deleted file mode 100644
index 21879e76285..00000000000
Binary files a/templates/tour/img/folder/folder-icon.png and /dev/null differ
diff --git a/templates/tour/img/folder/forward.jpg b/templates/tour/img/folder/forward.jpg
deleted file mode 100644
index 79fa4220ed7..00000000000
Binary files a/templates/tour/img/folder/forward.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/grow.jpg b/templates/tour/img/folder/grow.jpg
deleted file mode 100644
index 23036525fe2..00000000000
Binary files a/templates/tour/img/folder/grow.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/home-icon.png b/templates/tour/img/folder/home-icon.png
deleted file mode 100644
index 4fd63900a31..00000000000
Binary files a/templates/tour/img/folder/home-icon.png and /dev/null differ
diff --git a/templates/tour/img/folder/home.jpg b/templates/tour/img/folder/home.jpg
deleted file mode 100644
index c649eafc302..00000000000
Binary files a/templates/tour/img/folder/home.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/icon-view.jpg b/templates/tour/img/folder/icon-view.jpg
deleted file mode 100644
index 2a49e611c04..00000000000
Binary files a/templates/tour/img/folder/icon-view.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/maximise.jpg b/templates/tour/img/folder/maximise.jpg
deleted file mode 100644
index 76ee16f6550..00000000000
Binary files a/templates/tour/img/folder/maximise.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/minimise.jpg b/templates/tour/img/folder/minimise.jpg
deleted file mode 100644
index d36f9add20c..00000000000
Binary files a/templates/tour/img/folder/minimise.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/music-icon.png b/templates/tour/img/folder/music-icon.png
deleted file mode 100644
index e0f36f1b3bf..00000000000
Binary files a/templates/tour/img/folder/music-icon.png and /dev/null differ
diff --git a/templates/tour/img/folder/orange-overlay.png b/templates/tour/img/folder/orange-overlay.png
deleted file mode 100644
index 25855a3e620..00000000000
Binary files a/templates/tour/img/folder/orange-overlay.png and /dev/null differ
diff --git a/templates/tour/img/folder/pictures-icon.png b/templates/tour/img/folder/pictures-icon.png
deleted file mode 100644
index f327f550ea3..00000000000
Binary files a/templates/tour/img/folder/pictures-icon.png and /dev/null differ
diff --git a/templates/tour/img/folder/refresh.jpg b/templates/tour/img/folder/refresh.jpg
deleted file mode 100644
index f947bf649e9..00000000000
Binary files a/templates/tour/img/folder/refresh.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/resume.jpg b/templates/tour/img/folder/resume.jpg
deleted file mode 100644
index 3ca65100a69..00000000000
Binary files a/templates/tour/img/folder/resume.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/rubbish-icon.png b/templates/tour/img/folder/rubbish-icon.png
deleted file mode 100644
index 1b3abc915d7..00000000000
Binary files a/templates/tour/img/folder/rubbish-icon.png and /dev/null differ
diff --git a/templates/tour/img/folder/search.jpg b/templates/tour/img/folder/search.jpg
deleted file mode 100644
index 14680b6aa1b..00000000000
Binary files a/templates/tour/img/folder/search.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/shrink.jpg b/templates/tour/img/folder/shrink.jpg
deleted file mode 100644
index e04dc81e41e..00000000000
Binary files a/templates/tour/img/folder/shrink.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/top-bg.jpg b/templates/tour/img/folder/top-bg.jpg
deleted file mode 100644
index 6c9bd23b088..00000000000
Binary files a/templates/tour/img/folder/top-bg.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/unknown.png b/templates/tour/img/folder/unknown.png
deleted file mode 100644
index 418a98f1d7e..00000000000
Binary files a/templates/tour/img/folder/unknown.png and /dev/null differ
diff --git a/templates/tour/img/folder/up.jpg b/templates/tour/img/folder/up.jpg
deleted file mode 100644
index b28923d33c9..00000000000
Binary files a/templates/tour/img/folder/up.jpg and /dev/null differ
diff --git a/templates/tour/img/folder/videos-icon.png b/templates/tour/img/folder/videos-icon.png
deleted file mode 100644
index 2234a4f95f3..00000000000
Binary files a/templates/tour/img/folder/videos-icon.png and /dev/null differ
diff --git a/templates/tour/img/grey-bg-50.png b/templates/tour/img/grey-bg-50.png
deleted file mode 100644
index f3c7c7e98a6..00000000000
Binary files a/templates/tour/img/grey-bg-50.png and /dev/null differ
diff --git a/templates/tour/img/librecalc.jpg b/templates/tour/img/librecalc.jpg
deleted file mode 100644
index c3a183ee770..00000000000
Binary files a/templates/tour/img/librecalc.jpg and /dev/null differ
diff --git a/templates/tour/img/libreimpress.jpg b/templates/tour/img/libreimpress.jpg
deleted file mode 100644
index 4bc315de641..00000000000
Binary files a/templates/tour/img/libreimpress.jpg and /dev/null differ
diff --git a/templates/tour/img/librewriter.jpg b/templates/tour/img/librewriter.jpg
deleted file mode 100644
index e13301368a2..00000000000
Binary files a/templates/tour/img/librewriter.jpg and /dev/null differ
diff --git a/templates/tour/img/loader/ubuntu-loader.gif b/templates/tour/img/loader/ubuntu-loader.gif
deleted file mode 100644
index a0a11188001..00000000000
Binary files a/templates/tour/img/loader/ubuntu-loader.gif and /dev/null differ
diff --git a/templates/tour/img/loader/ubuntu-logo.jpg b/templates/tour/img/loader/ubuntu-logo.jpg
deleted file mode 100644
index fa05e5fa983..00000000000
Binary files a/templates/tour/img/loader/ubuntu-logo.jpg and /dev/null differ
diff --git a/templates/tour/img/loading/boot.png b/templates/tour/img/loading/boot.png
deleted file mode 100644
index 3b00502e8cf..00000000000
Binary files a/templates/tour/img/loading/boot.png and /dev/null differ
diff --git a/templates/tour/img/max-button.jpg b/templates/tour/img/max-button.jpg
deleted file mode 100644
index ef73b8d93b0..00000000000
Binary files a/templates/tour/img/max-button.jpg and /dev/null differ
diff --git a/templates/tour/img/menu/blur/icon-calc.png b/templates/tour/img/menu/blur/icon-calc.png
deleted file mode 100644
index 437051d859c..00000000000
Binary files a/templates/tour/img/menu/blur/icon-calc.png and /dev/null differ
diff --git a/templates/tour/img/menu/blur/icon-dash.png b/templates/tour/img/menu/blur/icon-dash.png
deleted file mode 100644
index db2d20afe83..00000000000
Binary files a/templates/tour/img/menu/blur/icon-dash.png and /dev/null differ
diff --git a/templates/tour/img/menu/blur/icon-emptyrubbish.png b/templates/tour/img/menu/blur/icon-emptyrubbish.png
deleted file mode 100644
index 2d5119adc8a..00000000000
Binary files a/templates/tour/img/menu/blur/icon-emptyrubbish.png and /dev/null differ
diff --git a/templates/tour/img/menu/blur/icon-firefox.png b/templates/tour/img/menu/blur/icon-firefox.png
deleted file mode 100644
index efdd5fd2d1d..00000000000
Binary files a/templates/tour/img/menu/blur/icon-firefox.png and /dev/null differ
diff --git a/templates/tour/img/menu/blur/icon-folder.png b/templates/tour/img/menu/blur/icon-folder.png
deleted file mode 100644
index 0fc17e45991..00000000000
Binary files a/templates/tour/img/menu/blur/icon-folder.png and /dev/null differ
diff --git a/templates/tour/img/menu/blur/icon-impress.png b/templates/tour/img/menu/blur/icon-impress.png
deleted file mode 100644
index d0ba66863cd..00000000000
Binary files a/templates/tour/img/menu/blur/icon-impress.png and /dev/null differ
diff --git a/templates/tour/img/menu/blur/icon-movieplayer.png b/templates/tour/img/menu/blur/icon-movieplayer.png
deleted file mode 100644
index 8838e70e8fc..00000000000
Binary files a/templates/tour/img/menu/blur/icon-movieplayer.png and /dev/null differ
diff --git a/templates/tour/img/menu/blur/icon-rubbish.png b/templates/tour/img/menu/blur/icon-rubbish.png
deleted file mode 100644
index 97a82aabd8e..00000000000
Binary files a/templates/tour/img/menu/blur/icon-rubbish.png and /dev/null differ
diff --git a/templates/tour/img/menu/blur/icon-shotwell.png b/templates/tour/img/menu/blur/icon-shotwell.png
deleted file mode 100644
index 8b145449c50..00000000000
Binary files a/templates/tour/img/menu/blur/icon-shotwell.png and /dev/null differ
diff --git a/templates/tour/img/menu/blur/icon-software.png b/templates/tour/img/menu/blur/icon-software.png
deleted file mode 100644
index 21286051cb4..00000000000
Binary files a/templates/tour/img/menu/blur/icon-software.png and /dev/null differ
diff --git a/templates/tour/img/menu/blur/icon-thunderbird.png b/templates/tour/img/menu/blur/icon-thunderbird.png
deleted file mode 100644
index f061337a4be..00000000000
Binary files a/templates/tour/img/menu/blur/icon-thunderbird.png and /dev/null differ
diff --git a/templates/tour/img/menu/blur/icon-ubuntuone.png b/templates/tour/img/menu/blur/icon-ubuntuone.png
deleted file mode 100644
index be9c57467c6..00000000000
Binary files a/templates/tour/img/menu/blur/icon-ubuntuone.png and /dev/null differ
diff --git a/templates/tour/img/menu/blur/icon-workspace.png b/templates/tour/img/menu/blur/icon-workspace.png
deleted file mode 100644
index f379597cbc2..00000000000
Binary files a/templates/tour/img/menu/blur/icon-workspace.png and /dev/null differ
diff --git a/templates/tour/img/menu/blur/icon-writer.png b/templates/tour/img/menu/blur/icon-writer.png
deleted file mode 100644
index 62173662ed5..00000000000
Binary files a/templates/tour/img/menu/blur/icon-writer.png and /dev/null differ
diff --git a/templates/tour/img/menu/blur/open-arrow.png b/templates/tour/img/menu/blur/open-arrow.png
deleted file mode 100644
index 4d9c0eacbb9..00000000000
Binary files a/templates/tour/img/menu/blur/open-arrow.png and /dev/null differ
diff --git a/templates/tour/img/menu/blur/selected-arrow.png b/templates/tour/img/menu/blur/selected-arrow.png
deleted file mode 100644
index 72789578d0c..00000000000
Binary files a/templates/tour/img/menu/blur/selected-arrow.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-applications.png b/templates/tour/img/menu/icon-applications.png
deleted file mode 100644
index 95fcf6c16cb..00000000000
Binary files a/templates/tour/img/menu/icon-applications.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-calc-active.png b/templates/tour/img/menu/icon-calc-active.png
deleted file mode 100644
index d297e490131..00000000000
Binary files a/templates/tour/img/menu/icon-calc-active.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-calc.png b/templates/tour/img/menu/icon-calc.png
deleted file mode 100644
index 54234a74c56..00000000000
Binary files a/templates/tour/img/menu/icon-calc.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-dash.png b/templates/tour/img/menu/icon-dash.png
deleted file mode 100644
index 98d718a7020..00000000000
Binary files a/templates/tour/img/menu/icon-dash.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-emptyrubbish-active.png b/templates/tour/img/menu/icon-emptyrubbish-active.png
deleted file mode 100644
index 4cc7e7b0a8c..00000000000
Binary files a/templates/tour/img/menu/icon-emptyrubbish-active.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-emptyrubbish.png b/templates/tour/img/menu/icon-emptyrubbish.png
deleted file mode 100644
index 026b39758cc..00000000000
Binary files a/templates/tour/img/menu/icon-emptyrubbish.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-files.png b/templates/tour/img/menu/icon-files.png
deleted file mode 100644
index 5b7213bf2a1..00000000000
Binary files a/templates/tour/img/menu/icon-files.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-firefox-active.png b/templates/tour/img/menu/icon-firefox-active.png
deleted file mode 100644
index 33f7ed23d83..00000000000
Binary files a/templates/tour/img/menu/icon-firefox-active.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-firefox.png b/templates/tour/img/menu/icon-firefox.png
deleted file mode 100644
index a302cf78e2b..00000000000
Binary files a/templates/tour/img/menu/icon-firefox.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-folder-active.png b/templates/tour/img/menu/icon-folder-active.png
deleted file mode 100644
index 334260fa540..00000000000
Binary files a/templates/tour/img/menu/icon-folder-active.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-folder.png b/templates/tour/img/menu/icon-folder.png
deleted file mode 100644
index 1d5e6e61457..00000000000
Binary files a/templates/tour/img/menu/icon-folder.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-impress-active.png b/templates/tour/img/menu/icon-impress-active.png
deleted file mode 100644
index fb330cc0591..00000000000
Binary files a/templates/tour/img/menu/icon-impress-active.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-impress.png b/templates/tour/img/menu/icon-impress.png
deleted file mode 100644
index aa195634263..00000000000
Binary files a/templates/tour/img/menu/icon-impress.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-movieplayer-active.png b/templates/tour/img/menu/icon-movieplayer-active.png
deleted file mode 100644
index d1239416f39..00000000000
Binary files a/templates/tour/img/menu/icon-movieplayer-active.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-movieplayer.png b/templates/tour/img/menu/icon-movieplayer.png
deleted file mode 100644
index d1239416f39..00000000000
Binary files a/templates/tour/img/menu/icon-movieplayer.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-shotwell-active.png b/templates/tour/img/menu/icon-shotwell-active.png
deleted file mode 100644
index 708e32a3f19..00000000000
Binary files a/templates/tour/img/menu/icon-shotwell-active.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-shotwell.png b/templates/tour/img/menu/icon-shotwell.png
deleted file mode 100644
index 708e32a3f19..00000000000
Binary files a/templates/tour/img/menu/icon-shotwell.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-software-active.png b/templates/tour/img/menu/icon-software-active.png
deleted file mode 100644
index 234ab533181..00000000000
Binary files a/templates/tour/img/menu/icon-software-active.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-software.png b/templates/tour/img/menu/icon-software.png
deleted file mode 100644
index 5e9cdf45807..00000000000
Binary files a/templates/tour/img/menu/icon-software.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-thunderbird-active.png b/templates/tour/img/menu/icon-thunderbird-active.png
deleted file mode 100644
index c96d1f58e08..00000000000
Binary files a/templates/tour/img/menu/icon-thunderbird-active.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-thunderbird.png b/templates/tour/img/menu/icon-thunderbird.png
deleted file mode 100644
index 5d139aa55ce..00000000000
Binary files a/templates/tour/img/menu/icon-thunderbird.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-ubuntuone-active.png b/templates/tour/img/menu/icon-ubuntuone-active.png
deleted file mode 100644
index 97956f9e9e1..00000000000
Binary files a/templates/tour/img/menu/icon-ubuntuone-active.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-ubuntuone.png b/templates/tour/img/menu/icon-ubuntuone.png
deleted file mode 100644
index e9d10cdbb37..00000000000
Binary files a/templates/tour/img/menu/icon-ubuntuone.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-workspace.png b/templates/tour/img/menu/icon-workspace.png
deleted file mode 100644
index 95d5e71292f..00000000000
Binary files a/templates/tour/img/menu/icon-workspace.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-writer-active.png b/templates/tour/img/menu/icon-writer-active.png
deleted file mode 100644
index 9a5d9953e51..00000000000
Binary files a/templates/tour/img/menu/icon-writer-active.png and /dev/null differ
diff --git a/templates/tour/img/menu/icon-writer.png b/templates/tour/img/menu/icon-writer.png
deleted file mode 100644
index c8cd86568a7..00000000000
Binary files a/templates/tour/img/menu/icon-writer.png and /dev/null differ
diff --git a/templates/tour/img/menu/open-arrow.png b/templates/tour/img/menu/open-arrow.png
deleted file mode 100644
index 0e7c1b3086c..00000000000
Binary files a/templates/tour/img/menu/open-arrow.png and /dev/null differ
diff --git a/templates/tour/img/menu/selected-arrow.png b/templates/tour/img/menu/selected-arrow.png
deleted file mode 100644
index fe3e85f0eb0..00000000000
Binary files a/templates/tour/img/menu/selected-arrow.png and /dev/null differ
diff --git a/templates/tour/img/menu/tooltip-background.png b/templates/tour/img/menu/tooltip-background.png
deleted file mode 100644
index 8f9db2dbb10..00000000000
Binary files a/templates/tour/img/menu/tooltip-background.png and /dev/null differ
diff --git a/templates/tour/img/min-button.jpg b/templates/tour/img/min-button.jpg
deleted file mode 100644
index 13802002699..00000000000
Binary files a/templates/tour/img/min-button.jpg and /dev/null differ
diff --git a/templates/tour/img/movieplayer/back.png b/templates/tour/img/movieplayer/back.png
deleted file mode 100644
index f25ebcb54b2..00000000000
Binary files a/templates/tour/img/movieplayer/back.png and /dev/null differ
diff --git a/templates/tour/img/movieplayer/blur/forward.jpg b/templates/tour/img/movieplayer/blur/forward.jpg
deleted file mode 100644
index 8f0c7d48135..00000000000
Binary files a/templates/tour/img/movieplayer/blur/forward.jpg and /dev/null differ
diff --git a/templates/tour/img/movieplayer/blur/fullscreen.jpg b/templates/tour/img/movieplayer/blur/fullscreen.jpg
deleted file mode 100644
index fe7e160aa05..00000000000
Binary files a/templates/tour/img/movieplayer/blur/fullscreen.jpg and /dev/null differ
diff --git a/templates/tour/img/movieplayer/blur/play.jpg b/templates/tour/img/movieplayer/blur/play.jpg
deleted file mode 100644
index b72c05ef63c..00000000000
Binary files a/templates/tour/img/movieplayer/blur/play.jpg and /dev/null differ
diff --git a/templates/tour/img/movieplayer/blur/rewind.jpg b/templates/tour/img/movieplayer/blur/rewind.jpg
deleted file mode 100644
index a4aaf21e23f..00000000000
Binary files a/templates/tour/img/movieplayer/blur/rewind.jpg and /dev/null differ
diff --git a/templates/tour/img/movieplayer/blur/splash.jpg b/templates/tour/img/movieplayer/blur/splash.jpg
deleted file mode 100644
index 683f71e93fe..00000000000
Binary files a/templates/tour/img/movieplayer/blur/splash.jpg and /dev/null differ
diff --git a/templates/tour/img/movieplayer/blur/timebar-bg.jpg b/templates/tour/img/movieplayer/blur/timebar-bg.jpg
deleted file mode 100644
index 31c95118e0d..00000000000
Binary files a/templates/tour/img/movieplayer/blur/timebar-bg.jpg and /dev/null differ
diff --git a/templates/tour/img/movieplayer/blur/volume.jpg b/templates/tour/img/movieplayer/blur/volume.jpg
deleted file mode 100644
index e0be2bad958..00000000000
Binary files a/templates/tour/img/movieplayer/blur/volume.jpg and /dev/null differ
diff --git a/templates/tour/img/movieplayer/cursor.png b/templates/tour/img/movieplayer/cursor.png
deleted file mode 100644
index 1aec7c8f83b..00000000000
Binary files a/templates/tour/img/movieplayer/cursor.png and /dev/null differ
diff --git a/templates/tour/img/movieplayer/forward.jpg b/templates/tour/img/movieplayer/forward.jpg
deleted file mode 100644
index 1e83ab52294..00000000000
Binary files a/templates/tour/img/movieplayer/forward.jpg and /dev/null differ
diff --git a/templates/tour/img/movieplayer/forward.png b/templates/tour/img/movieplayer/forward.png
deleted file mode 100644
index 4a302b7e1ce..00000000000
Binary files a/templates/tour/img/movieplayer/forward.png and /dev/null differ
diff --git a/templates/tour/img/movieplayer/fullscreen.jpg b/templates/tour/img/movieplayer/fullscreen.jpg
deleted file mode 100644
index fbfda2f17b9..00000000000
Binary files a/templates/tour/img/movieplayer/fullscreen.jpg and /dev/null differ
diff --git a/templates/tour/img/movieplayer/fullscreen.png b/templates/tour/img/movieplayer/fullscreen.png
deleted file mode 100644
index 6944c0ff652..00000000000
Binary files a/templates/tour/img/movieplayer/fullscreen.png and /dev/null differ
diff --git a/templates/tour/img/movieplayer/pause-over.png b/templates/tour/img/movieplayer/pause-over.png
deleted file mode 100644
index ee84c06eaec..00000000000
Binary files a/templates/tour/img/movieplayer/pause-over.png and /dev/null differ
diff --git a/templates/tour/img/movieplayer/pause.png b/templates/tour/img/movieplayer/pause.png
deleted file mode 100644
index 7b8beeebfe2..00000000000
Binary files a/templates/tour/img/movieplayer/pause.png and /dev/null differ
diff --git a/templates/tour/img/movieplayer/play (Anthony Dillon's conflicted copy 2011-10-03).jpg b/templates/tour/img/movieplayer/play (Anthony Dillon's conflicted copy 2011-10-03).jpg
deleted file mode 100644
index 8e5eda4bdcf..00000000000
Binary files a/templates/tour/img/movieplayer/play (Anthony Dillon's conflicted copy 2011-10-03).jpg and /dev/null differ
diff --git a/templates/tour/img/movieplayer/play-over.jpg b/templates/tour/img/movieplayer/play-over.jpg
deleted file mode 100644
index 131caaa32c8..00000000000
Binary files a/templates/tour/img/movieplayer/play-over.jpg and /dev/null differ
diff --git a/templates/tour/img/movieplayer/play-over.png b/templates/tour/img/movieplayer/play-over.png
deleted file mode 100644
index 74273356148..00000000000
Binary files a/templates/tour/img/movieplayer/play-over.png and /dev/null differ
diff --git a/templates/tour/img/movieplayer/play.jpg b/templates/tour/img/movieplayer/play.jpg
deleted file mode 100644
index 6caee58ad01..00000000000
Binary files a/templates/tour/img/movieplayer/play.jpg and /dev/null differ
diff --git a/templates/tour/img/movieplayer/play.png b/templates/tour/img/movieplayer/play.png
deleted file mode 100644
index 0ffe8b1d6e3..00000000000
Binary files a/templates/tour/img/movieplayer/play.png and /dev/null differ
diff --git a/templates/tour/img/movieplayer/rewind.jpg b/templates/tour/img/movieplayer/rewind.jpg
deleted file mode 100644
index 7445475a5b8..00000000000
Binary files a/templates/tour/img/movieplayer/rewind.jpg and /dev/null differ
diff --git a/templates/tour/img/movieplayer/splash.jpg b/templates/tour/img/movieplayer/splash.jpg
deleted file mode 100644
index e611c90f73d..00000000000
Binary files a/templates/tour/img/movieplayer/splash.jpg and /dev/null differ
diff --git a/templates/tour/img/movieplayer/timebar-bg.jpg b/templates/tour/img/movieplayer/timebar-bg.jpg
deleted file mode 100644
index b3bdfa8ece1..00000000000
Binary files a/templates/tour/img/movieplayer/timebar-bg.jpg and /dev/null differ
diff --git a/templates/tour/img/movieplayer/volume.jpg b/templates/tour/img/movieplayer/volume.jpg
deleted file mode 100644
index 9f28f2b590a..00000000000
Binary files a/templates/tour/img/movieplayer/volume.jpg and /dev/null differ
diff --git a/templates/tour/img/movieplayer/volume.png b/templates/tour/img/movieplayer/volume.png
deleted file mode 100644
index 5eaf9bf0d25..00000000000
Binary files a/templates/tour/img/movieplayer/volume.png and /dev/null differ
diff --git a/templates/tour/img/notification/blur/dropbox.png b/templates/tour/img/notification/blur/dropbox.png
deleted file mode 100644
index 6806111475a..00000000000
Binary files a/templates/tour/img/notification/blur/dropbox.png and /dev/null differ
diff --git a/templates/tour/img/notification/dropbox.png b/templates/tour/img/notification/dropbox.png
deleted file mode 100644
index 3e9e3659066..00000000000
Binary files a/templates/tour/img/notification/dropbox.png and /dev/null differ
diff --git a/templates/tour/img/overlay/available.png b/templates/tour/img/overlay/available.png
deleted file mode 100644
index b96a48775d8..00000000000
Binary files a/templates/tour/img/overlay/available.png and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/available.png b/templates/tour/img/overlay/blur/available.png
deleted file mode 100644
index 50ed0df5493..00000000000
Binary files a/templates/tour/img/overlay/blur/available.png and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/browse-the-web.png b/templates/tour/img/overlay/blur/browse-the-web.png
deleted file mode 100644
index 2ec310a98ac..00000000000
Binary files a/templates/tour/img/overlay/blur/browse-the-web.png and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/cancel-logo.png b/templates/tour/img/overlay/blur/cancel-logo.png
deleted file mode 100644
index b0ef3c5eba8..00000000000
Binary files a/templates/tour/img/overlay/blur/cancel-logo.png and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/check-email.png b/templates/tour/img/overlay/blur/check-email.png
deleted file mode 100644
index 436728d3176..00000000000
Binary files a/templates/tour/img/overlay/blur/check-email.png and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/dash-close.png b/templates/tour/img/overlay/blur/dash-close.png
deleted file mode 100644
index f40ebc87e8b..00000000000
Binary files a/templates/tour/img/overlay/blur/dash-close.png and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/dash-max.png b/templates/tour/img/overlay/blur/dash-max.png
deleted file mode 100644
index 49b4f441868..00000000000
Binary files a/templates/tour/img/overlay/blur/dash-max.png and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/dash-min.png b/templates/tour/img/overlay/blur/dash-min.png
deleted file mode 100644
index 8fd6a61f933..00000000000
Binary files a/templates/tour/img/overlay/blur/dash-min.png and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/downloaded.png b/templates/tour/img/overlay/blur/downloaded.png
deleted file mode 100644
index 9ec2cf2055d..00000000000
Binary files a/templates/tour/img/overlay/blur/downloaded.png and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/find-files.png b/templates/tour/img/overlay/blur/find-files.png
deleted file mode 100644
index bbb3aaf432f..00000000000
Binary files a/templates/tour/img/overlay/blur/find-files.png and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/folders.png b/templates/tour/img/overlay/blur/folders.png
deleted file mode 100644
index 2bc485da04c..00000000000
Binary files a/templates/tour/img/overlay/blur/folders.png and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/hr.png b/templates/tour/img/overlay/blur/hr.png
deleted file mode 100644
index 46e526baccf..00000000000
Binary files a/templates/tour/img/overlay/blur/hr.png and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/installed.png b/templates/tour/img/overlay/blur/installed.png
deleted file mode 100644
index 7d62cc9648e..00000000000
Binary files a/templates/tour/img/overlay/blur/installed.png and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/internet-apps.png b/templates/tour/img/overlay/blur/internet-apps.png
deleted file mode 100644
index 7c05c68d488..00000000000
Binary files a/templates/tour/img/overlay/blur/internet-apps.png and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/listen-to-music.png b/templates/tour/img/overlay/blur/listen-to-music.png
deleted file mode 100644
index f54615e2117..00000000000
Binary files a/templates/tour/img/overlay/blur/listen-to-music.png and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/media-apps.png b/templates/tour/img/overlay/blur/media-apps.png
deleted file mode 100644
index cad6eddfb62..00000000000
Binary files a/templates/tour/img/overlay/blur/media-apps.png and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/more-apps.png b/templates/tour/img/overlay/blur/more-apps.png
deleted file mode 100644
index 90c6dbab812..00000000000
Binary files a/templates/tour/img/overlay/blur/more-apps.png and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/mostfrequently.png b/templates/tour/img/overlay/blur/mostfrequently.png
deleted file mode 100644
index 2cd054374c8..00000000000
Binary files a/templates/tour/img/overlay/blur/mostfrequently.png and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/recentapps.png b/templates/tour/img/overlay/blur/recentapps.png
deleted file mode 100644
index ee76610d2bf..00000000000
Binary files a/templates/tour/img/overlay/blur/recentapps.png and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/recentfiles.png b/templates/tour/img/overlay/blur/recentfiles.png
deleted file mode 100644
index 3736d8b168e..00000000000
Binary files a/templates/tour/img/overlay/blur/recentfiles.png and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/search-apps-logo.jpg b/templates/tour/img/overlay/blur/search-apps-logo.jpg
deleted file mode 100644
index 40c1ad316d3..00000000000
Binary files a/templates/tour/img/overlay/blur/search-apps-logo.jpg and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/search-files-logo.jpg b/templates/tour/img/overlay/blur/search-files-logo.jpg
deleted file mode 100644
index 00e99a560f8..00000000000
Binary files a/templates/tour/img/overlay/blur/search-files-logo.jpg and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/search-logo.png b/templates/tour/img/overlay/blur/search-logo.png
deleted file mode 100644
index 9cf0843b37c..00000000000
Binary files a/templates/tour/img/overlay/blur/search-logo.png and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/shortcuts-logo.jpg b/templates/tour/img/overlay/blur/shortcuts-logo.jpg
deleted file mode 100644
index 5d3aa2712bc..00000000000
Binary files a/templates/tour/img/overlay/blur/shortcuts-logo.jpg and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/shoutcurts-down.jpg b/templates/tour/img/overlay/blur/shoutcurts-down.jpg
deleted file mode 100644
index 10f6876ce10..00000000000
Binary files a/templates/tour/img/overlay/blur/shoutcurts-down.jpg and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/shoutcurts-right.jpg b/templates/tour/img/overlay/blur/shoutcurts-right.jpg
deleted file mode 100644
index 7f9bc2c4638..00000000000
Binary files a/templates/tour/img/overlay/blur/shoutcurts-right.jpg and /dev/null differ
diff --git a/templates/tour/img/overlay/blur/view-photos.png b/templates/tour/img/overlay/blur/view-photos.png
deleted file mode 100644
index 42704f9901a..00000000000
Binary files a/templates/tour/img/overlay/blur/view-photos.png and /dev/null differ
diff --git a/templates/tour/img/overlay/browse-files.png b/templates/tour/img/overlay/browse-files.png
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/templates/tour/img/overlay/browse-the-web.png b/templates/tour/img/overlay/browse-the-web.png
deleted file mode 100644
index dff5ecc2205..00000000000
Binary files a/templates/tour/img/overlay/browse-the-web.png and /dev/null differ
diff --git a/templates/tour/img/overlay/cancel-logo.png b/templates/tour/img/overlay/cancel-logo.png
deleted file mode 100644
index f2e8e7bfc65..00000000000
Binary files a/templates/tour/img/overlay/cancel-logo.png and /dev/null differ
diff --git a/templates/tour/img/overlay/check-email (Anthony Dillon's conflicted copy 2011-10-03).png b/templates/tour/img/overlay/check-email (Anthony Dillon's conflicted copy 2011-10-03).png
deleted file mode 100644
index 7cd753f2ef7..00000000000
Binary files a/templates/tour/img/overlay/check-email (Anthony Dillon's conflicted copy 2011-10-03).png and /dev/null differ
diff --git a/templates/tour/img/overlay/check-email (copy).png b/templates/tour/img/overlay/check-email (copy).png
deleted file mode 100644
index 7cd753f2ef7..00000000000
Binary files a/templates/tour/img/overlay/check-email (copy).png and /dev/null differ
diff --git a/templates/tour/img/overlay/check-email.png b/templates/tour/img/overlay/check-email.png
deleted file mode 100644
index e3dca99c777..00000000000
Binary files a/templates/tour/img/overlay/check-email.png and /dev/null differ
diff --git a/templates/tour/img/overlay/dash-close.png b/templates/tour/img/overlay/dash-close.png
deleted file mode 100644
index 33b0c6fe85b..00000000000
Binary files a/templates/tour/img/overlay/dash-close.png and /dev/null differ
diff --git a/templates/tour/img/overlay/dash-max.png b/templates/tour/img/overlay/dash-max.png
deleted file mode 100644
index e502c9a4180..00000000000
Binary files a/templates/tour/img/overlay/dash-max.png and /dev/null differ
diff --git a/templates/tour/img/overlay/dash-min.png b/templates/tour/img/overlay/dash-min.png
deleted file mode 100644
index 4e404023e79..00000000000
Binary files a/templates/tour/img/overlay/dash-min.png and /dev/null differ
diff --git a/templates/tour/img/overlay/downloaded.png b/templates/tour/img/overlay/downloaded.png
deleted file mode 100644
index a9cf3fb3cc2..00000000000
Binary files a/templates/tour/img/overlay/downloaded.png and /dev/null differ
diff --git a/templates/tour/img/overlay/find-files.png b/templates/tour/img/overlay/find-files.png
deleted file mode 100644
index b7559faca7f..00000000000
Binary files a/templates/tour/img/overlay/find-files.png and /dev/null differ
diff --git a/templates/tour/img/overlay/folders.png b/templates/tour/img/overlay/folders.png
deleted file mode 100644
index 47273be9748..00000000000
Binary files a/templates/tour/img/overlay/folders.png and /dev/null differ
diff --git a/templates/tour/img/overlay/hr.png b/templates/tour/img/overlay/hr.png
deleted file mode 100644
index ef02c1de156..00000000000
Binary files a/templates/tour/img/overlay/hr.png and /dev/null differ
diff --git a/templates/tour/img/overlay/installed.png b/templates/tour/img/overlay/installed.png
deleted file mode 100644
index 07760181d48..00000000000
Binary files a/templates/tour/img/overlay/installed.png and /dev/null differ
diff --git a/templates/tour/img/overlay/internet-apps.png b/templates/tour/img/overlay/internet-apps.png
deleted file mode 100644
index 5c7f8e49478..00000000000
Binary files a/templates/tour/img/overlay/internet-apps.png and /dev/null differ
diff --git a/templates/tour/img/overlay/listen-to-music.png b/templates/tour/img/overlay/listen-to-music.png
deleted file mode 100644
index b9836fb59bf..00000000000
Binary files a/templates/tour/img/overlay/listen-to-music.png and /dev/null differ
diff --git a/templates/tour/img/overlay/media-apps.png b/templates/tour/img/overlay/media-apps.png
deleted file mode 100644
index d0445f2bcf8..00000000000
Binary files a/templates/tour/img/overlay/media-apps.png and /dev/null differ
diff --git a/templates/tour/img/overlay/more-apps.png b/templates/tour/img/overlay/more-apps.png
deleted file mode 100644
index cee5badf776..00000000000
Binary files a/templates/tour/img/overlay/more-apps.png and /dev/null differ
diff --git a/templates/tour/img/overlay/more-apps.xcf b/templates/tour/img/overlay/more-apps.xcf
deleted file mode 100644
index 5f747408961..00000000000
Binary files a/templates/tour/img/overlay/more-apps.xcf and /dev/null differ
diff --git a/templates/tour/img/overlay/mostfrequently.png b/templates/tour/img/overlay/mostfrequently.png
deleted file mode 100644
index 2d128318ada..00000000000
Binary files a/templates/tour/img/overlay/mostfrequently.png and /dev/null differ
diff --git a/templates/tour/img/overlay/recentapps.png b/templates/tour/img/overlay/recentapps.png
deleted file mode 100644
index fa2c641a7b7..00000000000
Binary files a/templates/tour/img/overlay/recentapps.png and /dev/null differ
diff --git a/templates/tour/img/overlay/recentfiles.png b/templates/tour/img/overlay/recentfiles.png
deleted file mode 100644
index 8ab6bcea2e4..00000000000
Binary files a/templates/tour/img/overlay/recentfiles.png and /dev/null differ
diff --git a/templates/tour/img/overlay/search-apps-logo.jpg b/templates/tour/img/overlay/search-apps-logo.jpg
deleted file mode 100644
index 9a2025cd165..00000000000
Binary files a/templates/tour/img/overlay/search-apps-logo.jpg and /dev/null differ
diff --git a/templates/tour/img/overlay/search-files-logo.jpg b/templates/tour/img/overlay/search-files-logo.jpg
deleted file mode 100644
index 8dea318a9d9..00000000000
Binary files a/templates/tour/img/overlay/search-files-logo.jpg and /dev/null differ
diff --git a/templates/tour/img/overlay/search-logo.png b/templates/tour/img/overlay/search-logo.png
deleted file mode 100644
index 9f5e4ac362a..00000000000
Binary files a/templates/tour/img/overlay/search-logo.png and /dev/null differ
diff --git a/templates/tour/img/overlay/shortcuts-logo (Anthony Dillon's conflicted copy 2011-10-03).jpg b/templates/tour/img/overlay/shortcuts-logo (Anthony Dillon's conflicted copy 2011-10-03).jpg
deleted file mode 100644
index 76b2594558b..00000000000
Binary files a/templates/tour/img/overlay/shortcuts-logo (Anthony Dillon's conflicted copy 2011-10-03).jpg and /dev/null differ
diff --git a/templates/tour/img/overlay/shortcuts-logo.jpg b/templates/tour/img/overlay/shortcuts-logo.jpg
deleted file mode 100644
index 1685e58a34f..00000000000
Binary files a/templates/tour/img/overlay/shortcuts-logo.jpg and /dev/null differ
diff --git a/templates/tour/img/overlay/shortcuts-logo.png b/templates/tour/img/overlay/shortcuts-logo.png
deleted file mode 100644
index 619238c821a..00000000000
Binary files a/templates/tour/img/overlay/shortcuts-logo.png and /dev/null differ
diff --git a/templates/tour/img/overlay/shoutcurts-down.jpg b/templates/tour/img/overlay/shoutcurts-down.jpg
deleted file mode 100644
index 86680b60e94..00000000000
Binary files a/templates/tour/img/overlay/shoutcurts-down.jpg and /dev/null differ
diff --git a/templates/tour/img/overlay/shoutcurts-down.png b/templates/tour/img/overlay/shoutcurts-down.png
deleted file mode 100644
index 6a12fe5993d..00000000000
Binary files a/templates/tour/img/overlay/shoutcurts-down.png and /dev/null differ
diff --git a/templates/tour/img/overlay/shoutcurts-right.jpg b/templates/tour/img/overlay/shoutcurts-right.jpg
deleted file mode 100644
index 247b83dfed4..00000000000
Binary files a/templates/tour/img/overlay/shoutcurts-right.jpg and /dev/null differ
diff --git a/templates/tour/img/overlay/shoutcurts-right.png b/templates/tour/img/overlay/shoutcurts-right.png
deleted file mode 100644
index aabec3bc2a9..00000000000
Binary files a/templates/tour/img/overlay/shoutcurts-right.png and /dev/null differ
diff --git a/templates/tour/img/overlay/surf-the-web.png b/templates/tour/img/overlay/surf-the-web.png
deleted file mode 100644
index cc203268aac..00000000000
Binary files a/templates/tour/img/overlay/surf-the-web.png and /dev/null differ
diff --git a/templates/tour/img/overlay/view-photos.png b/templates/tour/img/overlay/view-photos.png
deleted file mode 100644
index 191f72a3791..00000000000
Binary files a/templates/tour/img/overlay/view-photos.png and /dev/null differ
diff --git a/templates/tour/img/powerwarning.jpg b/templates/tour/img/powerwarning.jpg
deleted file mode 100644
index 41930cd0f92..00000000000
Binary files a/templates/tour/img/powerwarning.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/blur/library-icon.png b/templates/tour/img/shotwell/blur/library-icon.png
deleted file mode 100644
index 4bce8f8af9d..00000000000
Binary files a/templates/tour/img/shotwell/blur/library-icon.png and /dev/null differ
diff --git a/templates/tour/img/shotwell/blur/slider-large.jpg b/templates/tour/img/shotwell/blur/slider-large.jpg
deleted file mode 100644
index 1e4b680b704..00000000000
Binary files a/templates/tour/img/shotwell/blur/slider-large.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/blur/slider-small.jpg b/templates/tour/img/shotwell/blur/slider-small.jpg
deleted file mode 100644
index c7befc02c77..00000000000
Binary files a/templates/tour/img/shotwell/blur/slider-small.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library-icon.png b/templates/tour/img/shotwell/library-icon.png
deleted file mode 100644
index aacfc57638f..00000000000
Binary files a/templates/tour/img/shotwell/library-icon.png and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/Buckoff.jpg b/templates/tour/img/shotwell/library/Buckoff.jpg
deleted file mode 100644
index ea009e73a6c..00000000000
Binary files a/templates/tour/img/shotwell/library/Buckoff.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/DarkeningClockwork.jpg b/templates/tour/img/shotwell/library/DarkeningClockwork.jpg
deleted file mode 100644
index 0f47be39fcc..00000000000
Binary files a/templates/tour/img/shotwell/library/DarkeningClockwork.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/DybblsbroStation.jpg b/templates/tour/img/shotwell/library/DybblsbroStation.jpg
deleted file mode 100644
index fb7bfb89f94..00000000000
Binary files a/templates/tour/img/shotwell/library/DybblsbroStation.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/FedericaMiglio.jpg b/templates/tour/img/shotwell/library/FedericaMiglio.jpg
deleted file mode 100644
index 5ab2d20f8c9..00000000000
Binary files a/templates/tour/img/shotwell/library/FedericaMiglio.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/JardinPolar.jpg b/templates/tour/img/shotwell/library/JardinPolar.jpg
deleted file mode 100644
index 328d036afab..00000000000
Binary files a/templates/tour/img/shotwell/library/JardinPolar.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/LangelinieAlle.jpg b/templates/tour/img/shotwell/library/LangelinieAlle.jpg
deleted file mode 100644
index 8eeaa2a5d16..00000000000
Binary files a/templates/tour/img/shotwell/library/LangelinieAlle.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/MomijiDream.jpg b/templates/tour/img/shotwell/library/MomijiDream.jpg
deleted file mode 100644
index 4c2dbfb63e2..00000000000
Binary files a/templates/tour/img/shotwell/library/MomijiDream.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/MountSnowdon.jpg b/templates/tour/img/shotwell/library/MountSnowdon.jpg
deleted file mode 100644
index 80c9a32ce83..00000000000
Binary files a/templates/tour/img/shotwell/library/MountSnowdon.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/NotAlone.jpg b/templates/tour/img/shotwell/library/NotAlone.jpg
deleted file mode 100644
index a385adfdf0c..00000000000
Binary files a/templates/tour/img/shotwell/library/NotAlone.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/PowerOfWords.jpg b/templates/tour/img/shotwell/library/PowerOfWords.jpg
deleted file mode 100644
index b841de6e73a..00000000000
Binary files a/templates/tour/img/shotwell/library/PowerOfWords.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/PurpleDancers.jpg b/templates/tour/img/shotwell/library/PurpleDancers.jpg
deleted file mode 100644
index b15d4227fd2..00000000000
Binary files a/templates/tour/img/shotwell/library/PurpleDancers.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/SandMaze.jpg b/templates/tour/img/shotwell/library/SandMaze.jpg
deleted file mode 100644
index 47a143bc3fb..00000000000
Binary files a/templates/tour/img/shotwell/library/SandMaze.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/SmallFlowers.jpg b/templates/tour/img/shotwell/library/SmallFlowers.jpg
deleted file mode 100644
index 0fdceb20f9b..00000000000
Binary files a/templates/tour/img/shotwell/library/SmallFlowers.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/StalkingOcelot.jpg b/templates/tour/img/shotwell/library/StalkingOcelot.jpg
deleted file mode 100644
index 4c0a3594ccf..00000000000
Binary files a/templates/tour/img/shotwell/library/StalkingOcelot.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/TheGrassAintGreener.jpg b/templates/tour/img/shotwell/library/TheGrassAintGreener.jpg
deleted file mode 100644
index 19b95ab37b6..00000000000
Binary files a/templates/tour/img/shotwell/library/TheGrassAintGreener.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/WildWheat.jpg b/templates/tour/img/shotwell/library/WildWheat.jpg
deleted file mode 100644
index 2d267b6a7b0..00000000000
Binary files a/templates/tour/img/shotwell/library/WildWheat.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/blur/Buckoff.jpg b/templates/tour/img/shotwell/library/blur/Buckoff.jpg
deleted file mode 100644
index 52f1c603c5d..00000000000
Binary files a/templates/tour/img/shotwell/library/blur/Buckoff.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/blur/DarkeningClockwork.jpg b/templates/tour/img/shotwell/library/blur/DarkeningClockwork.jpg
deleted file mode 100644
index e6d10b4cf86..00000000000
Binary files a/templates/tour/img/shotwell/library/blur/DarkeningClockwork.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/blur/DybblsbroStation.jpg b/templates/tour/img/shotwell/library/blur/DybblsbroStation.jpg
deleted file mode 100644
index 40fdac430e6..00000000000
Binary files a/templates/tour/img/shotwell/library/blur/DybblsbroStation.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/blur/FedericaMiglio.jpg b/templates/tour/img/shotwell/library/blur/FedericaMiglio.jpg
deleted file mode 100644
index a074887e1d3..00000000000
Binary files a/templates/tour/img/shotwell/library/blur/FedericaMiglio.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/blur/JardinPolar.jpg b/templates/tour/img/shotwell/library/blur/JardinPolar.jpg
deleted file mode 100644
index d979a782612..00000000000
Binary files a/templates/tour/img/shotwell/library/blur/JardinPolar.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/blur/LangelinieAlle.jpg b/templates/tour/img/shotwell/library/blur/LangelinieAlle.jpg
deleted file mode 100644
index 028fc0ca902..00000000000
Binary files a/templates/tour/img/shotwell/library/blur/LangelinieAlle.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/blur/MomijiDream.jpg b/templates/tour/img/shotwell/library/blur/MomijiDream.jpg
deleted file mode 100644
index 9769a419e6d..00000000000
Binary files a/templates/tour/img/shotwell/library/blur/MomijiDream.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/blur/MountSnowdon.jpg b/templates/tour/img/shotwell/library/blur/MountSnowdon.jpg
deleted file mode 100644
index 9909b65ce30..00000000000
Binary files a/templates/tour/img/shotwell/library/blur/MountSnowdon.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/blur/NotAlone.jpg b/templates/tour/img/shotwell/library/blur/NotAlone.jpg
deleted file mode 100644
index d1388166d80..00000000000
Binary files a/templates/tour/img/shotwell/library/blur/NotAlone.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/blur/PowerOfWords.jpg b/templates/tour/img/shotwell/library/blur/PowerOfWords.jpg
deleted file mode 100644
index fc652c3fd59..00000000000
Binary files a/templates/tour/img/shotwell/library/blur/PowerOfWords.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/blur/PurpleDancers.jpg b/templates/tour/img/shotwell/library/blur/PurpleDancers.jpg
deleted file mode 100644
index 17049003245..00000000000
Binary files a/templates/tour/img/shotwell/library/blur/PurpleDancers.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/blur/SandMaze.jpg b/templates/tour/img/shotwell/library/blur/SandMaze.jpg
deleted file mode 100644
index bf487113f71..00000000000
Binary files a/templates/tour/img/shotwell/library/blur/SandMaze.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/blur/SmallFlowers.jpg b/templates/tour/img/shotwell/library/blur/SmallFlowers.jpg
deleted file mode 100644
index 89b56c18150..00000000000
Binary files a/templates/tour/img/shotwell/library/blur/SmallFlowers.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/blur/StalkingOcelot.jpg b/templates/tour/img/shotwell/library/blur/StalkingOcelot.jpg
deleted file mode 100644
index 82bbe95e5eb..00000000000
Binary files a/templates/tour/img/shotwell/library/blur/StalkingOcelot.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/blur/TheGrassAintGreener.jpg b/templates/tour/img/shotwell/library/blur/TheGrassAintGreener.jpg
deleted file mode 100644
index 074367a1042..00000000000
Binary files a/templates/tour/img/shotwell/library/blur/TheGrassAintGreener.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/blur/WildWheat.jpg b/templates/tour/img/shotwell/library/blur/WildWheat.jpg
deleted file mode 100644
index f9a26fc2096..00000000000
Binary files a/templates/tour/img/shotwell/library/blur/WildWheat.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/blur/dam.jpg b/templates/tour/img/shotwell/library/blur/dam.jpg
deleted file mode 100644
index a66dedc3976..00000000000
Binary files a/templates/tour/img/shotwell/library/blur/dam.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/blur/landscape.jpg b/templates/tour/img/shotwell/library/blur/landscape.jpg
deleted file mode 100644
index 6af41362ea9..00000000000
Binary files a/templates/tour/img/shotwell/library/blur/landscape.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/blur/plant.jpg b/templates/tour/img/shotwell/library/blur/plant.jpg
deleted file mode 100644
index 2f6f0f02f50..00000000000
Binary files a/templates/tour/img/shotwell/library/blur/plant.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/blur/river.jpg b/templates/tour/img/shotwell/library/blur/river.jpg
deleted file mode 100644
index 49e1d3ee64f..00000000000
Binary files a/templates/tour/img/shotwell/library/blur/river.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/blur/trees.jpg b/templates/tour/img/shotwell/library/blur/trees.jpg
deleted file mode 100644
index 4fb9ba8c191..00000000000
Binary files a/templates/tour/img/shotwell/library/blur/trees.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/dam.jpg b/templates/tour/img/shotwell/library/dam.jpg
deleted file mode 100644
index 60e6bf3b491..00000000000
Binary files a/templates/tour/img/shotwell/library/dam.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/landscape.jpg b/templates/tour/img/shotwell/library/landscape.jpg
deleted file mode 100644
index 4dbf5a15122..00000000000
Binary files a/templates/tour/img/shotwell/library/landscape.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/plant.jpg b/templates/tour/img/shotwell/library/plant.jpg
deleted file mode 100644
index 0893cbfbec0..00000000000
Binary files a/templates/tour/img/shotwell/library/plant.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/river.jpg b/templates/tour/img/shotwell/library/river.jpg
deleted file mode 100644
index 0a825f2d8c4..00000000000
Binary files a/templates/tour/img/shotwell/library/river.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/library/trees.jpg b/templates/tour/img/shotwell/library/trees.jpg
deleted file mode 100644
index 1ccd5b54d43..00000000000
Binary files a/templates/tour/img/shotwell/library/trees.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/slider-large.jpg b/templates/tour/img/shotwell/slider-large.jpg
deleted file mode 100644
index 4ad183c0b16..00000000000
Binary files a/templates/tour/img/shotwell/slider-large.jpg and /dev/null differ
diff --git a/templates/tour/img/shotwell/slider-small.jpg b/templates/tour/img/shotwell/slider-small.jpg
deleted file mode 100644
index 9742d80d656..00000000000
Binary files a/templates/tour/img/shotwell/slider-small.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/all-software.png b/templates/tour/img/software-centre/all-software.png
deleted file mode 100644
index bb52f570a9b..00000000000
Binary files a/templates/tour/img/software-centre/all-software.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/back.jpg b/templates/tour/img/software-centre/back.jpg
deleted file mode 100644
index 654b745c5d6..00000000000
Binary files a/templates/tour/img/software-centre/back.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/all-software.png b/templates/tour/img/software-centre/blur/all-software.png
deleted file mode 100644
index 508cd40e8e4..00000000000
Binary files a/templates/tour/img/software-centre/blur/all-software.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/back.jpg b/templates/tour/img/software-centre/blur/back.jpg
deleted file mode 100644
index 1de1fbd9597..00000000000
Binary files a/templates/tour/img/software-centre/blur/back.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/forward.jpg b/templates/tour/img/software-centre/blur/forward.jpg
deleted file mode 100644
index 3f0e0d1d10e..00000000000
Binary files a/templates/tour/img/software-centre/blur/forward.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/gladish.png b/templates/tour/img/software-centre/blur/gladish.png
deleted file mode 100644
index aa70b107c44..00000000000
Binary files a/templates/tour/img/software-centre/blur/gladish.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/header.jpg b/templates/tour/img/software-centre/blur/header.jpg
deleted file mode 100644
index 39f7c45645d..00000000000
Binary files a/templates/tour/img/software-centre/blur/header.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/history (copy).png b/templates/tour/img/software-centre/blur/history (copy).png
deleted file mode 100644
index a6ff77a1f07..00000000000
Binary files a/templates/tour/img/software-centre/blur/history (copy).png and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/history.png b/templates/tour/img/software-centre/blur/history.png
deleted file mode 100644
index f4346d0b3a6..00000000000
Binary files a/templates/tour/img/software-centre/blur/history.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/install-button-over.jpg b/templates/tour/img/software-centre/blur/install-button-over.jpg
deleted file mode 100644
index 3f4098c5d90..00000000000
Binary files a/templates/tour/img/software-centre/blur/install-button-over.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/install-button.jpg b/templates/tour/img/software-centre/blur/install-button.jpg
deleted file mode 100644
index dae4e25a66c..00000000000
Binary files a/templates/tour/img/software-centre/blur/install-button.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/install-tick.png b/templates/tour/img/software-centre/blur/install-tick.png
deleted file mode 100644
index 05a48fe3cd1..00000000000
Binary files a/templates/tour/img/software-centre/blur/install-tick.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/installed (copy).png b/templates/tour/img/software-centre/blur/installed (copy).png
deleted file mode 100644
index c2b300f516e..00000000000
Binary files a/templates/tour/img/software-centre/blur/installed (copy).png and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/installed.png b/templates/tour/img/software-centre/blur/installed.png
deleted file mode 100644
index 126f6245615..00000000000
Binary files a/templates/tour/img/software-centre/blur/installed.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/logo-beep.png b/templates/tour/img/software-centre/blur/logo-beep.png
deleted file mode 100644
index 97f2e81ed9c..00000000000
Binary files a/templates/tour/img/software-centre/blur/logo-beep.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/logo-blender.png b/templates/tour/img/software-centre/blur/logo-blender.png
deleted file mode 100644
index b3e06274b02..00000000000
Binary files a/templates/tour/img/software-centre/blur/logo-blender.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/logo-braid.png b/templates/tour/img/software-centre/blur/logo-braid.png
deleted file mode 100644
index 8091ea6a1d7..00000000000
Binary files a/templates/tour/img/software-centre/blur/logo-braid.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/logo-chromium.png b/templates/tour/img/software-centre/blur/logo-chromium.png
deleted file mode 100644
index 5e956fe2a28..00000000000
Binary files a/templates/tour/img/software-centre/blur/logo-chromium.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/logo-inkscape.png b/templates/tour/img/software-centre/blur/logo-inkscape.png
deleted file mode 100644
index c1b688631ab..00000000000
Binary files a/templates/tour/img/software-centre/blur/logo-inkscape.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/logo-world-of-goo.png b/templates/tour/img/software-centre/blur/logo-world-of-goo.png
deleted file mode 100644
index f8a01af103c..00000000000
Binary files a/templates/tour/img/software-centre/blur/logo-world-of-goo.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/netsurf.png b/templates/tour/img/software-centre/blur/netsurf.png
deleted file mode 100644
index b8395d08d4e..00000000000
Binary files a/templates/tour/img/software-centre/blur/netsurf.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/okular.png b/templates/tour/img/software-centre/blur/okular.png
deleted file mode 100644
index f1f7bb3d6a2..00000000000
Binary files a/templates/tour/img/software-centre/blur/okular.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/openjdk.png b/templates/tour/img/software-centre/blur/openjdk.png
deleted file mode 100644
index 497e69655a9..00000000000
Binary files a/templates/tour/img/software-centre/blur/openjdk.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/rating.jpg b/templates/tour/img/software-centre/blur/rating.jpg
deleted file mode 100644
index d745a774b64..00000000000
Binary files a/templates/tour/img/software-centre/blur/rating.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/screenshot-beep.jpg b/templates/tour/img/software-centre/blur/screenshot-beep.jpg
deleted file mode 100644
index 6dbeb436085..00000000000
Binary files a/templates/tour/img/software-centre/blur/screenshot-beep.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/screenshot-blender.jpg b/templates/tour/img/software-centre/blur/screenshot-blender.jpg
deleted file mode 100644
index 4e1b98cdf83..00000000000
Binary files a/templates/tour/img/software-centre/blur/screenshot-blender.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/screenshot-braid.jpg b/templates/tour/img/software-centre/blur/screenshot-braid.jpg
deleted file mode 100644
index 9198b4a6e47..00000000000
Binary files a/templates/tour/img/software-centre/blur/screenshot-braid.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/screenshot-chromium.jpg b/templates/tour/img/software-centre/blur/screenshot-chromium.jpg
deleted file mode 100644
index 3c11f842dc4..00000000000
Binary files a/templates/tour/img/software-centre/blur/screenshot-chromium.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/screenshot-inkscape.jpg b/templates/tour/img/software-centre/blur/screenshot-inkscape.jpg
deleted file mode 100644
index d0055f16879..00000000000
Binary files a/templates/tour/img/software-centre/blur/screenshot-inkscape.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/screenshot-worldofgoo.jpg b/templates/tour/img/software-centre/blur/screenshot-worldofgoo.jpg
deleted file mode 100644
index d4af80b41ea..00000000000
Binary files a/templates/tour/img/software-centre/blur/screenshot-worldofgoo.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/steadyflow.png b/templates/tour/img/software-centre/blur/steadyflow.png
deleted file mode 100644
index f9c52ef95d9..00000000000
Binary files a/templates/tour/img/software-centre/blur/steadyflow.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/top-bg-selected.jpg b/templates/tour/img/software-centre/blur/top-bg-selected.jpg
deleted file mode 100644
index 02dd1b5576d..00000000000
Binary files a/templates/tour/img/software-centre/blur/top-bg-selected.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/top-bg.jpg b/templates/tour/img/software-centre/blur/top-bg.jpg
deleted file mode 100644
index bcb4e230451..00000000000
Binary files a/templates/tour/img/software-centre/blur/top-bg.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/visolate.png b/templates/tour/img/software-centre/blur/visolate.png
deleted file mode 100644
index 701c4de0f93..00000000000
Binary files a/templates/tour/img/software-centre/blur/visolate.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/vitables.png b/templates/tour/img/software-centre/blur/vitables.png
deleted file mode 100644
index f80a8b5e553..00000000000
Binary files a/templates/tour/img/software-centre/blur/vitables.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/blur/xyscan.png b/templates/tour/img/software-centre/blur/xyscan.png
deleted file mode 100644
index 6b220ddb4fc..00000000000
Binary files a/templates/tour/img/software-centre/blur/xyscan.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/forward.jpg b/templates/tour/img/software-centre/forward.jpg
deleted file mode 100644
index ba7c2cd11ba..00000000000
Binary files a/templates/tour/img/software-centre/forward.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/gladish.png b/templates/tour/img/software-centre/gladish.png
deleted file mode 100644
index 1755cfd21f0..00000000000
Binary files a/templates/tour/img/software-centre/gladish.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/header.jpg b/templates/tour/img/software-centre/header.jpg
deleted file mode 100644
index 85fd09327b0..00000000000
Binary files a/templates/tour/img/software-centre/header.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/history (copy).png b/templates/tour/img/software-centre/history (copy).png
deleted file mode 100644
index 3925e524d19..00000000000
Binary files a/templates/tour/img/software-centre/history (copy).png and /dev/null differ
diff --git a/templates/tour/img/software-centre/history.png b/templates/tour/img/software-centre/history.png
deleted file mode 100644
index 3bc7093cd4b..00000000000
Binary files a/templates/tour/img/software-centre/history.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/install-button-over.jpg b/templates/tour/img/software-centre/install-button-over.jpg
deleted file mode 100644
index 107a8d43c93..00000000000
Binary files a/templates/tour/img/software-centre/install-button-over.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/install-button.jpg b/templates/tour/img/software-centre/install-button.jpg
deleted file mode 100644
index 668232595a9..00000000000
Binary files a/templates/tour/img/software-centre/install-button.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/install-tick.png b/templates/tour/img/software-centre/install-tick.png
deleted file mode 100644
index 3b466ac89e3..00000000000
Binary files a/templates/tour/img/software-centre/install-tick.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/installed (copy).png b/templates/tour/img/software-centre/installed (copy).png
deleted file mode 100644
index 4e9d4d06d18..00000000000
Binary files a/templates/tour/img/software-centre/installed (copy).png and /dev/null differ
diff --git a/templates/tour/img/software-centre/installed.png b/templates/tour/img/software-centre/installed.png
deleted file mode 100644
index 7ff436d4062..00000000000
Binary files a/templates/tour/img/software-centre/installed.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/logo-beep.png b/templates/tour/img/software-centre/logo-beep.png
deleted file mode 100644
index 69d58ceb83e..00000000000
Binary files a/templates/tour/img/software-centre/logo-beep.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/logo-blender.png b/templates/tour/img/software-centre/logo-blender.png
deleted file mode 100644
index 03cbe078fee..00000000000
Binary files a/templates/tour/img/software-centre/logo-blender.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/logo-braid.png b/templates/tour/img/software-centre/logo-braid.png
deleted file mode 100644
index ad320ecc280..00000000000
Binary files a/templates/tour/img/software-centre/logo-braid.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/logo-chromium.png b/templates/tour/img/software-centre/logo-chromium.png
deleted file mode 100644
index 6a99c02c6d0..00000000000
Binary files a/templates/tour/img/software-centre/logo-chromium.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/logo-inkscape.png b/templates/tour/img/software-centre/logo-inkscape.png
deleted file mode 100644
index 14a04e3e40e..00000000000
Binary files a/templates/tour/img/software-centre/logo-inkscape.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/logo-world-of-goo.png b/templates/tour/img/software-centre/logo-world-of-goo.png
deleted file mode 100644
index de36820125d..00000000000
Binary files a/templates/tour/img/software-centre/logo-world-of-goo.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/netsurf.png b/templates/tour/img/software-centre/netsurf.png
deleted file mode 100644
index 374646218f0..00000000000
Binary files a/templates/tour/img/software-centre/netsurf.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/okular.png b/templates/tour/img/software-centre/okular.png
deleted file mode 100644
index 07909b608e7..00000000000
Binary files a/templates/tour/img/software-centre/okular.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/openjdk.png b/templates/tour/img/software-centre/openjdk.png
deleted file mode 100644
index f728b645859..00000000000
Binary files a/templates/tour/img/software-centre/openjdk.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/rating.jpg b/templates/tour/img/software-centre/rating.jpg
deleted file mode 100644
index ab9df265dfb..00000000000
Binary files a/templates/tour/img/software-centre/rating.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/screenshot-beep.jpg b/templates/tour/img/software-centre/screenshot-beep.jpg
deleted file mode 100644
index 3f6be9a690e..00000000000
Binary files a/templates/tour/img/software-centre/screenshot-beep.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/screenshot-blender.jpg b/templates/tour/img/software-centre/screenshot-blender.jpg
deleted file mode 100644
index 7c83d1d7c01..00000000000
Binary files a/templates/tour/img/software-centre/screenshot-blender.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/screenshot-braid.jpg b/templates/tour/img/software-centre/screenshot-braid.jpg
deleted file mode 100644
index 2d31ecf52e2..00000000000
Binary files a/templates/tour/img/software-centre/screenshot-braid.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/screenshot-chromium.jpg b/templates/tour/img/software-centre/screenshot-chromium.jpg
deleted file mode 100644
index 6cbd6df9e2b..00000000000
Binary files a/templates/tour/img/software-centre/screenshot-chromium.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/screenshot-inkscape.jpg b/templates/tour/img/software-centre/screenshot-inkscape.jpg
deleted file mode 100644
index 1630ae19dbe..00000000000
Binary files a/templates/tour/img/software-centre/screenshot-inkscape.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/screenshot-worldofgoo.jpg b/templates/tour/img/software-centre/screenshot-worldofgoo.jpg
deleted file mode 100644
index 99a1f0cef69..00000000000
Binary files a/templates/tour/img/software-centre/screenshot-worldofgoo.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/steadyflow.png b/templates/tour/img/software-centre/steadyflow.png
deleted file mode 100644
index b82d6014893..00000000000
Binary files a/templates/tour/img/software-centre/steadyflow.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/top-bg-selected.jpg b/templates/tour/img/software-centre/top-bg-selected.jpg
deleted file mode 100644
index 8f10ea48c96..00000000000
Binary files a/templates/tour/img/software-centre/top-bg-selected.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/top-bg.jpg b/templates/tour/img/software-centre/top-bg.jpg
deleted file mode 100644
index 75a6cd53b8b..00000000000
Binary files a/templates/tour/img/software-centre/top-bg.jpg and /dev/null differ
diff --git a/templates/tour/img/software-centre/visolate.png b/templates/tour/img/software-centre/visolate.png
deleted file mode 100644
index a5ecc03cc42..00000000000
Binary files a/templates/tour/img/software-centre/visolate.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/vitables.png b/templates/tour/img/software-centre/vitables.png
deleted file mode 100644
index 70a19ab324d..00000000000
Binary files a/templates/tour/img/software-centre/vitables.png and /dev/null differ
diff --git a/templates/tour/img/software-centre/xyscan.png b/templates/tour/img/software-centre/xyscan.png
deleted file mode 100644
index 732d383be73..00000000000
Binary files a/templates/tour/img/software-centre/xyscan.png and /dev/null differ
diff --git a/templates/tour/img/speaker-bg-slider.png b/templates/tour/img/speaker-bg-slider.png
deleted file mode 100644
index 12791356136..00000000000
Binary files a/templates/tour/img/speaker-bg-slider.png and /dev/null differ
diff --git a/templates/tour/img/top-bg-selected.jpg b/templates/tour/img/top-bg-selected.jpg
deleted file mode 100644
index 01e12235bc0..00000000000
Binary files a/templates/tour/img/top-bg-selected.jpg and /dev/null differ
diff --git a/templates/tour/img/top-bg.jpg b/templates/tour/img/top-bg.jpg
deleted file mode 100644
index 787fd89a946..00000000000
Binary files a/templates/tour/img/top-bg.jpg and /dev/null differ
diff --git a/templates/tour/img/top/0slider.jpg b/templates/tour/img/top/0slider.jpg
deleted file mode 100644
index e45efc54ac4..00000000000
Binary files a/templates/tour/img/top/0slider.jpg and /dev/null differ
diff --git a/templates/tour/img/top/100slider.jpg b/templates/tour/img/top/100slider.jpg
deleted file mode 100644
index ee282c7ab97..00000000000
Binary files a/templates/tour/img/top/100slider.jpg and /dev/null differ
diff --git a/templates/tour/img/top/active-background.png b/templates/tour/img/top/active-background.png
deleted file mode 100644
index f4937cd5e0e..00000000000
Binary files a/templates/tour/img/top/active-background.png and /dev/null differ
diff --git a/templates/tour/img/top/available.jpg b/templates/tour/img/top/available.jpg
deleted file mode 100644
index 64ea9752868..00000000000
Binary files a/templates/tour/img/top/available.jpg and /dev/null differ
diff --git a/templates/tour/img/top/available.png b/templates/tour/img/top/available.png
deleted file mode 100644
index 9dfbadef3d0..00000000000
Binary files a/templates/tour/img/top/available.png and /dev/null differ
diff --git a/templates/tour/img/top/away.jpg b/templates/tour/img/top/away.jpg
deleted file mode 100644
index 749bead4a4d..00000000000
Binary files a/templates/tour/img/top/away.jpg and /dev/null differ
diff --git a/templates/tour/img/top/away.png b/templates/tour/img/top/away.png
deleted file mode 100644
index 1608413c78b..00000000000
Binary files a/templates/tour/img/top/away.png and /dev/null differ
diff --git a/templates/tour/img/top/banshee-forward.png b/templates/tour/img/top/banshee-forward.png
deleted file mode 100644
index 8de68a95f00..00000000000
Binary files a/templates/tour/img/top/banshee-forward.png and /dev/null differ
diff --git a/templates/tour/img/top/banshee-play-highlight.png b/templates/tour/img/top/banshee-play-highlight.png
deleted file mode 100644
index 382eb605873..00000000000
Binary files a/templates/tour/img/top/banshee-play-highlight.png and /dev/null differ
diff --git a/templates/tour/img/top/banshee-play.png b/templates/tour/img/top/banshee-play.png
deleted file mode 100644
index af4f10fc0fc..00000000000
Binary files a/templates/tour/img/top/banshee-play.png and /dev/null differ
diff --git a/templates/tour/img/top/banshee-rewind.png b/templates/tour/img/top/banshee-rewind.png
deleted file mode 100644
index 59d580abdf2..00000000000
Binary files a/templates/tour/img/top/banshee-rewind.png and /dev/null differ
diff --git a/templates/tour/img/top/banshee.png b/templates/tour/img/top/banshee.png
deleted file mode 100644
index 2ee5e1ee6e4..00000000000
Binary files a/templates/tour/img/top/banshee.png and /dev/null differ
diff --git a/templates/tour/img/top/bluetooth.png b/templates/tour/img/top/bluetooth.png
deleted file mode 100644
index 9f3e60c5b75..00000000000
Binary files a/templates/tour/img/top/bluetooth.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/0slider.jpg b/templates/tour/img/top/blur/0slider.jpg
deleted file mode 100644
index e45efc54ac4..00000000000
Binary files a/templates/tour/img/top/blur/0slider.jpg and /dev/null differ
diff --git a/templates/tour/img/top/blur/100slider.jpg b/templates/tour/img/top/blur/100slider.jpg
deleted file mode 100644
index ee282c7ab97..00000000000
Binary files a/templates/tour/img/top/blur/100slider.jpg and /dev/null differ
diff --git a/templates/tour/img/top/blur/active-background.png b/templates/tour/img/top/blur/active-background.png
deleted file mode 100644
index 619e4133fb0..00000000000
Binary files a/templates/tour/img/top/blur/active-background.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/available.jpg b/templates/tour/img/top/blur/available.jpg
deleted file mode 100644
index 64ea9752868..00000000000
Binary files a/templates/tour/img/top/blur/available.jpg and /dev/null differ
diff --git a/templates/tour/img/top/blur/available.png b/templates/tour/img/top/blur/available.png
deleted file mode 100644
index 9dfbadef3d0..00000000000
Binary files a/templates/tour/img/top/blur/available.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/away.jpg b/templates/tour/img/top/blur/away.jpg
deleted file mode 100644
index 749bead4a4d..00000000000
Binary files a/templates/tour/img/top/blur/away.jpg and /dev/null differ
diff --git a/templates/tour/img/top/blur/away.png b/templates/tour/img/top/blur/away.png
deleted file mode 100644
index 1608413c78b..00000000000
Binary files a/templates/tour/img/top/blur/away.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/banshee-forward.png b/templates/tour/img/top/blur/banshee-forward.png
deleted file mode 100644
index 8de68a95f00..00000000000
Binary files a/templates/tour/img/top/blur/banshee-forward.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/banshee-play-highlight.png b/templates/tour/img/top/blur/banshee-play-highlight.png
deleted file mode 100644
index 382eb605873..00000000000
Binary files a/templates/tour/img/top/blur/banshee-play-highlight.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/banshee-play.png b/templates/tour/img/top/blur/banshee-play.png
deleted file mode 100644
index af4f10fc0fc..00000000000
Binary files a/templates/tour/img/top/blur/banshee-play.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/banshee-rewind.png b/templates/tour/img/top/blur/banshee-rewind.png
deleted file mode 100644
index 59d580abdf2..00000000000
Binary files a/templates/tour/img/top/blur/banshee-rewind.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/banshee.png b/templates/tour/img/top/blur/banshee.png
deleted file mode 100644
index 2ee5e1ee6e4..00000000000
Binary files a/templates/tour/img/top/blur/banshee.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/bluetooth.png b/templates/tour/img/top/blur/bluetooth.png
deleted file mode 100644
index 922e750d343..00000000000
Binary files a/templates/tour/img/top/blur/bluetooth.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/broadcast.png b/templates/tour/img/top/blur/broadcast.png
deleted file mode 100644
index 4fbbe485357..00000000000
Binary files a/templates/tour/img/top/blur/broadcast.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/busy.jpg b/templates/tour/img/top/blur/busy.jpg
deleted file mode 100644
index 4cceb5fcabd..00000000000
Binary files a/templates/tour/img/top/blur/busy.jpg and /dev/null differ
diff --git a/templates/tour/img/top/blur/busy.png b/templates/tour/img/top/blur/busy.png
deleted file mode 100644
index 3e22e8ae0ed..00000000000
Binary files a/templates/tour/img/top/blur/busy.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/calendar.jpg b/templates/tour/img/top/blur/calendar.jpg
deleted file mode 100644
index bd1552ec9c0..00000000000
Binary files a/templates/tour/img/top/blur/calendar.jpg and /dev/null differ
diff --git a/templates/tour/img/top/blur/chat.png b/templates/tour/img/top/blur/chat.png
deleted file mode 100644
index d031f88cfbc..00000000000
Binary files a/templates/tour/img/top/blur/chat.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/connection.png b/templates/tour/img/top/blur/connection.png
deleted file mode 100644
index 0568b2c8813..00000000000
Binary files a/templates/tour/img/top/blur/connection.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/drop-down-hover.jpg b/templates/tour/img/top/blur/drop-down-hover.jpg
deleted file mode 100644
index cad15c00a33..00000000000
Binary files a/templates/tour/img/top/blur/drop-down-hover.jpg and /dev/null differ
diff --git a/templates/tour/img/top/blur/gotmessage.jpg b/templates/tour/img/top/blur/gotmessage.jpg
deleted file mode 100644
index 537f61149bf..00000000000
Binary files a/templates/tour/img/top/blur/gotmessage.jpg and /dev/null differ
diff --git a/templates/tour/img/top/blur/invisible.jpg b/templates/tour/img/top/blur/invisible.jpg
deleted file mode 100644
index 5d409b728ce..00000000000
Binary files a/templates/tour/img/top/blur/invisible.jpg and /dev/null differ
diff --git a/templates/tour/img/top/blur/invisible.png b/templates/tour/img/top/blur/invisible.png
deleted file mode 100644
index 9b9bb1867ee..00000000000
Binary files a/templates/tour/img/top/blur/invisible.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/logoff.jpg b/templates/tour/img/top/blur/logoff.jpg
deleted file mode 100644
index 03fbd3196b0..00000000000
Binary files a/templates/tour/img/top/blur/logoff.jpg and /dev/null differ
diff --git a/templates/tour/img/top/blur/logoff.png b/templates/tour/img/top/blur/logoff.png
deleted file mode 100644
index d036a1a08c3..00000000000
Binary files a/templates/tour/img/top/blur/logoff.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/mail.png b/templates/tour/img/top/blur/mail.png
deleted file mode 100644
index 195089c9640..00000000000
Binary files a/templates/tour/img/top/blur/mail.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/message.png b/templates/tour/img/top/blur/message.png
deleted file mode 100644
index d9abc2156c6..00000000000
Binary files a/templates/tour/img/top/blur/message.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/nomessage.jpg b/templates/tour/img/top/blur/nomessage.jpg
deleted file mode 100644
index 537f61149bf..00000000000
Binary files a/templates/tour/img/top/blur/nomessage.jpg and /dev/null differ
diff --git a/templates/tour/img/top/blur/offline.jpg b/templates/tour/img/top/blur/offline.jpg
deleted file mode 100644
index 493e08533f4..00000000000
Binary files a/templates/tour/img/top/blur/offline.jpg and /dev/null differ
diff --git a/templates/tour/img/top/blur/offline.png b/templates/tour/img/top/blur/offline.png
deleted file mode 100644
index 5ae6c77ace9..00000000000
Binary files a/templates/tour/img/top/blur/offline.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/power.png b/templates/tour/img/top/blur/power.png
deleted file mode 100644
index 7a5e55c3930..00000000000
Binary files a/templates/tour/img/top/blur/power.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/rhythmbox.png b/templates/tour/img/top/blur/rhythmbox.png
deleted file mode 100644
index b268190083b..00000000000
Binary files a/templates/tour/img/top/blur/rhythmbox.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/speaker4.png b/templates/tour/img/top/blur/speaker4.png
deleted file mode 100644
index b9c06fc4271..00000000000
Binary files a/templates/tour/img/top/blur/speaker4.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/speakers0.png b/templates/tour/img/top/blur/speakers0.png
deleted file mode 100644
index 3f02bb48a33..00000000000
Binary files a/templates/tour/img/top/blur/speakers0.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/speakers1.png b/templates/tour/img/top/blur/speakers1.png
deleted file mode 100644
index 4040939c16c..00000000000
Binary files a/templates/tour/img/top/blur/speakers1.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/speakers2.png b/templates/tour/img/top/blur/speakers2.png
deleted file mode 100644
index b5e0a518ee0..00000000000
Binary files a/templates/tour/img/top/blur/speakers2.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/speakers3.png b/templates/tour/img/top/blur/speakers3.png
deleted file mode 100644
index 17d8371c143..00000000000
Binary files a/templates/tour/img/top/blur/speakers3.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/uone.png b/templates/tour/img/top/blur/uone.png
deleted file mode 100644
index 2ea4512705c..00000000000
Binary files a/templates/tour/img/top/blur/uone.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/wireless-icon.png b/templates/tour/img/top/blur/wireless-icon.png
deleted file mode 100644
index 7fc6939626b..00000000000
Binary files a/templates/tour/img/top/blur/wireless-icon.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/wireless.png b/templates/tour/img/top/blur/wireless.png
deleted file mode 100644
index 7e2e53d2908..00000000000
Binary files a/templates/tour/img/top/blur/wireless.png and /dev/null differ
diff --git a/templates/tour/img/top/blur/x-chat.png b/templates/tour/img/top/blur/x-chat.png
deleted file mode 100644
index 8f4fbe0e74a..00000000000
Binary files a/templates/tour/img/top/blur/x-chat.png and /dev/null differ
diff --git a/templates/tour/img/top/broadcast.png b/templates/tour/img/top/broadcast.png
deleted file mode 100644
index 4fbbe485357..00000000000
Binary files a/templates/tour/img/top/broadcast.png and /dev/null differ
diff --git a/templates/tour/img/top/busy.jpg b/templates/tour/img/top/busy.jpg
deleted file mode 100644
index 4cceb5fcabd..00000000000
Binary files a/templates/tour/img/top/busy.jpg and /dev/null differ
diff --git a/templates/tour/img/top/busy.png b/templates/tour/img/top/busy.png
deleted file mode 100644
index 3e22e8ae0ed..00000000000
Binary files a/templates/tour/img/top/busy.png and /dev/null differ
diff --git a/templates/tour/img/top/calendar (Anthony Dillon's conflicted copy 2011-10-03).jpg b/templates/tour/img/top/calendar (Anthony Dillon's conflicted copy 2011-10-03).jpg
deleted file mode 100644
index ba84d63e6f2..00000000000
Binary files a/templates/tour/img/top/calendar (Anthony Dillon's conflicted copy 2011-10-03).jpg and /dev/null differ
diff --git a/templates/tour/img/top/calendar.jpg b/templates/tour/img/top/calendar.jpg
deleted file mode 100644
index bd1552ec9c0..00000000000
Binary files a/templates/tour/img/top/calendar.jpg and /dev/null differ
diff --git a/templates/tour/img/top/chat.png b/templates/tour/img/top/chat.png
deleted file mode 100644
index d031f88cfbc..00000000000
Binary files a/templates/tour/img/top/chat.png and /dev/null differ
diff --git a/templates/tour/img/top/connection.png b/templates/tour/img/top/connection.png
deleted file mode 100644
index 2a1cca10356..00000000000
Binary files a/templates/tour/img/top/connection.png and /dev/null differ
diff --git a/templates/tour/img/top/disconnected.png b/templates/tour/img/top/disconnected.png
deleted file mode 100644
index f7b66829219..00000000000
Binary files a/templates/tour/img/top/disconnected.png and /dev/null differ
diff --git a/templates/tour/img/top/drop-down-hover.jpg b/templates/tour/img/top/drop-down-hover.jpg
deleted file mode 100644
index cad15c00a33..00000000000
Binary files a/templates/tour/img/top/drop-down-hover.jpg and /dev/null differ
diff --git a/templates/tour/img/top/dropbox.jpg b/templates/tour/img/top/dropbox.jpg
deleted file mode 100644
index de2c6f8334f..00000000000
Binary files a/templates/tour/img/top/dropbox.jpg and /dev/null differ
diff --git a/templates/tour/img/top/ethernetconnection.jpg b/templates/tour/img/top/ethernetconnection.jpg
deleted file mode 100644
index d2c197ce17d..00000000000
Binary files a/templates/tour/img/top/ethernetconnection.jpg and /dev/null differ
diff --git a/templates/tour/img/top/ethernetconnection.png b/templates/tour/img/top/ethernetconnection.png
deleted file mode 100644
index db6910239a4..00000000000
Binary files a/templates/tour/img/top/ethernetconnection.png and /dev/null differ
diff --git a/templates/tour/img/top/gotmessage.jpg b/templates/tour/img/top/gotmessage.jpg
deleted file mode 100644
index ad775e247a0..00000000000
Binary files a/templates/tour/img/top/gotmessage.jpg and /dev/null differ
diff --git a/templates/tour/img/top/invisible.jpg b/templates/tour/img/top/invisible.jpg
deleted file mode 100644
index 5d409b728ce..00000000000
Binary files a/templates/tour/img/top/invisible.jpg and /dev/null differ
diff --git a/templates/tour/img/top/invisible.png b/templates/tour/img/top/invisible.png
deleted file mode 100644
index 9b9bb1867ee..00000000000
Binary files a/templates/tour/img/top/invisible.png and /dev/null differ
diff --git a/templates/tour/img/top/logoff.jpg b/templates/tour/img/top/logoff.jpg
deleted file mode 100644
index 03fbd3196b0..00000000000
Binary files a/templates/tour/img/top/logoff.jpg and /dev/null differ
diff --git a/templates/tour/img/top/logoff.png b/templates/tour/img/top/logoff.png
deleted file mode 100644
index d036a1a08c3..00000000000
Binary files a/templates/tour/img/top/logoff.png and /dev/null differ
diff --git a/templates/tour/img/top/mail.png b/templates/tour/img/top/mail.png
deleted file mode 100644
index 195089c9640..00000000000
Binary files a/templates/tour/img/top/mail.png and /dev/null differ
diff --git a/templates/tour/img/top/message.jpg b/templates/tour/img/top/message.jpg
deleted file mode 100644
index de5acf0cd7a..00000000000
Binary files a/templates/tour/img/top/message.jpg and /dev/null differ
diff --git a/templates/tour/img/top/nobluetooth.png b/templates/tour/img/top/nobluetooth.png
deleted file mode 100644
index cde6a08e37b..00000000000
Binary files a/templates/tour/img/top/nobluetooth.png and /dev/null differ
diff --git a/templates/tour/img/top/nomessage.jpg b/templates/tour/img/top/nomessage.jpg
deleted file mode 100644
index 7bd4b93c719..00000000000
Binary files a/templates/tour/img/top/nomessage.jpg and /dev/null differ
diff --git a/templates/tour/img/top/offline.jpg b/templates/tour/img/top/offline.jpg
deleted file mode 100644
index 493e08533f4..00000000000
Binary files a/templates/tour/img/top/offline.jpg and /dev/null differ
diff --git a/templates/tour/img/top/offline.png b/templates/tour/img/top/offline.png
deleted file mode 100644
index 5ae6c77ace9..00000000000
Binary files a/templates/tour/img/top/offline.png and /dev/null differ
diff --git a/templates/tour/img/top/power.jpg b/templates/tour/img/top/power.jpg
deleted file mode 100644
index ee59cdf79cc..00000000000
Binary files a/templates/tour/img/top/power.jpg and /dev/null differ
diff --git a/templates/tour/img/top/power.png b/templates/tour/img/top/power.png
deleted file mode 100644
index 61b884f9702..00000000000
Binary files a/templates/tour/img/top/power.png and /dev/null differ
diff --git a/templates/tour/img/top/rhythmbox.png b/templates/tour/img/top/rhythmbox.png
deleted file mode 100644
index 3848c3b69bf..00000000000
Binary files a/templates/tour/img/top/rhythmbox.png and /dev/null differ
diff --git a/templates/tour/img/top/selected-bg.jpg b/templates/tour/img/top/selected-bg.jpg
deleted file mode 100644
index d8fe5603d15..00000000000
Binary files a/templates/tour/img/top/selected-bg.jpg and /dev/null differ
diff --git a/templates/tour/img/top/slider.png b/templates/tour/img/top/slider.png
deleted file mode 100644
index 8df01823b87..00000000000
Binary files a/templates/tour/img/top/slider.png and /dev/null differ
diff --git a/templates/tour/img/top/speakers.jpg b/templates/tour/img/top/speakers.jpg
deleted file mode 100644
index b93a19a7772..00000000000
Binary files a/templates/tour/img/top/speakers.jpg and /dev/null differ
diff --git a/templates/tour/img/top/speakers0.png b/templates/tour/img/top/speakers0.png
deleted file mode 100644
index f6981fa4405..00000000000
Binary files a/templates/tour/img/top/speakers0.png and /dev/null differ
diff --git a/templates/tour/img/top/speakers1.png b/templates/tour/img/top/speakers1.png
deleted file mode 100644
index 11cf2c5bd83..00000000000
Binary files a/templates/tour/img/top/speakers1.png and /dev/null differ
diff --git a/templates/tour/img/top/speakers2.png b/templates/tour/img/top/speakers2.png
deleted file mode 100644
index c828aa131c4..00000000000
Binary files a/templates/tour/img/top/speakers2.png and /dev/null differ
diff --git a/templates/tour/img/top/speakers3.png b/templates/tour/img/top/speakers3.png
deleted file mode 100644
index a052c38f32a..00000000000
Binary files a/templates/tour/img/top/speakers3.png and /dev/null differ
diff --git a/templates/tour/img/top/speakers4.png b/templates/tour/img/top/speakers4.png
deleted file mode 100644
index 9038d76c389..00000000000
Binary files a/templates/tour/img/top/speakers4.png and /dev/null differ
diff --git a/templates/tour/img/top/tick.png b/templates/tour/img/top/tick.png
deleted file mode 100644
index b1d5f46fe44..00000000000
Binary files a/templates/tour/img/top/tick.png and /dev/null differ
diff --git a/templates/tour/img/top/uone.png b/templates/tour/img/top/uone.png
deleted file mode 100644
index 2ea4512705c..00000000000
Binary files a/templates/tour/img/top/uone.png and /dev/null differ
diff --git a/templates/tour/img/top/wireless-icon.jpg b/templates/tour/img/top/wireless-icon.jpg
deleted file mode 100644
index 2c6a10109d4..00000000000
Binary files a/templates/tour/img/top/wireless-icon.jpg and /dev/null differ
diff --git a/templates/tour/img/top/wireless-icon.png b/templates/tour/img/top/wireless-icon.png
deleted file mode 100644
index 7fc6939626b..00000000000
Binary files a/templates/tour/img/top/wireless-icon.png and /dev/null differ
diff --git a/templates/tour/img/top/wireless.png b/templates/tour/img/top/wireless.png
deleted file mode 100644
index e73d33bfd6d..00000000000
Binary files a/templates/tour/img/top/wireless.png and /dev/null differ
diff --git a/templates/tour/img/top/x-chat.png b/templates/tour/img/top/x-chat.png
deleted file mode 100644
index 8f4fbe0e74a..00000000000
Binary files a/templates/tour/img/top/x-chat.png and /dev/null differ
diff --git a/templates/tour/img/topleft-button.jpg b/templates/tour/img/topleft-button.jpg
deleted file mode 100644
index 510c832fdf8..00000000000
Binary files a/templates/tour/img/topleft-button.jpg and /dev/null differ
diff --git a/templates/tour/img/topleft-button.png b/templates/tour/img/topleft-button.png
deleted file mode 100644
index 260d804f918..00000000000
Binary files a/templates/tour/img/topleft-button.png and /dev/null differ
diff --git a/templates/tour/img/tourguide/apps (copy).png b/templates/tour/img/tourguide/apps (copy).png
deleted file mode 100644
index a7633ddf8e6..00000000000
Binary files a/templates/tour/img/tourguide/apps (copy).png and /dev/null differ
diff --git a/templates/tour/img/tourguide/apps-small.png b/templates/tour/img/tourguide/apps-small.png
deleted file mode 100644
index 7535ff16f89..00000000000
Binary files a/templates/tour/img/tourguide/apps-small.png and /dev/null differ
diff --git a/templates/tour/img/tourguide/apps.png b/templates/tour/img/tourguide/apps.png
deleted file mode 100644
index 0f019d3bbd0..00000000000
Binary files a/templates/tour/img/tourguide/apps.png and /dev/null differ
diff --git a/templates/tour/img/tourguide/arrow-next (Anthony Dillon's conflicted copy 2011-10-03).png b/templates/tour/img/tourguide/arrow-next (Anthony Dillon's conflicted copy 2011-10-03).png
deleted file mode 100644
index bd17579af73..00000000000
Binary files a/templates/tour/img/tourguide/arrow-next (Anthony Dillon's conflicted copy 2011-10-03).png and /dev/null differ
diff --git a/templates/tour/img/tourguide/arrow-next.png b/templates/tour/img/tourguide/arrow-next.png
deleted file mode 100644
index 8b1da7629b1..00000000000
Binary files a/templates/tour/img/tourguide/arrow-next.png and /dev/null differ
diff --git a/templates/tour/img/tourguide/arrow-prev (Anthony Dillon's conflicted copy 2011-10-03).png b/templates/tour/img/tourguide/arrow-prev (Anthony Dillon's conflicted copy 2011-10-03).png
deleted file mode 100644
index be7badd7978..00000000000
Binary files a/templates/tour/img/tourguide/arrow-prev (Anthony Dillon's conflicted copy 2011-10-03).png and /dev/null differ
diff --git a/templates/tour/img/tourguide/arrow-prev.png b/templates/tour/img/tourguide/arrow-prev.png
deleted file mode 100644
index e24343aa50a..00000000000
Binary files a/templates/tour/img/tourguide/arrow-prev.png and /dev/null differ
diff --git a/templates/tour/img/tourguide/back-to-download.jpg b/templates/tour/img/tourguide/back-to-download.jpg
deleted file mode 100644
index a4023fcbe1b..00000000000
Binary files a/templates/tour/img/tourguide/back-to-download.jpg and /dev/null differ
diff --git a/templates/tour/img/tourguide/back-to-download.png b/templates/tour/img/tourguide/back-to-download.png
deleted file mode 100644
index 771beb03503..00000000000
Binary files a/templates/tour/img/tourguide/back-to-download.png and /dev/null differ
diff --git a/templates/tour/img/tourguide/back-to-welcome.jpg b/templates/tour/img/tourguide/back-to-welcome.jpg
deleted file mode 100644
index ef656dd4989..00000000000
Binary files a/templates/tour/img/tourguide/back-to-welcome.jpg and /dev/null differ
diff --git a/templates/tour/img/tourguide/back-to-welcome.png b/templates/tour/img/tourguide/back-to-welcome.png
deleted file mode 100644
index cae3c336772..00000000000
Binary files a/templates/tour/img/tourguide/back-to-welcome.png and /dev/null differ
diff --git a/templates/tour/img/tourguide/button-bg.png b/templates/tour/img/tourguide/button-bg.png
deleted file mode 100644
index 5d5e805aea5..00000000000
Binary files a/templates/tour/img/tourguide/button-bg.png and /dev/null differ
diff --git a/templates/tour/img/tourguide/calc-small.png b/templates/tour/img/tourguide/calc-small.png
deleted file mode 100644
index 23d13e5ddca..00000000000
Binary files a/templates/tour/img/tourguide/calc-small.png and /dev/null differ
diff --git a/templates/tour/img/tourguide/calc.png b/templates/tour/img/tourguide/calc.png
deleted file mode 100644
index 15855772cab..00000000000
Binary files a/templates/tour/img/tourguide/calc.png and /dev/null differ
diff --git a/templates/tour/img/tourguide/document-small.png b/templates/tour/img/tourguide/document-small.png
deleted file mode 100644
index 867004f7eaf..00000000000
Binary files a/templates/tour/img/tourguide/document-small.png and /dev/null differ
diff --git a/templates/tour/img/tourguide/document.png b/templates/tour/img/tourguide/document.png
deleted file mode 100644
index 3b07a4319fd..00000000000
Binary files a/templates/tour/img/tourguide/document.png and /dev/null differ
diff --git a/templates/tour/img/tourguide/file-small.png b/templates/tour/img/tourguide/file-small.png
deleted file mode 100644
index 67b440bf238..00000000000
Binary files a/templates/tour/img/tourguide/file-small.png and /dev/null differ
diff --git a/templates/tour/img/tourguide/file.png b/templates/tour/img/tourguide/file.png
deleted file mode 100644
index f607ecd6214..00000000000
Binary files a/templates/tour/img/tourguide/file.png and /dev/null differ
diff --git a/templates/tour/img/tourguide/firefox-small.png b/templates/tour/img/tourguide/firefox-small.png
deleted file mode 100644
index cf8fe62f5cf..00000000000
Binary files a/templates/tour/img/tourguide/firefox-small.png and /dev/null differ
diff --git a/templates/tour/img/tourguide/firefox.png b/templates/tour/img/tourguide/firefox.png
deleted file mode 100644
index d2a8310aa23..00000000000
Binary files a/templates/tour/img/tourguide/firefox.png and /dev/null differ
diff --git a/templates/tour/img/tourguide/impress-small.png b/templates/tour/img/tourguide/impress-small.png
deleted file mode 100644
index da46b19ce4b..00000000000
Binary files a/templates/tour/img/tourguide/impress-small.png and /dev/null differ
diff --git a/templates/tour/img/tourguide/impress.png b/templates/tour/img/tourguide/impress.png
deleted file mode 100644
index 679aabcb9c1..00000000000
Binary files a/templates/tour/img/tourguide/impress.png and /dev/null differ
diff --git a/templates/tour/img/tourguide/info (Anthony Dillon's conflicted copy 2011-10-03).png b/templates/tour/img/tourguide/info (Anthony Dillon's conflicted copy 2011-10-03).png
deleted file mode 100644
index 34d279e3cc5..00000000000
Binary files a/templates/tour/img/tourguide/info (Anthony Dillon's conflicted copy 2011-10-03).png and /dev/null differ
diff --git a/templates/tour/img/tourguide/info.png b/templates/tour/img/tourguide/info.png
deleted file mode 100644
index cf22ed7be94..00000000000
Binary files a/templates/tour/img/tourguide/info.png and /dev/null differ
diff --git a/templates/tour/img/tourguide/mail-small.png b/templates/tour/img/tourguide/mail-small.png
deleted file mode 100644
index 8472ccfe605..00000000000
Binary files a/templates/tour/img/tourguide/mail-small.png and /dev/null differ
diff --git a/templates/tour/img/tourguide/mail.png b/templates/tour/img/tourguide/mail.png
deleted file mode 100644
index 46ab718b66f..00000000000
Binary files a/templates/tour/img/tourguide/mail.png and /dev/null differ
diff --git a/templates/tour/img/tourguide/shotwell-small.png b/templates/tour/img/tourguide/shotwell-small.png
deleted file mode 100644
index 4b6a6803c75..00000000000
Binary files a/templates/tour/img/tourguide/shotwell-small.png and /dev/null differ
diff --git a/templates/tour/img/tourguide/shotwell.png b/templates/tour/img/tourguide/shotwell.png
deleted file mode 100644
index 521e35f244f..00000000000
Binary files a/templates/tour/img/tourguide/shotwell.png and /dev/null differ
diff --git a/templates/tour/img/tourguide/video-small.png b/templates/tour/img/tourguide/video-small.png
deleted file mode 100644
index 85f55e78f7e..00000000000
Binary files a/templates/tour/img/tourguide/video-small.png and /dev/null differ
diff --git a/templates/tour/img/ubuntuone/blur/files-anywhere.jpg b/templates/tour/img/ubuntuone/blur/files-anywhere.jpg
deleted file mode 100644
index e0620aed65f..00000000000
Binary files a/templates/tour/img/ubuntuone/blur/files-anywhere.jpg and /dev/null differ
diff --git a/templates/tour/img/ubuntuone/blur/header.jpg b/templates/tour/img/ubuntuone/blur/header.jpg
deleted file mode 100644
index a5d1d7a3451..00000000000
Binary files a/templates/tour/img/ubuntuone/blur/header.jpg and /dev/null differ
diff --git a/templates/tour/img/ubuntuone/blur/join-now-bg.jpg b/templates/tour/img/ubuntuone/blur/join-now-bg.jpg
deleted file mode 100644
index fa5e7b5a7fa..00000000000
Binary files a/templates/tour/img/ubuntuone/blur/join-now-bg.jpg and /dev/null differ
diff --git a/templates/tour/img/ubuntuone/blur/keep-connected.jpg b/templates/tour/img/ubuntuone/blur/keep-connected.jpg
deleted file mode 100644
index 167ccf18892..00000000000
Binary files a/templates/tour/img/ubuntuone/blur/keep-connected.jpg and /dev/null differ
diff --git a/templates/tour/img/ubuntuone/blur/learn-more-bg.jpg b/templates/tour/img/ubuntuone/blur/learn-more-bg.jpg
deleted file mode 100644
index ac5566f4c5d..00000000000
Binary files a/templates/tour/img/ubuntuone/blur/learn-more-bg.jpg and /dev/null differ
diff --git a/templates/tour/img/ubuntuone/blur/rock-out.jpg b/templates/tour/img/ubuntuone/blur/rock-out.jpg
deleted file mode 100644
index 9c2e520163e..00000000000
Binary files a/templates/tour/img/ubuntuone/blur/rock-out.jpg and /dev/null differ
diff --git a/templates/tour/img/ubuntuone/blur/stay-productive.jpg b/templates/tour/img/ubuntuone/blur/stay-productive.jpg
deleted file mode 100644
index f660ca37a99..00000000000
Binary files a/templates/tour/img/ubuntuone/blur/stay-productive.jpg and /dev/null differ
diff --git a/templates/tour/img/ubuntuone/blur/ubuntuone-logo.jpg b/templates/tour/img/ubuntuone/blur/ubuntuone-logo.jpg
deleted file mode 100644
index e791751fe85..00000000000
Binary files a/templates/tour/img/ubuntuone/blur/ubuntuone-logo.jpg and /dev/null differ
diff --git a/templates/tour/img/ubuntuone/files-anywhere.jpg b/templates/tour/img/ubuntuone/files-anywhere.jpg
deleted file mode 100644
index 30fd3e9a9f7..00000000000
Binary files a/templates/tour/img/ubuntuone/files-anywhere.jpg and /dev/null differ
diff --git a/templates/tour/img/ubuntuone/header.jpg b/templates/tour/img/ubuntuone/header.jpg
deleted file mode 100644
index 5c15e876604..00000000000
Binary files a/templates/tour/img/ubuntuone/header.jpg and /dev/null differ
diff --git a/templates/tour/img/ubuntuone/join-now-bg.jpg b/templates/tour/img/ubuntuone/join-now-bg.jpg
deleted file mode 100644
index bb37a2588b6..00000000000
Binary files a/templates/tour/img/ubuntuone/join-now-bg.jpg and /dev/null differ
diff --git a/templates/tour/img/ubuntuone/keep-connected.jpg b/templates/tour/img/ubuntuone/keep-connected.jpg
deleted file mode 100644
index c990a2ac8ff..00000000000
Binary files a/templates/tour/img/ubuntuone/keep-connected.jpg and /dev/null differ
diff --git a/templates/tour/img/ubuntuone/learn-more-bg.jpg b/templates/tour/img/ubuntuone/learn-more-bg.jpg
deleted file mode 100644
index 939bd0f9d27..00000000000
Binary files a/templates/tour/img/ubuntuone/learn-more-bg.jpg and /dev/null differ
diff --git a/templates/tour/img/ubuntuone/rock-out.jpg b/templates/tour/img/ubuntuone/rock-out.jpg
deleted file mode 100644
index eedb190f7f7..00000000000
Binary files a/templates/tour/img/ubuntuone/rock-out.jpg and /dev/null differ
diff --git a/templates/tour/img/ubuntuone/stay-productive.jpg b/templates/tour/img/ubuntuone/stay-productive.jpg
deleted file mode 100644
index 0e495f4040a..00000000000
Binary files a/templates/tour/img/ubuntuone/stay-productive.jpg and /dev/null differ
diff --git a/templates/tour/img/ubuntuone/ubuntuone-logo.jpg b/templates/tour/img/ubuntuone/ubuntuone-logo.jpg
deleted file mode 100644
index afc10afa759..00000000000
Binary files a/templates/tour/img/ubuntuone/ubuntuone-logo.jpg and /dev/null differ
diff --git a/templates/tour/img/videos/Big_Buck_Bunny.jpg b/templates/tour/img/videos/Big_Buck_Bunny.jpg
deleted file mode 100644
index 25972634a7b..00000000000
Binary files a/templates/tour/img/videos/Big_Buck_Bunny.jpg and /dev/null differ
diff --git a/templates/tour/img/videos/FlyThrough.jpg b/templates/tour/img/videos/FlyThrough.jpg
deleted file mode 100644
index 158adcb73e4..00000000000
Binary files a/templates/tour/img/videos/FlyThrough.jpg and /dev/null differ
diff --git a/templates/tour/img/videos/IAmWeAre (Anthony Dillon's conflicted copy 2011-10-03).jpg b/templates/tour/img/videos/IAmWeAre (Anthony Dillon's conflicted copy 2011-10-03).jpg
deleted file mode 100644
index bf8c6461d6f..00000000000
Binary files a/templates/tour/img/videos/IAmWeAre (Anthony Dillon's conflicted copy 2011-10-03).jpg and /dev/null differ
diff --git a/templates/tour/img/videos/IAmWeAre.jpg b/templates/tour/img/videos/IAmWeAre.jpg
deleted file mode 100644
index 0264d5f0099..00000000000
Binary files a/templates/tour/img/videos/IAmWeAre.jpg and /dev/null differ
diff --git a/templates/tour/img/videos/IAmWeAre2.jpg b/templates/tour/img/videos/IAmWeAre2.jpg
deleted file mode 100644
index bf8c6461d6f..00000000000
Binary files a/templates/tour/img/videos/IAmWeAre2.jpg and /dev/null differ
diff --git a/templates/tour/img/videos/LindyHop.jpg b/templates/tour/img/videos/LindyHop.jpg
deleted file mode 100644
index 22a80c7e3ad..00000000000
Binary files a/templates/tour/img/videos/LindyHop.jpg and /dev/null differ
diff --git a/templates/tour/img/videos/Rockabilly.jpg b/templates/tour/img/videos/Rockabilly.jpg
deleted file mode 100644
index 20858e07e10..00000000000
Binary files a/templates/tour/img/videos/Rockabilly.jpg and /dev/null differ
diff --git a/templates/tour/img/videos/blur/Big_Buck_Bunny.jpg b/templates/tour/img/videos/blur/Big_Buck_Bunny.jpg
deleted file mode 100644
index b795b6a19fa..00000000000
Binary files a/templates/tour/img/videos/blur/Big_Buck_Bunny.jpg and /dev/null differ
diff --git a/templates/tour/img/videos/blur/FlyThrough.jpg b/templates/tour/img/videos/blur/FlyThrough.jpg
deleted file mode 100644
index 6ed34d5f5f8..00000000000
Binary files a/templates/tour/img/videos/blur/FlyThrough.jpg and /dev/null differ
diff --git a/templates/tour/img/videos/blur/IAmWeAre (Anthony Dillon's conflicted copy 2011-10-03).jpg b/templates/tour/img/videos/blur/IAmWeAre (Anthony Dillon's conflicted copy 2011-10-03).jpg
deleted file mode 100644
index d01588fa948..00000000000
Binary files a/templates/tour/img/videos/blur/IAmWeAre (Anthony Dillon's conflicted copy 2011-10-03).jpg and /dev/null differ
diff --git a/templates/tour/img/videos/blur/IAmWeAre.jpg b/templates/tour/img/videos/blur/IAmWeAre.jpg
deleted file mode 100644
index 42cab24fb4f..00000000000
Binary files a/templates/tour/img/videos/blur/IAmWeAre.jpg and /dev/null differ
diff --git a/templates/tour/img/videos/blur/IAmWeAre2.jpg b/templates/tour/img/videos/blur/IAmWeAre2.jpg
deleted file mode 100644
index d01588fa948..00000000000
Binary files a/templates/tour/img/videos/blur/IAmWeAre2.jpg and /dev/null differ
diff --git a/templates/tour/img/videos/blur/LindyHop.jpg b/templates/tour/img/videos/blur/LindyHop.jpg
deleted file mode 100644
index ff936b39ce0..00000000000
Binary files a/templates/tour/img/videos/blur/LindyHop.jpg and /dev/null differ
diff --git a/templates/tour/img/videos/blur/Rockabilly.jpg b/templates/tour/img/videos/blur/Rockabilly.jpg
deleted file mode 100644
index c3da67944ad..00000000000
Binary files a/templates/tour/img/videos/blur/Rockabilly.jpg and /dev/null differ
diff --git a/templates/tour/img/videos/blur/iStock.jpg b/templates/tour/img/videos/blur/iStock.jpg
deleted file mode 100644
index b578403dc98..00000000000
Binary files a/templates/tour/img/videos/blur/iStock.jpg and /dev/null differ
diff --git a/templates/tour/img/videos/iStock.jpg b/templates/tour/img/videos/iStock.jpg
deleted file mode 100644
index f8f9aa7726a..00000000000
Binary files a/templates/tour/img/videos/iStock.jpg and /dev/null differ
diff --git a/templates/tour/img/welcome/background-link-download.png b/templates/tour/img/welcome/background-link-download.png
deleted file mode 100644
index e5aab1af252..00000000000
Binary files a/templates/tour/img/welcome/background-link-download.png and /dev/null differ
diff --git a/templates/tour/img/welcome/background-link-explore.png b/templates/tour/img/welcome/background-link-explore.png
deleted file mode 100644
index fd3380336a5..00000000000
Binary files a/templates/tour/img/welcome/background-link-explore.png and /dev/null differ
diff --git a/templates/tour/img/welcome/background-welcome.jpg b/templates/tour/img/welcome/background-welcome.jpg
deleted file mode 100644
index feec72e2374..00000000000
Binary files a/templates/tour/img/welcome/background-welcome.jpg and /dev/null differ
diff --git a/templates/tour/img/welcome/background-welcome.png b/templates/tour/img/welcome/background-welcome.png
deleted file mode 100644
index ec210f01f1e..00000000000
Binary files a/templates/tour/img/welcome/background-welcome.png and /dev/null differ
diff --git a/templates/tour/img/welcome/blur/background-welcome.png b/templates/tour/img/welcome/blur/background-welcome.png
deleted file mode 100644
index 3908d9fe27e..00000000000
Binary files a/templates/tour/img/welcome/blur/background-welcome.png and /dev/null differ
diff --git a/templates/tour/img/welcome/browse-files.png b/templates/tour/img/welcome/browse-files.png
deleted file mode 100644
index 6dcdfc8085a..00000000000
Binary files a/templates/tour/img/welcome/browse-files.png and /dev/null differ
diff --git a/templates/tour/img/welcome/check-email.png b/templates/tour/img/welcome/check-email.png
deleted file mode 100644
index cfd15fc641d..00000000000
Binary files a/templates/tour/img/welcome/check-email.png and /dev/null differ
diff --git a/templates/tour/img/welcome/create-documents.png b/templates/tour/img/welcome/create-documents.png
deleted file mode 100644
index 61c7d97da28..00000000000
Binary files a/templates/tour/img/welcome/create-documents.png and /dev/null differ
diff --git a/templates/tour/img/welcome/create-presentations.png b/templates/tour/img/welcome/create-presentations.png
deleted file mode 100644
index 94a5381cea6..00000000000
Binary files a/templates/tour/img/welcome/create-presentations.png and /dev/null differ
diff --git a/templates/tour/img/welcome/create-spreadsheets.png b/templates/tour/img/welcome/create-spreadsheets.png
deleted file mode 100644
index eaddb4fb2aa..00000000000
Binary files a/templates/tour/img/welcome/create-spreadsheets.png and /dev/null differ
diff --git a/templates/tour/img/welcome/find-apps (copy).png b/templates/tour/img/welcome/find-apps (copy).png
deleted file mode 100644
index f4c6d5ebb70..00000000000
Binary files a/templates/tour/img/welcome/find-apps (copy).png and /dev/null differ
diff --git a/templates/tour/img/welcome/find-apps.png b/templates/tour/img/welcome/find-apps.png
deleted file mode 100644
index b35694e1856..00000000000
Binary files a/templates/tour/img/welcome/find-apps.png and /dev/null differ
diff --git a/templates/tour/img/welcome/surf-the-web.png b/templates/tour/img/welcome/surf-the-web.png
deleted file mode 100644
index c7025bbfff6..00000000000
Binary files a/templates/tour/img/welcome/surf-the-web.png and /dev/null differ
diff --git a/templates/tour/img/welcome/view-photos.png b/templates/tour/img/welcome/view-photos.png
deleted file mode 100644
index 71942057860..00000000000
Binary files a/templates/tour/img/welcome/view-photos.png and /dev/null differ
diff --git a/templates/tour/img/welcome/watch-video.png b/templates/tour/img/welcome/watch-video.png
deleted file mode 100644
index b5201ff2e95..00000000000
Binary files a/templates/tour/img/welcome/watch-video.png and /dev/null differ
diff --git a/templates/tour/img/welcome/window-buttons.png b/templates/tour/img/welcome/window-buttons.png
deleted file mode 100644
index b1c9f668ec8..00000000000
Binary files a/templates/tour/img/welcome/window-buttons.png and /dev/null differ
diff --git a/templates/tour/img/white-bg-40.png b/templates/tour/img/white-bg-40.png
deleted file mode 100644
index ab4e18bb46c..00000000000
Binary files a/templates/tour/img/white-bg-40.png and /dev/null differ
diff --git a/templates/tour/img/workspaces/gradient.jpg b/templates/tour/img/workspaces/gradient.jpg
deleted file mode 100644
index 1cdf3f09b8f..00000000000
Binary files a/templates/tour/img/workspaces/gradient.jpg and /dev/null differ
diff --git a/templates/tour/img/workspaces/overlay.png b/templates/tour/img/workspaces/overlay.png
deleted file mode 100644
index a70c6619608..00000000000
Binary files a/templates/tour/img/workspaces/overlay.png and /dev/null differ
diff --git a/templates/tour/img/workspaces/reflection.png b/templates/tour/img/workspaces/reflection.png
deleted file mode 100644
index 8a8c5f3eaef..00000000000
Binary files a/templates/tour/img/workspaces/reflection.png and /dev/null differ
diff --git a/templates/tour/js/analytics.js b/templates/tour/js/analytics.js
deleted file mode 100644
index d72f37f8804..00000000000
--- a/templates/tour/js/analytics.js
+++ /dev/null
@@ -1,10 +0,0 @@
-var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-1018242-4"]);_gaq.push(["_trackPageview"]);if(window.location.pathname.indexOf('search/google-appliance') != -1) {
-    var qs = window.location.pathname.substring(25);
-    pageTracker._trackPageview('/site_search?query='+qs);
-}(function() {var ga = document.createElement("script");ga.type = "text/javascript";ga.async = true;ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";var s = document.getElementsByTagName("script")[0];s.parentNode.insertBefore(ga, s);})();
-
-/*
-var axel = Math.random() + "";
-var a = axel * 10000000000000;
-document.write('<iframe src="http://fls.doubleclick.net/activityi;src=3450579;type=tourm853;cat=ubunt767;ord=' + a + '?" width="1" height="1" frameborder="0" style="display:none"></iframe>');
-*/
\ No newline at end of file
diff --git a/templates/tour/js/email.js b/templates/tour/js/email.js
deleted file mode 100644
index e4c2033e45f..00000000000
--- a/templates/tour/js/email.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-* Email object
-*  author: Anthony Dillon
-*/
-
-function Email($id, $folder, $subject, $body, $from, $to, $date, $cc){ 
-	if ($subject==undefined) { $subject='Untitled Message';}
-	if ($from==undefined) { $from='Welcome <welcome@ubuntu.com>';}
-	if ($to==undefined) { $to='Me <me@canonical.com>';}
-	if ($cc==undefined) { $cc=false;}
-	if($body==undefined){ $body = 'There is no body for message '+$subject; }
-	if ($date==undefined) { 
-		var currentTime = new Date();
-		var minutes = currentTime.getMinutes();
-		var date = currentTime.getDate();
-		var month = currentTime.getMonth() + 1;
-		var year = ''+currentTime.getFullYear();
-		year = year.substr(2,2);
-		if (minutes < 10){ minutes = "0" + minutes; }
-		if (date < 10){ date = "0" + date; }
-		if (month < 10){ month = "0" + month; }
-		if (minutes < 10){ minutes = "0" + minutes; }
-		$date= date+'/'+month+'/'+year+' '+currentTime.getHours() + ":" + minutes + " ";
-	}
-	var _id = $id;
-	var _date = $date;
-	var _subject = $subject;
-	var _from = $from;
-	var _to = $to;
-	var _cc = $cc;
-	var _replied = false;
-	var _forwarded= false;
-	var _attachment = false;
-	var _starred = false;
-	var _read = false;
-	var _fire = false;
-	var _folder = $folder;
-	var _body = $body;
-	var _deleted = false;
-	
-	if(_folder == 'sent'){ _read = true; }
-
-	this.subject = function (){ return _subject; }
-	this.date = function (){ return _date; }
-	this.from = function (){ return _from; }
-	this.to = function (){ return _to; }
-	this.cc = function (){ return _cc; }
-	this.replied = function (){ return _replied; }
-	this.attachment = function (){ return _attachment; }
-	this.starred = function (){ return _starred; }
-	this.read = function (){ return _read; }
-	this.folder = function (){ return _folder; }
-	this.fire = function (){ return _fire; }
-	this.body = function (){ return _body; }
-	this.deleted = function (){ return _deleted; }
-	this.forwarded = function(){ return _forwarded; }
-	
-	this.setReplied = function($replied){ _replied = $replied; }
-	this.setAttachment= function($attachment){ _attachment = $attachment; }
-	this.setStarred = function($starred){ _starred = $starred; }
-	this.setRead = function($read){ _read = $read; }
-	this.setFolder = function($folder){ _folder = $folder; }
-	this.setFire = function($fire){ _fire = $fire; }
-	this.setDeleted = function($deleted){ _deleted = $deleted; }
-	this.setForwarded = function($forwarded){ _forwarded = $forwarded; }
-	
-	this.draw = function(){
-		var classes = 'class="message ';
-		if(!_read){ classes += 'unread '; }
-		if(_attachment){ classes += 'attachment '; }
-		if(_starred){ classes += 'starred '; }
-		if(_fire){ classes += 'fire '; }
-		if(_replied && _forwarded){
-			classes += 'repliedforwarded ';
-		}else{
-			if(_replied){ classes += 'replied '; }
-			if(_forwarded){ classes += 'forwarded '; }
-		}
-		classes += '"';
-		if(_folder == 'sent'){
-			return '<div id="email-'+_id+'" '+classes+'><ul><li class="message-t"></li><li class="message-star"></li><li class="message-clip"></il><li class="message-subject">'+_subject+'</li><li class="message-glasses"></li><li class="message-from">'+_to+'</li><li class="message-fire"></li><li class="message-date">'+_date+'</li></div>';
-		}else{
-			return '<div id="email-'+_id+'" '+classes+'><ul><li class="message-t"></li><li class="message-star"></li><li class="message-clip"></il><li class="message-subject">'+_subject+'</li><li class="message-glasses"></li><li class="message-from">'+_from+'</li><li class="message-fire"></li><li class="message-date">'+_date+'</li></div>';
-		}
-		
-	}
-	
-	this.toString = function(){
-		return 'ID = '+ _id + ' | Subject = '+ _subject;
-	}
-}
-
diff --git a/templates/tour/js/emailsystem.js b/templates/tour/js/emailsystem.js
deleted file mode 100644
index 62732330212..00000000000
--- a/templates/tour/js/emailsystem.js
+++ /dev/null
@@ -1,490 +0,0 @@
-/*
-* Email system
-*  author: Anthony Dillon
-*/
-
-function EmailSystem($parent){
-	var emails = new Array();
-	var _parent = $parent;
-	var _this = this;
-	var minified = false;
-	var writeMinified = false;
-	var maximised = false;
-	var writeMaximised = false;
-	var currentFolder = 'inbox';
-	var emailCount = 0;
-	var selectedID = -1;
-	var unreadCount = 0;
-	var _isOpen = false;
-	var randomReplies = new Array();
-	var randomEmails = new Array();
-	var randomEmail = null;
-	var theWriteEmail = null;
-	var writeType = '';
-	
-	this.init = function(){
-		emails.push(new Email(0,'inbox', $.trim(_email_1_title_), $.trim(_email_1_body_), 'Inayaili de Leon', $.trim(_you_)));
-		emails.push(new Email(1,'inbox',$.trim(_email_2_title_),$.trim(_email_2_body_),'John Oxton', $.trim(_you_)));
-		emails.push(new Email(2,'inbox',$.trim(_email_3_title_),$.trim(_email_3_body_),'Ellen Arnold', $.trim(_you_)));
-		emails.push(new Email(3,'inbox',$.trim(_email_4_title_),$.trim(_email_4_body_),'Steve Edwards', $.trim(_you_)));
-		emails.push(new Email(4,'inbox',$.trim(_email_5_title_),$.trim(_email_5_body_),'Anthony Dillon', $.trim(_you_)));
-		
-		randomReplies.push(_random_reply_);
-		
-		randomEmails.push(new Email(emails.length,'inbox','Hiya there again','Just checking how you are? Been along time...\n\nRegards,\nJoe','Joe Bloggs <joe@bloggs.com>'));
-		randomEmails.push(new Email(emails.length,'inbox','Hiya there again','Great ... Sounds good! Lets meet for lunch tomorrow to talk it over! What you think?\n\nThanks,\nSue','Sue  White <suewhite@googlemail.com>'));
-		randomEmails.push(new Email(emails.length,'inbox','Hiya there again','Did you catch the game last night! What a goal... fancy coming over next time?','Jack Smith <j_swan@gmail.com>'));
-		randomEmails.push(new Email(emails.length,'inbox','Hiya there again','Ok, ill do my best but no promises. It will take some time so let you know when its done./\n/\nThanks,/\nPaul','Paul Swan <paul@hotmail.com>'));
-		
-		this.setupControl();
-	}
-	
-	this.setupControl = function(){
-		this.resetMessage();
-		
-		$('#email-write #write-send').bind('click',function(){
-			_this.sendEmail();
-		}); 
-
-		$('#email-write #write-subject input[name=subject]').keyup(function(){
-			var subjectText = $(this).val();
-			if(subjectText != ''){
-				$('#email-write  .window-title').text(_write_+': '+subjectText);
-			}else{
-				$('#email-write  .window-title').text(_write_+': ('+_no_subject_+')');
-			}
-		});
-		
-		$('#email-write input').focus(function(){
-			$(this).css('border-color','#dd4814');
-		});
-		
-		$('#email-write input').blur(function(){
-			$(this).css('border-color','#ADA9A5');
-		});
-		
-		$('#email-write .control .close').click(function(){
-			_this.closeWrite();
-		});
-		
-		$('#email-write .control .min').click(function(){
-			$('#email-write').hide();
-			if(writeMaximised){ _parent.systemSettings.decreaseFullscreen(); }
-			_parent.systemMenu.wiggle('email');
-			writeMinified = true;
-		});
-		
-		$('#email-write .control .max').click(function(){
-			if(writeMaximised){
-				writeMaximised = false;
-				$('#email-write').css('width','900px');
-				$('#email-write').css('height','610px');
-				$('#email-write').removeClass('fullsize');
-				_parent.systemSettings.decreaseFullscreen();
-			}else{
-				writeMaximised = true;
-				$('#email-write').css('width',$(document).width() - 70 + 'px');
-				$('#email-write').css('height',$(document).height() - 50 + 'px');
-				$('#email-write').addClass('fullsize');
-				_parent.systemSettings.increaseFullscreen();
-			}
-			_this.resizeMessage();
-		});
-		
-		$('.email-window .control .close').click(function(){
-			_this.close();
-		});
-		
-		$('.email-window .control .min').click(function(){
-			$('.email-window').hide();
-			if(maximised){ _parent.systemSettings.decreaseFullscreen(); }
-			_parent.systemMenu.wiggle('email');
-			minified = true;
-		});
-		
-		$('.email-window .control .max').click(function(){
-			if(maximised){
-				maximised = false;
-				$('.email-window').css('width','900px');
-				$('.email-window').css('height','600px');
-				$('.email-window').removeClass('fullsize');
-				_parent.systemSettings.decreaseFullscreen();
-			}else{
-				maximised = true;
-				$('.email-window').css('width',$(document).width() - 70 + 'px');
-				$('.email-window').css('height',$(document).height() - 50 + 'px');
-				$('.email-window').addClass('fullsize');
-				_parent.systemSettings.increaseFullscreen();
-			}
-			_this.resize();
-		});
-		
-		$('.email-content .folder-list .list div').click(function(){
-			$('.email-window .folder-list .list div').removeClass('selected');
-			$(this).addClass('selected');
-			_this.setFolder($(this).attr('id').split('-')[1]);
-		});
-		
-		$('.email-window .buttons .email-write').bind('click',function(event){
-			_this.showWrite();
-		});
-		
-		$('.email-window .buttons .email-get-mail').bind('click',function(event){
-			_this.updateDisplay();
-		});
-		
-		$('.message-header .email-buttons span.message-delete').bind('click',function(event){
-			if(selectedID != -1){
-				if(emails[selectedID].folder() != 'trash'){
-					emails[selectedID].setFolder('trash');
-				}else{
-					emails[selectedID].setDeleted(true);
-				}
-				selectedID = -1;
-				_this.updateDisplay();
-				_this.updateMessage();
-			}
-		});
-		
-		$('.message-header .email-buttons span.message-archive').bind('click',function(event){
-			if(selectedID != -1){
-					emails[selectedID].setFolder('archive');
-					selectedID = -1;
-					_this.updateDisplay();
-					_this.updateMessage();
-			}
-		});
-		
-		$('.message-header .email-buttons span.message-junk').bind('click',function(event){
-			if(selectedID != -1){
-				if(emails[selectedID].fire()){
-					emails[selectedID].setFire(false);
-				}else{
-					emails[selectedID].setFire(true);
-				}
-				_this.updateDisplay();
-				_this.updateMessage();
-			}
-		});
-		
-		$('.message-header .email-buttons span.message-forward').bind('click',function(event){
-			_this.showWrite('forward');
-		});
-		
-		$('.message-header .email-buttons span.message-reply').bind('click',function(event){
-			if(currentFolder == 'sent'){
-				_this.showWrite('sentreply');
-			}else{
-				_this.showWrite('reply');
-			}
-		});
-		
-		$('.not-junk').bind('click',function(event){
-			if(selectedID != -1){
-				emails[selectedID].setFire(false);
-				_this.updateDisplay();
-				_this.updateMessage();
-			}
-		});
-		
-		this.updateDisplay();
-		this.updateMessage();
-		
-	}
-	
-	this.setupRandomEmail = function(){
-		var randomIndex = Math.floor(Math.random() * randomEmails.length);
-		randomEmail = randomEmails[randomIndex];
-		var randomTime = (Math.random()*10000) + 2000;
-		setTimeout ( "recieveMessage()", randomTime );
-	}
-	
-	this.showWrite = function($type){
-		if(selectedID != -1){
-			 theWriteEmail = emails[selectedID];
-			 writeType = $type;
-			 var messageSubject = $.trim(theWriteEmail.subject());
-			if(messageSubject.substr(0, 3) != 'Re:'){ messageSubject = 'Re: '+$.trim(messageSubject); }
-			if(writeType == 'reply'){
-				$('#email-write  .window-title').text(_write_+': '+messageSubject);
-				$('#email-write  #write-from  input[name=from]').val($.trim(_you_));
-				$('#email-write  #write-subject  input[name=subject]').val(messageSubject);
-				$('#email-write  #write-to  input[name=to]').val(theWriteEmail.from());
-				$('#email-write #write-body textarea[name=body]').val('\n\n'+$.trim(_on_)+' '+$.trim(theWriteEmail.date())+', '+$.trim(theWriteEmail.from())+' '+$.trim(_wrote_)+': \n\n'+$.trim(theWriteEmail.body()));
-			}else if(writeType == 'forward'){
-				$('#email-write  .window-title').text($.trim(_write_)+': Fwd: '+$.trim(theWriteEmail.subject()));
-				$('#email-write  #write-subject  input[name=subject]').val($.trim(_fwd_)+': '+$.trim(theWriteEmail.subject()));
-				$('#email-write  #write-to  input[name=to]').val('');
-				$('#email-write #write-body textarea[name=body]').val('\n\n-------- '+$.trim(_original_message_)+' --------\n\n'+$.trim(theWriteEmail.body()));
-			}else if(writeType == 'sentreply'){
-				$('#email-write  .window-title').text($.trim(_write_)+': '+$.trim(messageSubject));
-				$('#email-write  #write-from  input[name=from]').val($.trim(_you_));
-				$('#email-write  #write-subject  input[name=subject]').val($.trim(messageSubject));
-				$('#email-write  #write-to  input[name=to]').val($.trim(theWriteEmail.to()));
-				$('#email-write #write-body textarea[name=body]').val('\n\n'+$.trim(_on_)+' '+$.trim(theWriteEmail.date())+', '+$.trim(theWriteEmail.from())+' '+$.trim(_wrote_)+': \n\n'+$.trim(theWriteEmail.body()));
-			}
-		}
-		$('#email-write').show();
-		$('#email-write').css('z-index',3);
-		$('#email-write').trigger('mousedown');
-		if($('css3-container').length > 0){
-        	$('#email-write').prev().css('top', $('#email-write').css('top'));
-        	$('#email-write').prev().css('left', $('#email-write').css('left'));
-        }
-	}
-	
-	this.closeWrite = function(){
-		_parent.openWindows['email-write'] = false;
-		this.resetMessage();
-		$('#email-write').hide();
-	}
-	
-	 this.isMaximised = function(){
-	    	return maximised;
-	 }
-	
-	this.isWriteMaximised = function(){
-		return writeMaximised;
-	} 
-	this.isWriteMinified = function(){
-		return writeMinified;
-	}   
-	
-	this.open = function(){
-		_isOpen = true;
-		this.center();
-		$('.email-window').show();
-	}
-	
-	this.close = function(){
-		if(_isOpen){
-			_isOpen = false;
-			_parent.openWindows['email-window'] = false;
-			$('.email-window').hide();
-			$('#email-write').hide();
-			if(maximised){ _parent.systemSettings.decreaseFullscreen(); }
-			_parent.systemMenu.closeWindow('email');
-			$('.email-window').removeClass('fullsize');
-			writeMaximised = writeMinified = maximised = maximised = false;
-			$('#folder-inbox').trigger('click');
-			this.resize();
-			this.center();
-		}
-	}
-	
-	this.updateDisplay = function( ){
-		emailCount = unreadCount = 0;
-		emailLIstContents = '';
-		var folderContents = '';
-		var i = emails.length;
-		while(i--){
-			if(!emails[i].read()){ _parent.systemSettings.gotMail(true); }
-			if(emails[i].folder() == currentFolder && !emails[i].deleted()){
-				folderContents +=  emails[i].draw(i);
-				emailCount++;
-				if(!emails[i].read()){ unreadCount++; }
-			}
-		}
-		this.checkMessageNotification();
-		$('.email-window .email-list').html(folderContents);
-		$(".email-window .email-list .message:even").addClass("grey");
-		if(selectedID != -1){
-			$('.email-window .email-list #email-'+selectedID).addClass('selected');
-		}
-		
-		$('.email-list div').bind('click',function(){
-			selectedID = $(this).attr('id').split('-')[1];
-			emails[selectedID].setRead(true);
-			$('.email-list div').removeClass('selected');
-			$(this).addClass('selected');
-			if($(this).hasClass('unread')){ unreadCount--; _this.checkMessageNotification() };
-			$(this).removeClass('unread');
-			_this.updateMessage();
-			_this.updateDetails();
-		});
-		
-		$('.email-list div li.message-star').bind('click',function(event){
-			event.stopPropagation();
-			selectedID = $(this).parent().parent().attr('id').split('-')[1];
-			if(emails[selectedID].starred()){
-				emails[selectedID].setStarred(false);
-				$(this).parent().parent().removeClass('starred');
-			}else{
-				emails[selectedID].setStarred(true);
-				$(this).parent().parent().addClass('starred');
-			}
-		});
-		
-		$('.email-list div li.message-fire').bind('click',function(event){
-			event.stopPropagation();
-			var tempID = $(this).parent().parent().attr('id').split('-')[1];
-			if(emails[tempID].fire()){
-				emails[tempID].setFire(false);
-				$(this).parent().parent().removeClass('fire');
-			}else{
-				emails[tempID].setFire(true);
-				$(this).parent().parent().addClass('fire');
-			}
-			_this.updateMessage();
-		});
-		
-		$('.email-list div li.message-glasses').bind('click',function(event){
-			event.stopPropagation();
-			selectedID = $(this).parent().parent().attr('id').split('-')[1];
-			if(emails[selectedID].read()){
-				emails[selectedID].setRead(false);
-				$(this).parent().parent().addClass('unread');
-				unreadCount++;
-			}else{
-				emails[selectedID].setRead(true);
-				$(this).parent().parent().removeClass('unread');
-				unreadCount--;
-			}
-			_this.updateDetails();
-		});
-		
-		
-	}
-	
-	this.checkMessageNotification = function(){
-		if(unreadCount > 0){
-			_parent.systemSettings.gotMail(true);
-		}else{
-			_parent.systemSettings.gotMail(false);
-		}
-	}
-	
-	this.updateMessage = function(){
-		if(selectedID != -1){
-			var $body = emails[selectedID].body();
-			$body = $body.replace(/\n/g,'<br/>');
-			$('.email-window .email-contents .message-body').html($body);
-			$('.email-window .email-contents .email-body .message-header .from dd').html(emails[selectedID].from());
-			$('.email-window .email-contents .email-body .message-header .subject dd').html(emails[selectedID].subject());
-			$('.email-window .email-contents .email-body .message-header .to dd').html(emails[selectedID].to());
-			$('.email-window .email-contents .email-body .message-header .date').html(emails[selectedID].date());
-			if(emails[selectedID].cc()){
-				$('.email-window .email-contents .email-body .message-header .cc dd').html(emails[selectedID].cc());
-			}else{
-				$('.email-window .email-contents .email-body .message-header .cc').hide();
-			}
-			$('.email-window .email-contents .email-body div').show();
-			var contentHeight = $('.email-window .email-contents .email-body').height() - ($('.email-window .email-contents .email-body .message-header').height() + 21);
-			if(emails[selectedID].fire()){
-				contentHeight -= 39;
-				$('.message-header .email-buttons span.message-junk').hide();
-				$('.email-window .email-contents .junk-mail-banner ').show();
-			}else{
-				$('.message-header .email-buttons span.message-junk').show();
-				$('.email-window .email-contents .junk-mail-banner ').hide();
-			}
-			contentHeight +=  'px';
-			$('.email-window .email-contents .message-body').css('height', contentHeight);
-		}else{
-			$('.email-window .email-contents .email-body div').hide();
-		}
-		this.updateDetails();
-	}
-	
-	this.setFolder = function($folder){
-		currentFolder = $folder;
-		selectedID = -1;
-		if(currentFolder == 'sent'){
-			$('.email-window .email-content .email-contents .email-categories .from').text(_recipient_);
-		}else{
-			$('.email-window .email-content .email-contents .email-categories .from').text(_from_);
-		}
-		this.updateDisplay();
-		this.updateMessage();
-	}
-	
-	this.resize = function(){
-		var emailContentWidth = $('.email-window').width() - 188;
-		var folderListHeight =  ($('.email-window').height()) - 130;
-		$('.email-window .email-content .email-contents').css('width',emailContentWidth);
-		$('.email-window .email-content .folder-list .list').css('height',folderListHeight);
-		$('.email-window .email-content .email-contents .email-list').css('height',(folderListHeight / 2)-3);
-		$('.email-window .email-content .email-contents .email-body').css('height',(folderListHeight / 2)-3);
-		this.updateMessage();
-	}
-	
-	this.resizeMessage = function(){
-		var bodyWidth = $('#email-write').width() - 6;
-		var bodyHeight =  ($('#email-write').height() - 250);
-		$('#email-write #write-body textarea').css('width',bodyWidth);
-		$('#email-write #write-body textarea').css('height',bodyHeight);
-	}
-	
-	this.updateDetails = function(){
-		$('.email-window .email-content .emails-info #details-unread').text(unreadCount);
-		$('.email-window .email-content .emails-info #details-total').text(emailCount);
-	}
-	
-	this.resetMessage = function(){
-		$('#email-write').hide();
-		$('#email-write  .window-title').text(_write_+': ('+_no_subject_+')');
-		$('#email-write  #write-subject  input[name=subject]').val('');
-		$('#email-write  #write-to  input[name=to]').val('');
-		$('#email-write #write-body textarea[name=body]').val('');
-		$('#email-write .loading-bar .progress').css('width','0');
-	}
-	
-	this.sendEmail = function(){
-		var subject = $('#email-write #write-subject input[name=subject]').val();
-		var body = $('#email-write #write-body textarea[name=body]').val();
-		var from = _you_;
-		var to = $('#email-write #write-to input[name=to]').val();
-		var currentTime = new Date();
-		var minutes = currentTime.getMinutes();
-		var date = currentTime.getDate();
-		var month = currentTime.getMonth();
-		var year = ''+currentTime.getFullYear();
-		year = year.substr(2,2);
-		if (minutes < 10){ minutes = "0" + minutes; }
-		if (date < 10){ date = "0" + date; }
-		if (month < 10){ month = "0" + month; }
-		if (minutes < 10){ minutes = "0" + minutes; }
-		currentTime = date+'/'+month+'/'+year+' '+currentTime.getHours() + ":" + minutes + " ";
-		var newEmail = new Email(emails.length,'sent',subject,body,from,to,currentTime);
-		emails.push(newEmail);
-		
-		if(writeType == 'reply'){
-			theWriteEmail.setReplied(true);
-		}else if(writeType == 'forward'){
-			theWriteEmail.setForwarded(true);
-		}
-		
-		$('#email-write .loading-bar .progress').animate({
-		    	width: 96
-		  }, 500, function() {
-		    	_this.resetMessage();
-		    	_this.updateDisplay();
-		    	_this.setupRandomReply(newEmail);
-		  });
-	}
-	
-	this.setupRandomReply = function($email){
-		var randomIndex = Math.floor(Math.random() * randomReplies.length);
-		var body = randomReplies[randomIndex]+'\n\n'+$.trim(_on_)+' '+$.trim($email.date())+', '+$.trim($email.from())+' '+$.trim(_fwd_)+' '+$.trim(_wrote_)+': \n\n'+$email.body();
-		var messageSubject = $email.subject();
-		if(messageSubject.substr(0, 3) != 'Re:'){ messageSubject = 'Re: '+messageSubject; }
-		emails.push(new Email(emails.length, 'inbox', messageSubject, body,$email.to(), _you_));
-		var randomTime = (Math.random()*2000) + 2000;
-		setTimeout ( "recieveMessage()", randomTime );
-	}
-	
-	 this.center = function(){
-    	var left = ($(document).width() / 2) - ($('.email-window').width() / 2);
-		var top = Math.max(24,($(document).height() / 2) - ($('.email-window').height() / 2));
-		$('.email-window').css('left',left);
-		$('.email-window').css('top',top+'px');
-		if($('css3-container').length > 0){
-        	$('.email-window').prev().css('top', $('.email-window').css('top'));
-        	$('.email-window').prev().css('left', $('.email-window').css('left'));
-        }
-    }
-}
-
-function recieveMessage(){
-	emailSystem.updateDisplay();
-}
diff --git a/templates/tour/js/errormessage.js b/templates/tour/js/errormessage.js
deleted file mode 100644
index d45acb72b0a..00000000000
--- a/templates/tour/js/errormessage.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *  Error Message 
- *  author: Anthony Dillon
- */
-
-function ErrorMessage($parent){
-	var _this = this;
-	var _parent = $parent;
-	
-	this.init = function(){
-		$('.error-window  .control .close').bind('click', function(){
-			_this.close();
-		});
-		$('.error-window .content .error-buttons div').bind('click', function(){
-			var clickedClass = $(this).attr('class').replace(' highlight', '');
-			switch(clickedClass){
-				case 'continue':
-					_this.continueClicked();
-				break;
-				case 'download':
-					_this.downloadClicked();
-				break;
-			}
-		});
-		this.center();
-	}
-	
-	this.continueClicked = function(){
-		this.close();
-	}
-	
-	this.downloadClicked = function(){
-		window.open('http://www.ubuntu.com/download/ubuntu/download');
-	}
-	
-	this.open = function(){
-		this.resize();
-		$('.error-window').show();
-		$('.error-window ').trigger('mousedown');
-		$('body').append('<div class="fullscreenErrorTransOverlay"></div>');
-		$('.fullscreenErrorTransOverlay').bind('click',function(){
-			_this.close();
-		});
-		if($('css3-container').length > 0){
-        	$('.error-window').prev().css('top', $('.error-window').css('top'));
-        	$('.error-window').prev().css('left', $('.error-window').css('left'));
-        }
-		//_parent.notificationSystem.displayNotification('img/error/warning.png', 'Thanks for exploring Ubuntu.','Remember, this is just a demo. You’ll have to download it to enjoy the real thing!')
-	}
-	
-	this.close = function(){
-		if($('.error-window').is(':visible')){
-			$('.fullscreenErrorTransOverlay').unbind('click');
-			$('.fullscreenErrorTransOverlay').remove();
-			$('.error-window').hide();
-			this.center();
-		}
-	}
-	
-	this.resize = function(){
-		var left = ($(document).width() / 2) - ($('.error-window').width() / 2);
-		var top = ($(document).height() / 2) - ($('.error-window').height() / 2);
-		$('.error-window').css('left',left);
-		$('.error-window').css('top',top);
-	}
-	
-	this.center = function(){
-	    	var left = ($(document).width() / 2) - ($('.error-window').width() / 2);
-			var top = ($(document).height() / 2) - ($('.error-window').height() / 2);
-			$('.error-window').css('left',left);
-			$('.error-window').css('top',top);
-   	}
-}
diff --git a/templates/tour/js/file.js b/templates/tour/js/file.js
deleted file mode 100644
index 1be05256e83..00000000000
--- a/templates/tour/js/file.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/* 
- *  File Object
- *  author: Anthony Dillon
- */
-
-function File($id, $url, $type, $name, $size, $date ,$location){
-	if($name == undefined){ var tempName = _url.split('/'); $name = tempName[tempName.length-1].split('.')[0]; }
-	if($size == undefined){ $size = '11.5MB'; }
-	if($date == undefined){ $date = new Date().toString(); }
-	if ($location==undefined) { $location='/Home';}
-	if($type == undefined){$type = 'photo'; }
-	
-	var _id = $id;
-	var _url = $url;
-	var _type = $type;
-	var _name = $name;
-	var _size = $size;
-	var _date = $date;
-	var _location = $location;
-	
-	this.url = function(){ return _url; }
-	this.name = function(){ return _name; }
-	this.size = function(){ return _size; }
-	this.date = function(){ return _date; }
-	this.location = function(){ return _location; }
-	this.id = function(){ return _id; }
-	this.type = function(){ return _type; }
-	
-	this.setURL = function($url){ _url = $url; }
-	this.setName = function($name){ _name = $name; }
-	this.setSize = function($size){ _size = $size; }
-	this.setDate = function($date){ _date = $date; }
-	this.setLocation = function($location){ _location = $location; }
-	this.setType = function($type){ _type = $type; }
-	
-	this.drawIcon = function($id, $type){
-		switch(_type){
-			case 'photo':
-				if($type == 'display-icon'){
-					return  '<div class="file '+$type+'" data-type="photo"  data-id='+$id+'><p class="border"><img src="'+_url+'"  width="53px"  /></p><span>'+_name+'</span></div>';
-				}else{
-					return  '<div class="file '+$type+'" data-type="photo"  data-id='+$id+'><p></p><span>'+_name+'</span></div>';
-				}
-			break;
-			case 'video':
-				var tempName = _url.split('/');
-				tempName = tempName[tempName.length-1].split('.')[0];
-				if($type == 'display-icon'){
-					return  '<div class="file '+$type+'"  data-type="video"  data-id='+$id+'><p class="border"><img src="../img/videos/'+tempName+'.jpg"  width="53px"  /></p><span>'+_name+'</span></div>';
-				}else{
-					return  '<div class="file '+$type+'"  data-type="video"  data-id='+$id+'><p></p><span>'+_name+'</span></div>';
-				}
-			break;
-			case 'audio':
-				if($type == 'display-icon'){
-					return  '<div class="file '+$type+'" data-type="audio"  data-id='+$id+'><p><img src="../img/folder/audio.png" /></p><span>'+_name+'</span></div>';
-				}else{
-					return  '<div class="file '+$type+'" data-type="audio"  data-id='+$id+'><p></p><span>'+_name+'</span></div>';
-				}
-			break;
-			default:
-				if($type == 'display-icon'){
-					return  '<div class="file '+$type+'" data-type="unknown"  data-id='+$id+'><p><img src="../img/folder/unknown.png" /></p><span>'+_name+'</span></div>';
-				}else{
-					return  '<div class="file '+$type+'" data-type="unknown"  data-id='+$id+'><p></p><span>'+_name+'</span></div>';
-				}
-			break;
-		}
-		
-	}
-}
diff --git a/templates/tour/js/filesystem.js b/templates/tour/js/filesystem.js
deleted file mode 100644
index e89f9559438..00000000000
--- a/templates/tour/js/filesystem.js
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
-* File system
-* author: Anthony Dillon
-*/
-
-function FileSystem($parent, $startingDir){
-	
-	var _parent = $parent;
-	var home = '/'+_home_folder_;
-	if($startingDir == undefined){ $startingDir = home; }
-	var current_dir = $startingDir;
-	var list_of_files = new Array();
-	var dir_history = new Array();
-	var history_index = -1;
-	var folderContents = '';
-	var _this = this;
-	var itemCount = 0;
-	var folder_index = -1;
-	var minified = false;
-	var maximised = false;
-	var dragging = false;
-	var name = _home_folder_;
-	var _isOpen = false;
-	var list_type = 'display-icon';
-	var openedID = -1;
-	
-	var folderContentsHeight = 0;
-	var folderContentsWidth = 0;
-	
-	this.init = function(){
-		
-		list_of_files.push(new Folder(_documents_folder_, '/'+_home_folder_));
-		list_of_files.push(new Folder(_downloads_folder_, '/'+_home_folder_));
-		list_of_files.push(new Folder(_music_folder_, '/'+_home_folder_));
-		list_of_files.push(new Folder(_videos_folder_, '/'+_home_folder_));
-		list_of_files.push(new Folder(_pictures_folder_, '/'+_home_folder_));
-		list_of_files.push(new Folder(_desktop_folder_, '/'+_home_folder_));
-		
-		
-		list_of_files.push(new Folder(_canonical_folder_, '/'+_home_folder_+'/'+_documents_folder_));
-		list_of_files.push(new Folder(_backup_folder_, '/'+_home_folder_+'/'+_documents_folder_));
-		list_of_files.push(new Folder(_local_folder_, '/'+_home_folder_+'/'+_documents_folder_));
-		
-		list_of_files.push(new Folder(_work_folder_, '/'+_home_folder_+'/'+_documents_folder_+'/'+_canonical_folder_));
-		list_of_files.push(new Folder(_branches_folder_, '/'+_home_folder_+'/'+_documents_folder_+'/'+_canonical_folder_));
-		
-		list_of_files = list_of_files.concat(_parent.fileLibrary);
-		
-		this.setupControl();
-	}
-	
-	this.setupControl = function(){
-		$('.folder .control .close').click(function(){
-			_this.close();
-		});
-		$('.folder .control .min').click(function(){
-			if(maximised){ _parent.systemSettings.decreaseFullscreen(); }
-			$('.folder').hide();
-			_parent.systemMenu.wiggle('home');
-			minified = true;
-		});
-		
-		$('.folder .control .max').click(function(){
-			if(maximised){
-				maximised = false;
-				$('.folder').css('height','500px');
-				$('.folder').css('width','730px');
-				$('.folder').removeClass('fullsize');
-				_parent.systemSettings.decreaseFullscreen();
-			}else{
-				maximised = true;
-				$('.folder').css('height',$(document).height() - 50 + 'px');
-				$('.folder').css('width',$(document).width() - 70 + 'px');
-				$('.folder').addClass('fullsize');
-				_parent.systemSettings.increaseFullscreen();
-			}
-			_this.resize();
-			_this.center();
-		});
-		
-		$('#folder-window .folder-list .list ul li').click(function(){
-			$('#folder-window .folder-list .list ul li').removeClass('selected');
-			$(this).addClass('selected');
-			var fresh = true;
-			 var index = $(this).attr('data-folder');
-			 var newDir = '';
-			 if(index == 'home'){
-			 	newDir = '/'+_home_folder_;
-			 }else if(index == 'bin'){
-			 	newDir = '/'+_rubbish_bin_folder_;
-			 	fresh = false;
-			 }else{
-		  		newDir = list_of_files[index].location()+'/'+list_of_files[index].name();
-		  	}
-	  		_this.clickedNewFolder(newDir);
-		 	_this.updateDir(newDir,fresh);
-		});
-		
-		this.updateDir(current_dir);
-		this.center();
-	}
-	
-	this.reset = function($full){
-		if($full){
-			current_dir = '/'+_home_folder_;
-			dir_history = new Array();
-			history_index = -1;
-			folderContents = '';
-			itemCount = 0;
-			folder_index = -1;
-			minified = false;
-		}
-		this.updateDir(current_dir);
-	}
-	
-	this.open = function(){
-		$('.folder').show();
-		_isOpen = true;
-		if($('css3-container').length > 0){
-        	$('.folder').prev().css('top', $('.folder').css('top'));
-        	$('.folder').prev().css('left', $('.folder').css('left'));
-        }
-	}
-	
-	this.isMinified = function(){ return minified; }
-	this.isMaximised = function(){ return maximised; }
-	this.in_bin = function (){ return _in_bin; };
-	
-	this.close = function(){
-		if(_isOpen){
-			_parent.openWindows['folder-window'] = false;
-			if(maximised){ _parent.systemSettings.decreaseFullscreen(); }
-			$('.folder').hide();
-			_parent.systemMenu.closeWindow('home');
-			$('.folder').removeClass('fullsize');
-			_this.resize();
-			_this.center();
-			_isOpen = false;
-			minified = false;
-			maximised = false;
-		}
-	}
-	
-	this.isOpen = function(){
-		return _isOpen;
-	}
-	
-	this.setupFolderControl = function(){
-		$('.folder-contents .contents div').mouseover(function() {
-		  	$(this).addClass("over");
-		});
-		
-		/*$('.folder-contents .contents div').draggable({ 
-			revert: true, 
-			opacity: 0.35, 
-			zIndex: 2700, 
-			start: function(event, ui) { 
-				//_parent.lockOpenMenu();
-		 	},
-		 	end: function(event, ui) { 
-				//_parent.lockCloseMenu();
-		 	}
-		 });*/
-		
-		$('.folder-contents .contents div').mouseout(function() {
-			$(this).removeClass("over");
-		});
-		
-		$('.folder-contents .contents').mousedown(function(){
-			$('.folder-contents .contents div').removeClass("selected");
-			$('.selected-details').hide();
-		 });
-			 
-		$('.folder-contents .contents div').mousedown(function(event) {
-			event.stopPropagation();
-			$('.folder-contents .contents div').removeClass("selected");
-		  	$(this).addClass("selected");
-		  	_this.showSelectedDetails(parseInt($(this).attr('data-id')));
-		});
-		
-		$('.folder-contents .contents div').dblclick(function() {
-			  openedID = $(this).attr('data-id');
-			  switch($(this).attr('data-type')){
-			  	case 'folder':
-			  		var newDir = current_dir+'/'+list_of_files[openedID].name();
-			  		_this.clickedNewFolder(newDir);
-				 	_this.updateDir(newDir);
-			  	break;
-			  	case 'photo':
-			  		_parent.shotwellSystem.selectImage(list_of_files[$(this).attr('data-id')].id());
-			  		_parent.shotwellSystem.open();
-			  	break;
-			  	case 'video':
-			  		//_parent.shotwellSystem.selectImage(list_of_files[$(this).attr('data-id')].id());
-			  		_parent.moviePlayerSystem.open();
-			  		_parent.moviePlayerSystem.addVideo();
-			  	break;
-			  	case 'audio':
-			  		_parent.errorMessage.open();
-			  	break;
-			  	default:
-					_parent.errorMessage.open();
-			  	break;
-			  }
-		 
-	 	 });
-	}
-	
-	this.showSelectedDetails = function($index){
-		var detailsName = list_of_files[$index].name();
-		var detailsCount = 0;
-		if(list_of_files[$index].type() == 'folder'){
-			var i = list_of_files.length;
-			while(i--){
-				if(list_of_files[i].location() == list_of_files[$index].location()+'/'+detailsName){
-					detailsCount++;
-				}
-			}
-			$('.selected-details').text('"'+detailsName+'" selected (containing '+detailsCount+' items)');
-		}else{
-			$('.selected-details').text('"'+detailsName+'" selected ('+list_of_files[$index].size()+')');
-		}
-		
-		$('.selected-details').show();
-	}
-	
-	this.setupBreadcrumbControl = function(){
-		$('.folder-contents .bottom-buttons div').bind('click',function() {
-		  	$(this).addClass("selected");
-		  	var index = $(this).attr('data-id');
-		  	_this.history_index = index;
-			_this.updateDir(dir_history[index]);
-		});
-	}
-	
-	this.clickedNewFolder = function(){
-		var dirExists = $.inArray(current_dir, dir_history);
-		if(dirExists > -1){
-			var i = (dir_history.length - 1) - dirExists;
-			while(i--){ dir_history.pop()  }
-		}
-		$('.selected-details').hide();
-	}
-	
-	this.refresh = function (){
-		itemCount = 0;
-		$('.folder-contents .contents').html('');
-		folderContents = '';
-		var i = list_of_files.length;
-		while(i--){
-			if(list_of_files[i].location() == current_dir){
-				folderContents +=  list_of_files[i].drawIcon(i,list_type);
-				itemCount++;
-			}
-		}
-		
-		$('.folder-contents .contents').html(folderContents);
-		$('.folder-contents .bottom-buttons div').unbind('click');
-		var breadcrumb = '';
-		for(i = 0; i < dir_history.length; i++ ){
-			var dir_name = dir_history[i].split('/');
-			dir_name = dir_name[dir_name.length-1];
-			if(i == 0){dir_name = '<img src="../img/folder/home-icon.png"/>' + dir_name}
-			if($.trim(dir_name) == 'Desktop'){dir_name = '<img src="../img/folder/desktop-icon.png"/>' + dir_name}
-			if(i == history_index){
-				breadcrumb += '<div data-id="'+i+'" class="selected">'+dir_name+'</div>';
-			}else{
-				breadcrumb += '<div data-id="'+i+'">'+dir_name+'</div>';
-			}
-		}
-		dir_name = dir_history[history_index].split('/');
-		dir_name = dir_name[dir_name.length-1];
-		$('.folder-contents .bottom-buttons').html(breadcrumb);
-		$('.folder .window-title').text(dir_name);
-		this.setupBreadcrumbControl();
-		this.setupFolderControl();
-	}
-	
-	this.getFiles = function(){
-		return list_of_files;
-	}
-	
-	this.backDir = function(){
-		history_index--;
-		this.updateDir(dir_history[history_index]);
-	}
-	
-	this.forwardDir = function(){
-		history_index++;
-		this.updateDir(dir_history[history_index]);
-	}
-	
-	this.updateDir = function($newDIr, $sidebar){
-		var tempArray = $newDIr.split('/');
-		var sidebarName = tempArray[tempArray.length - 1].toLowerCase();
-		if(sidebarName == 'rubbish bin'){ sidebarName = 'rubbish' };
-		if($sidebar == undefined){
-			$('#folder-window .folder-list .list ul li').removeClass('selected');
-			$('#folder-window .folder-list .list ul li[data-folder="'+openedID+'"]').addClass('selected');
-		}
-		
-		
-		current_dir = $newDIr;
-		if($sidebar == undefined){ $sidebar = false; }
-		var dirExists = $.inArray($newDIr, dir_history);
-		
-		if(dirExists > -1){
-			history_index = dirExists;
-		} else{
-			if($sidebar){
-				history_index = 1;
-				dir_history = new Array('/'+_home_folder_, $newDIr);
-			}else{
-				if(current_dir.split('/').length > 2){
-					history_index++;
-					dir_history.push($newDIr);
-				}else{
-					history_index = 0;
-					dir_history = new Array();
-					dir_history.push($newDIr);
-				}
-			}
-		}
-		if(history_index > 0){
-			this.backButton(true);
-		}else{
-			this.backButton(false);
-		}
-		if(history_index < dir_history.length -1){
-			this.forwardButton(true);
-		}else{
-			this.forwardButton(false);
-		}
-		this.refresh();
-	}
-		
-	this.backButton = function($enable){
-		if($enable){
-			if($('.buttons .folder-back').hasClass('disabled')){
-				$('.buttons .folder-back').bind('click',function() { _this.backDir(); });
-				$('.buttons .folder-back').removeClass('disabled');
-			}
-		}else{
-			if(!$('.buttons .folder-back').hasClass('disabled')){
-				$('.buttons .folder-back').unbind('click');
-				$('.buttons .folder-back').addClass('disabled');
-			}
-		}
-	}
-	this.forwardButton = function($enable){
-		if($enable){
-			if($('.buttons .folder-forward').hasClass('disabled')){
-				$('.buttons .folder-forward').bind('click',function() { _this.forwardDir(); });
-				$('.buttons .folder-forward').removeClass('disabled');
-			}
-		}else{
-			if(!$('.buttons .folder-forward').hasClass('disabled')){
-				$('.buttons .folder-forward').unbind('click');
-				$('.buttons .folder-forward').addClass('disabled');
-			}
-		}
-	}
-	
-	this.center = function(){
-	    	var left = ($(document).width() / 2) - ($('.folder').width() / 2);
-			var top = Math.max(24,($(document).height() / 2) - ($('.folder').height() / 2));
-			$('.folder').css('left',left);
-			$('.folder').css('top',top);
-	    }
-	
-	this.resize = function(){
-		folderContentsWidth = $('.folder').width() - 146;
-		folderListHeight = $('.folder').height() - 51;
-		$('.folder .folder-list .list').css('height',folderListHeight);
-		$('.folder .folder-contents .contents').css('height',folderListHeight - 15);
-		$('.folder .folder-contents .contents').css('width',folderContentsWidth);
-	}
-}
-
diff --git a/templates/tour/js/folders.js b/templates/tour/js/folders.js
deleted file mode 100644
index 266d391b1dc..00000000000
--- a/templates/tour/js/folders.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-* Folder object
-*  author: Anthony Dillon
-*/
-
-function Folder($name, $location){ 
-	if ($name==undefined) { $name='Untitled Folder';}
-	if ($location==undefined) { $location='/Home';}
-	var _name = $name;
-	var _size = '6.2 GB';
-	var _location = $location;
-	var _in_bin = false;
-
-	this.name = function (){ return _name; };
-	this.size = function (){ return _size; };
-	this.location = function (){ return _location; };
-	this.in_bin = function (){ return _in_bin; };
-	
-	this.rename = function($name){
-		_name = $name;
-	}
-	
-	this.bin = function($in_bin){
-		_in_bin = $in_bin;
-	}
-	
-	this.move = function($location){
-		_location = $location;
-	}
-	
-	this.drawIcon = function($id, $type){
-		return  "<div class='file-folder "+$type+"' data-type='folder' data-id='"+$id+"'><p></p><span>"+_name+"</span></div>";
-	}
-	
-	this.type = function(){ 
-		return 'folder';
-	}
-}
-
diff --git a/templates/tour/js/guidedtoursystem.js b/templates/tour/js/guidedtoursystem.js
deleted file mode 100644
index 9d53c8d13bb..00000000000
--- a/templates/tour/js/guidedtoursystem.js
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- *  Guided Tour System
- *  author: Anthony Dillon
- */
-
-function GuidedTourSystem($parent){
-	var _parent = $parent;
-	var _this = this;
-	
-	var browserfilesGuide;
-	var surfthewebGuide;
-	var checkemailGuide;
-	var viewphotosGuide;
-	var findappsGuide;
-	var createdocumentsGuide;
-	var createpresentation;
-	var createspreadsheets;
-	var watchVideosGuide;
-	var arrowClicked = false;
-	
-	var welcomeGuide;
-	
-	var guides;
-	var currentIndex = -1;
-	var guideCount = 0;
-	
-	this.init = function(){
-		homeGuide = {system:'welcome',icon:null, title:null, desc:'We hope you\'ve enjoyed the Ubuntu online tour. <a href="http://www.ubuntu.com/download/ubuntu/download#tour" target="_blank">Ready to download?</a> or <a href="/ubuntu/take-the-tour" >Back to the site</a>', hash: '#'};
-		
-		browserfilesGuide = {system:'home',icon:'img/tourguide/file-small.png', title:'Browse files', desc:'It’s quick and easy to access your folders and files from Ubuntu’s home folder.', hash: 'browser-files'};
-		surfthewebGuide = {system:'firefox',icon:'img/tourguide/firefox-small.png', title:'Surf the web', desc:'Browsing the web is fast and secure with Ubuntu and Firefox.', hash: 'surf-the-web'};
-		checkemailGuide = {system:'email',icon:'img/tourguide/mail-small.png', title:'Check email', desc:'Read, write and send emails with Thunderbird. It’s easy and fast.', hash: 'check-email'};
-		viewphotosGuide = {system:'shotwell',icon:'img/tourguide/shotwell-small.png', title:'View photos', desc:'You can upload, organise, edit and share your photos with Shotwell.', hash: 'view-photos'};
-		findappsGuide = {system:'software',icon:'img/tourguide/apps-small.png', title:'Find apps', desc:'Search and download apps fast from the Ubuntu Software Centre.', hash: 'find-apps'};
-		createdocumentsGuide = {system:'writer',icon:'img/tourguide/document-small.png', title:'Create documents', desc:'LibreOffice Writer makes it easy to draft professional documents.', hash: 'create-documents'};
-		createspreadsheets  = {system:'calc',icon:'img/tourguide/calc-small.png', title:'Create spreadsheets', desc:'LibreOffice Calc has everything you need to create clear and accurate spreadsheets.', hash: 'create-spreadsheets'};
-		createpresentation = {system:'impress',icon:'img/tourguide/impress-small.png', title:'Create presentations', desc:'Make a good impression with the intuitive LibreOffice Impress presentation tool.', hash: 'create-presentations'};
-		watchVideosGuide = {system:'movieplayer',icon:'img/tourguide/impress-small.png', title:'Watch videos', desc:'You can watch all your favourite films and videos, DVDs, downloads or movies youve created yourself.', hash: 'watch-video'};
-		
-		guides = new Array(browserfilesGuide, surfthewebGuide, checkemailGuide, viewphotosGuide, findappsGuide, createdocumentsGuide, createspreadsheets, createpresentation, watchVideosGuide);
-		guideCount = guides.length;
-		$('#tour-guide .next-button').bind('click',function(){
-			if(!$(this).hasClass('disabled')){
-				_this.next();
-			}
-		});
-		
-		$('#tour-guide .prev-button').bind('click',function(){
-			if(!$(this).hasClass('disabled')){
-				_this.prev();
-			}
-		});
-		
-		$('#tour-guide .back-to-download').bind('click', function(){
-			_parent.errorMessage.open();
-		});
-		
-		this.update();
-	}
-	
-	this.close = function(){
-		_parent.closeAllWindows(closeAllWindows);
-	}
-	
-	this.setSystem = function($system){
-		if($system == 'email-write'){ $system = 'email'; }
-		if(!arrowClicked){
-			var found = false;
-			for(i = 0; i < guides.length; i++){
-				if(guides[i].system == $system){
-					this.setCurrentIndex(i);
-					found = true;
-					break;
-				}
-			}
-			if(!found){ this.setCurrentIndex(-1); }
-		}
-		
-	}
-	
-	this.setIndex = function($index){
-		currentIndex = $index;
-	}
-	
-	this.setCurrentIndex = function($currentIndex, $update){
-		currentIndex = $currentIndex;
-		this.update();
-	}
-	
-	this.next = function(){
-		arrowClicked = true;
-		_parent.closeAllWindows(currentIndex);
-		if (currentIndex == guideCount -1) {
-			currentIndex = 0;
-		} else {
-			currentIndex++;
-		}
-		this.update();
-		this.updateHash();
-		_parent.systemMenu.handleMenuClick(guides[currentIndex].system);
-		arrowClicked = false;
-	}
-	
-	this.prev = function(){
-		arrowClicked = true;
-		_parent.closeAllWindows(currentIndex);
-		if (currentIndex == 0) {
-			currentIndex = guideCount -1;
-		} else {
-			currentIndex--;
-		}
-		this.update();
-		this.updateHash();
-		_parent.systemMenu.handleMenuClick(guides[currentIndex].system);
-		arrowClicked = false;
-	}
-	
-	this.update = function(){
-		$('#tour-guide .guide-container').hide();
-		
-		if(currentIndex == -1){
-			$('#tour-guide .prev-button').hide();
-			$('#tour-guide .next-button').hide();
-			$('#tour-guide .welcome').show();
-		}else{
-			$('#tour-guide .'+guides[currentIndex].system).show();
-			$('#tour-guide .prev-button').show();
-			$('#tour-guide .next-button').show();
-		}
-	}
-
-	this.updateHash = function() {
-		window.location.hash = guides[currentIndex].hash;
-	}
-}
diff --git a/templates/tour/js/internetsystem.js b/templates/tour/js/internetsystem.js
deleted file mode 100644
index 235ade65d07..00000000000
--- a/templates/tour/js/internetsystem.js
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
-* Firefox system
-* 	author: Anthony Dillon
-*/
-
-function FirefoxSystem($parent){
-	var backHistory = new Array();
-	var forwardHistory = new Array();
-	var _parent = $parent;
-	var _this = this;
-	var firefoxHeight = 0;
-	var urlWidth = 0;
-	var maximised = false;
-	var homePage = 'http://start.ubuntu.com';
-	var internalClick = true;
-	var name = 'Browse the internet';
-	var _isOpen = false;
-	
-	this.init = function(){
-		
-		$('.firefox-window .control .close').click(function(){
-			_this.close();
-		});
-		$('.firefox-window  .control .min').click(function(){
-			if(maximised){ _parent.systemSettings.decreaseFullscreen(); }
-			$('.firefox-window ').hide();
-			_parent.systemMenu.wiggle('firefox');
-		});
-		$('.firefox-window .control .max').click(function(){
-			if(maximised){
-				maximised = false;
-				$('.firefox-window').removeClass('fullsize');
-				$('.firefox-window').css('height','600px');
-				$('.firefox-window').css('width','900px');
-				$('.firefox-window .web-overlay-tran').css('width','100%');
-				$('.firefox-window .web-overlay-tran').hide();
-				_parent.systemSettings.decreaseFullscreen();
-			}else{
-				maximised = true;
-				$('.firefox-window').addClass('fullsize');
-				$('.firefox-window').css('height',$(document).height() - 50 + 'px');
-				$('.firefox-window').css('width',$(document).width() - 70 + 'px');
-				$('.firefox-window .web-overlay-tran').css('width','100px');
-				$('.firefox-window .web-overlay-tran').show();
-				_parent.systemSettings.increaseFullscreen();
-			}
-			
-			resize();
-		});
-		
-	    $('#submitURL').keypress(function(e){
-	    	if(e.keyCode == 13){
-	    		var inputURL = $('#submitURL ').val();
-	    		if(inputURL.slice(0,4) != 'http'){
-	    			if(inputURL.slice(0,3) != 'www'){
-	    				inputURL = 'http://www.'+inputURL;
-	    			}else{
-	    				inputURL = 'http://'+inputURL;
-	    			}
-	    		}
-	    		internalClick = true;
-	    		forwardHistory = new Array();
-	    		backHistory.push(inputURL);
-	    		changeURL(inputURL);
-	    	}
-	    });
-	    
-	    $('#submitSearch ').keypress(function(e){
-	    	if(e.keyCode == 13){
-	    		var inputURL = 'http://www.wikipedia.org/w/index.php?title=Special%3ASearch&search='+$('#submitSearch ').val().replace(' ','+');
-	    		forwardHistory = new Array();
-	    		backHistory.push(inputURL);
-	    		internalClick = true;
-	    		changeURL(inputURL);
-	    	}
-	    });
-	    
-	    this.close = function(){
-	    	if(_isOpen){}
-	    	_parent.openWindows['firefox-window'] = false;
-	    	$('.firefox-window ').hide();
-			if(maximised){ _parent.systemSettings.decreaseFullscreen(); }
-			center();
-			internalClick = false;
-			changeURL(homePage);
-			maximised = false;
-			$('.firefox-window').removeClass('fullsize');
-			_this.resize();
-			_this.center();
-			_parent.systemMenu.closeWindow('firefox');
-	    }
-	    
-	    this.open = function(){
-	    	center();
-	    	$('.firefox-window ').show();
-	    	_isOpen = true;
-	    	if($('css3-container').length > 0){
-	        	$('.firefox-window').prev().css('top', $('.firefox-window').css('top'));
-	        	$('.firefox-window').prev().css('left', $('.firefox-window').css('left'));
-	        }
-	    }
-	    
-	    this.isMaximised = function(){
-	    	return maximised;
-	    }
-	    
-	    this.resize = function(){
-	    	resize();
-	    }
-	    
-	    this.center = function(){
-	    	center();
-	    }
-	    
-	     $('#submitSearch').focus(function() {
-				if ($(this).val() == 'Wikipedia') {
-					$(this).val('');
-					$(this).removeClass('fade-text');
-				}
-			});
-			 $('#submitSearch').blur(function() {
-				if ($(this).val() == '') {
-					$(this).val('Wikipedia');
-					$(this).addClass('fade-text');
-				}
-			});
-			
-			$('#submitURL').focus(function() {
-				if($(this).val().substr($(this).val().length - 3,3) == '...'){
-					$(this).removeClass('fade-text');
-					$(this).val($(this).val().substr(0,$(this).val().length - 3));
-				}
-			});
-			$('#firefoxInternet').load(function(){
-				iframeChange();
-			});
-	    resize();
-	    center();
-	    backHistory.push(homePage);
-	    changeURL(homePage);
-	}
-	
-	function changeURL($url){
-	    	$('#submitURL ').attr('value', $url);
-	    	$('#firefoxInternet').attr('src', $url);
-	    	updateButtons();
-	    }
-	    
-	    function updateButtons(){
-	    	$('.buttons .firefox-back').unbind('click');
-	    	$('.buttons .firefox-forward').unbind('click');
-	    	
-	    	if(backHistory.length <= 1){
-	    		$('.buttons .firefox-back').addClass('inactive');
-	    	}else{
-	    		$('.buttons .firefox-back').removeClass('inactive');
-	    		$('.buttons .firefox-back').bind('click',function(){
-	    			backPressed();
-	    		});
-	    	}
-	    	if(forwardHistory.length <= 0){
-	    		$('.buttons .firefox-forward').addClass('inactive');
-	    	}else{
-	    		$('.buttons .firefox-forward').removeClass('inactive');
-	    		$('.buttons .firefox-forward').bind('click',function(){
-	    			forwardPressed();
-	    		});
-	    	}
-	    }
-	    
-	    function backPressed(){
-	    	forwardHistory.push(backHistory[backHistory.length - 1]);
-	    	backHistory.pop();firefoxHeight = $('.firefox-window').height() - ($('.firefox-window .control').height() + $('.firefox-window .buttons').height() + 12);
-			$('.firefox-window .firefox-internet').css('height',firefoxHeight);
-			urlWidth = $('.firefox-window').width() - 310;
-			$('.firefox-window .buttons .firefox-url input').css('width',urlWidth);
-			internalClick = true;
-	    	changeURL(backHistory[backHistory.length - 1]);
-	    }
-	    
-	    function forwardPressed(){
-	    	var forwardURL = forwardHistory[forwardHistory.length - 1];
-	    	backHistory.push(forwardURL);
-	    	forwardHistory.pop();
-	    	internalClick = true;
-	    	changeURL(forwardURL);
-	    }
-	    
-	    function resize(){
-	    	firefoxHeight = $('.firefox-window').height() - ($('.firefox-window .control').height() + $('.firefox-window .buttons').height() + 12);
-	    	if(maximised){ firefoxHeight -= 27; }
-			$('.firefox-window .firefox-internet .theIframe').css('height',firefoxHeight);
-			$('.firefox-window .web-overlay-tran').css('height',firefoxHeight);
-			urlWidth = $('.firefox-window').width() - 310;
-			$('.firefox-window .buttons .firefox-url input').css('width',urlWidth);
-	    }
-	    
-	    function center(){
-	    	var left = ($(document).width() / 2) - ($('.firefox-window').width() / 2);
-			var top = Math.max(24,($(document).height() / 2) - ($('.firefox-window').height() / 2));
-			$('.firefox-window').css('left',left);
-			$('.firefox-window').css('top',top);
-	    }
-	    
-	     function iframeChange(){
-	     	if(!internalClick){
-		     	$('#submitURL').addClass('fade-text');
-		     	if($('#submitURL').val().substr($('#submitURL').val().length - 3,3) != '...'){
-		     		$('#submitURL').val( $('#submitURL').val(  ) + '...' );
-		     	}
-		     }
-		     internalClick = false;
-		  }
-}
diff --git a/templates/tour/js/jquery-ui.min.js b/templates/tour/js/jquery-ui.min.js
deleted file mode 100644
index 882309218a7..00000000000
--- a/templates/tour/js/jquery-ui.min.js
+++ /dev/null
@@ -1,412 +0,0 @@
-/*!
- * jQuery UI 1.8.14
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI
- */
-(function(a,d){function c(h,g){var i=h.nodeName.toLowerCase();if("area"===i){g=h.parentNode;i=g.name;if(!h.href||!i||g.nodeName.toLowerCase()!=="map")return false;h=a("img[usemap=#"+i+"]")[0];return!!h&&e(h)}return(/input|select|textarea|button|object/.test(i)?!h.disabled:"a"==i?h.href||g:g)&&e(h)}function e(h){return!a(h).parents().andSelf().filter(function(){return a.curCSS(this,"visibility")==="hidden"||a.expr.filters.hidden(this)}).length}a.ui=a.ui||{};if(!a.ui.version){a.extend(a.ui,{version:"1.8.14",
-keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});a.fn.extend({_focus:a.fn.focus,focus:function(h,g){return typeof h==="number"?this.each(function(){var i=this;setTimeout(function(){a(i).focus();
-g&&g.call(i)},h)}):this._focus.apply(this,arguments)},scrollParent:function(){var h;h=a.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(a.curCSS(this,"position",1))&&/(auto|scroll)/.test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(a.curCSS(this,"overflow",1)+a.curCSS(this,
-"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!h.length?a(document):h},zIndex:function(h){if(h!==d)return this.css("zIndex",h);if(this.length){h=a(this[0]);for(var g;h.length&&h[0]!==document;){g=h.css("position");if(g==="absolute"||g==="relative"||g==="fixed"){g=parseInt(h.css("zIndex"),10);if(!isNaN(g)&&g!==0)return g}h=h.parent()}}return 0},disableSelection:function(){return this.bind((a.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",
-function(h){h.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});a.each(["Width","Height"],function(h,g){function i(l,o,n,k){a.each(b,function(){o-=parseFloat(a.curCSS(l,"padding"+this,true))||0;if(n)o-=parseFloat(a.curCSS(l,"border"+this+"Width",true))||0;if(k)o-=parseFloat(a.curCSS(l,"margin"+this,true))||0});return o}var b=g==="Width"?["Left","Right"]:["Top","Bottom"],f=g.toLowerCase(),j={innerWidth:a.fn.innerWidth,innerHeight:a.fn.innerHeight,outerWidth:a.fn.outerWidth,
-outerHeight:a.fn.outerHeight};a.fn["inner"+g]=function(l){if(l===d)return j["inner"+g].call(this);return this.each(function(){a(this).css(f,i(this,l)+"px")})};a.fn["outer"+g]=function(l,o){if(typeof l!=="number")return j["outer"+g].call(this,l);return this.each(function(){a(this).css(f,i(this,l,true,o)+"px")})}});a.extend(a.expr[":"],{data:function(h,g,i){return!!a.data(h,i[3])},focusable:function(h){return c(h,!isNaN(a.attr(h,"tabindex")))},tabbable:function(h){var g=a.attr(h,"tabindex"),i=isNaN(g);
-return(i||g>=0)&&c(h,!i)}});a(function(){var h=document.body,g=h.appendChild(g=document.createElement("div"));a.extend(g.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});a.support.minHeight=g.offsetHeight===100;a.support.selectstart="onselectstart"in g;h.removeChild(g).style.display="none"});a.extend(a.ui,{plugin:{add:function(h,g,i){h=a.ui[h].prototype;for(var b in i){h.plugins[b]=h.plugins[b]||[];h.plugins[b].push([g,i[b]])}},call:function(h,g,i){if((g=h.plugins[g])&&h.element[0].parentNode)for(var b=
-0;b<g.length;b++)h.options[g[b][0]]&&g[b][1].apply(h.element,i)}},contains:function(h,g){return document.compareDocumentPosition?h.compareDocumentPosition(g)&16:h!==g&&h.contains(g)},hasScroll:function(h,g){if(a(h).css("overflow")==="hidden")return false;g=g&&g==="left"?"scrollLeft":"scrollTop";var i=false;if(h[g]>0)return true;h[g]=1;i=h[g]>0;h[g]=0;return i},isOverAxis:function(h,g,i){return h>g&&h<g+i},isOver:function(h,g,i,b,f,j){return a.ui.isOverAxis(h,i,f)&&a.ui.isOverAxis(g,b,j)}})}})(jQuery);
-(function(a,d){if(a.cleanData){var c=a.cleanData;a.cleanData=function(h){for(var g=0,i;(i=h[g])!=null;g++)a(i).triggerHandler("remove");c(h)}}else{var e=a.fn.remove;a.fn.remove=function(h,g){return this.each(function(){if(!g)if(!h||a.filter(h,[this]).length)a("*",this).add([this]).each(function(){a(this).triggerHandler("remove")});return e.call(a(this),h,g)})}}a.widget=function(h,g,i){var b=h.split(".")[0],f;h=h.split(".")[1];f=b+"-"+h;if(!i){i=g;g=a.Widget}a.expr[":"][f]=function(j){return!!a.data(j,
-h)};a[b]=a[b]||{};a[b][h]=function(j,l){arguments.length&&this._createWidget(j,l)};g=new g;g.options=a.extend(true,{},g.options);a[b][h].prototype=a.extend(true,g,{namespace:b,widgetName:h,widgetEventPrefix:a[b][h].prototype.widgetEventPrefix||h,widgetBaseClass:f},i);a.widget.bridge(h,a[b][h])};a.widget.bridge=function(h,g){a.fn[h]=function(i){var b=typeof i==="string",f=Array.prototype.slice.call(arguments,1),j=this;i=!b&&f.length?a.extend.apply(null,[true,i].concat(f)):i;if(b&&i.charAt(0)==="_")return j;
-b?this.each(function(){var l=a.data(this,h),o=l&&a.isFunction(l[i])?l[i].apply(l,f):l;if(o!==l&&o!==d){j=o;return false}}):this.each(function(){var l=a.data(this,h);l?l.option(i||{})._init():a.data(this,h,new g(i,this))});return j}};a.Widget=function(h,g){arguments.length&&this._createWidget(h,g)};a.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(h,g){a.data(g,this.widgetName,this);this.element=a(g);this.options=a.extend(true,{},this.options,
-this._getCreateOptions(),h);var i=this;this.element.bind("remove."+this.widgetName,function(){i.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return a.metadata&&a.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled ui-state-disabled")},
-widget:function(){return this.element},option:function(h,g){var i=h;if(arguments.length===0)return a.extend({},this.options);if(typeof h==="string"){if(g===d)return this.options[h];i={};i[h]=g}this._setOptions(i);return this},_setOptions:function(h){var g=this;a.each(h,function(i,b){g._setOption(i,b)});return this},_setOption:function(h,g){this.options[h]=g;if(h==="disabled")this.widget()[g?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",g);return this},
-enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(h,g,i){var b=this.options[h];g=a.Event(g);g.type=(h===this.widgetEventPrefix?h:this.widgetEventPrefix+h).toLowerCase();i=i||{};if(g.originalEvent){h=a.event.props.length;for(var f;h;){f=a.event.props[--h];g[f]=g.originalEvent[f]}}this.element.trigger(g,i);return!(a.isFunction(b)&&b.call(this.element[0],g,i)===false||g.isDefaultPrevented())}}})(jQuery);
-(function(a){var d=false;a(document).mousedown(function(){d=false});a.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var c=this;this.element.bind("mousedown."+this.widgetName,function(e){return c._mouseDown(e)}).bind("click."+this.widgetName,function(e){if(true===a.data(e.target,c.widgetName+".preventClickEvent")){a.removeData(e.target,c.widgetName+".preventClickEvent");e.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+
-this.widgetName)},_mouseDown:function(c){if(!d){this._mouseStarted&&this._mouseUp(c);this._mouseDownEvent=c;var e=this,h=c.which==1,g=typeof this.options.cancel=="string"?a(c.target).closest(this.options.cancel).length:false;if(!h||g||!this._mouseCapture(c))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){e.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(c)&&this._mouseDelayMet(c)){this._mouseStarted=this._mouseStart(c)!==
-false;if(!this._mouseStarted){c.preventDefault();return true}}true===a.data(c.target,this.widgetName+".preventClickEvent")&&a.removeData(c.target,this.widgetName+".preventClickEvent");this._mouseMoveDelegate=function(i){return e._mouseMove(i)};this._mouseUpDelegate=function(i){return e._mouseUp(i)};a(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);c.preventDefault();return d=true}},_mouseMove:function(c){if(a.browser.msie&&
-!(document.documentMode>=9)&&!c.button)return this._mouseUp(c);if(this._mouseStarted){this._mouseDrag(c);return c.preventDefault()}if(this._mouseDistanceMet(c)&&this._mouseDelayMet(c))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,c)!==false)?this._mouseDrag(c):this._mouseUp(c);return!this._mouseStarted},_mouseUp:function(c){a(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=
-false;c.target==this._mouseDownEvent.target&&a.data(c.target,this.widgetName+".preventClickEvent",true);this._mouseStop(c)}return false},_mouseDistanceMet:function(c){return Math.max(Math.abs(this._mouseDownEvent.pageX-c.pageX),Math.abs(this._mouseDownEvent.pageY-c.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery);
-(function(a){a.widget("ui.draggable",a.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:true,appendTo:"parent",axis:false,connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false},_create:function(){if(this.options.helper==
-"original"&&!/^(?:r|a|f)/.test(this.element.css("position")))this.element[0].style.position="relative";this.options.addClasses&&this.element.addClass("ui-draggable");this.options.disabled&&this.element.addClass("ui-draggable-disabled");this._mouseInit()},destroy:function(){if(this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy();return this}},_mouseCapture:function(d){var c=
-this.options;if(this.helper||c.disabled||a(d.target).is(".ui-resizable-handle"))return false;this.handle=this._getHandle(d);if(!this.handle)return false;a(c.iframeFix===true?"iframe":c.iframeFix).each(function(){a('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1E3}).css(a(this).offset()).appendTo("body")});return true},_mouseStart:function(d){var c=this.options;this.helper=
-this._createHelper(d);this._cacheHelperProportions();if(a.ui.ddmanager)a.ui.ddmanager.current=this;this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.positionAbs=this.element.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};a.extend(this.offset,{click:{left:d.pageX-this.offset.left,top:d.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});
-this.originalPosition=this.position=this._generatePosition(d);this.originalPageX=d.pageX;this.originalPageY=d.pageY;c.cursorAt&&this._adjustOffsetFromHelper(c.cursorAt);c.containment&&this._setContainment();if(this._trigger("start",d)===false){this._clear();return false}this._cacheHelperProportions();a.ui.ddmanager&&!c.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,d);this.helper.addClass("ui-draggable-dragging");this._mouseDrag(d,true);a.ui.ddmanager&&a.ui.ddmanager.dragStart(this,d);return true},
-_mouseDrag:function(d,c){this.position=this._generatePosition(d);this.positionAbs=this._convertPositionTo("absolute");if(!c){c=this._uiHash();if(this._trigger("drag",d,c)===false){this._mouseUp({});return false}this.position=c.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";a.ui.ddmanager&&a.ui.ddmanager.drag(this,d);return false},_mouseStop:function(d){var c=
-false;if(a.ui.ddmanager&&!this.options.dropBehaviour)c=a.ui.ddmanager.drop(this,d);if(this.dropped){c=this.dropped;this.dropped=false}if((!this.element[0]||!this.element[0].parentNode)&&this.options.helper=="original")return false;if(this.options.revert=="invalid"&&!c||this.options.revert=="valid"&&c||this.options.revert===true||a.isFunction(this.options.revert)&&this.options.revert.call(this.element,c)){var e=this;a(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,
-10),function(){e._trigger("stop",d)!==false&&e._clear()})}else this._trigger("stop",d)!==false&&this._clear();return false},_mouseUp:function(d){this.options.iframeFix===true&&a("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)});a.ui.ddmanager&&a.ui.ddmanager.dragStop(this,d);return a.ui.mouse.prototype._mouseUp.call(this,d)},cancel:function(){this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear();return this},_getHandle:function(d){var c=!this.options.handle||
-!a(this.options.handle,this.element).length?true:false;a(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==d.target)c=true});return c},_createHelper:function(d){var c=this.options;d=a.isFunction(c.helper)?a(c.helper.apply(this.element[0],[d])):c.helper=="clone"?this.element.clone().removeAttr("id"):this.element;d.parents("body").length||d.appendTo(c.appendTo=="parent"?this.element[0].parentNode:c.appendTo);d[0]!=this.element[0]&&!/(fixed|absolute)/.test(d.css("position"))&&
-d.css("position","absolute");return d},_adjustOffsetFromHelper:function(d){if(typeof d=="string")d=d.split(" ");if(a.isArray(d))d={left:+d[0],top:+d[1]||0};if("left"in d)this.offset.click.left=d.left+this.margins.left;if("right"in d)this.offset.click.left=this.helperProportions.width-d.right+this.margins.left;if("top"in d)this.offset.click.top=d.top+this.margins.top;if("bottom"in d)this.offset.click.top=this.helperProportions.height-d.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=
-this.helper.offsetParent();var d=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0])){d.left+=this.scrollParent.scrollLeft();d.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&a.browser.msie)d={top:0,left:0};return{top:d.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:d.left+(parseInt(this.offsetParent.css("borderLeftWidth"),
-10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var d=this.element.position();return{top:d.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:d.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),
-10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var d=this.options;if(d.containment=="parent")d.containment=this.helper[0].parentNode;if(d.containment=="document"||d.containment=="window")this.containment=[d.containment=="document"?0:a(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,d.containment=="document"?0:a(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,
-(d.containment=="document"?0:a(window).scrollLeft())+a(d.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(d.containment=="document"?0:a(window).scrollTop())+(a(d.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(d.containment)&&d.containment.constructor!=Array){d=a(d.containment);var c=d[0];if(c){d.offset();var e=a(c).css("overflow")!=
-"hidden";this.containment=[(parseInt(a(c).css("borderLeftWidth"),10)||0)+(parseInt(a(c).css("paddingLeft"),10)||0),(parseInt(a(c).css("borderTopWidth"),10)||0)+(parseInt(a(c).css("paddingTop"),10)||0),(e?Math.max(c.scrollWidth,c.offsetWidth):c.offsetWidth)-(parseInt(a(c).css("borderLeftWidth"),10)||0)-(parseInt(a(c).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(e?Math.max(c.scrollHeight,c.offsetHeight):c.offsetHeight)-(parseInt(a(c).css("borderTopWidth"),
-10)||0)-(parseInt(a(c).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom];this.relative_container=d}}else if(d.containment.constructor==Array)this.containment=d.containment},_convertPositionTo:function(d,c){if(!c)c=this.position;d=d=="absolute"?1:-1;var e=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,h=/(html|body)/i.test(e[0].tagName);return{top:c.top+
-this.offset.relative.top*d+this.offset.parent.top*d-(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():h?0:e.scrollTop())*d),left:c.left+this.offset.relative.left*d+this.offset.parent.left*d-(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():h?0:e.scrollLeft())*d)}},_generatePosition:function(d){var c=this.options,e=this.cssPosition=="absolute"&&
-!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,h=/(html|body)/i.test(e[0].tagName),g=d.pageX,i=d.pageY;if(this.originalPosition){var b;if(this.containment){if(this.relative_container){b=this.relative_container.offset();b=[this.containment[0]+b.left,this.containment[1]+b.top,this.containment[2]+b.left,this.containment[3]+b.top]}else b=this.containment;if(d.pageX-this.offset.click.left<b[0])g=b[0]+this.offset.click.left;
-if(d.pageY-this.offset.click.top<b[1])i=b[1]+this.offset.click.top;if(d.pageX-this.offset.click.left>b[2])g=b[2]+this.offset.click.left;if(d.pageY-this.offset.click.top>b[3])i=b[3]+this.offset.click.top}if(c.grid){i=c.grid[1]?this.originalPageY+Math.round((i-this.originalPageY)/c.grid[1])*c.grid[1]:this.originalPageY;i=b?!(i-this.offset.click.top<b[1]||i-this.offset.click.top>b[3])?i:!(i-this.offset.click.top<b[1])?i-c.grid[1]:i+c.grid[1]:i;g=c.grid[0]?this.originalPageX+Math.round((g-this.originalPageX)/
-c.grid[0])*c.grid[0]:this.originalPageX;g=b?!(g-this.offset.click.left<b[0]||g-this.offset.click.left>b[2])?g:!(g-this.offset.click.left<b[0])?g-c.grid[0]:g+c.grid[0]:g}}return{top:i-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():h?0:e.scrollTop()),left:g-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.browser.safari&&a.browser.version<
-526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():h?0:e.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging");this.helper[0]!=this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove();this.helper=null;this.cancelHelperRemoval=false},_trigger:function(d,c,e){e=e||this._uiHash();a.ui.plugin.call(this,d,[c,e]);if(d=="drag")this.positionAbs=this._convertPositionTo("absolute");return a.Widget.prototype._trigger.call(this,d,c,
-e)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}});a.extend(a.ui.draggable,{version:"1.8.14"});a.ui.plugin.add("draggable","connectToSortable",{start:function(d,c){var e=a(this).data("draggable"),h=e.options,g=a.extend({},c,{item:e.element});e.sortables=[];a(h.connectToSortable).each(function(){var i=a.data(this,"sortable");if(i&&!i.options.disabled){e.sortables.push({instance:i,shouldRevert:i.options.revert});
-i.refreshPositions();i._trigger("activate",d,g)}})},stop:function(d,c){var e=a(this).data("draggable"),h=a.extend({},c,{item:e.element});a.each(e.sortables,function(){if(this.instance.isOver){this.instance.isOver=0;e.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert)this.instance.options.revert=true;this.instance._mouseStop(d);this.instance.options.helper=this.instance.options._helper;e.options.helper=="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})}else{this.instance.cancelHelperRemoval=
-false;this.instance._trigger("deactivate",d,h)}})},drag:function(d,c){var e=a(this).data("draggable"),h=this;a.each(e.sortables,function(){this.instance.positionAbs=e.positionAbs;this.instance.helperProportions=e.helperProportions;this.instance.offset.click=e.offset.click;if(this.instance._intersectsWith(this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=a(h).clone().removeAttr("id").appendTo(this.instance.element).data("sortable-item",true);
-this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return c.helper[0]};d.target=this.instance.currentItem[0];this.instance._mouseCapture(d,true);this.instance._mouseStart(d,true,true);this.instance.offset.click.top=e.offset.click.top;this.instance.offset.click.left=e.offset.click.left;this.instance.offset.parent.left-=e.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=e.offset.parent.top-this.instance.offset.parent.top;
-e._trigger("toSortable",d);e.dropped=this.instance.element;e.currentItem=e.element;this.instance.fromOutside=e}this.instance.currentItem&&this.instance._mouseDrag(d)}else if(this.instance.isOver){this.instance.isOver=0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance._trigger("out",d,this.instance._uiHash(this.instance));this.instance._mouseStop(d,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();this.instance.placeholder&&
-this.instance.placeholder.remove();e._trigger("fromSortable",d);e.dropped=false}})}});a.ui.plugin.add("draggable","cursor",{start:function(){var d=a("body"),c=a(this).data("draggable").options;if(d.css("cursor"))c._cursor=d.css("cursor");d.css("cursor",c.cursor)},stop:function(){var d=a(this).data("draggable").options;d._cursor&&a("body").css("cursor",d._cursor)}});a.ui.plugin.add("draggable","opacity",{start:function(d,c){d=a(c.helper);c=a(this).data("draggable").options;if(d.css("opacity"))c._opacity=
-d.css("opacity");d.css("opacity",c.opacity)},stop:function(d,c){d=a(this).data("draggable").options;d._opacity&&a(c.helper).css("opacity",d._opacity)}});a.ui.plugin.add("draggable","scroll",{start:function(){var d=a(this).data("draggable");if(d.scrollParent[0]!=document&&d.scrollParent[0].tagName!="HTML")d.overflowOffset=d.scrollParent.offset()},drag:function(d){var c=a(this).data("draggable"),e=c.options,h=false;if(c.scrollParent[0]!=document&&c.scrollParent[0].tagName!="HTML"){if(!e.axis||e.axis!=
-"x")if(c.overflowOffset.top+c.scrollParent[0].offsetHeight-d.pageY<e.scrollSensitivity)c.scrollParent[0].scrollTop=h=c.scrollParent[0].scrollTop+e.scrollSpeed;else if(d.pageY-c.overflowOffset.top<e.scrollSensitivity)c.scrollParent[0].scrollTop=h=c.scrollParent[0].scrollTop-e.scrollSpeed;if(!e.axis||e.axis!="y")if(c.overflowOffset.left+c.scrollParent[0].offsetWidth-d.pageX<e.scrollSensitivity)c.scrollParent[0].scrollLeft=h=c.scrollParent[0].scrollLeft+e.scrollSpeed;else if(d.pageX-c.overflowOffset.left<
-e.scrollSensitivity)c.scrollParent[0].scrollLeft=h=c.scrollParent[0].scrollLeft-e.scrollSpeed}else{if(!e.axis||e.axis!="x")if(d.pageY-a(document).scrollTop()<e.scrollSensitivity)h=a(document).scrollTop(a(document).scrollTop()-e.scrollSpeed);else if(a(window).height()-(d.pageY-a(document).scrollTop())<e.scrollSensitivity)h=a(document).scrollTop(a(document).scrollTop()+e.scrollSpeed);if(!e.axis||e.axis!="y")if(d.pageX-a(document).scrollLeft()<e.scrollSensitivity)h=a(document).scrollLeft(a(document).scrollLeft()-
-e.scrollSpeed);else if(a(window).width()-(d.pageX-a(document).scrollLeft())<e.scrollSensitivity)h=a(document).scrollLeft(a(document).scrollLeft()+e.scrollSpeed)}h!==false&&a.ui.ddmanager&&!e.dropBehaviour&&a.ui.ddmanager.prepareOffsets(c,d)}});a.ui.plugin.add("draggable","snap",{start:function(){var d=a(this).data("draggable"),c=d.options;d.snapElements=[];a(c.snap.constructor!=String?c.snap.items||":data(draggable)":c.snap).each(function(){var e=a(this),h=e.offset();this!=d.element[0]&&d.snapElements.push({item:this,
-width:e.outerWidth(),height:e.outerHeight(),top:h.top,left:h.left})})},drag:function(d,c){for(var e=a(this).data("draggable"),h=e.options,g=h.snapTolerance,i=c.offset.left,b=i+e.helperProportions.width,f=c.offset.top,j=f+e.helperProportions.height,l=e.snapElements.length-1;l>=0;l--){var o=e.snapElements[l].left,n=o+e.snapElements[l].width,k=e.snapElements[l].top,m=k+e.snapElements[l].height;if(o-g<i&&i<n+g&&k-g<f&&f<m+g||o-g<i&&i<n+g&&k-g<j&&j<m+g||o-g<b&&b<n+g&&k-g<f&&f<m+g||o-g<b&&b<n+g&&k-g<j&&
-j<m+g){if(h.snapMode!="inner"){var p=Math.abs(k-j)<=g,q=Math.abs(m-f)<=g,s=Math.abs(o-b)<=g,r=Math.abs(n-i)<=g;if(p)c.position.top=e._convertPositionTo("relative",{top:k-e.helperProportions.height,left:0}).top-e.margins.top;if(q)c.position.top=e._convertPositionTo("relative",{top:m,left:0}).top-e.margins.top;if(s)c.position.left=e._convertPositionTo("relative",{top:0,left:o-e.helperProportions.width}).left-e.margins.left;if(r)c.position.left=e._convertPositionTo("relative",{top:0,left:n}).left-e.margins.left}var u=
-p||q||s||r;if(h.snapMode!="outer"){p=Math.abs(k-f)<=g;q=Math.abs(m-j)<=g;s=Math.abs(o-i)<=g;r=Math.abs(n-b)<=g;if(p)c.position.top=e._convertPositionTo("relative",{top:k,left:0}).top-e.margins.top;if(q)c.position.top=e._convertPositionTo("relative",{top:m-e.helperProportions.height,left:0}).top-e.margins.top;if(s)c.position.left=e._convertPositionTo("relative",{top:0,left:o}).left-e.margins.left;if(r)c.position.left=e._convertPositionTo("relative",{top:0,left:n-e.helperProportions.width}).left-e.margins.left}if(!e.snapElements[l].snapping&&
-(p||q||s||r||u))e.options.snap.snap&&e.options.snap.snap.call(e.element,d,a.extend(e._uiHash(),{snapItem:e.snapElements[l].item}));e.snapElements[l].snapping=p||q||s||r||u}else{e.snapElements[l].snapping&&e.options.snap.release&&e.options.snap.release.call(e.element,d,a.extend(e._uiHash(),{snapItem:e.snapElements[l].item}));e.snapElements[l].snapping=false}}}});a.ui.plugin.add("draggable","stack",{start:function(){var d=a(this).data("draggable").options;d=a.makeArray(a(d.stack)).sort(function(e,h){return(parseInt(a(e).css("zIndex"),
-10)||0)-(parseInt(a(h).css("zIndex"),10)||0)});if(d.length){var c=parseInt(d[0].style.zIndex)||0;a(d).each(function(e){this.style.zIndex=c+e});this[0].style.zIndex=c+d.length}}});a.ui.plugin.add("draggable","zIndex",{start:function(d,c){d=a(c.helper);c=a(this).data("draggable").options;if(d.css("zIndex"))c._zIndex=d.css("zIndex");d.css("zIndex",c.zIndex)},stop:function(d,c){d=a(this).data("draggable").options;d._zIndex&&a(c.helper).css("zIndex",d._zIndex)}})})(jQuery);
-(function(a){a.widget("ui.droppable",{widgetEventPrefix:"drop",options:{accept:"*",activeClass:false,addClasses:true,greedy:false,hoverClass:false,scope:"default",tolerance:"intersect"},_create:function(){var d=this.options,c=d.accept;this.isover=0;this.isout=1;this.accept=a.isFunction(c)?c:function(e){return e.is(c)};this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};a.ui.ddmanager.droppables[d.scope]=a.ui.ddmanager.droppables[d.scope]||[];a.ui.ddmanager.droppables[d.scope].push(this);
-d.addClasses&&this.element.addClass("ui-droppable")},destroy:function(){for(var d=a.ui.ddmanager.droppables[this.options.scope],c=0;c<d.length;c++)d[c]==this&&d.splice(c,1);this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable");return this},_setOption:function(d,c){if(d=="accept")this.accept=a.isFunction(c)?c:function(e){return e.is(c)};a.Widget.prototype._setOption.apply(this,arguments)},_activate:function(d){var c=a.ui.ddmanager.current;this.options.activeClass&&
-this.element.addClass(this.options.activeClass);c&&this._trigger("activate",d,this.ui(c))},_deactivate:function(d){var c=a.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass);c&&this._trigger("deactivate",d,this.ui(c))},_over:function(d){var c=a.ui.ddmanager.current;if(!(!c||(c.currentItem||c.element)[0]==this.element[0]))if(this.accept.call(this.element[0],c.currentItem||c.element)){this.options.hoverClass&&this.element.addClass(this.options.hoverClass);
-this._trigger("over",d,this.ui(c))}},_out:function(d){var c=a.ui.ddmanager.current;if(!(!c||(c.currentItem||c.element)[0]==this.element[0]))if(this.accept.call(this.element[0],c.currentItem||c.element)){this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("out",d,this.ui(c))}},_drop:function(d,c){var e=c||a.ui.ddmanager.current;if(!e||(e.currentItem||e.element)[0]==this.element[0])return false;var h=false;this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var g=
-a.data(this,"droppable");if(g.options.greedy&&!g.options.disabled&&g.options.scope==e.options.scope&&g.accept.call(g.element[0],e.currentItem||e.element)&&a.ui.intersect(e,a.extend(g,{offset:g.element.offset()}),g.options.tolerance)){h=true;return false}});if(h)return false;if(this.accept.call(this.element[0],e.currentItem||e.element)){this.options.activeClass&&this.element.removeClass(this.options.activeClass);this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("drop",
-d,this.ui(e));return this.element}return false},ui:function(d){return{draggable:d.currentItem||d.element,helper:d.helper,position:d.position,offset:d.positionAbs}}});a.extend(a.ui.droppable,{version:"1.8.14"});a.ui.intersect=function(d,c,e){if(!c.offset)return false;var h=(d.positionAbs||d.position.absolute).left,g=h+d.helperProportions.width,i=(d.positionAbs||d.position.absolute).top,b=i+d.helperProportions.height,f=c.offset.left,j=f+c.proportions.width,l=c.offset.top,o=l+c.proportions.height;
-switch(e){case "fit":return f<=h&&g<=j&&l<=i&&b<=o;case "intersect":return f<h+d.helperProportions.width/2&&g-d.helperProportions.width/2<j&&l<i+d.helperProportions.height/2&&b-d.helperProportions.height/2<o;case "pointer":return a.ui.isOver((d.positionAbs||d.position.absolute).top+(d.clickOffset||d.offset.click).top,(d.positionAbs||d.position.absolute).left+(d.clickOffset||d.offset.click).left,l,f,c.proportions.height,c.proportions.width);case "touch":return(i>=l&&i<=o||b>=l&&b<=o||i<l&&b>o)&&(h>=
-f&&h<=j||g>=f&&g<=j||h<f&&g>j);default:return false}};a.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(d,c){var e=a.ui.ddmanager.droppables[d.options.scope]||[],h=c?c.type:null,g=(d.currentItem||d.element).find(":data(droppable)").andSelf(),i=0;a:for(;i<e.length;i++)if(!(e[i].options.disabled||d&&!e[i].accept.call(e[i].element[0],d.currentItem||d.element))){for(var b=0;b<g.length;b++)if(g[b]==e[i].element[0]){e[i].proportions.height=0;continue a}e[i].visible=e[i].element.css("display")!=
-"none";if(e[i].visible){h=="mousedown"&&e[i]._activate.call(e[i],c);e[i].offset=e[i].element.offset();e[i].proportions={width:e[i].element[0].offsetWidth,height:e[i].element[0].offsetHeight}}}},drop:function(d,c){var e=false;a.each(a.ui.ddmanager.droppables[d.options.scope]||[],function(){if(this.options){if(!this.options.disabled&&this.visible&&a.ui.intersect(d,this,this.options.tolerance))e=e||this._drop.call(this,c);if(!this.options.disabled&&this.visible&&this.accept.call(this.element[0],d.currentItem||
-d.element)){this.isout=1;this.isover=0;this._deactivate.call(this,c)}}});return e},dragStart:function(d,c){d.element.parentsUntil("body").bind("scroll.droppable",function(){d.options.refreshPositions||a.ui.ddmanager.prepareOffsets(d,c)})},drag:function(d,c){d.options.refreshPositions&&a.ui.ddmanager.prepareOffsets(d,c);a.each(a.ui.ddmanager.droppables[d.options.scope]||[],function(){if(!(this.options.disabled||this.greedyChild||!this.visible)){var e=a.ui.intersect(d,this,this.options.tolerance);if(e=
-!e&&this.isover==1?"isout":e&&this.isover==0?"isover":null){var h;if(this.options.greedy){var g=this.element.parents(":data(droppable):eq(0)");if(g.length){h=a.data(g[0],"droppable");h.greedyChild=e=="isover"?1:0}}if(h&&e=="isover"){h.isover=0;h.isout=1;h._out.call(h,c)}this[e]=1;this[e=="isout"?"isover":"isout"]=0;this[e=="isover"?"_over":"_out"].call(this,c);if(h&&e=="isout"){h.isout=0;h.isover=1;h._over.call(h,c)}}}})},dragStop:function(d,c){d.element.parentsUntil("body").unbind("scroll.droppable");
-d.options.refreshPositions||a.ui.ddmanager.prepareOffsets(d,c)}}})(jQuery);
-(function(a){a.widget("ui.resizable",a.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,containment:false,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1E3},_create:function(){var e=this,h=this.options;this.element.addClass("ui-resizable");a.extend(this,{_aspectRatio:!!h.aspectRatio,aspectRatio:h.aspectRatio,originalElement:this.element,
-_proportionallyResizeElements:[],_helper:h.helper||h.ghost||h.animate?h.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){/relative/.test(this.element.css("position"))&&a.browser.opera&&this.element.css({position:"relative",top:"auto",left:"auto"});this.element.wrap(a('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),
-top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=
-this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=h.handles||(!a(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",
-nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all")this.handles="n,e,s,w,se,sw,ne,nw";var g=this.handles.split(",");this.handles={};for(var i=0;i<g.length;i++){var b=a.trim(g[i]),f=a('<div class="ui-resizable-handle '+("ui-resizable-"+b)+'"></div>');/sw|se|ne|nw/.test(b)&&f.css({zIndex:++h.zIndex});"se"==b&&f.addClass("ui-icon ui-icon-gripsmall-diagonal-se");this.handles[b]=".ui-resizable-"+b;this.element.append(f)}}this._renderAxis=function(j){j=j||this.element;for(var l in this.handles){if(this.handles[l].constructor==
-String)this.handles[l]=a(this.handles[l],this.element).show();if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var o=a(this.handles[l],this.element),n=0;n=/sw|ne|nw|se|n|s/.test(l)?o.outerHeight():o.outerWidth();o=["padding",/ne|nw|n/.test(l)?"Top":/se|sw|s/.test(l)?"Bottom":/^e$/.test(l)?"Right":"Left"].join("");j.css(o,n);this._proportionallyResize()}a(this.handles[l])}};this._renderAxis(this.element);this._handles=a(".ui-resizable-handle",this.element).disableSelection();
-this._handles.mouseover(function(){if(!e.resizing){if(this.className)var j=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);e.axis=j&&j[1]?j[1]:"se"}});if(h.autoHide){this._handles.hide();a(this.element).addClass("ui-resizable-autohide").hover(function(){if(!h.disabled){a(this).removeClass("ui-resizable-autohide");e._handles.show()}},function(){if(!h.disabled)if(!e.resizing){a(this).addClass("ui-resizable-autohide");e._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();
-var e=function(g){a(g).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){e(this.element);var h=this.element;h.after(this.originalElement.css({position:h.css("position"),width:h.outerWidth(),height:h.outerHeight(),top:h.css("top"),left:h.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);e(this.originalElement);return this},_mouseCapture:function(e){var h=
-false;for(var g in this.handles)if(a(this.handles[g])[0]==e.target)h=true;return!this.options.disabled&&h},_mouseStart:function(e){var h=this.options,g=this.element.position(),i=this.element;this.resizing=true;this.documentScroll={top:a(document).scrollTop(),left:a(document).scrollLeft()};if(i.is(".ui-draggable")||/absolute/.test(i.css("position")))i.css({position:"absolute",top:g.top,left:g.left});a.browser.opera&&/relative/.test(i.css("position"))&&i.css({position:"relative",top:"auto",left:"auto"});
-this._renderProxy();g=d(this.helper.css("left"));var b=d(this.helper.css("top"));if(h.containment){g+=a(h.containment).scrollLeft()||0;b+=a(h.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:g,top:b};this.size=this._helper?{width:i.outerWidth(),height:i.outerHeight()}:{width:i.width(),height:i.height()};this.originalSize=this._helper?{width:i.outerWidth(),height:i.outerHeight()}:{width:i.width(),height:i.height()};this.originalPosition={left:g,top:b};this.sizeDiff=
-{width:i.outerWidth()-i.width(),height:i.outerHeight()-i.height()};this.originalMousePosition={left:e.pageX,top:e.pageY};this.aspectRatio=typeof h.aspectRatio=="number"?h.aspectRatio:this.originalSize.width/this.originalSize.height||1;h=a(".ui-resizable-"+this.axis).css("cursor");a("body").css("cursor",h=="auto"?this.axis+"-resize":h);i.addClass("ui-resizable-resizing");this._propagate("start",e);return true},_mouseDrag:function(e){var h=this.helper,g=this.originalMousePosition,i=this._change[this.axis];
-if(!i)return false;g=i.apply(this,[e,e.pageX-g.left||0,e.pageY-g.top||0]);this._updateVirtualBoundaries(e.shiftKey);if(this._aspectRatio||e.shiftKey)g=this._updateRatio(g,e);g=this._respectSize(g,e);this._propagate("resize",e);h.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize();this._updateCache(g);this._trigger("resize",e,this.ui());return false},
-_mouseStop:function(e){this.resizing=false;var h=this.options,g=this;if(this._helper){var i=this._proportionallyResizeElements,b=i.length&&/textarea/i.test(i[0].nodeName);i=b&&a.ui.hasScroll(i[0],"left")?0:g.sizeDiff.height;b=b?0:g.sizeDiff.width;b={width:g.helper.width()-b,height:g.helper.height()-i};i=parseInt(g.element.css("left"),10)+(g.position.left-g.originalPosition.left)||null;var f=parseInt(g.element.css("top"),10)+(g.position.top-g.originalPosition.top)||null;h.animate||this.element.css(a.extend(b,
-{top:f,left:i}));g.helper.height(g.size.height);g.helper.width(g.size.width);this._helper&&!h.animate&&this._proportionallyResize()}a("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",e);this._helper&&this.helper.remove();return false},_updateVirtualBoundaries:function(e){var h=this.options,g,i,b;h={minWidth:c(h.minWidth)?h.minWidth:0,maxWidth:c(h.maxWidth)?h.maxWidth:Infinity,minHeight:c(h.minHeight)?h.minHeight:0,maxHeight:c(h.maxHeight)?h.maxHeight:
-Infinity};if(this._aspectRatio||e){e=h.minHeight*this.aspectRatio;i=h.minWidth/this.aspectRatio;g=h.maxHeight*this.aspectRatio;b=h.maxWidth/this.aspectRatio;if(e>h.minWidth)h.minWidth=e;if(i>h.minHeight)h.minHeight=i;if(g<h.maxWidth)h.maxWidth=g;if(b<h.maxHeight)h.maxHeight=b}this._vBoundaries=h},_updateCache:function(e){this.offset=this.helper.offset();if(c(e.left))this.position.left=e.left;if(c(e.top))this.position.top=e.top;if(c(e.height))this.size.height=e.height;if(c(e.width))this.size.width=
-e.width},_updateRatio:function(e){var h=this.position,g=this.size,i=this.axis;if(c(e.height))e.width=e.height*this.aspectRatio;else if(c(e.width))e.height=e.width/this.aspectRatio;if(i=="sw"){e.left=h.left+(g.width-e.width);e.top=null}if(i=="nw"){e.top=h.top+(g.height-e.height);e.left=h.left+(g.width-e.width)}return e},_respectSize:function(e){var h=this._vBoundaries,g=this.axis,i=c(e.width)&&h.maxWidth&&h.maxWidth<e.width,b=c(e.height)&&h.maxHeight&&h.maxHeight<e.height,f=c(e.width)&&h.minWidth&&
-h.minWidth>e.width,j=c(e.height)&&h.minHeight&&h.minHeight>e.height;if(f)e.width=h.minWidth;if(j)e.height=h.minHeight;if(i)e.width=h.maxWidth;if(b)e.height=h.maxHeight;var l=this.originalPosition.left+this.originalSize.width,o=this.position.top+this.size.height,n=/sw|nw|w/.test(g);g=/nw|ne|n/.test(g);if(f&&n)e.left=l-h.minWidth;if(i&&n)e.left=l-h.maxWidth;if(j&&g)e.top=o-h.minHeight;if(b&&g)e.top=o-h.maxHeight;if((h=!e.width&&!e.height)&&!e.left&&e.top)e.top=null;else if(h&&!e.top&&e.left)e.left=
-null;return e},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var e=this.helper||this.element,h=0;h<this._proportionallyResizeElements.length;h++){var g=this._proportionallyResizeElements[h];if(!this.borderDif){var i=[g.css("borderTopWidth"),g.css("borderRightWidth"),g.css("borderBottomWidth"),g.css("borderLeftWidth")],b=[g.css("paddingTop"),g.css("paddingRight"),g.css("paddingBottom"),g.css("paddingLeft")];this.borderDif=a.map(i,function(f,j){f=parseInt(f,10)||
-0;j=parseInt(b[j],10)||0;return f+j})}a.browser.msie&&(a(e).is(":hidden")||a(e).parents(":hidden").length)||g.css({height:e.height()-this.borderDif[0]-this.borderDif[2]||0,width:e.width()-this.borderDif[1]-this.borderDif[3]||0})}},_renderProxy:function(){var e=this.options;this.elementOffset=this.element.offset();if(this._helper){this.helper=this.helper||a('<div style="overflow:hidden;"></div>');var h=a.browser.msie&&a.browser.version<7,g=h?1:0;h=h?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+
-h,height:this.element.outerHeight()+h,position:"absolute",left:this.elementOffset.left-g+"px",top:this.elementOffset.top-g+"px",zIndex:++e.zIndex});this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(e,h){return{width:this.originalSize.width+h}},w:function(e,h){return{left:this.originalPosition.left+h,width:this.originalSize.width-h}},n:function(e,h,g){return{top:this.originalPosition.top+g,height:this.originalSize.height-g}},s:function(e,h,g){return{height:this.originalSize.height+
-g}},se:function(e,h,g){return a.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,h,g]))},sw:function(e,h,g){return a.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,h,g]))},ne:function(e,h,g){return a.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,h,g]))},nw:function(e,h,g){return a.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,h,g]))}},_propagate:function(e,h){a.ui.plugin.call(this,e,[h,this.ui()]);
-e!="resize"&&this._trigger(e,h,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}});a.extend(a.ui.resizable,{version:"1.8.14"});a.ui.plugin.add("resizable","alsoResize",{start:function(){var e=a(this).data("resizable").options,h=function(g){a(g).each(function(){var i=a(this);i.data("resizable-alsoresize",{width:parseInt(i.width(),
-10),height:parseInt(i.height(),10),left:parseInt(i.css("left"),10),top:parseInt(i.css("top"),10),position:i.css("position")})})};if(typeof e.alsoResize=="object"&&!e.alsoResize.parentNode)if(e.alsoResize.length){e.alsoResize=e.alsoResize[0];h(e.alsoResize)}else a.each(e.alsoResize,function(g){h(g)});else h(e.alsoResize)},resize:function(e,h){var g=a(this).data("resizable");e=g.options;var i=g.originalSize,b=g.originalPosition,f={height:g.size.height-i.height||0,width:g.size.width-i.width||0,top:g.position.top-
-b.top||0,left:g.position.left-b.left||0},j=function(l,o){a(l).each(function(){var n=a(this),k=a(this).data("resizable-alsoresize"),m={},p=o&&o.length?o:n.parents(h.originalElement[0]).length?["width","height"]:["width","height","top","left"];a.each(p,function(q,s){if((q=(k[s]||0)+(f[s]||0))&&q>=0)m[s]=q||null});if(a.browser.opera&&/relative/.test(n.css("position"))){g._revertToRelativePosition=true;n.css({position:"absolute",top:"auto",left:"auto"})}n.css(m)})};typeof e.alsoResize=="object"&&!e.alsoResize.nodeType?
-a.each(e.alsoResize,function(l,o){j(l,o)}):j(e.alsoResize)},stop:function(){var e=a(this).data("resizable"),h=e.options,g=function(i){a(i).each(function(){var b=a(this);b.css({position:b.data("resizable-alsoresize").position})})};if(e._revertToRelativePosition){e._revertToRelativePosition=false;typeof h.alsoResize=="object"&&!h.alsoResize.nodeType?a.each(h.alsoResize,function(i){g(i)}):g(h.alsoResize)}a(this).removeData("resizable-alsoresize")}});a.ui.plugin.add("resizable","animate",{stop:function(e){var h=
-a(this).data("resizable"),g=h.options,i=h._proportionallyResizeElements,b=i.length&&/textarea/i.test(i[0].nodeName),f=b&&a.ui.hasScroll(i[0],"left")?0:h.sizeDiff.height;b={width:h.size.width-(b?0:h.sizeDiff.width),height:h.size.height-f};f=parseInt(h.element.css("left"),10)+(h.position.left-h.originalPosition.left)||null;var j=parseInt(h.element.css("top"),10)+(h.position.top-h.originalPosition.top)||null;h.element.animate(a.extend(b,j&&f?{top:j,left:f}:{}),{duration:g.animateDuration,easing:g.animateEasing,
-step:function(){var l={width:parseInt(h.element.css("width"),10),height:parseInt(h.element.css("height"),10),top:parseInt(h.element.css("top"),10),left:parseInt(h.element.css("left"),10)};i&&i.length&&a(i[0]).css({width:l.width,height:l.height});h._updateCache(l);h._propagate("resize",e)}})}});a.ui.plugin.add("resizable","containment",{start:function(){var e=a(this).data("resizable"),h=e.element,g=e.options.containment;if(h=g instanceof a?g.get(0):/parent/.test(g)?h.parent().get(0):g){e.containerElement=
-a(h);if(/document/.test(g)||g==document){e.containerOffset={left:0,top:0};e.containerPosition={left:0,top:0};e.parentData={element:a(document),left:0,top:0,width:a(document).width(),height:a(document).height()||document.body.parentNode.scrollHeight}}else{var i=a(h),b=[];a(["Top","Right","Left","Bottom"]).each(function(l,o){b[l]=d(i.css("padding"+o))});e.containerOffset=i.offset();e.containerPosition=i.position();e.containerSize={height:i.innerHeight()-b[3],width:i.innerWidth()-b[1]};g=e.containerOffset;
-var f=e.containerSize.height,j=e.containerSize.width;j=a.ui.hasScroll(h,"left")?h.scrollWidth:j;f=a.ui.hasScroll(h)?h.scrollHeight:f;e.parentData={element:h,left:g.left,top:g.top,width:j,height:f}}}},resize:function(e){var h=a(this).data("resizable"),g=h.options,i=h.containerOffset,b=h.position;e=h._aspectRatio||e.shiftKey;var f={top:0,left:0},j=h.containerElement;if(j[0]!=document&&/static/.test(j.css("position")))f=i;if(b.left<(h._helper?i.left:0)){h.size.width+=h._helper?h.position.left-i.left:
-h.position.left-f.left;if(e)h.size.height=h.size.width/g.aspectRatio;h.position.left=g.helper?i.left:0}if(b.top<(h._helper?i.top:0)){h.size.height+=h._helper?h.position.top-i.top:h.position.top;if(e)h.size.width=h.size.height*g.aspectRatio;h.position.top=h._helper?i.top:0}h.offset.left=h.parentData.left+h.position.left;h.offset.top=h.parentData.top+h.position.top;g=Math.abs((h._helper?h.offset.left-f.left:h.offset.left-f.left)+h.sizeDiff.width);i=Math.abs((h._helper?h.offset.top-f.top:h.offset.top-
-i.top)+h.sizeDiff.height);b=h.containerElement.get(0)==h.element.parent().get(0);f=/relative|absolute/.test(h.containerElement.css("position"));if(b&&f)g-=h.parentData.left;if(g+h.size.width>=h.parentData.width){h.size.width=h.parentData.width-g;if(e)h.size.height=h.size.width/h.aspectRatio}if(i+h.size.height>=h.parentData.height){h.size.height=h.parentData.height-i;if(e)h.size.width=h.size.height*h.aspectRatio}},stop:function(){var e=a(this).data("resizable"),h=e.options,g=e.containerOffset,i=e.containerPosition,
-b=e.containerElement,f=a(e.helper),j=f.offset(),l=f.outerWidth()-e.sizeDiff.width;f=f.outerHeight()-e.sizeDiff.height;e._helper&&!h.animate&&/relative/.test(b.css("position"))&&a(this).css({left:j.left-i.left-g.left,width:l,height:f});e._helper&&!h.animate&&/static/.test(b.css("position"))&&a(this).css({left:j.left-i.left-g.left,width:l,height:f})}});a.ui.plugin.add("resizable","ghost",{start:function(){var e=a(this).data("resizable"),h=e.options,g=e.size;e.ghost=e.originalElement.clone();e.ghost.css({opacity:0.25,
-display:"block",position:"relative",height:g.height,width:g.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof h.ghost=="string"?h.ghost:"");e.ghost.appendTo(e.helper)},resize:function(){var e=a(this).data("resizable");e.ghost&&e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})},stop:function(){var e=a(this).data("resizable");e.ghost&&e.helper&&e.helper.get(0).removeChild(e.ghost.get(0))}});a.ui.plugin.add("resizable","grid",{resize:function(){var e=
-a(this).data("resizable"),h=e.options,g=e.size,i=e.originalSize,b=e.originalPosition,f=e.axis;h.grid=typeof h.grid=="number"?[h.grid,h.grid]:h.grid;var j=Math.round((g.width-i.width)/(h.grid[0]||1))*(h.grid[0]||1);h=Math.round((g.height-i.height)/(h.grid[1]||1))*(h.grid[1]||1);if(/^(se|s|e)$/.test(f)){e.size.width=i.width+j;e.size.height=i.height+h}else if(/^(ne)$/.test(f)){e.size.width=i.width+j;e.size.height=i.height+h;e.position.top=b.top-h}else{if(/^(sw)$/.test(f)){e.size.width=i.width+j;e.size.height=
-i.height+h}else{e.size.width=i.width+j;e.size.height=i.height+h;e.position.top=b.top-h}e.position.left=b.left-j}}});var d=function(e){return parseInt(e,10)||0},c=function(e){return!isNaN(parseInt(e,10))}})(jQuery);
-(function(a){a.widget("ui.selectable",a.ui.mouse,{options:{appendTo:"body",autoRefresh:true,distance:0,filter:"*",tolerance:"touch"},_create:function(){var d=this;this.element.addClass("ui-selectable");this.dragged=false;var c;this.refresh=function(){c=a(d.options.filter,d.element[0]);c.each(function(){var e=a(this),h=e.offset();a.data(this,"selectable-item",{element:this,$element:e,left:h.left,top:h.top,right:h.left+e.outerWidth(),bottom:h.top+e.outerHeight(),startselected:false,selected:e.hasClass("ui-selected"),
-selecting:e.hasClass("ui-selecting"),unselecting:e.hasClass("ui-unselecting")})})};this.refresh();this.selectees=c.addClass("ui-selectee");this._mouseInit();this.helper=a("<div class='ui-selectable-helper'></div>")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item");this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy();return this},_mouseStart:function(d){var c=this;this.opos=[d.pageX,
-d.pageY];if(!this.options.disabled){var e=this.options;this.selectees=a(e.filter,this.element[0]);this._trigger("start",d);a(e.appendTo).append(this.helper);this.helper.css({left:d.clientX,top:d.clientY,width:0,height:0});e.autoRefresh&&this.refresh();this.selectees.filter(".ui-selected").each(function(){var h=a.data(this,"selectable-item");h.startselected=true;if(!d.metaKey){h.$element.removeClass("ui-selected");h.selected=false;h.$element.addClass("ui-unselecting");h.unselecting=true;c._trigger("unselecting",
-d,{unselecting:h.element})}});a(d.target).parents().andSelf().each(function(){var h=a.data(this,"selectable-item");if(h){var g=!d.metaKey||!h.$element.hasClass("ui-selected");h.$element.removeClass(g?"ui-unselecting":"ui-selected").addClass(g?"ui-selecting":"ui-unselecting");h.unselecting=!g;h.selecting=g;(h.selected=g)?c._trigger("selecting",d,{selecting:h.element}):c._trigger("unselecting",d,{unselecting:h.element});return false}})}},_mouseDrag:function(d){var c=this;this.dragged=true;if(!this.options.disabled){var e=
-this.options,h=this.opos[0],g=this.opos[1],i=d.pageX,b=d.pageY;if(h>i){var f=i;i=h;h=f}if(g>b){f=b;b=g;g=f}this.helper.css({left:h,top:g,width:i-h,height:b-g});this.selectees.each(function(){var j=a.data(this,"selectable-item");if(!(!j||j.element==c.element[0])){var l=false;if(e.tolerance=="touch")l=!(j.left>i||j.right<h||j.top>b||j.bottom<g);else if(e.tolerance=="fit")l=j.left>h&&j.right<i&&j.top>g&&j.bottom<b;if(l){if(j.selected){j.$element.removeClass("ui-selected");j.selected=false}if(j.unselecting){j.$element.removeClass("ui-unselecting");
-j.unselecting=false}if(!j.selecting){j.$element.addClass("ui-selecting");j.selecting=true;c._trigger("selecting",d,{selecting:j.element})}}else{if(j.selecting)if(d.metaKey&&j.startselected){j.$element.removeClass("ui-selecting");j.selecting=false;j.$element.addClass("ui-selected");j.selected=true}else{j.$element.removeClass("ui-selecting");j.selecting=false;if(j.startselected){j.$element.addClass("ui-unselecting");j.unselecting=true}c._trigger("unselecting",d,{unselecting:j.element})}if(j.selected)if(!d.metaKey&&
-!j.startselected){j.$element.removeClass("ui-selected");j.selected=false;j.$element.addClass("ui-unselecting");j.unselecting=true;c._trigger("unselecting",d,{unselecting:j.element})}}}});return false}},_mouseStop:function(d){var c=this;this.dragged=false;a(".ui-unselecting",this.element[0]).each(function(){var e=a.data(this,"selectable-item");e.$element.removeClass("ui-unselecting");e.unselecting=false;e.startselected=false;c._trigger("unselected",d,{unselected:e.element})});a(".ui-selecting",this.element[0]).each(function(){var e=
-a.data(this,"selectable-item");e.$element.removeClass("ui-selecting").addClass("ui-selected");e.selecting=false;e.selected=true;e.startselected=true;c._trigger("selected",d,{selected:e.element})});this._trigger("stop",d);this.helper.remove();return false}});a.extend(a.ui.selectable,{version:"1.8.14"})})(jQuery);
-(function(a){a.widget("ui.sortable",a.ui.mouse,{widgetEventPrefix:"sort",options:{appendTo:"parent",axis:false,connectWith:false,containment:false,cursor:"auto",cursorAt:false,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1E3},_create:function(){var d=this.options;this.containerCache={};this.element.addClass("ui-sortable");
-this.refresh();this.floating=this.items.length?d.axis==="x"||/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var d=this.items.length-1;d>=0;d--)this.items[d].item.removeData("sortable-item");return this},_setOption:function(d,c){if(d===
-"disabled"){this.options[d]=c;this.widget()[c?"addClass":"removeClass"]("ui-sortable-disabled")}else a.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(d,c){if(this.reverting)return false;if(this.options.disabled||this.options.type=="static")return false;this._refreshItems(d);var e=null,h=this;a(d.target).parents().each(function(){if(a.data(this,"sortable-item")==h){e=a(this);return false}});if(a.data(d.target,"sortable-item")==h)e=a(d.target);if(!e)return false;if(this.options.handle&&
-!c){var g=false;a(this.options.handle,e).find("*").andSelf().each(function(){if(this==d.target)g=true});if(!g)return false}this.currentItem=e;this._removeCurrentsFromItems();return true},_mouseStart:function(d,c,e){c=this.options;var h=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(d);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,
-left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");a.extend(this.offset,{click:{left:d.pageX-this.offset.left,top:d.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(d);this.originalPageX=d.pageX;this.originalPageY=d.pageY;c.cursorAt&&this._adjustOffsetFromHelper(c.cursorAt);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};
-this.helper[0]!=this.currentItem[0]&&this.currentItem.hide();this._createPlaceholder();c.containment&&this._setContainment();if(c.cursor){if(a("body").css("cursor"))this._storedCursor=a("body").css("cursor");a("body").css("cursor",c.cursor)}if(c.opacity){if(this.helper.css("opacity"))this._storedOpacity=this.helper.css("opacity");this.helper.css("opacity",c.opacity)}if(c.zIndex){if(this.helper.css("zIndex"))this._storedZIndex=this.helper.css("zIndex");this.helper.css("zIndex",c.zIndex)}if(this.scrollParent[0]!=
-document&&this.scrollParent[0].tagName!="HTML")this.overflowOffset=this.scrollParent.offset();this._trigger("start",d,this._uiHash());this._preserveHelperProportions||this._cacheHelperProportions();if(!e)for(e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("activate",d,h._uiHash(this));if(a.ui.ddmanager)a.ui.ddmanager.current=this;a.ui.ddmanager&&!c.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,d);this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(d);
-return true},_mouseDrag:function(d){this.position=this._generatePosition(d);this.positionAbs=this._convertPositionTo("absolute");if(!this.lastPositionAbs)this.lastPositionAbs=this.positionAbs;if(this.options.scroll){var c=this.options,e=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if(this.overflowOffset.top+this.scrollParent[0].offsetHeight-d.pageY<c.scrollSensitivity)this.scrollParent[0].scrollTop=e=this.scrollParent[0].scrollTop+c.scrollSpeed;else if(d.pageY-this.overflowOffset.top<
-c.scrollSensitivity)this.scrollParent[0].scrollTop=e=this.scrollParent[0].scrollTop-c.scrollSpeed;if(this.overflowOffset.left+this.scrollParent[0].offsetWidth-d.pageX<c.scrollSensitivity)this.scrollParent[0].scrollLeft=e=this.scrollParent[0].scrollLeft+c.scrollSpeed;else if(d.pageX-this.overflowOffset.left<c.scrollSensitivity)this.scrollParent[0].scrollLeft=e=this.scrollParent[0].scrollLeft-c.scrollSpeed}else{if(d.pageY-a(document).scrollTop()<c.scrollSensitivity)e=a(document).scrollTop(a(document).scrollTop()-
-c.scrollSpeed);else if(a(window).height()-(d.pageY-a(document).scrollTop())<c.scrollSensitivity)e=a(document).scrollTop(a(document).scrollTop()+c.scrollSpeed);if(d.pageX-a(document).scrollLeft()<c.scrollSensitivity)e=a(document).scrollLeft(a(document).scrollLeft()-c.scrollSpeed);else if(a(window).width()-(d.pageX-a(document).scrollLeft())<c.scrollSensitivity)e=a(document).scrollLeft(a(document).scrollLeft()+c.scrollSpeed)}e!==false&&a.ui.ddmanager&&!c.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,
-d)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(c=this.items.length-1;c>=0;c--){e=this.items[c];var h=e.item[0],g=this._intersectsWithPointer(e);if(g)if(h!=this.currentItem[0]&&this.placeholder[g==1?"next":"prev"]()[0]!=h&&!a.ui.contains(this.placeholder[0],h)&&(this.options.type=="semi-dynamic"?!a.ui.contains(this.element[0],
-h):true)){this.direction=g==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(e))this._rearrange(d,e);else break;this._trigger("change",d,this._uiHash());break}}this._contactContainers(d);a.ui.ddmanager&&a.ui.ddmanager.drag(this,d);this._trigger("sort",d,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(d,c){if(d){a.ui.ddmanager&&!this.options.dropBehaviour&&a.ui.ddmanager.drop(this,d);if(this.options.revert){var e=this;c=e.placeholder.offset();
-e.reverting=true;a(this.helper).animate({left:c.left-this.offset.parent.left-e.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:c.top-this.offset.parent.top-e.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){e._clear(d)})}else this._clear(d,c);return false}},cancel:function(){var d=this;if(this.dragging){this._mouseUp({target:null});this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):
-this.currentItem.show();for(var c=this.containers.length-1;c>=0;c--){this.containers[c]._trigger("deactivate",null,d._uiHash(this));if(this.containers[c].containerCache.over){this.containers[c]._trigger("out",null,d._uiHash(this));this.containers[c].containerCache.over=0}}}if(this.placeholder){this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove();a.extend(this,{helper:null,
-dragging:false,reverting:false,_noFinalSort:null});this.domPosition.prev?a(this.domPosition.prev).after(this.currentItem):a(this.domPosition.parent).prepend(this.currentItem)}return this},serialize:function(d){var c=this._getItemsAsjQuery(d&&d.connected),e=[];d=d||{};a(c).each(function(){var h=(a(d.item||this).attr(d.attribute||"id")||"").match(d.expression||/(.+)[-=_](.+)/);if(h)e.push((d.key||h[1]+"[]")+"="+(d.key&&d.expression?h[1]:h[2]))});!e.length&&d.key&&e.push(d.key+"=");return e.join("&")},
-toArray:function(d){var c=this._getItemsAsjQuery(d&&d.connected),e=[];d=d||{};c.each(function(){e.push(a(d.item||this).attr(d.attribute||"id")||"")});return e},_intersectsWith:function(d){var c=this.positionAbs.left,e=c+this.helperProportions.width,h=this.positionAbs.top,g=h+this.helperProportions.height,i=d.left,b=i+d.width,f=d.top,j=f+d.height,l=this.offset.click.top,o=this.offset.click.left;l=h+l>f&&h+l<j&&c+o>i&&c+o<b;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||
-this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>d[this.floating?"width":"height"]?l:i<c+this.helperProportions.width/2&&e-this.helperProportions.width/2<b&&f<h+this.helperProportions.height/2&&g-this.helperProportions.height/2<j},_intersectsWithPointer:function(d){var c=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,d.top,d.height);d=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,d.left,d.width);c=c&&d;d=this._getDragVerticalDirection();
-var e=this._getDragHorizontalDirection();if(!c)return false;return this.floating?e&&e=="right"||d=="down"?2:1:d&&(d=="down"?2:1)},_intersectsWithSides:function(d){var c=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,d.top+d.height/2,d.height);d=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,d.left+d.width/2,d.width);var e=this._getDragVerticalDirection(),h=this._getDragHorizontalDirection();return this.floating&&h?h=="right"&&d||h=="left"&&!d:e&&(e=="down"&&c||e=="up"&&!c)},
-_getDragVerticalDirection:function(){var d=this.positionAbs.top-this.lastPositionAbs.top;return d!=0&&(d>0?"down":"up")},_getDragHorizontalDirection:function(){var d=this.positionAbs.left-this.lastPositionAbs.left;return d!=0&&(d>0?"right":"left")},refresh:function(d){this._refreshItems(d);this.refreshPositions();return this},_connectWith:function(){var d=this.options;return d.connectWith.constructor==String?[d.connectWith]:d.connectWith},_getItemsAsjQuery:function(d){var c=[],e=[],h=this._connectWith();
-if(h&&d)for(d=h.length-1;d>=0;d--)for(var g=a(h[d]),i=g.length-1;i>=0;i--){var b=a.data(g[i],"sortable");if(b&&b!=this&&!b.options.disabled)e.push([a.isFunction(b.options.items)?b.options.items.call(b.element):a(b.options.items,b.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),b])}e.push([a.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):a(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),
-this]);for(d=e.length-1;d>=0;d--)e[d][0].each(function(){c.push(this)});return a(c)},_removeCurrentsFromItems:function(){for(var d=this.currentItem.find(":data(sortable-item)"),c=0;c<this.items.length;c++)for(var e=0;e<d.length;e++)d[e]==this.items[c].item[0]&&this.items.splice(c,1)},_refreshItems:function(d){this.items=[];this.containers=[this];var c=this.items,e=[[a.isFunction(this.options.items)?this.options.items.call(this.element[0],d,{item:this.currentItem}):a(this.options.items,this.element),
-this]],h=this._connectWith();if(h)for(var g=h.length-1;g>=0;g--)for(var i=a(h[g]),b=i.length-1;b>=0;b--){var f=a.data(i[b],"sortable");if(f&&f!=this&&!f.options.disabled){e.push([a.isFunction(f.options.items)?f.options.items.call(f.element[0],d,{item:this.currentItem}):a(f.options.items,f.element),f]);this.containers.push(f)}}for(g=e.length-1;g>=0;g--){d=e[g][1];h=e[g][0];b=0;for(i=h.length;b<i;b++){f=a(h[b]);f.data("sortable-item",d);c.push({item:f,instance:d,width:0,height:0,left:0,top:0})}}},refreshPositions:function(d){if(this.offsetParent&&
-this.helper)this.offset.parent=this._getParentOffset();for(var c=this.items.length-1;c>=0;c--){var e=this.items[c];if(!(e.instance!=this.currentContainer&&this.currentContainer&&e.item[0]!=this.currentItem[0])){var h=this.options.toleranceElement?a(this.options.toleranceElement,e.item):e.item;if(!d){e.width=h.outerWidth();e.height=h.outerHeight()}h=h.offset();e.left=h.left;e.top=h.top}}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(c=
-this.containers.length-1;c>=0;c--){h=this.containers[c].element.offset();this.containers[c].containerCache.left=h.left;this.containers[c].containerCache.top=h.top;this.containers[c].containerCache.width=this.containers[c].element.outerWidth();this.containers[c].containerCache.height=this.containers[c].element.outerHeight()}return this},_createPlaceholder:function(d){var c=d||this,e=c.options;if(!e.placeholder||e.placeholder.constructor==String){var h=e.placeholder;e.placeholder={element:function(){var g=
-a(document.createElement(c.currentItem[0].nodeName)).addClass(h||c.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!h)g.style.visibility="hidden";return g},update:function(g,i){if(!(h&&!e.forcePlaceholderSize)){i.height()||i.height(c.currentItem.innerHeight()-parseInt(c.currentItem.css("paddingTop")||0,10)-parseInt(c.currentItem.css("paddingBottom")||0,10));i.width()||i.width(c.currentItem.innerWidth()-parseInt(c.currentItem.css("paddingLeft")||0,10)-parseInt(c.currentItem.css("paddingRight")||
-0,10))}}}}c.placeholder=a(e.placeholder.element.call(c.element,c.currentItem));c.currentItem.after(c.placeholder);e.placeholder.update(c,c.placeholder)},_contactContainers:function(d){for(var c=null,e=null,h=this.containers.length-1;h>=0;h--)if(!a.ui.contains(this.currentItem[0],this.containers[h].element[0]))if(this._intersectsWith(this.containers[h].containerCache)){if(!(c&&a.ui.contains(this.containers[h].element[0],c.element[0]))){c=this.containers[h];e=h}}else if(this.containers[h].containerCache.over){this.containers[h]._trigger("out",
-d,this._uiHash(this));this.containers[h].containerCache.over=0}if(c)if(this.containers.length===1){this.containers[e]._trigger("over",d,this._uiHash(this));this.containers[e].containerCache.over=1}else if(this.currentContainer!=this.containers[e]){c=1E4;h=null;for(var g=this.positionAbs[this.containers[e].floating?"left":"top"],i=this.items.length-1;i>=0;i--)if(a.ui.contains(this.containers[e].element[0],this.items[i].item[0])){var b=this.items[i][this.containers[e].floating?"left":"top"];if(Math.abs(b-
-g)<c){c=Math.abs(b-g);h=this.items[i]}}if(h||this.options.dropOnEmpty){this.currentContainer=this.containers[e];h?this._rearrange(d,h,null,true):this._rearrange(d,null,this.containers[e].element,true);this._trigger("change",d,this._uiHash());this.containers[e]._trigger("change",d,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder);this.containers[e]._trigger("over",d,this._uiHash(this));this.containers[e].containerCache.over=1}}},_createHelper:function(d){var c=
-this.options;d=a.isFunction(c.helper)?a(c.helper.apply(this.element[0],[d,this.currentItem])):c.helper=="clone"?this.currentItem.clone():this.currentItem;d.parents("body").length||a(c.appendTo!="parent"?c.appendTo:this.currentItem[0].parentNode)[0].appendChild(d[0]);if(d[0]==this.currentItem[0])this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")};if(d[0].style.width==
-""||c.forceHelperSize)d.width(this.currentItem.width());if(d[0].style.height==""||c.forceHelperSize)d.height(this.currentItem.height());return d},_adjustOffsetFromHelper:function(d){if(typeof d=="string")d=d.split(" ");if(a.isArray(d))d={left:+d[0],top:+d[1]||0};if("left"in d)this.offset.click.left=d.left+this.margins.left;if("right"in d)this.offset.click.left=this.helperProportions.width-d.right+this.margins.left;if("top"in d)this.offset.click.top=d.top+this.margins.top;if("bottom"in d)this.offset.click.top=
-this.helperProportions.height-d.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var d=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0])){d.left+=this.scrollParent.scrollLeft();d.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&a.browser.msie)d=
-{top:0,left:0};return{top:d.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:d.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var d=this.currentItem.position();return{top:d.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:d.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),
-10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var d=this.options;if(d.containment=="parent")d.containment=this.helper[0].parentNode;if(d.containment=="document"||d.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,a(d.containment=="document"?
-document:window).width()-this.helperProportions.width-this.margins.left,(a(d.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(d.containment)){var c=a(d.containment)[0];d=a(d.containment).offset();var e=a(c).css("overflow")!="hidden";this.containment=[d.left+(parseInt(a(c).css("borderLeftWidth"),10)||0)+(parseInt(a(c).css("paddingLeft"),10)||0)-this.margins.left,d.top+(parseInt(a(c).css("borderTopWidth"),
-10)||0)+(parseInt(a(c).css("paddingTop"),10)||0)-this.margins.top,d.left+(e?Math.max(c.scrollWidth,c.offsetWidth):c.offsetWidth)-(parseInt(a(c).css("borderLeftWidth"),10)||0)-(parseInt(a(c).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,d.top+(e?Math.max(c.scrollHeight,c.offsetHeight):c.offsetHeight)-(parseInt(a(c).css("borderTopWidth"),10)||0)-(parseInt(a(c).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(d,c){if(!c)c=
-this.position;d=d=="absolute"?1:-1;var e=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,h=/(html|body)/i.test(e[0].tagName);return{top:c.top+this.offset.relative.top*d+this.offset.parent.top*d-(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():h?0:e.scrollTop())*d),left:c.left+this.offset.relative.left*d+this.offset.parent.left*d-(a.browser.safari&&
-this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():h?0:e.scrollLeft())*d)}},_generatePosition:function(d){var c=this.options,e=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,h=/(html|body)/i.test(e[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0]))this.offset.relative=this._getRelativeOffset();
-var g=d.pageX,i=d.pageY;if(this.originalPosition){if(this.containment){if(d.pageX-this.offset.click.left<this.containment[0])g=this.containment[0]+this.offset.click.left;if(d.pageY-this.offset.click.top<this.containment[1])i=this.containment[1]+this.offset.click.top;if(d.pageX-this.offset.click.left>this.containment[2])g=this.containment[2]+this.offset.click.left;if(d.pageY-this.offset.click.top>this.containment[3])i=this.containment[3]+this.offset.click.top}if(c.grid){i=this.originalPageY+Math.round((i-
-this.originalPageY)/c.grid[1])*c.grid[1];i=this.containment?!(i-this.offset.click.top<this.containment[1]||i-this.offset.click.top>this.containment[3])?i:!(i-this.offset.click.top<this.containment[1])?i-c.grid[1]:i+c.grid[1]:i;g=this.originalPageX+Math.round((g-this.originalPageX)/c.grid[0])*c.grid[0];g=this.containment?!(g-this.offset.click.left<this.containment[0]||g-this.offset.click.left>this.containment[2])?g:!(g-this.offset.click.left<this.containment[0])?g-c.grid[0]:g+c.grid[0]:g}}return{top:i-
-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(a.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():h?0:e.scrollTop()),left:g-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():h?0:e.scrollLeft())}},_rearrange:function(d,c,e,h){e?e[0].appendChild(this.placeholder[0]):c.item[0].parentNode.insertBefore(this.placeholder[0],
-this.direction=="down"?c.item[0]:c.item[0].nextSibling);this.counter=this.counter?++this.counter:1;var g=this,i=this.counter;window.setTimeout(function(){i==g.counter&&g.refreshPositions(!h)},0)},_clear:function(d,c){this.reverting=false;var e=[];!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem);this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var h in this._storedCSS)if(this._storedCSS[h]=="auto"||this._storedCSS[h]=="static")this._storedCSS[h]=
-"";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!c&&e.push(function(g){this._trigger("receive",g,this._uiHash(this.fromOutside))});if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!c)e.push(function(g){this._trigger("update",g,this._uiHash())});if(!a.ui.contains(this.element[0],this.currentItem[0])){c||e.push(function(g){this._trigger("remove",
-g,this._uiHash())});for(h=this.containers.length-1;h>=0;h--)if(a.ui.contains(this.containers[h].element[0],this.currentItem[0])&&!c){e.push(function(g){return function(i){g._trigger("receive",i,this._uiHash(this))}}.call(this,this.containers[h]));e.push(function(g){return function(i){g._trigger("update",i,this._uiHash(this))}}.call(this,this.containers[h]))}}for(h=this.containers.length-1;h>=0;h--){c||e.push(function(g){return function(i){g._trigger("deactivate",i,this._uiHash(this))}}.call(this,
-this.containers[h]));if(this.containers[h].containerCache.over){e.push(function(g){return function(i){g._trigger("out",i,this._uiHash(this))}}.call(this,this.containers[h]));this.containers[h].containerCache.over=0}}this._storedCursor&&a("body").css("cursor",this._storedCursor);this._storedOpacity&&this.helper.css("opacity",this._storedOpacity);if(this._storedZIndex)this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex);this.dragging=false;if(this.cancelHelperRemoval){if(!c){this._trigger("beforeStop",
-d,this._uiHash());for(h=0;h<e.length;h++)e[h].call(this,d);this._trigger("stop",d,this._uiHash())}return false}c||this._trigger("beforeStop",d,this._uiHash());this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.helper[0]!=this.currentItem[0]&&this.helper.remove();this.helper=null;if(!c){for(h=0;h<e.length;h++)e[h].call(this,d);this._trigger("stop",d,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){a.Widget.prototype._trigger.apply(this,arguments)===false&&this.cancel()},
-_uiHash:function(d){var c=d||this;return{helper:c.helper,placeholder:c.placeholder||a([]),position:c.position,originalPosition:c.originalPosition,offset:c.positionAbs,item:c.currentItem,sender:d?d.element:null}}});a.extend(a.ui.sortable,{version:"1.8.14"})})(jQuery);
-jQuery.effects||function(a,d){function c(n){var k;if(n&&n.constructor==Array&&n.length==3)return n;if(k=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(n))return[parseInt(k[1],10),parseInt(k[2],10),parseInt(k[3],10)];if(k=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(n))return[parseFloat(k[1])*2.55,parseFloat(k[2])*2.55,parseFloat(k[3])*2.55];if(k=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(n))return[parseInt(k[1],
-16),parseInt(k[2],16),parseInt(k[3],16)];if(k=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(n))return[parseInt(k[1]+k[1],16),parseInt(k[2]+k[2],16),parseInt(k[3]+k[3],16)];if(/rgba\(0, 0, 0, 0\)/.exec(n))return j.transparent;return j[a.trim(n).toLowerCase()]}function e(n,k){var m;do{m=a.curCSS(n,k);if(m!=""&&m!="transparent"||a.nodeName(n,"body"))break;k="backgroundColor"}while(n=n.parentNode);return c(m)}function h(){var n=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,
-k={},m,p;if(n&&n.length&&n[0]&&n[n[0]])for(var q=n.length;q--;){m=n[q];if(typeof n[m]=="string"){p=m.replace(/\-(\w)/g,function(s,r){return r.toUpperCase()});k[p]=n[m]}}else for(m in n)if(typeof n[m]==="string")k[m]=n[m];return k}function g(n){var k,m;for(k in n){m=n[k];if(m==null||a.isFunction(m)||k in o||/scrollbar/.test(k)||!/color/i.test(k)&&isNaN(parseFloat(m)))delete n[k]}return n}function i(n,k){var m={_:0},p;for(p in k)if(n[p]!=k[p])m[p]=k[p];return m}function b(n,k,m,p){if(typeof n=="object"){p=
-k;m=null;k=n;n=k.effect}if(a.isFunction(k)){p=k;m=null;k={}}if(typeof k=="number"||a.fx.speeds[k]){p=m;m=k;k={}}if(a.isFunction(m)){p=m;m=null}k=k||{};m=m||k.duration;m=a.fx.off?0:typeof m=="number"?m:m in a.fx.speeds?a.fx.speeds[m]:a.fx.speeds._default;p=p||k.complete;return[n,k,m,p]}function f(n){if(!n||typeof n==="number"||a.fx.speeds[n])return true;if(typeof n==="string"&&!a.effects[n])return true;return false}a.effects={};a.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor",
-"borderTopColor","borderColor","color","outlineColor"],function(n,k){a.fx.step[k]=function(m){if(!m.colorInit){m.start=e(m.elem,k);m.end=c(m.end);m.colorInit=true}m.elem.style[k]="rgb("+Math.max(Math.min(parseInt(m.pos*(m.end[0]-m.start[0])+m.start[0],10),255),0)+","+Math.max(Math.min(parseInt(m.pos*(m.end[1]-m.start[1])+m.start[1],10),255),0)+","+Math.max(Math.min(parseInt(m.pos*(m.end[2]-m.start[2])+m.start[2],10),255),0)+")"}});var j={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,
-0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,
-211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},l=["add","remove","toggle"],o={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};a.effects.animateClass=function(n,k,m,
-p){if(a.isFunction(m)){p=m;m=null}return this.queue(function(){var q=a(this),s=q.attr("style")||" ",r=g(h.call(this)),u,v=q.attr("class");a.each(l,function(w,x){n[x]&&q[x+"Class"](n[x])});u=g(h.call(this));q.attr("class",v);q.animate(i(r,u),{queue:false,duration:k,easing:m,complete:function(){a.each(l,function(w,x){n[x]&&q[x+"Class"](n[x])});if(typeof q.attr("style")=="object"){q.attr("style").cssText="";q.attr("style").cssText=s}else q.attr("style",s);p&&p.apply(this,arguments);a.dequeue(this)}})})};
-a.fn.extend({_addClass:a.fn.addClass,addClass:function(n,k,m,p){return k?a.effects.animateClass.apply(this,[{add:n},k,m,p]):this._addClass(n)},_removeClass:a.fn.removeClass,removeClass:function(n,k,m,p){return k?a.effects.animateClass.apply(this,[{remove:n},k,m,p]):this._removeClass(n)},_toggleClass:a.fn.toggleClass,toggleClass:function(n,k,m,p,q){return typeof k=="boolean"||k===d?m?a.effects.animateClass.apply(this,[k?{add:n}:{remove:n},m,p,q]):this._toggleClass(n,k):a.effects.animateClass.apply(this,
-[{toggle:n},k,m,p])},switchClass:function(n,k,m,p,q){return a.effects.animateClass.apply(this,[{add:k,remove:n},m,p,q])}});a.extend(a.effects,{version:"1.8.14",save:function(n,k){for(var m=0;m<k.length;m++)k[m]!==null&&n.data("ec.storage."+k[m],n[0].style[k[m]])},restore:function(n,k){for(var m=0;m<k.length;m++)k[m]!==null&&n.css(k[m],n.data("ec.storage."+k[m]))},setMode:function(n,k){if(k=="toggle")k=n.is(":hidden")?"show":"hide";return k},getBaseline:function(n,k){var m;switch(n[0]){case "top":m=
-0;break;case "middle":m=0.5;break;case "bottom":m=1;break;default:m=n[0]/k.height}switch(n[1]){case "left":n=0;break;case "center":n=0.5;break;case "right":n=1;break;default:n=n[1]/k.width}return{x:n,y:m}},createWrapper:function(n){if(n.parent().is(".ui-effects-wrapper"))return n.parent();var k={width:n.outerWidth(true),height:n.outerHeight(true),"float":n.css("float")},m=a("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0});
-n.wrap(m);m=n.parent();if(n.css("position")=="static"){m.css({position:"relative"});n.css({position:"relative"})}else{a.extend(k,{position:n.css("position"),zIndex:n.css("z-index")});a.each(["top","left","bottom","right"],function(p,q){k[q]=n.css(q);if(isNaN(parseInt(k[q],10)))k[q]="auto"});n.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})}return m.css(k).show()},removeWrapper:function(n){if(n.parent().is(".ui-effects-wrapper"))return n.parent().replaceWith(n);return n},setTransition:function(n,
-k,m,p){p=p||{};a.each(k,function(q,s){unit=n.cssUnit(s);if(unit[0]>0)p[s]=unit[0]*m+unit[1]});return p}});a.fn.extend({effect:function(n){var k=b.apply(this,arguments),m={options:k[1],duration:k[2],callback:k[3]};k=m.options.mode;var p=a.effects[n];if(a.fx.off||!p)return k?this[k](m.duration,m.callback):this.each(function(){m.callback&&m.callback.call(this)});return p.call(this,m)},_show:a.fn.show,show:function(n){if(f(n))return this._show.apply(this,arguments);else{var k=b.apply(this,arguments);
-k[1].mode="show";return this.effect.apply(this,k)}},_hide:a.fn.hide,hide:function(n){if(f(n))return this._hide.apply(this,arguments);else{var k=b.apply(this,arguments);k[1].mode="hide";return this.effect.apply(this,k)}},__toggle:a.fn.toggle,toggle:function(n){if(f(n)||typeof n==="boolean"||a.isFunction(n))return this.__toggle.apply(this,arguments);else{var k=b.apply(this,arguments);k[1].mode="toggle";return this.effect.apply(this,k)}},cssUnit:function(n){var k=this.css(n),m=[];a.each(["em","px","%",
-"pt"],function(p,q){if(k.indexOf(q)>0)m=[parseFloat(k),q]});return m}});a.easing.jswing=a.easing.swing;a.extend(a.easing,{def:"easeOutQuad",swing:function(n,k,m,p,q){return a.easing[a.easing.def](n,k,m,p,q)},easeInQuad:function(n,k,m,p,q){return p*(k/=q)*k+m},easeOutQuad:function(n,k,m,p,q){return-p*(k/=q)*(k-2)+m},easeInOutQuad:function(n,k,m,p,q){if((k/=q/2)<1)return p/2*k*k+m;return-p/2*(--k*(k-2)-1)+m},easeInCubic:function(n,k,m,p,q){return p*(k/=q)*k*k+m},easeOutCubic:function(n,k,m,p,q){return p*
-((k=k/q-1)*k*k+1)+m},easeInOutCubic:function(n,k,m,p,q){if((k/=q/2)<1)return p/2*k*k*k+m;return p/2*((k-=2)*k*k+2)+m},easeInQuart:function(n,k,m,p,q){return p*(k/=q)*k*k*k+m},easeOutQuart:function(n,k,m,p,q){return-p*((k=k/q-1)*k*k*k-1)+m},easeInOutQuart:function(n,k,m,p,q){if((k/=q/2)<1)return p/2*k*k*k*k+m;return-p/2*((k-=2)*k*k*k-2)+m},easeInQuint:function(n,k,m,p,q){return p*(k/=q)*k*k*k*k+m},easeOutQuint:function(n,k,m,p,q){return p*((k=k/q-1)*k*k*k*k+1)+m},easeInOutQuint:function(n,k,m,p,q){if((k/=
-q/2)<1)return p/2*k*k*k*k*k+m;return p/2*((k-=2)*k*k*k*k+2)+m},easeInSine:function(n,k,m,p,q){return-p*Math.cos(k/q*(Math.PI/2))+p+m},easeOutSine:function(n,k,m,p,q){return p*Math.sin(k/q*(Math.PI/2))+m},easeInOutSine:function(n,k,m,p,q){return-p/2*(Math.cos(Math.PI*k/q)-1)+m},easeInExpo:function(n,k,m,p,q){return k==0?m:p*Math.pow(2,10*(k/q-1))+m},easeOutExpo:function(n,k,m,p,q){return k==q?m+p:p*(-Math.pow(2,-10*k/q)+1)+m},easeInOutExpo:function(n,k,m,p,q){if(k==0)return m;if(k==q)return m+p;if((k/=
-q/2)<1)return p/2*Math.pow(2,10*(k-1))+m;return p/2*(-Math.pow(2,-10*--k)+2)+m},easeInCirc:function(n,k,m,p,q){return-p*(Math.sqrt(1-(k/=q)*k)-1)+m},easeOutCirc:function(n,k,m,p,q){return p*Math.sqrt(1-(k=k/q-1)*k)+m},easeInOutCirc:function(n,k,m,p,q){if((k/=q/2)<1)return-p/2*(Math.sqrt(1-k*k)-1)+m;return p/2*(Math.sqrt(1-(k-=2)*k)+1)+m},easeInElastic:function(n,k,m,p,q){n=1.70158;var s=0,r=p;if(k==0)return m;if((k/=q)==1)return m+p;s||(s=q*0.3);if(r<Math.abs(p)){r=p;n=s/4}else n=s/(2*Math.PI)*Math.asin(p/
-r);return-(r*Math.pow(2,10*(k-=1))*Math.sin((k*q-n)*2*Math.PI/s))+m},easeOutElastic:function(n,k,m,p,q){n=1.70158;var s=0,r=p;if(k==0)return m;if((k/=q)==1)return m+p;s||(s=q*0.3);if(r<Math.abs(p)){r=p;n=s/4}else n=s/(2*Math.PI)*Math.asin(p/r);return r*Math.pow(2,-10*k)*Math.sin((k*q-n)*2*Math.PI/s)+p+m},easeInOutElastic:function(n,k,m,p,q){n=1.70158;var s=0,r=p;if(k==0)return m;if((k/=q/2)==2)return m+p;s||(s=q*0.3*1.5);if(r<Math.abs(p)){r=p;n=s/4}else n=s/(2*Math.PI)*Math.asin(p/r);if(k<1)return-0.5*
-r*Math.pow(2,10*(k-=1))*Math.sin((k*q-n)*2*Math.PI/s)+m;return r*Math.pow(2,-10*(k-=1))*Math.sin((k*q-n)*2*Math.PI/s)*0.5+p+m},easeInBack:function(n,k,m,p,q,s){if(s==d)s=1.70158;return p*(k/=q)*k*((s+1)*k-s)+m},easeOutBack:function(n,k,m,p,q,s){if(s==d)s=1.70158;return p*((k=k/q-1)*k*((s+1)*k+s)+1)+m},easeInOutBack:function(n,k,m,p,q,s){if(s==d)s=1.70158;if((k/=q/2)<1)return p/2*k*k*(((s*=1.525)+1)*k-s)+m;return p/2*((k-=2)*k*(((s*=1.525)+1)*k+s)+2)+m},easeInBounce:function(n,k,m,p,q){return p-a.easing.easeOutBounce(n,
-q-k,0,p,q)+m},easeOutBounce:function(n,k,m,p,q){return(k/=q)<1/2.75?p*7.5625*k*k+m:k<2/2.75?p*(7.5625*(k-=1.5/2.75)*k+0.75)+m:k<2.5/2.75?p*(7.5625*(k-=2.25/2.75)*k+0.9375)+m:p*(7.5625*(k-=2.625/2.75)*k+0.984375)+m},easeInOutBounce:function(n,k,m,p,q){if(k<q/2)return a.easing.easeInBounce(n,k*2,0,p,q)*0.5+m;return a.easing.easeOutBounce(n,k*2-q,0,p,q)*0.5+p*0.5+m}})}(jQuery);
-(function(a){a.effects.blind=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right"],h=a.effects.setMode(c,d.options.mode||"hide"),g=d.options.direction||"vertical";a.effects.save(c,e);c.show();var i=a.effects.createWrapper(c).css({overflow:"hidden"}),b=g=="vertical"?"height":"width";g=g=="vertical"?i.height():i.width();h=="show"&&i.css(b,0);var f={};f[b]=h=="show"?g:0;i.animate(f,d.duration,d.options.easing,function(){h=="hide"&&c.hide();a.effects.restore(c,
-e);a.effects.removeWrapper(c);d.callback&&d.callback.apply(c[0],arguments);c.dequeue()})})}})(jQuery);
-(function(a){a.effects.bounce=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right"],h=a.effects.setMode(c,d.options.mode||"effect"),g=d.options.direction||"up",i=d.options.distance||20,b=d.options.times||5,f=d.duration||250;/show|hide/.test(h)&&e.push("opacity");a.effects.save(c,e);c.show();a.effects.createWrapper(c);var j=g=="up"||g=="down"?"top":"left";g=g=="up"||g=="left"?"pos":"neg";i=d.options.distance||(j=="top"?c.outerHeight({margin:true})/3:c.outerWidth({margin:true})/
-3);if(h=="show")c.css("opacity",0).css(j,g=="pos"?-i:i);if(h=="hide")i/=b*2;h!="hide"&&b--;if(h=="show"){var l={opacity:1};l[j]=(g=="pos"?"+=":"-=")+i;c.animate(l,f/2,d.options.easing);i/=2;b--}for(l=0;l<b;l++){var o={},n={};o[j]=(g=="pos"?"-=":"+=")+i;n[j]=(g=="pos"?"+=":"-=")+i;c.animate(o,f/2,d.options.easing).animate(n,f/2,d.options.easing);i=h=="hide"?i*2:i/2}if(h=="hide"){l={opacity:0};l[j]=(g=="pos"?"-=":"+=")+i;c.animate(l,f/2,d.options.easing,function(){c.hide();a.effects.restore(c,e);a.effects.removeWrapper(c);
-d.callback&&d.callback.apply(this,arguments)})}else{o={};n={};o[j]=(g=="pos"?"-=":"+=")+i;n[j]=(g=="pos"?"+=":"-=")+i;c.animate(o,f/2,d.options.easing).animate(n,f/2,d.options.easing,function(){a.effects.restore(c,e);a.effects.removeWrapper(c);d.callback&&d.callback.apply(this,arguments)})}c.queue("fx",function(){c.dequeue()});c.dequeue()})}})(jQuery);
-(function(a){a.effects.clip=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right","height","width"],h=a.effects.setMode(c,d.options.mode||"hide"),g=d.options.direction||"vertical";a.effects.save(c,e);c.show();var i=a.effects.createWrapper(c).css({overflow:"hidden"});i=c[0].tagName=="IMG"?i:c;var b={size:g=="vertical"?"height":"width",position:g=="vertical"?"top":"left"};g=g=="vertical"?i.height():i.width();if(h=="show"){i.css(b.size,0);i.css(b.position,
-g/2)}var f={};f[b.size]=h=="show"?g:0;f[b.position]=h=="show"?0:g/2;i.animate(f,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){h=="hide"&&c.hide();a.effects.restore(c,e);a.effects.removeWrapper(c);d.callback&&d.callback.apply(c[0],arguments);c.dequeue()}})})}})(jQuery);
-(function(a){a.effects.drop=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right","opacity"],h=a.effects.setMode(c,d.options.mode||"hide"),g=d.options.direction||"left";a.effects.save(c,e);c.show();a.effects.createWrapper(c);var i=g=="up"||g=="down"?"top":"left";g=g=="up"||g=="left"?"pos":"neg";var b=d.options.distance||(i=="top"?c.outerHeight({margin:true})/2:c.outerWidth({margin:true})/2);if(h=="show")c.css("opacity",0).css(i,g=="pos"?-b:b);var f={opacity:h==
-"show"?1:0};f[i]=(h=="show"?g=="pos"?"+=":"-=":g=="pos"?"-=":"+=")+b;c.animate(f,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){h=="hide"&&c.hide();a.effects.restore(c,e);a.effects.removeWrapper(c);d.callback&&d.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery);
-(function(a){a.effects.explode=function(d){return this.queue(function(){var c=d.options.pieces?Math.round(Math.sqrt(d.options.pieces)):3,e=d.options.pieces?Math.round(Math.sqrt(d.options.pieces)):3;d.options.mode=d.options.mode=="toggle"?a(this).is(":visible")?"hide":"show":d.options.mode;var h=a(this).show().css("visibility","hidden"),g=h.offset();g.top-=parseInt(h.css("marginTop"),10)||0;g.left-=parseInt(h.css("marginLeft"),10)||0;for(var i=h.outerWidth(true),b=h.outerHeight(true),f=0;f<c;f++)for(var j=
-0;j<e;j++)h.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-j*(i/e),top:-f*(b/c)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:i/e,height:b/c,left:g.left+j*(i/e)+(d.options.mode=="show"?(j-Math.floor(e/2))*(i/e):0),top:g.top+f*(b/c)+(d.options.mode=="show"?(f-Math.floor(c/2))*(b/c):0),opacity:d.options.mode=="show"?0:1}).animate({left:g.left+j*(i/e)+(d.options.mode=="show"?0:(j-Math.floor(e/2))*(i/e)),top:g.top+
-f*(b/c)+(d.options.mode=="show"?0:(f-Math.floor(c/2))*(b/c)),opacity:d.options.mode=="show"?1:0},d.duration||500);setTimeout(function(){d.options.mode=="show"?h.css({visibility:"visible"}):h.css({visibility:"visible"}).hide();d.callback&&d.callback.apply(h[0]);h.dequeue();a("div.ui-effects-explode").remove()},d.duration||500)})}})(jQuery);
-(function(a){a.effects.fade=function(d){return this.queue(function(){var c=a(this),e=a.effects.setMode(c,d.options.mode||"hide");c.animate({opacity:e},{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){d.callback&&d.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery);
-(function(a){a.effects.fold=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right"],h=a.effects.setMode(c,d.options.mode||"hide"),g=d.options.size||15,i=!!d.options.horizFirst,b=d.duration?d.duration/2:a.fx.speeds._default/2;a.effects.save(c,e);c.show();var f=a.effects.createWrapper(c).css({overflow:"hidden"}),j=h=="show"!=i,l=j?["width","height"]:["height","width"];j=j?[f.width(),f.height()]:[f.height(),f.width()];var o=/([0-9]+)%/.exec(g);if(o)g=parseInt(o[1],
-10)/100*j[h=="hide"?0:1];if(h=="show")f.css(i?{height:0,width:g}:{height:g,width:0});i={};o={};i[l[0]]=h=="show"?j[0]:g;o[l[1]]=h=="show"?j[1]:0;f.animate(i,b,d.options.easing).animate(o,b,d.options.easing,function(){h=="hide"&&c.hide();a.effects.restore(c,e);a.effects.removeWrapper(c);d.callback&&d.callback.apply(c[0],arguments);c.dequeue()})})}})(jQuery);
-(function(a){a.effects.highlight=function(d){return this.queue(function(){var c=a(this),e=["backgroundImage","backgroundColor","opacity"],h=a.effects.setMode(c,d.options.mode||"show"),g={backgroundColor:c.css("backgroundColor")};if(h=="hide")g.opacity=0;a.effects.save(c,e);c.show().css({backgroundImage:"none",backgroundColor:d.options.color||"#ffff99"}).animate(g,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){h=="hide"&&c.hide();a.effects.restore(c,e);h=="show"&&!a.support.opacity&&
-this.style.removeAttribute("filter");d.callback&&d.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery);
-(function(a){a.effects.pulsate=function(d){return this.queue(function(){var c=a(this),e=a.effects.setMode(c,d.options.mode||"show");times=(d.options.times||5)*2-1;duration=d.duration?d.duration/2:a.fx.speeds._default/2;isVisible=c.is(":visible");animateTo=0;if(!isVisible){c.css("opacity",0).show();animateTo=1}if(e=="hide"&&isVisible||e=="show"&&!isVisible)times--;for(e=0;e<times;e++){c.animate({opacity:animateTo},duration,d.options.easing);animateTo=(animateTo+1)%2}c.animate({opacity:animateTo},duration,
-d.options.easing,function(){animateTo==0&&c.hide();d.callback&&d.callback.apply(this,arguments)});c.queue("fx",function(){c.dequeue()}).dequeue()})}})(jQuery);
-(function(a){a.effects.puff=function(d){return this.queue(function(){var c=a(this),e=a.effects.setMode(c,d.options.mode||"hide"),h=parseInt(d.options.percent,10)||150,g=h/100,i={height:c.height(),width:c.width()};a.extend(d.options,{fade:true,mode:e,percent:e=="hide"?h:100,from:e=="hide"?i:{height:i.height*g,width:i.width*g}});c.effect("scale",d.options,d.duration,d.callback);c.dequeue()})};a.effects.scale=function(d){return this.queue(function(){var c=a(this),e=a.extend(true,{},d.options),h=a.effects.setMode(c,
-d.options.mode||"effect"),g=parseInt(d.options.percent,10)||(parseInt(d.options.percent,10)==0?0:h=="hide"?0:100),i=d.options.direction||"both",b=d.options.origin;if(h!="effect"){e.origin=b||["middle","center"];e.restore=true}b={height:c.height(),width:c.width()};c.from=d.options.from||(h=="show"?{height:0,width:0}:b);g={y:i!="horizontal"?g/100:1,x:i!="vertical"?g/100:1};c.to={height:b.height*g.y,width:b.width*g.x};if(d.options.fade){if(h=="show"){c.from.opacity=0;c.to.opacity=1}if(h=="hide"){c.from.opacity=
-1;c.to.opacity=0}}e.from=c.from;e.to=c.to;e.mode=h;c.effect("size",e,d.duration,d.callback);c.dequeue()})};a.effects.size=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right","width","height","overflow","opacity"],h=["position","top","bottom","left","right","overflow","opacity"],g=["width","height","overflow"],i=["fontSize"],b=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],f=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],
-j=a.effects.setMode(c,d.options.mode||"effect"),l=d.options.restore||false,o=d.options.scale||"both",n=d.options.origin,k={height:c.height(),width:c.width()};c.from=d.options.from||k;c.to=d.options.to||k;if(n){n=a.effects.getBaseline(n,k);c.from.top=(k.height-c.from.height)*n.y;c.from.left=(k.width-c.from.width)*n.x;c.to.top=(k.height-c.to.height)*n.y;c.to.left=(k.width-c.to.width)*n.x}var m={from:{y:c.from.height/k.height,x:c.from.width/k.width},to:{y:c.to.height/k.height,x:c.to.width/k.width}};
-if(o=="box"||o=="both"){if(m.from.y!=m.to.y){e=e.concat(b);c.from=a.effects.setTransition(c,b,m.from.y,c.from);c.to=a.effects.setTransition(c,b,m.to.y,c.to)}if(m.from.x!=m.to.x){e=e.concat(f);c.from=a.effects.setTransition(c,f,m.from.x,c.from);c.to=a.effects.setTransition(c,f,m.to.x,c.to)}}if(o=="content"||o=="both")if(m.from.y!=m.to.y){e=e.concat(i);c.from=a.effects.setTransition(c,i,m.from.y,c.from);c.to=a.effects.setTransition(c,i,m.to.y,c.to)}a.effects.save(c,l?e:h);c.show();a.effects.createWrapper(c);
-c.css("overflow","hidden").css(c.from);if(o=="content"||o=="both"){b=b.concat(["marginTop","marginBottom"]).concat(i);f=f.concat(["marginLeft","marginRight"]);g=e.concat(b).concat(f);c.find("*[width]").each(function(){child=a(this);l&&a.effects.save(child,g);var p={height:child.height(),width:child.width()};child.from={height:p.height*m.from.y,width:p.width*m.from.x};child.to={height:p.height*m.to.y,width:p.width*m.to.x};if(m.from.y!=m.to.y){child.from=a.effects.setTransition(child,b,m.from.y,child.from);
-child.to=a.effects.setTransition(child,b,m.to.y,child.to)}if(m.from.x!=m.to.x){child.from=a.effects.setTransition(child,f,m.from.x,child.from);child.to=a.effects.setTransition(child,f,m.to.x,child.to)}child.css(child.from);child.animate(child.to,d.duration,d.options.easing,function(){l&&a.effects.restore(child,g)})})}c.animate(c.to,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){c.to.opacity===0&&c.css("opacity",c.from.opacity);j=="hide"&&c.hide();a.effects.restore(c,
-l?e:h);a.effects.removeWrapper(c);d.callback&&d.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery);
-(function(a){a.effects.shake=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right"];a.effects.setMode(c,d.options.mode||"effect");var h=d.options.direction||"left",g=d.options.distance||20,i=d.options.times||3,b=d.duration||d.options.duration||140;a.effects.save(c,e);c.show();a.effects.createWrapper(c);var f=h=="up"||h=="down"?"top":"left",j=h=="up"||h=="left"?"pos":"neg";h={};var l={},o={};h[f]=(j=="pos"?"-=":"+=")+g;l[f]=(j=="pos"?"+=":"-=")+g*2;o[f]=
-(j=="pos"?"-=":"+=")+g*2;c.animate(h,b,d.options.easing);for(g=1;g<i;g++)c.animate(l,b,d.options.easing).animate(o,b,d.options.easing);c.animate(l,b,d.options.easing).animate(h,b/2,d.options.easing,function(){a.effects.restore(c,e);a.effects.removeWrapper(c);d.callback&&d.callback.apply(this,arguments)});c.queue("fx",function(){c.dequeue()});c.dequeue()})}})(jQuery);
-(function(a){a.effects.slide=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right"],h=a.effects.setMode(c,d.options.mode||"show"),g=d.options.direction||"left";a.effects.save(c,e);c.show();a.effects.createWrapper(c).css({overflow:"hidden"});var i=g=="up"||g=="down"?"top":"left";g=g=="up"||g=="left"?"pos":"neg";var b=d.options.distance||(i=="top"?c.outerHeight({margin:true}):c.outerWidth({margin:true}));if(h=="show")c.css(i,g=="pos"?isNaN(b)?"-"+b:-b:b);
-var f={};f[i]=(h=="show"?g=="pos"?"+=":"-=":g=="pos"?"-=":"+=")+b;c.animate(f,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){h=="hide"&&c.hide();a.effects.restore(c,e);a.effects.removeWrapper(c);d.callback&&d.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery);
-(function(a){a.effects.transfer=function(d){return this.queue(function(){var c=a(this),e=a(d.options.to),h=e.offset();e={top:h.top,left:h.left,height:e.innerHeight(),width:e.innerWidth()};h=c.offset();var g=a('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(d.options.className).css({top:h.top,left:h.left,height:c.innerHeight(),width:c.innerWidth(),position:"absolute"}).animate(e,d.duration,d.options.easing,function(){g.remove();d.callback&&d.callback.apply(c[0],arguments);
-c.dequeue()})})}})(jQuery);
-(function(a){a.widget("ui.accordion",{options:{active:0,animated:"slide",autoHeight:true,clearStyle:false,collapsible:false,event:"click",fillSpace:false,header:"> li > :first-child,> :not(li):even",icons:{header:"ui-icon-triangle-1-e",headerSelected:"ui-icon-triangle-1-s"},navigation:false,navigationFilter:function(){return this.href.toLowerCase()===location.href.toLowerCase()}},_create:function(){var d=this,c=d.options;d.running=0;d.element.addClass("ui-accordion ui-widget ui-helper-reset").children("li").addClass("ui-accordion-li-fix");d.headers=
-d.element.find(c.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all").bind("mouseenter.accordion",function(){c.disabled||a(this).addClass("ui-state-hover")}).bind("mouseleave.accordion",function(){c.disabled||a(this).removeClass("ui-state-hover")}).bind("focus.accordion",function(){c.disabled||a(this).addClass("ui-state-focus")}).bind("blur.accordion",function(){c.disabled||a(this).removeClass("ui-state-focus")});d.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom");
-if(c.navigation){var e=d.element.find("a").filter(c.navigationFilter).eq(0);if(e.length){var h=e.closest(".ui-accordion-header");d.active=h.length?h:e.closest(".ui-accordion-content").prev()}}d.active=d._findActive(d.active||c.active).addClass("ui-state-default ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top");d.active.next().addClass("ui-accordion-content-active");d._createIcons();d.resize();d.element.attr("role","tablist");d.headers.attr("role","tab").bind("keydown.accordion",
-function(g){return d._keydown(g)}).next().attr("role","tabpanel");d.headers.not(d.active||"").attr({"aria-expanded":"false","aria-selected":"false",tabIndex:-1}).next().hide();d.active.length?d.active.attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}):d.headers.eq(0).attr("tabIndex",0);a.browser.safari||d.headers.find("a").attr("tabIndex",-1);c.event&&d.headers.bind(c.event.split(" ").join(".accordion ")+".accordion",function(g){d._clickHandler.call(d,g,this);g.preventDefault()})},_createIcons:function(){var d=
-this.options;if(d.icons){a("<span></span>").addClass("ui-icon "+d.icons.header).prependTo(this.headers);this.active.children(".ui-icon").toggleClass(d.icons.header).toggleClass(d.icons.headerSelected);this.element.addClass("ui-accordion-icons")}},_destroyIcons:function(){this.headers.children(".ui-icon").remove();this.element.removeClass("ui-accordion-icons")},destroy:function(){var d=this.options;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role");this.headers.unbind(".accordion").removeClass("ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("tabIndex");
-this.headers.find("a").removeAttr("tabIndex");this._destroyIcons();var c=this.headers.next().css("display","").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled");if(d.autoHeight||d.fillHeight)c.css("height","");return a.Widget.prototype.destroy.call(this)},_setOption:function(d,c){a.Widget.prototype._setOption.apply(this,arguments);d=="active"&&this.activate(c);if(d=="icons"){this._destroyIcons();
-c&&this._createIcons()}if(d=="disabled")this.headers.add(this.headers.next())[c?"addClass":"removeClass"]("ui-accordion-disabled ui-state-disabled")},_keydown:function(d){if(!(this.options.disabled||d.altKey||d.ctrlKey)){var c=a.ui.keyCode,e=this.headers.length,h=this.headers.index(d.target),g=false;switch(d.keyCode){case c.RIGHT:case c.DOWN:g=this.headers[(h+1)%e];break;case c.LEFT:case c.UP:g=this.headers[(h-1+e)%e];break;case c.SPACE:case c.ENTER:this._clickHandler({target:d.target},d.target);
-d.preventDefault()}if(g){a(d.target).attr("tabIndex",-1);a(g).attr("tabIndex",0);g.focus();return false}return true}},resize:function(){var d=this.options,c;if(d.fillSpace){if(a.browser.msie){var e=this.element.parent().css("overflow");this.element.parent().css("overflow","hidden")}c=this.element.parent().height();a.browser.msie&&this.element.parent().css("overflow",e);this.headers.each(function(){c-=a(this).outerHeight(true)});this.headers.next().each(function(){a(this).height(Math.max(0,c-a(this).innerHeight()+
-a(this).height()))}).css("overflow","auto")}else if(d.autoHeight){c=0;this.headers.next().each(function(){c=Math.max(c,a(this).height("").height())}).height(c)}return this},activate:function(d){this.options.active=d;d=this._findActive(d)[0];this._clickHandler({target:d},d);return this},_findActive:function(d){return d?typeof d==="number"?this.headers.filter(":eq("+d+")"):this.headers.not(this.headers.not(d)):d===false?a([]):this.headers.filter(":eq(0)")},_clickHandler:function(d,c){var e=this.options;
-if(!e.disabled)if(d.target){d=a(d.currentTarget||c);c=d[0]===this.active[0];e.active=e.collapsible&&c?false:this.headers.index(d);if(!(this.running||!e.collapsible&&c)){var h=this.active;f=d.next();i=this.active.next();b={options:e,newHeader:c&&e.collapsible?a([]):d,oldHeader:this.active,newContent:c&&e.collapsible?a([]):f,oldContent:i};var g=this.headers.index(this.active[0])>this.headers.index(d[0]);this.active=c?a([]):d;this._toggle(f,i,b,c,g);h.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(e.icons.headerSelected).addClass(e.icons.header);
-if(!c){d.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner-top").children(".ui-icon").removeClass(e.icons.header).addClass(e.icons.headerSelected);d.next().addClass("ui-accordion-content-active")}}}else if(e.collapsible){this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(e.icons.headerSelected).addClass(e.icons.header);this.active.next().addClass("ui-accordion-content-active");var i=this.active.next(),
-b={options:e,newHeader:a([]),oldHeader:e.active,newContent:a([]),oldContent:i},f=this.active=a([]);this._toggle(f,i,b)}},_toggle:function(d,c,e,h,g){var i=this,b=i.options;i.toShow=d;i.toHide=c;i.data=e;var f=function(){if(i)return i._completed.apply(i,arguments)};i._trigger("changestart",null,i.data);i.running=c.size()===0?d.size():c.size();if(b.animated){e={};e=b.collapsible&&h?{toShow:a([]),toHide:c,complete:f,down:g,autoHeight:b.autoHeight||b.fillSpace}:{toShow:d,toHide:c,complete:f,down:g,autoHeight:b.autoHeight||
-b.fillSpace};if(!b.proxied)b.proxied=b.animated;if(!b.proxiedDuration)b.proxiedDuration=b.duration;b.animated=a.isFunction(b.proxied)?b.proxied(e):b.proxied;b.duration=a.isFunction(b.proxiedDuration)?b.proxiedDuration(e):b.proxiedDuration;h=a.ui.accordion.animations;var j=b.duration,l=b.animated;if(l&&!h[l]&&!a.easing[l])l="slide";h[l]||(h[l]=function(o){this.slide(o,{easing:l,duration:j||700})});h[l](e)}else{if(b.collapsible&&h)d.toggle();else{c.hide();d.show()}f(true)}c.prev().attr({"aria-expanded":"false",
-"aria-selected":"false",tabIndex:-1}).blur();d.prev().attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}).focus()},_completed:function(d){this.running=d?0:--this.running;if(!this.running){this.options.clearStyle&&this.toShow.add(this.toHide).css({height:"",overflow:""});this.toHide.removeClass("ui-accordion-content-active");if(this.toHide.length)this.toHide.parent()[0].className=this.toHide.parent()[0].className;this._trigger("change",null,this.data)}}});a.extend(a.ui.accordion,{version:"1.8.14",
-animations:{slide:function(d,c){d=a.extend({easing:"swing",duration:300},d,c);if(d.toHide.size())if(d.toShow.size()){var e=d.toShow.css("overflow"),h=0,g={},i={},b;c=d.toShow;b=c[0].style.width;c.width(parseInt(c.parent().width(),10)-parseInt(c.css("paddingLeft"),10)-parseInt(c.css("paddingRight"),10)-(parseInt(c.css("borderLeftWidth"),10)||0)-(parseInt(c.css("borderRightWidth"),10)||0));a.each(["height","paddingTop","paddingBottom"],function(f,j){i[j]="hide";f=(""+a.css(d.toShow[0],j)).match(/^([\d+-.]+)(.*)$/);
-g[j]={value:f[1],unit:f[2]||"px"}});d.toShow.css({height:0,overflow:"hidden"}).show();d.toHide.filter(":hidden").each(d.complete).end().filter(":visible").animate(i,{step:function(f,j){if(j.prop=="height")h=j.end-j.start===0?0:(j.now-j.start)/(j.end-j.start);d.toShow[0].style[j.prop]=h*g[j.prop].value+g[j.prop].unit},duration:d.duration,easing:d.easing,complete:function(){d.autoHeight||d.toShow.css("height","");d.toShow.css({width:b,overflow:e});d.complete()}})}else d.toHide.animate({height:"hide",
-paddingTop:"hide",paddingBottom:"hide"},d);else d.toShow.animate({height:"show",paddingTop:"show",paddingBottom:"show"},d)},bounceslide:function(d){this.slide(d,{easing:d.down?"easeOutBounce":"swing",duration:d.down?1E3:200})}}})})(jQuery);
-(function(a){var d=0;a.widget("ui.autocomplete",{options:{appendTo:"body",autoFocus:false,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null},pending:0,_create:function(){var c=this,e=this.element[0].ownerDocument,h;this.element.addClass("ui-autocomplete-input").attr("autocomplete","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"true"}).bind("keydown.autocomplete",function(g){if(!(c.options.disabled||c.element.attr("readonly"))){h=
-false;var i=a.ui.keyCode;switch(g.keyCode){case i.PAGE_UP:c._move("previousPage",g);break;case i.PAGE_DOWN:c._move("nextPage",g);break;case i.UP:c._move("previous",g);g.preventDefault();break;case i.DOWN:c._move("next",g);g.preventDefault();break;case i.ENTER:case i.NUMPAD_ENTER:if(c.menu.active){h=true;g.preventDefault()}case i.TAB:if(!c.menu.active)return;c.menu.select(g);break;case i.ESCAPE:c.element.val(c.term);c.close(g);break;default:clearTimeout(c.searching);c.searching=setTimeout(function(){if(c.term!=
-c.element.val()){c.selectedItem=null;c.search(null,g)}},c.options.delay);break}}}).bind("keypress.autocomplete",function(g){if(h){h=false;g.preventDefault()}}).bind("focus.autocomplete",function(){if(!c.options.disabled){c.selectedItem=null;c.previous=c.element.val()}}).bind("blur.autocomplete",function(g){if(!c.options.disabled){clearTimeout(c.searching);c.closing=setTimeout(function(){c.close(g);c._change(g)},150)}});this._initSource();this.response=function(){return c._response.apply(c,arguments)};
-this.menu=a("<ul></ul>").addClass("ui-autocomplete").appendTo(a(this.options.appendTo||"body",e)[0]).mousedown(function(g){var i=c.menu.element[0];a(g.target).closest(".ui-menu-item").length||setTimeout(function(){a(document).one("mousedown",function(b){b.target!==c.element[0]&&b.target!==i&&!a.ui.contains(i,b.target)&&c.close()})},1);setTimeout(function(){clearTimeout(c.closing)},13)}).menu({focus:function(g,i){i=i.item.data("item.autocomplete");false!==c._trigger("focus",g,{item:i})&&/^key/.test(g.originalEvent.type)&&
-c.element.val(i.value)},selected:function(g,i){var b=i.item.data("item.autocomplete"),f=c.previous;if(c.element[0]!==e.activeElement){c.element.focus();c.previous=f;setTimeout(function(){c.previous=f;c.selectedItem=b},1)}false!==c._trigger("select",g,{item:b})&&c.element.val(b.value);c.term=c.element.val();c.close(g);c.selectedItem=b},blur:function(){c.menu.element.is(":visible")&&c.element.val()!==c.term&&c.element.val(c.term)}}).zIndex(this.element.zIndex()+1).css({top:0,left:0}).hide().data("menu");
-a.fn.bgiframe&&this.menu.element.bgiframe()},destroy:function(){this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete").removeAttr("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup");this.menu.element.remove();a.Widget.prototype.destroy.call(this)},_setOption:function(c,e){a.Widget.prototype._setOption.apply(this,arguments);c==="source"&&this._initSource();if(c==="appendTo")this.menu.element.appendTo(a(e||"body",this.element[0].ownerDocument)[0]);c==="disabled"&&
-e&&this.xhr&&this.xhr.abort()},_initSource:function(){var c=this,e,h;if(a.isArray(this.options.source)){e=this.options.source;this.source=function(g,i){i(a.ui.autocomplete.filter(e,g.term))}}else if(typeof this.options.source==="string"){h=this.options.source;this.source=function(g,i){c.xhr&&c.xhr.abort();c.xhr=a.ajax({url:h,data:g,dataType:"json",autocompleteRequest:++d,success:function(b){this.autocompleteRequest===d&&i(b)},error:function(){this.autocompleteRequest===d&&i([])}})}}else this.source=
-this.options.source},search:function(c,e){c=c!=null?c:this.element.val();this.term=this.element.val();if(c.length<this.options.minLength)return this.close(e);clearTimeout(this.closing);if(this._trigger("search",e)!==false)return this._search(c)},_search:function(c){this.pending++;this.element.addClass("ui-autocomplete-loading");this.source({term:c},this.response)},_response:function(c){if(!this.options.disabled&&c&&c.length){c=this._normalize(c);this._suggest(c);this._trigger("open")}else this.close();
-this.pending--;this.pending||this.element.removeClass("ui-autocomplete-loading")},close:function(c){clearTimeout(this.closing);if(this.menu.element.is(":visible")){this.menu.element.hide();this.menu.deactivate();this._trigger("close",c)}},_change:function(c){this.previous!==this.element.val()&&this._trigger("change",c,{item:this.selectedItem})},_normalize:function(c){if(c.length&&c[0].label&&c[0].value)return c;return a.map(c,function(e){if(typeof e==="string")return{label:e,value:e};return a.extend({label:e.label||
-e.value,value:e.value||e.label},e)})},_suggest:function(c){var e=this.menu.element.empty().zIndex(this.element.zIndex()+1);this._renderMenu(e,c);this.menu.deactivate();this.menu.refresh();e.show();this._resizeMenu();e.position(a.extend({of:this.element},this.options.position));this.options.autoFocus&&this.menu.next(new a.Event("mouseover"))},_resizeMenu:function(){var c=this.menu.element;c.outerWidth(Math.max(c.width("").outerWidth(),this.element.outerWidth()))},_renderMenu:function(c,e){var h=this;
-a.each(e,function(g,i){h._renderItem(c,i)})},_renderItem:function(c,e){return a("<li></li>").data("item.autocomplete",e).append(a("<a></a>").text(e.label)).appendTo(c)},_move:function(c,e){if(this.menu.element.is(":visible"))if(this.menu.first()&&/^previous/.test(c)||this.menu.last()&&/^next/.test(c)){this.element.val(this.term);this.menu.deactivate()}else this.menu[c](e);else this.search(null,e)},widget:function(){return this.menu.element}});a.extend(a.ui.autocomplete,{escapeRegex:function(c){return c.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,
-"\\$&")},filter:function(c,e){var h=new RegExp(a.ui.autocomplete.escapeRegex(e),"i");return a.grep(c,function(g){return h.test(g.label||g.value||g)})}})})(jQuery);
-(function(a){a.widget("ui.menu",{_create:function(){var d=this;this.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(function(c){if(a(c.target).closest(".ui-menu-item a").length){c.preventDefault();d.select(c)}});this.refresh()},refresh:function(){var d=this;this.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","menuitem").children("a").addClass("ui-corner-all").attr("tabindex",
--1).mouseenter(function(c){d.activate(c,a(this).parent())}).mouseleave(function(){d.deactivate()})},activate:function(d,c){this.deactivate();if(this.hasScroll()){var e=c.offset().top-this.element.offset().top,h=this.element.scrollTop(),g=this.element.height();if(e<0)this.element.scrollTop(h+e);else e>=g&&this.element.scrollTop(h+e-g+c.height())}this.active=c.eq(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem").end();this._trigger("focus",d,{item:c})},deactivate:function(){if(this.active){this.active.children("a").removeClass("ui-state-hover").removeAttr("id");
-this._trigger("blur");this.active=null}},next:function(d){this.move("next",".ui-menu-item:first",d)},previous:function(d){this.move("prev",".ui-menu-item:last",d)},first:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},last:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},move:function(d,c,e){if(this.active){d=this.active[d+"All"](".ui-menu-item").eq(0);d.length?this.activate(e,d):this.activate(e,this.element.children(c))}else this.activate(e,
-this.element.children(c))},nextPage:function(d){if(this.hasScroll())if(!this.active||this.last())this.activate(d,this.element.children(".ui-menu-item:first"));else{var c=this.active.offset().top,e=this.element.height(),h=this.element.children(".ui-menu-item").filter(function(){var g=a(this).offset().top-c-e+a(this).height();return g<10&&g>-10});h.length||(h=this.element.children(".ui-menu-item:last"));this.activate(d,h)}else this.activate(d,this.element.children(".ui-menu-item").filter(!this.active||
-this.last()?":first":":last"))},previousPage:function(d){if(this.hasScroll())if(!this.active||this.first())this.activate(d,this.element.children(".ui-menu-item:last"));else{var c=this.active.offset().top,e=this.element.height();result=this.element.children(".ui-menu-item").filter(function(){var h=a(this).offset().top-c+e-a(this).height();return h<10&&h>-10});result.length||(result=this.element.children(".ui-menu-item:first"));this.activate(d,result)}else this.activate(d,this.element.children(".ui-menu-item").filter(!this.active||
-this.first()?":last":":first"))},hasScroll:function(){return this.element.height()<this.element[a.fn.prop?"prop":"attr"]("scrollHeight")},select:function(d){this._trigger("selected",d,{item:this.active})}})})(jQuery);
-(function(a){var d,c,e,h,g=function(){var b=a(this).find(":ui-button");setTimeout(function(){b.button("refresh")},1)},i=function(b){var f=b.name,j=b.form,l=a([]);if(f)l=j?a(j).find("[name='"+f+"']"):a("[name='"+f+"']",b.ownerDocument).filter(function(){return!this.form});return l};a.widget("ui.button",{options:{disabled:null,text:true,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset.button").bind("reset.button",g);if(typeof this.options.disabled!==
-"boolean")this.options.disabled=this.element.attr("disabled");this._determineButtonType();this.hasTitle=!!this.buttonElement.attr("title");var b=this,f=this.options,j=this.type==="checkbox"||this.type==="radio",l="ui-state-hover"+(!j?" ui-state-active":"");if(f.label===null)f.label=this.buttonElement.html();if(this.element.is(":disabled"))f.disabled=true;this.buttonElement.addClass("ui-button ui-widget ui-state-default ui-corner-all").attr("role","button").bind("mouseenter.button",function(){if(!f.disabled){a(this).addClass("ui-state-hover");
-this===d&&a(this).addClass("ui-state-active")}}).bind("mouseleave.button",function(){f.disabled||a(this).removeClass(l)}).bind("click.button",function(o){if(f.disabled){o.preventDefault();o.stopImmediatePropagation()}});this.element.bind("focus.button",function(){b.buttonElement.addClass("ui-state-focus")}).bind("blur.button",function(){b.buttonElement.removeClass("ui-state-focus")});if(j){this.element.bind("change.button",function(){h||b.refresh()});this.buttonElement.bind("mousedown.button",function(o){if(!f.disabled){h=
-false;c=o.pageX;e=o.pageY}}).bind("mouseup.button",function(o){if(!f.disabled)if(c!==o.pageX||e!==o.pageY)h=true})}if(this.type==="checkbox")this.buttonElement.bind("click.button",function(){if(f.disabled||h)return false;a(this).toggleClass("ui-state-active");b.buttonElement.attr("aria-pressed",b.element[0].checked)});else if(this.type==="radio")this.buttonElement.bind("click.button",function(){if(f.disabled||h)return false;a(this).addClass("ui-state-active");b.buttonElement.attr("aria-pressed",true);
-var o=b.element[0];i(o).not(o).map(function(){return a(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed",false)});else{this.buttonElement.bind("mousedown.button",function(){if(f.disabled)return false;a(this).addClass("ui-state-active");d=this;a(document).one("mouseup",function(){d=null})}).bind("mouseup.button",function(){if(f.disabled)return false;a(this).removeClass("ui-state-active")}).bind("keydown.button",function(o){if(f.disabled)return false;if(o.keyCode==a.ui.keyCode.SPACE||
-o.keyCode==a.ui.keyCode.ENTER)a(this).addClass("ui-state-active")}).bind("keyup.button",function(){a(this).removeClass("ui-state-active")});this.buttonElement.is("a")&&this.buttonElement.keyup(function(o){o.keyCode===a.ui.keyCode.SPACE&&a(this).click()})}this._setOption("disabled",f.disabled);this._resetButton()},_determineButtonType:function(){this.type=this.element.is(":checkbox")?"checkbox":this.element.is(":radio")?"radio":this.element.is("input")?"input":"button";if(this.type==="checkbox"||this.type===
-"radio"){var b=this.element.parents().filter(":last"),f="label[for="+this.element.attr("id")+"]";this.buttonElement=b.find(f);if(!this.buttonElement.length){b=b.length?b.siblings():this.element.siblings();this.buttonElement=b.filter(f);if(!this.buttonElement.length)this.buttonElement=b.find(f)}this.element.addClass("ui-helper-hidden-accessible");(b=this.element.is(":checked"))&&this.buttonElement.addClass("ui-state-active");this.buttonElement.attr("aria-pressed",b)}else this.buttonElement=this.element},
-widget:function(){return this.buttonElement},destroy:function(){this.element.removeClass("ui-helper-hidden-accessible");this.buttonElement.removeClass("ui-button ui-widget ui-state-default ui-corner-all ui-state-hover ui-state-active  ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only").removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html());this.hasTitle||this.buttonElement.removeAttr("title");
-a.Widget.prototype.destroy.call(this)},_setOption:function(b,f){a.Widget.prototype._setOption.apply(this,arguments);if(b==="disabled")f?this.element.attr("disabled",true):this.element.removeAttr("disabled");else this._resetButton()},refresh:function(){var b=this.element.is(":disabled");b!==this.options.disabled&&this._setOption("disabled",b);if(this.type==="radio")i(this.element[0]).each(function(){a(this).is(":checked")?a(this).button("widget").addClass("ui-state-active").attr("aria-pressed",true):
-a(this).button("widget").removeClass("ui-state-active").attr("aria-pressed",false)});else if(this.type==="checkbox")this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed",true):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed",false)},_resetButton:function(){if(this.type==="input")this.options.label&&this.element.val(this.options.label);else{var b=this.buttonElement.removeClass("ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only"),
-f=a("<span></span>").addClass("ui-button-text").html(this.options.label).appendTo(b.empty()).text(),j=this.options.icons,l=j.primary&&j.secondary,o=[];if(j.primary||j.secondary){if(this.options.text)o.push("ui-button-text-icon"+(l?"s":j.primary?"-primary":"-secondary"));j.primary&&b.prepend("<span class='ui-button-icon-primary ui-icon "+j.primary+"'></span>");j.secondary&&b.append("<span class='ui-button-icon-secondary ui-icon "+j.secondary+"'></span>");if(!this.options.text){o.push(l?"ui-button-icons-only":
-"ui-button-icon-only");this.hasTitle||b.attr("title",f)}}else o.push("ui-button-text-only");b.addClass(o.join(" "))}}});a.widget("ui.buttonset",{options:{items:":button, :submit, :reset, :checkbox, :radio, a, :data(button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(b,f){b==="disabled"&&this.buttons.button("option",b,f);a.Widget.prototype._setOption.apply(this,arguments)},refresh:function(){var b=this.element.css("direction")===
-"ltr";this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(b?"ui-corner-left":"ui-corner-right").end().filter(":last").addClass(b?"ui-corner-right":"ui-corner-left").end().end()},destroy:function(){this.element.removeClass("ui-buttonset");this.buttons.map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy");
-a.Widget.prototype.destroy.call(this)}})})(jQuery);
-(function(a,d){function c(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._inDialog=this._datepickerShowing=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass=
-"ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su",
-"Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:false,showMonthAfterYear:false,yearSuffix:""};this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,yearRange:"c-10:c+10",showOtherMonths:false,selectOtherMonths:false,showWeek:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",
-minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false};a.extend(this._defaults,this.regional[""]);this.dpDiv=e(a('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}function e(b){return b.bind("mouseout",function(f){f=
-a(f.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");f.length&&f.removeClass("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bind("mouseover",function(f){f=a(f.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");if(!(a.datepicker._isDisabledDatepicker(i.inline?b.parent()[0]:i.input[0])||!f.length)){f.parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");f.addClass("ui-state-hover");
-f.hasClass("ui-datepicker-prev")&&f.addClass("ui-datepicker-prev-hover");f.hasClass("ui-datepicker-next")&&f.addClass("ui-datepicker-next-hover")}})}function h(b,f){a.extend(b,f);for(var j in f)if(f[j]==null||f[j]==d)b[j]=f[j];return b}a.extend(a.ui,{datepicker:{version:"1.8.14"}});var g=(new Date).getTime(),i;a.extend(c.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(b){h(this._defaults,
-b||{});return this},_attachDatepicker:function(b,f){var j=null;for(var l in this._defaults){var o=b.getAttribute("date:"+l);if(o){j=j||{};try{j[l]=eval(o)}catch(n){j[l]=o}}}l=b.nodeName.toLowerCase();o=l=="div"||l=="span";if(!b.id){this.uuid+=1;b.id="dp"+this.uuid}var k=this._newInst(a(b),o);k.settings=a.extend({},f||{},j||{});if(l=="input")this._connectDatepicker(b,k);else o&&this._inlineDatepicker(b,k)},_newInst:function(b,f){return{id:b[0].id.replace(/([^A-Za-z0-9_-])/g,"\\\\$1"),input:b,selectedDay:0,
-selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:f,dpDiv:!f?this.dpDiv:e(a('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}},_connectDatepicker:function(b,f){var j=a(b);f.append=a([]);f.trigger=a([]);if(!j.hasClass(this.markerClassName)){this._attachments(j,f);j.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",function(l,o,n){f.settings[o]=
-n}).bind("getData.datepicker",function(l,o){return this._get(f,o)});this._autoSize(f);a.data(b,"datepicker",f)}},_attachments:function(b,f){var j=this._get(f,"appendText"),l=this._get(f,"isRTL");f.append&&f.append.remove();if(j){f.append=a('<span class="'+this._appendClass+'">'+j+"</span>");b[l?"before":"after"](f.append)}b.unbind("focus",this._showDatepicker);f.trigger&&f.trigger.remove();j=this._get(f,"showOn");if(j=="focus"||j=="both")b.focus(this._showDatepicker);if(j=="button"||j=="both"){j=
-this._get(f,"buttonText");var o=this._get(f,"buttonImage");f.trigger=a(this._get(f,"buttonImageOnly")?a("<img/>").addClass(this._triggerClass).attr({src:o,alt:j,title:j}):a('<button type="button"></button>').addClass(this._triggerClass).html(o==""?j:a("<img/>").attr({src:o,alt:j,title:j})));b[l?"before":"after"](f.trigger);f.trigger.click(function(){a.datepicker._datepickerShowing&&a.datepicker._lastInput==b[0]?a.datepicker._hideDatepicker():a.datepicker._showDatepicker(b[0]);return false})}},_autoSize:function(b){if(this._get(b,
-"autoSize")&&!b.inline){var f=new Date(2009,11,20),j=this._get(b,"dateFormat");if(j.match(/[DM]/)){var l=function(o){for(var n=0,k=0,m=0;m<o.length;m++)if(o[m].length>n){n=o[m].length;k=m}return k};f.setMonth(l(this._get(b,j.match(/MM/)?"monthNames":"monthNamesShort")));f.setDate(l(this._get(b,j.match(/DD/)?"dayNames":"dayNamesShort"))+20-f.getDay())}b.input.attr("size",this._formatDate(b,f).length)}},_inlineDatepicker:function(b,f){var j=a(b);if(!j.hasClass(this.markerClassName)){j.addClass(this.markerClassName).append(f.dpDiv).bind("setData.datepicker",
-function(l,o,n){f.settings[o]=n}).bind("getData.datepicker",function(l,o){return this._get(f,o)});a.data(b,"datepicker",f);this._setDate(f,this._getDefaultDate(f),true);this._updateDatepicker(f);this._updateAlternate(f);f.dpDiv.show()}},_dialogDatepicker:function(b,f,j,l,o){b=this._dialogInst;if(!b){this.uuid+=1;this._dialogInput=a('<input type="text" id="'+("dp"+this.uuid)+'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>');this._dialogInput.keydown(this._doKeyDown);a("body").append(this._dialogInput);
-b=this._dialogInst=this._newInst(this._dialogInput,false);b.settings={};a.data(this._dialogInput[0],"datepicker",b)}h(b.settings,l||{});f=f&&f.constructor==Date?this._formatDate(b,f):f;this._dialogInput.val(f);this._pos=o?o.length?o:[o.pageX,o.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left",
-this._pos[0]+20+"px").css("top",this._pos[1]+"px");b.settings.onSelect=j;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);a.blockUI&&a.blockUI(this.dpDiv);a.data(this._dialogInput[0],"datepicker",b);return this},_destroyDatepicker:function(b){var f=a(b),j=a.data(b,"datepicker");if(f.hasClass(this.markerClassName)){var l=b.nodeName.toLowerCase();a.removeData(b,"datepicker");if(l=="input"){j.append.remove();j.trigger.remove();f.removeClass(this.markerClassName).unbind("focus",
-this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)}else if(l=="div"||l=="span")f.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(b){var f=a(b),j=a.data(b,"datepicker");if(f.hasClass(this.markerClassName)){var l=b.nodeName.toLowerCase();if(l=="input"){b.disabled=false;j.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(l=="div"||l=="span"){f=
-f.children("."+this._inlineClass);f.children().removeClass("ui-state-disabled");f.find("select.ui-datepicker-month, select.ui-datepicker-year").removeAttr("disabled")}this._disabledInputs=a.map(this._disabledInputs,function(o){return o==b?null:o})}},_disableDatepicker:function(b){var f=a(b),j=a.data(b,"datepicker");if(f.hasClass(this.markerClassName)){var l=b.nodeName.toLowerCase();if(l=="input"){b.disabled=true;j.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",
-cursor:"default"})}else if(l=="div"||l=="span"){f=f.children("."+this._inlineClass);f.children().addClass("ui-state-disabled");f.find("select.ui-datepicker-month, select.ui-datepicker-year").attr("disabled","disabled")}this._disabledInputs=a.map(this._disabledInputs,function(o){return o==b?null:o});this._disabledInputs[this._disabledInputs.length]=b}},_isDisabledDatepicker:function(b){if(!b)return false;for(var f=0;f<this._disabledInputs.length;f++)if(this._disabledInputs[f]==b)return true;return false},
-_getInst:function(b){try{return a.data(b,"datepicker")}catch(f){throw"Missing instance data for this datepicker";}},_optionDatepicker:function(b,f,j){var l=this._getInst(b);if(arguments.length==2&&typeof f=="string")return f=="defaults"?a.extend({},a.datepicker._defaults):l?f=="all"?a.extend({},l.settings):this._get(l,f):null;var o=f||{};if(typeof f=="string"){o={};o[f]=j}if(l){this._curInst==l&&this._hideDatepicker();var n=this._getDateDatepicker(b,true),k=this._getMinMaxDate(l,"min"),m=this._getMinMaxDate(l,
-"max");h(l.settings,o);if(k!==null&&o.dateFormat!==d&&o.minDate===d)l.settings.minDate=this._formatDate(l,k);if(m!==null&&o.dateFormat!==d&&o.maxDate===d)l.settings.maxDate=this._formatDate(l,m);this._attachments(a(b),l);this._autoSize(l);this._setDate(l,n);this._updateAlternate(l);this._updateDatepicker(l)}},_changeDatepicker:function(b,f,j){this._optionDatepicker(b,f,j)},_refreshDatepicker:function(b){(b=this._getInst(b))&&this._updateDatepicker(b)},_setDateDatepicker:function(b,f){if(b=this._getInst(b)){this._setDate(b,
-f);this._updateDatepicker(b);this._updateAlternate(b)}},_getDateDatepicker:function(b,f){(b=this._getInst(b))&&!b.inline&&this._setDateFromField(b,f);return b?this._getDate(b):null},_doKeyDown:function(b){var f=a.datepicker._getInst(b.target),j=true,l=f.dpDiv.is(".ui-datepicker-rtl");f._keyEvent=true;if(a.datepicker._datepickerShowing)switch(b.keyCode){case 9:a.datepicker._hideDatepicker();j=false;break;case 13:j=a("td."+a.datepicker._dayOverClass+":not(."+a.datepicker._currentClass+")",f.dpDiv);
-j[0]?a.datepicker._selectDay(b.target,f.selectedMonth,f.selectedYear,j[0]):a.datepicker._hideDatepicker();return false;case 27:a.datepicker._hideDatepicker();break;case 33:a.datepicker._adjustDate(b.target,b.ctrlKey?-a.datepicker._get(f,"stepBigMonths"):-a.datepicker._get(f,"stepMonths"),"M");break;case 34:a.datepicker._adjustDate(b.target,b.ctrlKey?+a.datepicker._get(f,"stepBigMonths"):+a.datepicker._get(f,"stepMonths"),"M");break;case 35:if(b.ctrlKey||b.metaKey)a.datepicker._clearDate(b.target);
-j=b.ctrlKey||b.metaKey;break;case 36:if(b.ctrlKey||b.metaKey)a.datepicker._gotoToday(b.target);j=b.ctrlKey||b.metaKey;break;case 37:if(b.ctrlKey||b.metaKey)a.datepicker._adjustDate(b.target,l?+1:-1,"D");j=b.ctrlKey||b.metaKey;if(b.originalEvent.altKey)a.datepicker._adjustDate(b.target,b.ctrlKey?-a.datepicker._get(f,"stepBigMonths"):-a.datepicker._get(f,"stepMonths"),"M");break;case 38:if(b.ctrlKey||b.metaKey)a.datepicker._adjustDate(b.target,-7,"D");j=b.ctrlKey||b.metaKey;break;case 39:if(b.ctrlKey||
-b.metaKey)a.datepicker._adjustDate(b.target,l?-1:+1,"D");j=b.ctrlKey||b.metaKey;if(b.originalEvent.altKey)a.datepicker._adjustDate(b.target,b.ctrlKey?+a.datepicker._get(f,"stepBigMonths"):+a.datepicker._get(f,"stepMonths"),"M");break;case 40:if(b.ctrlKey||b.metaKey)a.datepicker._adjustDate(b.target,+7,"D");j=b.ctrlKey||b.metaKey;break;default:j=false}else if(b.keyCode==36&&b.ctrlKey)a.datepicker._showDatepicker(this);else j=false;if(j){b.preventDefault();b.stopPropagation()}},_doKeyPress:function(b){var f=
-a.datepicker._getInst(b.target);if(a.datepicker._get(f,"constrainInput")){f=a.datepicker._possibleChars(a.datepicker._get(f,"dateFormat"));var j=String.fromCharCode(b.charCode==d?b.keyCode:b.charCode);return b.ctrlKey||b.metaKey||j<" "||!f||f.indexOf(j)>-1}},_doKeyUp:function(b){b=a.datepicker._getInst(b.target);if(b.input.val()!=b.lastVal)try{if(a.datepicker.parseDate(a.datepicker._get(b,"dateFormat"),b.input?b.input.val():null,a.datepicker._getFormatConfig(b))){a.datepicker._setDateFromField(b);
-a.datepicker._updateAlternate(b);a.datepicker._updateDatepicker(b)}}catch(f){a.datepicker.log(f)}return true},_showDatepicker:function(b){b=b.target||b;if(b.nodeName.toLowerCase()!="input")b=a("input",b.parentNode)[0];if(!(a.datepicker._isDisabledDatepicker(b)||a.datepicker._lastInput==b)){var f=a.datepicker._getInst(b);if(a.datepicker._curInst&&a.datepicker._curInst!=f){a.datepicker._datepickerShowing&&a.datepicker._triggerOnClose(a.datepicker._curInst);a.datepicker._curInst.dpDiv.stop(true,true)}var j=
-a.datepicker._get(f,"beforeShow");h(f.settings,j?j.apply(b,[b,f]):{});f.lastVal=null;a.datepicker._lastInput=b;a.datepicker._setDateFromField(f);if(a.datepicker._inDialog)b.value="";if(!a.datepicker._pos){a.datepicker._pos=a.datepicker._findPos(b);a.datepicker._pos[1]+=b.offsetHeight}var l=false;a(b).parents().each(function(){l|=a(this).css("position")=="fixed";return!l});if(l&&a.browser.opera){a.datepicker._pos[0]-=document.documentElement.scrollLeft;a.datepicker._pos[1]-=document.documentElement.scrollTop}j=
-{left:a.datepicker._pos[0],top:a.datepicker._pos[1]};a.datepicker._pos=null;f.dpDiv.empty();f.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});a.datepicker._updateDatepicker(f);j=a.datepicker._checkOffset(f,j,l);f.dpDiv.css({position:a.datepicker._inDialog&&a.blockUI?"static":l?"fixed":"absolute",display:"none",left:j.left+"px",top:j.top+"px"});if(!f.inline){j=a.datepicker._get(f,"showAnim");var o=a.datepicker._get(f,"duration"),n=function(){var k=f.dpDiv.find("iframe.ui-datepicker-cover");
-if(k.length){var m=a.datepicker._getBorders(f.dpDiv);k.css({left:-m[0],top:-m[1],width:f.dpDiv.outerWidth(),height:f.dpDiv.outerHeight()})}};f.dpDiv.zIndex(a(b).zIndex()+1);a.datepicker._datepickerShowing=true;a.effects&&a.effects[j]?f.dpDiv.show(j,a.datepicker._get(f,"showOptions"),o,n):f.dpDiv[j||"show"](j?o:null,n);if(!j||!o)n();f.input.is(":visible")&&!f.input.is(":disabled")&&f.input.focus();a.datepicker._curInst=f}}},_updateDatepicker:function(b){this.maxRows=4;var f=a.datepicker._getBorders(b.dpDiv);
-i=b;b.dpDiv.empty().append(this._generateHTML(b));var j=b.dpDiv.find("iframe.ui-datepicker-cover");j.length&&j.css({left:-f[0],top:-f[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()});b.dpDiv.find("."+this._dayOverClass+" a").mouseover();f=this._getNumberOfMonths(b);j=f[1];b.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");j>1&&b.dpDiv.addClass("ui-datepicker-multi-"+j).css("width",17*j+"em");b.dpDiv[(f[0]!=1||f[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");
-b.dpDiv[(this._get(b,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");b==a.datepicker._curInst&&a.datepicker._datepickerShowing&&b.input&&b.input.is(":visible")&&!b.input.is(":disabled")&&b.input[0]!=document.activeElement&&b.input.focus();if(b.yearshtml){var l=b.yearshtml;setTimeout(function(){l===b.yearshtml&&b.yearshtml&&b.dpDiv.find("select.ui-datepicker-year:first").replaceWith(b.yearshtml);l=b.yearshtml=null},0)}},_getBorders:function(b){var f=function(j){return{thin:1,medium:2,thick:3}[j]||
-j};return[parseFloat(f(b.css("border-left-width"))),parseFloat(f(b.css("border-top-width")))]},_checkOffset:function(b,f,j){var l=b.dpDiv.outerWidth(),o=b.dpDiv.outerHeight(),n=b.input?b.input.outerWidth():0,k=b.input?b.input.outerHeight():0,m=document.documentElement.clientWidth+a(document).scrollLeft(),p=document.documentElement.clientHeight+a(document).scrollTop();f.left-=this._get(b,"isRTL")?l-n:0;f.left-=j&&f.left==b.input.offset().left?a(document).scrollLeft():0;f.top-=j&&f.top==b.input.offset().top+
-k?a(document).scrollTop():0;f.left-=Math.min(f.left,f.left+l>m&&m>l?Math.abs(f.left+l-m):0);f.top-=Math.min(f.top,f.top+o>p&&p>o?Math.abs(o+k):0);return f},_findPos:function(b){for(var f=this._get(this._getInst(b),"isRTL");b&&(b.type=="hidden"||b.nodeType!=1||a.expr.filters.hidden(b));)b=b[f?"previousSibling":"nextSibling"];b=a(b).offset();return[b.left,b.top]},_triggerOnClose:function(b){var f=this._get(b,"onClose");if(f)f.apply(b.input?b.input[0]:null,[b.input?b.input.val():"",b])},_hideDatepicker:function(b){var f=
-this._curInst;if(!(!f||b&&f!=a.data(b,"datepicker")))if(this._datepickerShowing){b=this._get(f,"showAnim");var j=this._get(f,"duration"),l=function(){a.datepicker._tidyDialog(f);this._curInst=null};a.effects&&a.effects[b]?f.dpDiv.hide(b,a.datepicker._get(f,"showOptions"),j,l):f.dpDiv[b=="slideDown"?"slideUp":b=="fadeIn"?"fadeOut":"hide"](b?j:null,l);b||l();a.datepicker._triggerOnClose(f);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",
-left:"0",top:"-100px"});if(a.blockUI){a.unblockUI();a("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(b){b.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(b){if(a.datepicker._curInst){b=a(b.target);b[0].id!=a.datepicker._mainDivId&&b.parents("#"+a.datepicker._mainDivId).length==0&&!b.hasClass(a.datepicker.markerClassName)&&!b.hasClass(a.datepicker._triggerClass)&&a.datepicker._datepickerShowing&&!(a.datepicker._inDialog&&
-a.blockUI)&&a.datepicker._hideDatepicker()}},_adjustDate:function(b,f,j){b=a(b);var l=this._getInst(b[0]);if(!this._isDisabledDatepicker(b[0])){this._adjustInstDate(l,f+(j=="M"?this._get(l,"showCurrentAtPos"):0),j);this._updateDatepicker(l)}},_gotoToday:function(b){b=a(b);var f=this._getInst(b[0]);if(this._get(f,"gotoCurrent")&&f.currentDay){f.selectedDay=f.currentDay;f.drawMonth=f.selectedMonth=f.currentMonth;f.drawYear=f.selectedYear=f.currentYear}else{var j=new Date;f.selectedDay=j.getDate();f.drawMonth=
-f.selectedMonth=j.getMonth();f.drawYear=f.selectedYear=j.getFullYear()}this._notifyChange(f);this._adjustDate(b)},_selectMonthYear:function(b,f,j){b=a(b);var l=this._getInst(b[0]);l._selectingMonthYear=false;l["selected"+(j=="M"?"Month":"Year")]=l["draw"+(j=="M"?"Month":"Year")]=parseInt(f.options[f.selectedIndex].value,10);this._notifyChange(l);this._adjustDate(b)},_clickMonthYear:function(b){var f=this._getInst(a(b)[0]);f.input&&f._selectingMonthYear&&setTimeout(function(){f.input.focus()},0);f._selectingMonthYear=
-!f._selectingMonthYear},_selectDay:function(b,f,j,l){var o=a(b);if(!(a(l).hasClass(this._unselectableClass)||this._isDisabledDatepicker(o[0]))){o=this._getInst(o[0]);o.selectedDay=o.currentDay=a("a",l).html();o.selectedMonth=o.currentMonth=f;o.selectedYear=o.currentYear=j;this._selectDate(b,this._formatDate(o,o.currentDay,o.currentMonth,o.currentYear))}},_clearDate:function(b){b=a(b);this._getInst(b[0]);this._selectDate(b,"")},_selectDate:function(b,f){b=this._getInst(a(b)[0]);f=f!=null?f:this._formatDate(b);
-b.input&&b.input.val(f);this._updateAlternate(b);var j=this._get(b,"onSelect");if(j)j.apply(b.input?b.input[0]:null,[f,b]);else b.input&&b.input.trigger("change");if(b.inline)this._updateDatepicker(b);else{this._hideDatepicker();this._lastInput=b.input[0];typeof b.input[0]!="object"&&b.input.focus();this._lastInput=null}},_updateAlternate:function(b){var f=this._get(b,"altField");if(f){var j=this._get(b,"altFormat")||this._get(b,"dateFormat"),l=this._getDate(b),o=this.formatDate(j,l,this._getFormatConfig(b));
-a(f).each(function(){a(this).val(o)})}},noWeekends:function(b){b=b.getDay();return[b>0&&b<6,""]},iso8601Week:function(b){b=new Date(b.getTime());b.setDate(b.getDate()+4-(b.getDay()||7));var f=b.getTime();b.setMonth(0);b.setDate(1);return Math.floor(Math.round((f-b)/864E5)/7)+1},parseDate:function(b,f,j){if(b==null||f==null)throw"Invalid arguments";f=typeof f=="object"?f.toString():f+"";if(f=="")return null;var l=(j?j.shortYearCutoff:null)||this._defaults.shortYearCutoff;l=typeof l!="string"?l:(new Date).getFullYear()%
-100+parseInt(l,10);for(var o=(j?j.dayNamesShort:null)||this._defaults.dayNamesShort,n=(j?j.dayNames:null)||this._defaults.dayNames,k=(j?j.monthNamesShort:null)||this._defaults.monthNamesShort,m=(j?j.monthNames:null)||this._defaults.monthNames,p=j=-1,q=-1,s=-1,r=false,u=function(z){(z=H+1<b.length&&b.charAt(H+1)==z)&&H++;return z},v=function(z){var I=u(z);z=new RegExp("^\\d{1,"+(z=="@"?14:z=="!"?20:z=="y"&&I?4:z=="o"?3:2)+"}");z=f.substring(y).match(z);if(!z)throw"Missing number at position "+y;y+=
-z[0].length;return parseInt(z[0],10)},w=function(z,I,N){z=a.map(u(z)?N:I,function(D,E){return[[E,D]]}).sort(function(D,E){return-(D[1].length-E[1].length)});var J=-1;a.each(z,function(D,E){D=E[1];if(f.substr(y,D.length).toLowerCase()==D.toLowerCase()){J=E[0];y+=D.length;return false}});if(J!=-1)return J+1;else throw"Unknown name at position "+y;},x=function(){if(f.charAt(y)!=b.charAt(H))throw"Unexpected literal at position "+y;y++},y=0,H=0;H<b.length;H++)if(r)if(b.charAt(H)=="'"&&!u("'"))r=false;
-else x();else switch(b.charAt(H)){case "d":q=v("d");break;case "D":w("D",o,n);break;case "o":s=v("o");break;case "m":p=v("m");break;case "M":p=w("M",k,m);break;case "y":j=v("y");break;case "@":var C=new Date(v("@"));j=C.getFullYear();p=C.getMonth()+1;q=C.getDate();break;case "!":C=new Date((v("!")-this._ticksTo1970)/1E4);j=C.getFullYear();p=C.getMonth()+1;q=C.getDate();break;case "'":if(u("'"))x();else r=true;break;default:x()}if(y<f.length)throw"Extra/unparsed characters found in date: "+f.substring(y);
-if(j==-1)j=(new Date).getFullYear();else if(j<100)j+=(new Date).getFullYear()-(new Date).getFullYear()%100+(j<=l?0:-100);if(s>-1){p=1;q=s;do{l=this._getDaysInMonth(j,p-1);if(q<=l)break;p++;q-=l}while(1)}C=this._daylightSavingAdjust(new Date(j,p-1,q));if(C.getFullYear()!=j||C.getMonth()+1!=p||C.getDate()!=q)throw"Invalid date";return C},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",
-TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1E7,formatDate:function(b,f,j){if(!f)return"";var l=(j?j.dayNamesShort:null)||this._defaults.dayNamesShort,o=(j?j.dayNames:null)||this._defaults.dayNames,n=(j?j.monthNamesShort:null)||this._defaults.monthNamesShort;j=(j?j.monthNames:null)||this._defaults.monthNames;var k=function(u){(u=r+1<b.length&&b.charAt(r+1)==u)&&r++;return u},m=function(u,v,w){v=""+v;if(k(u))for(;v.length<
-w;)v="0"+v;return v},p=function(u,v,w,x){return k(u)?x[v]:w[v]},q="",s=false;if(f)for(var r=0;r<b.length;r++)if(s)if(b.charAt(r)=="'"&&!k("'"))s=false;else q+=b.charAt(r);else switch(b.charAt(r)){case "d":q+=m("d",f.getDate(),2);break;case "D":q+=p("D",f.getDay(),l,o);break;case "o":q+=m("o",Math.round(((new Date(f.getFullYear(),f.getMonth(),f.getDate())).getTime()-(new Date(f.getFullYear(),0,0)).getTime())/864E5),3);break;case "m":q+=m("m",f.getMonth()+1,2);break;case "M":q+=p("M",f.getMonth(),n,
-j);break;case "y":q+=k("y")?f.getFullYear():(f.getYear()%100<10?"0":"")+f.getYear()%100;break;case "@":q+=f.getTime();break;case "!":q+=f.getTime()*1E4+this._ticksTo1970;break;case "'":if(k("'"))q+="'";else s=true;break;default:q+=b.charAt(r)}return q},_possibleChars:function(b){for(var f="",j=false,l=function(n){(n=o+1<b.length&&b.charAt(o+1)==n)&&o++;return n},o=0;o<b.length;o++)if(j)if(b.charAt(o)=="'"&&!l("'"))j=false;else f+=b.charAt(o);else switch(b.charAt(o)){case "d":case "m":case "y":case "@":f+=
-"0123456789";break;case "D":case "M":return null;case "'":if(l("'"))f+="'";else j=true;break;default:f+=b.charAt(o)}return f},_get:function(b,f){return b.settings[f]!==d?b.settings[f]:this._defaults[f]},_setDateFromField:function(b,f){if(b.input.val()!=b.lastVal){var j=this._get(b,"dateFormat"),l=b.lastVal=b.input?b.input.val():null,o,n;o=n=this._getDefaultDate(b);var k=this._getFormatConfig(b);try{o=this.parseDate(j,l,k)||n}catch(m){this.log(m);l=f?"":l}b.selectedDay=o.getDate();b.drawMonth=b.selectedMonth=
-o.getMonth();b.drawYear=b.selectedYear=o.getFullYear();b.currentDay=l?o.getDate():0;b.currentMonth=l?o.getMonth():0;b.currentYear=l?o.getFullYear():0;this._adjustInstDate(b)}},_getDefaultDate:function(b){return this._restrictMinMax(b,this._determineDate(b,this._get(b,"defaultDate"),new Date))},_determineDate:function(b,f,j){var l=function(n){var k=new Date;k.setDate(k.getDate()+n);return k},o=function(n){try{return a.datepicker.parseDate(a.datepicker._get(b,"dateFormat"),n,a.datepicker._getFormatConfig(b))}catch(k){}var m=
-(n.toLowerCase().match(/^c/)?a.datepicker._getDate(b):null)||new Date,p=m.getFullYear(),q=m.getMonth();m=m.getDate();for(var s=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,r=s.exec(n);r;){switch(r[2]||"d"){case "d":case "D":m+=parseInt(r[1],10);break;case "w":case "W":m+=parseInt(r[1],10)*7;break;case "m":case "M":q+=parseInt(r[1],10);m=Math.min(m,a.datepicker._getDaysInMonth(p,q));break;case "y":case "Y":p+=parseInt(r[1],10);m=Math.min(m,a.datepicker._getDaysInMonth(p,q));break}r=s.exec(n)}return new Date(p,
-q,m)};if(f=(f=f==null||f===""?j:typeof f=="string"?o(f):typeof f=="number"?isNaN(f)?j:l(f):new Date(f.getTime()))&&f.toString()=="Invalid Date"?j:f){f.setHours(0);f.setMinutes(0);f.setSeconds(0);f.setMilliseconds(0)}return this._daylightSavingAdjust(f)},_daylightSavingAdjust:function(b){if(!b)return null;b.setHours(b.getHours()>12?b.getHours()+2:0);return b},_setDate:function(b,f,j){var l=!f,o=b.selectedMonth,n=b.selectedYear;f=this._restrictMinMax(b,this._determineDate(b,f,new Date));b.selectedDay=
-b.currentDay=f.getDate();b.drawMonth=b.selectedMonth=b.currentMonth=f.getMonth();b.drawYear=b.selectedYear=b.currentYear=f.getFullYear();if((o!=b.selectedMonth||n!=b.selectedYear)&&!j)this._notifyChange(b);this._adjustInstDate(b);if(b.input)b.input.val(l?"":this._formatDate(b))},_getDate:function(b){return!b.currentYear||b.input&&b.input.val()==""?null:this._daylightSavingAdjust(new Date(b.currentYear,b.currentMonth,b.currentDay))},_generateHTML:function(b){var f=new Date;f=this._daylightSavingAdjust(new Date(f.getFullYear(),
-f.getMonth(),f.getDate()));var j=this._get(b,"isRTL"),l=this._get(b,"showButtonPanel"),o=this._get(b,"hideIfNoPrevNext"),n=this._get(b,"navigationAsDateFormat"),k=this._getNumberOfMonths(b),m=this._get(b,"showCurrentAtPos"),p=this._get(b,"stepMonths"),q=k[0]!=1||k[1]!=1,s=this._daylightSavingAdjust(!b.currentDay?new Date(9999,9,9):new Date(b.currentYear,b.currentMonth,b.currentDay)),r=this._getMinMaxDate(b,"min"),u=this._getMinMaxDate(b,"max");m=b.drawMonth-m;var v=b.drawYear;if(m<0){m+=12;v--}if(u){var w=
-this._daylightSavingAdjust(new Date(u.getFullYear(),u.getMonth()-k[0]*k[1]+1,u.getDate()));for(w=r&&w<r?r:w;this._daylightSavingAdjust(new Date(v,m,1))>w;){m--;if(m<0){m=11;v--}}}b.drawMonth=m;b.drawYear=v;w=this._get(b,"prevText");w=!n?w:this.formatDate(w,this._daylightSavingAdjust(new Date(v,m-p,1)),this._getFormatConfig(b));w=this._canAdjustMonth(b,-1,v,m)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_'+g+".datepicker._adjustDate('#"+b.id+"', -"+p+", 'M');\" title=\""+w+'"><span class="ui-icon ui-icon-circle-triangle-'+
-(j?"e":"w")+'">'+w+"</span></a>":o?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+w+'"><span class="ui-icon ui-icon-circle-triangle-'+(j?"e":"w")+'">'+w+"</span></a>";var x=this._get(b,"nextText");x=!n?x:this.formatDate(x,this._daylightSavingAdjust(new Date(v,m+p,1)),this._getFormatConfig(b));o=this._canAdjustMonth(b,+1,v,m)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_'+g+".datepicker._adjustDate('#"+b.id+"', +"+p+", 'M');\" title=\""+x+'"><span class="ui-icon ui-icon-circle-triangle-'+
-(j?"w":"e")+'">'+x+"</span></a>":o?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+x+'"><span class="ui-icon ui-icon-circle-triangle-'+(j?"w":"e")+'">'+x+"</span></a>";p=this._get(b,"currentText");x=this._get(b,"gotoCurrent")&&b.currentDay?s:f;p=!n?p:this.formatDate(p,x,this._getFormatConfig(b));n=!b.inline?'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_'+g+'.datepicker._hideDatepicker();">'+this._get(b,
-"closeText")+"</button>":"";l=l?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(j?n:"")+(this._isInRange(b,x)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_'+g+".datepicker._gotoToday('#"+b.id+"');\">"+p+"</button>":"")+(j?"":n)+"</div>":"";n=parseInt(this._get(b,"firstDay"),10);n=isNaN(n)?0:n;p=this._get(b,"showWeek");x=this._get(b,"dayNames");this._get(b,"dayNamesShort");var y=this._get(b,"dayNamesMin"),H=
-this._get(b,"monthNames"),C=this._get(b,"monthNamesShort"),z=this._get(b,"beforeShowDay"),I=this._get(b,"showOtherMonths"),N=this._get(b,"selectOtherMonths");this._get(b,"calculateWeek");for(var J=this._getDefaultDate(b),D="",E=0;E<k[0];E++){var P="";this.maxRows=4;for(var L=0;L<k[1];L++){var Q=this._daylightSavingAdjust(new Date(v,m,b.selectedDay)),B=" ui-corner-all",F="";if(q){F+='<div class="ui-datepicker-group';if(k[1]>1)switch(L){case 0:F+=" ui-datepicker-group-first";B=" ui-corner-"+(j?"right":
-"left");break;case k[1]-1:F+=" ui-datepicker-group-last";B=" ui-corner-"+(j?"left":"right");break;default:F+=" ui-datepicker-group-middle";B="";break}F+='">'}F+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+B+'">'+(/all|left/.test(B)&&E==0?j?o:w:"")+(/all|right/.test(B)&&E==0?j?w:o:"")+this._generateMonthYearHeader(b,m,v,r,u,E>0||L>0,H,C)+'</div><table class="ui-datepicker-calendar"><thead><tr>';var G=p?'<th class="ui-datepicker-week-col">'+this._get(b,"weekHeader")+"</th>":
-"";for(B=0;B<7;B++){var A=(B+n)%7;G+="<th"+((B+n+6)%7>=5?' class="ui-datepicker-week-end"':"")+'><span title="'+x[A]+'">'+y[A]+"</span></th>"}F+=G+"</tr></thead><tbody>";G=this._getDaysInMonth(v,m);if(v==b.selectedYear&&m==b.selectedMonth)b.selectedDay=Math.min(b.selectedDay,G);B=(this._getFirstDayOfMonth(v,m)-n+7)%7;G=Math.ceil((B+G)/7);this.maxRows=G=q?this.maxRows>G?this.maxRows:G:G;A=this._daylightSavingAdjust(new Date(v,m,1-B));for(var R=0;R<G;R++){F+="<tr>";var S=!p?"":'<td class="ui-datepicker-week-col">'+
-this._get(b,"calculateWeek")(A)+"</td>";for(B=0;B<7;B++){var M=z?z.apply(b.input?b.input[0]:null,[A]):[true,""],K=A.getMonth()!=m,O=K&&!N||!M[0]||r&&A<r||u&&A>u;S+='<td class="'+((B+n+6)%7>=5?" ui-datepicker-week-end":"")+(K?" ui-datepicker-other-month":"")+(A.getTime()==Q.getTime()&&m==b.selectedMonth&&b._keyEvent||J.getTime()==A.getTime()&&J.getTime()==Q.getTime()?" "+this._dayOverClass:"")+(O?" "+this._unselectableClass+" ui-state-disabled":"")+(K&&!I?"":" "+M[1]+(A.getTime()==s.getTime()?" "+
-this._currentClass:"")+(A.getTime()==f.getTime()?" ui-datepicker-today":""))+'"'+((!K||I)&&M[2]?' title="'+M[2]+'"':"")+(O?"":' onclick="DP_jQuery_'+g+".datepicker._selectDay('#"+b.id+"',"+A.getMonth()+","+A.getFullYear()+', this);return false;"')+">"+(K&&!I?"&#xa0;":O?'<span class="ui-state-default">'+A.getDate()+"</span>":'<a class="ui-state-default'+(A.getTime()==f.getTime()?" ui-state-highlight":"")+(A.getTime()==s.getTime()?" ui-state-active":"")+(K?" ui-priority-secondary":"")+'" href="#">'+
-A.getDate()+"</a>")+"</td>";A.setDate(A.getDate()+1);A=this._daylightSavingAdjust(A)}F+=S+"</tr>"}m++;if(m>11){m=0;v++}F+="</tbody></table>"+(q?"</div>"+(k[0]>0&&L==k[1]-1?'<div class="ui-datepicker-row-break"></div>':""):"");P+=F}D+=P}D+=l+(a.browser.msie&&parseInt(a.browser.version,10)<7&&!b.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':"");b._keyEvent=false;return D},_generateMonthYearHeader:function(b,f,j,l,o,n,k,m){var p=this._get(b,"changeMonth"),
-q=this._get(b,"changeYear"),s=this._get(b,"showMonthAfterYear"),r='<div class="ui-datepicker-title">',u="";if(n||!p)u+='<span class="ui-datepicker-month">'+k[f]+"</span>";else{k=l&&l.getFullYear()==j;var v=o&&o.getFullYear()==j;u+='<select class="ui-datepicker-month" onchange="DP_jQuery_'+g+".datepicker._selectMonthYear('#"+b.id+"', this, 'M');\" onclick=\"DP_jQuery_"+g+".datepicker._clickMonthYear('#"+b.id+"');\">";for(var w=0;w<12;w++)if((!k||w>=l.getMonth())&&(!v||w<=o.getMonth()))u+='<option value="'+
-w+'"'+(w==f?' selected="selected"':"")+">"+m[w]+"</option>";u+="</select>"}s||(r+=u+(n||!(p&&q)?"&#xa0;":""));if(!b.yearshtml){b.yearshtml="";if(n||!q)r+='<span class="ui-datepicker-year">'+j+"</span>";else{m=this._get(b,"yearRange").split(":");var x=(new Date).getFullYear();k=function(y){y=y.match(/c[+-].*/)?j+parseInt(y.substring(1),10):y.match(/[+-].*/)?x+parseInt(y,10):parseInt(y,10);return isNaN(y)?x:y};f=k(m[0]);m=Math.max(f,k(m[1]||""));f=l?Math.max(f,l.getFullYear()):f;m=o?Math.min(m,o.getFullYear()):
-m;for(b.yearshtml+='<select class="ui-datepicker-year" onchange="DP_jQuery_'+g+".datepicker._selectMonthYear('#"+b.id+"', this, 'Y');\" onclick=\"DP_jQuery_"+g+".datepicker._clickMonthYear('#"+b.id+"');\">";f<=m;f++)b.yearshtml+='<option value="'+f+'"'+(f==j?' selected="selected"':"")+">"+f+"</option>";b.yearshtml+="</select>";r+=b.yearshtml;b.yearshtml=null}}r+=this._get(b,"yearSuffix");if(s)r+=(n||!(p&&q)?"&#xa0;":"")+u;r+="</div>";return r},_adjustInstDate:function(b,f,j){var l=b.drawYear+(j==
-"Y"?f:0),o=b.drawMonth+(j=="M"?f:0);f=Math.min(b.selectedDay,this._getDaysInMonth(l,o))+(j=="D"?f:0);l=this._restrictMinMax(b,this._daylightSavingAdjust(new Date(l,o,f)));b.selectedDay=l.getDate();b.drawMonth=b.selectedMonth=l.getMonth();b.drawYear=b.selectedYear=l.getFullYear();if(j=="M"||j=="Y")this._notifyChange(b)},_restrictMinMax:function(b,f){var j=this._getMinMaxDate(b,"min");b=this._getMinMaxDate(b,"max");f=j&&f<j?j:f;return f=b&&f>b?b:f},_notifyChange:function(b){var f=this._get(b,"onChangeMonthYear");
-if(f)f.apply(b.input?b.input[0]:null,[b.selectedYear,b.selectedMonth+1,b])},_getNumberOfMonths:function(b){b=this._get(b,"numberOfMonths");return b==null?[1,1]:typeof b=="number"?[1,b]:b},_getMinMaxDate:function(b,f){return this._determineDate(b,this._get(b,f+"Date"),null)},_getDaysInMonth:function(b,f){return 32-this._daylightSavingAdjust(new Date(b,f,32)).getDate()},_getFirstDayOfMonth:function(b,f){return(new Date(b,f,1)).getDay()},_canAdjustMonth:function(b,f,j,l){var o=this._getNumberOfMonths(b);
-j=this._daylightSavingAdjust(new Date(j,l+(f<0?f:o[0]*o[1]),1));f<0&&j.setDate(this._getDaysInMonth(j.getFullYear(),j.getMonth()));return this._isInRange(b,j)},_isInRange:function(b,f){var j=this._getMinMaxDate(b,"min");b=this._getMinMaxDate(b,"max");return(!j||f.getTime()>=j.getTime())&&(!b||f.getTime()<=b.getTime())},_getFormatConfig:function(b){var f=this._get(b,"shortYearCutoff");f=typeof f!="string"?f:(new Date).getFullYear()%100+parseInt(f,10);return{shortYearCutoff:f,dayNamesShort:this._get(b,
-"dayNamesShort"),dayNames:this._get(b,"dayNames"),monthNamesShort:this._get(b,"monthNamesShort"),monthNames:this._get(b,"monthNames")}},_formatDate:function(b,f,j,l){if(!f){b.currentDay=b.selectedDay;b.currentMonth=b.selectedMonth;b.currentYear=b.selectedYear}f=f?typeof f=="object"?f:this._daylightSavingAdjust(new Date(l,j,f)):this._daylightSavingAdjust(new Date(b.currentYear,b.currentMonth,b.currentDay));return this.formatDate(this._get(b,"dateFormat"),f,this._getFormatConfig(b))}});a.fn.datepicker=
-function(b){if(!this.length)return this;if(!a.datepicker.initialized){a(document).mousedown(a.datepicker._checkExternalClick).find("body").append(a.datepicker.dpDiv);a.datepicker.initialized=true}var f=Array.prototype.slice.call(arguments,1);if(typeof b=="string"&&(b=="isDisabled"||b=="getDate"||b=="widget"))return a.datepicker["_"+b+"Datepicker"].apply(a.datepicker,[this[0]].concat(f));if(b=="option"&&arguments.length==2&&typeof arguments[1]=="string")return a.datepicker["_"+b+"Datepicker"].apply(a.datepicker,
-[this[0]].concat(f));return this.each(function(){typeof b=="string"?a.datepicker["_"+b+"Datepicker"].apply(a.datepicker,[this].concat(f)):a.datepicker._attachDatepicker(this,b)})};a.datepicker=new c;a.datepicker.initialized=false;a.datepicker.uuid=(new Date).getTime();a.datepicker.version="1.8.14";window["DP_jQuery_"+g]=a})(jQuery);
-(function(a,d){var c={buttons:true,height:true,maxHeight:true,maxWidth:true,minHeight:true,minWidth:true,width:true},e={maxHeight:true,maxWidth:true,minHeight:true,minWidth:true},h=a.attrFn||{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true,click:true};a.widget("ui.dialog",{options:{autoOpen:true,buttons:{},closeOnEscape:true,closeText:"close",dialogClass:"",draggable:true,hide:null,height:"auto",maxHeight:false,maxWidth:false,minHeight:150,minWidth:150,modal:false,
-position:{my:"center",at:"center",collision:"fit",using:function(g){var i=a(this).css(g).offset().top;i<0&&a(this).css("top",g.top-i)}},resizable:true,show:null,stack:true,title:"",width:300,zIndex:1E3},_create:function(){this.originalTitle=this.element.attr("title");if(typeof this.originalTitle!=="string")this.originalTitle="";this.options.title=this.options.title||this.originalTitle;var g=this,i=g.options,b=i.title||"&#160;",f=a.ui.dialog.getTitleId(g.element),j=(g.uiDialog=a("<div></div>")).appendTo(document.body).hide().addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+
-i.dialogClass).css({zIndex:i.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(n){if(i.closeOnEscape&&n.keyCode&&n.keyCode===a.ui.keyCode.ESCAPE){g.close(n);n.preventDefault()}}).attr({role:"dialog","aria-labelledby":f}).mousedown(function(n){g.moveToTop(false,n)});g.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(j);var l=(g.uiDialogTitlebar=a("<div></div>")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(j),
-o=a('<a href="#"></a>').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role","button").hover(function(){o.addClass("ui-state-hover")},function(){o.removeClass("ui-state-hover")}).focus(function(){o.addClass("ui-state-focus")}).blur(function(){o.removeClass("ui-state-focus")}).click(function(n){g.close(n);return false}).appendTo(l);(g.uiDialogTitlebarCloseText=a("<span></span>")).addClass("ui-icon ui-icon-closethick").text(i.closeText).appendTo(o);a("<span></span>").addClass("ui-dialog-title").attr("id",
-f).html(b).prependTo(l);if(a.isFunction(i.beforeclose)&&!a.isFunction(i.beforeClose))i.beforeClose=i.beforeclose;l.find("*").add(l).disableSelection();i.draggable&&a.fn.draggable&&g._makeDraggable();i.resizable&&a.fn.resizable&&g._makeResizable();g._createButtons(i.buttons);g._isOpen=false;a.fn.bgiframe&&j.bgiframe()},_init:function(){this.options.autoOpen&&this.open()},destroy:function(){var g=this;g.overlay&&g.overlay.destroy();g.uiDialog.hide();g.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body");
-g.uiDialog.remove();g.originalTitle&&g.element.attr("title",g.originalTitle);return g},widget:function(){return this.uiDialog},close:function(g){var i=this,b,f;if(false!==i._trigger("beforeClose",g)){i.overlay&&i.overlay.destroy();i.uiDialog.unbind("keypress.ui-dialog");i._isOpen=false;if(i.options.hide)i.uiDialog.hide(i.options.hide,function(){i._trigger("close",g)});else{i.uiDialog.hide();i._trigger("close",g)}a.ui.dialog.overlay.resize();if(i.options.modal){b=0;a(".ui-dialog").each(function(){if(this!==
-i.uiDialog[0]){f=a(this).css("z-index");isNaN(f)||(b=Math.max(b,f))}});a.ui.dialog.maxZ=b}return i}},isOpen:function(){return this._isOpen},moveToTop:function(g,i){var b=this,f=b.options;if(f.modal&&!g||!f.stack&&!f.modal)return b._trigger("focus",i);if(f.zIndex>a.ui.dialog.maxZ)a.ui.dialog.maxZ=f.zIndex;if(b.overlay){a.ui.dialog.maxZ+=1;b.overlay.$el.css("z-index",a.ui.dialog.overlay.maxZ=a.ui.dialog.maxZ)}g={scrollTop:b.element.attr("scrollTop"),scrollLeft:b.element.attr("scrollLeft")};a.ui.dialog.maxZ+=
-1;b.uiDialog.css("z-index",a.ui.dialog.maxZ);b.element.attr(g);b._trigger("focus",i);return b},open:function(){if(!this._isOpen){var g=this,i=g.options,b=g.uiDialog;g.overlay=i.modal?new a.ui.dialog.overlay(g):null;g._size();g._position(i.position);b.show(i.show);g.moveToTop(true);i.modal&&b.bind("keypress.ui-dialog",function(f){if(f.keyCode===a.ui.keyCode.TAB){var j=a(":tabbable",this),l=j.filter(":first");j=j.filter(":last");if(f.target===j[0]&&!f.shiftKey){l.focus(1);return false}else if(f.target===
-l[0]&&f.shiftKey){j.focus(1);return false}}});a(g.element.find(":tabbable").get().concat(b.find(".ui-dialog-buttonpane :tabbable").get().concat(b.get()))).eq(0).focus();g._isOpen=true;g._trigger("open");return g}},_createButtons:function(g){var i=this,b=false,f=a("<div></div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),j=a("<div></div>").addClass("ui-dialog-buttonset").appendTo(f);i.uiDialog.find(".ui-dialog-buttonpane").remove();typeof g==="object"&&g!==null&&a.each(g,
-function(){return!(b=true)});if(b){a.each(g,function(l,o){o=a.isFunction(o)?{click:o,text:l}:o;var n=a('<button type="button"></button>').click(function(){o.click.apply(i.element[0],arguments)}).appendTo(j);a.each(o,function(k,m){if(k!=="click")k in h?n[k](m):n.attr(k,m)});a.fn.button&&n.button()});f.appendTo(i.uiDialog)}},_makeDraggable:function(){function g(l){return{position:l.position,offset:l.offset}}var i=this,b=i.options,f=a(document),j;i.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",
-handle:".ui-dialog-titlebar",containment:"document",start:function(l,o){j=b.height==="auto"?"auto":a(this).height();a(this).height(a(this).height()).addClass("ui-dialog-dragging");i._trigger("dragStart",l,g(o))},drag:function(l,o){i._trigger("drag",l,g(o))},stop:function(l,o){b.position=[o.position.left-f.scrollLeft(),o.position.top-f.scrollTop()];a(this).removeClass("ui-dialog-dragging").height(j);i._trigger("dragStop",l,g(o));a.ui.dialog.overlay.resize()}})},_makeResizable:function(g){function i(l){return{originalPosition:l.originalPosition,
-originalSize:l.originalSize,position:l.position,size:l.size}}g=g===d?this.options.resizable:g;var b=this,f=b.options,j=b.uiDialog.css("position");g=typeof g==="string"?g:"n,e,s,w,se,sw,ne,nw";b.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:b.element,maxWidth:f.maxWidth,maxHeight:f.maxHeight,minWidth:f.minWidth,minHeight:b._minHeight(),handles:g,start:function(l,o){a(this).addClass("ui-dialog-resizing");b._trigger("resizeStart",l,i(o))},resize:function(l,o){b._trigger("resize",
-l,i(o))},stop:function(l,o){a(this).removeClass("ui-dialog-resizing");f.height=a(this).height();f.width=a(this).width();b._trigger("resizeStop",l,i(o));a.ui.dialog.overlay.resize()}}).css("position",j).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var g=this.options;return g.height==="auto"?g.minHeight:Math.min(g.minHeight,g.height)},_position:function(g){var i=[],b=[0,0],f;if(g){if(typeof g==="string"||typeof g==="object"&&"0"in g){i=g.split?g.split(" "):
-[g[0],g[1]];if(i.length===1)i[1]=i[0];a.each(["left","top"],function(j,l){if(+i[j]===i[j]){b[j]=i[j];i[j]=l}});g={my:i.join(" "),at:i.join(" "),offset:b.join(" ")}}g=a.extend({},a.ui.dialog.prototype.options.position,g)}else g=a.ui.dialog.prototype.options.position;(f=this.uiDialog.is(":visible"))||this.uiDialog.show();this.uiDialog.css({top:0,left:0}).position(a.extend({of:window},g));f||this.uiDialog.hide()},_setOptions:function(g){var i=this,b={},f=false;a.each(g,function(j,l){i._setOption(j,l);
-if(j in c)f=true;if(j in e)b[j]=l});f&&this._size();this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option",b)},_setOption:function(g,i){var b=this,f=b.uiDialog;switch(g){case "beforeclose":g="beforeClose";break;case "buttons":b._createButtons(i);break;case "closeText":b.uiDialogTitlebarCloseText.text(""+i);break;case "dialogClass":f.removeClass(b.options.dialogClass).addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+i);break;case "disabled":i?f.addClass("ui-dialog-disabled"):
-f.removeClass("ui-dialog-disabled");break;case "draggable":var j=f.is(":data(draggable)");j&&!i&&f.draggable("destroy");!j&&i&&b._makeDraggable();break;case "position":b._position(i);break;case "resizable":(j=f.is(":data(resizable)"))&&!i&&f.resizable("destroy");j&&typeof i==="string"&&f.resizable("option","handles",i);!j&&i!==false&&b._makeResizable(i);break;case "title":a(".ui-dialog-title",b.uiDialogTitlebar).html(""+(i||"&#160;"));break}a.Widget.prototype._setOption.apply(b,arguments)},_size:function(){var g=
-this.options,i,b,f=this.uiDialog.is(":visible");this.element.show().css({width:"auto",minHeight:0,height:0});if(g.minWidth>g.width)g.width=g.minWidth;i=this.uiDialog.css({height:"auto",width:g.width}).height();b=Math.max(0,g.minHeight-i);if(g.height==="auto")if(a.support.minHeight)this.element.css({minHeight:b,height:"auto"});else{this.uiDialog.show();g=this.element.css("height","auto").height();f||this.uiDialog.hide();this.element.height(Math.max(g,b))}else this.element.height(Math.max(g.height-
-i,0));this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())}});a.extend(a.ui.dialog,{version:"1.8.14",uuid:0,maxZ:0,getTitleId:function(g){g=g.attr("id");if(!g){this.uuid+=1;g=this.uuid}return"ui-dialog-title-"+g},overlay:function(g){this.$el=a.ui.dialog.overlay.create(g)}});a.extend(a.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:a.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(g){return g+".dialog-overlay"}).join(" "),
-create:function(g){if(this.instances.length===0){setTimeout(function(){a.ui.dialog.overlay.instances.length&&a(document).bind(a.ui.dialog.overlay.events,function(b){if(a(b.target).zIndex()<a.ui.dialog.overlay.maxZ)return false})},1);a(document).bind("keydown.dialog-overlay",function(b){if(g.options.closeOnEscape&&b.keyCode&&b.keyCode===a.ui.keyCode.ESCAPE){g.close(b);b.preventDefault()}});a(window).bind("resize.dialog-overlay",a.ui.dialog.overlay.resize)}var i=(this.oldInstances.pop()||a("<div></div>").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(),
-height:this.height()});a.fn.bgiframe&&i.bgiframe();this.instances.push(i);return i},destroy:function(g){var i=a.inArray(g,this.instances);i!=-1&&this.oldInstances.push(this.instances.splice(i,1)[0]);this.instances.length===0&&a([document,window]).unbind(".dialog-overlay");g.remove();var b=0;a.each(this.instances,function(){b=Math.max(b,this.css("z-index"))});this.maxZ=b},height:function(){var g,i;if(a.browser.msie&&a.browser.version<7){g=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight);
-i=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return g<i?a(window).height()+"px":g+"px"}else return a(document).height()+"px"},width:function(){var g,i;if(a.browser.msie){g=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth);i=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);return g<i?a(window).width()+"px":g+"px"}else return a(document).width()+"px"},resize:function(){var g=a([]);a.each(a.ui.dialog.overlay.instances,function(){g=
-g.add(this)});g.css({width:0,height:0}).css({width:a.ui.dialog.overlay.width(),height:a.ui.dialog.overlay.height()})}});a.extend(a.ui.dialog.overlay.prototype,{destroy:function(){a.ui.dialog.overlay.destroy(this.$el)}})})(jQuery);
-(function(a){a.ui=a.ui||{};var d=/left|center|right/,c=/top|center|bottom/,e=a.fn.position,h=a.fn.offset;a.fn.position=function(g){if(!g||!g.of)return e.apply(this,arguments);g=a.extend({},g);var i=a(g.of),b=i[0],f=(g.collision||"flip").split(" "),j=g.offset?g.offset.split(" "):[0,0],l,o,n;if(b.nodeType===9){l=i.width();o=i.height();n={top:0,left:0}}else if(b.setTimeout){l=i.width();o=i.height();n={top:i.scrollTop(),left:i.scrollLeft()}}else if(b.preventDefault){g.at="left top";l=o=0;n={top:g.of.pageY,
-left:g.of.pageX}}else{l=i.outerWidth();o=i.outerHeight();n=i.offset()}a.each(["my","at"],function(){var k=(g[this]||"").split(" ");if(k.length===1)k=d.test(k[0])?k.concat(["center"]):c.test(k[0])?["center"].concat(k):["center","center"];k[0]=d.test(k[0])?k[0]:"center";k[1]=c.test(k[1])?k[1]:"center";g[this]=k});if(f.length===1)f[1]=f[0];j[0]=parseInt(j[0],10)||0;if(j.length===1)j[1]=j[0];j[1]=parseInt(j[1],10)||0;if(g.at[0]==="right")n.left+=l;else if(g.at[0]==="center")n.left+=l/2;if(g.at[1]==="bottom")n.top+=
-o;else if(g.at[1]==="center")n.top+=o/2;n.left+=j[0];n.top+=j[1];return this.each(function(){var k=a(this),m=k.outerWidth(),p=k.outerHeight(),q=parseInt(a.curCSS(this,"marginLeft",true))||0,s=parseInt(a.curCSS(this,"marginTop",true))||0,r=m+q+(parseInt(a.curCSS(this,"marginRight",true))||0),u=p+s+(parseInt(a.curCSS(this,"marginBottom",true))||0),v=a.extend({},n),w;if(g.my[0]==="right")v.left-=m;else if(g.my[0]==="center")v.left-=m/2;if(g.my[1]==="bottom")v.top-=p;else if(g.my[1]==="center")v.top-=
-p/2;v.left=Math.round(v.left);v.top=Math.round(v.top);w={left:v.left-q,top:v.top-s};a.each(["left","top"],function(x,y){a.ui.position[f[x]]&&a.ui.position[f[x]][y](v,{targetWidth:l,targetHeight:o,elemWidth:m,elemHeight:p,collisionPosition:w,collisionWidth:r,collisionHeight:u,offset:j,my:g.my,at:g.at})});a.fn.bgiframe&&k.bgiframe();k.offset(a.extend(v,{using:g.using}))})};a.ui.position={fit:{left:function(g,i){var b=a(window);b=i.collisionPosition.left+i.collisionWidth-b.width()-b.scrollLeft();g.left=
-b>0?g.left-b:Math.max(g.left-i.collisionPosition.left,g.left)},top:function(g,i){var b=a(window);b=i.collisionPosition.top+i.collisionHeight-b.height()-b.scrollTop();g.top=b>0?g.top-b:Math.max(g.top-i.collisionPosition.top,g.top)}},flip:{left:function(g,i){if(i.at[0]!=="center"){var b=a(window);b=i.collisionPosition.left+i.collisionWidth-b.width()-b.scrollLeft();var f=i.my[0]==="left"?-i.elemWidth:i.my[0]==="right"?i.elemWidth:0,j=i.at[0]==="left"?i.targetWidth:-i.targetWidth,l=-2*i.offset[0];g.left+=
-i.collisionPosition.left<0?f+j+l:b>0?f+j+l:0}},top:function(g,i){if(i.at[1]!=="center"){var b=a(window);b=i.collisionPosition.top+i.collisionHeight-b.height()-b.scrollTop();var f=i.my[1]==="top"?-i.elemHeight:i.my[1]==="bottom"?i.elemHeight:0,j=i.at[1]==="top"?i.targetHeight:-i.targetHeight,l=-2*i.offset[1];g.top+=i.collisionPosition.top<0?f+j+l:b>0?f+j+l:0}}}};if(!a.offset.setOffset){a.offset.setOffset=function(g,i){if(/static/.test(a.curCSS(g,"position")))g.style.position="relative";var b=a(g),
-f=b.offset(),j=parseInt(a.curCSS(g,"top",true),10)||0,l=parseInt(a.curCSS(g,"left",true),10)||0;f={top:i.top-f.top+j,left:i.left-f.left+l};"using"in i?i.using.call(g,f):b.css(f)};a.fn.offset=function(g){var i=this[0];if(!i||!i.ownerDocument)return null;if(g)return this.each(function(){a.offset.setOffset(this,g)});return h.call(this)}}})(jQuery);
-(function(a,d){a.widget("ui.progressbar",{options:{value:0,max:100},min:0,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.options.max,"aria-valuenow":this._value()});this.valueDiv=a("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element);this.oldValue=this._value();this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow");
-this.valueDiv.remove();a.Widget.prototype.destroy.apply(this,arguments)},value:function(c){if(c===d)return this._value();this._setOption("value",c);return this},_setOption:function(c,e){if(c==="value"){this.options.value=e;this._refreshValue();this._value()===this.options.max&&this._trigger("complete")}a.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var c=this.options.value;if(typeof c!=="number")c=0;return Math.min(this.options.max,Math.max(this.min,c))},_percentage:function(){return 100*
-this._value()/this.options.max},_refreshValue:function(){var c=this.value(),e=this._percentage();if(this.oldValue!==c){this.oldValue=c;this._trigger("change")}this.valueDiv.toggle(c>this.min).toggleClass("ui-corner-right",c===this.options.max).width(e.toFixed(0)+"%");this.element.attr("aria-valuenow",c)}});a.extend(a.ui.progressbar,{version:"1.8.14"})})(jQuery);
-(function(a){a.widget("ui.slider",a.ui.mouse,{widgetEventPrefix:"slide",options:{animate:false,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null},_create:function(){var d=this,c=this.options,e=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),h=c.values&&c.values.length||1,g=[];this._mouseSliding=this._keySliding=false;this._animateOff=true;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+
-this.orientation+" ui-widget ui-widget-content ui-corner-all"+(c.disabled?" ui-slider-disabled ui-disabled":""));this.range=a([]);if(c.range){if(c.range===true){if(!c.values)c.values=[this._valueMin(),this._valueMin()];if(c.values.length&&c.values.length!==2)c.values=[c.values[0],c.values[0]]}this.range=a("<div></div>").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(c.range==="min"||c.range==="max"?" ui-slider-range-"+c.range:""))}for(var i=e.length;i<h;i+=1)g.push("<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>");
-this.handles=e.add(a(g.join("")).appendTo(d.element));this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(b){b.preventDefault()}).hover(function(){c.disabled||a(this).addClass("ui-state-hover")},function(){a(this).removeClass("ui-state-hover")}).focus(function(){if(c.disabled)a(this).blur();else{a(".ui-slider .ui-state-focus").removeClass("ui-state-focus");a(this).addClass("ui-state-focus")}}).blur(function(){a(this).removeClass("ui-state-focus")});this.handles.each(function(b){a(this).data("index.ui-slider-handle",
-b)});this.handles.keydown(function(b){var f=true,j=a(this).data("index.ui-slider-handle"),l,o,n;if(!d.options.disabled){switch(b.keyCode){case a.ui.keyCode.HOME:case a.ui.keyCode.END:case a.ui.keyCode.PAGE_UP:case a.ui.keyCode.PAGE_DOWN:case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:case a.ui.keyCode.DOWN:case a.ui.keyCode.LEFT:f=false;if(!d._keySliding){d._keySliding=true;a(this).addClass("ui-state-active");l=d._start(b,j);if(l===false)return}break}n=d.options.step;l=d.options.values&&d.options.values.length?
-(o=d.values(j)):(o=d.value());switch(b.keyCode){case a.ui.keyCode.HOME:o=d._valueMin();break;case a.ui.keyCode.END:o=d._valueMax();break;case a.ui.keyCode.PAGE_UP:o=d._trimAlignValue(l+(d._valueMax()-d._valueMin())/5);break;case a.ui.keyCode.PAGE_DOWN:o=d._trimAlignValue(l-(d._valueMax()-d._valueMin())/5);break;case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:if(l===d._valueMax())return;o=d._trimAlignValue(l+n);break;case a.ui.keyCode.DOWN:case a.ui.keyCode.LEFT:if(l===d._valueMin())return;o=d._trimAlignValue(l-
-n);break}d._slide(b,j,o);return f}}).keyup(function(b){var f=a(this).data("index.ui-slider-handle");if(d._keySliding){d._keySliding=false;d._stop(b,f);d._change(b,f);a(this).removeClass("ui-state-active")}});this._refreshValue();this._animateOff=false},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");this._mouseDestroy();
-return this},_mouseCapture:function(d){var c=this.options,e,h,g,i,b;if(c.disabled)return false;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();e=this._normValueFromMouse({x:d.pageX,y:d.pageY});h=this._valueMax()-this._valueMin()+1;i=this;this.handles.each(function(f){var j=Math.abs(e-i.values(f));if(h>j){h=j;g=a(this);b=f}});if(c.range===true&&this.values(1)===c.min){b+=1;g=a(this.handles[b])}if(this._start(d,b)===false)return false;
-this._mouseSliding=true;i._handleIndex=b;g.addClass("ui-state-active").focus();c=g.offset();this._clickOffset=!a(d.target).parents().andSelf().is(".ui-slider-handle")?{left:0,top:0}:{left:d.pageX-c.left-g.width()/2,top:d.pageY-c.top-g.height()/2-(parseInt(g.css("borderTopWidth"),10)||0)-(parseInt(g.css("borderBottomWidth"),10)||0)+(parseInt(g.css("marginTop"),10)||0)};this.handles.hasClass("ui-state-hover")||this._slide(d,b,e);return this._animateOff=true},_mouseStart:function(){return true},_mouseDrag:function(d){var c=
-this._normValueFromMouse({x:d.pageX,y:d.pageY});this._slide(d,this._handleIndex,c);return false},_mouseStop:function(d){this.handles.removeClass("ui-state-active");this._mouseSliding=false;this._stop(d,this._handleIndex);this._change(d,this._handleIndex);this._clickOffset=this._handleIndex=null;return this._animateOff=false},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(d){var c;if(this.orientation==="horizontal"){c=
-this.elementSize.width;d=d.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{c=this.elementSize.height;d=d.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}c=d/c;if(c>1)c=1;if(c<0)c=0;if(this.orientation==="vertical")c=1-c;d=this._valueMax()-this._valueMin();return this._trimAlignValue(this._valueMin()+c*d)},_start:function(d,c){var e={handle:this.handles[c],value:this.value()};if(this.options.values&&this.options.values.length){e.value=this.values(c);
-e.values=this.values()}return this._trigger("start",d,e)},_slide:function(d,c,e){var h;if(this.options.values&&this.options.values.length){h=this.values(c?0:1);if(this.options.values.length===2&&this.options.range===true&&(c===0&&e>h||c===1&&e<h))e=h;if(e!==this.values(c)){h=this.values();h[c]=e;d=this._trigger("slide",d,{handle:this.handles[c],value:e,values:h});this.values(c?0:1);d!==false&&this.values(c,e,true)}}else if(e!==this.value()){d=this._trigger("slide",d,{handle:this.handles[c],value:e});
-d!==false&&this.value(e)}},_stop:function(d,c){var e={handle:this.handles[c],value:this.value()};if(this.options.values&&this.options.values.length){e.value=this.values(c);e.values=this.values()}this._trigger("stop",d,e)},_change:function(d,c){if(!this._keySliding&&!this._mouseSliding){var e={handle:this.handles[c],value:this.value()};if(this.options.values&&this.options.values.length){e.value=this.values(c);e.values=this.values()}this._trigger("change",d,e)}},value:function(d){if(arguments.length){this.options.value=
-this._trimAlignValue(d);this._refreshValue();this._change(null,0)}else return this._value()},values:function(d,c){var e,h,g;if(arguments.length>1){this.options.values[d]=this._trimAlignValue(c);this._refreshValue();this._change(null,d)}else if(arguments.length)if(a.isArray(arguments[0])){e=this.options.values;h=arguments[0];for(g=0;g<e.length;g+=1){e[g]=this._trimAlignValue(h[g]);this._change(null,g)}this._refreshValue()}else return this.options.values&&this.options.values.length?this._values(d):
-this.value();else return this._values()},_setOption:function(d,c){var e,h=0;if(a.isArray(this.options.values))h=this.options.values.length;a.Widget.prototype._setOption.apply(this,arguments);switch(d){case "disabled":if(c){this.handles.filter(".ui-state-focus").blur();this.handles.removeClass("ui-state-hover");this.handles.attr("disabled","disabled");this.element.addClass("ui-disabled")}else{this.handles.removeAttr("disabled");this.element.removeClass("ui-disabled")}break;case "orientation":this._detectOrientation();
-this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation);this._refreshValue();break;case "value":this._animateOff=true;this._refreshValue();this._change(null,0);this._animateOff=false;break;case "values":this._animateOff=true;this._refreshValue();for(e=0;e<h;e+=1)this._change(null,e);this._animateOff=false;break}},_value:function(){var d=this.options.value;return d=this._trimAlignValue(d)},_values:function(d){var c,e;if(arguments.length){c=this.options.values[d];
-return c=this._trimAlignValue(c)}else{c=this.options.values.slice();for(e=0;e<c.length;e+=1)c[e]=this._trimAlignValue(c[e]);return c}},_trimAlignValue:function(d){if(d<=this._valueMin())return this._valueMin();if(d>=this._valueMax())return this._valueMax();var c=this.options.step>0?this.options.step:1,e=(d-this._valueMin())%c;alignValue=d-e;if(Math.abs(e)*2>=c)alignValue+=e>0?c:-c;return parseFloat(alignValue.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},
-_refreshValue:function(){var d=this.options.range,c=this.options,e=this,h=!this._animateOff?c.animate:false,g,i={},b,f,j,l;if(this.options.values&&this.options.values.length)this.handles.each(function(o){g=(e.values(o)-e._valueMin())/(e._valueMax()-e._valueMin())*100;i[e.orientation==="horizontal"?"left":"bottom"]=g+"%";a(this).stop(1,1)[h?"animate":"css"](i,c.animate);if(e.options.range===true)if(e.orientation==="horizontal"){if(o===0)e.range.stop(1,1)[h?"animate":"css"]({left:g+"%"},c.animate);
-if(o===1)e.range[h?"animate":"css"]({width:g-b+"%"},{queue:false,duration:c.animate})}else{if(o===0)e.range.stop(1,1)[h?"animate":"css"]({bottom:g+"%"},c.animate);if(o===1)e.range[h?"animate":"css"]({height:g-b+"%"},{queue:false,duration:c.animate})}b=g});else{f=this.value();j=this._valueMin();l=this._valueMax();g=l!==j?(f-j)/(l-j)*100:0;i[e.orientation==="horizontal"?"left":"bottom"]=g+"%";this.handle.stop(1,1)[h?"animate":"css"](i,c.animate);if(d==="min"&&this.orientation==="horizontal")this.range.stop(1,
-1)[h?"animate":"css"]({width:g+"%"},c.animate);if(d==="max"&&this.orientation==="horizontal")this.range[h?"animate":"css"]({width:100-g+"%"},{queue:false,duration:c.animate});if(d==="min"&&this.orientation==="vertical")this.range.stop(1,1)[h?"animate":"css"]({height:g+"%"},c.animate);if(d==="max"&&this.orientation==="vertical")this.range[h?"animate":"css"]({height:100-g+"%"},{queue:false,duration:c.animate})}}});a.extend(a.ui.slider,{version:"1.8.14"})})(jQuery);
-(function(a,d){function c(){return++h}function e(){return++g}var h=0,g=0;a.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:false,cookie:null,collapsible:false,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,select:null,show:null,spinner:"<em>Loading&#8230;</em>",tabTemplate:"<li><a href='#{href}'><span>#{label}</span></a></li>"},_create:function(){this._tabify(true)},_setOption:function(i,b){if(i=="selected")this.options.collapsible&&
-b==this.options.selected||this.select(b);else{this.options[i]=b;this._tabify()}},_tabId:function(i){return i.title&&i.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+c()},_sanitizeSelector:function(i){return i.replace(/:/g,"\\:")},_cookie:function(){var i=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+e());return a.cookie.apply(null,[i].concat(a.makeArray(arguments)))},_ui:function(i,b){return{tab:i,panel:b,index:this.anchors.index(i)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var i=
-a(this);i.html(i.data("label.tabs")).removeData("label.tabs")})},_tabify:function(i){function b(r,u){r.css("display","");!a.support.opacity&&u.opacity&&r[0].style.removeAttribute("filter")}var f=this,j=this.options,l=/^#.+/;this.list=this.element.find("ol,ul").eq(0);this.lis=a(" > li:has(a[href])",this.list);this.anchors=this.lis.map(function(){return a("a",this)[0]});this.panels=a([]);this.anchors.each(function(r,u){var v=a(u).attr("href"),w=v.split("#")[0],x;if(w&&(w===location.toString().split("#")[0]||
-(x=a("base")[0])&&w===x.href)){v=u.hash;u.href=v}if(l.test(v))f.panels=f.panels.add(f.element.find(f._sanitizeSelector(v)));else if(v&&v!=="#"){a.data(u,"href.tabs",v);a.data(u,"load.tabs",v.replace(/#.*$/,""));v=f._tabId(u);u.href="#"+v;u=f.element.find("#"+v);if(!u.length){u=a(j.panelTemplate).attr("id",v).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(f.panels[r-1]||f.list);u.data("destroy.tabs",true)}f.panels=f.panels.add(u)}else j.disabled.push(r)});if(i){this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all");
-this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.lis.addClass("ui-state-default ui-corner-top");this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom");if(j.selected===d){location.hash&&this.anchors.each(function(r,u){if(u.hash==location.hash){j.selected=r;return false}});if(typeof j.selected!=="number"&&j.cookie)j.selected=parseInt(f._cookie(),10);if(typeof j.selected!=="number"&&this.lis.filter(".ui-tabs-selected").length)j.selected=
-this.lis.index(this.lis.filter(".ui-tabs-selected"));j.selected=j.selected||(this.lis.length?0:-1)}else if(j.selected===null)j.selected=-1;j.selected=j.selected>=0&&this.anchors[j.selected]||j.selected<0?j.selected:0;j.disabled=a.unique(j.disabled.concat(a.map(this.lis.filter(".ui-state-disabled"),function(r){return f.lis.index(r)}))).sort();a.inArray(j.selected,j.disabled)!=-1&&j.disabled.splice(a.inArray(j.selected,j.disabled),1);this.panels.addClass("ui-tabs-hide");this.lis.removeClass("ui-tabs-selected ui-state-active");
-if(j.selected>=0&&this.anchors.length){f.element.find(f._sanitizeSelector(f.anchors[j.selected].hash)).removeClass("ui-tabs-hide");this.lis.eq(j.selected).addClass("ui-tabs-selected ui-state-active");f.element.queue("tabs",function(){f._trigger("show",null,f._ui(f.anchors[j.selected],f.element.find(f._sanitizeSelector(f.anchors[j.selected].hash))[0]))});this.load(j.selected)}a(window).bind("unload",function(){f.lis.add(f.anchors).unbind(".tabs");f.lis=f.anchors=f.panels=null})}else j.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"));
-this.element[j.collapsible?"addClass":"removeClass"]("ui-tabs-collapsible");j.cookie&&this._cookie(j.selected,j.cookie);i=0;for(var o;o=this.lis[i];i++)a(o)[a.inArray(i,j.disabled)!=-1&&!a(o).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled");j.cache===false&&this.anchors.removeData("cache.tabs");this.lis.add(this.anchors).unbind(".tabs");if(j.event!=="mouseover"){var n=function(r,u){u.is(":not(.ui-state-disabled)")&&u.addClass("ui-state-"+r)},k=function(r,u){u.removeClass("ui-state-"+
-r)};this.lis.bind("mouseover.tabs",function(){n("hover",a(this))});this.lis.bind("mouseout.tabs",function(){k("hover",a(this))});this.anchors.bind("focus.tabs",function(){n("focus",a(this).closest("li"))});this.anchors.bind("blur.tabs",function(){k("focus",a(this).closest("li"))})}var m,p;if(j.fx)if(a.isArray(j.fx)){m=j.fx[0];p=j.fx[1]}else m=p=j.fx;var q=p?function(r,u){a(r).closest("li").addClass("ui-tabs-selected ui-state-active");u.hide().removeClass("ui-tabs-hide").animate(p,p.duration||"normal",
-function(){b(u,p);f._trigger("show",null,f._ui(r,u[0]))})}:function(r,u){a(r).closest("li").addClass("ui-tabs-selected ui-state-active");u.removeClass("ui-tabs-hide");f._trigger("show",null,f._ui(r,u[0]))},s=m?function(r,u){u.animate(m,m.duration||"normal",function(){f.lis.removeClass("ui-tabs-selected ui-state-active");u.addClass("ui-tabs-hide");b(u,m);f.element.dequeue("tabs")})}:function(r,u){f.lis.removeClass("ui-tabs-selected ui-state-active");u.addClass("ui-tabs-hide");f.element.dequeue("tabs")};
-this.anchors.bind(j.event+".tabs",function(){var r=this,u=a(r).closest("li"),v=f.panels.filter(":not(.ui-tabs-hide)"),w=f.element.find(f._sanitizeSelector(r.hash));if(u.hasClass("ui-tabs-selected")&&!j.collapsible||u.hasClass("ui-state-disabled")||u.hasClass("ui-state-processing")||f.panels.filter(":animated").length||f._trigger("select",null,f._ui(this,w[0]))===false){this.blur();return false}j.selected=f.anchors.index(this);f.abort();if(j.collapsible)if(u.hasClass("ui-tabs-selected")){j.selected=
--1;j.cookie&&f._cookie(j.selected,j.cookie);f.element.queue("tabs",function(){s(r,v)}).dequeue("tabs");this.blur();return false}else if(!v.length){j.cookie&&f._cookie(j.selected,j.cookie);f.element.queue("tabs",function(){q(r,w)});f.load(f.anchors.index(this));this.blur();return false}j.cookie&&f._cookie(j.selected,j.cookie);if(w.length){v.length&&f.element.queue("tabs",function(){s(r,v)});f.element.queue("tabs",function(){q(r,w)});f.load(f.anchors.index(this))}else throw"jQuery UI Tabs: Mismatching fragment identifier.";
-a.browser.msie&&this.blur()});this.anchors.bind("click.tabs",function(){return false})},_getIndex:function(i){if(typeof i=="string")i=this.anchors.index(this.anchors.filter("[href$="+i+"]"));return i},destroy:function(){var i=this.options;this.abort();this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs");this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.anchors.each(function(){var b=
-a.data(this,"href.tabs");if(b)this.href=b;var f=a(this).unbind(".tabs");a.each(["href","load","cache"],function(j,l){f.removeData(l+".tabs")})});this.lis.unbind(".tabs").add(this.panels).each(function(){a.data(this,"destroy.tabs")?a(this).remove():a(this).removeClass("ui-state-default ui-corner-top ui-tabs-selected ui-state-active ui-state-hover ui-state-focus ui-state-disabled ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide")});i.cookie&&this._cookie(null,i.cookie);return this},add:function(i,
-b,f){if(f===d)f=this.anchors.length;var j=this,l=this.options;b=a(l.tabTemplate.replace(/#\{href\}/g,i).replace(/#\{label\}/g,b));i=!i.indexOf("#")?i.replace("#",""):this._tabId(a("a",b)[0]);b.addClass("ui-state-default ui-corner-top").data("destroy.tabs",true);var o=j.element.find("#"+i);o.length||(o=a(l.panelTemplate).attr("id",i).data("destroy.tabs",true));o.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide");if(f>=this.lis.length){b.appendTo(this.list);o.appendTo(this.list[0].parentNode)}else{b.insertBefore(this.lis[f]);
-o.insertBefore(this.panels[f])}l.disabled=a.map(l.disabled,function(n){return n>=f?++n:n});this._tabify();if(this.anchors.length==1){l.selected=0;b.addClass("ui-tabs-selected ui-state-active");o.removeClass("ui-tabs-hide");this.element.queue("tabs",function(){j._trigger("show",null,j._ui(j.anchors[0],j.panels[0]))});this.load(0)}this._trigger("add",null,this._ui(this.anchors[f],this.panels[f]));return this},remove:function(i){i=this._getIndex(i);var b=this.options,f=this.lis.eq(i).remove(),j=this.panels.eq(i).remove();
-if(f.hasClass("ui-tabs-selected")&&this.anchors.length>1)this.select(i+(i+1<this.anchors.length?1:-1));b.disabled=a.map(a.grep(b.disabled,function(l){return l!=i}),function(l){return l>=i?--l:l});this._tabify();this._trigger("remove",null,this._ui(f.find("a")[0],j[0]));return this},enable:function(i){i=this._getIndex(i);var b=this.options;if(a.inArray(i,b.disabled)!=-1){this.lis.eq(i).removeClass("ui-state-disabled");b.disabled=a.grep(b.disabled,function(f){return f!=i});this._trigger("enable",null,
-this._ui(this.anchors[i],this.panels[i]));return this}},disable:function(i){i=this._getIndex(i);var b=this.options;if(i!=b.selected){this.lis.eq(i).addClass("ui-state-disabled");b.disabled.push(i);b.disabled.sort();this._trigger("disable",null,this._ui(this.anchors[i],this.panels[i]))}return this},select:function(i){i=this._getIndex(i);if(i==-1)if(this.options.collapsible&&this.options.selected!=-1)i=this.options.selected;else return this;this.anchors.eq(i).trigger(this.options.event+".tabs");return this},
-load:function(i){i=this._getIndex(i);var b=this,f=this.options,j=this.anchors.eq(i)[0],l=a.data(j,"load.tabs");this.abort();if(!l||this.element.queue("tabs").length!==0&&a.data(j,"cache.tabs"))this.element.dequeue("tabs");else{this.lis.eq(i).addClass("ui-state-processing");if(f.spinner){var o=a("span",j);o.data("label.tabs",o.html()).html(f.spinner)}this.xhr=a.ajax(a.extend({},f.ajaxOptions,{url:l,success:function(n,k){b.element.find(b._sanitizeSelector(j.hash)).html(n);b._cleanup();f.cache&&a.data(j,
-"cache.tabs",true);b._trigger("load",null,b._ui(b.anchors[i],b.panels[i]));try{f.ajaxOptions.success(n,k)}catch(m){}},error:function(n,k){b._cleanup();b._trigger("load",null,b._ui(b.anchors[i],b.panels[i]));try{f.ajaxOptions.error(n,k,i,j)}catch(m){}}}));b.element.dequeue("tabs");return this}},abort:function(){this.element.queue([]);this.panels.stop(false,true);this.element.queue("tabs",this.element.queue("tabs").splice(-2,2));if(this.xhr){this.xhr.abort();delete this.xhr}this._cleanup();return this},
-url:function(i,b){this.anchors.eq(i).removeData("cache.tabs").data("load.tabs",b);return this},length:function(){return this.anchors.length}});a.extend(a.ui.tabs,{version:"1.8.14"});a.extend(a.ui.tabs.prototype,{rotation:null,rotate:function(i,b){var f=this,j=this.options,l=f._rotate||(f._rotate=function(o){clearTimeout(f.rotation);f.rotation=setTimeout(function(){var n=j.selected;f.select(++n<f.anchors.length?n:0)},i);o&&o.stopPropagation()});b=f._unrotate||(f._unrotate=!b?function(o){o.clientX&&
-f.rotate(null)}:function(){t=j.selected;l()});if(i){this.element.bind("tabsshow",l);this.anchors.bind(j.event+".tabs",b);l()}else{clearTimeout(f.rotation);this.element.unbind("tabsshow",l);this.anchors.unbind(j.event+".tabs",b);delete this._rotate;delete this._unrotate}return this}})})(jQuery);
diff --git a/templates/tour/js/jquery.min.js b/templates/tour/js/jquery.min.js
deleted file mode 100644
index 8cdc80eb85d..00000000000
--- a/templates/tour/js/jquery.min.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.6.2
- * http://jquery.com/
- *
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Thu Jun 30 14:16:56 2011 -0400
- */
-(function(a,b){function cv(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cs(a){if(!cg[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ch||(ch=c.createElement("iframe"),ch.frameBorder=ch.width=ch.height=0),b.appendChild(ch);if(!ci||!ch.createElement)ci=(ch.contentWindow||ch.contentDocument).document,ci.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),ci.close();d=ci.createElement(a),ci.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ch)}cg[a]=e}return cg[a]}function cr(a,b){var c={};f.each(cm.concat.apply([],cm.slice(0,b)),function(){c[this]=a});return c}function cq(){cn=b}function cp(){setTimeout(cq,0);return cn=f.now()}function cf(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ce(){try{return new a.XMLHttpRequest}catch(b){}}function b$(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bZ(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bY(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bC.test(a)?d(a,e):bY(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)bY(a+"["+e+"]",b[e],c,d);else d(a,b)}function bX(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bR,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bX(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bX(a,c,d,e,"*",g));return l}function bW(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bN),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bA(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bv:bw;if(d>0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bx(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function bm(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(be,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bl(a){f.nodeName(a,"input")?bk(a):"getElementsByTagName"in a&&f.grep(a.getElementsByTagName("input"),bk)}function bk(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bj(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bi(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bh(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)f.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function bg(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function W(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(R.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function V(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function N(a,b){return(a&&a!=="*"?a+".":"")+b.replace(z,"`").replace(A,"&")}function M(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;i<s.length;i++)g=s[i],g.origType.replace(x,"")===a.type?q.push(g.selector):s.splice(i--,1);e=f(a.target).closest(q,a.currentTarget);for(j=0,k=e.length;j<k;j++){m=e[j];for(i=0;i<s.length;i++){g=s[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,d=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,d=f(a.relatedTarget).closest(g.selector)[0],d&&f.contains(h,d)&&(d=h);(!d||d!==h)&&p.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=p.length;j<k;j++){e=p[j];if(c&&e.level>c)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function K(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function E(){return!0}function D(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"$1-$2").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z])/ig,x=function(a,b){return b.toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!A){A=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a);return c===b||D.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(b,c,d){a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),d=c.documentElement,(!d||!d.nodeName||d.nodeName==="parsererror")&&e.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b){if(H)return H.call(b,a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=s.exec(a)||t.exec(a)||u.exec(a)||a.indexOf("compatible")<0&&v.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g="done fail isResolved isRejected promise then always pipe".split(" "),h=[].slice;f.extend({_Deferred:function(){var a=[],b,c,d,e={done:function(){if(!d){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=f.type(i),j==="array"?e.done.apply(e,i):j==="function"&&a.push(i);k&&e.resolveWith(k[0],k[1])}return this},resolveWith:function(e,f){if(!d&&!b&&!c){f=f||[],c=1;try{while(a[0])a.shift().apply(e,f)}finally{b=[e,f],c=0}}return this},resolve:function(){e.resolveWith(this,arguments);return this},isResolved:function(){return!!c||!!b},cancel:function(){d=1,a=[];return this}};return e},Deferred:function(a){var b=f._Deferred(),c=f._Deferred(),d;f.extend(b,{then:function(a,c){b.done(a).fail(c);return this},always:function(){return b.done.apply(b,arguments).fail.apply(this,arguments)},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,pipe:function(a,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[c,"reject"]},function(a,c){var e=c[0],g=c[1],h;f.isFunction(e)?b[a](function(){h=e.apply(this,arguments),h&&f.isFunction(h.promise)?h.promise().then(d.resolve,d.reject):d[g](h)}):b[a](d[g])})}).promise()},promise:function(a){if(a==null){if(d)return d;d=a={}}var c=g.length;while(c--)a[g[c]]=b[g[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){function i(a){return function(c){b[a]=arguments.length>1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c<d;c++)b[c]&&f.isFunction(b[c].promise)?b[c].promise().then(i(c),g.reject):--e;e||g.resolveWith(g,b)}else g!==a&&g.resolveWith(g,d?[a]:[]);return g.promise()}}),f.support=function(){var a=c.createElement("div"),b=c.documentElement,d,e,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u;a.setAttribute("className","t"),a.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=a.getElementsByTagName("input")[0],k={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,k.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,k.optDisabled=!h.disabled;try{delete a.test}catch(v){k.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function(){k.noCloneEvent=!1}),a.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),k.radioValue=i.value==="t",i.setAttribute("checked","checked"),a.appendChild(i),l=c.createDocumentFragment(),l.appendChild(a.firstChild),k.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",m=c.getElementsByTagName("body")[0],o=c.createElement(m?"div":"body"),p={visibility:"hidden",width:0,height:0,border:0,margin:0},m&&f.extend(p,{position:"absolute",left:-1e3,top:-1e3});for(t in p)o.style[t]=p[t];o.appendChild(a),n=m||b,n.insertBefore(o,n.firstChild),k.appendChecked=i.checked,k.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,k.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0),o.innerHTML="",n.removeChild(o);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([a-z])([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g=f.expando,h=typeof c=="string",i,j=a.nodeType,k=j?f.cache:a,l=j?a[f.expando]:a[f.expando]&&f.expando;if((!l||e&&l&&!k[l][g])&&h&&d===b)return;l||(j?a[f.expando]=l=++f.uuid:l=f.expando),k[l]||(k[l]={},j||(k[l].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?k[l][g]=f.extend(k[l][g],c):k[l]=f.extend(k[l],c);i=k[l],e&&(i[g]||(i[g]={}),i=i[g]),d!==b&&(i[f.camelCase(c)]=d);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[f.camelCase(c)]||i[c]:i}},removeData:function(b,c,d){if(!!f.acceptData(b)){var e=f.expando,g=b.nodeType,h=g?f.cache:b,i=g?b[f.expando]:f.expando;if(!h[i])return;if(c){var j=d?h[i][e]:h[i];if(j){delete j[c];if(!l(j))return}}if(d){delete h[i][e];if(!l(h[i]))return}var k=h[i][e];f.support.deleteExpando||h!=a?delete h[i]:h[i]=null,k?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=k):g&&(f.support.deleteExpando?delete b[f.expando]:b.removeAttribute?b.removeAttribute(f.expando):b[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h<i;h++)g=e[h].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),k(this[0],g,d[g]))}}return d}if(typeof a=="object")return this.each(function(){f.data(this,a)});var j=a.split(".");j[1]=j[1]?"."+j[1]:"";if(c===b){d=this.triggerHandler("getData"+j[1]+"!",[j[0]]),d===b&&this.length&&(d=f.data(this[0],a),d=k(this[0],a,d));return d===b&&j[1]?this.data(j[0]):d}return this.each(function(){var b=f(this),d=[j[0],c];b.triggerHandler("setData"+j[1]+"!",d),f.data(this,a,c),b.triggerHandler("changeData"+j[1]+"!",d)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,c){a&&(c=(c||"fx")+"mark",f.data(a,c,(f.data(a,c,b,!0)||0)+1,!0))},_unmark:function(a,c,d){a!==!0&&(d=c,c=a,a=!1);if(c){d=d||"fx";var e=d+"mark",g=a?0:(f.data(c,e,b,!0)||1)-1;g?f.data(c,e,g,!0):(f.removeData(c,e,!0),m(c,d,"mark"))}},queue:function(a,c,d){if(a){c=(c||"fx")+"queue";var e=f.data(a,c,b,!0);d&&(!e||f.isArray(d)?e=f.data(a,c,f.makeArray(d),!0):e.push(d));return e||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e;d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),d.call(a,function(){f.dequeue(a,b)})),c.length||(f.removeData(a,b+"queue",!0),m(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){f.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f._Deferred(),!0))h++,l.done(m);m();return d.promise()}});var n=/[\n\t\r]/g,o=/\s+/,p=/\r/g,q=/^(?:button|input)$/i,r=/^(?:button|input|object|select|textarea)$/i,s=/^a(?:rea)?$/i,t=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,u=/\:|^on/,v,w;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(o);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(o);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(n," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(o);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if((" "+this[c].className+" ").replace(n," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;d=e.value;return typeof d=="string"?d.replace(p,""):d==null?"":d}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h<i;h++){var j=e[h];if(j.selected&&(f.support.optDisabled?!j.disabled:j.getAttribute("disabled")===null)&&(!j.parentNode.disabled||!f.nodeName(j.parentNode,"optgroup"))){b=f(j).val();if(g)return b;d.push(b)}}if(g&&!d.length&&e.length)return f(e[c]).val();return d},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);j&&(c=f.attrFix[c]||c,i=f.attrHooks[c],i||(t.test(c)?i=w:v&&c!=="className"&&(f.nodeName(a,"form")||u.test(c))&&(i=v)));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j&&(h=i.get(a,c))!==null)return h;h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.support.getSetAttribute?a.removeAttribute(b):(f.attr(a,b,""),a.removeAttributeNode(a.getAttributeNode(b))),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},tabIndex:{get:function(a){var c=a.getAttributeNode("tabIndex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}},value:{get:function(a,b){if(v&&f.nodeName(a,"button"))return v.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(v&&f.nodeName(a,"button"))return v.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);i&&(c=f.propFix[c]||c,h=f.propHooks[c]);return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==b?g:a[c]},propHooks:{}}),w={get:function(a,c){return f.prop(a,c)?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},f.support.getSetAttribute||(f.attrFix=f.propFix,v=f.attrHooks.name=f.attrHooks.title=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,c){var d=a.getAttributeNode(c);if(d){d.nodeValue=b;return b}}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var x=/\.(.*)$/,y=/^(?:textarea|input|select)$/i,z=/\./g,A=/ /g,B=/[^\w\s.|`]/g,C=function(a){return a.replace(B,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=D;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=D);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),C).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))f.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=f.event.special[h]||{};for(j=e||0;j<p.length;j++){q=p[j];if(d.guid===q.guid){if(l||n.test(q.namespace))e==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(e!=null)break}}if(p.length===0||e!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&f.removeEvent(a,h,s.handle),g=null,delete t[h]}if(f.isEmptyObject(t)){var u=s.handle;u&&(u.elem=null),delete s.events,delete s.handle,f.isEmptyObject(s)&&f.removeData(a,b,!0)}}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){var h=c.type||c,i=[],j;h.indexOf("!")>=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.
-shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d!=null?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h<i;h++){var j=d[h];if(e||c.namespace_re.test(j.namespace)){c.handler=j.handler,c.data=j.data,c.handleObj=j;var k=j.handler.apply(this,g);k!==b&&(c.result=k,k===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[f.expando])return a;var d=a;a=f.Event(d);for(var e=this.props.length,g;e;)g=this.props[--e],a[g]=d[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=a.target.ownerDocument||c,i=h.documentElement,j=h.body;a.pageX=a.clientX+(i&&i.scrollLeft||j&&j.scrollLeft||0)-(i&&i.clientLeft||j&&j.clientLeft||0),a.pageY=a.clientY+(i&&i.scrollTop||j&&j.scrollTop||0)-(i&&i.clientTop||j&&j.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:f.proxy,special:{ready:{setup:f.bindReady,teardown:f.noop},live:{add:function(a){f.event.add(this,N(a.origType,a.selector),f.extend({},a,{handler:M,guid:a.handler.guid}))},remove:function(a){f.event.remove(this,N(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!this.preventDefault)return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?E:D):this.type=a,b&&f.extend(this,b),this.timeStamp=f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=E;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=E;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=E,this.stopPropagation()},isDefaultPrevented:D,isPropagationStopped:D,isImmediatePropagationStopped:D};var F=function(a){var b=a.relatedTarget,c=!1,d=a.type;a.type=a.data,b!==this&&(b&&(c=f.contains(this,b)),c||(f.event.handle.apply(this,arguments),a.type=d))},G=function(a){a.type=a.data,f.event.handle.apply(this,arguments)};f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={setup:function(c){f.event.add(this,b,c&&c.selector?G:F,a)},teardown:function(a){f.event.remove(this,b,a&&a.selector?G:F)}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(a,b){if(!f.nodeName(this,"form"))f.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=b.type;(c==="submit"||c==="image")&&f(b).closest("form").length&&K("submit",this,arguments)}),f.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=b.type;(c==="text"||c==="password")&&f(b).closest("form").length&&a.keyCode===13&&K("submit",this,arguments)});else return!1},teardown:function(a){f.event.remove(this,".specialSubmit")}});if(!f.support.changeBubbles){var H,I=function(a){var b=a.type,c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},J=function(c){var d=c.target,e,g;if(!!y.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=I(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:J,beforedeactivate:J,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&J.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&J.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",I(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in H)f.event.add(this,c+".specialChange",H[c]);return y.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return y.test(this.nodeName)}},H=f.event.special.change.filters,H.focus=H.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i<j;i++)f.event.add(this[i],a,g,d);return this}}),f.fn.extend({unbind:function(a,b){if(typeof a=="object"&&!a.preventDefault)for(var c in a)this.unbind(c,a[c]);else for(var d=0,e=this.length;d<e;d++)f.event.remove(this[d],a,b);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f.data(this,"lastToggle"+a.guid)||0)%d;f.data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var L={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};f.each(["live","die"],function(a,c){f.fn[c]=function(a,d,e,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:f(this.context);if(typeof a=="object"&&!a.preventDefault){for(var o in a)n[c](o,d,a[o],m);return this}if(c==="die"&&!a&&g&&g.charAt(0)==="."){n.unbind(g);return this}if(d===!1||f.isFunction(d))e=d||D,d=b;a=(a||"").split(" ");while((h=a[i++])!=null){j=x.exec(h),k="",j&&(k=j[0],h=h.replace(x,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,L[h]?(a.push(L[h]+k),h=h+k):h=(L[h]||h)+k;if(c==="live")for(var p=0,q=n.length;p<q;p++)f.event.add(n[p],"live."+N(h,m),{data:d,selector:m,handler:e,origType:h,origHandler:e,preType:l});else n.unbind("live."+N(h,m),e)}return this}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(!f)g=o=!0;else if(f===!0)continue}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("parentNode",b,f,a,e,c)},"~":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("previousSibling",b,f,a,e,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c<f;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){if(a===b){g=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};f.find=k,f.expr=k.selectors,f.expr[":"]=f.expr.filters,f.unique=k.uniqueSort,f.text=k.getText,f.isXMLDoc=k.isXML,f.contains=k.contains}();var O=/Until$/,P=/^(?:parents|prevUntil|prevAll)/,Q=/,/,R=/^.[^:#\[\.,]*$/,S=Array.prototype.slice,T=f.expr.match.POS,U={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(W(this,a,!1),"not",a)},filter:function(a){return this.pushStack(W(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d<e;d++)i=a[d],j[i]||(j[i]=T.test(i)?f(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=T.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(l?l.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a=="string")return f.inArray(this[0],a?f(a):this.parent().children());return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(V(c[0])||V(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=S.call(arguments);O.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!U[a]?f.unique(e):e,(this.length>1||Q.test(d))&&P.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var X=/ jQuery\d+="(?:\d+|null)"/g,Y=/^\s+/,Z=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,$=/<([\w:]+)/,_=/<tbody/i,ba=/<|&#?\w+;/,bb=/<(?:script|object|embed|option|style)/i,bc=/checked\s*(?:[^=]|=\s*.checked.)/i,bd=/\/(java|ecma)script/i,be=/^\s*<!(?:\[CDATA\[|\-\-)/,bf={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};bf.optgroup=bf.option,bf.tbody=bf.tfoot=bf.colgroup=bf.caption=bf.thead,bf.th=bf.td,f.support.htmlSerialize||(bf._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(X,""):null;if(typeof a=="string"&&!bb.test(a)&&(f.support.leadingWhitespace||!Y.test(a))&&!bf[($.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Z,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bc.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bg(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bm)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i;b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof a[0]=="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!bb.test(a[0])&&(f.support.checkClone||!bc.test(a[0]))&&(g=!0,h=f.fragments[a[0]],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[a[0]]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j
-)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bi(a,d),e=bj(a),g=bj(d);for(h=0;e[h];++h)bi(e[h],g[h])}if(b){bh(a,d);if(c){e=bj(a),g=bj(d);for(h=0;e[h];++h)bh(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!ba.test(k))k=b.createTextNode(k);else{k=k.replace(Z,"<$1></$2>");var l=($.exec(k)||["",""])[1].toLowerCase(),m=bf[l]||bf._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=_.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&Y.test(k)&&o.insertBefore(b.createTextNode(Y.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bl(k[i]);else bl(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||bd.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.expando,g=f.event.special,h=f.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&f.noData[j.nodeName.toLowerCase()])continue;c=j[f.expando];if(c){b=d[c]&&d[c][e];if(b&&b.events){for(var k in b.events)g[k]?f.event.remove(j,k):f.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[f.expando]:j.removeAttribute&&j.removeAttribute(f.expando),delete d[c]}}}});var bn=/alpha\([^)]*\)/i,bo=/opacity=([^)]*)/,bp=/([A-Z]|^ms)/g,bq=/^-?\d+(?:px)?$/i,br=/^-?\d/,bs=/^[+\-]=/,bt=/[^+\-\.\de]+/g,bu={position:"absolute",visibility:"hidden",display:"block"},bv=["Left","Right"],bw=["Top","Bottom"],bx,by,bz;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bx(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d;if(h==="number"&&isNaN(d)||d==null)return;h==="string"&&bs.test(d)&&(d=+d.replace(bt,"")+parseFloat(f.css(a,c)),h="number"),h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bx)return bx(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bA(a,b,d);f.swap(a,bu,function(){e=bA(a,b,d)});return e}},set:function(a,b){if(!bq.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bo.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle;c.zoom=1;var e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.filter=bn.test(g)?g.replace(bn,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bx(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(by=function(a,c){var d,e,g;c=c.replace(bp,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bz=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bq.test(d)&&br.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bx=by||bz,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bB=/%20/g,bC=/\[\]$/,bD=/\r?\n/g,bE=/#.*$/,bF=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bG=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bH=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,bI=/^(?:GET|HEAD)$/,bJ=/^\/\//,bK=/\?/,bL=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bM=/^(?:select|textarea)/i,bN=/\s+/,bO=/([?&])_=[^&]*/,bP=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bQ=f.fn.load,bR={},bS={},bT,bU;try{bT=e.href}catch(bV){bT=c.createElement("a"),bT.href="",bT=bT.href}bU=bP.exec(bT.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bQ)return bQ.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bL,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bM.test(this.nodeName)||bG.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bD,"\r\n")}}):{name:b.name,value:c.replace(bD,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?f.extend(!0,a,f.ajaxSettings,b):(b=a,a=f.extend(!0,f.ajaxSettings,b));for(var c in{context:1,url:1})c in b?a[c]=b[c]:c in f.ajaxSettings&&(a[c]=f.ajaxSettings[c]);return a},ajaxSettings:{url:bT,isLocal:bH.test(bU[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML}},ajaxPrefilter:bW(bR),ajaxTransport:bW(bS),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a?4:0;var o,r,u,w=l?bZ(d,v,l):b,x,y;if(a>=200&&a<300||a===304){if(d.ifModified){if(x=v.getResponseHeader("Last-Modified"))f.lastModified[k]=x;if(y=v.getResponseHeader("Etag"))f.etag[k]=y}if(a===304)c="notmodified",o=!0;else try{r=b$(d,w),c="success",o=!0}catch(z){c="parsererror",u=z}}else{u=c;if(!c||a)c="error",a<0&&(a=0)}v.status=a,v.statusText=c,o?h.resolveWith(e,[r,c,v]):h.rejectWith(e,[v,c,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,c]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bF.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bE,"").replace(bJ,bU[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bN),d.crossDomain==null&&(r=bP.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bU[1]&&r[2]==bU[2]&&(r[3]||(r[1]==="http:"?80:443))==(bU[3]||(bU[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bX(bR,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bI.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bK.test(d.url)?"&":"?")+d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bO,"$1_="+x);d.url=y+(y===d.url?(bK.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", */*; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bX(bS,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){status<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)bY(g,a[g],c,e);return d.join("&").replace(bB,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var b_=f.now(),ca=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+b_++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ca.test(b.url)||e&&ca.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ca,l),b.url===j&&(e&&(k=k.replace(ca,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cb=a.ActiveXObject?function(){for(var a in cd)cd[a](0,1)}:!1,cc=0,cd;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ce()||cf()}:ce,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cb&&delete cd[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cc,cb&&(cd||(cd={},f(a).unload(cb)),cd[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cg={},ch,ci,cj=/^(?:toggle|show|hide)$/,ck=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cl,cm=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cn,co=a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cr("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cs(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cr("hide",3),a,b,c);for(var d=0,e=this.length;d<e;d++)if(this[d].style){var g=f.css(this[d],"display");g!=="none"&&!f._data(this[d],"olddisplay")&&f._data(this[d],"olddisplay",g)}for(d=0;d<e;d++)this[d].style&&(this[d].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cr("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return this[e.queue===!1?"each":"queue"](function(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(f.support.inlineBlockNeedsLayout?(j=cs(this.nodeName),j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)):this.style.display="inline-block"))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)k=new f.fx(this,b,i),h=a[i],cj.test(h)?k[h==="toggle"?d?"show":"hide":h]():(l=ck.exec(h),m=k.cur(),l?(n=parseFloat(l[2]),o=l[3]||(f.cssNumber[i]?"":"px"),o!=="px"&&(f.style(this,i,(n||1)+o),m=(n||1)/k.cur()*m,f.style(this,i,m+o)),l[1]&&(n=(l[1]==="-="?-1:1)*n+m),k.custom(m,n,o)):k.custom(m,h,""));return!0})},stop:function(a,b){a&&this.queue([]),this.each(function(){var a=f.timers,c=a.length;b||f._unmark(!0,this);while(c--)a[c].elem===this&&(b&&a[c](!0),a.splice(c,1))}),b||this.dequeue();return this}}),f.each({slideDown:cr("show",1),slideUp:cr("hide",1),slideToggle:cr("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default,d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue!==!1?f.dequeue(this):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function h(a){return d.step(a)}var d=this,e=f.fx,g;this.startTime=cn||cp(),this.start=a,this.end=b,this.unit=c||this.unit||(f.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,h.elem=this.elem,h()&&f.timers.push(h)&&!cl&&(co?(cl=!0,g=function(){cl&&(co(g),e.tick())},co(g)):cl=setInterval(e.tick,e.interval))},show:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=cn||cp(),c=!0,d=this.elem,e=this.options,g,h;if(a||b>=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b<a.length;++b)a[b]()||a.splice(b--,1);a.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cl),cl=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var ct=/^t(?:able|d|h)$/i,cu=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cv(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);f.offset.initialize();var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.offset.doesNotAddBorder&&(!f.offset.doesAddBorderForTableAndCells||!ct.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={initialize:function(){var a=c.body,b=c.createElement("div"),d,e,g,h,i=parseFloat(f.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cu.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cu.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cv(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cv(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a&&a.style?parseFloat(f.css(a,d,"padding")):null},f.fn["outer"+c]=function(a){var b=this[0];return b&&b.style?parseFloat(f.css(b,d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c];return e.document.compatMode==="CSS1Compat"&&g||e.document.body["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var h=f.css(e,d),i=parseFloat(h);return f.isNaN(i)?h:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window);
\ No newline at end of file
diff --git a/templates/tour/js/lang.js b/templates/tour/js/lang.js
deleted file mode 100644
index 39c256e9102..00000000000
--- a/templates/tour/js/lang.js
+++ /dev/null
@@ -1,146 +0,0 @@
-var hiddenTranslation = $('#Translation-Strings');
-
-/*
- * Email system
- */
-
-var _email_1_title_ = $.trim(hiddenTranslation.find('._email_1_title_').text());
-var _email_2_title_ = $.trim(hiddenTranslation.find('._email_2_title_').text());
-var _email_3_title_ = $.trim(hiddenTranslation.find('._email_3_title_').text());
-var _email_4_title_ = $.trim(hiddenTranslation.find('._email_4_title_').text());
-var _email_5_title_ = $.trim(hiddenTranslation.find('._email_5_title_').text());
-
-var _email_1_body_ = $.trim(hiddenTranslation.find('._email_1_body_').text());
-var _email_2_body_ = $.trim(hiddenTranslation.find('._email_2_body_').text());
-var _email_3_body_ = $.trim(hiddenTranslation.find('._email_3_body_').text());
-var _email_4_body_ = $.trim(hiddenTranslation.find('._email_4_body_').text());
-var _email_5_body_ = $.trim(hiddenTranslation.find('._email_5_body_').text());
-
-var _random_reply_ = $.trim(hiddenTranslation.find('._random_reply_').text());
-
-var _write_ = $.trim(hiddenTranslation.find('._write_').text());
-var _no_subject_ = $.trim(hiddenTranslation.find('._no_subject_').text());
-var _recipient_ = $.trim(hiddenTranslation.find('._recipient_').text());
-var _from_ = $.trim(hiddenTranslation.find('._from_').text());
-
-var _you_ = $.trim(hiddenTranslation.find('._you_').text());
-var _on_ = $.trim(hiddenTranslation.find('._on_').text());
-var _wrote_ = $.trim(hiddenTranslation.find('._wrote_').text());
-var _original_message_ = $.trim(hiddenTranslation.find('._original_message_').text());
-var _fwd_ = $.trim(hiddenTranslation.find('._fwd_').text());
-
-/*
- * Folder System
- */
-
-var _home_folder_ = $.trim(hiddenTranslation.find('._home_folder_').text());
-var _desktop_folder_ = $.trim(hiddenTranslation.find('._desktop_folder_').text());
-var _pictures_folder_ = $.trim(hiddenTranslation.find('._pictures_folder_').text());
-var _videos_folder_ = $.trim(hiddenTranslation.find('._videos_folder_').text());
-var _music_folder_ = $.trim(hiddenTranslation.find('._music_folder_').text());
-var _downloads_folder_ = $.trim(hiddenTranslation.find('._downloads_folder_').text());
-var _documents_folder_ = $.trim(hiddenTranslation.find('._documents_folder_').text());
-var _canonical_folder_ = $.trim(hiddenTranslation.find('._canonical_folder_').text());
-var _backup_folder_ = $.trim(hiddenTranslation.find('._backup_folder_').text());
-var _local_folder_ = $.trim(hiddenTranslation.find('._local_folder_').text());
-var _work_folder_ = $.trim(hiddenTranslation.find('._work_folder_').text());
-var _branches_folder_ = $.trim(hiddenTranslation.find('._branches_folder_').text());
-var _rubbish_bin_folder_ = $.trim(hiddenTranslation.find('._rubbish_bin_folder_').text());
-
-/*
- * Software Center System
- */
-
-var _remove_ = $.trim(hiddenTranslation.find('._remove_').text());
-var _price_free_ = $.trim(hiddenTranslation.find('._price_free_').text());
-var _installed_ = $.trim(hiddenTranslation.find('._installed_').text());
-var _install_ = $.trim(hiddenTranslation.find('._install_').text());
-var _installing_ = $.trim(hiddenTranslation.find('._installing_').text());
-var _chromium_app_ = $.trim(hiddenTranslation.find('._chromium_app_').text());
-var _chromium_sub_ = $.trim(hiddenTranslation.find('._chromium_sub_').text());
-var _chromium_desc_ = $.trim(hiddenTranslation.find('._chromium_desc_').text());
-var _beep_app_ = $.trim(hiddenTranslation.find('._beep_app_').text());
-var _beep_sub_ = $.trim(hiddenTranslation.find('._beep_sub_').text());
-var _beep_desc_ = $.trim(hiddenTranslation.find('._beep_desc_').text());
-var _inkscape_app_ = $.trim(hiddenTranslation.find('._inkscape_app_').text());
-var _inkscape_sub_ = $.trim(hiddenTranslation.find('._inkscape_sub_').text());
-var _inkscape_desc_ = $.trim(hiddenTranslation.find('._inkscape_desc_').text());
-var _world_of_goo_app_ = $.trim(hiddenTranslation.find('._world_of_goo_app_').text());
-var _world_of_goo_sub_ = $.trim(hiddenTranslation.find('._world_of_goo_sub_').text());
-var _world_of_goo_desc_ = $.trim(hiddenTranslation.find('._world_of_goo_desc_').text());
-var _blender_app_ = $.trim(hiddenTranslation.find('._blender_app_').text());
-var _blender_sub_ = $.trim(hiddenTranslation.find('._blender_sub_').text());
-var _blender_desc_ = $.trim(hiddenTranslation.find('._blender_desc_').text());
-var _braid_app_ = $.trim(hiddenTranslation.find('._braid_app_').text());
-var _braid_sub_ = $.trim(hiddenTranslation.find('._braid_sub_').text());
-var _braid_desc_ = $.trim(hiddenTranslation.find('._braid_desc_').text());
-var _banshee_app_ = $.trim(hiddenTranslation.find('._banshee_app_').text());
-var _brasero_app_ = $.trim(hiddenTranslation.find('._brasero_app_').text());
-var _movie_player_app_ = $.trim(hiddenTranslation.find('._movie_player_app_').text());
-var _shotwell_app_ = $.trim(hiddenTranslation.find('._shotwell_app_').text());
-var _pitivi_app_ = $.trim(hiddenTranslation.find('._pitivi_app_').text());
-var _sound_recorder_app_ = $.trim(hiddenTranslation.find('._sound_recorder_app_').text());
-var _empathy_app_ = $.trim(hiddenTranslation.find('._empathy_app_').text());
-var _thunderbird_app_ = $.trim(hiddenTranslation.find('._thunderbird_app_').text());
-var _firefox_app_ = $.trim(hiddenTranslation.find('._firefox_app_').text());
-var _gwibber_app_ = $.trim(hiddenTranslation.find('._gwibber_app_').text());
-var _remote_desktop_app_ = $.trim(hiddenTranslation.find('._remote_desktop_app_').text());
-var _terminal_app_ = $.trim(hiddenTranslation.find('._terminal_app_').text());
-var _about_me_app_ = $.trim(hiddenTranslation.find('._about_me_app_').text());
-var _additional_drivers_app_ = $.trim(hiddenTranslation.find('._additional_drivers_app_').text());
-var _aisleroit_app_ = $.trim(hiddenTranslation.find('._aisleroit_app_').text());
-var _appearance_app_ = $.trim(hiddenTranslation.find('._appearance_app_').text());
-var _bluetooth_app_ = $.trim(hiddenTranslation.find('._bluetooth_app_').text());
-
-/*
- * Dash
- */
-
-var _search_ = $.trim(hiddenTranslation.find('._search_').text());
-
-/*
- * Notifications
- */
-
-var _turn_off_bluetooth_ = $.trim(hiddenTranslation.find('._turn_off_bluetooth_').text());
-var _turn_on_bluetooth_ = $.trim(hiddenTranslation.find('._turn_on_bluetooth_').text());
-var _visible_ = $.trim(hiddenTranslation.find('._visible_').text());
-var _mute_ = $.trim(hiddenTranslation.find('._mute_').text());
-var _unmute_ = $.trim(hiddenTranslation.find('._unmute_').text());
-var _shut_down_ = $.trim(hiddenTranslation.find('._shut_down_').text());
-
-/*
- * Files Details - Images
- */
-var _photo_size_ = $.trim(hiddenTranslation.find('._photo_size_').text());
-var _photo_date_ = $.trim(hiddenTranslation.find('._photo_date_').text());
-var _buck_off_title_ = $.trim(hiddenTranslation.find('._buck_off_title_').text());
-var _darkening_clockwork_title_ = $.trim(hiddenTranslation.find('._darkening_clockwork_title_').text());
-var _darkening_clockwork_size_ = $.trim(hiddenTranslation.find('._darkening_clockwork_size_').text());
-var _dybbølsbro_station_title_ = $.trim(hiddenTranslation.find('._dybbølsbro_station_title_').text());
-var _federica_miglio_title_ = $.trim(hiddenTranslation.find('._federica_miglio_title_').text());
-var _jardin_polar_title_ = $.trim(hiddenTranslation.find('._jardin_polar_title_').text());
-var _langelinie_alle_title_ = $.trim(hiddenTranslation.find('._langelinie_alle_title_').text());
-var _momiji_dream_title_ = $.trim(hiddenTranslation.find('._momiji_dream_title_').text());
-var _mount_snowdon_title_ = $.trim(hiddenTranslation.find('._mount_snowdon_title_').text());
-var _not_alone_title_ = $.trim(hiddenTranslation.find('._not_alone_title_').text());
-var _power_of_words_title_ = $.trim(hiddenTranslation.find('._power_of_words_title_').text());
-var _purple_dancers_title_ = $.trim(hiddenTranslation.find('._purple_dancers_title_').text());
-var _sand_maze_title_ = $.trim(hiddenTranslation.find('._sand_maze_title_').text());
-var _small_flowers_title_ = $.trim(hiddenTranslation.find('._small_flowers_title_').text());
-var _stalking_ocelot_title_ = $.trim(hiddenTranslation.find('._stalking_ocelot_title_').text());
-var _the_grass_aint_greener_title_ = $.trim(hiddenTranslation.find('._the_grass_aint_greener_title_').text());
-var _wildWheat_title_ = $.trim(hiddenTranslation.find('._wildWheat_title_').text());
-/*
- * Files Details - Video
- */
-var _introduction_ubuntu_title_ = $.trim(hiddenTranslation.find('._introduction_ubuntu_title_').text());
-var _video_size_ = $.trim(hiddenTranslation.find('._video_size_').text());
-var _video_date_ = $.trim(hiddenTranslation.find('._video_date_').text());
-/*
- * Files Details - Music
- */
-var _happyness_title_ = $.trim(hiddenTranslation.find('._happyness_title_').text());
-var _music_size_ = $.trim(hiddenTranslation.find('._music_size_').text());
-var _music_date_ = $.trim(hiddenTranslation.find('._music_date_').text());
-
diff --git a/templates/tour/js/libresystem.js b/templates/tour/js/libresystem.js
deleted file mode 100644
index 55bae72cdeb..00000000000
--- a/templates/tour/js/libresystem.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Error Message 
- *  author: Anthony Dillon
- */
-
-function LibreSystem($parent){
-	var _this = this;
-	var _parent = $parent;
-	
-	this.init = function(){
-		$('#libreoffice-calc-window   .control .close').bind('click', function(){
-			_this.close('calc');
-		});
-		$('#libreoffice-writer-window   .control .close').bind('click', function(){
-			_this.close('writer');
-		});
-		$('#libreoffice-impress-window   .control .close').bind('click', function(){
-			_this.close('impress');
-		});
-		$('#libreoffice-calc-window .content').bind('click', function(){
-			_parent.errorMessage.open();
-		});
-		$('#libreoffice-writer-window .content').bind('click', function(){
-			_parent.errorMessage.open();
-		});
-		$('#libreoffice-impress-window .content').bind('click', function(){
-			_parent.errorMessage.open();
-		});
-		
-		this.center('calc');
-		this.center('writer');
-	}
-	
-	this.open = function($type){
-		$('#libreoffice-'+$type+'-window').show();
-		$('#libreoffice-'+$type+'-window ').trigger('mousedown');
-		this.center($type);
-		if($('css3-container').length > 0){
-        	$('#libreoffice-'+$type+'-window').prev().css('top', $('#libreoffice-'+$type+'-window').css('top'));
-        	$('#libreoffice-'+$type+'-window').prev().css('left', $('#libreoffice-'+$type+'-window').css('left'));
-        }
-	}
-	
-	this.close = function($type){
-		if($('#libreoffice-'+$type+'-window').is(':visible')){
-			_parent.openWindows['libreoffice-'+$type+'-window'] = false;
-			$('#libreoffice-'+$type+'-window').hide();
-			this.center($type);
-			_parent.systemMenu.closeWindow($type);
-		}
-	}
-	
-	this.center = function($type){
-	    	var left = ($(document).width() / 2) - ($('#libreoffice-'+$type+'-window').width() / 2);
-			var top =  Math.max(24,($(document).height() / 2) - ($('#libreoffice-'+$type+'-window').height() / 2));
-			$('#libreoffice-'+$type+'-window').css('left',left);
-			$('#libreoffice-'+$type+'-window').css('top',top);
-	    }
-}
diff --git a/templates/tour/js/modernizr.js b/templates/tour/js/modernizr.js
deleted file mode 100644
index 96cfd04e5ea..00000000000
--- a/templates/tour/js/modernizr.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Modernizr 2.0.6 (Custom Build) | MIT & BSD
- * Build: http://www.modernizr.com/download/#-borderradius-boxshadow-rgba-iepp-cssclasses-testprop-testallprops-domprefixes-load
- */
-;window.Modernizr=function(a,b,c){function A(a,b){var c=a.charAt(0).toUpperCase()+a.substr(1),d=(a+" "+n.join(c+" ")+c).split(" ");return z(d,b)}function z(a,b){for(var d in a)if(k[a[d]]!==c)return b=="pfx"?a[d]:!0;return!1}function y(a,b){return!!~(""+a).indexOf(b)}function x(a,b){return typeof a===b}function w(a,b){return v(prefixes.join(a+";")+(b||""))}function v(a){k.cssText=a}var d="2.0.6",e={},f=!0,g=b.documentElement,h=b.head||b.getElementsByTagName("head")[0],i="modernizr",j=b.createElement(i),k=j.style,l,m=Object.prototype.toString,n="Webkit Moz O ms Khtml".split(" "),o={},p={},q={},r=[],s,t={}.hasOwnProperty,u;!x(t,c)&&!x(t.call,c)?u=function(a,b){return t.call(a,b)}:u=function(a,b){return b in a&&x(a.constructor.prototype[b],c)},o.rgba=function(){v("background-color:rgba(150,255,150,.5)");return y(k.backgroundColor,"rgba")},o.borderradius=function(){return A("borderRadius")},o.boxshadow=function(){return A("boxShadow")};for(var B in o)u(o,B)&&(s=B.toLowerCase(),e[s]=o[B](),r.push((e[s]?"":"no-")+s));v(""),j=l=null,a.attachEvent&&function(){var a=b.createElement("div");a.innerHTML="<elem></elem>";return a.childNodes.length!==1}()&&function(a,b){function s(a){var b=-1;while(++b<g)a.createElement(f[b])}a.iepp=a.iepp||{};var d=a.iepp,e=d.html5elements||"abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",f=e.split("|"),g=f.length,h=new RegExp("(^|\\s)("+e+")","gi"),i=new RegExp("<(/*)("+e+")","gi"),j=/^\s*[\{\}]\s*$/,k=new RegExp("(^|[^\\n]*?\\s)("+e+")([^\\n]*)({[\\n\\w\\W]*?})","gi"),l=b.createDocumentFragment(),m=b.documentElement,n=m.firstChild,o=b.createElement("body"),p=b.createElement("style"),q=/print|all/,r;d.getCSS=function(a,b){if(a+""===c)return"";var e=-1,f=a.length,g,h=[];while(++e<f){g=a[e];if(g.disabled)continue;b=g.media||b,q.test(b)&&h.push(d.getCSS(g.imports,b),g.cssText),b="all"}return h.join("")},d.parseCSS=function(a){var b=[],c;while((c=k.exec(a))!=null)b.push(((j.exec(c[1])?"\n":c[1])+c[2]+c[3]).replace(h,"$1.iepp_$2")+c[4]);return b.join("\n")},d.writeHTML=function(){var a=-1;r=r||b.body;while(++a<g){var c=b.getElementsByTagName(f[a]),d=c.length,e=-1;while(++e<d)c[e].className.indexOf("iepp_")<0&&(c[e].className+=" iepp_"+f[a])}l.appendChild(r),m.appendChild(o),o.className=r.className,o.id=r.id,o.innerHTML=r.innerHTML.replace(i,"<$1font")},d._beforePrint=function(){p.styleSheet.cssText=d.parseCSS(d.getCSS(b.styleSheets,"all")),d.writeHTML()},d.restoreHTML=function(){o.innerHTML="",m.removeChild(o),m.appendChild(r)},d._afterPrint=function(){d.restoreHTML(),p.styleSheet.cssText=""},s(b),s(l);d.disablePP||(n.insertBefore(p,n.firstChild),p.media="print",p.className="iepp-printshim",a.attachEvent("onbeforeprint",d._beforePrint),a.attachEvent("onafterprint",d._afterPrint))}(a,b),e._version=d,e._domPrefixes=n,e.testProp=function(a){return z([a])},e.testAllProps=A,g.className=g.className.replace(/\bno-js\b/,"")+(f?" js "+r.join(" "):"");return e}(this,this.document),function(a,b,c){function k(a){return!a||a=="loaded"||a=="complete"}function j(){var a=1,b=-1;while(p.length- ++b)if(p[b].s&&!(a=p[b].r))break;a&&g()}function i(a){var c=b.createElement("script"),d;c.src=a.s,c.onreadystatechange=c.onload=function(){!d&&k(c.readyState)&&(d=1,j(),c.onload=c.onreadystatechange=null)},m(function(){d||(d=1,j())},H.errorTimeout),a.e?c.onload():n.parentNode.insertBefore(c,n)}function h(a){var c=b.createElement("link"),d;c.href=a.s,c.rel="stylesheet",c.type="text/css";if(!a.e&&(w||r)){var e=function(a){m(function(){if(!d)try{a.sheet.cssRules.length?(d=1,j()):e(a)}catch(b){b.code==1e3||b.message=="security"||b.message=="denied"?(d=1,m(function(){j()},0)):e(a)}},0)};e(c)}else c.onload=function(){d||(d=1,m(function(){j()},0))},a.e&&c.onload();m(function(){d||(d=1,j())},H.errorTimeout),!a.e&&n.parentNode.insertBefore(c,n)}function g(){var a=p.shift();q=1,a?a.t?m(function(){a.t=="c"?h(a):i(a)},0):(a(),j()):q=0}function f(a,c,d,e,f,h){function i(){!o&&k(l.readyState)&&(r.r=o=1,!q&&j(),l.onload=l.onreadystatechange=null,m(function(){u.removeChild(l)},0))}var l=b.createElement(a),o=0,r={t:d,s:c,e:h};l.src=l.data=c,!s&&(l.style.display="none"),l.width=l.height="0",a!="object"&&(l.type=d),l.onload=l.onreadystatechange=i,a=="img"?l.onerror=i:a=="script"&&(l.onerror=function(){r.e=r.r=1,g()}),p.splice(e,0,r),u.insertBefore(l,s?null:n),m(function(){o||(u.removeChild(l),r.r=r.e=o=1,j())},H.errorTimeout)}function e(a,b,c){var d=b=="c"?z:y;q=0,b=b||"j",C(a)?f(d,a,b,this.i++,l,c):(p.splice(this.i++,0,a),p.length==1&&g());return this}function d(){var a=H;a.loader={load:e,i:0};return a}var l=b.documentElement,m=a.setTimeout,n=b.getElementsByTagName("script")[0],o={}.toString,p=[],q=0,r="MozAppearance"in l.style,s=r&&!!b.createRange().compareNode,t=r&&!s,u=s?l:n.parentNode,v=a.opera&&o.call(a.opera)=="[object Opera]",w="webkitAppearance"in l.style,x=w&&"async"in b.createElement("script"),y=r?"object":v||x?"img":"script",z=w?"img":y,A=Array.isArray||function(a){return o.call(a)=="[object Array]"},B=function(a){return Object(a)===a},C=function(a){return typeof a=="string"},D=function(a){return o.call(a)=="[object Function]"},E=[],F={},G,H;H=function(a){function f(a){var b=a.split("!"),c=E.length,d=b.pop(),e=b.length,f={url:d,origUrl:d,prefixes:b},g,h;for(h=0;h<e;h++)g=F[b[h]],g&&(f=g(f));for(h=0;h<c;h++)f=E[h](f);return f}function e(a,b,e,g,h){var i=f(a),j=i.autoCallback;if(!i.bypass){b&&(b=D(b)?b:b[a]||b[g]||b[a.split("/").pop().split("?")[0]]);if(i.instead)return i.instead(a,b,e,g,h);e.load(i.url,i.forceCSS||!i.forceJS&&/css$/.test(i.url)?"c":c,i.noexec),(D(b)||D(j))&&e.load(function(){d(),b&&b(i.origUrl,h,g),j&&j(i.origUrl,h,g)})}}function b(a,b){function c(a){if(C(a))e(a,h,b,0,d);else if(B(a))for(i in a)a.hasOwnProperty(i)&&e(a[i],h,b,i,d)}var d=!!a.test,f=d?a.yep:a.nope,g=a.load||a.both,h=a.callback,i;c(f),c(g),a.complete&&b.load(a.complete)}var g,h,i=this.yepnope.loader;if(C(a))e(a,0,i,0);else if(A(a))for(g=0;g<a.length;g++)h=a[g],C(h)?e(h,0,i,0):A(h)?H(h):B(h)&&b(h,i);else B(a)&&b(a,i)},H.addPrefix=function(a,b){F[a]=b},H.addFilter=function(a){E.push(a)},H.errorTimeout=1e4,b.readyState==null&&b.addEventListener&&(b.readyState="loading",b.addEventListener("DOMContentLoaded",G=function(){b.removeEventListener("DOMContentLoaded",G,0),b.readyState="complete"},0)),a.yepnope=d()}(this,this.document),Modernizr.load=function(){yepnope.apply(window,[].slice.call(arguments,0))};
\ No newline at end of file
diff --git a/templates/tour/js/movieplayersystem.js b/templates/tour/js/movieplayersystem.js
deleted file mode 100644
index 3e2cef43add..00000000000
--- a/templates/tour/js/movieplayersystem.js
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- *  Movie Player System
- *  author: Anthony Dillon
- */
-
-function MoviePlayerSystem($parent){
-	
-	var _parent = $parent;
-	var _this = this;
-	var _isOpen = false;
-	var maximised = false;
-	var minified = false;
-	var movieURL = 'videos/iStock.flv';
-	
-	this.init = function(){
-		this.setupControl();
-	}
-	
-	this.setupControl = function(){
-		$('#movieplayer  .control .close').click(function(){
-			_this.close();
-		});
-		$('#movieplayer  .control .min').click(function(){
-			_this.min();
-		});
-		
-		$('#movieplayer  .control .max').click(function(){
-			if(maximised){
-				maximised = false;
-				$('#movieplayer').css('width','700px');
-				$('#movieplayer').css('height','497px');
-				$('#movieplayer').removeClass('fullsize');
-				_parent.systemSettings.decreaseFullscreen();
-			}else{
-				maximised = true;
-				$('#movieplayer').css('width',$(document).width() - 70 + 'px');
-				$('#movieplayer').css('height',$(document).height() - 50 + 'px');
-				$('#movieplayer').addClass('fullsize');
-				_parent.systemSettings.increaseFullscreen();
-			}
-			_this.resize();
-		});
-		$('#movieplayer .container .tools .controlbuttons .left .play').click(function(){
-			playClicked();
-		});
-	}
-	
-	this.addVideo = function(){
-		var videoObject = '<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"  width="'+$('#movieplayer .container .video').width()+'" height="'+$('#movieplayer .container .video').height()+'"  id="videoPlayer"><param name="movie"  value="../videoplayer.swf" />		<param name="wmode" value="transparent" />  <param name="quality" value="high" />		<param name="bgcolor" value="#000000" />		<embed wmode="transparent" src="../videoplayer.swf" quality="high" bgcolor="#000000" width="'+$('#movieplayer .container .video').width()+'" height="'+$('#movieplayer .container .video').height()+'"  name="videoPlayer" align="" type="application/x-shockwave-flash"  pluginspage="http://www.macromedia.com/go/getflashplayer"> </embed></object>'; 
-		$('#movieplayer .container .video').html(videoObject);
-	}
-	
-	this.removeVideo = function(){
-		$('#movieplayer .container .video').html('');
-	}
-	
-	this.open = function($playvideo){
-		if(!_isOpen){
-			this.resize();
-			this.center();
-			$('#movieplayer').show();
-		}
-		$('#movieplayer').mousedown();
-		_parent.systemMenu.openWindow('movieplayer');
-		_isOpen = true;
-		if($('css3-container').length > 0){
-        	$('#movieplayer').prev().css('top', $('#movieplayer').css('top'));
-        	$('#movieplayer').prev().css('left', $('#movieplayer').css('left'));
-        }
-	}
-	
-	this.close = function(){
-		_parent.openWindows['movieplayer'] = false;
-		if(maximised){ _parent.systemSettings.decreaseFullscreen(); }
-		$('#movieplayer ').hide();
-		_parent.systemMenu.closeWindow('movieplayer');
-		$('#movieplayer ').removeClass('fullsize');
-		_this.resize();
-		minified = _isOpen = false;
-		this.removeVideo();
-		_this.center();
-	}
-	
-	this.min = function(){
-		if(maximised){ _parent.systemSettings.decreaseFullscreen(); }
-		$('#movieplayer ').hide();
-		_parent.systemMenu.wiggle('movieplayer');
-		minified = true;
-		_isOpen = false;
-	}
-	
-	this.isMaximised = function(){
-		return maximised;
-	}
-	
-	this.resize = function(){
-		var videoWidth = $('#movieplayer').width();
-		var videoHeight = $('#movieplayer').height();
-		$('#videoPlayer embed').attr('width',videoWidth);
-		$('#videoPlayer').attr('width',videoWidth);
-		$('#videoPlayer').attr('height',videoHeight);
-		$('#videoPlayer embed').attr('height',videoHeight - 27);
-	}
-	
-	this.center = function(){
-    	var left = ($(document).width() / 2) - ($('#movieplayer').width() / 2);
-		var top = Math.max(24,($(document).height() / 2) - ($('#movieplayer').height() / 2));
-		$('#movieplayer').css('left',left);
-		$('#movieplayer').css('top',top);
-    }
-}
-
-function getFlashMovieObject(movieName){
-	if (window.document[movieName]){
-		return window.document[movieName];
-	}
-	if (navigator.appName.indexOf("Microsoft Internet")==-1){
-		if (document.embeds && document.embeds[movieName])
-			return document.embeds[movieName];
-	}
-	else{
-		return document.getElementById(movieName);
-	}
-}
-
-function playClicked(){
-	var flashMovie=getFlashMovieObject("videoPlayer");
-	flashMovie.playClicked('fg');
-}
diff --git a/templates/tour/js/notificationsystem.js b/templates/tour/js/notificationsystem.js
deleted file mode 100644
index e639e82258a..00000000000
--- a/templates/tour/js/notificationsystem.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *  Notification System
- *  author: Anthony Dillon
- */
-
-function NotificationSystem(){
-	var _this;
-	var displaying;
-	var messageArray;
-	var notificationTimeout;
-	
-	this.init = function(){
-		_this = this;
-		displaying = false;
-		messageArray = new Array();
-		notificationTimeout = null;
-	}
-	
-	this.displayNotification = function($img, $title, $desc){
-		messageArray.push({img:$img, title:$title, desc:$desc});
-		if(!displaying){
-			this.showNotification();
-		}
-	}
-	
-	this.showNotification = function(){
-		displaying = true;
-		$('body').append('<div class="notification"><img src="'+messageArray[0].img+'"/><p class="title">'+messageArray[0].title+'</p><p class="description">'+messageArray[0].desc+'</p></div>');
-		$('.notification').bind('mouseover', function(){
-			_this.stopTimeout();
-		});
-		$('.notification').bind('mouseout', function(){
-			_this.startTimeout();
-		});
-		$('.notification').fadeTo(1000, 1, _this.startTimeout);
-	}
-	
-	this.startTimeout = function(){
-		notificationTimeout = setTimeout(function() {
-			$('.notification').fadeTo(1000, 0, _this.killTimeout);
-		}, 3000);
-	}
-	
-	this.killTimeout = function(){
-		$('.notification').remove();
-		$('.notification').unbind('mouseover');
-		$('.notification').unbind('mouseout');
-		clearInterval(notificationTimeout);
-		notificationTimeout = null;
-		displaying = false;
-		_this.runNext();
-	}
-	
-	this.runNext = function(){
-		messageArray.splice(0,1);
-		if(messageArray.length > 0){
-			this.showNotification();
-		}
-	}
-	
-	this.stopTimeout = function(){
-		clearInterval(notificationTimeout);
-		notificationTimeout = null;
-	}
-}
diff --git a/templates/tour/js/scripts.js b/templates/tour/js/scripts.js
deleted file mode 100644
index 8d23c7aa3a8..00000000000
--- a/templates/tour/js/scripts.js
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
- *  Main Script System
- *  author: Anthony Dillon
- */
-
-var _this = this;
-var movingFolder = null;
-var folderXOffset = 0;
-var folderYOffset = 0;
-var fileSystem = null;
-var systemOverlay = null;
-var systemMenu = null;
-var firefoxSystem = null;
-var emailSystem = null;
-var ubuntuOneSystem = null;
-var systemSettings = null;
-var errorMessage = null;
-var shutdownSystem = null;
-var libreSystem = null;
-var currentSystemSelected = null;
-var currentSelectedFullscreen = false;
-//var workspaces = null;
-var shotwellSystem = null;
-var welcomeSystem = null;
-var moviePlayerSystem = null;
-var guidedTourSystem = null;
-var notificationSystem = null;
-var softwareSystem = null;
-var fileLibrary = new Array();
-var openWindows = new Array();
-
-$(document).ready(function(){
-	if($.browser.msie){
-		if($.browser.version != '8.0' && $.browser.version != '9.0'){
-			window.location.href = '/ubuntu/take-the-tour-gallery';
-		}else{
-			setup();
-		}
-	}else{
-		setup();
-	}
-});
-
-function setup(){
-	var imageObj = new Image();
-	$(imageObj).attr("src","../img/welcome/background-welcome.jpg").load(function(){
-	  	$('#loader').hide();
-	});
-	setupSystemSettings();
-	setupGuidedTourSystem();
-	setupShotwellSystem();
-	setupSystemMenu();
-	setupSystemOverlay();
-	setupFirefoxSystem();
-	setupEmailSystem();
-	setupErrorMessage();
-	setupUbuntuOneSystem();
-	setupFileSystem();
-	setupShutdownSystem();
-	setupMoviePlayerSystem();
-	setupLibreSystem();
-	setupNotificationSystem();
-	setupSoftwareSystem();
-	setupWelcomeSystem();
-	init();
-}
-
-function init(){
-	$(window).resize(function() {
-		systemOverlay.resize();
-		if(ubuntuOneSystem.isOpen()){
-			ubuntuOneSystem.resize();
-		}
-		if(welcomeSystem.isOpen()){
-			welcomeSystem.resize();
-		}
-		systemMenu.resize();
-	});
-	
-	$(document).mousemove(function(e){
-      		if(movingFolder != null){
-      			movingFolder.css('left', e.pageX - folderXOffset);
-      			movingFolder.css('top',Math.max(24, e.pageY - folderYOffset));
-      		}
-     }); 
-     
-     $('.control').mousedown(function(e) {
-			movingFolder = $(this).parent();
-			folderXOffset = e.pageX - movingFolder.position().left;
-			folderYOffset = e.pageY - movingFolder.position().top;
-	 });
-	 $(document).mouseup(function() {
-			movingFolder = null;
-	 });
-	 
-	 $('.window').mousedown(function(){
-		if($(this).attr('class').indexOf("firefox-window") != -1){
-			if($(this).attr('class').indexOf("fullsize") == -1){
-				$('.firefox-window .web-overlay-tran').css('width','100%');
-				$('.firefox-window .web-overlay-tran').hide();
-			}else{
-				$('.firefox-window .web-ubuntuOneSystemoverlay-tran').css('width','100px');
-				$('.firefox-window .web-overlay-tran').show();	
-			}
-		}else{
-			$('.firefox-window .web-overlay-tran').css('width','100%');
-			$('.firefox-window .web-overlay-tran').show();
-		}
-		$('.window').css('z-index',2);
-		$('.window').removeClass('selected-window');
-		$('#top #top-left #title').text($('.window-title', this).text());
-		$('.'+currentSystemSelected).css('z-index',3);
-		$(this).css('z-index',4);
-		
-		if($('css3-container').length > 0){
-	     	$('css3-container').css('z-index',2);
-	     	$('.'+currentSystemSelected).prev().css('z-index',3);
-	        $(this).prev().css('z-index',4);
-		}
-		
-		$(this).addClass('selected-window');
-		openWindows[$(this).attr('id')] = true;
-		
-		if(currentSystemSelected != $(this).attr('class').replace(' window', '').replace(' fullsize', '').replace(' selected-window','').replace(' window', '')){
-			currentSystemSelected = $(this).attr('class').replace(' fullsize', '');
-			currentSystemSelected = currentSystemSelected.replace(' selected-window','');
-			currentSystemSelected = currentSystemSelected.replace(' window', '');
-			$('#menu ul li .selected-window-arrow').hide();
-			var set = currentSystemSelected;
-			if(set == 'folder'){ set = 'home'; }
-			if(set == 'firefox-window'){ set = 'firefox'; }
-			if(set == 'email-window'){ set = 'email'; }
-			
-			$('#menu ul li.'+set+' .selected-window-arrow').show();
-			
-			guidedTourSystem.setSystem(set);
-		}
-	 });
-     setupTopMenu();
-}
-
-function noWIndowSelected(){
-	currentSystemSelected = null;
-	$('#menu ul li .selected-window-arrow').hide();
-}
-
-function setupTopMenu(){
-	$('#top #top-right div').bind('click', function(){
-		var hasSelected = $(this).hasClass('selected');
-		closeTopRightDropDowns();
-		if(!hasSelected){
-			$(this).addClass('selected');
-			$('.drop-down',this).show();
-			addTransOverlay();
-			$('#top #top-right div').bind('mouseover',function(){
-				if(!$(this).hasClass('selected')){
-					$('#top #top-right div').removeClass('selected');
-					$('#top #top-right .drop-down').hide();
-					$(this).addClass('selected');
-					$('.drop-down',this).show();
-				}
-			});
-		}else{
-			$('#top #top-right div').unbind('mouseover');
-			//systemMenu.setLocked(false);
-		}
-	});
-	
-	$('#top #top-right div ul li').bind('click',function(){
-		switch($.trim($(this).text())){
-			case _turn_off_bluetooth_:
-				systemSettings.setBluetooth(false);
-				$(this).text(_turn_on_bluetooth_);
-			break;
-			case _turn_on_bluetooth_:
-				systemSettings.setBluetooth(true);
-				$(this).text(_turn_off_bluetooth_);
-			break;
-			case _visible_:
-				if(systemSettings.bluetoothVisible()){
-					systemSettings.setBluetoothVisible(false);
-					$(this).removeClass('ticked');
-				}else{
-					systemSettings.setBluetoothVisible(true);
-					$(this).addClass('ticked');
-				}
-			break;
-			case _mute_:
-				systemSettings.setMute(true);
-				sliderUpdate(0, 1);
-				$(this).text(_unmute_);
-			break;
-			case _unmute_:
-				systemSettings.setMute(false);
-				sliderUpdate(systemSettings.volume(), 0);
-				$(this).text(_mute_);
-			break;
-			case _shut_down_:
-				shutdownSystem.open();
-			break;
-			default:
-				errorMessage.open();
-			break;
-		}
-	});
-	
-	$('#top #top-right #speakers .slider').slider({
-			min: 0,
-			max: 100,
-			step: 1,
-			value: 30,
-			slide: function(event, ui) {
-				currentPercent = $(this).slider('option', 'value');
-				_this.sliderUpdate(currentPercent);
-			},
-			stop: function(event, ui) {
-				currentPercent = $(this).slider('option', 'value');
-				_this.sliderUpdate(currentPercent);
-				_this.systemSettings.setVolume(currentPercent);
-			}
-		});
-		
-	
-	$('#top #top-left #control-buttons div').bind('click', function(){
-		var buttonClicked = $(this).attr('id');
-		$('.'+currentSystemSelected+ ' .control .'+buttonClicked).trigger('click');
-	});
-	
-	$('#top #top-right #speakers .banshee').mouseover(function(){
-		$('#top #top-right #speakers .banshee .banshee-play').css('background-image','url(../img/top/banshee-play-highlight.png)');
-	});
-	
-	$('#top #top-right #speakers .banshee').mouseout(function(){
-		$('#top #top-right #speakers .banshee .banshee-play').css('background-image','url(../img/top/banshee-play.png)');
-	});
-	
-}
-
-function sliderUpdate($percent, $muted){
-	var active = parseInt((195 * $percent) / 100);
-	if(active < 10){ active = 0; }
-	$('#top #top-right #speakers .drop-down .slider-active').css('width',active);
-	var imageIndex = 0;
-	if(systemSettings.mute()){
-		imageIndex = 0;
-	}else	if($percent <= 1){
-		imageIndex = 1;
-	}else	if($percent <= 35){
-		imageIndex = 2;
-	}else if($percent <= 75){
-		imageIndex = 3;
-	}else if($percent >= 75){
-		imageIndex = 4;
-	}
-	if($muted != undefined){
-		if($muted){
-			$('#top #top-right #speakers .slider').slider({value: 0});
-		}else{
-			$('#top #top-right #speakers .slider').slider({value: systemSettings.volume()});
-		}
-	}
-	$('#top #top-right #speakers img.speakers-logo').attr('src', '../img/top/speakers'+imageIndex+'.png');
-}
-
-function closeTopRightDropDowns(){
-	$('#top #top-right div').removeClass('selected');
-	$('#top #top-right .drop-down').hide();
-	$('.fullscreenTransOverlay').unbind('click');
-	$('.fullscreenTransOverlay').remove();
-	$('#top #top-right div').unbind('mouseover');
-}
-
-function addTransOverlay(){
-	$('body').append('<div class="fullscreenTransOverlay"></div>');
-	//systemMenu.setLocked(true);
-	$('.fullscreenTransOverlay').bind('click',function(){
-		closeTopRightDropDowns();
-	});
-}
-
-/*function setupWorkspaces(){
-	workspaces = new Workspaces(this);
-	workspaces.init();
-}*/
-
-function setupSystemSettings(){
-	systemSettings = new SystemSettings(this);
-	systemSettings.init();
-}
-
-function setupErrorMessage(){
-	errorMessage = new ErrorMessage(this);
-	errorMessage.init();
-}
-
-function setupSystemOverlay(){
-	systemOverlay = new SystemOverlay(this);
-	systemOverlay.init();
-}
-
-function setupSystemMenu(){
-	systemMenu = new SystemMenu(this);
-	systemMenu.init();
-}
-
-function setupLibreSystem(){
-	libreSystem = new LibreSystem(this);
-	libreSystem.init();
-}
-
-function setupSoftwareSystem(){
-	softwareSystem = new SoftwareSystem(this);
-	softwareSystem.init();
-}
-
-function setupNotificationSystem(){
-	notificationSystem = new NotificationSystem();
-	notificationSystem.init();
-}
-
-function setupShutdownSystem(){
-	shutdownSystem = new ShutdownSystem();
-	shutdownSystem.init();
-}
-
-function setupFirefoxSystem(){
-	firefoxSystem = new FirefoxSystem(this);
-	firefoxSystem.init();
-}
-
-function setupMoviePlayerSystem(){
-	moviePlayerSystem = new MoviePlayerSystem(this);
-	moviePlayerSystem.init();
-}
-
-function setupEmailSystem(){
-	emailSystem = new EmailSystem(this);
-	emailSystem.init();
-}
-
-function setupUbuntuOneSystem(){
-	ubuntuOneSystem = new UbuntuOneSystem(this);
-	ubuntuOneSystem.init();
-}
-
-function setupFileSystem(){
-	fileSystem = new FileSystem(this);
-	fileSystem.init();
-}
-
-function setupWelcomeSystem(){
-	welcomeSystem = new WelcomeSystem(this);
-	welcomeSystem.init();
-}
-
-function setupGuidedTourSystem(){
-	guidedTourSystem = new GuidedTourSystem(this);
-	guidedTourSystem.init();
-}
-
-function closeAllWindows($tourIndex){
-	var _tourIndex = $tourIndex;
-	$('#systemOverlay').hide();
-	errorMessage.close();
-	firefoxSystem.close();
-	emailSystem.close();
-	ubuntuOneSystem.close();
-	fileSystem.close();
-	shotwellSystem.close();
-	libreSystem.close('writer');
-	libreSystem.close('calc');
-	libreSystem.close('impress');
-	softwareSystem.close();
-	guidedTourSystem.setIndex(_tourIndex);
-}
-
-function setupShotwellSystem(){
-	fileLibrary.push(new File(fileLibrary.length,'../img/shotwell/library/Buckoff.jpg','photo', _buck_off_title_, _photo_size_,_photo_date_, '/'+_home_folder_+'/'+_pictures_folder_));
-	fileLibrary.push(new File(fileLibrary.length,'../img/shotwell/library/DarkeningClockwork.jpg','photo', _darkening_clockwork_title_, _photo_size_,_photo_date_, '/'+_home_folder_+'/'+_pictures_folder_));
-	fileLibrary.push(new File(fileLibrary.length,'../img/shotwell/library/DybblsbroStation.jpg','photo', _dybbølsbro_station_title_, _photo_size_,_photo_date_, '/'+_home_folder_+'/'+_pictures_folder_));
-	fileLibrary.push(new File(fileLibrary.length,'../img/shotwell/library/FedericaMiglio.jpg','photo', _federica_miglio_title_, _photo_size_, _photo_date_, '/'+_home_folder_+'/'+_pictures_folder_));
-	fileLibrary.push(new File(fileLibrary.length,'../img/shotwell/library/JardinPolar.jpg','photo', _jardin_polar_title_, _photo_size_, _photo_date_, '/'+_home_folder_+'/'+_pictures_folder_));
-	fileLibrary.push(new File(fileLibrary.length,'../img/shotwell/library/LangelinieAlle.jpg','photo', _langelinie_alle_title_, _photo_size_,_photo_date_, '/'+_home_folder_+'/'+_pictures_folder_));
-	fileLibrary.push(new File(fileLibrary.length,'../img/shotwell/library/MomijiDream.jpg','photo', _momiji_dream_title_, _photo_size_,_photo_date_, '/'+_home_folder_+'/'+_pictures_folder_));
-	fileLibrary.push(new File(fileLibrary.length,'../img/shotwell/library/MountSnowdon.jpg','photo', _mount_snowdon_title_, _photo_size_,_photo_date_, '/'+_home_folder_+'/'+_pictures_folder_));
-	fileLibrary.push(new File(fileLibrary.length,'../img/shotwell/library/NotAlone.jpg','photo', _not_alone_title_, _photo_size_, _photo_date_, '/'+_home_folder_+'/'+_pictures_folder_));
-	fileLibrary.push(new File(fileLibrary.length,'../img/shotwell/library/PowerOfWords.jpg','photo', _power_of_words_title_, _photo_size_, _photo_date_, '/'+_home_folder_+'/'+_pictures_folder_));
-	fileLibrary.push(new File(fileLibrary.length,'../img/shotwell/library/PurpleDancers.jpg','photo', _purple_dancers_title_, _photo_size_,_photo_date_, '/'+_home_folder_+'/'+_pictures_folder_));
-	fileLibrary.push(new File(fileLibrary.length,'../img/shotwell/library/SandMaze.jpg','photo', _sand_maze_title_, _photo_size_,_photo_date_, '/'+_home_folder_+'/'+_pictures_folder_));
-	fileLibrary.push(new File(fileLibrary.length,'../img/shotwell/library/SmallFlowers.jpg','photo', _small_flowers_title_, _photo_size_,_photo_date_, '/'+_home_folder_+'/'+_pictures_folder_));
-	fileLibrary.push(new File(fileLibrary.length,'../img/shotwell/library/StalkingOcelot.jpg','photo', _stalking_ocelot_title_, _photo_size_, _photo_date_, '/'+_home_folder_+'/'+_pictures_folder_));
-	fileLibrary.push(new File(fileLibrary.length,'../img/shotwell/library/TheGrassAintGreener.jpg','photo', _the_grass_aint_greener_title_, _photo_size_, _photo_date_, '/'+_home_folder_+'/'+_pictures_folder_));
-	fileLibrary.push(new File(fileLibrary.length,'../img/shotwell/library/WildWheat.jpg','photo', _wildWheat_title_, _photo_size_,_photo_date_, '/'+_home_folder_+'/'+_pictures_folder_));
-	
-	fileLibrary.push(new File(fileLibrary.length,'../videos/IAmWeAre.flv','video', _introduction_ubuntu_title_, _video_size_, _video_date_, '/'+_home_folder_+'/'+_videos_folder_));
-	
-	fileLibrary.push(new File(fileLibrary.length,'../audio/preview.mp3','audio', _happyness_title_, _music_size_, _music_date_, '/'+_home_folder_+'/'+_music_folder_));
-	
-	shotwellSystem = new ShotwellSystem(this);
-	shotwellSystem.init();
-}
-
-function topShadow($display){
-	if($display){
-		$('#top').addClass('dropShadow');
-		$('#control-buttons').hide();
-		$('#top').unbind('mouseover');
-		$('#top').unbind('mouseout');
-	}else{
-		$('#top').removeClass('dropShadow');
-		$('#top').bind('mouseover',function(){
-			currentSystemSelected = currentSystemSelected.replace(' pie_hover','');
-			var currentWindowFullScreen = $('.'+currentSystemSelected).hasClass('fullsize');
-			if(!$('#systemOverlay').is(':visible') && currentWindowFullScreen){
-				$('#control-buttons').show();
-			}
-		});
-		$('#top').bind('mouseout',function(){
-			$('#control-buttons').hide();
-		});
-	}
-}
-
-function blurWindows(){
-		var $currentBackground = '';
-		var $indexLastSlash = 0;
-		var $newBackgroundLink = '';
-		for(i in openWindows){
-			if(openWindows[i] == true){
-				$('#'+i).addClass('blurred');
-				$.each($('#'+i+' *'), function(){
-					if($(this).is('img')){
-						$currentBackground = $(this).attr('src');
-						$indexLastSlash = $currentBackground.lastIndexOf('/');
-						$newBackgroundLink = $currentBackground.substr(0,$indexLastSlash) + '/blur' + $currentBackground.substr($indexLastSlash);
-						$(this).attr('src',$newBackgroundLink);
-					}else{
-						$currentBackground = $(this).css('background-image');
-						if($currentBackground != 'none'){
-							 $indexLastSlash = $currentBackground.lastIndexOf('/');
-							 $newBackgroundLink = $currentBackground.substr(0,$indexLastSlash) + '/blur' + $currentBackground.substr($indexLastSlash);
-							$(this).css('background-image',$newBackgroundLink);
-						}
-					}
-				});
-			}
-		}
-		
-		/*$.each($('#menu *'), function(){
-			if($(this).is('img')){
-				$currentBackground = $(this).attr('src');
-				$indexLastSlash = $currentBackground.lastIndexOf('/');
-				$newBackgroundLink = $currentBackground.substr(0,$indexLastSlash) + '/blur' + $currentBackground.substr($indexLastSlash);
-				$(this).attr('src',$newBackgroundLink);
-			}else{
-				$currentBackground = $(this).css('background-image');
-				if($currentBackground != 'none'){
-					 $indexLastSlash = $currentBackground.lastIndexOf('/');
-					 $newBackgroundLink = $currentBackground.substr(0,$indexLastSlash) + '/blur' + $currentBackground.substr($indexLastSlash);
-					$(this).css('background-image',$newBackgroundLink);
-				}
-			}
-		});*/
-		$.each($('#top-right *'), function(){
-			if($(this).is('img')){
-				$currentBackground = $(this).attr('src');
-				$indexLastSlash = $currentBackground.lastIndexOf('/');
-				$newBackgroundLink = $currentBackground.substr(0,$indexLastSlash) + '/blur' + $currentBackground.substr($indexLastSlash);
-				$(this).attr('src',$newBackgroundLink);
-			}else{
-				$currentBackground = $(this).css('background-image');
-				if($currentBackground != 'none'){
-					 $indexLastSlash = $currentBackground.lastIndexOf('/');
-					 $newBackgroundLink = $currentBackground.substr(0,$indexLastSlash) + '/blur' + $currentBackground.substr($indexLastSlash);
-					$(this).css('background-image',$newBackgroundLink);
-				}
-			}
-		});
-		
-}
-
-function unblurWindows(){
-		var $currentBackground = '';
-		var $newBackgroundLink = '';
-		for(i in openWindows){
-			if(openWindows[i] == true){
-				$('#'+i).removeClass('blurred');
-				$.each($('#'+i+' *'), function(){
-					if($(this).is('img')){
-						$currentBackground = $(this).attr('src');
-						$newBackgroundLink = $currentBackground.replace('/blur','');
-						$(this).attr('src',$newBackgroundLink);
-					}else{
-						$currentBackground = $(this).css('background-image');
-						if($currentBackground != 'none'){
-							$newBackgroundLink = $currentBackground.replace('/blur','');
-							$(this).css('background-image',$newBackgroundLink)
-						}
-					}
-				});
-			}
-		}
-		
-		$.each($('#menu *'), function(){
-			if($(this).is('img')){
-				$currentBackground = $(this).attr('src');
-				$newBackgroundLink = $currentBackground.replace('/blur','');
-				$(this).attr('src',$newBackgroundLink);
-			}else{
-				$currentBackground = $(this).css('background-image');
-				if($currentBackground != 'none'){
-					$newBackgroundLink = $currentBackground.replace('/blur','');
-					$(this).css('background-image',$newBackgroundLink)
-				}
-			}
-		});
-		$.each($('#top-right *'), function(){
-			if($(this).is('img')){
-				$currentBackground = $(this).attr('src');
-				$newBackgroundLink = $currentBackground.replace('/blur','');
-				$(this).attr('src',$newBackgroundLink);
-			}else{
-				$currentBackground = $(this).css('background-image');
-				if($currentBackground != 'none'){
-					$newBackgroundLink = $currentBackground.replace('/blur','');
-					$(this).css('background-image',$newBackgroundLink)
-				}
-			}
-		});
-}
-
diff --git a/templates/tour/js/shotwellsystem.js b/templates/tour/js/shotwellsystem.js
deleted file mode 100644
index 653ec31a209..00000000000
--- a/templates/tour/js/shotwellsystem.js
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- *  Shotwell System
- *  author: Anthony Dillon
- */
-
-function ShotwellSystem($parent){
-	
-	var _parent = $parent;
-	var _this = this;
-	var _isOpen = false;
-	var maximised = false;
-	var resizeWidth = 60;
-	var imageCount = 0;
-	var imageMin = 72;
-	var imageMax = 360;
-	var columns = 0;
-	var currentPercent = 0.3;
-	var currentIndex = 0;
-	
-	this.init = function(){
-		columns = Math.floor($('#shotwell .container .images').width() / 158);
-		imageCount = _parent.fileLibrary.length - 2;
-		this.setupControl();
-	}
-	
-	this.setupControl = function(){
-		$('#shotwell  .control .close').click(function(){
-			_this.close();
-		});
-		$('#shotwell  .control .min').click(function(){
-			_this.min();
-		});
-		
-		$('#shotwell  .control .max').click(function(){
-			if(maximised){
-				maximised = false;
-				$('#shotwell').css('width','800px');
-				$('#shotwell').css('height','550px');
-				$('#shotwell ').removeClass('fullsize');
-				_parent.systemSettings.decreaseFullscreen();
-			}else{
-				maximised = true;
-				$('#shotwell').css('width',$(document).width() - 70 + 'px');
-				$('#shotwell').css('height',$(document).height() - 50 + 'px');
-				$('#shotwell ').addClass('fullsize');
-				_parent.systemSettings.increaseFullscreen();
-			}
-			_this.resize();
-		});
-		
-		$('#shotwell .nav ul').click(function(){
-			$(this).addClass('selected');
-			$('#shotwell .container .images').removeClass('singleImage');
-			$('#shotwell .container .tools .jump-image').hide();
-			$('#shotwell .container .tools .slider-container').show();
-			$('#shotwell .sidebar .details .overall').show();
-			$('#shotwell .sidebar .details .single').hide();
-			_this.display();
-			_this.sliderUpdate(currentPercent);
-		});
-		
-		$('#shotwell .container .tools .jump-image .next').bind('click',function(){
-			if(!$(this).hasClass('disabled')){
-				currentIndex++;
-				_this.updateImageDetails(currentIndex);
-				_this.display(currentIndex);
-				_this.checkNextPrev();
-			}
-		});
-		
-		$('#shotwell .container .tools .jump-image .prev').bind('click',function(){
-			if(!$(this).hasClass('disabled')){
-				currentIndex--;
-				_this.updateImageDetails(currentIndex);
-				_this.display(currentIndex);
-				_this.checkNextPrev();
-			}
-		});
-		
-		$('#shotwell .container .tools .slider-container .slider').slider({
-			min: 0,
-			max: 100,
-			step: 1,
-			value: 30,
-			slide: function(event, ui) {
-				_this.getSliderValueAndUpdate($(this));
-			},
-			change: function(event, ui) {
-				_this.getSliderValueAndUpdate($(this));
-			}
-		});
-		
-		$('#shotwell .container .images').click(function(){
-			$('#shotwell .nav ul').removeClass('selected');
-			$('#shotwell .container .images img').removeClass('selected');
-			$('#shotwell .sidebar .details .overall').show();
-			$('#shotwell .sidebar .details .single').hide();
-		});
-		
-		$('#shotwell .sidebar .details .single').hide();
-		$('#shotwell .container .tools .jump-image').hide();
-		this.display();
-		this.sliderUpdate(currentPercent,1);
-		this.center();
-	}
-	
-	this.getSliderValueAndUpdate = function(slider) {
-		var currentPercent = slider.slider('option', 'value') / 100;
-		_this.sliderUpdate(currentPercent);
-	}
-	
-	this.checkNextPrev = function(){
-		$('#shotwell .container .tools .jump-image div').removeClass('disabled');
-		if(currentIndex <= 0){
-			$('#shotwell .container .tools .jump-image .prev').addClass('disabled');
-		}
-		if(currentIndex >= imageCount -1){
-			$('#shotwell .container .tools .jump-image .next').addClass('disabled');
-		}
-	}
-	
-	this.sliderUpdate = function($percent, $firsttime){
-		var containerWidth = $('#shotwell .container .images').width() - 15;
-		var active = $('#shotwell .container .tools .slider-container .slider .ui-slider-handle').position();
-		if($firsttime != undefined){ active = '60.45px; '}
-		$('#shotwell .container .tools .slider-container .slider-active').css('width', active.left);
-		
-		var imageWidth = Math.floor(((imageMax - imageMin) * $percent) + imageMin) - 5;
-		$('#shotwell .container .images img').css('width',imageWidth);
-		
-		columns = Math.min(imageCount, Math.floor(containerWidth/ imageWidth));
-		var imageDivsWidth = Math.floor(containerWidth / columns)
-		$('#shotwell .container .images div').css('width',imageDivsWidth+'px');
-	}
-	
-	this.display = function($imageIndex){
-		
-		var imagesHTML = '';
-		if($imageIndex == undefined){
-			for(var i = 0; i < imageCount; i++){
-				if(_parent.fileLibrary[i].type() == 'photo'){
-					imagesHTML += '<div><img src="'+_parent.fileLibrary[i].url()+'" alt="'+_parent.fileLibrary[i].name()+'" id="'+i+'"  /></div>';
-				}
-			}
-		}else{
-			imagesHTML += '<div class="large"><img src="'+_parent.fileLibrary[$imageIndex].url()+'" alt="'+_parent.fileLibrary[$imageIndex].name()+'"  id="-1"  /></div>';
-		}
-		$('#shotwell .container .images').html(imagesHTML);
-		
-		//$('#shotwell .container .images div').css('height',$('#shotwell .container .images img').height());
-		//$('#shotwell .sidebar .details .items').text(imageCount+' Photos');
-		$('#shotwell .container .images img').click(function( event ){
-			event.stopPropagation();
-			$('#shotwell .container .images img').removeClass('selected');
-			$(this).addClass('selected');
-			$('#shotwell .sidebar .details .overall').hide();
-			$('#shotwell .sidebar .details .single').show();
-			$('#shotwell .sidebar .details .title').text(_parent.fileLibrary[$(this).attr('id')].name());
-			$('#shotwell .sidebar .details .date').text(_parent.fileLibrary[$(this).attr('id')].date());
-			$('#shotwell .sidebar .details .size').text(_parent.fileLibrary[$(this).attr('id')].size());
-		});
-		$('#shotwell .container .images img').dblclick(function(){
-			$('#shotwell .container .images').addClass('singleImage');
-			$('#shotwell .container .tools .jump-image').show();
-			$('#shotwell .container .tools .slider-container').hide();
-			currentIndex = $(this).attr('id');
-			_this.display(currentIndex);
-			_this.checkNextPrev();
-		});
-		this.resize();
-	}
-	
-	this.showImageDetails = function( $index ){
-		this.updateImageDetails($index);
-		$('#shotwell .sidebar .details .overall').hide();
-		$('#shotwell .sidebar .details .single').show();
-	}
-	
-	this.updateImageDetails = function( $index ){
-		$('#shotwell .sidebar .details .title').text(_parent.fileLibrary[$index].name());
-		$('#shotwell .sidebar .details .date').text(_parent.fileLibrary[$index].date());
-		$('#shotwell .sidebar .details .size').text(_parent.fileLibrary[$index].size());
-	}
-	
-	this.selectImage = function($index){
-		$('#shotwell .container .images').addClass('singleImage');
-		$('#shotwell .container .tools .jump-image').show();
-		$('#shotwell .container .tools .slider-container').hide();
-		currentIndex = $index;
-		this.showImageDetails(currentIndex);
-		_this.display(currentIndex);
-		_this.checkNextPrev();
-		$('#shotwell').show();
-		_isOpen = true;
-		this.resize();
-		_parent.systemMenu.openWindow('shotwell');
-		$('#shotwell').trigger('mousedown');
-	}
-
-	this.open = function(){
-		this.resize();
-		this.center();
-		$('#shotwell').show();
-		_isOpen = true;
-		_parent.systemMenu.openWindow('shotwell');
-		//this.sliderUpdate(currentPercent);
-		if($('css3-container').length > 0){
-        	$('#shotwell').prev().css('top', $('#shotwell').css('top'));
-        	$('#shotwell').prev().css('left', $('#shotwell').css('left'));
-        }
-	}
-	
-	this.close = function(){
-		if(_isOpen){
-			_parent.openWindows['shotwell'] = false;
-			$('#shotwell .container .images').removeClass('singleImage');
-			$('#shotwell .container .tools .jump-image').hide();
-			$('#shotwell .container .tools .slider-container').show();
-			$('#shotwell .sidebar .details .overall').show();
-			$('#shotwell .sidebar .details .single').hide();
-			_this.display();
-			_this.sliderUpdate(currentPercent);
-			
-			if(maximised){ _parent.systemSettings.decreaseFullscreen(); }
-			$('#shotwell ').hide();
-			_parent.systemMenu.closeWindow('shotwell');
-			$('#shotwell ').removeClass('fullsize');
-			_this.resize();
-			minified = _isOpen = false;
-			_this.center();
-		}
-	}
-	
-	this.min = function(){
-		if(maximised){ _parent.systemSettings.decreaseFullscreen(); }
-		$('#shotwell ').hide();
-		_parent.systemMenu.wiggle('shotwell');
-		minified = true;
-	}
-	
-	this.isMaximised = function(){
-		return maximised;
-	}
-	
-	/* this.open = function(){
-	    	this.center();
-	    	$('.shotwell').show();
-	  }*/
-	
-	this.resize = function(){
-		/*var topPadding = ($('#shotwell .container .images').height() - $('#shotwell .container .images .large img').height()) /2;
-		 $('#shotwell .container .images .large img').css('margin-top',topPadding+'px');*/
-		 var imageContainerWIdth = $('#shotwell').width() - 228;
-		 $('#shotwell .container').css('width',imageContainerWIdth);
-		 var imageContainerHeight = $('#shotwell').height() - 33;
-		 $('#shotwell .container').css('height',imageContainerHeight);
-		 $('#shotwell .sidebar .nav').css('height',imageContainerHeight - 138);
-		 $('#shotwell .container .images').css('height',imageContainerHeight-40);
-	}
-	
-	this.center = function(){
-    	var left = ($(document).width() / 2) - ($('#shotwell').width() / 2);
-		var top = Math.max(24,($(document).height() / 2) - ($('#shotwell').height() / 2));
-		$('#shotwell').css('left',left);
-		$('#shotwell').css('top',top);
-    }
-}
\ No newline at end of file
diff --git a/templates/tour/js/shutdownSystem.js b/templates/tour/js/shutdownSystem.js
deleted file mode 100644
index f3fab89a3b3..00000000000
--- a/templates/tour/js/shutdownSystem.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- *  Shut Down System
- *  author: Anthony Dillon
- */
-
-function ShutdownSystem(){
-	var _this = this;
-	
-	this.init = function(){
-		$('#shutdown-window  .control .close').bind('click', function(){
-			_this.close();
-		});
-		$('#shutdown-window .content .shutdown-buttons div').bind('click', function(){
-			var clickedClass = $(this).attr('class').replace(' highlight', '');
-			switch(clickedClass){
-				case 'shutdown':
-					_this.shutdownClicked();
-				break;
-				case 'cancel':
-					_this.cancelClicked();
-				break;
-			}
-		});
-		this.center();
-	}
-	
-	this.cancelClicked = function(){
-		this.close();
-	}
-	
-	this.shutdownClicked = function(){
-		window.location.href = 'http://www.ubuntu.com/ubuntu/take-the-tour';
-	}
-	
-	this.open = function(){
-		this.resize();
-		$('#shutdown-window').show();
-		$('#shutdown-window ').trigger('mousedown');
-	}
-	
-	this.close = function(){
-		$('#shutdown-window').hide();
-		this.center();
-	}
-	
-	this.resize = function(){
-		var left = ($(document).width() / 2) - ($('#shutdown-window').width() / 2);
-		var top = ($(document).height() / 2) - ($('#shutdown-window').height() / 2);
-		$('#shutdown-window').css('left',left);
-		$('#shutdown-window').css('top',top-100);
-	}
-	
-	this.center = function(){
-	    	var left = ($(document).width() / 2) - ($('#shutdown-window').width() / 2);
-			var top = ($(document).height() / 2) - ($('#shutdown-window').height() / 2);
-			$('#shutdown-window').css('left',left);
-			$('#shutdown-window').css('top',top-100);
-	    }
-}
diff --git a/templates/tour/js/softwaresystem.js b/templates/tour/js/softwaresystem.js
deleted file mode 100644
index 5388fb61041..00000000000
--- a/templates/tour/js/softwaresystem.js
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
-* Software Centre System
-*  author: Anthony Dillon
-*/
-
-function SoftwareSystem($parent){
-	var _this = this;
-	var _parent = $parent;
-	var minified = false;
-	var maximised = false;
-	var _isOpen = false;
-	var currentApp = null;
-	var installedApps = new Array();
-	var thePrice = '';
-	var theName = '';
-	var theSub = '';
-	var theImage = '';
-	var theDescription = '';
-	var theDesctiptionImage = '';
-	
-	this.init = function(){
-		
-		$('#software-centre .loading-bar').hide();
-		$('#software-centre .detailed .price .progress').css('width','0');
-		
-		$('#software-centre .control .close').click(function(){
-			_this.close();
-		});
-		$('#software-centre  .control .min').click(function(){
-			_this.min();
-		});
-		
-		$('#software-centre  .control .max').click(function(){
-			if(maximised){
-				maximised = false;
-				$('#software-centre').css('width','800px');
-				$('#software-centre').css('height','550px');
-				$('#software-centre').removeClass('fullsize');
-				_parent.systemSettings.decreaseFullscreen();
-			}else{
-				maximised = true;
-				$('#software-centre').css('width',$(document).width() - 70 + 'px');
-				$('#software-centre').css('height',$(document).height() - 50 + 'px');
-				$('#software-centre').addClass('fullsize');
-				_parent.systemSettings.increaseFullscreen();
-			}
-			_this.resize();
-		});
-		
-		$('#software-centre .top-panel .back').bind('click',function(){
-			if(!$(this).hasClass('disabled')){
-				$('#software-centre .home').show();
-				$('#software-centre .detailed').hide();
-				$(this).addClass('disabled');
-				$('#software-centre .top-panel .forward').removeClass('disabled');
-			}
-		});
-		$('#software-centre .top-panel .forward').bind('click',function(){
-			if(!$(this).hasClass('disabled')){
-				_this.loadApp();
-				$(this).addClass('disabled');
-			}
-		});
-		
-		$('#software-centre .whats-new .app-container div').click(function(){
-			currentApp = $(this).attr('class');
-			$('#software-centre .top-panel .forward').addClass('disabled');
-			_this.loadApp();
-		});
-		this.setupInstall();
-		this.setupTopButtons();
-		this.center();
-	}
-	
-	this.loadApp = function(){
-		var error = false;
-		$('#software-centre .top-panel .back').removeClass('disabled');
-		$('#software-centre .detailed .price .theprice').removeClass('installed');
-		$('#software-centre .detailed .price .button').text(_install_);
-		if(installedApps[currentApp] == true){  _this.installedApp(); }
-		switch(currentApp){
-				case 'chromium':
-					thePrice = _price_free_;
-					theName = _chromium_app_;
-					theSub = _chromium_sub_;
-					theImage = '../img/software-centre/logo-chromium.png';
-					theDescription = _chromium_desc_;
-					theDesctiptionImage = '../img/software-centre/screenshot-chromium.jpg';
-				break;
-				case 'beep':
-					thePrice = '$9.99';
-					theName = _beep_app_;
-					theSub = _beep_sub_;
-					theImage = '../img/software-centre/logo-beep.png';
-					theDescription = _beep_desc_;
-					theDesctiptionImage = '../img/software-centre/screenshot-beep.jpg';
-				break;
-				case 'inkscape':
-					thePrice = _price_free_;
-					theName = _inkscape_app_;
-					theSub = _inkscape_sub_;
-					theImage = '../img/software-centre/logo-inkscape.png';
-					theDescription = _inkscape_desc_;
-					theDesctiptionImage = '../img/software-centre/screenshot-inkscape.jpg';
-				break;
-				case 'worldofgoo':
-					thePrice = '$19.95';
-					theName = _world_of_goo_app_;
-					theSub = _world_of_goo_sub_;
-					theImage = '../img/software-centre/logo-world-of-goo.png';
-					theDescription = _world_of_goo_desc_;
-					theDesctiptionImage = '../img/software-centre/screenshot-worldofgoo.jpg';
-				break;
-				case 'blender':
-					thePrice = _price_free_;
-					theName = _blender_app_;
-					theSub = _blender_sub_;
-					theImage = '../img/software-centre/logo-blender.png';
-					theDescription = _blender_desc_;
-					theDesctiptionImage = '../img/software-centre/screenshot-blender.jpg';
-				break;
-				case 'braid':
-					thePrice = '$9.99';
-					theName = _braid_app_;
-					theSub = _braid_sub_;
-					theImage = '../img/software-centre/logo-braid.png';
-					theDescription = _braid_desc_;
-					theDesctiptionImage = '../img/software-centre/screenshot-braid.jpg';
-				break;
-				default:
-					_parent.errorMessage.open();
-					error = true;
-					break;	
-				}
-			
-			$('#software-centre .detailed .title h1').text(theName);
-			$('#software-centre .detailed .title p.subheading').text(theSub);
-			$('#software-centre .detailed .title img.app-image').attr('src', theImage);
-			$('#software-centre .detailed .description').html(theDescription);
-			$('#software-centre .detailed .description-image img').attr('src',theDesctiptionImage);
-			if($('#software-centre .detailed .price .theprice').hasClass(_installed_)){
-				$('#software-centre .detailed .price .theprice').text(_installed_);
-			}else{
-				$('#software-centre .detailed .price .theprice').text(thePrice);
-			}
-			if(!error){
-				$('#software-centre .home').hide();
-				$('#software-centre .detailed').show();
-			}
-	}
-	
-	this.setupInstall = function(){
-		$('#software-centre .detailed .price .button').bind('click',function(){
-			if(installedApps[currentApp] == true){
-				_this.removeApp();
-			}else{
-				$(this).hide();
-				$('#software-centre .loading-bar').show();
-				$('#software-centre .detailed .price .theprice').text(_installing_+'…');
-				$('#software-centre .loading-bar .progress').animate({
-				    	width: 150
-				  }, 1500, function() {
-				    	_this.installedApp();
-						$('#software-centre .loading-bar').hide();
-						$('#software-centre .detailed .price .button').show();
-				  });
-				 }
-		});
-	}
-	
-	this.removeApp = function(){
-		$('#software-centre .detailed .price .theprice').text(thePrice);
-		$('#software-centre .detailed .price .theprice').removeClass('installed');
-		$('#software-centre .detailed .price .theprice').css('background-image','none');
-		$('#software-centre .detailed .price .button').text(_install_);
-		_parent.systemOverlay.removeApps(theName);
-		installedApps[currentApp] = false;
-	}
-	
-	this.installedApp = function(){
-		$('#software-centre .detailed .price .theprice').text(_installed_);
-		$('#software-centre .detailed .price .theprice').addClass('installed');
-		$('#software-centre .detailed .price .button').text(_remove_);
-		$('#software-centre .detailed .price .progress').css('width','0');
-		_parent.systemOverlay.totalApps.push({name:theName,image:theImage});
-		installedApps[currentApp] = true;
-	}
-	
-	this.setupTopButtons = function(){
-		$('#software-centre .all-software').bind('click', function(){
-			$('#software-centre .home').show();
-			$('#software-centre .detailed').hide();
-			$('#software-centre .top-panel .back').addClass('disabled');
-		});
-	}
-	
-	this.close = function(){
-		if(_isOpen){
-			$('#software-centre .home').show();
-			$('#software-centre .detailed').hide();
-			if(maximised){ _parent.systemSettings.decreaseFullscreen(); }
-			$('#software-centre ').hide();
-			_parent.systemMenu.closeWindow('software');
-			$('#software-centre ').removeClass('fullsize');
-			_this.resize();
-			minified = _isOpen = false;
-			_this.center();
-			if($('css3-container').length > 0){
-	        	$('#software-centre').prev().css('top', $('#software-centre').css('top'));
-	        	$('#software-centre').prev().css('left', $('#software-centre').css('left'));
-	        }
-       }
-	}
-	
-	this.min = function(){
-		if(maximised){ _parent.systemSettings.decreaseFullscreen(); }
-		$('#software-centre ').hide();
-		_parent.systemMenu.wiggle('software');
-		minified = true;
-	}
-	
-	this.resize = function(){
-		var containerHeight = $('#software-centre').height() - ($('#software-centre .top-panel').height() + $('#software-centre .control').height() + 6);
-		var appBoxWidth = $('#software-centre').width() - ($('#software-centre .navigation').width() + 50);
-    	if(maximised){ containerHeight -= 27; }
-		$('#software-centre .container').css('height',containerHeight);
-		$('#software-centre .container .whats-new').css('width',appBoxWidth);
-	}
-	
-	this.center = function(){
-    	var left = ($(document).width() / 2) - ($('#software-centre ').width() / 2);
-		var top = Math.max(24,($(document).height() / 2) - ($('#software-centre ').height() / 2));
-		$('#software-centre ').css('left',left);
-		$('#software-centre ').css('top',top);
-    }
-    
-    this.isMaximised = function(){
-		return maximised;
-	}
-	
-	this.open = function($app){
-		if($app != undefined){ currentApp = $app; this.loadApp(); }
-		this.resize();
-		this.center();
-		$('#software-centre').show();
-		_isOpen = true;
-		_parent.systemMenu.openWindow('software');
-		if($('css3-container').length > 0){
-        	$('#software-centre').prev().css('top', $('#software-centre').css('top'));
-        	$('#software-centre').prev().css('left', $('#software-centre').css('left'));
-        }
-	}
-}
\ No newline at end of file
diff --git a/templates/tour/js/systemmenu.js b/templates/tour/js/systemmenu.js
deleted file mode 100644
index 6c064267e39..00000000000
--- a/templates/tour/js/systemmenu.js
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
-* System Menu
-*  author: Anthony Dillon
-*/
-var scrollingTimer = null;
-function SystemMenu($parent){
-	var _parent = $parent;
-	var _this = this;
-	var menuOut = false;
-	var menuTimeout = null;
-	var goingIn = false;
-	var locked = false;
-	var menuScrollAmount = 0;
-	var scrolling = false;
-	var selectedMenu;
-	
-	this.init = function(){
-	     
-	     $('#menu ul li').mouseover(function() {
-				$('#tooltip-text').text($(this).text());
-				$('#tooltip').css("top",$(this).position().top + $('#menu ul').position().top + 45);
-				$('#tooltip').show();
-	     });
-	     
-	     $('#menu ul li').click(function() {
-	     	var theClass = $(this).attr("class").replace(' bottom','');
-	     	theClass = theClass.replace(' temp', '').replace(' glow', '');
-	     	_this.handleMenuClick(theClass);
-	     });
-	     
-	     $('#menu ul li').mouseout(function() {
-				$('#tooltip').hide();
-	     });
-	     this.resize();
-	}
-	
-	this.resize = function(){
-		var menuHeight = $(window).height() - 74;
-		$("#menu").css('height',menuHeight);
-		this.scrollCheck();		
-	}
-	
-	this.scrollCheck = function(){
-		var iconMaxHeight = 0;
-		$.each($('#menu ul li'), function(){
-			if ( $(this).is(':visible')){
-				iconMaxHeight += $(this).height() + 8;
-			}
-		});
-		if($('#menu ul').height() < iconMaxHeight){
-			if(!scrolling){
-				this.addScrolling();
-				$('#menu .rubbish').removeClass('bottom');
-			}
-		}else{
-			if(scrolling){
-				this.removeScrolling();
-				$('#menu .rubbish').addClass('bottom');
-			}
-		}
-	}
-	
-	this.addScrolling = function(){
-		scrolling = true;
-		$('#menu').append('<div class="scroll-up"></div><div class="scroll-down"></div>');
-		$('#menu .scroll-up').bind('mouseover', function(){ scrollingUp = true; scrollUp(); });
-		$('#menu .scroll-down').bind('mouseover', function(){ scrollingDown = true; scrollDown(); });
-		$('#menu .scroll-up').bind('mouseout', function(){  _this.stopScrolling() });
-		$('#menu .scroll-down').bind('mouseout', function(){ _this.stopScrolling() });
-		$('#menu').bind('mouseleave', function(){ _this.resetScroll(); });
-	}
-	
-	this.stopScrolling = function(){
-		 clearTimeout(scrollingTimer); 
-		 scrollingTimer = null;
-	}
-	
-	this.removeScrolling = function(){
-		scrolling = false;
-		$('#menu').unbind('mousemove');
-		$('#menu').unbind('mouseout');
-		$('#menu .scroll-up').remove();
-		$('#menu .scroll-down').remove();
-		$('#menu .scroll-up').unbind('mouseover');
-		$('#menu .scroll-down').unbind('mouseover');
-		$('#menu .scroll-up').unbind('mouseoout');
-		$('#menu .scroll-down').unbind('mouseoout');
-	}
-	
-	this.resetScroll = function(){
-		$('#menu ul').css('top','0px');
-	}
-	
-	this.handleMenuClick = function($menu){
-		if($menu != 'dash'){
-			selectedMenu = $menu;
-		}
-		switch($menu){
-			case 'dash':
-				$('#menu .selected-window-arrow').hide();
-				$('#menu .dash .selected-window-arrow').show();
-				_parent.systemOverlay.open();
-			break;
-			case 'home':
-				var div = $('.folder');
-				 if(!div.is(':visible')){
-					if(fileSystem.isMinified()){
-						if(fileSystem.isMaximised()){ systemSettings.increaseFullscreen();}
-						fileSystem.reset(false);
-					}else{
-						fileSystem.reset(true);
-					}
-				}
-				fileSystem.open();
-				$('.folder ').trigger('mousedown');
-			break;
-			case 'firefox':
-				var div = $('.firefox-window');
-				 if(!div.is(':visible')){
-				 	_parent.firefoxSystem.open();
-					if(_parent.firefoxSystem.isMaximised()){ _parent.systemSettings.increaseFullscreen();}
-				 }
-				 $('.firefox-window ').trigger('mousedown');
-			break;
-			case 'shotwell':
-				var div = $('#shotwell');
-				 if(!div.is(':visible')){
-					_parent.shotwellSystem.open();
-					if(_parent.shotwellSystem.isMaximised()){ _parent.systemSettings.increaseFullscreen();}
-				 }
-				 div.trigger('mousedown');
-			break;
-			case 'writer':
-				var div = $('#libreoffice-writer-window');
-				 if(!div.is(':visible')){
-					_parent.libreSystem.open('writer');
-				 }
-				 div.trigger('mousedown');
-			break;
-			case 'impress':
-				var div = $('#libreoffice-impress-window');
-				 if(!div.is(':visible')){
-					_parent.libreSystem.open('impress');
-				 }
-				 div.trigger('mousedown');
-			break;
-			case 'calc':
-				var div = $('#libreoffice-calc-window');
-				 if(!div.is(':visible')){
-					_parent.libreSystem.open('calc');
-				 }
-				 div.trigger('mousedown');
-			break;
-			case 'uone':
-				var div = $('#ubuntuone-window');
-				 if(!div.is(':visible')){
-				 	_parent.ubuntuOneSystem.open();
-				 }
-				 $('#ubuntuone-window ').trigger('mousedown');
-			break;
-			case 'software':
-				var div = $('#software-centre');
-				 if(!div.is(':visible')){
-					_parent.softwareSystem.open();
-				 }
-				 div.trigger('mousedown');
-			break;
-			case 'email':
-				var div = $('.email-window ');
-				 if(!div.is(':visible')){
-				 	emailSystem.open();
-					if(_parent.emailSystem.isMaximised()){ _parent.systemSettings.increaseFullscreen();}
-				 }
-				 if(_parent.emailSystem.isWriteMinified()){ 
-				 	$('#email-write').show(); 
-				 	 $('#email-write ').trigger('mousedown');
-				 }else{
-				 	 $('.email-window ').trigger('mousedown');
-				 }
-			break;
-			case 'movieplayer':
-				var div = $('#movieplayer');
-				 if(!div.is(':visible')){
-				 	moviePlayerSystem.center();
-					div.show();
-					if(_parent.moviePlayerSystem.isMaximised()){ _parent.systemSettings.increaseFullscreen();}
-				 }
-				 $('#movieplayer ').trigger('mousedown');
-			break;
-			case 'rubbish':
-				var div = $('.folder');
-				 if(!div.is(':visible')){
-					if(_parent.fileSystem == null){
-						_parent.fileSystem = new FileSystem(this,'/'+_rubbish_bin_folder_);
-						_parent.fileSystem.init();
-					}else{
-						//_parent.fileSystem.reset(!_parent.fileSystem.isMinified());
-						_parent.fileSystem.updateDir('/'+_rubbish_bin_folder_);
-					}
-					$('.folder').show();
-					$("#menu ul li.home img").show();
-				}else{
-					_parent.fileSystem.updateDir('/'+_rubbish_bin_folder_);
-				}
-				_parent.fileSystem.open();
-				$('.folder ').trigger('mousedown');
-				
-			break;
-			case 'workspace':
-			if(_parent.workspaces.isOpen()){
-				_parent.workspaces.close();
-			}else{
-				_parent.workspaces.open();
-			}
-			break;
-			default:
-				_parent.errorMessage.open();
-			break;
-		}
-		$("#menu ul li."+$menu+" img.open-arrow").show();
-		var $currentBackground = $("#menu ul li."+$menu).css('background-image');
-		if($menu != 'dash' && $menu != 'rubbish' && $currentBackground.indexOf('-active') == -1){
-			$indexLastSlash = $currentBackground.lastIndexOf('.');
-			$newBackgroundLink = $currentBackground.substr(0,$indexLastSlash) + '-active.png';
-			$("#menu ul li."+$menu).css('background-image',$newBackgroundLink);
-		}
-	}
-	
-	this.getSelectedMenu = function() {
-		return selectedMenu;
-	}
-	
-	this.increaseFullscreen = function(){
-		//_parent.systemSettings.increaseFullscreen();
-	}
-	
-	this.decreaseFullscreen = function(){
-		//_parent.systemSettings.decreaseFullscreen();
-	}
-	
-	this.wiggle = function($icon){
-		$('#menu').css('overflow','visible');
-		_parent.noWIndowSelected();
-		//$("#menu ul li."+$icon).stop(true,false).animate({"marginLeft": "30px"}, "1000") .animate({"marginLeft": "0px"}, "1000", function(){ $('#menu').css('overflow','hidden'); });
-		$("#menu ul li."+$icon).addClass('glow').delay(600).queue(function(next){
-		    $(this).removeClass("glow");
-		    next();
-		});
-
-	}
-	
-	this.closeWindow = function($icon){
-		$("#menu ul li."+$icon+" img").hide();
-		var $currentBackground = $("#menu ul li."+$icon).css('background-image');
-		$("#menu ul li."+$icon).css('background-image',$currentBackground.replace('-active',''));
-		if($("#menu ul li."+$icon).hasClass('temp')){
-			$("#menu ul li."+$icon).hide();
-		}
-		$('#top #top-left #title').text('');
-		
-		_parent.guidedTourSystem.setCurrentIndex(-1);
-		this.scrollCheck();
-	}
-	
-	this.openWindow = function($icon){
-		if($("#menu ul li."+$icon).hasClass('temp')){
-			$("#menu ul li."+$icon).show();
-		}
-		$("#menu ul li."+$icon+" img").show();
-		this.scrollCheck();
-	}
-	
-}
-
-function scrollUp(){
-		var pos = Math.min(0,$('#menu ul').position().top +5);
-		$('#menu ul').css('top',pos+'px');
-		scrollingTimer = setTimeout("scrollUp()",50);
-}
-	
-function scrollDown(){
-	var maxscroll =  ($(window).height() - 74) - ($('#menu ul .rubbish').position().top + $('#menu ul .rubbish').height() + 30);
-	var pos = Math.max(maxscroll ,Math.min(0,$('#menu ul').position().top - 5));
-	$('#menu ul').css('top',pos+'px');
-	scrollingTimer = setTimeout("scrollDown()",50);
-}
\ No newline at end of file
diff --git a/templates/tour/js/systemoverlay.js b/templates/tour/js/systemoverlay.js
deleted file mode 100644
index 2991dcb180b..00000000000
--- a/templates/tour/js/systemoverlay.js
+++ /dev/null
@@ -1,507 +0,0 @@
-/*
-* System Overlay
-*  author: Anthony Dillon
-*/
-
-function SystemOverlay($parent){
-	 
-	var _parent = $parent;
-	var _this = this;
-	var menu_open = false;
-	var contentsWidth = 0;
-	var mediaApps;
-	var internetApps;
-	var moreApps;
-	var downloadApps;
-	this.totalApps;
-	var fileList, lastOpenWindow;
-	var searching = false;
-	
-	this.init = function(){
-		downloadApps = new Array({name:_chromium_app_,image:'img/software-centre/logo-chromium.png'},
-															  {name:_beep_app_,image:'img/software-centre/logo-beep.png' },
-															  {name:_inkscape_app_,image:'img/software-centre/logo-inkscape.png'},
-															  {name:_world_of_goo_app_,image:'img/software-centre/logo-world-of-goo.png'},
-															  {name:_blender_app_, image:'img/software-centre/logo-blender.png'},
-															  {name:_braid_app_,image:'img/software-centre/logo-braid.png'});
-															  
-		mediaApps = new Array({name:_banshee_app_,image:'banshee.png'},
-															  {name:_brasero_app_,image:'brasero.png' },
-															  {name:_movie_player_app_,image:'movieplayer.png'},
-															  {name:_shotwell_app_,image:'shotwell.png'},
-															  {name:_pitivi_app_, image:'pitivi.png'},
-															  {name:_sound_recorder_app_,image:'soundrecorder.png'});
-															  
-		internetApps = new Array({name:_empathy_app_,image:'empathy.png'},
-																  {name:_thunderbird_app_,image:'thunderbird.png' },
-																  {name:_firefox_app_,image:'firefox.png'},
-																  {name:_gwibber_app_, image:'gwibber.png'},
-																  {name:_remote_desktop_app_,image:'remotedesktop.png'},
-																  {name:_terminal_app_, image:'terminalserver.png'});
-
-		moreApps = new Array({name:_about_me_app_,image:'aboutme.png'},
-														    {name:_additional_drivers_app_,image:'additionaldrivers.png' },
-														    {name:_aisleroit_app_,image:'solitaire.png'},
-														    {name:_appearance_app_, image:'appearance.png'},
-														    {name:_bluetooth_app_,image:'bluetooth.png'});	
-														    
-		this.totalApps = mediaApps.concat(internetApps, moreApps);
-		$('#systemOverlay input').val(_search_);
-		this.setupTopControl();
-	}
-	
-	this.open = function(){
-		_parent.closeTopRightDropDowns();
-		if(menu_open){
-			_this.closeOverlay();
-		}else{
-			_this.openOverlay();
-		}
-		this.resize();
-	}
-	
-	this.setupTopControl = function(){
-		$('#systemOverlay .copyDash').bind('click',function(event){
-				_this.closeOverlay();
-		});
-		
-		$('#top #top-left #dash-control-buttons .close').bind('click',function(event){
-				_this.closeOverlay();
-		});
-		
-		$('#systemOverlay input').keyup(function(){
-			_this.appSearch($(this).val());
-		});
-		
-		this.resize();
-		
-		
-		$('#systemOverlay #dash-bottom-bar .bottom-wrapper div').click(function(){
-			$('#systemOverlay #dash-bottom-bar .bottom-wrapper div').removeClass('active');
-			switch($(this).attr('class').replace(' last','')){
-				case 'home-icon':
-					_this.showHome();
-				break;
-				case 'applications-icon':
-					_this.displayApps();
-				break;
-				case 'files-icon':
-					_this.displayFindApps();
-				break;
-				case 'music-icon':
-					_this.displayMusic();
-				break;
-				case 'video-icon':
-					_this.displayVideo();
-				break;
-			}
-			$(this).addClass('active');
-			
-		});
-		
-		var search_input = $('#systemOverlay input');
-	
-		search_input.focus(function() {
-			if ($(this).val() == _search_) {
-				$(this).val('');
-				$(this).css('font-style', 'normal');
-				$(this).css('color', '#fff');
-			}
-		});
-		search_input.blur(function() {
-			if ($(this).val() == '') {
-				$(this).val(_search_);
-				$(this).css('font-style', 'italic');
-				$(this).css('color', '#aaa');
-				_this.reset();
-			}
-		});
-	}
-	
-	this.removeApps = function($name){
-		for(var i = 0; i < this.totalApps.length; i++){
-			if( this.totalApps[i].name == $name){
-				this.totalApps.splice(i,1);
-				break;
-			}
-		}
-	}
-	
-	this.appSearch = function($query){
-		if($query != ''){
-			var listFilesContents = '';
-			fileList = _parent.fileSystem.getFiles();
-			var listContents = '';
-			var i = this.totalApps.length;
-			var tempArray = new Array();
-			var patt1 = new RegExp($query,"gi");
-			while(i--){
-				tempArray = this.totalApps[i].name.match(patt1);
-				if(tempArray != null){
-					if(this.totalApps[i].image.substr(0,7) == '../img/'){
-						listContents += '<div><img src="'+this.totalApps[i].image+'" /><p>'+this.totalApps[i].name+'</p></div>';
-					}else{
-						listContents += '<div><img src="../img/applications/'+this.totalApps[i].image+'" /><p>'+this.totalApps[i].name+'</p></div>';
-					}
-				}
-			}
-			for(var i = 0; i < fileList.length; i++){
-				tempArray = fileList[i].name().match(patt1);
-				if(tempArray != null){
-					listFilesContents += this.getDisplayIcon(fileList[i], i);
-				}
-			}
-			
-			this.hideAll();
-			$('#systemOverlay #display-search .files .app-list').html(listFilesContents);
-			$('#systemOverlay #display-search .applications .app-list').html(listContents);
-			
-			$('#systemOverlay #display-search').show();
-			$('#systemOverlay .app-container .app-list div').bind('mouseover', function(){
-				$('img',this).addClass('hover');
-			});
-			$('#systemOverlay .app-container .app-list div').bind('mouseout', function(){
-				$('img',this).removeClass('hover');
-			});
-			$('#systemOverlay .app-container .applications .app-list div').bind('click', function(){
-				var download = false;
-				if($(this).attr('data-type') == 'download'){ download = true; }
-				_this.appClicked($('img', this).attr('src'), download);
-			});
-			$('#systemOverlay .app-container .files .app-list div').bind('click', function(){
-				_this.fileClicked($(this).attr('data-id'));
-			});
-		}else{
-			this.showHome();
-		}
-	}
-	
-	this.getDisplayIcon = function($object, $i){
-		switch($object.type()){
-			case 'folder':
-				return  '<div data-id="'+$i+'"><img src="../img/applications/folder.png" /><p>'+$object.name()+'</p></div>';
-			break;
-			case 'audio':
-				return  '<div data-id="'+$i+'"><img src="../img/applications/audio.png" /><p>'+$object.name()+'</p></div>';
-			break;
-			case 'video':
-				return '<div data-id="'+$i+'"><img src="../img/'+$object.url().replace('flv','jpg').replace('../','')+'" /><p>'+$object.name()+'</p></div>';
-			break;
-			case 'photo':
-				return  '<div data-id="'+$i+'"><img src="'+$object.url()+'" /><p>'+$object.name()+'</p></div>';
-			break;
-			default:
-				return  '<div data-id="'+$i+'"><img src="../img/applications/unknown.png" /><p>'+$object.name()+'</p></div>'; 
-			break;
-		}
-	}
-	
-	this.hideAll = function(){
-		$('#systemOverlay #overlayContents #display-home').hide();
-		$('#systemOverlay #overlayContents #display-apps').hide();
-		$('#systemOverlay #overlayContents #display-find-files').hide();
-		$('#systemOverlay #overlayContents #display-search').hide();
-		$('#systemOverlay #overlayContents #display-find-music').hide();
-		$('#systemOverlay #overlayContents #display-find-video').hide();
-	}
-	
-	this.showHome = function(){
-		$('#systemOverlay #overlayContents #display-apps').hide();
-		$('#systemOverlay #overlayContents #display-find-files').hide();
-		$('#systemOverlay #overlayContents #display-search').hide();
-		$('#systemOverlay #overlayContents #display-find-music').hide();
-		$('#systemOverlay #overlayContents #display-find-video').hide();
-		$('#systemOverlay #overlayContents #display-home').show();
-	}
-	
-	this.displayHome = function(){
-		var mostUsedArray;
-		var listContents = '';
-		var mostUsedContents = '';
-		var downloadedContents = '';
-		var appArray = this.totalApps;
-		mostUsedArray = appArray.slice();
-		mostUsedArray.sort(this.randOrd);
-		downloadApps.sort(this.randOrd);
-		fileList = _parent.fileSystem.getFiles();
-		for(var i = 0; i < appArray.length; i++){
-			if(appArray[i].image.substr(0,7) == '../img'){
-				listContents += '<div><img src="'+appArray[i].image+'" /><p>'+appArray[i].name+'</p></div>';
-			}else{
-				listContents += '<div><img src="../img/applications/'+appArray[i].image+'" /><p>'+appArray[i].name+'</p></div>';
-			}
-		}
-		for(var i = 0; i < fileList.length; i++){
-			if(fileList[i].type() != 'folder'){
-				mostUsedContents += this.getDisplayIcon(fileList[i], i);
-			}
-		}
-		var i = fileList.length;
-		while(i--){
-			if(fileList[i].type() != 'folder'){
-				downloadedContents += this.getDisplayIcon(fileList[i], i);
-			}
-		}
-		$('#systemOverlay #display-home .recent-apps .app-list').html(listContents);
-		$('#systemOverlay #display-home .recent-files .app-list').html(mostUsedContents);
-		$('#systemOverlay #display-home .downloads .app-list').html(downloadedContents);
-		$('#systemOverlay #display-find-files .downloads .app-list').html(downloadedContents);
-		
-		$('#systemOverlay .app-container .app-list div').bind('mouseover', function(){
-			$('img',this).addClass('hover');
-		});
-		$('#systemOverlay .app-container .app-list div').bind('mouseout', function(){
-			$('img',this).removeClass('hover');
-		});
-		$('#systemOverlay #display-home .recent-apps .app-list div').bind('click', function(){
-			_this.appClicked($('img', this).attr('src'), ($(this).attr('data-type') == 'download'));
-		});
-		$('#systemOverlay #display-home .recent-files .app-list div').bind('click', function(){
-			_this.fileClicked($(this).attr('data-id'));
-		});
-		$('#systemOverlay #display-home .downloads .app-list div').bind('click', function(){
-			_this.fileClicked($(this).attr('data-id'));
-		});
-		
-	}
-	
-	this.displayApps = function($type){
-		this.hideAll();
-		var appArray;
-		var mostUsedArray;
-		var listContents = '';
-		var mostUsedContents = '';
-		var downloadableContents = '';
-		if($type == 'media'){
-			appArray = mediaApps;
-		}else if($type == 'internet'){
-			appArray = internetApps;
-		}else if($type == 'more'){
-			appArray = moreApps;
-		}else{
-			appArray = this.totalApps;
-		}
-		mostUsedArray = appArray.slice();
-		mostUsedArray.sort(this.randOrd);
-		downloadApps.sort(this.randOrd);
-		for(var i = 0; i < appArray.length; i++){
-			if(appArray[i].image.substr(0,4) == 'img/'){
-				listContents += '<div><img src="../'+appArray[i].image+'" /><p>'+appArray[i].name+'</p></div>';
-			}else{
-				listContents += '<div><img src="../img/applications/'+appArray[i].image+'" /><p>'+appArray[i].name+'</p></div>';
-			}
-		}
-		for(var i = 0; i < mostUsedArray.length; i++){
-			if(mostUsedArray[i].image.substr(0,4) == 'img/'){
-				mostUsedContents += '<div><img src="../'+mostUsedArray[i].image+'" /><p>'+mostUsedArray[i].name+'</p></div>';
-			}else{
-				mostUsedContents += '<div><img src="../img/applications/'+mostUsedArray[i].image+'" /><p>'+mostUsedArray[i].name+'</p></div>';
-			}
-		}
-		for(var i = 0; i < downloadApps.length; i++){
-			if(downloadApps[i].image.substr(0,4) == 'img/'){
-				downloadableContents += '<div data-type="download"><img src="../'+downloadApps[i].image+'" /><p>'+downloadApps[i].name+'</p></div>';
-			}else{
-				downloadableContents += '<div data-type="download"><img src="../img/applications/'+downloadApps[i].image+'" /><p>'+downloadApps[i].name+'</p></div>';
-			}
-		}
-		$('#systemOverlay #display-home').hide();
-		$('#systemOverlay #display-apps .available .app-list').html(downloadableContents);
-		$('#systemOverlay #display-apps .installed .app-list').html(listContents);
-		$('#systemOverlay #display-apps .frequently .app-list').html(mostUsedContents);
-		$('#systemOverlay #display-apps').show();
-		$('#systemOverlay .app-container .app-list div').bind('mouseover', function(){
-			$('img',this).addClass('hover');
-		});
-		$('#systemOverlay .app-container .app-list div').bind('mouseout', function(){
-			$('img',this).removeClass('hover');
-		});
-		$('#systemOverlay .app-container .app-list div').bind('click', function(){
-			_this.appClicked($('img', this).attr('src'), ($(this).attr('data-type') == 'download'));
-		});
-	}
-	
-	this.randOrd = function(){
-		return (Math.round(Math.random())-0.5); 
-	} 
-	
-	this.displayMusic = function(){
-		this.hideAll();
-		var songsContents = '';
-		var albumsContents = '';
-		fileList = _parent.fileSystem.getFiles();
-		for(var i = 0; i < fileList.length; i++){
-			if(fileList[i].type() == 'audio'){
-				songsContents += this.getDisplayIcon(fileList[i], i);
-			}
-		}
-		$('#systemOverlay #display-find-music .songs .app-list').html(songsContents);
-		$('#systemOverlay #display-find-music .albums  .app-list').html(albumsContents);
-		$('#systemOverlay #display-home').hide();
-		$('#systemOverlay #display-find-music').show();
-		$('#systemOverlay .app-container .app-list div').bind('mouseover', function(){
-			$('img',this).addClass('hover');
-		});
-		$('#systemOverlay .app-container .app-list div').bind('mouseout', function(){
-			$('img',this).removeClass('hover');
-		});
-		$('#systemOverlay .app-container .app-list div').bind('click', function(){
-			_this.appClicked($('img', this).attr('src'), ($(this).attr('data-type') == 'download'));
-		});
-	}
-	
-	this.displayVideo = function(){
-		this.hideAll();
-		var videosContents = '';
-		fileList = _parent.fileSystem.getFiles();
-		for(var i = 0; i < fileList.length; i++){
-			if(fileList[i].type() == 'video'){
-				videosContents += this.getDisplayIcon(fileList[i], i);
-			}
-		}
-		$('#systemOverlay #display-find-video .videos .app-list').html(videosContents);
-		$('#systemOverlay #display-home').hide();
-		$('#systemOverlay #display-find-video').show();
-		$('#systemOverlay .app-container .app-list div').bind('mouseover', function(){
-			$('img',this).addClass('hover');
-		});
-		$('#systemOverlay .app-container .app-list div').bind('mouseout', function(){
-			$('img',this).removeClass('hover');
-		});
-		$('#systemOverlay .app-container .app-list div').bind('click', function(){
-			_this.fileClicked($(this).attr('data-id'));
-		});
-	}
-	
-	this.displayFindApps = function(){
-		this.hideAll();
-		var listFilesContents = '';
-		var listFolderContents = '';
-		fileList = _parent.fileSystem.getFiles();
-		for(var i = 0; i < fileList.length; i++){
-			if(fileList[i].type() == 'folder'){
-				listFolderContents += this.getDisplayIcon(fileList[i], i);
-			}else{
-				listFilesContents += this.getDisplayIcon(fileList[i], i);
-			}
-		}
-		$('#systemOverlay #display-find-files .folders .app-list').html(listFolderContents);
-		$('#systemOverlay #display-find-files .files .app-list').html(listFilesContents);
-		$('#systemOverlay #display-home').hide();
-		$('#systemOverlay #display-find-files').show();
-		$('#systemOverlay .app-container .app-list div').bind('mouseover', function(){
-			$('img',this).addClass('hover');
-		});
-		$('#systemOverlay .app-container .app-list div').bind('mouseout', function(){
-			$('img',this).removeClass('hover');
-		});
-		$('#systemOverlay .app-container .app-list div').bind('click', function(){
-			_this.fileClicked($(this).attr('data-id'));
-		});
-	}
-	
-	this.fileClicked = function($fileID){
-		var fileObject = fileList[$fileID];
-		switch(fileObject.type()){
-			case 'folder':
-				_this.closeOverlay();
-				_parent.fileSystem.reset(!_parent.fileSystem.isMinified());
-				_parent.fileSystem.updateDir(fileObject.location()+'/'+fileObject.name());
-				_parent.fileSystem.open();
-			break;
-			case 'photo':
-				_this.closeOverlay();
-				_parent.shotwellSystem.selectImage(fileObject.id());
-			  	_parent.shotwellSystem.open();
-			break;
-			case 'video':
-				_this.closeOverlay();
-			  	_parent.moviePlayerSystem.open();
-			  	_parent.moviePlayerSystem.addVideo();
-			break;
-			default:
-				_this.closeOverlay();
-				_parent.errorMessage.open();
-			break;
-		}
-	}
-	
-	this.appClicked = function($appName, $download){
-		_this.closeOverlay();
-		var appName = $appName.substring($appName.lastIndexOf('/')+1, $appName.length - 4);
-		if($download){
-			appName = appName.replace('logo-','');
-			if(appName == 'world-of-goo'){ appName = 'worldofgoo'; }
-			_parent.softwareSystem.open(appName);
-		}else{
-			switch(appName){
-				case 'shotwell':
-					_parent.systemMenu.handleMenuClick('shotwell');
-				break;
-				case 'thunderbird':
-					_parent.systemMenu.handleMenuClick('email');
-				break;
-				case 'firefox':
-					_parent.systemMenu.handleMenuClick('firefox');
-				break;
-				case 'movieplayer':
-					_parent.moviePlayerSystem.open();
-				break;
-				default:
-					_parent.errorMessage.open();
-				break;
-			}
-		}
-		
-	}
-	
-	this.reset = function(){
-		$('#systemOverlay input').val(_search_);
-		$('#systemOverlay input').css('font-style', 'italic');
-		$('#systemOverlay input').css('color', '#aaa');
-		this.hideAll();
-		$('#systemOverlay #display-home').show();
-		$('#systemOverlay #dash-bottom-bar .bottom-wrapper div').removeClass('active');
-		$('#systemOverlay #dash-bottom-bar .bottom-wrapper .home-icon').addClass('active');
-	}
-	
-	this.hide = function(){
-		_parent.unblurWindows();
-		$('#systemOverlay').hide();
-		_this.reset();
-	}
-	
-	this.openOverlay = function(){
-		$('#top').addClass('dashOpen');
-		$('#menu').addClass('dashOpen');
-		$('#top').removeClass('dropShadow');
-		menu_open = true;
-		this.reset();
-		this.displayHome();
-		$('#top #top-button-bg').addClass('open');
-		$('#systemOverlay').fadeTo(300, 1, _parent.blurWindows);
-		$('#systemOverlay input').focus();
-	}
-	
-	this.closeOverlay = function(){
-		$('#top').removeClass('dashOpen');
-		$('#menu').removeClass('dashOpen');
-		$('#top').addClass('dropShadow');
-		menu_open = false;
-		$('#top #top-button-bg').removeClass('open');
-		$('#systemOverlay').fadeTo(300, 0, function(){
-			_this.hide();
-		});
-		 $('#systemOverlay .app-container .app-list div').unbind('mouseover');
-		 $('#systemOverlay .app-container .app-list div').unbind('mouseout');
-		 $('#systemOverlay .app-container .app-list div').unbind('click');
-		 $('#menu .dash .selected-window-arrow').hide();
-		 $('#menu .' + _parent.systemMenu.getSelectedMenu() + ' .selected-window-arrow').show();
-	}
-	
-	this.resize = function(){
-		$('#systemOverlay  .bottom-wrapper').css('left',($('#dash-bottom-bar').width() / 2) - ($('#dash-bottom-bar .bottom-wrapper').width() / 2));
-		$('#systemOverlay').css('height',$(document).height() - 50);
-		$('#systemOverlay input').css('width',$('#dash-bottom-bar').width() - 250);
-	}
-}
diff --git a/templates/tour/js/systemsettings.js b/templates/tour/js/systemsettings.js
deleted file mode 100644
index e66252cefe6..00000000000
--- a/templates/tour/js/systemsettings.js
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- *  System Settings
- *  author: Anthony Dillon
- */
-
-function SystemSettings($parent){
-	var _parent;
-	var _this;
-	var _date;
-	var _volume;
-	var _bluetooth;
-	var _bluetoothVisible;
-	var _fullscreenCount;
-	var _onGuidedTour;
-	var _systemName;
-	var _mute;
-	var _gotMessage;
-	var _activeIcons;
-	var _timeInterval;
-	var _firstMinute;
-	
-	this.init = function(){
-		_parent = $parent;
-		_this = this;
-		_date = new Date();
-		_volume = 30;
-		_bluetooth = true;
-		_bluetoothVisible = false;
-		_fullscreenCount = 0;
-		_onGuidedTour = false;
-		_systemName = 'Ubuntu Play';
-		_mute = false;
-		_gotMessage = false;
-		_activeIcons = 9;
-		_timeInterval = setInterval(function(){ _this.updateClock() }, 1000);
-		_firstMinute = _date.getMinutes();
-		this.setClock();
-		this.setSystem();
-		
-	}
-	
-	this.setSystem = function(){
-		//$('#welcome #welcome-screen h1').text('Welcome to '+_systemName);
-	}
-	
-	this.gotMail = function($mail){
-		_gotMessage = $mail;
-		if($mail && $('#top #top-right #message .message-logo').attr('src') == '../img/top/nomessage.png'){
-			$('#top #top-right #message .message-logo').attr('src', '../img/top/gotmessage.png');
-		}else if(!$mail && $('#top #top-right #message .message-logo').attr('src') == '../img/top/gotmessage.png'){
-			$('#top #top-right #message .message-logo').attr('src', '../img/top/nomessage.png');
-		}
-	}
-	
-	this.setGuidedTour = function($ogt){
-		_onGuidedTour = $ogt;
-	}
-	
-	this.setDate= function($time){ 
-		_date = $time;
-	}
-	
-	this.setVolume = function($volume){ 
-		_volume = $volume;
-	}
-	
-	this.setMute = function($mute){ 
-		_mute = $mute;
-	}
-	
-	this.setActiveIcons = function($iconCount){
-		_activeIcons = $iconCount;
-	}
-	
-	this.setBluetooth = function($bluetooth){ 
-		_bluetooth = $bluetooth;
-		if(_bluetooth){
-			$('#top #top-right #bluetooth ul li.bluetooth').text('Bluetooth On');
-				$('#top #top-right #bluetooth img').removeClass('disabled');
-			$('#top #top-right #bluetooth ul li.BtOn').show();
-		}else{
-			$('#top #top-right #bluetooth ul li.bluetooth').text('Bluetooth Off');
-			$('#top #top-right #bluetooth img').addClass('disabled');
-			$('#top #top-right #bluetooth ul li.BtOn').hide();
-		}
-	}
-	
-	this.increaseFullscreen = function(){
-		_fullscreenCount++;
-		_parent.topShadow(false);
-	}
-	
-	this.decreaseFullscreen = function(){
-		_fullscreenCount--;
-		if(_fullscreenCount <= 0){
-			_parent.topShadow(true);
-			_parent.noWIndowSelected();
-		}
-	}
-	
-	this.setBluetoothVisible = function($bluetoothVisible){ 
-		_bluetoothVisible = $bluetoothVisible;
-	}
-	
-	this.updateTime = function(){
-		_date.setMinutes( _date.getMinutes() + 1);
-		this.setClock();
-	}
-	
-	this.setClock = function(){
-		var hours = _date.getHours();
-		var minutes = _date.getMinutes();
-		if (minutes < 10){ minutes = "0" + minutes; }
-		if (hours < 10){ hours = "0" + hours; }
-		$('#time p').text(hours + ":" + minutes + " ");
-	}
-	
-	this.updateClock = function(){
-		if(_firstMinute != new Date().getMinutes()){
-			clearInterval(_timeInterval);
-			this.updateTime()
-			setInterval(function(){ _this.updateTime() }, 60000);
-		}
-	}
-	
-	this.onGuidedTour = function(){ return _onGuidedTour; }
-	this.date = function(){ return _date;	}
-	this.fullscreenCount = function(){ return _fullscreenCount;	}
-	this.volume = function(){ return _volume;	}
-	this.bluetooth = function(){ return _bluetooth;	}
-	this.bluetoothVisible = function(){ return _bluetoothVisible;	}
-	this.mute = function(){ return _mute;	}
-	this.mail = function(){ return _gotMessage; }
-}
diff --git a/templates/tour/js/task.js b/templates/tour/js/task.js
deleted file mode 100644
index fee3262003b..00000000000
--- a/templates/tour/js/task.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
-* Task object
-*  author: Anthony Dillon
-*/
-
-function Task(){ 
-	
-}
-
diff --git a/templates/tour/js/ubuntuonesystem.js b/templates/tour/js/ubuntuonesystem.js
deleted file mode 100644
index 0396a93ad16..00000000000
--- a/templates/tour/js/ubuntuonesystem.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-* UbuntuOne system
-*  author: Anthony Dillon
-*/
-
-function UbuntuOneSystem($parent){
-	var _isOpen = false;
-	var _parent = $parent;
-	var _this = this;
-	
-	this.init = function(){
-		$('#ubuntuone-window').hide();
-		$('#ubuntuone-window .control .close').bind('click', function(){
-			_this.close();
-		});
-		$('#ubuntuone-window .content .body .ubuntuone-buttons .join-now').bind('click', function(){
-			//_this.close();
-			//_parent.errorMessage.open();
-			_this.openUbuntu1Page();
-		});
-		
-		$('#ubuntuone-window .content .body .ubuntuone-buttons .learn-more').bind('click', function(){
-			_this.openUbuntu1Page();
-		});
-		
-		$('#ubuntuone-window .content .body .ubuntuone-buttons .have-account').bind('click', function(){
-			_this.openUbuntu1Page();
-		});
-	}
-	
-	this.open = function(){
-		
-		this.center();
-		$('#ubuntuone-window ').show();
-		_isOpen = true;
-		
-		if($('css3-container').length > 0){
-        	$('#ubuntuone-window').prev().css('top', $('#ubuntuone-window').css('top'));
-        	$('#ubuntuone-window').prev().css('left', $('#ubuntuone-window').css('left'));
-        }
-		
-	}
-	
-	this.openUbuntu1Page = function(){
-		window.open('http://one.ubuntu.com');
-	}
-		
-	this.close = function(){
-		if(_isOpen){
-			_parent.openWindows['ubuntuone-window'] = false;
-			$('#ubuntuone-window .control .close').unbind('click');
-			$('#ubuntuone-window').hide();
-			_parent.systemMenu.closeWindow('uone');
-			_isOpen = false;
-		}
-	}
-	
-	this.isOpen = function(){
-		return _isOpen;
-	}
-	
-	this.resize = function(){
-		this.center();
-	}
-	
-	this.center = function(){
-    	var left = ($(document).width() / 2) - ($('#ubuntuone-window ').width() / 2);
-		var top = Math.max(24,($(document).height() / 2) - ($('#ubuntuone-window ').height() / 2));
-		$('#ubuntuone-window ').css('left',left);
-		$('#ubuntuone-window ').css('top',top);
-    }
-}
\ No newline at end of file
diff --git a/templates/tour/js/welcomesystem.js b/templates/tour/js/welcomesystem.js
deleted file mode 100644
index 2d86acbeb3b..00000000000
--- a/templates/tour/js/welcomesystem.js
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- *  Welcome System
- *  author: Anthony DIllon
- */
-
-function WelcomeSystem($parent){
-	var _parent = $parent;
-	var _this = this;
-	var _isOpen = false;
-	
-	this.init = function(){
-		this.center();
-		this.open();
-		$('#welcome #welcome-screen ul a').bind('click',function(e){
-			_this.startTour($(this).attr('class'));
-		});
-		
-		$('#welcome #welcome-screen .explore-mode').bind('click',function(e){
-			_this.startTour('explore-mode');
-		});
-		
-		$('#welcome #welcome-screen .tour-mode').bind('click',function(e){
-			_this.startTour('tour-mode');
-		});
-		
-		$('#welcome #welcome-screen .close').bind('click',function(e){
-			_this.startTour('explore-mode');
-		});
-		$('#welcome  #welcome-screen').show();
-		var hash = window.location.hash; 
-		if (hash != undefined) {
-			_this.startTour(hash.substring(1));
-		}
-	}
-	
-	this.startTour = function(tourId) {
-		switch(tourId){
-			case 'browse-files':
-				$('#welcome').hide();
-				_isOpen = false;
-				_parent.guidedTourSystem.setCurrentIndex(0);
-				_parent.systemMenu.handleMenuClick('home');
-			break;
-			case 'surf-the-web':
-				$('#welcome').hide();
-				_isOpen = false;
-				_parent.guidedTourSystem.setCurrentIndex(1);
-			    _parent.systemMenu.handleMenuClick('firefox');
-			break;
-			case 'check-email':
-				$('#welcome').hide();
-				_isOpen = false;
-				_parent.guidedTourSystem.setCurrentIndex(2);
-				_parent.systemMenu.handleMenuClick('email');
-			break;
-			case 'view-photos':
-				$('#welcome').hide();
-				_isOpen = false;
-				_parent.guidedTourSystem.setCurrentIndex(3);
-				_parent.systemMenu.handleMenuClick('shotwell');
-			break;
-			case 'find-apps':
-				$('#welcome').hide();
-				_isOpen = false;
-				_parent.guidedTourSystem.setCurrentIndex(4);
-				_parent.systemMenu.handleMenuClick('software');
-			break;
-			case 'create-documents':
-				$('#welcome').hide();
-				_isOpen = false;
-				_parent.guidedTourSystem.setCurrentIndex(5);
-				_parent.systemMenu.handleMenuClick('writer');
-			break;
-			case 'create-presentations':
-				$('#welcome').hide();
-				_isOpen = false;
-				_parent.guidedTourSystem.setCurrentIndex(6);
-				_parent.systemMenu.handleMenuClick('impress');
-			break;
-			case 'create-spreadsheets':
-				$('#welcome').hide();
-				_isOpen = false;
-				_parent.guidedTourSystem.setCurrentIndex(7);
-			    _parent.systemMenu.handleMenuClick('calc');
-			break;
-			case 'watch-video':
-				$('#welcome').hide();
-				_isOpen = false;
-				_parent.guidedTourSystem.setCurrentIndex(8);
-				_parent.systemMenu.handleMenuClick('movieplayer');
-				_parent.moviePlayerSystem.addVideo();
-			break;
-			case 'explore-mode':
-				$('#welcome').hide();
-				_isOpen = false;
-			break;
-			case 'tour-mode':
-				$('#welcome').hide();
-				_isOpen = false;
-				_parent.guidedTourSystem.setCurrentIndex(0);
-				_parent.systemMenu.handleMenuClick('home');
-			break;
-			default:
-				return false;
-			break;
-		}
-		$('#tour-guide .explore-to-welcome').bind('click',function(){
-			_this.open();
-		});
-		$('#tour-guide .explore-to-welcome').bind('mouseover',function(){
-			$('#tour-guide .explore-tooltip-welcome').show();
-		});
-		$('#tour-guide .explore-to-welcome').bind('mouseout',function(){
-			$('#tour-guide .explore-tooltip-welcome').hide();
-		});
-		$('#tour-guide .explore-to-download').bind('mouseover',function(){
-			$('#tour-guide .explore-tooltip-download').show();
-		});
-		$('#tour-guide .explore-to-download').bind('mouseout',function(){
-			$('#tour-guide .explore-tooltip-download').hide();
-		});
-		$('#tour-guide .explore-to-download').bind('click',function(){
-			_parent.errorMessage.open();
-		});
-		/*if($('#tour-guide').is(':visible')){
-			$('.explore-to-welcome').css('bottom',210);
-			$('.explore-to-download').css('bottom',150);
-		}else{
-			$('.explore-to-welcome').css('bottom',80);
-			$('.explore-to-download').css('bottom',20);
-		}*/
-	}
-	
-	this.open = function(){
-		_isOpen = true;
-		$('#welcome').show();
-		
-	}
-	
-	this.center = function(){
-	    var windowHeight = 575;//$('#welcome #welcome-screen').outerWidth(true);
-    	var left = ($(document).width() / 2) - (windowHeight / 2);
-		var top = Math.max(24,($(document).height() / 2) - (windowHeight / 2));
-		$('#welcome #welcome-screen').css('left',left);
-		$('#welcome #welcome-screen').css('top',top); 
-	}
-	    
-	this.resize = function(){
-		this.center();
-	}
-	
-	this.isOpen = function(){
-		return _isOpen;
-	}
-	
-}
diff --git a/templates/tour/js/workspaces.js b/templates/tour/js/workspaces.js
deleted file mode 100644
index f110dda35a1..00000000000
--- a/templates/tour/js/workspaces.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  Workspaces Object
- *  author: Anthony Dillon
- */
-
-function Workspaces($parent){
-	var _parent = $parent;
-	var _this = this;
-	var _isOpen = false;
-	
-	this.init = function(){
-		$('#workspaces').hide();
-	}
-	
-	this.open = function($id){
-		_isOpen = true;
-		$('#workspaces').fadeTo(100, 1, function() { _this.resize(); });
-		//$('#workspaces').animate({ opacity: 0.25 }, 500, function() {   _this.resize();  });
-		 //$('#workspaces').show(500);
-		 $('#workspace-container .fadedOverlay').bind('click', function(){
-			$('#workspace-container .fadedOverlay').removeClass('selected');
-			$(this).addClass('selected');
-		});
-		$('#workspace-container .fadedOverlay').bind('dblclick', function(){
-			_this.close();
-		});
-		 _this.resize();
-	}
-	
-	this.close = function(){
-		_isOpen = false;
-		$('#workspaces').fadeTo(100, 0, function() { });
-		$('#workspace-container .fadedOverlay').unbind('click');
-		$('#workspace-container .fadedOverlay').unbind('dblclick');
-	}
-	
-	this.isOpen = function(){
-		return _isOpen;
-	}
-	
-	this.resize = function(){
-		var voidHeight = $('#void').height();
-		$('#workspaces').css('background-position','0px '+voidHeight+'px');
-	}
-}
diff --git a/templates/tour/pie/PIE.htc b/templates/tour/pie/PIE.htc
deleted file mode 100644
index 00b63838af0..00000000000
--- a/templates/tour/pie/PIE.htc
+++ /dev/null
@@ -1,96 +0,0 @@
-<!--
-PIE: CSS3 rendering for IE
-Version 1.0beta5
-http://css3pie.com
-Dual-licensed for use under the Apache License Version 2.0 or the General Public License (GPL) Version 2.
--->
-<PUBLIC:COMPONENT lightWeight="true">
-<!-- saved from url=(0014)about:internet -->
-<PUBLIC:ATTACH EVENT="oncontentready" FOR="element" ONEVENT="init()" />
-<PUBLIC:ATTACH EVENT="ondocumentready" FOR="element" ONEVENT="init()" />
-<PUBLIC:ATTACH EVENT="ondetach" FOR="element" ONEVENT="cleanup()" />
-
-<script type="text/javascript">
-var doc = element.document;var f=window.PIE;
-if(!f){f=window.PIE={Q:"-pie-",nb:"Pie",La:"pie_",Ac:{TD:1,TH:1},cc:{TABLE:1,THEAD:1,TBODY:1,TFOOT:1,TR:1,INPUT:1,TEXTAREA:1,SELECT:1,OPTION:1,IMG:1,HR:1},fc:{A:1,INPUT:1,TEXTAREA:1,SELECT:1,BUTTON:1},Gd:{submit:1,button:1,reset:1},aa:function(){}};try{doc.execCommand("BackgroundImageCache",false,true)}catch(aa){}for(var X=4,Y=doc.createElement("div"),ca=Y.getElementsByTagName("i"),Z;Y.innerHTML="<!--[if gt IE "+ ++X+"]><i></i><![endif]--\>",ca[0];);f.V=X;if(X===6)f.Q=f.Q.replace(/^-/,"");f.Ba=doc.documentMode||
-f.V;Y.innerHTML='<v:shape adj="1"/>';Z=Y.firstChild;Z.style.behavior="url(#default#VML)";f.zc=typeof Z.adj==="object";(function(){var a,b=0,c={};f.p={Za:function(d){if(!a){a=doc.createDocumentFragment();a.namespaces.add("css3vml","urn:schemas-microsoft-com:vml")}return a.createElement("css3vml:"+d)},Aa:function(d){return d&&d._pieId||(d._pieId="_"+ ++b)},Eb:function(d){var e,g,i,j,h=arguments;e=1;for(g=h.length;e<g;e++){j=h[e];for(i in j)if(j.hasOwnProperty(i))d[i]=j[i]}return d},Rb:function(d,e,
-g){var i=c[d],j,h;if(i)Object.prototype.toString.call(i)==="[object Array]"?i.push([e,g]):e.call(g,i);else{h=c[d]=[[e,g]];j=new Image;j.onload=function(){i=c[d]={i:j.width,f:j.height};for(var k=0,n=h.length;k<n;k++)h[k][0].call(h[k][1],i);j.onload=null};j.src=d}}}})();f.Na={gc:function(a,b,c,d){function e(){k=i>=90&&i<270?b:0;n=i<180?c:0;l=b-k;q=c-n}function g(){for(;i<0;)i+=360;i%=360}var i=d.ra;d=d.zb;var j,h,k,n,l,q,s,m;if(d){d=d.coords(a,b,c);j=d.x;h=d.y}if(i){i=i.jd();g();e();if(!d){j=k;h=n}d=
-f.Na.tc(j,h,i,l,q);a=d[0];d=d[1]}else if(d){a=b-j;d=c-h}else{j=h=a=0;d=c}s=a-j;m=d-h;if(i===void 0){i=!s?m<0?90:270:!m?s<0?180:0:-Math.atan2(m,s)/Math.PI*180;g();e()}return{ra:i,xc:j,yc:h,td:a,ud:d,Vd:k,Wd:n,rd:l,sd:q,kd:s,ld:m,rc:f.Na.dc(j,h,a,d)}},tc:function(a,b,c,d,e){if(c===0||c===180)return[d,b];else if(c===90||c===270)return[a,e];else{c=Math.tan(-c*Math.PI/180);a=c*a-b;b=-1/c;d=b*d-e;e=b-c;return[(d-a)/e,(c*d-b*a)/e]}},dc:function(a,b,c,d){a=c-a;b=d-b;return Math.abs(a===0?b:b===0?a:Math.sqrt(a*
-a+b*b))}};f.ea=function(){this.Gb=[];this.oc={}};f.ea.prototype={ba:function(a){var b=f.p.Aa(a),c=this.oc,d=this.Gb;if(!(b in c)){c[b]=d.length;d.push(a)}},Ha:function(a){a=f.p.Aa(a);var b=this.oc;if(a&&a in b){delete this.Gb[b[a]];delete b[a]}},wa:function(){for(var a=this.Gb,b=a.length;b--;)a[b]&&a[b]()}};f.Oa=new f.ea;f.Oa.Qd=function(){var a=this;if(!a.Rd){setInterval(function(){a.wa()},250);a.Rd=1}};(function(){function a(){f.K.wa();window.detachEvent("onunload",a);window.PIE=null}f.K=new f.ea;
-window.attachEvent("onunload",a);f.K.sa=function(b,c,d){b.attachEvent(c,d);this.ba(function(){b.detachEvent(c,d)})}})();f.Qa=new f.ea;f.K.sa(window,"onresize",function(){f.Qa.wa()});(function(){function a(){f.mb.wa()}f.mb=new f.ea;f.K.sa(window,"onscroll",a);f.Qa.ba(a)})();(function(){function a(){c=f.kb.md()}function b(){if(c){for(var d=0,e=c.length;d<e;d++)f.attach(c[d]);c=0}}var c;f.K.sa(window,"onbeforeprint",a);f.K.sa(window,"onafterprint",b)})();f.lb=new f.ea;f.K.sa(doc,"onmouseup",function(){f.lb.wa()});
-f.ge=function(){function a(h){this.Y=h}var b=doc.createElement("length-calc"),c=doc.documentElement,d=b.style,e={},g=["mm","cm","in","pt","pc"],i=g.length,j={};d.position="absolute";d.top=d.left="-9999px";for(c.appendChild(b);i--;){b.style.width="100"+g[i];e[g[i]]=b.offsetWidth/100}c.removeChild(b);b.style.width="1em";a.prototype={Kb:/(px|em|ex|mm|cm|in|pt|pc|%)$/,ic:function(){var h=this.Id;if(h===void 0)h=this.Id=parseFloat(this.Y);return h},yb:function(){var h=this.$d;if(!h)h=this.$d=(h=this.Y.match(this.Kb))&&
-h[0]||"px";return h},a:function(h,k){var n=this.ic(),l=this.yb();switch(l){case "px":return n;case "%":return n*(typeof k==="function"?k():k)/100;case "em":return n*this.xb(h);case "ex":return n*this.xb(h)/2;default:return n*e[l]}},xb:function(h){var k=h.currentStyle.fontSize,n,l;if(k.indexOf("px")>0)return parseFloat(k);else if(h.tagName in f.cc){l=this;n=h.parentNode;return f.n(k).a(n,function(){return l.xb(n)})}else{h.appendChild(b);k=b.offsetWidth;b.parentNode===h&&h.removeChild(b);return k}}};
-f.n=function(h){return j[h]||(j[h]=new a(h))};return a}();f.Ja=function(){function a(e){this.X=e}var b=f.n("50%"),c={top:1,center:1,bottom:1},d={left:1,center:1,right:1};a.prototype={zd:function(){if(!this.ac){var e=this.X,g=e.length,i=f.v,j=i.pa,h=f.n("0");j=j.ma;h=["left",h,"top",h];if(g===1){e.push(new i.ob(j,"center"));g++}if(g===2){j&(e[0].k|e[1].k)&&e[0].d in c&&e[1].d in d&&e.push(e.shift());if(e[0].k&j)if(e[0].d==="center")h[1]=b;else h[0]=e[0].d;else if(e[0].W())h[1]=f.n(e[0].d);if(e[1].k&
-j)if(e[1].d==="center")h[3]=b;else h[2]=e[1].d;else if(e[1].W())h[3]=f.n(e[1].d)}this.ac=h}return this.ac},coords:function(e,g,i){var j=this.zd(),h=j[1].a(e,g);e=j[3].a(e,i);return{x:j[0]==="right"?g-h:h,y:j[2]==="bottom"?i-e:e}}};return a}();f.Ka=function(){function a(b,c){this.i=b;this.f=c}a.prototype={a:function(b,c,d,e,g){var i=this.i,j=this.f,h=c/d;e=e/g;if(i==="contain"){i=e>h?c:d*e;j=e>h?c/e:d}else if(i==="cover"){i=e<h?c:d*e;j=e<h?c/e:d}else if(i==="auto"){j=j==="auto"?g:j.a(b,d);i=j*e}else{i=
-i.a(b,c);j=j==="auto"?i/e:j.a(b,d)}return{i:i,f:j}}};a.Kc=new a("auto","auto");return a}();f.Ec=function(){function a(b){this.Y=b}a.prototype={Kb:/[a-z]+$/i,yb:function(){return this.ad||(this.ad=this.Y.match(this.Kb)[0].toLowerCase())},jd:function(){var b=this.Vc,c;if(b===undefined){b=this.yb();c=parseFloat(this.Y,10);b=this.Vc=b==="deg"?c:b==="rad"?c/Math.PI*180:b==="grad"?c/400*360:b==="turn"?c*360:0}return b}};return a}();f.Jc=function(){function a(c){this.Y=c}var b={};a.Pd=/\s*rgba\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d+|\d*\.\d+)\s*\)\s*/;
-a.Fb={aliceblue:"F0F8FF",antiquewhite:"FAEBD7",aqua:"0FF",aquamarine:"7FFFD4",azure:"F0FFFF",beige:"F5F5DC",bisque:"FFE4C4",black:"000",blanchedalmond:"FFEBCD",blue:"00F",blueviolet:"8A2BE2",brown:"A52A2A",burlywood:"DEB887",cadetblue:"5F9EA0",chartreuse:"7FFF00",chocolate:"D2691E",coral:"FF7F50",cornflowerblue:"6495ED",cornsilk:"FFF8DC",crimson:"DC143C",cyan:"0FF",darkblue:"00008B",darkcyan:"008B8B",darkgoldenrod:"B8860B",darkgray:"A9A9A9",darkgreen:"006400",darkkhaki:"BDB76B",darkmagenta:"8B008B",
-darkolivegreen:"556B2F",darkorange:"FF8C00",darkorchid:"9932CC",darkred:"8B0000",darksalmon:"E9967A",darkseagreen:"8FBC8F",darkslateblue:"483D8B",darkslategray:"2F4F4F",darkturquoise:"00CED1",darkviolet:"9400D3",deeppink:"FF1493",deepskyblue:"00BFFF",dimgray:"696969",dodgerblue:"1E90FF",firebrick:"B22222",floralwhite:"FFFAF0",forestgreen:"228B22",fuchsia:"F0F",gainsboro:"DCDCDC",ghostwhite:"F8F8FF",gold:"FFD700",goldenrod:"DAA520",gray:"808080",green:"008000",greenyellow:"ADFF2F",honeydew:"F0FFF0",
-hotpink:"FF69B4",indianred:"CD5C5C",indigo:"4B0082",ivory:"FFFFF0",khaki:"F0E68C",lavender:"E6E6FA",lavenderblush:"FFF0F5",lawngreen:"7CFC00",lemonchiffon:"FFFACD",lightblue:"ADD8E6",lightcoral:"F08080",lightcyan:"E0FFFF",lightgoldenrodyellow:"FAFAD2",lightgreen:"90EE90",lightgrey:"D3D3D3",lightpink:"FFB6C1",lightsalmon:"FFA07A",lightseagreen:"20B2AA",lightskyblue:"87CEFA",lightslategray:"789",lightsteelblue:"B0C4DE",lightyellow:"FFFFE0",lime:"0F0",limegreen:"32CD32",linen:"FAF0E6",magenta:"F0F",
-maroon:"800000",mediumauqamarine:"66CDAA",mediumblue:"0000CD",mediumorchid:"BA55D3",mediumpurple:"9370D8",mediumseagreen:"3CB371",mediumslateblue:"7B68EE",mediumspringgreen:"00FA9A",mediumturquoise:"48D1CC",mediumvioletred:"C71585",midnightblue:"191970",mintcream:"F5FFFA",mistyrose:"FFE4E1",moccasin:"FFE4B5",navajowhite:"FFDEAD",navy:"000080",oldlace:"FDF5E6",olive:"808000",olivedrab:"688E23",orange:"FFA500",orangered:"FF4500",orchid:"DA70D6",palegoldenrod:"EEE8AA",palegreen:"98FB98",paleturquoise:"AFEEEE",
-palevioletred:"D87093",papayawhip:"FFEFD5",peachpuff:"FFDAB9",peru:"CD853F",pink:"FFC0CB",plum:"DDA0DD",powderblue:"B0E0E6",purple:"800080",red:"F00",rosybrown:"BC8F8F",royalblue:"4169E1",saddlebrown:"8B4513",salmon:"FA8072",sandybrown:"F4A460",seagreen:"2E8B57",seashell:"FFF5EE",sienna:"A0522D",silver:"C0C0C0",skyblue:"87CEEB",slateblue:"6A5ACD",slategray:"708090",snow:"FFFAFA",springgreen:"00FF7F",steelblue:"4682B4",tan:"D2B48C",teal:"008080",thistle:"D8BFD8",tomato:"FF6347",turquoise:"40E0D0",
-violet:"EE82EE",wheat:"F5DEB3",white:"FFF",whitesmoke:"F5F5F5",yellow:"FF0",yellowgreen:"9ACD32"};a.prototype={parse:function(){if(!this.Ua){var c=this.Y,d;if(d=c.match(a.Pd)){this.Ua="rgb("+d[1]+","+d[2]+","+d[3]+")";this.Yb=parseFloat(d[4])}else{if((d=c.toLowerCase())in a.Fb)c="#"+a.Fb[d];this.Ua=c;this.Yb=c==="transparent"?0:1}}},T:function(c){this.parse();return this.Ua==="currentColor"?c.currentStyle.color:this.Ua},fa:function(){this.parse();return this.Yb}};f.ha=function(c){return b[c]||(b[c]=
-new a(c))};return a}();f.v=function(){function a(c){this.$a=c;this.ch=0;this.X=[];this.Ga=0}var b=a.pa={Ia:1,Wb:2,B:4,Lc:8,Xb:16,ma:32,J:64,na:128,oa:256,Ra:512,Tc:1024,URL:2048};a.ob=function(c,d){this.k=c;this.d=d};a.ob.prototype={Ca:function(){return this.k&b.J||this.k&b.na&&this.d==="0"},W:function(){return this.Ca()||this.k&b.Ra}};a.prototype={ce:/\s/,Jd:/^[\+\-]?(\d*\.)?\d+/,url:/^url\(\s*("([^"]*)"|'([^']*)'|([!#$%&*-~]*))\s*\)/i,nc:/^\-?[_a-z][\w-]*/i,Xd:/^("([^"]*)"|'([^']*)')/,Bd:/^#([\da-f]{6}|[\da-f]{3})/i,
-ae:{px:b.J,em:b.J,ex:b.J,mm:b.J,cm:b.J,"in":b.J,pt:b.J,pc:b.J,deg:b.Ia,rad:b.Ia,grad:b.Ia},fd:{rgb:1,rgba:1,hsl:1,hsla:1},next:function(c){function d(q,s){q=new a.ob(q,s);if(!c){k.X.push(q);k.Ga++}return q}function e(){k.Ga++;return null}var g,i,j,h,k=this;if(this.Ga<this.X.length)return this.X[this.Ga++];for(;this.ce.test(this.$a.charAt(this.ch));)this.ch++;if(this.ch>=this.$a.length)return e();i=this.ch;g=this.$a.substring(this.ch);j=g.charAt(0);switch(j){case "#":if(h=g.match(this.Bd)){this.ch+=
-h[0].length;return d(b.B,h[0])}break;case '"':case "'":if(h=g.match(this.Xd)){this.ch+=h[0].length;return d(b.Tc,h[2]||h[3]||"")}break;case "/":case ",":this.ch++;return d(b.oa,j);case "u":if(h=g.match(this.url)){this.ch+=h[0].length;return d(b.URL,h[2]||h[3]||h[4]||"")}}if(h=g.match(this.Jd)){j=h[0];this.ch+=j.length;if(g.charAt(j.length)==="%"){this.ch++;return d(b.Ra,j+"%")}if(h=g.substring(j.length).match(this.nc)){j+=h[0];this.ch+=h[0].length;return d(this.ae[h[0].toLowerCase()]||b.Lc,j)}return d(b.na,
-j)}if(h=g.match(this.nc)){j=h[0];this.ch+=j.length;if(j.toLowerCase()in f.Jc.Fb||j==="currentColor"||j==="transparent")return d(b.B,j);if(g.charAt(j.length)==="("){this.ch++;if(j.toLowerCase()in this.fd){g=function(q){return q&&q.k&b.na};h=function(q){return q&&q.k&(b.na|b.Ra)};var n=function(q,s){return q&&q.d===s},l=function(){return k.next(1)};if((j.charAt(0)==="r"?h(l()):g(l()))&&n(l(),",")&&h(l())&&n(l(),",")&&h(l())&&(j==="rgb"||j==="hsa"||n(l(),",")&&g(l()))&&n(l(),")"))return d(b.B,this.$a.substring(i,
-this.ch));return e()}return d(b.Xb,j)}return d(b.ma,j)}this.ch++;return d(b.Wb,j)},D:function(){return this.X[this.Ga-- -2]},all:function(){for(;this.next(););return this.X},la:function(c,d){for(var e=[],g,i;g=this.next();){if(c(g)){i=true;this.D();break}e.push(g)}return d&&!i?null:e}};return a}();var da=function(a){this.e=a};da.prototype={Z:0,Nd:function(){var a=this.qb,b;return!a||(b=this.o())&&(a.x!==b.x||a.y!==b.y)},Sd:function(){var a=this.qb,b;return!a||(b=this.o())&&(a.i!==b.i||a.f!==b.f)},
-hc:function(){var a=this.e,b=a.getBoundingClientRect(),c=f.Ba===9;return{x:b.left,y:b.top,i:c?a.offsetWidth:b.right-b.left,f:c?a.offsetHeight:b.bottom-b.top}},o:function(){return this.Z?this.Va||(this.Va=this.hc()):this.hc()},Ad:function(){return!!this.qb},cb:function(){++this.Z},hb:function(){if(!--this.Z){if(this.Va)this.qb=this.Va;this.Va=null}}};(function(){function a(b){var c=f.p.Aa(b);return function(){if(this.Z){var d=this.$b||(this.$b={});return c in d?d[c]:(d[c]=b.call(this))}else return b.call(this)}}
-f.C={Z:0,ja:function(b){function c(d){this.e=d;this.Zb=this.ia()}f.p.Eb(c.prototype,f.C,b);c.$c={};return c},j:function(){var b=this.ia(),c=this.constructor.$c;return b?b in c?c[b]:(c[b]=this.ka(b)):null},ia:a(function(){var b=this.e,c=this.constructor,d=b.style;b=b.currentStyle;var e=this.va,g=this.Fa,i=c.Yc||(c.Yc=f.Q+e);c=c.Zc||(c.Zc=f.nb+g.charAt(0).toUpperCase()+g.substring(1));return d[c]||b.getAttribute(i)||d[g]||b.getAttribute(e)}),h:a(function(){return!!this.j()}),G:a(function(){var b=this.ia(),
-c=b!==this.Zb;this.Zb=b;return c}),ua:a,cb:function(){++this.Z},hb:function(){--this.Z||delete this.$b}}})();f.Sb=f.C.ja({va:f.Q+"background",Fa:f.nb+"Background",cd:{scroll:1,fixed:1,local:1},fb:{"repeat-x":1,"repeat-y":1,repeat:1,"no-repeat":1},sc:{"padding-box":1,"border-box":1,"content-box":1},Od:{top:1,right:1,bottom:1,left:1,center:1},Td:{contain:1,cover:1},eb:{Ma:"backgroundClip",B:"backgroundColor",da:"backgroundImage",Pa:"backgroundOrigin",R:"backgroundPosition",S:"backgroundRepeat",Sa:"backgroundSize"},
-ka:function(a){function b(v){return v&&v.W()||v.k&k&&v.d in m}function c(v){return v&&(v.W()&&f.n(v.d)||v.d==="auto"&&"auto")}var d=this.e.currentStyle,e,g,i,j=f.v.pa,h=j.oa,k=j.ma,n=j.B,l,q,s=0,m=this.Od,r,p,t={L:[]};if(this.wb()){e=new f.v(a);for(i={};g=e.next();){l=g.k;q=g.d;if(!i.N&&l&j.Xb&&q==="linear-gradient"){r={ca:[],N:q};for(p={};g=e.next();){l=g.k;q=g.d;if(l&j.Wb&&q===")"){p.color&&r.ca.push(p);r.ca.length>1&&f.p.Eb(i,r);break}if(l&n){if(r.ra||r.zb){g=e.D();if(g.k!==h)break;e.next()}p=
-{color:f.ha(q)};g=e.next();if(g.W())p.db=f.n(g.d);else e.D()}else if(l&j.Ia&&!r.ra&&!p.color&&!r.ca.length)r.ra=new f.Ec(g.d);else if(b(g)&&!r.zb&&!p.color&&!r.ca.length){e.D();r.zb=new f.Ja(e.la(function(v){return!b(v)},false))}else if(l&h&&q===","){if(p.color){r.ca.push(p);p={}}}else break}}else if(!i.N&&l&j.URL){i.Ab=q;i.N="image"}else if(b(g)&&!i.$){e.D();i.$=new f.Ja(e.la(function(v){return!b(v)},false))}else if(l&k)if(q in this.fb&&!i.bb)i.bb=q;else if(q in this.sc&&!i.Wa){i.Wa=q;if((g=e.next())&&
-g.k&k&&g.d in this.sc)i.ub=g.d;else{i.ub=q;e.D()}}else if(q in this.cd&&!i.bc)i.bc=q;else return null;else if(l&n&&!t.color)t.color=f.ha(q);else if(l&h&&q==="/"&&!i.Xa&&i.$){g=e.next();if(g.k&k&&g.d in this.Td)i.Xa=new f.Ka(g.d);else if(g=c(g)){l=c(e.next());if(!l){l=g;e.D()}i.Xa=new f.Ka(g,l)}else return null}else if(l&h&&q===","&&i.N){i.Hb=a.substring(s,e.ch-1);s=e.ch;t.L.push(i);i={}}else return null}if(i.N){i.Hb=a.substring(s);t.L.push(i)}}else this.Bc(f.Ba<9?function(){var v=this.eb,o=d[v.R+
-"X"],u=d[v.R+"Y"],x=d[v.da],y=d[v.B];if(y!=="transparent")t.color=f.ha(y);if(x!=="none")t.L=[{N:"image",Ab:(new f.v(x)).next().d,bb:d[v.S],$:new f.Ja((new f.v(o+" "+u)).all())}]}:function(){var v=this.eb,o=/\s*,\s*/,u=d[v.da].split(o),x=d[v.B],y,z,D,G,E,B;if(x!=="transparent")t.color=f.ha(x);if((G=u.length)&&u[0]!=="none"){x=d[v.S].split(o);y=d[v.R].split(o);z=d[v.Pa].split(o);D=d[v.Ma].split(o);v=d[v.Sa].split(o);t.L=[];for(o=0;o<G;o++)if((E=u[o])&&E!=="none"){B=v[o].split(" ");t.L.push({Hb:E+" "+
-x[o]+" "+y[o]+" / "+v[o]+" "+z[o]+" "+D[o],N:"image",Ab:(new f.v(E)).next().d,bb:x[o],$:new f.Ja((new f.v(y[o])).all()),Wa:z[o],ub:D[o],Xa:new f.Ka(B[0],B[1])})}}});return t.color||t.L[0]?t:null},Bc:function(a){var b=f.Ba>8,c=this.eb,d=this.e.runtimeStyle,e=d[c.da],g=d[c.B],i=d[c.S],j,h,k,n;if(e)d[c.da]="";if(g)d[c.B]="";if(i)d[c.S]="";if(b){j=d[c.Ma];h=d[c.Pa];n=d[c.R];k=d[c.Sa];if(j)d[c.Ma]="";if(h)d[c.Pa]="";if(n)d[c.R]="";if(k)d[c.Sa]=""}a=a.call(this);if(e)d[c.da]=e;if(g)d[c.B]=g;if(i)d[c.S]=
-i;if(b){if(j)d[c.Ma]=j;if(h)d[c.Pa]=h;if(n)d[c.R]=n;if(k)d[c.Sa]=k}return a},ia:f.C.ua(function(){return this.wb()||this.Bc(function(){var a=this.e.currentStyle,b=this.eb;return a[b.B]+" "+a[b.da]+" "+a[b.S]+" "+a[b.R+"X"]+" "+a[b.R+"Y"]})}),wb:f.C.ua(function(){var a=this.e;return a.style[this.Fa]||a.currentStyle.getAttribute(this.va)}),qc:function(){var a=0;if(f.V<7){a=this.e;a=""+(a.style[f.nb+"PngFix"]||a.currentStyle.getAttribute(f.Q+"png-fix"))==="true"}return a},h:f.C.ua(function(){return(this.wb()||
-this.qc())&&!!this.j()})});f.Vb=f.C.ja({wc:["Top","Right","Bottom","Left"],Hd:{thin:"1px",medium:"3px",thick:"5px"},ka:function(){var a={},b={},c={},d=false,e=true,g=true,i=true;this.Cc(function(){for(var j=this.e.currentStyle,h=0,k,n,l,q,s,m,r;h<4;h++){l=this.wc[h];r=l.charAt(0).toLowerCase();k=b[r]=j["border"+l+"Style"];n=j["border"+l+"Color"];l=j["border"+l+"Width"];if(h>0){if(k!==q)g=false;if(n!==s)e=false;if(l!==m)i=false}q=k;s=n;m=l;c[r]=f.ha(n);l=a[r]=f.n(b[r]==="none"?"0":this.Hd[l]||l);if(l.a(this.e)>
-0)d=true}});return d?{I:a,Yd:b,gd:c,de:i,hd:e,Zd:g}:null},ia:f.C.ua(function(){var a=this.e,b=a.currentStyle,c;a.tagName in f.Ac&&a.offsetParent.currentStyle.borderCollapse==="collapse"||this.Cc(function(){c=b.borderWidth+"|"+b.borderStyle+"|"+b.borderColor});return c}),Cc:function(a){var b=this.e.runtimeStyle,c=b.borderWidth,d=b.borderColor;if(c)b.borderWidth="";if(d)b.borderColor="";a=a.call(this);if(c)b.borderWidth=c;if(d)b.borderColor=d;return a}});(function(){f.jb=f.C.ja({va:"border-radius",
-Fa:"borderRadius",ka:function(b){var c=null,d,e,g,i,j=false;if(b){e=new f.v(b);var h=function(){for(var k=[],n;(g=e.next())&&g.W();){i=f.n(g.d);n=i.ic();if(n<0)return null;if(n>0)j=true;k.push(i)}return k.length>0&&k.length<5?{tl:k[0],tr:k[1]||k[0],br:k[2]||k[0],bl:k[3]||k[1]||k[0]}:null};if(b=h()){if(g){if(g.k&f.v.pa.oa&&g.d==="/")d=h()}else d=b;if(j&&b&&d)c={x:b,y:d}}}return c}});var a=f.n("0");a={tl:a,tr:a,br:a,bl:a};f.jb.Dc={x:a,y:a}})();f.Ub=f.C.ja({va:"border-image",Fa:"borderImage",fb:{stretch:1,
-round:1,repeat:1,space:1},ka:function(a){var b=null,c,d,e,g,i,j,h=0,k=f.v.pa,n=k.ma,l=k.na,q=k.Ra;if(a){c=new f.v(a);b={};for(var s=function(p){return p&&p.k&k.oa&&p.d==="/"},m=function(p){return p&&p.k&n&&p.d==="fill"},r=function(){g=c.la(function(p){return!(p.k&(l|q))});if(m(c.next())&&!b.fill)b.fill=true;else c.D();if(s(c.next())){h++;i=c.la(function(p){return!p.W()&&!(p.k&n&&p.d==="auto")});if(s(c.next())){h++;j=c.la(function(p){return!p.Ca()})}}else c.D()};a=c.next();){d=a.k;e=a.d;if(d&(l|q)&&
-!g){c.D();r()}else if(m(a)&&!b.fill){b.fill=true;r()}else if(d&n&&this.fb[e]&&!b.repeat){b.repeat={f:e};if(a=c.next())if(a.k&n&&this.fb[a.d])b.repeat.Ob=a.d;else c.D()}else if(d&k.URL&&!b.src)b.src=e;else return null}if(!b.src||!g||g.length<1||g.length>4||i&&i.length>4||h===1&&i.length<1||j&&j.length>4||h===2&&j.length<1)return null;if(!b.repeat)b.repeat={f:"stretch"};if(!b.repeat.Ob)b.repeat.Ob=b.repeat.f;a=function(p,t){return{t:t(p[0]),r:t(p[1]||p[0]),b:t(p[2]||p[0]),l:t(p[3]||p[1]||p[0])}};b.slice=
-a(g,function(p){return f.n(p.k&l?p.d+"px":p.d)});if(i&&i[0])b.I=a(i,function(p){return p.W()?f.n(p.d):p.d});if(j&&j[0])b.Da=a(j,function(p){return p.Ca()?f.n(p.d):p.d})}return b}});f.Ic=f.C.ja({va:"box-shadow",Fa:"boxShadow",ka:function(a){var b,c=f.n,d=f.v.pa,e;if(a){e=new f.v(a);b={Da:[],Bb:[]};for(a=function(){for(var g,i,j,h,k,n;g=e.next();){j=g.d;i=g.k;if(i&d.oa&&j===",")break;else if(g.Ca()&&!k){e.D();k=e.la(function(l){return!l.Ca()})}else if(i&d.B&&!h)h=j;else if(i&d.ma&&j==="inset"&&!n)n=
-true;else return false}g=k&&k.length;if(g>1&&g<5){(n?b.Bb:b.Da).push({ee:c(k[0].d),fe:c(k[1].d),blur:c(k[2]?k[2].d:"0"),Ud:c(k[3]?k[3].d:"0"),color:f.ha(h||"currentColor")});return true}return false};a(););}return b&&(b.Bb.length||b.Da.length)?b:null}});f.Uc=f.C.ja({ia:f.C.ua(function(){var a=this.e.currentStyle;return a.visibility+"|"+a.display}),ka:function(){var a=this.e,b=a.runtimeStyle;a=a.currentStyle;var c=b.visibility,d;b.visibility="";d=a.visibility;b.visibility=c;return{be:d!=="hidden",
-nd:a.display!=="none"}},h:function(){return false}});f.u={P:function(a){function b(c,d,e,g){this.e=c;this.s=d;this.g=e;this.parent=g}f.p.Eb(b.prototype,f.u,a);return b},Cb:false,O:function(){return false},Ea:f.aa,Lb:function(){this.m();this.h()&&this.U()},ib:function(){this.Cb=true},Mb:function(){this.h()?this.U():this.m()},sb:function(a,b){this.vc(a);for(var c=this.qa||(this.qa=[]),d=a+1,e=c.length,g;d<e;d++)if(g=c[d])break;c[a]=b;this.H().insertBefore(b,g||null)},ya:function(a){var b=this.qa;return b&&
-b[a]||null},vc:function(a){var b=this.ya(a),c=this.Ta;if(b&&c){c.removeChild(b);this.qa[a]=null}},za:function(a,b,c,d){var e=this.rb||(this.rb={}),g=e[a];if(!g){g=e[a]=f.p.Za("shape");if(b)g.appendChild(g[b]=f.p.Za(b));if(d){c=this.ya(d);if(!c){this.sb(d,doc.createElement("group"+d));c=this.ya(d)}}c.appendChild(g);a=g.style;a.position="absolute";a.left=a.top=0;a.behavior="url(#default#VML)"}return g},vb:function(a){var b=this.rb,c=b&&b[a];if(c){c.parentNode.removeChild(c);delete b[a]}return!!c},kc:function(a){var b=
-this.e,c=this.s.o(),d=c.i,e=c.f,g,i,j,h,k,n;c=a.x.tl.a(b,d);g=a.y.tl.a(b,e);i=a.x.tr.a(b,d);j=a.y.tr.a(b,e);h=a.x.br.a(b,d);k=a.y.br.a(b,e);n=a.x.bl.a(b,d);a=a.y.bl.a(b,e);d=Math.min(d/(c+i),e/(j+k),d/(n+h),e/(g+a));if(d<1){c*=d;g*=d;i*=d;j*=d;h*=d;k*=d;n*=d;a*=d}return{x:{tl:c,tr:i,br:h,bl:n},y:{tl:g,tr:j,br:k,bl:a}}},xa:function(a,b,c){b=b||1;var d,e,g=this.s.o();e=g.i*b;g=g.f*b;var i=this.g.F,j=Math.floor,h=Math.ceil,k=a?a.Jb*b:0,n=a?a.Ib*b:0,l=a?a.tb*b:0;a=a?a.Db*b:0;var q,s,m,r,p;if(c||i.h()){d=
-this.kc(c||i.j());c=d.x.tl*b;i=d.y.tl*b;q=d.x.tr*b;s=d.y.tr*b;m=d.x.br*b;r=d.y.br*b;p=d.x.bl*b;b=d.y.bl*b;e="m"+j(a)+","+j(i)+"qy"+j(c)+","+j(k)+"l"+h(e-q)+","+j(k)+"qx"+h(e-n)+","+j(s)+"l"+h(e-n)+","+h(g-r)+"qy"+h(e-m)+","+h(g-l)+"l"+j(p)+","+h(g-l)+"qx"+j(a)+","+h(g-b)+" x e"}else e="m"+j(a)+","+j(k)+"l"+h(e-n)+","+j(k)+"l"+h(e-n)+","+h(g-l)+"l"+j(a)+","+h(g-l)+"xe";return e},H:function(){var a=this.parent.ya(this.M),b;if(!a){a=doc.createElement(this.Ya);b=a.style;b.position="absolute";b.top=b.left=
-0;this.parent.sb(this.M,a)}return a},mc:function(){var a=this.e,b=a.currentStyle,c=a.runtimeStyle,d=a.tagName,e=f.V===6,g;if(e&&(d in f.cc||d==="FIELDSET")||d==="BUTTON"||d==="INPUT"&&a.type in f.Gd){c.borderWidth="";d=this.g.z.wc;for(g=d.length;g--;){e=d[g];c["padding"+e]="";c["padding"+e]=f.n(b["padding"+e]).a(a)+f.n(b["border"+e+"Width"]).a(a)+(f.V!==8&&g%2?1:0)}c.borderWidth=0}else if(e){if(a.childNodes.length!==1||a.firstChild.tagName!=="ie6-mask"){b=doc.createElement("ie6-mask");d=b.style;d.visibility=
-"visible";for(d.zoom=1;d=a.firstChild;)b.appendChild(d);a.appendChild(b);c.visibility="hidden"}}else c.borderColor="transparent"},he:function(){},m:function(){this.parent.vc(this.M);delete this.rb;delete this.qa}};f.Rc=f.u.P({h:function(){var a=this.ed;for(var b in a)if(a.hasOwnProperty(b)&&a[b].h())return true;return false},O:function(){return this.g.Pb.G()},ib:function(){if(this.h()){var a=this.jc(),b=a,c;a=a.currentStyle;var d=a.position,e=this.H().style,g=0,i=0;i=this.s.o();if(d==="fixed"&&f.V>
-6){g=i.x;i=i.y;b=d}else{do b=b.offsetParent;while(b&&b.currentStyle.position==="static");if(b){c=b.getBoundingClientRect();b=b.currentStyle;g=i.x-c.left-(parseFloat(b.borderLeftWidth)||0);i=i.y-c.top-(parseFloat(b.borderTopWidth)||0)}else{b=doc.documentElement;g=i.x+b.scrollLeft-b.clientLeft;i=i.y+b.scrollTop-b.clientTop}b="absolute"}e.position=b;e.left=g;e.top=i;e.zIndex=d==="static"?-1:a.zIndex;this.Cb=true}},Mb:f.aa,Nb:function(){var a=this.g.Pb.j();this.H().style.display=a.be&&a.nd?"":"none"},
-Lb:function(){this.h()?this.Nb():this.m()},jc:function(){var a=this.e;return a.tagName in f.Ac?a.offsetParent:a},H:function(){var a=this.Ta,b;if(!a){b=this.jc();a=this.Ta=doc.createElement("css3-container");a.style.direction="ltr";this.Nb();b.parentNode.insertBefore(a,b)}return a},ab:f.aa,m:function(){var a=this.Ta,b;if(a&&(b=a.parentNode))b.removeChild(a);delete this.Ta;delete this.qa}});f.Fc=f.u.P({M:2,Ya:"background",O:function(){var a=this.g;return a.w.G()||a.F.G()},h:function(){var a=this.g;
-return a.q.h()||a.F.h()||a.w.h()||a.ga.h()&&a.ga.j().Bb},U:function(){var a=this.s.o();if(a.i&&a.f){this.od();this.pd()}},od:function(){var a=this.g.w.j(),b=this.s.o(),c=this.e,d=a&&a.color,e,g;if(d&&d.fa()>0){this.lc();a=this.za("bgColor","fill",this.H(),1);e=b.i;b=b.f;a.stroked=false;a.coordsize=e*2+","+b*2;a.coordorigin="1,1";a.path=this.xa(null,2);g=a.style;g.width=e;g.height=b;a.fill.color=d.T(c);c=d.fa();if(c<1)a.fill.opacity=c}else this.vb("bgColor")},pd:function(){var a=this.g.w.j(),b=this.s.o();
-a=a&&a.L;var c,d,e,g,i;if(a){this.lc();d=b.i;e=b.f;for(i=a.length;i--;){b=a[i];c=this.za("bgImage"+i,"fill",this.H(),2);c.stroked=false;c.fill.type="tile";c.fillcolor="none";c.coordsize=d*2+","+e*2;c.coordorigin="1,1";c.path=this.xa(0,2);g=c.style;g.width=d;g.height=e;if(b.N==="linear-gradient")this.bd(c,b);else{c.fill.src=b.Ab;this.Md(c,i)}}}for(i=a?a.length:0;this.vb("bgImage"+i++););},Md:function(a,b){var c=this;f.p.Rb(a.fill.src,function(d){var e=c.e,g=c.s.o(),i=g.i;g=g.f;if(i&&g){var j=a.fill,
-h=c.g,k=h.z.j(),n=k&&k.I;k=n?n.t.a(e):0;var l=n?n.r.a(e):0,q=n?n.b.a(e):0;n=n?n.l.a(e):0;h=h.w.j().L[b];e=h.$?h.$.coords(e,i-d.i-n-l,g-d.f-k-q):{x:0,y:0};h=h.bb;q=l=0;var s=i+1,m=g+1,r=f.V===8?0:1;n=Math.round(e.x)+n+0.5;k=Math.round(e.y)+k+0.5;j.position=n/i+","+k/g;if(h&&h!=="repeat"){if(h==="repeat-x"||h==="no-repeat"){l=k+1;m=k+d.f+r}if(h==="repeat-y"||h==="no-repeat"){q=n+1;s=n+d.i+r}a.style.clip="rect("+l+"px,"+s+"px,"+m+"px,"+q+"px)"}}})},bd:function(a,b){var c=this.e,d=this.s.o(),e=d.i,g=
-d.f;a=a.fill;d=b.ca;var i=d.length,j=Math.PI,h=f.Na,k=h.tc,n=h.dc;b=h.gc(c,e,g,b);h=b.ra;var l=b.xc,q=b.yc,s=b.Vd,m=b.Wd,r=b.rd,p=b.sd,t=b.kd,v=b.ld;b=b.rc;e=h%90?Math.atan2(t*e/g,v)/j*180:h+90;e+=180;e%=360;r=k(s,m,h,r,p);g=n(s,m,r[0],r[1]);j=[];r=k(l,q,h,s,m);n=n(l,q,r[0],r[1])/g*100;k=[];for(h=0;h<i;h++)k.push(d[h].db?d[h].db.a(c,b):h===0?0:h===i-1?b:null);for(h=1;h<i;h++){if(k[h]===null){l=k[h-1];b=h;do q=k[++b];while(q===null);k[h]=l+(q-l)/(b-h+1)}k[h]=Math.max(k[h],k[h-1])}for(h=0;h<i;h++)j.push(n+
-k[h]/g*100+"% "+d[h].color.T(c));a.angle=e;a.type="gradient";a.method="sigma";a.color=d[0].color.T(c);a.color2=d[i-1].color.T(c);if(a.colors)a.colors.value=j.join(",");else a.colors=j.join(",")},lc:function(){var a=this.e.runtimeStyle;a.backgroundImage="url(about:blank)";a.backgroundColor="transparent"},m:function(){f.u.m.call(this);var a=this.e.runtimeStyle;a.backgroundImage=a.backgroundColor=""}});f.Gc=f.u.P({M:4,Ya:"border",O:function(){var a=this.g;return a.z.G()||a.F.G()},h:function(){var a=
-this.g;return(a.F.h()||a.w.h())&&!a.q.h()&&a.z.h()},U:function(){var a=this.e,b=this.g.z.j(),c=this.s.o(),d=c.i;c=c.f;var e,g,i,j,h;if(b){this.mc();b=this.wd(2);j=0;for(h=b.length;j<h;j++){i=b[j];e=this.za("borderPiece"+j,i.stroke?"stroke":"fill",this.H());e.coordsize=d*2+","+c*2;e.coordorigin="1,1";e.path=i.path;g=e.style;g.width=d;g.height=c;e.filled=!!i.fill;e.stroked=!!i.stroke;if(i.stroke){e=e.stroke;e.weight=i.Qb+"px";e.color=i.color.T(a);e.dashstyle=i.stroke==="dashed"?"2 2":i.stroke==="dotted"?
-"1 1":"solid";e.linestyle=i.stroke==="double"&&i.Qb>2?"ThinThin":"Single"}else e.fill.color=i.fill.T(a)}for(;this.vb("borderPiece"+j++););}},wd:function(a){var b=this.e,c,d,e,g=this.g.z,i=[],j,h,k,n,l=Math.round,q,s,m;if(g.h()){c=g.j();g=c.I;s=c.Yd;m=c.gd;if(c.de&&c.Zd&&c.hd){if(m.t.fa()>0){c=g.t.a(b);k=c/2;i.push({path:this.xa({Jb:k,Ib:k,tb:k,Db:k},a),stroke:s.t,color:m.t,Qb:c})}}else{a=a||1;c=this.s.o();d=c.i;e=c.f;c=l(g.t.a(b));k=l(g.r.a(b));n=l(g.b.a(b));b=l(g.l.a(b));var r={t:c,r:k,b:n,l:b};
-b=this.g.F;if(b.h())q=this.kc(b.j());j=Math.floor;h=Math.ceil;var p=function(o,u){return q?q[o][u]:0},t=function(o,u,x,y,z,D){var G=p("x",o),E=p("y",o),B=o.charAt(1)==="r";o=o.charAt(0)==="b";return G>0&&E>0?(D?"al":"ae")+(B?h(d-G):j(G))*a+","+(o?h(e-E):j(E))*a+","+(j(G)-u)*a+","+(j(E)-x)*a+","+y*65535+","+2949075*(z?1:-1):(D?"m":"l")+(B?d-u:u)*a+","+(o?e-x:x)*a},v=function(o,u,x,y){var z=o==="t"?j(p("x","tl"))*a+","+h(u)*a:o==="r"?h(d-u)*a+","+j(p("y","tr"))*a:o==="b"?h(d-p("x","br"))*a+","+j(e-
-u)*a:j(u)*a+","+h(e-p("y","bl"))*a;o=o==="t"?h(d-p("x","tr"))*a+","+h(u)*a:o==="r"?h(d-u)*a+","+h(e-p("y","br"))*a:o==="b"?j(p("x","bl"))*a+","+j(e-u)*a:j(u)*a+","+j(p("y","tl"))*a;return x?(y?"m"+o:"")+"l"+z:(y?"m"+z:"")+"l"+o};b=function(o,u,x,y,z,D){var G=o==="l"||o==="r",E=r[o],B,A;if(E>0&&s[o]!=="none"&&m[o].fa()>0){B=r[G?o:u];u=r[G?u:o];A=r[G?o:x];x=r[G?x:o];if(s[o]==="dashed"||s[o]==="dotted"){i.push({path:t(y,B,u,D+45,0,1)+t(y,0,0,D,1,0),fill:m[o]});i.push({path:v(o,E/2,0,1),stroke:s[o],Qb:E,
-color:m[o]});i.push({path:t(z,A,x,D,0,1)+t(z,0,0,D-45,1,0),fill:m[o]})}else i.push({path:t(y,B,u,D+45,0,1)+v(o,E,0,0)+t(z,A,x,D,0,0)+(s[o]==="double"&&E>2?t(z,A-j(A/3),x-j(x/3),D-45,1,0)+v(o,h(E/3*2),1,0)+t(y,B-j(B/3),u-j(u/3),D,1,0)+"x "+t(y,j(B/3),j(u/3),D+45,0,1)+v(o,j(E/3),1,0)+t(z,j(A/3),j(x/3),D,0,0):"")+t(z,0,0,D-45,1,0)+v(o,0,1,0)+t(y,0,0,D,1,0),fill:m[o]})}};b("t","l","r","tl","tr",90);b("r","t","b","tr","br",0);b("b","r","l","br","bl",-90);b("l","b","t","bl","tl",-180)}}return i},m:function(){if(this.ec||
-!this.g.q.h())this.e.runtimeStyle.borderColor="";f.u.m.call(this)}});f.Tb=f.u.P({M:5,Ld:["t","tr","r","br","b","bl","l","tl","c"],O:function(){return this.g.q.G()},h:function(){return this.g.q.h()},U:function(){this.H();var a=this.g.q.j(),b=this.g.z.j(),c=this.s.o(),d=this.e,e=this.uc;f.p.Rb(a.src,function(g){function i(v,o,u,x,y){v=e[v].style;var z=Math.max;v.width=z(o,0);v.height=z(u,0);v.left=x;v.top=y}function j(v,o,u){for(var x=0,y=v.length;x<y;x++)e[v[x]].imagedata[o]=u}var h=c.i,k=c.f,n=f.n("0"),
-l=a.I||(b?b.I:{t:n,r:n,b:n,l:n});n=l.t.a(d);var q=l.r.a(d),s=l.b.a(d);l=l.l.a(d);var m=a.slice,r=m.t.a(d),p=m.r.a(d),t=m.b.a(d);m=m.l.a(d);i("tl",l,n,0,0);i("t",h-l-q,n,l,0);i("tr",q,n,h-q,0);i("r",q,k-n-s,h-q,n);i("br",q,s,h-q,k-s);i("b",h-l-q,s,l,k-s);i("bl",l,s,0,k-s);i("l",l,k-n-s,0,n);i("c",h-l-q,k-n-s,l,n);j(["tl","t","tr"],"cropBottom",(g.f-r)/g.f);j(["tl","l","bl"],"cropRight",(g.i-m)/g.i);j(["bl","b","br"],"cropTop",(g.f-t)/g.f);j(["tr","r","br"],"cropLeft",(g.i-p)/g.i);j(["l","r","c"],"cropTop",
-r/g.f);j(["l","r","c"],"cropBottom",t/g.f);j(["t","b","c"],"cropLeft",m/g.i);j(["t","b","c"],"cropRight",p/g.i);e.c.style.display=a.fill?"":"none"},this)},H:function(){var a=this.parent.ya(this.M),b,c,d,e=this.Ld,g=e.length;if(!a){a=doc.createElement("border-image");b=a.style;b.position="absolute";this.uc={};for(d=0;d<g;d++){c=this.uc[e[d]]=f.p.Za("rect");c.appendChild(f.p.Za("imagedata"));b=c.style;b.behavior="url(#default#VML)";b.position="absolute";b.top=b.left=0;c.imagedata.src=this.g.q.j().src;
-c.stroked=false;c.filled=false;a.appendChild(c)}this.parent.sb(this.M,a)}return a},Ea:function(){if(this.h()){var a=this.e,b=a.runtimeStyle,c=this.g.q.j().I;b.borderStyle="solid";if(c){b.borderTopWidth=c.t.a(a)+"px";b.borderRightWidth=c.r.a(a)+"px";b.borderBottomWidth=c.b.a(a)+"px";b.borderLeftWidth=c.l.a(a)+"px"}this.mc()}},m:function(){var a=this.e.runtimeStyle;a.borderStyle="";if(this.ec||!this.g.z.h())a.borderColor=a.borderWidth="";f.u.m.call(this)}});f.Hc=f.u.P({M:1,Ya:"outset-box-shadow",O:function(){var a=
-this.g;return a.ga.G()||a.F.G()},h:function(){var a=this.g.ga;return a.h()&&a.j().Da[0]},U:function(){function a(B,A,L,N,H,I,F){B=b.za("shadow"+B+A,"fill",d,i-B);A=B.fill;B.coordsize=n*2+","+l*2;B.coordorigin="1,1";B.stroked=false;B.filled=true;A.color=H.T(c);if(I){A.type="gradienttitle";A.color2=A.color;A.opacity=0}B.path=F;p=B.style;p.left=L;p.top=N;p.width=n;p.height=l;return B}var b=this,c=this.e,d=this.H(),e=this.g,g=e.ga.j().Da;e=e.F.j();var i=g.length,j=i,h,k=this.s.o(),n=k.i,l=k.f;k=f.V===
-8?1:0;for(var q=["tl","tr","br","bl"],s,m,r,p,t,v,o,u,x,y,z,D,G,E;j--;){m=g[j];t=m.ee.a(c);v=m.fe.a(c);h=m.Ud.a(c);o=m.blur.a(c);m=m.color;u=-h-o;if(!e&&o)e=f.jb.Dc;u=this.xa({Jb:u,Ib:u,tb:u,Db:u},2,e);if(o){x=(h+o)*2+n;y=(h+o)*2+l;z=o*2/x;D=o*2/y;if(o-h>n/2||o-h>l/2)for(h=4;h--;){s=q[h];G=s.charAt(0)==="b";E=s.charAt(1)==="r";s=a(j,s,t,v,m,o,u);r=s.fill;r.focusposition=(E?1-z:z)+","+(G?1-D:D);r.focussize="0,0";s.style.clip="rect("+((G?y/2:0)+k)+"px,"+(E?x:x/2)+"px,"+(G?y:y/2)+"px,"+((E?x/2:0)+k)+
-"px)"}else{s=a(j,"",t,v,m,o,u);r=s.fill;r.focusposition=z+","+D;r.focussize=1-z*2+","+(1-D*2)}}else{s=a(j,"",t,v,m,o,u);t=m.fa();if(t<1)s.fill.opacity=t}}}});f.Pc=f.u.P({M:6,Ya:"imgEl",O:function(){var a=this.g;return this.e.src!==this.Xc||a.F.G()},h:function(){var a=this.g;return a.F.h()||a.w.qc()},U:function(){this.Xc=i;this.Cd();var a=this.za("img","fill",this.H()),b=a.fill,c=this.s.o(),d=c.i;c=c.f;var e=this.g.z.j(),g=e&&e.I;e=this.e;var i=e.src,j=Math.round,h=e.currentStyle,k=f.n;if(!g||f.V<
-7){g=f.n("0");g={t:g,r:g,b:g,l:g}}a.stroked=false;b.type="frame";b.src=i;b.position=(d?0.5/d:0)+","+(c?0.5/c:0);a.coordsize=d*2+","+c*2;a.coordorigin="1,1";a.path=this.xa({Jb:j(g.t.a(e)+k(h.paddingTop).a(e)),Ib:j(g.r.a(e)+k(h.paddingRight).a(e)),tb:j(g.b.a(e)+k(h.paddingBottom).a(e)),Db:j(g.l.a(e)+k(h.paddingLeft).a(e))},2);a=a.style;a.width=d;a.height=c},Cd:function(){this.e.runtimeStyle.filter="alpha(opacity=0)"},m:function(){f.u.m.call(this);this.e.runtimeStyle.filter=""}});f.Oc=f.u.P({ib:f.aa,
-Mb:f.aa,Nb:f.aa,Lb:f.aa,Kd:/^,+|,+$/g,Fd:/,+/g,gb:function(a,b){(this.pb||(this.pb=[]))[a]=b||void 0},ab:function(){var a=this.pb,b;if(a&&(b=a.join(",").replace(this.Kd,"").replace(this.Fd,","))!==this.Wc)this.Wc=this.e.runtimeStyle.background=b},m:function(){this.e.runtimeStyle.background="";delete this.pb}});f.Mc=f.u.P({ta:1,O:function(){return this.g.w.G()},h:function(){var a=this.g;return a.w.h()||a.q.h()},U:function(){var a=this.g.w.j(),b,c,d=0,e,g;if(a){b=[];if(c=a.L)for(;e=c[d++];)if(e.N===
-"linear-gradient"){g=this.vd(e.Wa);g=(e.Xa||f.Ka.Kc).a(this.e,g.i,g.f,g.i,g.f);b.push("url(data:image/svg+xml,"+escape(this.xd(e,g.i,g.f))+") "+this.dd(e.$)+" / "+g.i+"px "+g.f+"px "+(e.bc||"")+" "+(e.Wa||"")+" "+(e.ub||""))}else b.push(e.Hb);a.color&&b.push(a.color.Y);this.parent.gb(this.ta,b.join(","))}},dd:function(a){return a?a.X.map(function(b){return b.d}).join(" "):"0 0"},vd:function(a){var b=this.e,c=this.s.o(),d=c.i;c=c.f;var e;if(a!=="border-box")if((e=this.g.z.j())&&(e=e.I)){d-=e.l.a(b)+
-e.l.a(b);c-=e.t.a(b)+e.b.a(b)}if(a==="content-box"){a=f.n;e=b.currentStyle;d-=a(e.paddingLeft).a(b)+a(e.paddingRight).a(b);c-=a(e.paddingTop).a(b)+a(e.paddingBottom).a(b)}return{i:d,f:c}},xd:function(a,b,c){var d=this.e,e=a.ca,g=e.length,i=f.Na.gc(d,b,c,a);a=i.xc;var j=i.yc,h=i.td,k=i.ud;i=i.rc;var n,l,q,s,m;n=[];for(l=0;l<g;l++)n.push(e[l].db?e[l].db.a(d,i):l===0?0:l===g-1?i:null);for(l=1;l<g;l++)if(n[l]===null){s=n[l-1];q=l;do m=n[++q];while(m===null);n[l]=s+(m-s)/(q-l+1)}b=['<svg width="'+b+'" height="'+
-c+'" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="g" gradientUnits="userSpaceOnUse" x1="'+a/b*100+'%" y1="'+j/c*100+'%" x2="'+h/b*100+'%" y2="'+k/c*100+'%">'];for(l=0;l<g;l++)b.push('<stop offset="'+n[l]/i+'" stop-color="'+e[l].color.T(d)+'" stop-opacity="'+e[l].color.fa()+'"/>');b.push('</linearGradient></defs><rect width="100%" height="100%" fill="url(#g)"/></svg>');return b.join("")},m:function(){this.parent.gb(this.ta)}});f.Nc=f.u.P({S:"repeat",Sc:"stretch",Qc:"round",ta:0,O:function(){return this.g.q.G()},
-h:function(){return this.g.q.h()},U:function(){var a=this,b=a.g.q.j(),c=a.g.z.j(),d=a.s.o(),e=b.repeat,g=e.f,i=e.Ob,j=a.e,h=0;f.p.Rb(b.src,function(k){function n(R,S,U,V,W,T,w,C,K,O){J.push('<pattern patternUnits="userSpaceOnUse" id="pattern'+Q+'" x="'+(g===p?R+U/2-K/2:R)+'" y="'+(i===p?S+V/2-O/2:S)+'" width="'+K+'" height="'+O+'"><svg width="'+K+'" height="'+O+'" viewBox="'+W+" "+T+" "+w+" "+C+'" preserveAspectRatio="none"><image xlink:href="'+r+'" x="0" y="0" width="'+s+'" height="'+m+'" /></svg></pattern>');
-P.push('<rect x="'+R+'" y="'+S+'" width="'+U+'" height="'+V+'" fill="url(#pattern'+Q+')" />');Q++}var l=d.i,q=d.f,s=k.i,m=k.f,r=a.Dd(b.src,s,m),p=a.S,t=a.Sc;k=a.Qc;var v=Math.ceil,o=f.n("0"),u=b.I||(c?c.I:{t:o,r:o,b:o,l:o});o=u.t.a(j);var x=u.r.a(j),y=u.b.a(j);u=u.l.a(j);var z=b.slice,D=z.t.a(j),G=z.r.a(j),E=z.b.a(j);z=z.l.a(j);var B=l-u-x,A=q-o-y,L=s-z-G,N=m-D-E,H=g===t?B:L*o/D,I=i===t?A:N*x/G,F=g===t?B:L*y/E;t=i===t?A:N*u/z;var J=[],P=[],Q=0;if(g===k){H-=(H-(B%H||H))/v(B/H);F-=(F-(B%F||F))/v(B/
-F)}if(i===k){I-=(I-(A%I||I))/v(A/I);t-=(t-(A%t||t))/v(A/t)}k=['<svg width="'+l+'" height="'+q+'" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">'];n(0,0,u,o,0,0,z,D,u,o);n(u,0,B,o,z,0,L,D,H,o);n(l-x,0,x,o,s-G,0,G,D,x,o);n(0,o,u,A,0,D,z,N,u,t);if(b.fill)n(u,o,B,A,z,D,L,N,H||F||L,t||I||N);n(l-x,o,x,A,s-G,D,G,N,x,I);n(0,q-y,u,y,0,m-E,z,E,u,y);n(u,q-y,B,y,z,m-E,L,E,F,y);n(l-x,q-y,x,y,s-G,m-E,G,E,x,y);k.push("<defs>"+J.join("\n")+"</defs>"+P.join("\n")+"</svg>");a.parent.gb(a.ta,
-"url(data:image/svg+xml,"+escape(k.join(""))+") no-repeat border-box border-box");h&&a.parent.ab()},a);h=1},Dd:function(){var a={};return function(b,c,d){var e=a[b],g;if(!e){e=new Image;g=doc.createElement("canvas");e.src=b;g.width=c;g.height=d;g.getContext("2d").drawImage(e,0,0);e=a[b]=g.toDataURL()}return e}}(),Ea:f.Tb.prototype.Ea,m:function(){var a=this.e.runtimeStyle;this.parent.gb(this.ta);a.borderColor=a.borderStyle=a.borderWidth=""}});f.kb=function(){function a(m,r){m.className+=" "+r}function b(m){var r=
-s.slice.call(arguments,1),p=r.length;setTimeout(function(){for(;p--;)a(m,r[p])},0)}function c(m){var r=s.slice.call(arguments,1),p=r.length;setTimeout(function(){for(;p--;){var t=r[p];t=q[t]||(q[t]=new RegExp("\\b"+t+"\\b","g"));m.className=m.className.replace(t,"")}},0)}function d(m){function r(){if(!R){var w,C,K=f.Ba,O=m.currentStyle,M=O.getAttribute(g)==="true";T=O.getAttribute(i);T=K>7?T!=="false":T==="true";if(!Q){Q=1;m.runtimeStyle.zoom=1;O=m;for(var ba=1;O=O.previousSibling;)if(O.nodeType===
-1){ba=0;break}ba&&a(m,n)}F.cb();if(M&&(C=F.o())&&(w=doc.documentElement||doc.body)&&(C.y>w.clientHeight||C.x>w.clientWidth||C.y+C.f<0||C.x+C.i<0)){if(!V){V=1;f.mb.ba(r)}}else{R=1;V=Q=0;f.mb.Ha(r);if(K===9){J={w:new f.Sb(m),q:new f.Ub(m),z:new f.Vb(m)};P=[J.w,J.q];I=new f.Oc(m,F,J);w=[new f.Mc(m,F,J,I),new f.Nc(m,F,J,I)]}else{J={w:new f.Sb(m),z:new f.Vb(m),q:new f.Ub(m),F:new f.jb(m),ga:new f.Ic(m),Pb:new f.Uc(m)};P=[J.w,J.z,J.q,J.F,J.ga,J.Pb];I=new f.Rc(m,F,J);w=[new f.Hc(m,F,J,I),new f.Fc(m,F,J,
-I),new f.Gc(m,F,J,I),new f.Tb(m,F,J,I)];m.tagName==="IMG"&&w.push(new f.Pc(m,F,J,I));I.ed=w}H=[I].concat(w);if(w=m.currentStyle.getAttribute(f.Q+"watch-ancestors")){w=parseInt(w,10);C=0;for(M=m.parentNode;M&&(w==="NaN"||C++<w);){A(M,"onpropertychange",G);A(M,"onmouseenter",o);A(M,"onmouseleave",u);A(M,"onmousedown",x);if(M.tagName in f.fc){A(M,"onfocus",z);A(M,"onblur",D)}M=M.parentNode}}if(T){f.Oa.ba(t);f.Oa.Qd()}t(1)}if(!S){S=1;K<9&&A(m,"onmove",p);A(m,"onresize",p);A(m,"onpropertychange",v);A(m,
-"onmouseenter",o);A(m,"onmouseleave",u);A(m,"onmousedown",x);if(m.tagName in f.fc){A(m,"onfocus",z);A(m,"onblur",D)}f.Qa.ba(p);f.K.ba(L)}F.hb()}}function p(){F&&F.Ad()&&t()}function t(w){if(!W)if(R){var C,K=H.length;E();for(C=0;C<K;C++)H[C].Ea();if(w||F.Nd())for(C=0;C<K;C++)H[C].ib();if(w||F.Sd())for(C=0;C<K;C++)H[C].Mb();I.ab();B()}else Q||r()}function v(){var w,C=H.length,K;w=event;if(!W&&!(w&&w.propertyName in l))if(R){E();for(w=0;w<C;w++)H[w].Ea();for(w=0;w<C;w++){K=H[w];K.Cb||K.ib();K.O()&&K.Lb()}I.ab();
-B()}else Q||r()}function o(){b(m,j)}function u(){c(m,j,h)}function x(){b(m,h);f.lb.ba(y)}function y(){c(m,h);f.lb.Ha(y)}function z(){b(m,k)}function D(){c(m,k)}function G(){var w=event.propertyName;if(w==="className"||w==="id")v()}function E(){F.cb();for(var w=P.length;w--;)P[w].cb()}function B(){for(var w=P.length;w--;)P[w].hb();F.hb()}function A(w,C,K){w.attachEvent(C,K);U.push([w,C,K])}function L(){if(S){for(var w=U.length,C;w--;){C=U[w];C[0].detachEvent(C[1],C[2])}f.K.Ha(L);S=0;U=[]}}function N(){if(!W){var w,
-C;L();W=1;if(H){w=0;for(C=H.length;w<C;w++){H[w].ec=1;H[w].m()}}T&&f.Oa.Ha(t);f.Qa.Ha(t);H=F=J=P=m=null}}var H,I,F=new da(m),J,P,Q,R,S,U=[],V,W,T;this.Ed=r;this.update=t;this.m=N;this.qd=m}var e={},g=f.Q+"lazy-init",i=f.Q+"poll",j=f.La+"hover",h=f.La+"active",k=f.La+"focus",n=f.La+"first-child",l={background:1,bgColor:1,display:1},q={},s=[];d.yd=function(m){var r=f.p.Aa(m);return e[r]||(e[r]=new d(m))};d.m=function(m){m=f.p.Aa(m);var r=e[m];if(r){r.m();delete e[m]}};d.md=function(){var m=[],r;if(e){for(var p in e)if(e.hasOwnProperty(p)){r=
-e[p];m.push(r.qd);r.m()}e={}}return m};return d}();f.supportsVML=f.zc;f.attach=function(a){f.Ba<10&&f.zc&&f.kb.yd(a).Ed()};f.detach=function(a){f.kb.m(a)}};
-var $=element;function init(){var a=window.PIE;a&&doc.media!=="print"&&a.attach($)}function cleanup(){var a=window.PIE;if(a){a.detach($);$=0}}$.readyState==="complete"&&init();
-</script>
-</PUBLIC:COMPONENT>
diff --git a/templates/tour/pie/PIE.js b/templates/tour/pie/PIE.js
deleted file mode 100644
index 8db5933314a..00000000000
--- a/templates/tour/pie/PIE.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-PIE: CSS3 rendering for IE
-Version 1.0beta5
-http://css3pie.com
-Dual-licensed for use under the Apache License Version 2.0 or the General Public License (GPL) Version 2.
-*/
-(function(){
-var doc = document;var f=window.PIE;
-if(!f){f=window.PIE={Q:"-pie-",nb:"Pie",La:"pie_",Ac:{TD:1,TH:1},cc:{TABLE:1,THEAD:1,TBODY:1,TFOOT:1,TR:1,INPUT:1,TEXTAREA:1,SELECT:1,OPTION:1,IMG:1,HR:1},fc:{A:1,INPUT:1,TEXTAREA:1,SELECT:1,BUTTON:1},Gd:{submit:1,button:1,reset:1},aa:function(){}};try{doc.execCommand("BackgroundImageCache",false,true)}catch(aa){}for(var X=4,Y=doc.createElement("div"),ca=Y.getElementsByTagName("i"),Z;Y.innerHTML="<!--[if gt IE "+ ++X+"]><i></i><![endif]--\>",ca[0];);f.V=X;if(X===6)f.Q=f.Q.replace(/^-/,"");f.Ba=doc.documentMode||
-f.V;Y.innerHTML='<v:shape adj="1"/>';Z=Y.firstChild;Z.style.behavior="url(#default#VML)";f.zc=typeof Z.adj==="object";(function(){var a,b=0,c={};f.p={Za:function(d){if(!a){a=doc.createDocumentFragment();a.namespaces.add("css3vml","urn:schemas-microsoft-com:vml")}return a.createElement("css3vml:"+d)},Aa:function(d){return d&&d._pieId||(d._pieId="_"+ ++b)},Eb:function(d){var e,g,i,j,h=arguments;e=1;for(g=h.length;e<g;e++){j=h[e];for(i in j)if(j.hasOwnProperty(i))d[i]=j[i]}return d},Rb:function(d,e,
-g){var i=c[d],j,h;if(i)Object.prototype.toString.call(i)==="[object Array]"?i.push([e,g]):e.call(g,i);else{h=c[d]=[[e,g]];j=new Image;j.onload=function(){i=c[d]={i:j.width,f:j.height};for(var k=0,n=h.length;k<n;k++)h[k][0].call(h[k][1],i);j.onload=null};j.src=d}}}})();f.Na={gc:function(a,b,c,d){function e(){k=i>=90&&i<270?b:0;n=i<180?c:0;l=b-k;q=c-n}function g(){for(;i<0;)i+=360;i%=360}var i=d.ra;d=d.zb;var j,h,k,n,l,q,s,m;if(d){d=d.coords(a,b,c);j=d.x;h=d.y}if(i){i=i.jd();g();e();if(!d){j=k;h=n}d=
-f.Na.tc(j,h,i,l,q);a=d[0];d=d[1]}else if(d){a=b-j;d=c-h}else{j=h=a=0;d=c}s=a-j;m=d-h;if(i===void 0){i=!s?m<0?90:270:!m?s<0?180:0:-Math.atan2(m,s)/Math.PI*180;g();e()}return{ra:i,xc:j,yc:h,td:a,ud:d,Vd:k,Wd:n,rd:l,sd:q,kd:s,ld:m,rc:f.Na.dc(j,h,a,d)}},tc:function(a,b,c,d,e){if(c===0||c===180)return[d,b];else if(c===90||c===270)return[a,e];else{c=Math.tan(-c*Math.PI/180);a=c*a-b;b=-1/c;d=b*d-e;e=b-c;return[(d-a)/e,(c*d-b*a)/e]}},dc:function(a,b,c,d){a=c-a;b=d-b;return Math.abs(a===0?b:b===0?a:Math.sqrt(a*
-a+b*b))}};f.ea=function(){this.Gb=[];this.oc={}};f.ea.prototype={ba:function(a){var b=f.p.Aa(a),c=this.oc,d=this.Gb;if(!(b in c)){c[b]=d.length;d.push(a)}},Ha:function(a){a=f.p.Aa(a);var b=this.oc;if(a&&a in b){delete this.Gb[b[a]];delete b[a]}},wa:function(){for(var a=this.Gb,b=a.length;b--;)a[b]&&a[b]()}};f.Oa=new f.ea;f.Oa.Qd=function(){var a=this;if(!a.Rd){setInterval(function(){a.wa()},250);a.Rd=1}};(function(){function a(){f.K.wa();window.detachEvent("onunload",a);window.PIE=null}f.K=new f.ea;
-window.attachEvent("onunload",a);f.K.sa=function(b,c,d){b.attachEvent(c,d);this.ba(function(){b.detachEvent(c,d)})}})();f.Qa=new f.ea;f.K.sa(window,"onresize",function(){f.Qa.wa()});(function(){function a(){f.mb.wa()}f.mb=new f.ea;f.K.sa(window,"onscroll",a);f.Qa.ba(a)})();(function(){function a(){c=f.kb.md()}function b(){if(c){for(var d=0,e=c.length;d<e;d++)f.attach(c[d]);c=0}}var c;f.K.sa(window,"onbeforeprint",a);f.K.sa(window,"onafterprint",b)})();f.lb=new f.ea;f.K.sa(doc,"onmouseup",function(){f.lb.wa()});
-f.ge=function(){function a(h){this.Y=h}var b=doc.createElement("length-calc"),c=doc.documentElement,d=b.style,e={},g=["mm","cm","in","pt","pc"],i=g.length,j={};d.position="absolute";d.top=d.left="-9999px";for(c.appendChild(b);i--;){b.style.width="100"+g[i];e[g[i]]=b.offsetWidth/100}c.removeChild(b);b.style.width="1em";a.prototype={Kb:/(px|em|ex|mm|cm|in|pt|pc|%)$/,ic:function(){var h=this.Id;if(h===void 0)h=this.Id=parseFloat(this.Y);return h},yb:function(){var h=this.$d;if(!h)h=this.$d=(h=this.Y.match(this.Kb))&&
-h[0]||"px";return h},a:function(h,k){var n=this.ic(),l=this.yb();switch(l){case "px":return n;case "%":return n*(typeof k==="function"?k():k)/100;case "em":return n*this.xb(h);case "ex":return n*this.xb(h)/2;default:return n*e[l]}},xb:function(h){var k=h.currentStyle.fontSize,n,l;if(k.indexOf("px")>0)return parseFloat(k);else if(h.tagName in f.cc){l=this;n=h.parentNode;return f.n(k).a(n,function(){return l.xb(n)})}else{h.appendChild(b);k=b.offsetWidth;b.parentNode===h&&h.removeChild(b);return k}}};
-f.n=function(h){return j[h]||(j[h]=new a(h))};return a}();f.Ja=function(){function a(e){this.X=e}var b=f.n("50%"),c={top:1,center:1,bottom:1},d={left:1,center:1,right:1};a.prototype={zd:function(){if(!this.ac){var e=this.X,g=e.length,i=f.v,j=i.pa,h=f.n("0");j=j.ma;h=["left",h,"top",h];if(g===1){e.push(new i.ob(j,"center"));g++}if(g===2){j&(e[0].k|e[1].k)&&e[0].d in c&&e[1].d in d&&e.push(e.shift());if(e[0].k&j)if(e[0].d==="center")h[1]=b;else h[0]=e[0].d;else if(e[0].W())h[1]=f.n(e[0].d);if(e[1].k&
-j)if(e[1].d==="center")h[3]=b;else h[2]=e[1].d;else if(e[1].W())h[3]=f.n(e[1].d)}this.ac=h}return this.ac},coords:function(e,g,i){var j=this.zd(),h=j[1].a(e,g);e=j[3].a(e,i);return{x:j[0]==="right"?g-h:h,y:j[2]==="bottom"?i-e:e}}};return a}();f.Ka=function(){function a(b,c){this.i=b;this.f=c}a.prototype={a:function(b,c,d,e,g){var i=this.i,j=this.f,h=c/d;e=e/g;if(i==="contain"){i=e>h?c:d*e;j=e>h?c/e:d}else if(i==="cover"){i=e<h?c:d*e;j=e<h?c/e:d}else if(i==="auto"){j=j==="auto"?g:j.a(b,d);i=j*e}else{i=
-i.a(b,c);j=j==="auto"?i/e:j.a(b,d)}return{i:i,f:j}}};a.Kc=new a("auto","auto");return a}();f.Ec=function(){function a(b){this.Y=b}a.prototype={Kb:/[a-z]+$/i,yb:function(){return this.ad||(this.ad=this.Y.match(this.Kb)[0].toLowerCase())},jd:function(){var b=this.Vc,c;if(b===undefined){b=this.yb();c=parseFloat(this.Y,10);b=this.Vc=b==="deg"?c:b==="rad"?c/Math.PI*180:b==="grad"?c/400*360:b==="turn"?c*360:0}return b}};return a}();f.Jc=function(){function a(c){this.Y=c}var b={};a.Pd=/\s*rgba\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d+|\d*\.\d+)\s*\)\s*/;
-a.Fb={aliceblue:"F0F8FF",antiquewhite:"FAEBD7",aqua:"0FF",aquamarine:"7FFFD4",azure:"F0FFFF",beige:"F5F5DC",bisque:"FFE4C4",black:"000",blanchedalmond:"FFEBCD",blue:"00F",blueviolet:"8A2BE2",brown:"A52A2A",burlywood:"DEB887",cadetblue:"5F9EA0",chartreuse:"7FFF00",chocolate:"D2691E",coral:"FF7F50",cornflowerblue:"6495ED",cornsilk:"FFF8DC",crimson:"DC143C",cyan:"0FF",darkblue:"00008B",darkcyan:"008B8B",darkgoldenrod:"B8860B",darkgray:"A9A9A9",darkgreen:"006400",darkkhaki:"BDB76B",darkmagenta:"8B008B",
-darkolivegreen:"556B2F",darkorange:"FF8C00",darkorchid:"9932CC",darkred:"8B0000",darksalmon:"E9967A",darkseagreen:"8FBC8F",darkslateblue:"483D8B",darkslategray:"2F4F4F",darkturquoise:"00CED1",darkviolet:"9400D3",deeppink:"FF1493",deepskyblue:"00BFFF",dimgray:"696969",dodgerblue:"1E90FF",firebrick:"B22222",floralwhite:"FFFAF0",forestgreen:"228B22",fuchsia:"F0F",gainsboro:"DCDCDC",ghostwhite:"F8F8FF",gold:"FFD700",goldenrod:"DAA520",gray:"808080",green:"008000",greenyellow:"ADFF2F",honeydew:"F0FFF0",
-hotpink:"FF69B4",indianred:"CD5C5C",indigo:"4B0082",ivory:"FFFFF0",khaki:"F0E68C",lavender:"E6E6FA",lavenderblush:"FFF0F5",lawngreen:"7CFC00",lemonchiffon:"FFFACD",lightblue:"ADD8E6",lightcoral:"F08080",lightcyan:"E0FFFF",lightgoldenrodyellow:"FAFAD2",lightgreen:"90EE90",lightgrey:"D3D3D3",lightpink:"FFB6C1",lightsalmon:"FFA07A",lightseagreen:"20B2AA",lightskyblue:"87CEFA",lightslategray:"789",lightsteelblue:"B0C4DE",lightyellow:"FFFFE0",lime:"0F0",limegreen:"32CD32",linen:"FAF0E6",magenta:"F0F",
-maroon:"800000",mediumauqamarine:"66CDAA",mediumblue:"0000CD",mediumorchid:"BA55D3",mediumpurple:"9370D8",mediumseagreen:"3CB371",mediumslateblue:"7B68EE",mediumspringgreen:"00FA9A",mediumturquoise:"48D1CC",mediumvioletred:"C71585",midnightblue:"191970",mintcream:"F5FFFA",mistyrose:"FFE4E1",moccasin:"FFE4B5",navajowhite:"FFDEAD",navy:"000080",oldlace:"FDF5E6",olive:"808000",olivedrab:"688E23",orange:"FFA500",orangered:"FF4500",orchid:"DA70D6",palegoldenrod:"EEE8AA",palegreen:"98FB98",paleturquoise:"AFEEEE",
-palevioletred:"D87093",papayawhip:"FFEFD5",peachpuff:"FFDAB9",peru:"CD853F",pink:"FFC0CB",plum:"DDA0DD",powderblue:"B0E0E6",purple:"800080",red:"F00",rosybrown:"BC8F8F",royalblue:"4169E1",saddlebrown:"8B4513",salmon:"FA8072",sandybrown:"F4A460",seagreen:"2E8B57",seashell:"FFF5EE",sienna:"A0522D",silver:"C0C0C0",skyblue:"87CEEB",slateblue:"6A5ACD",slategray:"708090",snow:"FFFAFA",springgreen:"00FF7F",steelblue:"4682B4",tan:"D2B48C",teal:"008080",thistle:"D8BFD8",tomato:"FF6347",turquoise:"40E0D0",
-violet:"EE82EE",wheat:"F5DEB3",white:"FFF",whitesmoke:"F5F5F5",yellow:"FF0",yellowgreen:"9ACD32"};a.prototype={parse:function(){if(!this.Ua){var c=this.Y,d;if(d=c.match(a.Pd)){this.Ua="rgb("+d[1]+","+d[2]+","+d[3]+")";this.Yb=parseFloat(d[4])}else{if((d=c.toLowerCase())in a.Fb)c="#"+a.Fb[d];this.Ua=c;this.Yb=c==="transparent"?0:1}}},T:function(c){this.parse();return this.Ua==="currentColor"?c.currentStyle.color:this.Ua},fa:function(){this.parse();return this.Yb}};f.ha=function(c){return b[c]||(b[c]=
-new a(c))};return a}();f.v=function(){function a(c){this.$a=c;this.ch=0;this.X=[];this.Ga=0}var b=a.pa={Ia:1,Wb:2,B:4,Lc:8,Xb:16,ma:32,J:64,na:128,oa:256,Ra:512,Tc:1024,URL:2048};a.ob=function(c,d){this.k=c;this.d=d};a.ob.prototype={Ca:function(){return this.k&b.J||this.k&b.na&&this.d==="0"},W:function(){return this.Ca()||this.k&b.Ra}};a.prototype={ce:/\s/,Jd:/^[\+\-]?(\d*\.)?\d+/,url:/^url\(\s*("([^"]*)"|'([^']*)'|([!#$%&*-~]*))\s*\)/i,nc:/^\-?[_a-z][\w-]*/i,Xd:/^("([^"]*)"|'([^']*)')/,Bd:/^#([\da-f]{6}|[\da-f]{3})/i,
-ae:{px:b.J,em:b.J,ex:b.J,mm:b.J,cm:b.J,"in":b.J,pt:b.J,pc:b.J,deg:b.Ia,rad:b.Ia,grad:b.Ia},fd:{rgb:1,rgba:1,hsl:1,hsla:1},next:function(c){function d(q,s){q=new a.ob(q,s);if(!c){k.X.push(q);k.Ga++}return q}function e(){k.Ga++;return null}var g,i,j,h,k=this;if(this.Ga<this.X.length)return this.X[this.Ga++];for(;this.ce.test(this.$a.charAt(this.ch));)this.ch++;if(this.ch>=this.$a.length)return e();i=this.ch;g=this.$a.substring(this.ch);j=g.charAt(0);switch(j){case "#":if(h=g.match(this.Bd)){this.ch+=
-h[0].length;return d(b.B,h[0])}break;case '"':case "'":if(h=g.match(this.Xd)){this.ch+=h[0].length;return d(b.Tc,h[2]||h[3]||"")}break;case "/":case ",":this.ch++;return d(b.oa,j);case "u":if(h=g.match(this.url)){this.ch+=h[0].length;return d(b.URL,h[2]||h[3]||h[4]||"")}}if(h=g.match(this.Jd)){j=h[0];this.ch+=j.length;if(g.charAt(j.length)==="%"){this.ch++;return d(b.Ra,j+"%")}if(h=g.substring(j.length).match(this.nc)){j+=h[0];this.ch+=h[0].length;return d(this.ae[h[0].toLowerCase()]||b.Lc,j)}return d(b.na,
-j)}if(h=g.match(this.nc)){j=h[0];this.ch+=j.length;if(j.toLowerCase()in f.Jc.Fb||j==="currentColor"||j==="transparent")return d(b.B,j);if(g.charAt(j.length)==="("){this.ch++;if(j.toLowerCase()in this.fd){g=function(q){return q&&q.k&b.na};h=function(q){return q&&q.k&(b.na|b.Ra)};var n=function(q,s){return q&&q.d===s},l=function(){return k.next(1)};if((j.charAt(0)==="r"?h(l()):g(l()))&&n(l(),",")&&h(l())&&n(l(),",")&&h(l())&&(j==="rgb"||j==="hsa"||n(l(),",")&&g(l()))&&n(l(),")"))return d(b.B,this.$a.substring(i,
-this.ch));return e()}return d(b.Xb,j)}return d(b.ma,j)}this.ch++;return d(b.Wb,j)},D:function(){return this.X[this.Ga-- -2]},all:function(){for(;this.next(););return this.X},la:function(c,d){for(var e=[],g,i;g=this.next();){if(c(g)){i=true;this.D();break}e.push(g)}return d&&!i?null:e}};return a}();var da=function(a){this.e=a};da.prototype={Z:0,Nd:function(){var a=this.qb,b;return!a||(b=this.o())&&(a.x!==b.x||a.y!==b.y)},Sd:function(){var a=this.qb,b;return!a||(b=this.o())&&(a.i!==b.i||a.f!==b.f)},
-hc:function(){var a=this.e,b=a.getBoundingClientRect(),c=f.Ba===9;return{x:b.left,y:b.top,i:c?a.offsetWidth:b.right-b.left,f:c?a.offsetHeight:b.bottom-b.top}},o:function(){return this.Z?this.Va||(this.Va=this.hc()):this.hc()},Ad:function(){return!!this.qb},cb:function(){++this.Z},hb:function(){if(!--this.Z){if(this.Va)this.qb=this.Va;this.Va=null}}};(function(){function a(b){var c=f.p.Aa(b);return function(){if(this.Z){var d=this.$b||(this.$b={});return c in d?d[c]:(d[c]=b.call(this))}else return b.call(this)}}
-f.C={Z:0,ja:function(b){function c(d){this.e=d;this.Zb=this.ia()}f.p.Eb(c.prototype,f.C,b);c.$c={};return c},j:function(){var b=this.ia(),c=this.constructor.$c;return b?b in c?c[b]:(c[b]=this.ka(b)):null},ia:a(function(){var b=this.e,c=this.constructor,d=b.style;b=b.currentStyle;var e=this.va,g=this.Fa,i=c.Yc||(c.Yc=f.Q+e);c=c.Zc||(c.Zc=f.nb+g.charAt(0).toUpperCase()+g.substring(1));return d[c]||b.getAttribute(i)||d[g]||b.getAttribute(e)}),h:a(function(){return!!this.j()}),G:a(function(){var b=this.ia(),
-c=b!==this.Zb;this.Zb=b;return c}),ua:a,cb:function(){++this.Z},hb:function(){--this.Z||delete this.$b}}})();f.Sb=f.C.ja({va:f.Q+"background",Fa:f.nb+"Background",cd:{scroll:1,fixed:1,local:1},fb:{"repeat-x":1,"repeat-y":1,repeat:1,"no-repeat":1},sc:{"padding-box":1,"border-box":1,"content-box":1},Od:{top:1,right:1,bottom:1,left:1,center:1},Td:{contain:1,cover:1},eb:{Ma:"backgroundClip",B:"backgroundColor",da:"backgroundImage",Pa:"backgroundOrigin",R:"backgroundPosition",S:"backgroundRepeat",Sa:"backgroundSize"},
-ka:function(a){function b(v){return v&&v.W()||v.k&k&&v.d in m}function c(v){return v&&(v.W()&&f.n(v.d)||v.d==="auto"&&"auto")}var d=this.e.currentStyle,e,g,i,j=f.v.pa,h=j.oa,k=j.ma,n=j.B,l,q,s=0,m=this.Od,r,p,t={L:[]};if(this.wb()){e=new f.v(a);for(i={};g=e.next();){l=g.k;q=g.d;if(!i.N&&l&j.Xb&&q==="linear-gradient"){r={ca:[],N:q};for(p={};g=e.next();){l=g.k;q=g.d;if(l&j.Wb&&q===")"){p.color&&r.ca.push(p);r.ca.length>1&&f.p.Eb(i,r);break}if(l&n){if(r.ra||r.zb){g=e.D();if(g.k!==h)break;e.next()}p=
-{color:f.ha(q)};g=e.next();if(g.W())p.db=f.n(g.d);else e.D()}else if(l&j.Ia&&!r.ra&&!p.color&&!r.ca.length)r.ra=new f.Ec(g.d);else if(b(g)&&!r.zb&&!p.color&&!r.ca.length){e.D();r.zb=new f.Ja(e.la(function(v){return!b(v)},false))}else if(l&h&&q===","){if(p.color){r.ca.push(p);p={}}}else break}}else if(!i.N&&l&j.URL){i.Ab=q;i.N="image"}else if(b(g)&&!i.$){e.D();i.$=new f.Ja(e.la(function(v){return!b(v)},false))}else if(l&k)if(q in this.fb&&!i.bb)i.bb=q;else if(q in this.sc&&!i.Wa){i.Wa=q;if((g=e.next())&&
-g.k&k&&g.d in this.sc)i.ub=g.d;else{i.ub=q;e.D()}}else if(q in this.cd&&!i.bc)i.bc=q;else return null;else if(l&n&&!t.color)t.color=f.ha(q);else if(l&h&&q==="/"&&!i.Xa&&i.$){g=e.next();if(g.k&k&&g.d in this.Td)i.Xa=new f.Ka(g.d);else if(g=c(g)){l=c(e.next());if(!l){l=g;e.D()}i.Xa=new f.Ka(g,l)}else return null}else if(l&h&&q===","&&i.N){i.Hb=a.substring(s,e.ch-1);s=e.ch;t.L.push(i);i={}}else return null}if(i.N){i.Hb=a.substring(s);t.L.push(i)}}else this.Bc(f.Ba<9?function(){var v=this.eb,o=d[v.R+
-"X"],u=d[v.R+"Y"],x=d[v.da],y=d[v.B];if(y!=="transparent")t.color=f.ha(y);if(x!=="none")t.L=[{N:"image",Ab:(new f.v(x)).next().d,bb:d[v.S],$:new f.Ja((new f.v(o+" "+u)).all())}]}:function(){var v=this.eb,o=/\s*,\s*/,u=d[v.da].split(o),x=d[v.B],y,z,D,G,E,B;if(x!=="transparent")t.color=f.ha(x);if((G=u.length)&&u[0]!=="none"){x=d[v.S].split(o);y=d[v.R].split(o);z=d[v.Pa].split(o);D=d[v.Ma].split(o);v=d[v.Sa].split(o);t.L=[];for(o=0;o<G;o++)if((E=u[o])&&E!=="none"){B=v[o].split(" ");t.L.push({Hb:E+" "+
-x[o]+" "+y[o]+" / "+v[o]+" "+z[o]+" "+D[o],N:"image",Ab:(new f.v(E)).next().d,bb:x[o],$:new f.Ja((new f.v(y[o])).all()),Wa:z[o],ub:D[o],Xa:new f.Ka(B[0],B[1])})}}});return t.color||t.L[0]?t:null},Bc:function(a){var b=f.Ba>8,c=this.eb,d=this.e.runtimeStyle,e=d[c.da],g=d[c.B],i=d[c.S],j,h,k,n;if(e)d[c.da]="";if(g)d[c.B]="";if(i)d[c.S]="";if(b){j=d[c.Ma];h=d[c.Pa];n=d[c.R];k=d[c.Sa];if(j)d[c.Ma]="";if(h)d[c.Pa]="";if(n)d[c.R]="";if(k)d[c.Sa]=""}a=a.call(this);if(e)d[c.da]=e;if(g)d[c.B]=g;if(i)d[c.S]=
-i;if(b){if(j)d[c.Ma]=j;if(h)d[c.Pa]=h;if(n)d[c.R]=n;if(k)d[c.Sa]=k}return a},ia:f.C.ua(function(){return this.wb()||this.Bc(function(){var a=this.e.currentStyle,b=this.eb;return a[b.B]+" "+a[b.da]+" "+a[b.S]+" "+a[b.R+"X"]+" "+a[b.R+"Y"]})}),wb:f.C.ua(function(){var a=this.e;return a.style[this.Fa]||a.currentStyle.getAttribute(this.va)}),qc:function(){var a=0;if(f.V<7){a=this.e;a=""+(a.style[f.nb+"PngFix"]||a.currentStyle.getAttribute(f.Q+"png-fix"))==="true"}return a},h:f.C.ua(function(){return(this.wb()||
-this.qc())&&!!this.j()})});f.Vb=f.C.ja({wc:["Top","Right","Bottom","Left"],Hd:{thin:"1px",medium:"3px",thick:"5px"},ka:function(){var a={},b={},c={},d=false,e=true,g=true,i=true;this.Cc(function(){for(var j=this.e.currentStyle,h=0,k,n,l,q,s,m,r;h<4;h++){l=this.wc[h];r=l.charAt(0).toLowerCase();k=b[r]=j["border"+l+"Style"];n=j["border"+l+"Color"];l=j["border"+l+"Width"];if(h>0){if(k!==q)g=false;if(n!==s)e=false;if(l!==m)i=false}q=k;s=n;m=l;c[r]=f.ha(n);l=a[r]=f.n(b[r]==="none"?"0":this.Hd[l]||l);if(l.a(this.e)>
-0)d=true}});return d?{I:a,Yd:b,gd:c,de:i,hd:e,Zd:g}:null},ia:f.C.ua(function(){var a=this.e,b=a.currentStyle,c;a.tagName in f.Ac&&a.offsetParent.currentStyle.borderCollapse==="collapse"||this.Cc(function(){c=b.borderWidth+"|"+b.borderStyle+"|"+b.borderColor});return c}),Cc:function(a){var b=this.e.runtimeStyle,c=b.borderWidth,d=b.borderColor;if(c)b.borderWidth="";if(d)b.borderColor="";a=a.call(this);if(c)b.borderWidth=c;if(d)b.borderColor=d;return a}});(function(){f.jb=f.C.ja({va:"border-radius",
-Fa:"borderRadius",ka:function(b){var c=null,d,e,g,i,j=false;if(b){e=new f.v(b);var h=function(){for(var k=[],n;(g=e.next())&&g.W();){i=f.n(g.d);n=i.ic();if(n<0)return null;if(n>0)j=true;k.push(i)}return k.length>0&&k.length<5?{tl:k[0],tr:k[1]||k[0],br:k[2]||k[0],bl:k[3]||k[1]||k[0]}:null};if(b=h()){if(g){if(g.k&f.v.pa.oa&&g.d==="/")d=h()}else d=b;if(j&&b&&d)c={x:b,y:d}}}return c}});var a=f.n("0");a={tl:a,tr:a,br:a,bl:a};f.jb.Dc={x:a,y:a}})();f.Ub=f.C.ja({va:"border-image",Fa:"borderImage",fb:{stretch:1,
-round:1,repeat:1,space:1},ka:function(a){var b=null,c,d,e,g,i,j,h=0,k=f.v.pa,n=k.ma,l=k.na,q=k.Ra;if(a){c=new f.v(a);b={};for(var s=function(p){return p&&p.k&k.oa&&p.d==="/"},m=function(p){return p&&p.k&n&&p.d==="fill"},r=function(){g=c.la(function(p){return!(p.k&(l|q))});if(m(c.next())&&!b.fill)b.fill=true;else c.D();if(s(c.next())){h++;i=c.la(function(p){return!p.W()&&!(p.k&n&&p.d==="auto")});if(s(c.next())){h++;j=c.la(function(p){return!p.Ca()})}}else c.D()};a=c.next();){d=a.k;e=a.d;if(d&(l|q)&&
-!g){c.D();r()}else if(m(a)&&!b.fill){b.fill=true;r()}else if(d&n&&this.fb[e]&&!b.repeat){b.repeat={f:e};if(a=c.next())if(a.k&n&&this.fb[a.d])b.repeat.Ob=a.d;else c.D()}else if(d&k.URL&&!b.src)b.src=e;else return null}if(!b.src||!g||g.length<1||g.length>4||i&&i.length>4||h===1&&i.length<1||j&&j.length>4||h===2&&j.length<1)return null;if(!b.repeat)b.repeat={f:"stretch"};if(!b.repeat.Ob)b.repeat.Ob=b.repeat.f;a=function(p,t){return{t:t(p[0]),r:t(p[1]||p[0]),b:t(p[2]||p[0]),l:t(p[3]||p[1]||p[0])}};b.slice=
-a(g,function(p){return f.n(p.k&l?p.d+"px":p.d)});if(i&&i[0])b.I=a(i,function(p){return p.W()?f.n(p.d):p.d});if(j&&j[0])b.Da=a(j,function(p){return p.Ca()?f.n(p.d):p.d})}return b}});f.Ic=f.C.ja({va:"box-shadow",Fa:"boxShadow",ka:function(a){var b,c=f.n,d=f.v.pa,e;if(a){e=new f.v(a);b={Da:[],Bb:[]};for(a=function(){for(var g,i,j,h,k,n;g=e.next();){j=g.d;i=g.k;if(i&d.oa&&j===",")break;else if(g.Ca()&&!k){e.D();k=e.la(function(l){return!l.Ca()})}else if(i&d.B&&!h)h=j;else if(i&d.ma&&j==="inset"&&!n)n=
-true;else return false}g=k&&k.length;if(g>1&&g<5){(n?b.Bb:b.Da).push({ee:c(k[0].d),fe:c(k[1].d),blur:c(k[2]?k[2].d:"0"),Ud:c(k[3]?k[3].d:"0"),color:f.ha(h||"currentColor")});return true}return false};a(););}return b&&(b.Bb.length||b.Da.length)?b:null}});f.Uc=f.C.ja({ia:f.C.ua(function(){var a=this.e.currentStyle;return a.visibility+"|"+a.display}),ka:function(){var a=this.e,b=a.runtimeStyle;a=a.currentStyle;var c=b.visibility,d;b.visibility="";d=a.visibility;b.visibility=c;return{be:d!=="hidden",
-nd:a.display!=="none"}},h:function(){return false}});f.u={P:function(a){function b(c,d,e,g){this.e=c;this.s=d;this.g=e;this.parent=g}f.p.Eb(b.prototype,f.u,a);return b},Cb:false,O:function(){return false},Ea:f.aa,Lb:function(){this.m();this.h()&&this.U()},ib:function(){this.Cb=true},Mb:function(){this.h()?this.U():this.m()},sb:function(a,b){this.vc(a);for(var c=this.qa||(this.qa=[]),d=a+1,e=c.length,g;d<e;d++)if(g=c[d])break;c[a]=b;this.H().insertBefore(b,g||null)},ya:function(a){var b=this.qa;return b&&
-b[a]||null},vc:function(a){var b=this.ya(a),c=this.Ta;if(b&&c){c.removeChild(b);this.qa[a]=null}},za:function(a,b,c,d){var e=this.rb||(this.rb={}),g=e[a];if(!g){g=e[a]=f.p.Za("shape");if(b)g.appendChild(g[b]=f.p.Za(b));if(d){c=this.ya(d);if(!c){this.sb(d,doc.createElement("group"+d));c=this.ya(d)}}c.appendChild(g);a=g.style;a.position="absolute";a.left=a.top=0;a.behavior="url(#default#VML)"}return g},vb:function(a){var b=this.rb,c=b&&b[a];if(c){c.parentNode.removeChild(c);delete b[a]}return!!c},kc:function(a){var b=
-this.e,c=this.s.o(),d=c.i,e=c.f,g,i,j,h,k,n;c=a.x.tl.a(b,d);g=a.y.tl.a(b,e);i=a.x.tr.a(b,d);j=a.y.tr.a(b,e);h=a.x.br.a(b,d);k=a.y.br.a(b,e);n=a.x.bl.a(b,d);a=a.y.bl.a(b,e);d=Math.min(d/(c+i),e/(j+k),d/(n+h),e/(g+a));if(d<1){c*=d;g*=d;i*=d;j*=d;h*=d;k*=d;n*=d;a*=d}return{x:{tl:c,tr:i,br:h,bl:n},y:{tl:g,tr:j,br:k,bl:a}}},xa:function(a,b,c){b=b||1;var d,e,g=this.s.o();e=g.i*b;g=g.f*b;var i=this.g.F,j=Math.floor,h=Math.ceil,k=a?a.Jb*b:0,n=a?a.Ib*b:0,l=a?a.tb*b:0;a=a?a.Db*b:0;var q,s,m,r,p;if(c||i.h()){d=
-this.kc(c||i.j());c=d.x.tl*b;i=d.y.tl*b;q=d.x.tr*b;s=d.y.tr*b;m=d.x.br*b;r=d.y.br*b;p=d.x.bl*b;b=d.y.bl*b;e="m"+j(a)+","+j(i)+"qy"+j(c)+","+j(k)+"l"+h(e-q)+","+j(k)+"qx"+h(e-n)+","+j(s)+"l"+h(e-n)+","+h(g-r)+"qy"+h(e-m)+","+h(g-l)+"l"+j(p)+","+h(g-l)+"qx"+j(a)+","+h(g-b)+" x e"}else e="m"+j(a)+","+j(k)+"l"+h(e-n)+","+j(k)+"l"+h(e-n)+","+h(g-l)+"l"+j(a)+","+h(g-l)+"xe";return e},H:function(){var a=this.parent.ya(this.M),b;if(!a){a=doc.createElement(this.Ya);b=a.style;b.position="absolute";b.top=b.left=
-0;this.parent.sb(this.M,a)}return a},mc:function(){var a=this.e,b=a.currentStyle,c=a.runtimeStyle,d=a.tagName,e=f.V===6,g;if(e&&(d in f.cc||d==="FIELDSET")||d==="BUTTON"||d==="INPUT"&&a.type in f.Gd){c.borderWidth="";d=this.g.z.wc;for(g=d.length;g--;){e=d[g];c["padding"+e]="";c["padding"+e]=f.n(b["padding"+e]).a(a)+f.n(b["border"+e+"Width"]).a(a)+(f.V!==8&&g%2?1:0)}c.borderWidth=0}else if(e){if(a.childNodes.length!==1||a.firstChild.tagName!=="ie6-mask"){b=doc.createElement("ie6-mask");d=b.style;d.visibility=
-"visible";for(d.zoom=1;d=a.firstChild;)b.appendChild(d);a.appendChild(b);c.visibility="hidden"}}else c.borderColor="transparent"},he:function(){},m:function(){this.parent.vc(this.M);delete this.rb;delete this.qa}};f.Rc=f.u.P({h:function(){var a=this.ed;for(var b in a)if(a.hasOwnProperty(b)&&a[b].h())return true;return false},O:function(){return this.g.Pb.G()},ib:function(){if(this.h()){var a=this.jc(),b=a,c;a=a.currentStyle;var d=a.position,e=this.H().style,g=0,i=0;i=this.s.o();if(d==="fixed"&&f.V>
-6){g=i.x;i=i.y;b=d}else{do b=b.offsetParent;while(b&&b.currentStyle.position==="static");if(b){c=b.getBoundingClientRect();b=b.currentStyle;g=i.x-c.left-(parseFloat(b.borderLeftWidth)||0);i=i.y-c.top-(parseFloat(b.borderTopWidth)||0)}else{b=doc.documentElement;g=i.x+b.scrollLeft-b.clientLeft;i=i.y+b.scrollTop-b.clientTop}b="absolute"}e.position=b;e.left=g;e.top=i;e.zIndex=d==="static"?-1:a.zIndex;this.Cb=true}},Mb:f.aa,Nb:function(){var a=this.g.Pb.j();this.H().style.display=a.be&&a.nd?"":"none"},
-Lb:function(){this.h()?this.Nb():this.m()},jc:function(){var a=this.e;return a.tagName in f.Ac?a.offsetParent:a},H:function(){var a=this.Ta,b;if(!a){b=this.jc();a=this.Ta=doc.createElement("css3-container");a.style.direction="ltr";this.Nb();b.parentNode.insertBefore(a,b)}return a},ab:f.aa,m:function(){var a=this.Ta,b;if(a&&(b=a.parentNode))b.removeChild(a);delete this.Ta;delete this.qa}});f.Fc=f.u.P({M:2,Ya:"background",O:function(){var a=this.g;return a.w.G()||a.F.G()},h:function(){var a=this.g;
-return a.q.h()||a.F.h()||a.w.h()||a.ga.h()&&a.ga.j().Bb},U:function(){var a=this.s.o();if(a.i&&a.f){this.od();this.pd()}},od:function(){var a=this.g.w.j(),b=this.s.o(),c=this.e,d=a&&a.color,e,g;if(d&&d.fa()>0){this.lc();a=this.za("bgColor","fill",this.H(),1);e=b.i;b=b.f;a.stroked=false;a.coordsize=e*2+","+b*2;a.coordorigin="1,1";a.path=this.xa(null,2);g=a.style;g.width=e;g.height=b;a.fill.color=d.T(c);c=d.fa();if(c<1)a.fill.opacity=c}else this.vb("bgColor")},pd:function(){var a=this.g.w.j(),b=this.s.o();
-a=a&&a.L;var c,d,e,g,i;if(a){this.lc();d=b.i;e=b.f;for(i=a.length;i--;){b=a[i];c=this.za("bgImage"+i,"fill",this.H(),2);c.stroked=false;c.fill.type="tile";c.fillcolor="none";c.coordsize=d*2+","+e*2;c.coordorigin="1,1";c.path=this.xa(0,2);g=c.style;g.width=d;g.height=e;if(b.N==="linear-gradient")this.bd(c,b);else{c.fill.src=b.Ab;this.Md(c,i)}}}for(i=a?a.length:0;this.vb("bgImage"+i++););},Md:function(a,b){var c=this;f.p.Rb(a.fill.src,function(d){var e=c.e,g=c.s.o(),i=g.i;g=g.f;if(i&&g){var j=a.fill,
-h=c.g,k=h.z.j(),n=k&&k.I;k=n?n.t.a(e):0;var l=n?n.r.a(e):0,q=n?n.b.a(e):0;n=n?n.l.a(e):0;h=h.w.j().L[b];e=h.$?h.$.coords(e,i-d.i-n-l,g-d.f-k-q):{x:0,y:0};h=h.bb;q=l=0;var s=i+1,m=g+1,r=f.V===8?0:1;n=Math.round(e.x)+n+0.5;k=Math.round(e.y)+k+0.5;j.position=n/i+","+k/g;if(h&&h!=="repeat"){if(h==="repeat-x"||h==="no-repeat"){l=k+1;m=k+d.f+r}if(h==="repeat-y"||h==="no-repeat"){q=n+1;s=n+d.i+r}a.style.clip="rect("+l+"px,"+s+"px,"+m+"px,"+q+"px)"}}})},bd:function(a,b){var c=this.e,d=this.s.o(),e=d.i,g=
-d.f;a=a.fill;d=b.ca;var i=d.length,j=Math.PI,h=f.Na,k=h.tc,n=h.dc;b=h.gc(c,e,g,b);h=b.ra;var l=b.xc,q=b.yc,s=b.Vd,m=b.Wd,r=b.rd,p=b.sd,t=b.kd,v=b.ld;b=b.rc;e=h%90?Math.atan2(t*e/g,v)/j*180:h+90;e+=180;e%=360;r=k(s,m,h,r,p);g=n(s,m,r[0],r[1]);j=[];r=k(l,q,h,s,m);n=n(l,q,r[0],r[1])/g*100;k=[];for(h=0;h<i;h++)k.push(d[h].db?d[h].db.a(c,b):h===0?0:h===i-1?b:null);for(h=1;h<i;h++){if(k[h]===null){l=k[h-1];b=h;do q=k[++b];while(q===null);k[h]=l+(q-l)/(b-h+1)}k[h]=Math.max(k[h],k[h-1])}for(h=0;h<i;h++)j.push(n+
-k[h]/g*100+"% "+d[h].color.T(c));a.angle=e;a.type="gradient";a.method="sigma";a.color=d[0].color.T(c);a.color2=d[i-1].color.T(c);if(a.colors)a.colors.value=j.join(",");else a.colors=j.join(",")},lc:function(){var a=this.e.runtimeStyle;a.backgroundImage="url(about:blank)";a.backgroundColor="transparent"},m:function(){f.u.m.call(this);var a=this.e.runtimeStyle;a.backgroundImage=a.backgroundColor=""}});f.Gc=f.u.P({M:4,Ya:"border",O:function(){var a=this.g;return a.z.G()||a.F.G()},h:function(){var a=
-this.g;return(a.F.h()||a.w.h())&&!a.q.h()&&a.z.h()},U:function(){var a=this.e,b=this.g.z.j(),c=this.s.o(),d=c.i;c=c.f;var e,g,i,j,h;if(b){this.mc();b=this.wd(2);j=0;for(h=b.length;j<h;j++){i=b[j];e=this.za("borderPiece"+j,i.stroke?"stroke":"fill",this.H());e.coordsize=d*2+","+c*2;e.coordorigin="1,1";e.path=i.path;g=e.style;g.width=d;g.height=c;e.filled=!!i.fill;e.stroked=!!i.stroke;if(i.stroke){e=e.stroke;e.weight=i.Qb+"px";e.color=i.color.T(a);e.dashstyle=i.stroke==="dashed"?"2 2":i.stroke==="dotted"?
-"1 1":"solid";e.linestyle=i.stroke==="double"&&i.Qb>2?"ThinThin":"Single"}else e.fill.color=i.fill.T(a)}for(;this.vb("borderPiece"+j++););}},wd:function(a){var b=this.e,c,d,e,g=this.g.z,i=[],j,h,k,n,l=Math.round,q,s,m;if(g.h()){c=g.j();g=c.I;s=c.Yd;m=c.gd;if(c.de&&c.Zd&&c.hd){if(m.t.fa()>0){c=g.t.a(b);k=c/2;i.push({path:this.xa({Jb:k,Ib:k,tb:k,Db:k},a),stroke:s.t,color:m.t,Qb:c})}}else{a=a||1;c=this.s.o();d=c.i;e=c.f;c=l(g.t.a(b));k=l(g.r.a(b));n=l(g.b.a(b));b=l(g.l.a(b));var r={t:c,r:k,b:n,l:b};
-b=this.g.F;if(b.h())q=this.kc(b.j());j=Math.floor;h=Math.ceil;var p=function(o,u){return q?q[o][u]:0},t=function(o,u,x,y,z,D){var G=p("x",o),E=p("y",o),B=o.charAt(1)==="r";o=o.charAt(0)==="b";return G>0&&E>0?(D?"al":"ae")+(B?h(d-G):j(G))*a+","+(o?h(e-E):j(E))*a+","+(j(G)-u)*a+","+(j(E)-x)*a+","+y*65535+","+2949075*(z?1:-1):(D?"m":"l")+(B?d-u:u)*a+","+(o?e-x:x)*a},v=function(o,u,x,y){var z=o==="t"?j(p("x","tl"))*a+","+h(u)*a:o==="r"?h(d-u)*a+","+j(p("y","tr"))*a:o==="b"?h(d-p("x","br"))*a+","+j(e-
-u)*a:j(u)*a+","+h(e-p("y","bl"))*a;o=o==="t"?h(d-p("x","tr"))*a+","+h(u)*a:o==="r"?h(d-u)*a+","+h(e-p("y","br"))*a:o==="b"?j(p("x","bl"))*a+","+j(e-u)*a:j(u)*a+","+j(p("y","tl"))*a;return x?(y?"m"+o:"")+"l"+z:(y?"m"+z:"")+"l"+o};b=function(o,u,x,y,z,D){var G=o==="l"||o==="r",E=r[o],B,A;if(E>0&&s[o]!=="none"&&m[o].fa()>0){B=r[G?o:u];u=r[G?u:o];A=r[G?o:x];x=r[G?x:o];if(s[o]==="dashed"||s[o]==="dotted"){i.push({path:t(y,B,u,D+45,0,1)+t(y,0,0,D,1,0),fill:m[o]});i.push({path:v(o,E/2,0,1),stroke:s[o],Qb:E,
-color:m[o]});i.push({path:t(z,A,x,D,0,1)+t(z,0,0,D-45,1,0),fill:m[o]})}else i.push({path:t(y,B,u,D+45,0,1)+v(o,E,0,0)+t(z,A,x,D,0,0)+(s[o]==="double"&&E>2?t(z,A-j(A/3),x-j(x/3),D-45,1,0)+v(o,h(E/3*2),1,0)+t(y,B-j(B/3),u-j(u/3),D,1,0)+"x "+t(y,j(B/3),j(u/3),D+45,0,1)+v(o,j(E/3),1,0)+t(z,j(A/3),j(x/3),D,0,0):"")+t(z,0,0,D-45,1,0)+v(o,0,1,0)+t(y,0,0,D,1,0),fill:m[o]})}};b("t","l","r","tl","tr",90);b("r","t","b","tr","br",0);b("b","r","l","br","bl",-90);b("l","b","t","bl","tl",-180)}}return i},m:function(){if(this.ec||
-!this.g.q.h())this.e.runtimeStyle.borderColor="";f.u.m.call(this)}});f.Tb=f.u.P({M:5,Ld:["t","tr","r","br","b","bl","l","tl","c"],O:function(){return this.g.q.G()},h:function(){return this.g.q.h()},U:function(){this.H();var a=this.g.q.j(),b=this.g.z.j(),c=this.s.o(),d=this.e,e=this.uc;f.p.Rb(a.src,function(g){function i(v,o,u,x,y){v=e[v].style;var z=Math.max;v.width=z(o,0);v.height=z(u,0);v.left=x;v.top=y}function j(v,o,u){for(var x=0,y=v.length;x<y;x++)e[v[x]].imagedata[o]=u}var h=c.i,k=c.f,n=f.n("0"),
-l=a.I||(b?b.I:{t:n,r:n,b:n,l:n});n=l.t.a(d);var q=l.r.a(d),s=l.b.a(d);l=l.l.a(d);var m=a.slice,r=m.t.a(d),p=m.r.a(d),t=m.b.a(d);m=m.l.a(d);i("tl",l,n,0,0);i("t",h-l-q,n,l,0);i("tr",q,n,h-q,0);i("r",q,k-n-s,h-q,n);i("br",q,s,h-q,k-s);i("b",h-l-q,s,l,k-s);i("bl",l,s,0,k-s);i("l",l,k-n-s,0,n);i("c",h-l-q,k-n-s,l,n);j(["tl","t","tr"],"cropBottom",(g.f-r)/g.f);j(["tl","l","bl"],"cropRight",(g.i-m)/g.i);j(["bl","b","br"],"cropTop",(g.f-t)/g.f);j(["tr","r","br"],"cropLeft",(g.i-p)/g.i);j(["l","r","c"],"cropTop",
-r/g.f);j(["l","r","c"],"cropBottom",t/g.f);j(["t","b","c"],"cropLeft",m/g.i);j(["t","b","c"],"cropRight",p/g.i);e.c.style.display=a.fill?"":"none"},this)},H:function(){var a=this.parent.ya(this.M),b,c,d,e=this.Ld,g=e.length;if(!a){a=doc.createElement("border-image");b=a.style;b.position="absolute";this.uc={};for(d=0;d<g;d++){c=this.uc[e[d]]=f.p.Za("rect");c.appendChild(f.p.Za("imagedata"));b=c.style;b.behavior="url(#default#VML)";b.position="absolute";b.top=b.left=0;c.imagedata.src=this.g.q.j().src;
-c.stroked=false;c.filled=false;a.appendChild(c)}this.parent.sb(this.M,a)}return a},Ea:function(){if(this.h()){var a=this.e,b=a.runtimeStyle,c=this.g.q.j().I;b.borderStyle="solid";if(c){b.borderTopWidth=c.t.a(a)+"px";b.borderRightWidth=c.r.a(a)+"px";b.borderBottomWidth=c.b.a(a)+"px";b.borderLeftWidth=c.l.a(a)+"px"}this.mc()}},m:function(){var a=this.e.runtimeStyle;a.borderStyle="";if(this.ec||!this.g.z.h())a.borderColor=a.borderWidth="";f.u.m.call(this)}});f.Hc=f.u.P({M:1,Ya:"outset-box-shadow",O:function(){var a=
-this.g;return a.ga.G()||a.F.G()},h:function(){var a=this.g.ga;return a.h()&&a.j().Da[0]},U:function(){function a(B,A,L,N,H,I,F){B=b.za("shadow"+B+A,"fill",d,i-B);A=B.fill;B.coordsize=n*2+","+l*2;B.coordorigin="1,1";B.stroked=false;B.filled=true;A.color=H.T(c);if(I){A.type="gradienttitle";A.color2=A.color;A.opacity=0}B.path=F;p=B.style;p.left=L;p.top=N;p.width=n;p.height=l;return B}var b=this,c=this.e,d=this.H(),e=this.g,g=e.ga.j().Da;e=e.F.j();var i=g.length,j=i,h,k=this.s.o(),n=k.i,l=k.f;k=f.V===
-8?1:0;for(var q=["tl","tr","br","bl"],s,m,r,p,t,v,o,u,x,y,z,D,G,E;j--;){m=g[j];t=m.ee.a(c);v=m.fe.a(c);h=m.Ud.a(c);o=m.blur.a(c);m=m.color;u=-h-o;if(!e&&o)e=f.jb.Dc;u=this.xa({Jb:u,Ib:u,tb:u,Db:u},2,e);if(o){x=(h+o)*2+n;y=(h+o)*2+l;z=o*2/x;D=o*2/y;if(o-h>n/2||o-h>l/2)for(h=4;h--;){s=q[h];G=s.charAt(0)==="b";E=s.charAt(1)==="r";s=a(j,s,t,v,m,o,u);r=s.fill;r.focusposition=(E?1-z:z)+","+(G?1-D:D);r.focussize="0,0";s.style.clip="rect("+((G?y/2:0)+k)+"px,"+(E?x:x/2)+"px,"+(G?y:y/2)+"px,"+((E?x/2:0)+k)+
-"px)"}else{s=a(j,"",t,v,m,o,u);r=s.fill;r.focusposition=z+","+D;r.focussize=1-z*2+","+(1-D*2)}}else{s=a(j,"",t,v,m,o,u);t=m.fa();if(t<1)s.fill.opacity=t}}}});f.Pc=f.u.P({M:6,Ya:"imgEl",O:function(){var a=this.g;return this.e.src!==this.Xc||a.F.G()},h:function(){var a=this.g;return a.F.h()||a.w.qc()},U:function(){this.Xc=i;this.Cd();var a=this.za("img","fill",this.H()),b=a.fill,c=this.s.o(),d=c.i;c=c.f;var e=this.g.z.j(),g=e&&e.I;e=this.e;var i=e.src,j=Math.round,h=e.currentStyle,k=f.n;if(!g||f.V<
-7){g=f.n("0");g={t:g,r:g,b:g,l:g}}a.stroked=false;b.type="frame";b.src=i;b.position=(d?0.5/d:0)+","+(c?0.5/c:0);a.coordsize=d*2+","+c*2;a.coordorigin="1,1";a.path=this.xa({Jb:j(g.t.a(e)+k(h.paddingTop).a(e)),Ib:j(g.r.a(e)+k(h.paddingRight).a(e)),tb:j(g.b.a(e)+k(h.paddingBottom).a(e)),Db:j(g.l.a(e)+k(h.paddingLeft).a(e))},2);a=a.style;a.width=d;a.height=c},Cd:function(){this.e.runtimeStyle.filter="alpha(opacity=0)"},m:function(){f.u.m.call(this);this.e.runtimeStyle.filter=""}});f.Oc=f.u.P({ib:f.aa,
-Mb:f.aa,Nb:f.aa,Lb:f.aa,Kd:/^,+|,+$/g,Fd:/,+/g,gb:function(a,b){(this.pb||(this.pb=[]))[a]=b||void 0},ab:function(){var a=this.pb,b;if(a&&(b=a.join(",").replace(this.Kd,"").replace(this.Fd,","))!==this.Wc)this.Wc=this.e.runtimeStyle.background=b},m:function(){this.e.runtimeStyle.background="";delete this.pb}});f.Mc=f.u.P({ta:1,O:function(){return this.g.w.G()},h:function(){var a=this.g;return a.w.h()||a.q.h()},U:function(){var a=this.g.w.j(),b,c,d=0,e,g;if(a){b=[];if(c=a.L)for(;e=c[d++];)if(e.N===
-"linear-gradient"){g=this.vd(e.Wa);g=(e.Xa||f.Ka.Kc).a(this.e,g.i,g.f,g.i,g.f);b.push("url(data:image/svg+xml,"+escape(this.xd(e,g.i,g.f))+") "+this.dd(e.$)+" / "+g.i+"px "+g.f+"px "+(e.bc||"")+" "+(e.Wa||"")+" "+(e.ub||""))}else b.push(e.Hb);a.color&&b.push(a.color.Y);this.parent.gb(this.ta,b.join(","))}},dd:function(a){return a?a.X.map(function(b){return b.d}).join(" "):"0 0"},vd:function(a){var b=this.e,c=this.s.o(),d=c.i;c=c.f;var e;if(a!=="border-box")if((e=this.g.z.j())&&(e=e.I)){d-=e.l.a(b)+
-e.l.a(b);c-=e.t.a(b)+e.b.a(b)}if(a==="content-box"){a=f.n;e=b.currentStyle;d-=a(e.paddingLeft).a(b)+a(e.paddingRight).a(b);c-=a(e.paddingTop).a(b)+a(e.paddingBottom).a(b)}return{i:d,f:c}},xd:function(a,b,c){var d=this.e,e=a.ca,g=e.length,i=f.Na.gc(d,b,c,a);a=i.xc;var j=i.yc,h=i.td,k=i.ud;i=i.rc;var n,l,q,s,m;n=[];for(l=0;l<g;l++)n.push(e[l].db?e[l].db.a(d,i):l===0?0:l===g-1?i:null);for(l=1;l<g;l++)if(n[l]===null){s=n[l-1];q=l;do m=n[++q];while(m===null);n[l]=s+(m-s)/(q-l+1)}b=['<svg width="'+b+'" height="'+
-c+'" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="g" gradientUnits="userSpaceOnUse" x1="'+a/b*100+'%" y1="'+j/c*100+'%" x2="'+h/b*100+'%" y2="'+k/c*100+'%">'];for(l=0;l<g;l++)b.push('<stop offset="'+n[l]/i+'" stop-color="'+e[l].color.T(d)+'" stop-opacity="'+e[l].color.fa()+'"/>');b.push('</linearGradient></defs><rect width="100%" height="100%" fill="url(#g)"/></svg>');return b.join("")},m:function(){this.parent.gb(this.ta)}});f.Nc=f.u.P({S:"repeat",Sc:"stretch",Qc:"round",ta:0,O:function(){return this.g.q.G()},
-h:function(){return this.g.q.h()},U:function(){var a=this,b=a.g.q.j(),c=a.g.z.j(),d=a.s.o(),e=b.repeat,g=e.f,i=e.Ob,j=a.e,h=0;f.p.Rb(b.src,function(k){function n(R,S,U,V,W,T,w,C,K,O){J.push('<pattern patternUnits="userSpaceOnUse" id="pattern'+Q+'" x="'+(g===p?R+U/2-K/2:R)+'" y="'+(i===p?S+V/2-O/2:S)+'" width="'+K+'" height="'+O+'"><svg width="'+K+'" height="'+O+'" viewBox="'+W+" "+T+" "+w+" "+C+'" preserveAspectRatio="none"><image xlink:href="'+r+'" x="0" y="0" width="'+s+'" height="'+m+'" /></svg></pattern>');
-P.push('<rect x="'+R+'" y="'+S+'" width="'+U+'" height="'+V+'" fill="url(#pattern'+Q+')" />');Q++}var l=d.i,q=d.f,s=k.i,m=k.f,r=a.Dd(b.src,s,m),p=a.S,t=a.Sc;k=a.Qc;var v=Math.ceil,o=f.n("0"),u=b.I||(c?c.I:{t:o,r:o,b:o,l:o});o=u.t.a(j);var x=u.r.a(j),y=u.b.a(j);u=u.l.a(j);var z=b.slice,D=z.t.a(j),G=z.r.a(j),E=z.b.a(j);z=z.l.a(j);var B=l-u-x,A=q-o-y,L=s-z-G,N=m-D-E,H=g===t?B:L*o/D,I=i===t?A:N*x/G,F=g===t?B:L*y/E;t=i===t?A:N*u/z;var J=[],P=[],Q=0;if(g===k){H-=(H-(B%H||H))/v(B/H);F-=(F-(B%F||F))/v(B/
-F)}if(i===k){I-=(I-(A%I||I))/v(A/I);t-=(t-(A%t||t))/v(A/t)}k=['<svg width="'+l+'" height="'+q+'" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">'];n(0,0,u,o,0,0,z,D,u,o);n(u,0,B,o,z,0,L,D,H,o);n(l-x,0,x,o,s-G,0,G,D,x,o);n(0,o,u,A,0,D,z,N,u,t);if(b.fill)n(u,o,B,A,z,D,L,N,H||F||L,t||I||N);n(l-x,o,x,A,s-G,D,G,N,x,I);n(0,q-y,u,y,0,m-E,z,E,u,y);n(u,q-y,B,y,z,m-E,L,E,F,y);n(l-x,q-y,x,y,s-G,m-E,G,E,x,y);k.push("<defs>"+J.join("\n")+"</defs>"+P.join("\n")+"</svg>");a.parent.gb(a.ta,
-"url(data:image/svg+xml,"+escape(k.join(""))+") no-repeat border-box border-box");h&&a.parent.ab()},a);h=1},Dd:function(){var a={};return function(b,c,d){var e=a[b],g;if(!e){e=new Image;g=doc.createElement("canvas");e.src=b;g.width=c;g.height=d;g.getContext("2d").drawImage(e,0,0);e=a[b]=g.toDataURL()}return e}}(),Ea:f.Tb.prototype.Ea,m:function(){var a=this.e.runtimeStyle;this.parent.gb(this.ta);a.borderColor=a.borderStyle=a.borderWidth=""}});f.kb=function(){function a(m,r){m.className+=" "+r}function b(m){var r=
-s.slice.call(arguments,1),p=r.length;setTimeout(function(){for(;p--;)a(m,r[p])},0)}function c(m){var r=s.slice.call(arguments,1),p=r.length;setTimeout(function(){for(;p--;){var t=r[p];t=q[t]||(q[t]=new RegExp("\\b"+t+"\\b","g"));m.className=m.className.replace(t,"")}},0)}function d(m){function r(){if(!R){var w,C,K=f.Ba,O=m.currentStyle,M=O.getAttribute(g)==="true";T=O.getAttribute(i);T=K>7?T!=="false":T==="true";if(!Q){Q=1;m.runtimeStyle.zoom=1;O=m;for(var ba=1;O=O.previousSibling;)if(O.nodeType===
-1){ba=0;break}ba&&a(m,n)}F.cb();if(M&&(C=F.o())&&(w=doc.documentElement||doc.body)&&(C.y>w.clientHeight||C.x>w.clientWidth||C.y+C.f<0||C.x+C.i<0)){if(!V){V=1;f.mb.ba(r)}}else{R=1;V=Q=0;f.mb.Ha(r);if(K===9){J={w:new f.Sb(m),q:new f.Ub(m),z:new f.Vb(m)};P=[J.w,J.q];I=new f.Oc(m,F,J);w=[new f.Mc(m,F,J,I),new f.Nc(m,F,J,I)]}else{J={w:new f.Sb(m),z:new f.Vb(m),q:new f.Ub(m),F:new f.jb(m),ga:new f.Ic(m),Pb:new f.Uc(m)};P=[J.w,J.z,J.q,J.F,J.ga,J.Pb];I=new f.Rc(m,F,J);w=[new f.Hc(m,F,J,I),new f.Fc(m,F,J,
-I),new f.Gc(m,F,J,I),new f.Tb(m,F,J,I)];m.tagName==="IMG"&&w.push(new f.Pc(m,F,J,I));I.ed=w}H=[I].concat(w);if(w=m.currentStyle.getAttribute(f.Q+"watch-ancestors")){w=parseInt(w,10);C=0;for(M=m.parentNode;M&&(w==="NaN"||C++<w);){A(M,"onpropertychange",G);A(M,"onmouseenter",o);A(M,"onmouseleave",u);A(M,"onmousedown",x);if(M.tagName in f.fc){A(M,"onfocus",z);A(M,"onblur",D)}M=M.parentNode}}if(T){f.Oa.ba(t);f.Oa.Qd()}t(1)}if(!S){S=1;K<9&&A(m,"onmove",p);A(m,"onresize",p);A(m,"onpropertychange",v);A(m,
-"onmouseenter",o);A(m,"onmouseleave",u);A(m,"onmousedown",x);if(m.tagName in f.fc){A(m,"onfocus",z);A(m,"onblur",D)}f.Qa.ba(p);f.K.ba(L)}F.hb()}}function p(){F&&F.Ad()&&t()}function t(w){if(!W)if(R){var C,K=H.length;E();for(C=0;C<K;C++)H[C].Ea();if(w||F.Nd())for(C=0;C<K;C++)H[C].ib();if(w||F.Sd())for(C=0;C<K;C++)H[C].Mb();I.ab();B()}else Q||r()}function v(){var w,C=H.length,K;w=event;if(!W&&!(w&&w.propertyName in l))if(R){E();for(w=0;w<C;w++)H[w].Ea();for(w=0;w<C;w++){K=H[w];K.Cb||K.ib();K.O()&&K.Lb()}I.ab();
-B()}else Q||r()}function o(){b(m,j)}function u(){c(m,j,h)}function x(){b(m,h);f.lb.ba(y)}function y(){c(m,h);f.lb.Ha(y)}function z(){b(m,k)}function D(){c(m,k)}function G(){var w=event.propertyName;if(w==="className"||w==="id")v()}function E(){F.cb();for(var w=P.length;w--;)P[w].cb()}function B(){for(var w=P.length;w--;)P[w].hb();F.hb()}function A(w,C,K){w.attachEvent(C,K);U.push([w,C,K])}function L(){if(S){for(var w=U.length,C;w--;){C=U[w];C[0].detachEvent(C[1],C[2])}f.K.Ha(L);S=0;U=[]}}function N(){if(!W){var w,
-C;L();W=1;if(H){w=0;for(C=H.length;w<C;w++){H[w].ec=1;H[w].m()}}T&&f.Oa.Ha(t);f.Qa.Ha(t);H=F=J=P=m=null}}var H,I,F=new da(m),J,P,Q,R,S,U=[],V,W,T;this.Ed=r;this.update=t;this.m=N;this.qd=m}var e={},g=f.Q+"lazy-init",i=f.Q+"poll",j=f.La+"hover",h=f.La+"active",k=f.La+"focus",n=f.La+"first-child",l={background:1,bgColor:1,display:1},q={},s=[];d.yd=function(m){var r=f.p.Aa(m);return e[r]||(e[r]=new d(m))};d.m=function(m){m=f.p.Aa(m);var r=e[m];if(r){r.m();delete e[m]}};d.md=function(){var m=[],r;if(e){for(var p in e)if(e.hasOwnProperty(p)){r=
-e[p];m.push(r.qd);r.m()}e={}}return m};return d}();f.supportsVML=f.zc;f.attach=function(a){f.Ba<10&&f.zc&&f.kb.yd(a).Ed()};f.detach=function(a){f.kb.m(a)}};
-})();
\ No newline at end of file
diff --git a/templates/tour/pie/PIE.php b/templates/tour/pie/PIE.php
deleted file mode 100644
index 58a6f0a6df1..00000000000
--- a/templates/tour/pie/PIE.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/*
-This file is a wrapper, for use in PHP environments, which serves PIE.htc using the
-correct content-type, so that IE will recognize it as a behavior.  Simply specify the
-behavior property to fetch this .php file instead of the .htc directly:
-
-.myElement {
-    [ ...css3 properties... ]
-    behavior: url(PIE.php);
-}
-
-This is only necessary when the web server is not configured to serve .htc files with
-the text/x-component content-type, and cannot easily be configured to do so (as is the
-case with some shared hosting providers).
-*/
-
-header( 'Content-type: text/x-component' );
-include( 'PIE.htc' );
-?>
\ No newline at end of file
diff --git a/templates/tour/pie/PIE_uncompressed.htc b/templates/tour/pie/PIE_uncompressed.htc
deleted file mode 100644
index 14a9a00bb92..00000000000
--- a/templates/tour/pie/PIE_uncompressed.htc
+++ /dev/null
@@ -1,4470 +0,0 @@
-<!--
-PIE: CSS3 rendering for IE
-Version 1.0beta5
-http://css3pie.com
-Dual-licensed for use under the Apache License Version 2.0 or the General Public License (GPL) Version 2.
--->
-<PUBLIC:COMPONENT lightWeight="true">
-<!-- saved from url=(0014)about:internet -->
-<PUBLIC:ATTACH EVENT="oncontentready" FOR="element" ONEVENT="init()" />
-<PUBLIC:ATTACH EVENT="ondocumentready" FOR="element" ONEVENT="init()" />
-<PUBLIC:ATTACH EVENT="ondetach" FOR="element" ONEVENT="cleanup()" />
-
-<script type="text/javascript">
-var doc = element.document;var PIE = window['PIE'];
-
-if( !PIE ) {
-    PIE = window['PIE'] = {
-        CSS_PREFIX: '-pie-',
-        STYLE_PREFIX: 'Pie',
-        CLASS_PREFIX: 'pie_',
-        tableCellTags: {
-            'TD': 1,
-            'TH': 1
-        },
-
-        /**
-         * Lookup table of elements which cannot take custom children.
-         */
-        childlessElements: {
-            'TABLE':1,
-            'THEAD':1,
-            'TBODY':1,
-            'TFOOT':1,
-            'TR':1,
-            'INPUT':1,
-            'TEXTAREA':1,
-            'SELECT':1,
-            'OPTION':1,
-            'IMG':1,
-            'HR':1
-        },
-
-        /**
-         * Elements that can receive user focus
-         */
-        focusableElements: {
-            'A':1,
-            'INPUT':1,
-            'TEXTAREA':1,
-            'SELECT':1,
-            'BUTTON':1
-        },
-
-        /**
-         * Values of the type attribute for input elements displayed as buttons
-         */
-        inputButtonTypes: {
-            'submit':1,
-            'button':1,
-            'reset':1
-        },
-
-        emptyFn: function() {}
-    };
-
-    // Force the background cache to be used. No reason it shouldn't be.
-    try {
-        doc.execCommand( 'BackgroundImageCache', false, true );
-    } catch(e) {}
-
-    (function() {
-        /*
-         * IE version detection approach by James Padolsey, with modifications -- from
-         * http://james.padolsey.com/javascript/detect-ie-in-js-using-conditional-comments/
-         */
-        var ieVersion = 4,
-            div = doc.createElement('div'),
-            all = div.getElementsByTagName('i'),
-            shape;
-        while (
-            div.innerHTML = '<!--[if gt IE ' + (++ieVersion) + ']><i></i><![endif]-->',
-            all[0]
-        ) {}
-        PIE.ieVersion = ieVersion;
-
-        // Detect IE6
-        if( ieVersion === 6 ) {
-            // IE6 can't access properties with leading dash, but can without it.
-            PIE.CSS_PREFIX = PIE.CSS_PREFIX.replace( /^-/, '' );
-        }
-
-        PIE.ieDocMode = doc.documentMode || PIE.ieVersion;
-
-        // Detect VML support (a small number of IE installs don't have a working VML engine)
-        div.innerHTML = '<v:shape adj="1"/>';
-        shape = div.firstChild;
-        shape.style['behavior'] = 'url(#default#VML)';
-        PIE.supportsVML = (typeof shape['adj'] === "object");
-    }());
-/**
- * Utility functions
- */
-(function() {
-    var vmlCreatorDoc,
-        idNum = 0,
-        imageSizes = {};
-
-
-    PIE.Util = {
-
-        /**
-         * To create a VML element, it must be created by a Document which has the VML
-         * namespace set. Unfortunately, if you try to add the namespace programatically
-         * into the main document, you will get an "Unspecified error" when trying to
-         * access document.namespaces before the document is finished loading. To get
-         * around this, we create a DocumentFragment, which in IE land is apparently a
-         * full-fledged Document. It allows adding namespaces immediately, so we add the
-         * namespace there and then have it create the VML element.
-         * @param {string} tag The tag name for the VML element
-         * @return {Element} The new VML element
-         */
-        createVmlElement: function( tag ) {
-            var vmlPrefix = 'css3vml';
-            if( !vmlCreatorDoc ) {
-                vmlCreatorDoc = doc.createDocumentFragment();
-                vmlCreatorDoc.namespaces.add( vmlPrefix, 'urn:schemas-microsoft-com:vml' );
-            }
-            return vmlCreatorDoc.createElement( vmlPrefix + ':' + tag );
-        },
-
-
-        /**
-         * Generate and return a unique ID for a given object. The generated ID is stored
-         * as a property of the object for future reuse.
-         * @param {Object} obj
-         */
-        getUID: function( obj ) {
-            return obj && obj[ '_pieId' ] || ( obj[ '_pieId' ] = '_' + ++idNum );
-        },
-
-
-        /**
-         * Simple utility for merging objects
-         * @param {Object} obj1 The main object into which all others will be merged
-         * @param {...Object} var_args Other objects which will be merged into the first, in order
-         */
-        merge: function( obj1 ) {
-            var i, len, p, objN, args = arguments;
-            for( i = 1, len = args.length; i < len; i++ ) {
-                objN = args[i];
-                for( p in objN ) {
-                    if( objN.hasOwnProperty( p ) ) {
-                        obj1[ p ] = objN[ p ];
-                    }
-                }
-            }
-            return obj1;
-        },
-
-
-        /**
-         * Execute a callback function, passing it the dimensions of a given image once
-         * they are known.
-         * @param {string} src The source URL of the image
-         * @param {function({w:number, h:number})} func The callback function to be called once the image dimensions are known
-         * @param {Object} ctx A context object which will be used as the 'this' value within the executed callback function
-         */
-        withImageSize: function( src, func, ctx ) {
-            var size = imageSizes[ src ], img, queue;
-            if( size ) {
-                // If we have a queue, add to it
-                if( Object.prototype.toString.call( size ) === '[object Array]' ) {
-                    size.push( [ func, ctx ] );
-                }
-                // Already have the size cached, call func right away
-                else {
-                    func.call( ctx, size );
-                }
-            } else {
-                queue = imageSizes[ src ] = [ [ func, ctx ] ]; //create queue
-                img = new Image();
-                img.onload = function() {
-                    size = imageSizes[ src ] = { w: img.width, h: img.height };
-                    for( var i = 0, len = queue.length; i < len; i++ ) {
-                        queue[ i ][ 0 ].call( queue[ i ][ 1 ], size );
-                    }
-                    img.onload = null;
-                };
-                img.src = src;
-            }
-        }
-    };
-})();/**
- * Utility functions for handling gradients
- */
-PIE.GradientUtil = {
-
-    getGradientMetrics: function( el, width, height, gradientInfo ) {
-        var angle = gradientInfo.angle,
-            startPos = gradientInfo.gradientStart,
-            startX, startY,
-            endX, endY,
-            startCornerX, startCornerY,
-            endCornerX, endCornerY,
-            deltaX, deltaY,
-            p, UNDEF;
-
-        // Find the "start" and "end" corners; these are the corners furthest along the gradient line.
-        // This is used below to find the start/end positions of the CSS3 gradient-line, and also in finding
-        // the total length of the VML rendered gradient-line corner to corner.
-        function findCorners() {
-            startCornerX = ( angle >= 90 && angle < 270 ) ? width : 0;
-            startCornerY = angle < 180 ? height : 0;
-            endCornerX = width - startCornerX;
-            endCornerY = height - startCornerY;
-        }
-
-        // Normalize the angle to a value between [0, 360)
-        function normalizeAngle() {
-            while( angle < 0 ) {
-                angle += 360;
-            }
-            angle = angle % 360;
-        }
-
-        // Find the start and end points of the gradient
-        if( startPos ) {
-            startPos = startPos.coords( el, width, height );
-            startX = startPos.x;
-            startY = startPos.y;
-        }
-        if( angle ) {
-            angle = angle.degrees();
-
-            normalizeAngle();
-            findCorners();
-
-            // If no start position was specified, then choose a corner as the starting point.
-            if( !startPos ) {
-                startX = startCornerX;
-                startY = startCornerY;
-            }
-
-            // Find the end position by extending a perpendicular line from the gradient-line which
-            // intersects the corner opposite from the starting corner.
-            p = PIE.GradientUtil.perpendicularIntersect( startX, startY, angle, endCornerX, endCornerY );
-            endX = p[0];
-            endY = p[1];
-        }
-        else if( startPos ) {
-            // Start position but no angle specified: find the end point by rotating 180deg around the center
-            endX = width - startX;
-            endY = height - startY;
-        }
-        else {
-            // Neither position nor angle specified; create vertical gradient from top to bottom
-            startX = startY = endX = 0;
-            endY = height;
-        }
-        deltaX = endX - startX;
-        deltaY = endY - startY;
-
-        if( angle === UNDEF ) {
-            // Get the angle based on the change in x/y from start to end point. Checks first for horizontal
-            // or vertical angles so they get exact whole numbers rather than what atan2 gives.
-            angle = ( !deltaX ? ( deltaY < 0 ? 90 : 270 ) :
-                        ( !deltaY ? ( deltaX < 0 ? 180 : 0 ) :
-                            -Math.atan2( deltaY, deltaX ) / Math.PI * 180
-                        )
-                    );
-            normalizeAngle();
-            findCorners();
-        }
-
-        return {
-            angle: angle,
-            startX: startX,
-            startY: startY,
-            endX: endX,
-            endY: endY,
-            startCornerX: startCornerX,
-            startCornerY: startCornerY,
-            endCornerX: endCornerX,
-            endCornerY: endCornerY,
-            deltaX: deltaX,
-            deltaY: deltaY,
-            lineLength: PIE.GradientUtil.distance( startX, startY, endX, endY )
-        }
-    },
-
-    /**
-     * Find the point along a given line (defined by a starting point and an angle), at which
-     * that line is intersected by a perpendicular line extending through another point.
-     * @param x1 - x coord of the starting point
-     * @param y1 - y coord of the starting point
-     * @param angle - angle of the line extending from the starting point (in degrees)
-     * @param x2 - x coord of point along the perpendicular line
-     * @param y2 - y coord of point along the perpendicular line
-     * @return [ x, y ]
-     */
-    perpendicularIntersect: function( x1, y1, angle, x2, y2 ) {
-        // Handle straight vertical and horizontal angles, for performance and to avoid
-        // divide-by-zero errors.
-        if( angle === 0 || angle === 180 ) {
-            return [ x2, y1 ];
-        }
-        else if( angle === 90 || angle === 270 ) {
-            return [ x1, y2 ];
-        }
-        else {
-            // General approach: determine the Ax+By=C formula for each line (the slope of the second
-            // line is the negative inverse of the first) and then solve for where both formulas have
-            // the same x/y values.
-            var a1 = Math.tan( -angle * Math.PI / 180 ),
-                c1 = a1 * x1 - y1,
-                a2 = -1 / a1,
-                c2 = a2 * x2 - y2,
-                d = a2 - a1,
-                endX = ( c2 - c1 ) / d,
-                endY = ( a1 * c2 - a2 * c1 ) / d;
-            return [ endX, endY ];
-        }
-    },
-
-    /**
-     * Find the distance between two points
-     * @param {Number} p1x
-     * @param {Number} p1y
-     * @param {Number} p2x
-     * @param {Number} p2y
-     * @return {Number} the distance
-     */
-    distance: function( p1x, p1y, p2x, p2y ) {
-        var dx = p2x - p1x,
-            dy = p2y - p1y;
-        return Math.abs(
-            dx === 0 ? dy :
-            dy === 0 ? dx :
-            Math.sqrt( dx * dx + dy * dy )
-        );
-    }
-
-};/**
- * 
- */
-PIE.Observable = function() {
-    /**
-     * List of registered observer functions
-     */
-    this.observers = [];
-
-    /**
-     * Hash of function ids to their position in the observers list, for fast lookup
-     */
-    this.indexes = {};
-};
-PIE.Observable.prototype = {
-
-    observe: function( fn ) {
-        var id = PIE.Util.getUID( fn ),
-            indexes = this.indexes,
-            observers = this.observers;
-        if( !( id in indexes ) ) {
-            indexes[ id ] = observers.length;
-            observers.push( fn );
-        }
-    },
-
-    unobserve: function( fn ) {
-        var id = PIE.Util.getUID( fn ),
-            indexes = this.indexes;
-        if( id && id in indexes ) {
-            delete this.observers[ indexes[ id ] ];
-            delete indexes[ id ];
-        }
-    },
-
-    fire: function() {
-        var o = this.observers,
-            i = o.length;
-        while( i-- ) {
-            o[ i ] && o[ i ]();
-        }
-    }
-
-};/*
- * Simple heartbeat timer - this is a brute-force workaround for syncing issues caused by IE not
- * always firing the onmove and onresize events when elements are moved or resized. We check a few
- * times every second to make sure the elements have the correct position and size. See Element.js
- * which adds heartbeat listeners based on the custom -pie-poll flag, which defaults to true in IE8
- * and false elsewhere.
- */
-
-PIE.Heartbeat = new PIE.Observable();
-PIE.Heartbeat.run = function() {
-    var me = this;
-    if( !me.running ) {
-        setInterval( function() { me.fire() }, 250 );
-        me.running = 1;
-    }
-};
-/**
- * Create an observable listener for the onunload event
- */
-(function() {
-    PIE.OnUnload = new PIE.Observable();
-
-    function handleUnload() {
-        PIE.OnUnload.fire();
-        window.detachEvent( 'onunload', handleUnload );
-        window[ 'PIE' ] = null;
-    }
-
-    window.attachEvent( 'onunload', handleUnload );
-
-    /**
-     * Attach an event which automatically gets detached onunload
-     */
-    PIE.OnUnload.attachManagedEvent = function( target, name, handler ) {
-        target.attachEvent( name, handler );
-        this.observe( function() {
-            target.detachEvent( name, handler );
-        } );
-    };
-})()/**
- * Create a single observable listener for window resize events.
- */
-PIE.OnResize = new PIE.Observable();
-
-PIE.OnUnload.attachManagedEvent( window, 'onresize', function() { PIE.OnResize.fire(); } );
-/**
- * Create a single observable listener for scroll events. Used for lazy loading based
- * on the viewport, and for fixed position backgrounds.
- */
-(function() {
-    PIE.OnScroll = new PIE.Observable();
-
-    function scrolled() {
-        PIE.OnScroll.fire();
-    }
-
-    PIE.OnUnload.attachManagedEvent( window, 'onscroll', scrolled );
-
-    PIE.OnResize.observe( scrolled );
-})();
-/**
- * Listen for printing events, destroy all active PIE instances when printing, and
- * restore them afterward.
- */
-(function() {
-
-    var elements;
-
-    function beforePrint() {
-        elements = PIE.Element.destroyAll();
-    }
-
-    function afterPrint() {
-        if( elements ) {
-            for( var i = 0, len = elements.length; i < len; i++ ) {
-                PIE[ 'attach' ]( elements[i] );
-            }
-            elements = 0;
-        }
-    }
-
-    PIE.OnUnload.attachManagedEvent( window, 'onbeforeprint', beforePrint );
-    PIE.OnUnload.attachManagedEvent( window, 'onafterprint', afterPrint );
-
-})();/**
- * Create a single observable listener for document mouseup events.
- */
-PIE.OnMouseup = new PIE.Observable();
-
-PIE.OnUnload.attachManagedEvent( doc, 'onmouseup', function() { PIE.OnMouseup.fire(); } );
-/**
- * Wrapper for length and percentage style values. The value is immutable. A singleton instance per unique
- * value is returned from PIE.getLength() - always use that instead of instantiating directly.
- * @constructor
- * @param {string} val The CSS string representing the length. It is assumed that this will already have
- *                 been validated as a valid length or percentage syntax.
- */
-PIE.Length = (function() {
-    var lengthCalcEl = doc.createElement( 'length-calc' ),
-        parent = doc.documentElement,
-        s = lengthCalcEl.style,
-        conversions = {},
-        units = [ 'mm', 'cm', 'in', 'pt', 'pc' ],
-        i = units.length,
-        instances = {};
-
-    s.position = 'absolute';
-    s.top = s.left = '-9999px';
-
-    parent.appendChild( lengthCalcEl );
-    while( i-- ) {
-        lengthCalcEl.style.width = '100' + units[i];
-        conversions[ units[i] ] = lengthCalcEl.offsetWidth / 100;
-    }
-    parent.removeChild( lengthCalcEl );
-
-    // All calcs from here on will use 1em
-    lengthCalcEl.style.width = '1em';
-
-
-    function Length( val ) {
-        this.val = val;
-    }
-    Length.prototype = {
-        /**
-         * Regular expression for matching the length unit
-         * @private
-         */
-        unitRE: /(px|em|ex|mm|cm|in|pt|pc|%)$/,
-
-        /**
-         * Get the numeric value of the length
-         * @return {number} The value
-         */
-        getNumber: function() {
-            var num = this.num,
-                UNDEF;
-            if( num === UNDEF ) {
-                num = this.num = parseFloat( this.val );
-            }
-            return num;
-        },
-
-        /**
-         * Get the unit of the length
-         * @return {string} The unit
-         */
-        getUnit: function() {
-            var unit = this.unit,
-                m;
-            if( !unit ) {
-                m = this.val.match( this.unitRE );
-                unit = this.unit = ( m && m[0] ) || 'px';
-            }
-            return unit;
-        },
-
-        /**
-         * Determine whether this is a percentage length value
-         * @return {boolean}
-         */
-        isPercentage: function() {
-            return this.getUnit() === '%';
-        },
-
-        /**
-         * Resolve this length into a number of pixels.
-         * @param {Element} el - the context element, used to resolve font-relative values
-         * @param {(function():number|number)=} pct100 - the number of pixels that equal a 100% percentage. This can be either a number or a
-         *                  function which will be called to return the number.
-         */
-        pixels: function( el, pct100 ) {
-            var num = this.getNumber(),
-                unit = this.getUnit();
-            switch( unit ) {
-                case "px":
-                    return num;
-                case "%":
-                    return num * ( typeof pct100 === 'function' ? pct100() : pct100 ) / 100;
-                case "em":
-                    return num * this.getEmPixels( el );
-                case "ex":
-                    return num * this.getEmPixels( el ) / 2;
-                default:
-                    return num * conversions[ unit ];
-            }
-        },
-
-        /**
-         * The em and ex units are relative to the font-size of the current element,
-         * however if the font-size is set using non-pixel units then we get that value
-         * rather than a pixel conversion. To get around this, we keep a floating element
-         * with width:1em which we insert into the target element and then read its offsetWidth.
-         * For elements that won't accept a child we insert into the parent node and perform
-         * additional calculation. If the font-size *is* specified in pixels, then we use that
-         * directly to avoid the expensive DOM manipulation.
-         * @param {Element} el
-         * @return {number}
-         */
-        getEmPixels: function( el ) {
-            var fs = el.currentStyle.fontSize,
-                px, parent, me;
-
-            if( fs.indexOf( 'px' ) > 0 ) {
-                return parseFloat( fs );
-            }
-            else if( el.tagName in PIE.childlessElements ) {
-                me = this;
-                parent = el.parentNode;
-                return PIE.getLength( fs ).pixels( parent, function() {
-                    return me.getEmPixels( parent );
-                } );
-            }
-            else {
-                el.appendChild( lengthCalcEl );
-                px = lengthCalcEl.offsetWidth;
-                if( lengthCalcEl.parentNode === el ) { //not sure how this could be false but it sometimes is
-                    el.removeChild( lengthCalcEl );
-                }
-                return px;
-            }
-        }
-    };
-
-
-    /**
-     * Retrieve a PIE.Length instance for the given value. A shared singleton instance is returned for each unique value.
-     * @param {string} val The CSS string representing the length. It is assumed that this will already have
-     *                 been validated as a valid length or percentage syntax.
-     */
-    PIE.getLength = function( val ) {
-        return instances[ val ] || ( instances[ val ] = new Length( val ) );
-    };
-
-    return Length;
-})();
-/**
- * Wrapper for a CSS3 bg-position value. Takes up to 2 position keywords and 2 lengths/percentages.
- * @constructor
- * @param {Array.<PIE.Tokenizer.Token>} tokens The tokens making up the background position value.
- */
-PIE.BgPosition = (function() {
-
-    var length_fifty = PIE.getLength( '50%' ),
-        vert_idents = { 'top': 1, 'center': 1, 'bottom': 1 },
-        horiz_idents = { 'left': 1, 'center': 1, 'right': 1 };
-
-
-    function BgPosition( tokens ) {
-        this.tokens = tokens;
-    }
-    BgPosition.prototype = {
-        /**
-         * Normalize the values into the form:
-         * [ xOffsetSide, xOffsetLength, yOffsetSide, yOffsetLength ]
-         * where: xOffsetSide is either 'left' or 'right',
-         *        yOffsetSide is either 'top' or 'bottom',
-         *        and x/yOffsetLength are both PIE.Length objects.
-         * @return {Array}
-         */
-        getValues: function() {
-            if( !this._values ) {
-                var tokens = this.tokens,
-                    len = tokens.length,
-                    Tokenizer = PIE.Tokenizer,
-                    identType = Tokenizer.Type,
-                    length_zero = PIE.getLength( '0' ),
-                    type_ident = identType.IDENT,
-                    type_length = identType.LENGTH,
-                    type_percent = identType.PERCENT,
-                    type, value,
-                    vals = [ 'left', length_zero, 'top', length_zero ];
-
-                // If only one value, the second is assumed to be 'center'
-                if( len === 1 ) {
-                    tokens.push( new Tokenizer.Token( type_ident, 'center' ) );
-                    len++;
-                }
-
-                // Two values - CSS2
-                if( len === 2 ) {
-                    // If both idents, they can appear in either order, so switch them if needed
-                    if( type_ident & ( tokens[0].tokenType | tokens[1].tokenType ) &&
-                        tokens[0].tokenValue in vert_idents && tokens[1].tokenValue in horiz_idents ) {
-                        tokens.push( tokens.shift() );
-                    }
-                    if( tokens[0].tokenType & type_ident ) {
-                        if( tokens[0].tokenValue === 'center' ) {
-                            vals[1] = length_fifty;
-                        } else {
-                            vals[0] = tokens[0].tokenValue;
-                        }
-                    }
-                    else if( tokens[0].isLengthOrPercent() ) {
-                        vals[1] = PIE.getLength( tokens[0].tokenValue );
-                    }
-                    if( tokens[1].tokenType & type_ident ) {
-                        if( tokens[1].tokenValue === 'center' ) {
-                            vals[3] = length_fifty;
-                        } else {
-                            vals[2] = tokens[1].tokenValue;
-                        }
-                    }
-                    else if( tokens[1].isLengthOrPercent() ) {
-                        vals[3] = PIE.getLength( tokens[1].tokenValue );
-                    }
-                }
-
-                // Three or four values - CSS3
-                else {
-                    // TODO
-                }
-
-                this._values = vals;
-            }
-            return this._values;
-        },
-
-        /**
-         * Find the coordinates of the background image from the upper-left corner of the background area.
-         * Note that these coordinate values are not rounded.
-         * @param {Element} el
-         * @param {number} width - the width for percentages (background area width minus image width)
-         * @param {number} height - the height for percentages (background area height minus image height)
-         * @return {Object} { x: Number, y: Number }
-         */
-        coords: function( el, width, height ) {
-            var vals = this.getValues(),
-                pxX = vals[1].pixels( el, width ),
-                pxY = vals[3].pixels( el, height );
-
-            return {
-                x: vals[0] === 'right' ? width - pxX : pxX,
-                y: vals[2] === 'bottom' ? height - pxY : pxY
-            };
-        }
-    };
-
-    return BgPosition;
-})();
-/**
- * Wrapper for a CSS3 background-size value.
- * @constructor
- * @param {String|PIE.Length} w The width parameter
- * @param {String|PIE.Length} h The height parameter, if any
- */
-PIE.BgSize = (function() {
-
-    var CONTAIN = 'contain',
-        COVER = 'cover',
-        AUTO = 'auto';
-
-
-    function BgSize( w, h ) {
-        this.w = w;
-        this.h = h;
-    }
-    BgSize.prototype = {
-
-        pixels: function( el, areaW, areaH, imgW, imgH ) {
-            var me = this,
-                w = me.w,
-                h = me.h,
-                areaRatio = areaW / areaH,
-                imgRatio = imgW / imgH;
-
-            if ( w === CONTAIN ) {
-                w = imgRatio > areaRatio ? areaW : areaH * imgRatio;
-                h = imgRatio > areaRatio ? areaW / imgRatio : areaH;
-            }
-            else if ( w === COVER ) {
-                w = imgRatio < areaRatio ? areaW : areaH * imgRatio;
-                h = imgRatio < areaRatio ? areaW / imgRatio : areaH;
-            }
-            else if ( w === AUTO ) {
-                h = ( h === AUTO ? imgH : h.pixels( el, areaH ) );
-                w = h * imgRatio;
-            }
-            else {
-                w = w.pixels( el, areaW );
-                h = ( h === AUTO ? w / imgRatio : h.pixels( el, areaH ) );
-            }
-
-            return { w: w, h: h };
-        }
-
-    };
-
-    BgSize.DEFAULT = new BgSize( AUTO, AUTO );
-
-    return BgSize;
-})();
-/**
- * Wrapper for angle values; handles conversion to degrees from all allowed angle units
- * @constructor
- * @param {string} val The raw CSS value for the angle. It is assumed it has been pre-validated.
- */
-PIE.Angle = (function() {
-    function Angle( val ) {
-        this.val = val;
-    }
-    Angle.prototype = {
-        unitRE: /[a-z]+$/i,
-
-        /**
-         * @return {string} The unit of the angle value
-         */
-        getUnit: function() {
-            return this._unit || ( this._unit = this.val.match( this.unitRE )[0].toLowerCase() );
-        },
-
-        /**
-         * Get the numeric value of the angle in degrees.
-         * @return {number} The degrees value
-         */
-        degrees: function() {
-            var deg = this._deg, u, n;
-            if( deg === undefined ) {
-                u = this.getUnit();
-                n = parseFloat( this.val, 10 );
-                deg = this._deg = ( u === 'deg' ? n : u === 'rad' ? n / Math.PI * 180 : u === 'grad' ? n / 400 * 360 : u === 'turn' ? n * 360 : 0 );
-            }
-            return deg;
-        }
-    };
-
-    return Angle;
-})();/**
- * Abstraction for colors values. Allows detection of rgba values. A singleton instance per unique
- * value is returned from PIE.getColor() - always use that instead of instantiating directly.
- * @constructor
- * @param {string} val The raw CSS string value for the color
- */
-PIE.Color = (function() {
-    var instances = {};
-
-    function Color( val ) {
-        this.val = val;
-    }
-
-    /**
-     * Regular expression for matching rgba colors and extracting their components
-     * @type {RegExp}
-     */
-    Color.rgbaRE = /\s*rgba\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d+|\d*\.\d+)\s*\)\s*/;
-
-    Color.names = {
-        "aliceblue":"F0F8FF", "antiquewhite":"FAEBD7", "aqua":"0FF",
-        "aquamarine":"7FFFD4", "azure":"F0FFFF", "beige":"F5F5DC",
-        "bisque":"FFE4C4", "black":"000", "blanchedalmond":"FFEBCD",
-        "blue":"00F", "blueviolet":"8A2BE2", "brown":"A52A2A",
-        "burlywood":"DEB887", "cadetblue":"5F9EA0", "chartreuse":"7FFF00",
-        "chocolate":"D2691E", "coral":"FF7F50", "cornflowerblue":"6495ED",
-        "cornsilk":"FFF8DC", "crimson":"DC143C", "cyan":"0FF",
-        "darkblue":"00008B", "darkcyan":"008B8B", "darkgoldenrod":"B8860B",
-        "darkgray":"A9A9A9", "darkgreen":"006400", "darkkhaki":"BDB76B",
-        "darkmagenta":"8B008B", "darkolivegreen":"556B2F", "darkorange":"FF8C00",
-        "darkorchid":"9932CC", "darkred":"8B0000", "darksalmon":"E9967A",
-        "darkseagreen":"8FBC8F", "darkslateblue":"483D8B", "darkslategray":"2F4F4F",
-        "darkturquoise":"00CED1", "darkviolet":"9400D3", "deeppink":"FF1493",
-        "deepskyblue":"00BFFF", "dimgray":"696969", "dodgerblue":"1E90FF",
-        "firebrick":"B22222", "floralwhite":"FFFAF0", "forestgreen":"228B22",
-        "fuchsia":"F0F", "gainsboro":"DCDCDC", "ghostwhite":"F8F8FF",
-        "gold":"FFD700", "goldenrod":"DAA520", "gray":"808080",
-        "green":"008000", "greenyellow":"ADFF2F", "honeydew":"F0FFF0",
-        "hotpink":"FF69B4", "indianred":"CD5C5C", "indigo":"4B0082",
-        "ivory":"FFFFF0", "khaki":"F0E68C", "lavender":"E6E6FA",
-        "lavenderblush":"FFF0F5", "lawngreen":"7CFC00", "lemonchiffon":"FFFACD",
-        "lightblue":"ADD8E6", "lightcoral":"F08080", "lightcyan":"E0FFFF",
-        "lightgoldenrodyellow":"FAFAD2", "lightgreen":"90EE90", "lightgrey":"D3D3D3",
-        "lightpink":"FFB6C1", "lightsalmon":"FFA07A", "lightseagreen":"20B2AA",
-        "lightskyblue":"87CEFA", "lightslategray":"789", "lightsteelblue":"B0C4DE",
-        "lightyellow":"FFFFE0", "lime":"0F0", "limegreen":"32CD32",
-        "linen":"FAF0E6", "magenta":"F0F", "maroon":"800000",
-        "mediumauqamarine":"66CDAA", "mediumblue":"0000CD", "mediumorchid":"BA55D3",
-        "mediumpurple":"9370D8", "mediumseagreen":"3CB371", "mediumslateblue":"7B68EE",
-        "mediumspringgreen":"00FA9A", "mediumturquoise":"48D1CC", "mediumvioletred":"C71585",
-        "midnightblue":"191970", "mintcream":"F5FFFA", "mistyrose":"FFE4E1",
-        "moccasin":"FFE4B5", "navajowhite":"FFDEAD", "navy":"000080",
-        "oldlace":"FDF5E6", "olive":"808000", "olivedrab":"688E23",
-        "orange":"FFA500", "orangered":"FF4500", "orchid":"DA70D6",
-        "palegoldenrod":"EEE8AA", "palegreen":"98FB98", "paleturquoise":"AFEEEE",
-        "palevioletred":"D87093", "papayawhip":"FFEFD5", "peachpuff":"FFDAB9",
-        "peru":"CD853F", "pink":"FFC0CB", "plum":"DDA0DD",
-        "powderblue":"B0E0E6", "purple":"800080", "red":"F00",
-        "rosybrown":"BC8F8F", "royalblue":"4169E1", "saddlebrown":"8B4513",
-        "salmon":"FA8072", "sandybrown":"F4A460", "seagreen":"2E8B57",
-        "seashell":"FFF5EE", "sienna":"A0522D", "silver":"C0C0C0",
-        "skyblue":"87CEEB", "slateblue":"6A5ACD", "slategray":"708090",
-        "snow":"FFFAFA", "springgreen":"00FF7F", "steelblue":"4682B4",
-        "tan":"D2B48C", "teal":"008080", "thistle":"D8BFD8",
-        "tomato":"FF6347", "turquoise":"40E0D0", "violet":"EE82EE",
-        "wheat":"F5DEB3", "white":"FFF", "whitesmoke":"F5F5F5",
-        "yellow":"FF0", "yellowgreen":"9ACD32"
-    };
-
-    Color.prototype = {
-        /**
-         * @private
-         */
-        parse: function() {
-            if( !this._color ) {
-                var me = this,
-                    v = me.val,
-                    vLower,
-                    m = v.match( Color.rgbaRE );
-                if( m ) {
-                    me._color = 'rgb(' + m[1] + ',' + m[2] + ',' + m[3] + ')';
-                    me._alpha = parseFloat( m[4] );
-                }
-                else {
-                    if( ( vLower = v.toLowerCase() ) in Color.names ) {
-                        v = '#' + Color.names[vLower];
-                    }
-                    me._color = v;
-                    me._alpha = ( v === 'transparent' ? 0 : 1 );
-                }
-            }
-        },
-
-        /**
-         * Retrieve the value of the color in a format usable by IE natively. This will be the same as
-         * the raw input value, except for rgba values which will be converted to an rgb value.
-         * @param {Element} el The context element, used to get 'currentColor' keyword value.
-         * @return {string} Color value
-         */
-        colorValue: function( el ) {
-            this.parse();
-            return this._color === 'currentColor' ? el.currentStyle.color : this._color;
-        },
-
-        /**
-         * Retrieve the alpha value of the color. Will be 1 for all values except for rgba values
-         * with an alpha component.
-         * @return {number} The alpha value, from 0 to 1.
-         */
-        alpha: function() {
-            this.parse();
-            return this._alpha;
-        }
-    };
-
-
-    /**
-     * Retrieve a PIE.Color instance for the given value. A shared singleton instance is returned for each unique value.
-     * @param {string} val The CSS string representing the color. It is assumed that this will already have
-     *                 been validated as a valid color syntax.
-     */
-    PIE.getColor = function(val) {
-        return instances[ val ] || ( instances[ val ] = new Color( val ) );
-    };
-
-    return Color;
-})();/**
- * A tokenizer for CSS value strings.
- * @constructor
- * @param {string} css The CSS value string
- */
-PIE.Tokenizer = (function() {
-    function Tokenizer( css ) {
-        this.css = css;
-        this.ch = 0;
-        this.tokens = [];
-        this.tokenIndex = 0;
-    }
-
-    /**
-     * Enumeration of token type constants.
-     * @enum {number}
-     */
-    var Type = Tokenizer.Type = {
-        ANGLE: 1,
-        CHARACTER: 2,
-        COLOR: 4,
-        DIMEN: 8,
-        FUNCTION: 16,
-        IDENT: 32,
-        LENGTH: 64,
-        NUMBER: 128,
-        OPERATOR: 256,
-        PERCENT: 512,
-        STRING: 1024,
-        URL: 2048
-    };
-
-    /**
-     * A single token
-     * @constructor
-     * @param {number} type The type of the token - see PIE.Tokenizer.Type
-     * @param {string} value The value of the token
-     */
-    Tokenizer.Token = function( type, value ) {
-        this.tokenType = type;
-        this.tokenValue = value;
-    };
-    Tokenizer.Token.prototype = {
-        isLength: function() {
-            return this.tokenType & Type.LENGTH || ( this.tokenType & Type.NUMBER && this.tokenValue === '0' );
-        },
-        isLengthOrPercent: function() {
-            return this.isLength() || this.tokenType & Type.PERCENT;
-        }
-    };
-
-    Tokenizer.prototype = {
-        whitespace: /\s/,
-        number: /^[\+\-]?(\d*\.)?\d+/,
-        url: /^url\(\s*("([^"]*)"|'([^']*)'|([!#$%&*-~]*))\s*\)/i,
-        ident: /^\-?[_a-z][\w-]*/i,
-        string: /^("([^"]*)"|'([^']*)')/,
-        operator: /^[\/,]/,
-        hash: /^#[\w]+/,
-        hashColor: /^#([\da-f]{6}|[\da-f]{3})/i,
-
-        unitTypes: {
-            'px': Type.LENGTH, 'em': Type.LENGTH, 'ex': Type.LENGTH,
-            'mm': Type.LENGTH, 'cm': Type.LENGTH, 'in': Type.LENGTH,
-            'pt': Type.LENGTH, 'pc': Type.LENGTH,
-            'deg': Type.ANGLE, 'rad': Type.ANGLE, 'grad': Type.ANGLE
-        },
-
-        colorFunctions: {
-            'rgb': 1, 'rgba': 1, 'hsl': 1, 'hsla': 1
-        },
-
-
-        /**
-         * Advance to and return the next token in the CSS string. If the end of the CSS string has
-         * been reached, null will be returned.
-         * @param {boolean} forget - if true, the token will not be stored for the purposes of backtracking with prev().
-         * @return {PIE.Tokenizer.Token}
-         */
-        next: function( forget ) {
-            var css, ch, firstChar, match, val,
-                me = this;
-
-            function newToken( type, value ) {
-                var tok = new Tokenizer.Token( type, value );
-                if( !forget ) {
-                    me.tokens.push( tok );
-                    me.tokenIndex++;
-                }
-                return tok;
-            }
-            function failure() {
-                me.tokenIndex++;
-                return null;
-            }
-
-            // In case we previously backed up, return the stored token in the next slot
-            if( this.tokenIndex < this.tokens.length ) {
-                return this.tokens[ this.tokenIndex++ ];
-            }
-
-            // Move past leading whitespace characters
-            while( this.whitespace.test( this.css.charAt( this.ch ) ) ) {
-                this.ch++;
-            }
-            if( this.ch >= this.css.length ) {
-                return failure();
-            }
-
-            ch = this.ch;
-            css = this.css.substring( this.ch );
-            firstChar = css.charAt( 0 );
-            switch( firstChar ) {
-                case '#':
-                    if( match = css.match( this.hashColor ) ) {
-                        this.ch += match[0].length;
-                        return newToken( Type.COLOR, match[0] );
-                    }
-                    break;
-
-                case '"':
-                case "'":
-                    if( match = css.match( this.string ) ) {
-                        this.ch += match[0].length;
-                        return newToken( Type.STRING, match[2] || match[3] || '' );
-                    }
-                    break;
-
-                case "/":
-                case ",":
-                    this.ch++;
-                    return newToken( Type.OPERATOR, firstChar );
-
-                case 'u':
-                    if( match = css.match( this.url ) ) {
-                        this.ch += match[0].length;
-                        return newToken( Type.URL, match[2] || match[3] || match[4] || '' );
-                    }
-            }
-
-            // Numbers and values starting with numbers
-            if( match = css.match( this.number ) ) {
-                val = match[0];
-                this.ch += val.length;
-
-                // Check if it is followed by a unit
-                if( css.charAt( val.length ) === '%' ) {
-                    this.ch++;
-                    return newToken( Type.PERCENT, val + '%' );
-                }
-                if( match = css.substring( val.length ).match( this.ident ) ) {
-                    val += match[0];
-                    this.ch += match[0].length;
-                    return newToken( this.unitTypes[ match[0].toLowerCase() ] || Type.DIMEN, val );
-                }
-
-                // Plain ol' number
-                return newToken( Type.NUMBER, val );
-            }
-
-            // Identifiers
-            if( match = css.match( this.ident ) ) {
-                val = match[0];
-                this.ch += val.length;
-
-                // Named colors
-                if( val.toLowerCase() in PIE.Color.names || val === 'currentColor' || val === 'transparent' ) {
-                    return newToken( Type.COLOR, val );
-                }
-
-                // Functions
-                if( css.charAt( val.length ) === '(' ) {
-                    this.ch++;
-
-                    // Color values in function format: rgb, rgba, hsl, hsla
-                    if( val.toLowerCase() in this.colorFunctions ) {
-                        function isNum( tok ) {
-                            return tok && tok.tokenType & Type.NUMBER;
-                        }
-                        function isNumOrPct( tok ) {
-                            return tok && ( tok.tokenType & ( Type.NUMBER | Type.PERCENT ) );
-                        }
-                        function isValue( tok, val ) {
-                            return tok && tok.tokenValue === val;
-                        }
-                        function next() {
-                            return me.next( 1 );
-                        }
-
-                        if( ( val.charAt(0) === 'r' ? isNumOrPct( next() ) : isNum( next() ) ) &&
-                            isValue( next(), ',' ) &&
-                            isNumOrPct( next() ) &&
-                            isValue( next(), ',' ) &&
-                            isNumOrPct( next() ) &&
-                            ( val === 'rgb' || val === 'hsa' || (
-                                isValue( next(), ',' ) &&
-                                isNum( next() )
-                            ) ) &&
-                            isValue( next(), ')' ) ) {
-                            return newToken( Type.COLOR, this.css.substring( ch, this.ch ) );
-                        }
-                        return failure();
-                    }
-
-                    return newToken( Type.FUNCTION, val );
-                }
-
-                // Other identifier
-                return newToken( Type.IDENT, val );
-            }
-
-            // Standalone character
-            this.ch++;
-            return newToken( Type.CHARACTER, firstChar );
-        },
-
-        /**
-         * Determine whether there is another token
-         * @return {boolean}
-         */
-        hasNext: function() {
-            var next = this.next();
-            this.prev();
-            return !!next;
-        },
-
-        /**
-         * Back up and return the previous token
-         * @return {PIE.Tokenizer.Token}
-         */
-        prev: function() {
-            return this.tokens[ this.tokenIndex-- - 2 ];
-        },
-
-        /**
-         * Retrieve all the tokens in the CSS string
-         * @return {Array.<PIE.Tokenizer.Token>}
-         */
-        all: function() {
-            while( this.next() ) {}
-            return this.tokens;
-        },
-
-        /**
-         * Return a list of tokens from the current position until the given function returns
-         * true. The final token will not be included in the list.
-         * @param {function():boolean} func - test function
-         * @param {boolean} require - if true, then if the end of the CSS string is reached
-         *        before the test function returns true, null will be returned instead of the
-         *        tokens that have been found so far.
-         * @return {Array.<PIE.Tokenizer.Token>}
-         */
-        until: function( func, require ) {
-            var list = [], t, hit;
-            while( t = this.next() ) {
-                if( func( t ) ) {
-                    hit = true;
-                    this.prev();
-                    break;
-                }
-                list.push( t );
-            }
-            return require && !hit ? null : list;
-        }
-    };
-
-    return Tokenizer;
-})();/**
- * Handles calculating, caching, and detecting changes to size and position of the element.
- * @constructor
- * @param {Element} el the target element
- */
-PIE.BoundsInfo = function( el ) {
-    this.targetElement = el;
-};
-PIE.BoundsInfo.prototype = {
-
-    _locked: 0,
-
-    positionChanged: function() {
-        var last = this._lastBounds,
-            bounds;
-        return !last || ( ( bounds = this.getBounds() ) && ( last.x !== bounds.x || last.y !== bounds.y ) );
-    },
-
-    sizeChanged: function() {
-        var last = this._lastBounds,
-            bounds;
-        return !last || ( ( bounds = this.getBounds() ) && ( last.w !== bounds.w || last.h !== bounds.h ) );
-    },
-
-    getLiveBounds: function() {
-        var el = this.targetElement,
-            rect = el.getBoundingClientRect(),
-            isIE9 = PIE.ieDocMode === 9;
-        return {
-            x: rect.left,
-            y: rect.top,
-            // In some cases scrolling the page will cause IE9 to report incorrect dimensions
-            // in the rect returned by getBoundingClientRect, so we must query offsetWidth/Height instead
-            w: isIE9 ? el.offsetWidth : rect.right - rect.left,
-            h: isIE9 ? el.offsetHeight : rect.bottom - rect.top
-        };
-    },
-
-    getBounds: function() {
-        return this._locked ? 
-                ( this._lockedBounds || ( this._lockedBounds = this.getLiveBounds() ) ) :
-                this.getLiveBounds();
-    },
-
-    hasBeenQueried: function() {
-        return !!this._lastBounds;
-    },
-
-    lock: function() {
-        ++this._locked;
-    },
-
-    unlock: function() {
-        if( !--this._locked ) {
-            if( this._lockedBounds ) this._lastBounds = this._lockedBounds;
-            this._lockedBounds = null;
-        }
-    }
-
-};
-(function() {
-
-function cacheWhenLocked( fn ) {
-    var uid = PIE.Util.getUID( fn );
-    return function() {
-        if( this._locked ) {
-            var cache = this._lockedValues || ( this._lockedValues = {} );
-            return ( uid in cache ) ? cache[ uid ] : ( cache[ uid ] = fn.call( this ) );
-        } else {
-            return fn.call( this );
-        }
-    }
-}
-
-
-PIE.StyleInfoBase = {
-
-    _locked: 0,
-
-    /**
-     * Create a new StyleInfo class, with the standard constructor, and augmented by
-     * the StyleInfoBase's members.
-     * @param proto
-     */
-    newStyleInfo: function( proto ) {
-        function StyleInfo( el ) {
-            this.targetElement = el;
-            this._lastCss = this.getCss();
-        }
-        PIE.Util.merge( StyleInfo.prototype, PIE.StyleInfoBase, proto );
-        StyleInfo._propsCache = {};
-        return StyleInfo;
-    },
-
-    /**
-     * Get an object representation of the target CSS style, caching it for each unique
-     * CSS value string.
-     * @return {Object}
-     */
-    getProps: function() {
-        var css = this.getCss(),
-            cache = this.constructor._propsCache;
-        return css ? ( css in cache ? cache[ css ] : ( cache[ css ] = this.parseCss( css ) ) ) : null;
-    },
-
-    /**
-     * Get the raw CSS value for the target style
-     * @return {string}
-     */
-    getCss: cacheWhenLocked( function() {
-        var el = this.targetElement,
-            ctor = this.constructor,
-            s = el.style,
-            cs = el.currentStyle,
-            cssProp = this.cssProperty,
-            styleProp = this.styleProperty,
-            prefixedCssProp = ctor._prefixedCssProp || ( ctor._prefixedCssProp = PIE.CSS_PREFIX + cssProp ),
-            prefixedStyleProp = ctor._prefixedStyleProp || ( ctor._prefixedStyleProp = PIE.STYLE_PREFIX + styleProp.charAt(0).toUpperCase() + styleProp.substring(1) );
-        return s[ prefixedStyleProp ] || cs.getAttribute( prefixedCssProp ) || s[ styleProp ] || cs.getAttribute( cssProp );
-    } ),
-
-    /**
-     * Determine whether the target CSS style is active.
-     * @return {boolean}
-     */
-    isActive: cacheWhenLocked( function() {
-        return !!this.getProps();
-    } ),
-
-    /**
-     * Determine whether the target CSS style has changed since the last time it was used.
-     * @return {boolean}
-     */
-    changed: cacheWhenLocked( function() {
-        var currentCss = this.getCss(),
-            changed = currentCss !== this._lastCss;
-        this._lastCss = currentCss;
-        return changed;
-    } ),
-
-    cacheWhenLocked: cacheWhenLocked,
-
-    lock: function() {
-        ++this._locked;
-    },
-
-    unlock: function() {
-        if( !--this._locked ) {
-            delete this._lockedValues;
-        }
-    }
-};
-
-})();/**
- * Handles parsing, caching, and detecting changes to background (and -pie-background) CSS
- * @constructor
- * @param {Element} el the target element
- */
-PIE.BackgroundStyleInfo = PIE.StyleInfoBase.newStyleInfo( {
-
-    cssProperty: PIE.CSS_PREFIX + 'background',
-    styleProperty: PIE.STYLE_PREFIX + 'Background',
-
-    attachIdents: { 'scroll':1, 'fixed':1, 'local':1 },
-    repeatIdents: { 'repeat-x':1, 'repeat-y':1, 'repeat':1, 'no-repeat':1 },
-    originAndClipIdents: { 'padding-box':1, 'border-box':1, 'content-box':1 },
-    positionIdents: { 'top':1, 'right':1, 'bottom':1, 'left':1, 'center':1 },
-    sizeIdents: { 'contain':1, 'cover':1 },
-    propertyNames: {
-        CLIP: 'backgroundClip',
-        COLOR: 'backgroundColor',
-        IMAGE: 'backgroundImage',
-        ORIGIN: 'backgroundOrigin',
-        POSITION: 'backgroundPosition',
-        REPEAT: 'backgroundRepeat',
-        SIZE: 'backgroundSize'
-    },
-
-    /**
-     * For background styles, we support the -pie-background property but fall back to the standard
-     * backround* properties.  The reason we have to use the prefixed version is that IE natively
-     * parses the standard properties and if it sees something it doesn't know how to parse, for example
-     * multiple values or gradient definitions, it will throw that away and not make it available through
-     * currentStyle.
-     *
-     * Format of return object:
-     * {
-     *     color: <PIE.Color>,
-     *     bgImages: [
-     *         {
-     *             imgType: 'image',
-     *             imgUrl: 'image.png',
-     *             imgRepeat: <'no-repeat' | 'repeat-x' | 'repeat-y' | 'repeat'>,
-     *             bgPosition: <PIE.BgPosition>,
-     *             bgAttachment: <'scroll' | 'fixed' | 'local'>,
-     *             bgOrigin: <'border-box' | 'padding-box' | 'content-box'>,
-     *             bgClip: <'border-box' | 'padding-box'>,
-     *             bgSize: <PIE.BgSize>,
-     *             origString: 'url(img.png) no-repeat top left'
-     *         },
-     *         {
-     *             imgType: 'linear-gradient',
-     *             gradientStart: <PIE.BgPosition>,
-     *             angle: <PIE.Angle>,
-     *             stops: [
-     *                 { color: <PIE.Color>, offset: <PIE.Length> },
-     *                 { color: <PIE.Color>, offset: <PIE.Length> }, ...
-     *             ]
-     *         }
-     *     ]
-     * }
-     * @param {String} css
-     * @override
-     */
-    parseCss: function( css ) {
-        var el = this.targetElement,
-            cs = el.currentStyle,
-            tokenizer, token, image,
-            tok_type = PIE.Tokenizer.Type,
-            type_operator = tok_type.OPERATOR,
-            type_ident = tok_type.IDENT,
-            type_color = tok_type.COLOR,
-            tokType, tokVal,
-            beginCharIndex = 0,
-            positionIdents = this.positionIdents,
-            gradient, stop, width, height,
-            props = { bgImages: [] };
-
-        function isBgPosToken( token ) {
-            return token && token.isLengthOrPercent() || ( token.tokenType & type_ident && token.tokenValue in positionIdents );
-        }
-
-        function sizeToken( token ) {
-            return token && ( ( token.isLengthOrPercent() && PIE.getLength( token.tokenValue ) ) || ( token.tokenValue === 'auto' && 'auto' ) );
-        }
-
-        // If the CSS3-specific -pie-background property is present, parse it
-        if( this.getCss3() ) {
-            tokenizer = new PIE.Tokenizer( css );
-            image = {};
-
-            while( token = tokenizer.next() ) {
-                tokType = token.tokenType;
-                tokVal = token.tokenValue;
-
-                if( !image.imgType && tokType & tok_type.FUNCTION && tokVal === 'linear-gradient' ) {
-                    gradient = { stops: [], imgType: tokVal };
-                    stop = {};
-                    while( token = tokenizer.next() ) {
-                        tokType = token.tokenType;
-                        tokVal = token.tokenValue;
-
-                        // If we reached the end of the function and had at least 2 stops, flush the info
-                        if( tokType & tok_type.CHARACTER && tokVal === ')' ) {
-                            if( stop.color ) {
-                                gradient.stops.push( stop );
-                            }
-                            if( gradient.stops.length > 1 ) {
-                                PIE.Util.merge( image, gradient );
-                            }
-                            break;
-                        }
-
-                        // Color stop - must start with color
-                        if( tokType & type_color ) {
-                            // if we already have an angle/position, make sure that the previous token was a comma
-                            if( gradient.angle || gradient.gradientStart ) {
-                                token = tokenizer.prev();
-                                if( token.tokenType !== type_operator ) {
-                                    break; //fail
-                                }
-                                tokenizer.next();
-                            }
-
-                            stop = {
-                                color: PIE.getColor( tokVal )
-                            };
-                            // check for offset following color
-                            token = tokenizer.next();
-                            if( token.isLengthOrPercent() ) {
-                                stop.offset = PIE.getLength( token.tokenValue );
-                            } else {
-                                tokenizer.prev();
-                            }
-                        }
-                        // Angle - can only appear in first spot
-                        else if( tokType & tok_type.ANGLE && !gradient.angle && !stop.color && !gradient.stops.length ) {
-                            gradient.angle = new PIE.Angle( token.tokenValue );
-                        }
-                        else if( isBgPosToken( token ) && !gradient.gradientStart && !stop.color && !gradient.stops.length ) {
-                            tokenizer.prev();
-                            gradient.gradientStart = new PIE.BgPosition(
-                                tokenizer.until( function( t ) {
-                                    return !isBgPosToken( t );
-                                }, false )
-                            );
-                        }
-                        else if( tokType & type_operator && tokVal === ',' ) {
-                            if( stop.color ) {
-                                gradient.stops.push( stop );
-                                stop = {};
-                            }
-                        }
-                        else {
-                            // Found something we didn't recognize; fail without adding image
-                            break;
-                        }
-                    }
-                }
-                else if( !image.imgType && tokType & tok_type.URL ) {
-                    image.imgUrl = tokVal;
-                    image.imgType = 'image';
-                }
-                else if( isBgPosToken( token ) && !image.bgPosition ) {
-                    tokenizer.prev();
-                    image.bgPosition = new PIE.BgPosition(
-                        tokenizer.until( function( t ) {
-                            return !isBgPosToken( t );
-                        }, false )
-                    );
-                }
-                else if( tokType & type_ident ) {
-                    if( tokVal in this.repeatIdents && !image.imgRepeat ) {
-                        image.imgRepeat = tokVal;
-                    }
-                    else if( tokVal in this.originAndClipIdents && !image.bgOrigin ) {
-                        image.bgOrigin = tokVal;
-                        if( ( token = tokenizer.next() ) && ( token.tokenType & type_ident ) &&
-                            token.tokenValue in this.originAndClipIdents ) {
-                            image.bgClip = token.tokenValue;
-                        } else {
-                            image.bgClip = tokVal;
-                            tokenizer.prev();
-                        }
-                    }
-                    else if( tokVal in this.attachIdents && !image.bgAttachment ) {
-                        image.bgAttachment = tokVal;
-                    }
-                    else {
-                        return null;
-                    }
-                }
-                else if( tokType & type_color && !props.color ) {
-                    props.color = PIE.getColor( tokVal );
-                }
-                else if( tokType & type_operator && tokVal === '/' && !image.bgSize && image.bgPosition ) {
-                    // background size
-                    token = tokenizer.next();
-                    if( token.tokenType & type_ident && token.tokenValue in this.sizeIdents ) {
-                        image.bgSize = new PIE.BgSize( token.tokenValue );
-                    }
-                    else if( width = sizeToken( token ) ) {
-                        height = sizeToken( tokenizer.next() );
-                        if ( !height ) {
-                            height = width;
-                            tokenizer.prev();
-                        }
-                        image.bgSize = new PIE.BgSize( width, height );
-                    }
-                    else {
-                        return null;
-                    }
-                }
-                // new layer
-                else if( tokType & type_operator && tokVal === ',' && image.imgType ) {
-                    image.origString = css.substring( beginCharIndex, tokenizer.ch - 1 );
-                    beginCharIndex = tokenizer.ch;
-                    props.bgImages.push( image );
-                    image = {};
-                }
-                else {
-                    // Found something unrecognized; chuck everything
-                    return null;
-                }
-            }
-
-            // leftovers
-            if( image.imgType ) {
-                image.origString = css.substring( beginCharIndex );
-                props.bgImages.push( image );
-            }
-        }
-
-        // Otherwise, use the standard background properties; let IE give us the values rather than parsing them
-        else {
-            this.withActualBg( PIE.ieDocMode < 9 ?
-                function() {
-                    var propNames = this.propertyNames,
-                        posX = cs[propNames.POSITION + 'X'],
-                        posY = cs[propNames.POSITION + 'Y'],
-                        img = cs[propNames.IMAGE],
-                        color = cs[propNames.COLOR];
-
-                    if( color !== 'transparent' ) {
-                        props.color = PIE.getColor( color )
-                    }
-                    if( img !== 'none' ) {
-                        props.bgImages = [ {
-                            imgType: 'image',
-                            imgUrl: new PIE.Tokenizer( img ).next().tokenValue,
-                            imgRepeat: cs[propNames.REPEAT],
-                            bgPosition: new PIE.BgPosition( new PIE.Tokenizer( posX + ' ' + posY ).all() )
-                        } ];
-                    }
-                } :
-                function() {
-                    var propNames = this.propertyNames,
-                        splitter = /\s*,\s*/,
-                        images = cs[propNames.IMAGE].split( splitter ),
-                        color = cs[propNames.COLOR],
-                        repeats, positions, origins, clips, sizes, i, len, image, sizeParts;
-
-                    if( color !== 'transparent' ) {
-                        props.color = PIE.getColor( color )
-                    }
-
-                    len = images.length;
-                    if( len && images[0] !== 'none' ) {
-                        repeats = cs[propNames.REPEAT].split( splitter );
-                        positions = cs[propNames.POSITION].split( splitter );
-                        origins = cs[propNames.ORIGIN].split( splitter );
-                        clips = cs[propNames.CLIP].split( splitter );
-                        sizes = cs[propNames.SIZE].split( splitter );
-
-                        props.bgImages = [];
-                        for( i = 0; i < len; i++ ) {
-                            image = images[ i ];
-                            if( image && image !== 'none' ) {
-                                sizeParts = sizes[i].split( ' ' );
-                                props.bgImages.push( {
-                                    origString: image + ' ' + repeats[ i ] + ' ' + positions[ i ] + ' / ' + sizes[ i ] + ' ' +
-                                                origins[ i ] + ' ' + clips[ i ],
-                                    imgType: 'image',
-                                    imgUrl: new PIE.Tokenizer( image ).next().tokenValue,
-                                    imgRepeat: repeats[ i ],
-                                    bgPosition: new PIE.BgPosition( new PIE.Tokenizer( positions[ i ] ).all() ),
-                                    bgOrigin: origins[ i ],
-                                    bgClip: clips[ i ],
-                                    bgSize: new PIE.BgSize( sizeParts[ 0 ], sizeParts[ 1 ] )
-                                } );
-                            }
-                        }
-                    }
-                }
-            );
-        }
-
-        return ( props.color || props.bgImages[0] ) ? props : null;
-    },
-
-    /**
-     * Execute a function with the actual background styles (not overridden with runtimeStyle
-     * properties set by the renderers) available via currentStyle.
-     * @param fn
-     */
-    withActualBg: function( fn ) {
-        var isIE9 = PIE.ieDocMode > 8,
-            propNames = this.propertyNames,
-            rs = this.targetElement.runtimeStyle,
-            rsImage = rs[propNames.IMAGE],
-            rsColor = rs[propNames.COLOR],
-            rsRepeat = rs[propNames.REPEAT],
-            rsClip, rsOrigin, rsSize, rsPosition, ret;
-
-        if( rsImage ) rs[propNames.IMAGE] = '';
-        if( rsColor ) rs[propNames.COLOR] = '';
-        if( rsRepeat ) rs[propNames.REPEAT] = '';
-        if( isIE9 ) {
-            rsClip = rs[propNames.CLIP];
-            rsOrigin = rs[propNames.ORIGIN];
-            rsPosition = rs[propNames.POSITION];
-            rsSize = rs[propNames.SIZE];
-            if( rsClip ) rs[propNames.CLIP] = '';
-            if( rsOrigin ) rs[propNames.ORIGIN] = '';
-            if( rsPosition ) rs[propNames.POSITION] = '';
-            if( rsSize ) rs[propNames.SIZE] = '';
-        }
-
-        ret = fn.call( this );
-
-        if( rsImage ) rs[propNames.IMAGE] = rsImage;
-        if( rsColor ) rs[propNames.COLOR] = rsColor;
-        if( rsRepeat ) rs[propNames.REPEAT] = rsRepeat;
-        if( isIE9 ) {
-            if( rsClip ) rs[propNames.CLIP] = rsClip;
-            if( rsOrigin ) rs[propNames.ORIGIN] = rsOrigin;
-            if( rsPosition ) rs[propNames.POSITION] = rsPosition;
-            if( rsSize ) rs[propNames.SIZE] = rsSize;
-        }
-
-        return ret;
-    },
-
-    getCss: PIE.StyleInfoBase.cacheWhenLocked( function() {
-        return this.getCss3() ||
-               this.withActualBg( function() {
-                   var cs = this.targetElement.currentStyle,
-                       propNames = this.propertyNames;
-                   return cs[propNames.COLOR] + ' ' + cs[propNames.IMAGE] + ' ' + cs[propNames.REPEAT] + ' ' +
-                   cs[propNames.POSITION + 'X'] + ' ' + cs[propNames.POSITION + 'Y'];
-               } );
-    } ),
-
-    getCss3: PIE.StyleInfoBase.cacheWhenLocked( function() {
-        var el = this.targetElement;
-        return el.style[ this.styleProperty ] || el.currentStyle.getAttribute( this.cssProperty );
-    } ),
-
-    /**
-     * Tests if style.PiePngFix or the -pie-png-fix property is set to true in IE6.
-     */
-    isPngFix: function() {
-        var val = 0, el;
-        if( PIE.ieVersion < 7 ) {
-            el = this.targetElement;
-            val = ( '' + ( el.style[ PIE.STYLE_PREFIX + 'PngFix' ] || el.currentStyle.getAttribute( PIE.CSS_PREFIX + 'png-fix' ) ) === 'true' );
-        }
-        return val;
-    },
-    
-    /**
-     * The isActive logic is slightly different, because getProps() always returns an object
-     * even if it is just falling back to the native background properties.  But we only want
-     * to report is as being "active" if either the -pie-background override property is present
-     * and parses successfully or '-pie-png-fix' is set to true in IE6.
-     */
-    isActive: PIE.StyleInfoBase.cacheWhenLocked( function() {
-        return (this.getCss3() || this.isPngFix()) && !!this.getProps();
-    } )
-
-} );/**
- * Handles parsing, caching, and detecting changes to border CSS
- * @constructor
- * @param {Element} el the target element
- */
-PIE.BorderStyleInfo = PIE.StyleInfoBase.newStyleInfo( {
-
-    sides: [ 'Top', 'Right', 'Bottom', 'Left' ],
-    namedWidths: {
-        'thin': '1px',
-        'medium': '3px',
-        'thick': '5px'
-    },
-
-    parseCss: function( css ) {
-        var w = {},
-            s = {},
-            c = {},
-            active = false,
-            colorsSame = true,
-            stylesSame = true,
-            widthsSame = true;
-
-        this.withActualBorder( function() {
-            var el = this.targetElement,
-                cs = el.currentStyle,
-                i = 0,
-                style, color, width, lastStyle, lastColor, lastWidth, side, ltr;
-            for( ; i < 4; i++ ) {
-                side = this.sides[ i ];
-
-                ltr = side.charAt(0).toLowerCase();
-                style = s[ ltr ] = cs[ 'border' + side + 'Style' ];
-                color = cs[ 'border' + side + 'Color' ];
-                width = cs[ 'border' + side + 'Width' ];
-
-                if( i > 0 ) {
-                    if( style !== lastStyle ) { stylesSame = false; }
-                    if( color !== lastColor ) { colorsSame = false; }
-                    if( width !== lastWidth ) { widthsSame = false; }
-                }
-                lastStyle = style;
-                lastColor = color;
-                lastWidth = width;
-
-                c[ ltr ] = PIE.getColor( color );
-
-                width = w[ ltr ] = PIE.getLength( s[ ltr ] === 'none' ? '0' : ( this.namedWidths[ width ] || width ) );
-                if( width.pixels( this.targetElement ) > 0 ) {
-                    active = true;
-                }
-            }
-        } );
-
-        return active ? {
-            widths: w,
-            styles: s,
-            colors: c,
-            widthsSame: widthsSame,
-            colorsSame: colorsSame,
-            stylesSame: stylesSame
-        } : null;
-    },
-
-    getCss: PIE.StyleInfoBase.cacheWhenLocked( function() {
-        var el = this.targetElement,
-            cs = el.currentStyle,
-            css;
-
-        // Don't redraw or hide borders for cells in border-collapse:collapse tables
-        if( !( el.tagName in PIE.tableCellTags && el.offsetParent.currentStyle.borderCollapse === 'collapse' ) ) {
-            this.withActualBorder( function() {
-                css = cs.borderWidth + '|' + cs.borderStyle + '|' + cs.borderColor;
-            } );
-        }
-        return css;
-    } ),
-
-    /**
-     * Execute a function with the actual border styles (not overridden with runtimeStyle
-     * properties set by the renderers) available via currentStyle.
-     * @param fn
-     */
-    withActualBorder: function( fn ) {
-        var rs = this.targetElement.runtimeStyle,
-            rsWidth = rs.borderWidth,
-            rsColor = rs.borderColor,
-            ret;
-
-        if( rsWidth ) rs.borderWidth = '';
-        if( rsColor ) rs.borderColor = '';
-
-        ret = fn.call( this );
-
-        if( rsWidth ) rs.borderWidth = rsWidth;
-        if( rsColor ) rs.borderColor = rsColor;
-
-        return ret;
-    }
-
-} );
-/**
- * Handles parsing, caching, and detecting changes to border-radius CSS
- * @constructor
- * @param {Element} el the target element
- */
-(function() {
-
-PIE.BorderRadiusStyleInfo = PIE.StyleInfoBase.newStyleInfo( {
-
-    cssProperty: 'border-radius',
-    styleProperty: 'borderRadius',
-
-    parseCss: function( css ) {
-        var p = null, x, y,
-            tokenizer, token, length,
-            hasNonZero = false;
-
-        if( css ) {
-            tokenizer = new PIE.Tokenizer( css );
-
-            function collectLengths() {
-                var arr = [], num;
-                while( ( token = tokenizer.next() ) && token.isLengthOrPercent() ) {
-                    length = PIE.getLength( token.tokenValue );
-                    num = length.getNumber();
-                    if( num < 0 ) {
-                        return null;
-                    }
-                    if( num > 0 ) {
-                        hasNonZero = true;
-                    }
-                    arr.push( length );
-                }
-                return arr.length > 0 && arr.length < 5 ? {
-                        'tl': arr[0],
-                        'tr': arr[1] || arr[0],
-                        'br': arr[2] || arr[0],
-                        'bl': arr[3] || arr[1] || arr[0]
-                    } : null;
-            }
-
-            // Grab the initial sequence of lengths
-            if( x = collectLengths() ) {
-                // See if there is a slash followed by more lengths, for the y-axis radii
-                if( token ) {
-                    if( token.tokenType & PIE.Tokenizer.Type.OPERATOR && token.tokenValue === '/' ) {
-                        y = collectLengths();
-                    }
-                } else {
-                    y = x;
-                }
-
-                // Treat all-zero values the same as no value
-                if( hasNonZero && x && y ) {
-                    p = { x: x, y : y };
-                }
-            }
-        }
-
-        return p;
-    }
-} );
-
-var zero = PIE.getLength( '0' ),
-    zeros = { 'tl': zero, 'tr': zero, 'br': zero, 'bl': zero };
-PIE.BorderRadiusStyleInfo.ALL_ZERO = { x: zeros, y: zeros };
-
-})();/**
- * Handles parsing, caching, and detecting changes to border-image CSS
- * @constructor
- * @param {Element} el the target element
- */
-PIE.BorderImageStyleInfo = PIE.StyleInfoBase.newStyleInfo( {
-
-    cssProperty: 'border-image',
-    styleProperty: 'borderImage',
-
-    repeatIdents: { 'stretch':1, 'round':1, 'repeat':1, 'space':1 },
-
-    parseCss: function( css ) {
-        var p = null, tokenizer, token, type, value,
-            slices, widths, outsets,
-            slashCount = 0,
-            Type = PIE.Tokenizer.Type,
-            IDENT = Type.IDENT,
-            NUMBER = Type.NUMBER,
-            PERCENT = Type.PERCENT;
-
-        if( css ) {
-            tokenizer = new PIE.Tokenizer( css );
-            p = {};
-
-            function isSlash( token ) {
-                return token && ( token.tokenType & Type.OPERATOR ) && ( token.tokenValue === '/' );
-            }
-
-            function isFillIdent( token ) {
-                return token && ( token.tokenType & IDENT ) && ( token.tokenValue === 'fill' );
-            }
-
-            function collectSlicesEtc() {
-                slices = tokenizer.until( function( tok ) {
-                    return !( tok.tokenType & ( NUMBER | PERCENT ) );
-                } );
-
-                if( isFillIdent( tokenizer.next() ) && !p.fill ) {
-                    p.fill = true;
-                } else {
-                    tokenizer.prev();
-                }
-
-                if( isSlash( tokenizer.next() ) ) {
-                    slashCount++;
-                    widths = tokenizer.until( function( token ) {
-                        return !token.isLengthOrPercent() && !( ( token.tokenType & IDENT ) && token.tokenValue === 'auto' );
-                    } );
-
-                    if( isSlash( tokenizer.next() ) ) {
-                        slashCount++;
-                        outsets = tokenizer.until( function( token ) {
-                            return !token.isLength();
-                        } );
-                    }
-                } else {
-                    tokenizer.prev();
-                }
-            }
-
-            while( token = tokenizer.next() ) {
-                type = token.tokenType;
-                value = token.tokenValue;
-
-                // Numbers and/or 'fill' keyword: slice values. May be followed optionally by width values, followed optionally by outset values
-                if( type & ( NUMBER | PERCENT ) && !slices ) {
-                    tokenizer.prev();
-                    collectSlicesEtc();
-                }
-                else if( isFillIdent( token ) && !p.fill ) {
-                    p.fill = true;
-                    collectSlicesEtc();
-                }
-
-                // Idents: one or values for 'repeat'
-                else if( ( type & IDENT ) && this.repeatIdents[value] && !p.repeat ) {
-                    p.repeat = { h: value };
-                    if( token = tokenizer.next() ) {
-                        if( ( token.tokenType & IDENT ) && this.repeatIdents[token.tokenValue] ) {
-                            p.repeat.v = token.tokenValue;
-                        } else {
-                            tokenizer.prev();
-                        }
-                    }
-                }
-
-                // URL of the image
-                else if( ( type & Type.URL ) && !p.src ) {
-                    p.src =  value;
-                }
-
-                // Found something unrecognized; exit.
-                else {
-                    return null;
-                }
-            }
-
-            // Validate what we collected
-            if( !p.src || !slices || slices.length < 1 || slices.length > 4 ||
-                ( widths && widths.length > 4 ) || ( slashCount === 1 && widths.length < 1 ) ||
-                ( outsets && outsets.length > 4 ) || ( slashCount === 2 && outsets.length < 1 ) ) {
-                return null;
-            }
-
-            // Fill in missing values
-            if( !p.repeat ) {
-                p.repeat = { h: 'stretch' };
-            }
-            if( !p.repeat.v ) {
-                p.repeat.v = p.repeat.h;
-            }
-
-            function distributeSides( tokens, convertFn ) {
-                return {
-                    't': convertFn( tokens[0] ),
-                    'r': convertFn( tokens[1] || tokens[0] ),
-                    'b': convertFn( tokens[2] || tokens[0] ),
-                    'l': convertFn( tokens[3] || tokens[1] || tokens[0] )
-                };
-            }
-
-            p.slice = distributeSides( slices, function( tok ) {
-                return PIE.getLength( ( tok.tokenType & NUMBER ) ? tok.tokenValue + 'px' : tok.tokenValue );
-            } );
-
-            if( widths && widths[0] ) {
-                p.widths = distributeSides( widths, function( tok ) {
-                    return tok.isLengthOrPercent() ? PIE.getLength( tok.tokenValue ) : tok.tokenValue;
-                } );
-            }
-
-            if( outsets && outsets[0] ) {
-                p.outset = distributeSides( outsets, function( tok ) {
-                    return tok.isLength() ? PIE.getLength( tok.tokenValue ) : tok.tokenValue;
-                } );
-            }
-        }
-
-        return p;
-    }
-
-} );/**
- * Handles parsing, caching, and detecting changes to box-shadow CSS
- * @constructor
- * @param {Element} el the target element
- */
-PIE.BoxShadowStyleInfo = PIE.StyleInfoBase.newStyleInfo( {
-
-    cssProperty: 'box-shadow',
-    styleProperty: 'boxShadow',
-
-    parseCss: function( css ) {
-        var props,
-            getLength = PIE.getLength,
-            Type = PIE.Tokenizer.Type,
-            tokenizer;
-
-        if( css ) {
-            tokenizer = new PIE.Tokenizer( css );
-            props = { outset: [], inset: [] };
-
-            function parseItem() {
-                var token, type, value, color, lengths, inset, len;
-
-                while( token = tokenizer.next() ) {
-                    value = token.tokenValue;
-                    type = token.tokenType;
-
-                    if( type & Type.OPERATOR && value === ',' ) {
-                        break;
-                    }
-                    else if( token.isLength() && !lengths ) {
-                        tokenizer.prev();
-                        lengths = tokenizer.until( function( token ) {
-                            return !token.isLength();
-                        } );
-                    }
-                    else if( type & Type.COLOR && !color ) {
-                        color = value;
-                    }
-                    else if( type & Type.IDENT && value === 'inset' && !inset ) {
-                        inset = true;
-                    }
-                    else { //encountered an unrecognized token; fail.
-                        return false;
-                    }
-                }
-
-                len = lengths && lengths.length;
-                if( len > 1 && len < 5 ) {
-                    ( inset ? props.inset : props.outset ).push( {
-                        xOffset: getLength( lengths[0].tokenValue ),
-                        yOffset: getLength( lengths[1].tokenValue ),
-                        blur: getLength( lengths[2] ? lengths[2].tokenValue : '0' ),
-                        spread: getLength( lengths[3] ? lengths[3].tokenValue : '0' ),
-                        color: PIE.getColor( color || 'currentColor' )
-                    } );
-                    return true;
-                }
-                return false;
-            }
-
-            while( parseItem() ) {}
-        }
-
-        return props && ( props.inset.length || props.outset.length ) ? props : null;
-    }
-} );
-/**
- * Retrieves the state of the element's visibility and display
- * @constructor
- * @param {Element} el the target element
- */
-PIE.VisibilityStyleInfo = PIE.StyleInfoBase.newStyleInfo( {
-
-    getCss: PIE.StyleInfoBase.cacheWhenLocked( function() {
-        var cs = this.targetElement.currentStyle;
-        return cs.visibility + '|' + cs.display;
-    } ),
-
-    parseCss: function() {
-        var el = this.targetElement,
-            rs = el.runtimeStyle,
-            cs = el.currentStyle,
-            rsVis = rs.visibility,
-            csVis;
-
-        rs.visibility = '';
-        csVis = cs.visibility;
-        rs.visibility = rsVis;
-
-        return {
-            visible: csVis !== 'hidden',
-            displayed: cs.display !== 'none'
-        }
-    },
-
-    /**
-     * Always return false for isActive, since this property alone will not trigger
-     * a renderer to do anything.
-     */
-    isActive: function() {
-        return false;
-    }
-
-} );
-PIE.RendererBase = {
-
-    /**
-     * Create a new Renderer class, with the standard constructor, and augmented by
-     * the RendererBase's members.
-     * @param proto
-     */
-    newRenderer: function( proto ) {
-        function Renderer( el, boundsInfo, styleInfos, parent ) {
-            this.targetElement = el;
-            this.boundsInfo = boundsInfo;
-            this.styleInfos = styleInfos;
-            this.parent = parent;
-        }
-        PIE.Util.merge( Renderer.prototype, PIE.RendererBase, proto );
-        return Renderer;
-    },
-
-    /**
-     * Flag indicating the element has already been positioned at least once.
-     * @type {boolean}
-     */
-    isPositioned: false,
-
-    /**
-     * Determine if the renderer needs to be updated
-     * @return {boolean}
-     */
-    needsUpdate: function() {
-        return false;
-    },
-
-    /**
-     * Run any preparation logic that would affect the main update logic of this
-     * renderer or any of the other renderers, e.g. things that might affect the
-     * element's size or style properties.
-     */
-    prepareUpdate: PIE.emptyFn,
-
-    /**
-     * Tell the renderer to update based on modified properties
-     */
-    updateProps: function() {
-        this.destroy();
-        if( this.isActive() ) {
-            this.draw();
-        }
-    },
-
-    /**
-     * Tell the renderer to update based on modified element position
-     */
-    updatePos: function() {
-        this.isPositioned = true;
-    },
-
-    /**
-     * Tell the renderer to update based on modified element dimensions
-     */
-    updateSize: function() {
-        if( this.isActive() ) {
-            this.draw();
-        } else {
-            this.destroy();
-        }
-    },
-
-
-    /**
-     * Add a layer element, with the given z-order index, to the renderer's main box element. We can't use
-     * z-index because that breaks when the root rendering box's z-index is 'auto' in IE8+ standards mode.
-     * So instead we make sure they are inserted into the DOM in the correct order.
-     * @param {number} index
-     * @param {Element} el
-     */
-    addLayer: function( index, el ) {
-        this.removeLayer( index );
-        for( var layers = this._layers || ( this._layers = [] ), i = index + 1, len = layers.length, layer; i < len; i++ ) {
-            layer = layers[i];
-            if( layer ) {
-                break;
-            }
-        }
-        layers[index] = el;
-        this.getBox().insertBefore( el, layer || null );
-    },
-
-    /**
-     * Retrieve a layer element by its index, or null if not present
-     * @param {number} index
-     * @return {Element}
-     */
-    getLayer: function( index ) {
-        var layers = this._layers;
-        return layers && layers[index] || null;
-    },
-
-    /**
-     * Remove a layer element by its index
-     * @param {number} index
-     */
-    removeLayer: function( index ) {
-        var layer = this.getLayer( index ),
-            box = this._box;
-        if( layer && box ) {
-            box.removeChild( layer );
-            this._layers[index] = null;
-        }
-    },
-
-
-    /**
-     * Get a VML shape by name, creating it if necessary.
-     * @param {string} name A name identifying the element
-     * @param {string=} subElName If specified a subelement of the shape will be created with this tag name
-     * @param {Element} parent The parent element for the shape; will be ignored if 'group' is specified
-     * @param {number=} group If specified, an ordinal group for the shape. 1 or greater. Groups are rendered
-     *                  using container elements in the correct order, to get correct z stacking without z-index.
-     */
-    getShape: function( name, subElName, parent, group ) {
-        var shapes = this._shapes || ( this._shapes = {} ),
-            shape = shapes[ name ],
-            s;
-
-        if( !shape ) {
-            shape = shapes[ name ] = PIE.Util.createVmlElement( 'shape' );
-            if( subElName ) {
-                shape.appendChild( shape[ subElName ] = PIE.Util.createVmlElement( subElName ) );
-            }
-
-            if( group ) {
-                parent = this.getLayer( group );
-                if( !parent ) {
-                    this.addLayer( group, doc.createElement( 'group' + group ) );
-                    parent = this.getLayer( group );
-                }
-            }
-
-            parent.appendChild( shape );
-
-            s = shape.style;
-            s.position = 'absolute';
-            s.left = s.top = 0;
-            s['behavior'] = 'url(#default#VML)';
-        }
-        return shape;
-    },
-
-    /**
-     * Delete a named shape which was created by getShape(). Returns true if a shape with the
-     * given name was found and deleted, or false if there was no shape of that name.
-     * @param {string} name
-     * @return {boolean}
-     */
-    deleteShape: function( name ) {
-        var shapes = this._shapes,
-            shape = shapes && shapes[ name ];
-        if( shape ) {
-            shape.parentNode.removeChild( shape );
-            delete shapes[ name ];
-        }
-        return !!shape;
-    },
-
-
-    /**
-     * For a given set of border radius length/percentage values, convert them to concrete pixel
-     * values based on the current size of the target element.
-     * @param {Object} radii
-     * @return {Object}
-     */
-    getRadiiPixels: function( radii ) {
-        var el = this.targetElement,
-            bounds = this.boundsInfo.getBounds(),
-            w = bounds.w,
-            h = bounds.h,
-            tlX, tlY, trX, trY, brX, brY, blX, blY, f;
-
-        tlX = radii.x['tl'].pixels( el, w );
-        tlY = radii.y['tl'].pixels( el, h );
-        trX = radii.x['tr'].pixels( el, w );
-        trY = radii.y['tr'].pixels( el, h );
-        brX = radii.x['br'].pixels( el, w );
-        brY = radii.y['br'].pixels( el, h );
-        blX = radii.x['bl'].pixels( el, w );
-        blY = radii.y['bl'].pixels( el, h );
-
-        // If any corner ellipses overlap, reduce them all by the appropriate factor. This formula
-        // is taken straight from the CSS3 Backgrounds and Borders spec.
-        f = Math.min(
-            w / ( tlX + trX ),
-            h / ( trY + brY ),
-            w / ( blX + brX ),
-            h / ( tlY + blY )
-        );
-        if( f < 1 ) {
-            tlX *= f;
-            tlY *= f;
-            trX *= f;
-            trY *= f;
-            brX *= f;
-            brY *= f;
-            blX *= f;
-            blY *= f;
-        }
-
-        return {
-            x: {
-                'tl': tlX,
-                'tr': trX,
-                'br': brX,
-                'bl': blX
-            },
-            y: {
-                'tl': tlY,
-                'tr': trY,
-                'br': brY,
-                'bl': blY
-            }
-        }
-    },
-
-    /**
-     * Return the VML path string for the element's background box, with corners rounded.
-     * @param {Object.<{t:number, r:number, b:number, l:number}>} shrink - if present, specifies number of
-     *        pixels to shrink the box path inward from the element's four sides.
-     * @param {number=} mult If specified, all coordinates will be multiplied by this number
-     * @param {Object=} radii If specified, this will be used for the corner radii instead of the properties
-     *        from this renderer's borderRadiusInfo object.
-     * @return {string} the VML path
-     */
-    getBoxPath: function( shrink, mult, radii ) {
-        mult = mult || 1;
-
-        var r, str,
-            bounds = this.boundsInfo.getBounds(),
-            w = bounds.w * mult,
-            h = bounds.h * mult,
-            radInfo = this.styleInfos.borderRadiusInfo,
-            floor = Math.floor, ceil = Math.ceil,
-            shrinkT = shrink ? shrink.t * mult : 0,
-            shrinkR = shrink ? shrink.r * mult : 0,
-            shrinkB = shrink ? shrink.b * mult : 0,
-            shrinkL = shrink ? shrink.l * mult : 0,
-            tlX, tlY, trX, trY, brX, brY, blX, blY;
-
-        if( radii || radInfo.isActive() ) {
-            r = this.getRadiiPixels( radii || radInfo.getProps() );
-
-            tlX = r.x['tl'] * mult;
-            tlY = r.y['tl'] * mult;
-            trX = r.x['tr'] * mult;
-            trY = r.y['tr'] * mult;
-            brX = r.x['br'] * mult;
-            brY = r.y['br'] * mult;
-            blX = r.x['bl'] * mult;
-            blY = r.y['bl'] * mult;
-
-            str = 'm' + floor( shrinkL ) + ',' + floor( tlY ) +
-                'qy' + floor( tlX ) + ',' + floor( shrinkT ) +
-                'l' + ceil( w - trX ) + ',' + floor( shrinkT ) +
-                'qx' + ceil( w - shrinkR ) + ',' + floor( trY ) +
-                'l' + ceil( w - shrinkR ) + ',' + ceil( h - brY ) +
-                'qy' + ceil( w - brX ) + ',' + ceil( h - shrinkB ) +
-                'l' + floor( blX ) + ',' + ceil( h - shrinkB ) +
-                'qx' + floor( shrinkL ) + ',' + ceil( h - blY ) + ' x e';
-        } else {
-            // simplified path for non-rounded box
-            str = 'm' + floor( shrinkL ) + ',' + floor( shrinkT ) +
-                  'l' + ceil( w - shrinkR ) + ',' + floor( shrinkT ) +
-                  'l' + ceil( w - shrinkR ) + ',' + ceil( h - shrinkB ) +
-                  'l' + floor( shrinkL ) + ',' + ceil( h - shrinkB ) +
-                  'xe';
-        }
-        return str;
-    },
-
-
-    /**
-     * Get the container element for the shapes, creating it if necessary.
-     */
-    getBox: function() {
-        var box = this.parent.getLayer( this.boxZIndex ), s;
-
-        if( !box ) {
-            box = doc.createElement( this.boxName );
-            s = box.style;
-            s.position = 'absolute';
-            s.top = s.left = 0;
-            this.parent.addLayer( this.boxZIndex, box );
-        }
-
-        return box;
-    },
-
-
-    /**
-     * Hide the actual border of the element. In IE7 and up we can just set its color to transparent;
-     * however IE6 does not support transparent borders so we have to get tricky with it. Also, some elements
-     * like form buttons require removing the border width altogether, so for those we increase the padding
-     * by the border size.
-     */
-    hideBorder: function() {
-        var el = this.targetElement,
-            cs = el.currentStyle,
-            rs = el.runtimeStyle,
-            tag = el.tagName,
-            isIE6 = PIE.ieVersion === 6,
-            sides, side, i;
-
-        if( ( isIE6 && ( tag in PIE.childlessElements || tag === 'FIELDSET' ) ) ||
-                tag === 'BUTTON' || ( tag === 'INPUT' && el.type in PIE.inputButtonTypes ) ) {
-            rs.borderWidth = '';
-            sides = this.styleInfos.borderInfo.sides;
-            for( i = sides.length; i--; ) {
-                side = sides[ i ];
-                rs[ 'padding' + side ] = '';
-                rs[ 'padding' + side ] = ( PIE.getLength( cs[ 'padding' + side ] ) ).pixels( el ) +
-                                         ( PIE.getLength( cs[ 'border' + side + 'Width' ] ) ).pixels( el ) +
-                                         ( PIE.ieVersion !== 8 && i % 2 ? 1 : 0 ); //needs an extra horizontal pixel to counteract the extra "inner border" going away
-            }
-            rs.borderWidth = 0;
-        }
-        else if( isIE6 ) {
-            // Wrap all the element's children in a custom element, set the element to visiblity:hidden,
-            // and set the wrapper element to visiblity:visible. This hides the outer element's decorations
-            // (background and border) but displays all the contents.
-            // TODO find a better way to do this that doesn't mess up the DOM parent-child relationship,
-            // as this can interfere with other author scripts which add/modify/delete children. Also, this
-            // won't work for elements which cannot take children, e.g. input/button/textarea/img/etc. Look into
-            // using a compositor filter or some other filter which masks the border.
-            if( el.childNodes.length !== 1 || el.firstChild.tagName !== 'ie6-mask' ) {
-                var cont = doc.createElement( 'ie6-mask' ),
-                    s = cont.style, child;
-                s.visibility = 'visible';
-                s.zoom = 1;
-                while( child = el.firstChild ) {
-                    cont.appendChild( child );
-                }
-                el.appendChild( cont );
-                rs.visibility = 'hidden';
-            }
-        }
-        else {
-            rs.borderColor = 'transparent';
-        }
-    },
-
-    unhideBorder: function() {
-        
-    },
-
-
-    /**
-     * Destroy the rendered objects. This is a base implementation which handles common renderer
-     * structures, but individual renderers may override as necessary.
-     */
-    destroy: function() {
-        this.parent.removeLayer( this.boxZIndex );
-        delete this._shapes;
-        delete this._layers;
-    }
-};
-/**
- * Root renderer; creates the outermost container element and handles keeping it aligned
- * with the target element's size and position.
- * @param {Element} el The target element
- * @param {Object} styleInfos The StyleInfo objects
- */
-PIE.RootRenderer = PIE.RendererBase.newRenderer( {
-
-    isActive: function() {
-        var children = this.childRenderers;
-        for( var i in children ) {
-            if( children.hasOwnProperty( i ) && children[ i ].isActive() ) {
-                return true;
-            }
-        }
-        return false;
-    },
-
-    needsUpdate: function() {
-        return this.styleInfos.visibilityInfo.changed();
-    },
-
-    updatePos: function() {
-        if( this.isActive() ) {
-            var el = this.getPositioningElement(),
-                par = el,
-                docEl,
-                parRect,
-                tgtCS = el.currentStyle,
-                tgtPos = tgtCS.position,
-                boxPos,
-                s = this.getBox().style, cs,
-                x = 0, y = 0,
-                elBounds = this.boundsInfo.getBounds();
-
-            if( tgtPos === 'fixed' && PIE.ieVersion > 6 ) {
-                x = elBounds.x;
-                y = elBounds.y;
-                boxPos = tgtPos;
-            } else {
-                // Get the element's offsets from its nearest positioned ancestor. Uses
-                // getBoundingClientRect for accuracy and speed.
-                do {
-                    par = par.offsetParent;
-                } while( par && ( par.currentStyle.position === 'static' ) );
-                if( par ) {
-                    parRect = par.getBoundingClientRect();
-                    cs = par.currentStyle;
-                    x = elBounds.x - parRect.left - ( parseFloat(cs.borderLeftWidth) || 0 );
-                    y = elBounds.y - parRect.top - ( parseFloat(cs.borderTopWidth) || 0 );
-                } else {
-                    docEl = doc.documentElement;
-                    x = elBounds.x + docEl.scrollLeft - docEl.clientLeft;
-                    y = elBounds.y + docEl.scrollTop - docEl.clientTop;
-                }
-                boxPos = 'absolute';
-            }
-
-            s.position = boxPos;
-            s.left = x;
-            s.top = y;
-            s.zIndex = tgtPos === 'static' ? -1 : tgtCS.zIndex;
-            this.isPositioned = true;
-        }
-    },
-
-    updateSize: PIE.emptyFn,
-
-    updateVisibility: function() {
-        var vis = this.styleInfos.visibilityInfo.getProps();
-        this.getBox().style.display = ( vis.visible && vis.displayed ) ? '' : 'none';
-    },
-
-    updateProps: function() {
-        if( this.isActive() ) {
-            this.updateVisibility();
-        } else {
-            this.destroy();
-        }
-    },
-
-    getPositioningElement: function() {
-        var el = this.targetElement;
-        return el.tagName in PIE.tableCellTags ? el.offsetParent : el;
-    },
-
-    getBox: function() {
-        var box = this._box, el;
-        if( !box ) {
-            el = this.getPositioningElement();
-            box = this._box = doc.createElement( 'css3-container' );
-            box.style['direction'] = 'ltr'; //fix positioning bug in rtl environments
-
-            this.updateVisibility();
-
-            el.parentNode.insertBefore( box, el );
-        }
-        return box;
-    },
-
-    finishUpdate: PIE.emptyFn,
-
-    destroy: function() {
-        var box = this._box, par;
-        if( box && ( par = box.parentNode ) ) {
-            par.removeChild( box );
-        }
-        delete this._box;
-        delete this._layers;
-    }
-
-} );
-/**
- * Renderer for element backgrounds.
- * @constructor
- * @param {Element} el The target element
- * @param {Object} styleInfos The StyleInfo objects
- * @param {PIE.RootRenderer} parent
- */
-PIE.BackgroundRenderer = PIE.RendererBase.newRenderer( {
-
-    boxZIndex: 2,
-    boxName: 'background',
-
-    needsUpdate: function() {
-        var si = this.styleInfos;
-        return si.backgroundInfo.changed() || si.borderRadiusInfo.changed();
-    },
-
-    isActive: function() {
-        var si = this.styleInfos;
-        return si.borderImageInfo.isActive() ||
-               si.borderRadiusInfo.isActive() ||
-               si.backgroundInfo.isActive() ||
-               ( si.boxShadowInfo.isActive() && si.boxShadowInfo.getProps().inset );
-    },
-
-    /**
-     * Draw the shapes
-     */
-    draw: function() {
-        var bounds = this.boundsInfo.getBounds();
-        if( bounds.w && bounds.h ) {
-            this.drawBgColor();
-            this.drawBgImages();
-        }
-    },
-
-    /**
-     * Draw the background color shape
-     */
-    drawBgColor: function() {
-        var props = this.styleInfos.backgroundInfo.getProps(),
-            bounds = this.boundsInfo.getBounds(),
-            el = this.targetElement,
-            color = props && props.color,
-            shape, w, h, s, alpha;
-
-        if( color && color.alpha() > 0 ) {
-            this.hideBackground();
-
-            shape = this.getShape( 'bgColor', 'fill', this.getBox(), 1 );
-            w = bounds.w;
-            h = bounds.h;
-            shape.stroked = false;
-            shape.coordsize = w * 2 + ',' + h * 2;
-            shape.coordorigin = '1,1';
-            shape.path = this.getBoxPath( null, 2 );
-            s = shape.style;
-            s.width = w;
-            s.height = h;
-            shape.fill.color = color.colorValue( el );
-
-            alpha = color.alpha();
-            if( alpha < 1 ) {
-                shape.fill.opacity = alpha;
-            }
-        } else {
-            this.deleteShape( 'bgColor' );
-        }
-    },
-
-    /**
-     * Draw all the background image layers
-     */
-    drawBgImages: function() {
-        var props = this.styleInfos.backgroundInfo.getProps(),
-            bounds = this.boundsInfo.getBounds(),
-            images = props && props.bgImages,
-            img, shape, w, h, s, i;
-
-        if( images ) {
-            this.hideBackground();
-
-            w = bounds.w;
-            h = bounds.h;
-
-            i = images.length;
-            while( i-- ) {
-                img = images[i];
-                shape = this.getShape( 'bgImage' + i, 'fill', this.getBox(), 2 );
-
-                shape.stroked = false;
-                shape.fill.type = 'tile';
-                shape.fillcolor = 'none';
-                shape.coordsize = w * 2 + ',' + h * 2;
-                shape.coordorigin = '1,1';
-                shape.path = this.getBoxPath( 0, 2 );
-                s = shape.style;
-                s.width = w;
-                s.height = h;
-
-                if( img.imgType === 'linear-gradient' ) {
-                    this.addLinearGradient( shape, img );
-                }
-                else {
-                    shape.fill.src = img.imgUrl;
-                    this.positionBgImage( shape, i );
-                }
-            }
-        }
-
-        // Delete any bgImage shapes previously created which weren't used above
-        i = images ? images.length : 0;
-        while( this.deleteShape( 'bgImage' + i++ ) ) {}
-    },
-
-
-    /**
-     * Set the position and clipping of the background image for a layer
-     * @param {Element} shape
-     * @param {number} index
-     */
-    positionBgImage: function( shape, index ) {
-        var me = this;
-        PIE.Util.withImageSize( shape.fill.src, function( size ) {
-            var el = me.targetElement,
-                bounds = me.boundsInfo.getBounds(),
-                elW = bounds.w,
-                elH = bounds.h;
-
-            // It's possible that the element dimensions are zero now but weren't when the original
-            // update executed, make sure that's not the case to avoid divide-by-zero error
-            if( elW && elH ) {
-                var fill = shape.fill,
-                    si = me.styleInfos,
-                    border = si.borderInfo.getProps(),
-                    bw = border && border.widths,
-                    bwT = bw ? bw['t'].pixels( el ) : 0,
-                    bwR = bw ? bw['r'].pixels( el ) : 0,
-                    bwB = bw ? bw['b'].pixels( el ) : 0,
-                    bwL = bw ? bw['l'].pixels( el ) : 0,
-                    bg = si.backgroundInfo.getProps().bgImages[ index ],
-                    bgPos = bg.bgPosition ? bg.bgPosition.coords( el, elW - size.w - bwL - bwR, elH - size.h - bwT - bwB ) : { x:0, y:0 },
-                    repeat = bg.imgRepeat,
-                    pxX, pxY,
-                    clipT = 0, clipL = 0,
-                    clipR = elW + 1, clipB = elH + 1, //make sure the default clip region is not inside the box (by a subpixel)
-                    clipAdjust = PIE.ieVersion === 8 ? 0 : 1; //prior to IE8 requires 1 extra pixel in the image clip region
-
-                // Positioning - find the pixel offset from the top/left and convert to a ratio
-                // The position is shifted by half a pixel, to adjust for the half-pixel coordorigin shift which is
-                // needed to fix antialiasing but makes the bg image fuzzy.
-                pxX = Math.round( bgPos.x ) + bwL + 0.5;
-                pxY = Math.round( bgPos.y ) + bwT + 0.5;
-                fill.position = ( pxX / elW ) + ',' + ( pxY / elH );
-
-                // Repeating - clip the image shape
-                if( repeat && repeat !== 'repeat' ) {
-                    if( repeat === 'repeat-x' || repeat === 'no-repeat' ) {
-                        clipT = pxY + 1;
-                        clipB = pxY + size.h + clipAdjust;
-                    }
-                    if( repeat === 'repeat-y' || repeat === 'no-repeat' ) {
-                        clipL = pxX + 1;
-                        clipR = pxX + size.w + clipAdjust;
-                    }
-                    shape.style.clip = 'rect(' + clipT + 'px,' + clipR + 'px,' + clipB + 'px,' + clipL + 'px)';
-                }
-            }
-        } );
-    },
-
-
-    /**
-     * Draw the linear gradient for a gradient layer
-     * @param {Element} shape
-     * @param {Object} info The object holding the information about the gradient
-     */
-    addLinearGradient: function( shape, info ) {
-        var el = this.targetElement,
-            bounds = this.boundsInfo.getBounds(),
-            w = bounds.w,
-            h = bounds.h,
-            fill = shape.fill,
-            stops = info.stops,
-            stopCount = stops.length,
-            PI = Math.PI,
-            GradientUtil = PIE.GradientUtil,
-            perpendicularIntersect = GradientUtil.perpendicularIntersect,
-            distance = GradientUtil.distance,
-            metrics = GradientUtil.getGradientMetrics( el, w, h, info ),
-            angle = metrics.angle,
-            startX = metrics.startX,
-            startY = metrics.startY,
-            startCornerX = metrics.startCornerX,
-            startCornerY = metrics.startCornerY,
-            endCornerX = metrics.endCornerX,
-            endCornerY = metrics.endCornerY,
-            deltaX = metrics.deltaX,
-            deltaY = metrics.deltaY,
-            lineLength = metrics.lineLength,
-            vmlAngle, vmlGradientLength, vmlColors,
-            stopPx, vmlOffsetPct,
-            p, i, j, before, after;
-
-        // In VML land, the angle of the rendered gradient depends on the aspect ratio of the shape's
-        // bounding box; for example specifying a 45 deg angle actually results in a gradient
-        // drawn diagonally from one corner to its opposite corner, which will only appear to the
-        // viewer as 45 degrees if the shape is equilateral.  We adjust for this by taking the x/y deltas
-        // between the start and end points, multiply one of them by the shape's aspect ratio,
-        // and get their arctangent, resulting in an appropriate VML angle. If the angle is perfectly
-        // horizontal or vertical then we don't need to do this conversion.
-        vmlAngle = ( angle % 90 ) ? Math.atan2( deltaX * w / h, deltaY ) / PI * 180 : ( angle + 90 );
-
-        // VML angles are 180 degrees offset from CSS angles
-        vmlAngle += 180;
-        vmlAngle = vmlAngle % 360;
-
-        // Add all the stops to the VML 'colors' list, including the first and last stops.
-        // For each, we find its pixel offset along the gradient-line; if the offset of a stop is less
-        // than that of its predecessor we increase it to be equal. We then map that pixel offset to a
-        // percentage along the VML gradient-line, which runs from shape corner to corner.
-        p = perpendicularIntersect( startCornerX, startCornerY, angle, endCornerX, endCornerY );
-        vmlGradientLength = distance( startCornerX, startCornerY, p[0], p[1] );
-        vmlColors = [];
-        p = perpendicularIntersect( startX, startY, angle, startCornerX, startCornerY );
-        vmlOffsetPct = distance( startX, startY, p[0], p[1] ) / vmlGradientLength * 100;
-
-        // Find the pixel offsets along the CSS3 gradient-line for each stop.
-        stopPx = [];
-        for( i = 0; i < stopCount; i++ ) {
-            stopPx.push( stops[i].offset ? stops[i].offset.pixels( el, lineLength ) :
-                         i === 0 ? 0 : i === stopCount - 1 ? lineLength : null );
-        }
-        // Fill in gaps with evenly-spaced offsets
-        for( i = 1; i < stopCount; i++ ) {
-            if( stopPx[ i ] === null ) {
-                before = stopPx[ i - 1 ];
-                j = i;
-                do {
-                    after = stopPx[ ++j ];
-                } while( after === null );
-                stopPx[ i ] = before + ( after - before ) / ( j - i + 1 );
-            }
-            // Make sure each stop's offset is no less than the one before it
-            stopPx[ i ] = Math.max( stopPx[ i ], stopPx[ i - 1 ] );
-        }
-
-        // Convert to percentage along the VML gradient line and add to the VML 'colors' value
-        for( i = 0; i < stopCount; i++ ) {
-            vmlColors.push(
-                ( vmlOffsetPct + ( stopPx[ i ] / vmlGradientLength * 100 ) ) + '% ' + stops[i].color.colorValue( el )
-            );
-        }
-
-        // Now, finally, we're ready to render the gradient fill. Set the start and end colors to
-        // the first and last stop colors; this just sets outer bounds for the gradient.
-        fill['angle'] = vmlAngle;
-        fill['type'] = 'gradient';
-        fill['method'] = 'sigma';
-        fill['color'] = stops[0].color.colorValue( el );
-        fill['color2'] = stops[stopCount - 1].color.colorValue( el );
-        if( fill['colors'] ) { //sometimes the colors object isn't initialized so we have to assign it directly (?)
-            fill['colors'].value = vmlColors.join( ',' );
-        } else {
-            fill['colors'] = vmlColors.join( ',' );
-        }
-    },
-
-
-    /**
-     * Hide the actual background image and color of the element.
-     */
-    hideBackground: function() {
-        var rs = this.targetElement.runtimeStyle;
-        rs.backgroundImage = 'url(about:blank)'; //ensures the background area reacts to mouse events
-        rs.backgroundColor = 'transparent';
-    },
-
-    destroy: function() {
-        PIE.RendererBase.destroy.call( this );
-        var rs = this.targetElement.runtimeStyle;
-        rs.backgroundImage = rs.backgroundColor = '';
-    }
-
-} );
-/**
- * Renderer for element borders.
- * @constructor
- * @param {Element} el The target element
- * @param {Object} styleInfos The StyleInfo objects
- * @param {PIE.RootRenderer} parent
- */
-PIE.BorderRenderer = PIE.RendererBase.newRenderer( {
-
-    boxZIndex: 4,
-    boxName: 'border',
-
-    needsUpdate: function() {
-        var si = this.styleInfos;
-        return si.borderInfo.changed() || si.borderRadiusInfo.changed();
-    },
-
-    isActive: function() {
-        var si = this.styleInfos;
-        return ( si.borderRadiusInfo.isActive() ||
-                 si.backgroundInfo.isActive() ) &&
-               !si.borderImageInfo.isActive() &&
-               si.borderInfo.isActive(); //check BorderStyleInfo last because it's the most expensive
-    },
-
-    /**
-     * Draw the border shape(s)
-     */
-    draw: function() {
-        var el = this.targetElement,
-            props = this.styleInfos.borderInfo.getProps(),
-            bounds = this.boundsInfo.getBounds(),
-            w = bounds.w,
-            h = bounds.h,
-            shape, stroke, s,
-            segments, seg, i, len;
-
-        if( props ) {
-            this.hideBorder();
-
-            segments = this.getBorderSegments( 2 );
-            for( i = 0, len = segments.length; i < len; i++) {
-                seg = segments[i];
-                shape = this.getShape( 'borderPiece' + i, seg.stroke ? 'stroke' : 'fill', this.getBox() );
-                shape.coordsize = w * 2 + ',' + h * 2;
-                shape.coordorigin = '1,1';
-                shape.path = seg.path;
-                s = shape.style;
-                s.width = w;
-                s.height = h;
-
-                shape.filled = !!seg.fill;
-                shape.stroked = !!seg.stroke;
-                if( seg.stroke ) {
-                    stroke = shape.stroke;
-                    stroke['weight'] = seg.weight + 'px';
-                    stroke.color = seg.color.colorValue( el );
-                    stroke['dashstyle'] = seg.stroke === 'dashed' ? '2 2' : seg.stroke === 'dotted' ? '1 1' : 'solid';
-                    stroke['linestyle'] = seg.stroke === 'double' && seg.weight > 2 ? 'ThinThin' : 'Single';
-                } else {
-                    shape.fill.color = seg.fill.colorValue( el );
-                }
-            }
-
-            // remove any previously-created border shapes which didn't get used above
-            while( this.deleteShape( 'borderPiece' + i++ ) ) {}
-        }
-    },
-
-
-    /**
-     * Get the VML path definitions for the border segment(s).
-     * @param {number=} mult If specified, all coordinates will be multiplied by this number
-     * @return {Array.<string>}
-     */
-    getBorderSegments: function( mult ) {
-        var el = this.targetElement,
-            bounds, elW, elH,
-            borderInfo = this.styleInfos.borderInfo,
-            segments = [],
-            floor, ceil, wT, wR, wB, wL,
-            round = Math.round,
-            borderProps, radiusInfo, radii, widths, styles, colors;
-
-        if( borderInfo.isActive() ) {
-            borderProps = borderInfo.getProps();
-
-            widths = borderProps.widths;
-            styles = borderProps.styles;
-            colors = borderProps.colors;
-
-            if( borderProps.widthsSame && borderProps.stylesSame && borderProps.colorsSame ) {
-                if( colors['t'].alpha() > 0 ) {
-                    // shortcut for identical border on all sides - only need 1 stroked shape
-                    wT = widths['t'].pixels( el ); //thickness
-                    wR = wT / 2; //shrink
-                    segments.push( {
-                        path: this.getBoxPath( { t: wR, r: wR, b: wR, l: wR }, mult ),
-                        stroke: styles['t'],
-                        color: colors['t'],
-                        weight: wT
-                    } );
-                }
-            }
-            else {
-                mult = mult || 1;
-                bounds = this.boundsInfo.getBounds();
-                elW = bounds.w;
-                elH = bounds.h;
-
-                wT = round( widths['t'].pixels( el ) );
-                wR = round( widths['r'].pixels( el ) );
-                wB = round( widths['b'].pixels( el ) );
-                wL = round( widths['l'].pixels( el ) );
-                var pxWidths = {
-                    't': wT,
-                    'r': wR,
-                    'b': wB,
-                    'l': wL
-                };
-
-                radiusInfo = this.styleInfos.borderRadiusInfo;
-                if( radiusInfo.isActive() ) {
-                    radii = this.getRadiiPixels( radiusInfo.getProps() );
-                }
-
-                floor = Math.floor;
-                ceil = Math.ceil;
-
-                function radius( xy, corner ) {
-                    return radii ? radii[ xy ][ corner ] : 0;
-                }
-
-                function curve( corner, shrinkX, shrinkY, startAngle, ccw, doMove ) {
-                    var rx = radius( 'x', corner),
-                        ry = radius( 'y', corner),
-                        deg = 65535,
-                        isRight = corner.charAt( 1 ) === 'r',
-                        isBottom = corner.charAt( 0 ) === 'b';
-                    return ( rx > 0 && ry > 0 ) ?
-                                ( doMove ? 'al' : 'ae' ) +
-                                ( isRight ? ceil( elW - rx ) : floor( rx ) ) * mult + ',' + // center x
-                                ( isBottom ? ceil( elH - ry ) : floor( ry ) ) * mult + ',' + // center y
-                                ( floor( rx ) - shrinkX ) * mult + ',' + // width
-                                ( floor( ry ) - shrinkY ) * mult + ',' + // height
-                                ( startAngle * deg ) + ',' + // start angle
-                                ( 45 * deg * ( ccw ? 1 : -1 ) // angle change
-                            ) : (
-                                ( doMove ? 'm' : 'l' ) +
-                                ( isRight ? elW - shrinkX : shrinkX ) * mult + ',' +
-                                ( isBottom ? elH - shrinkY : shrinkY ) * mult
-                            );
-                }
-
-                function line( side, shrink, ccw, doMove ) {
-                    var
-                        start = (
-                            side === 't' ?
-                                floor( radius( 'x', 'tl') ) * mult + ',' + ceil( shrink ) * mult :
-                            side === 'r' ?
-                                ceil( elW - shrink ) * mult + ',' + floor( radius( 'y', 'tr') ) * mult :
-                            side === 'b' ?
-                                ceil( elW - radius( 'x', 'br') ) * mult + ',' + floor( elH - shrink ) * mult :
-                            // side === 'l' ?
-                                floor( shrink ) * mult + ',' + ceil( elH - radius( 'y', 'bl') ) * mult
-                        ),
-                        end = (
-                            side === 't' ?
-                                ceil( elW - radius( 'x', 'tr') ) * mult + ',' + ceil( shrink ) * mult :
-                            side === 'r' ?
-                                ceil( elW - shrink ) * mult + ',' + ceil( elH - radius( 'y', 'br') ) * mult :
-                            side === 'b' ?
-                                floor( radius( 'x', 'bl') ) * mult + ',' + floor( elH - shrink ) * mult :
-                            // side === 'l' ?
-                                floor( shrink ) * mult + ',' + floor( radius( 'y', 'tl') ) * mult
-                        );
-                    return ccw ? ( doMove ? 'm' + end : '' ) + 'l' + start :
-                                 ( doMove ? 'm' + start : '' ) + 'l' + end;
-                }
-
-
-                function addSide( side, sideBefore, sideAfter, cornerBefore, cornerAfter, baseAngle ) {
-                    var vert = side === 'l' || side === 'r',
-                        sideW = pxWidths[ side ],
-                        beforeX, beforeY, afterX, afterY;
-
-                    if( sideW > 0 && styles[ side ] !== 'none' && colors[ side ].alpha() > 0 ) {
-                        beforeX = pxWidths[ vert ? side : sideBefore ];
-                        beforeY = pxWidths[ vert ? sideBefore : side ];
-                        afterX = pxWidths[ vert ? side : sideAfter ];
-                        afterY = pxWidths[ vert ? sideAfter : side ];
-
-                        if( styles[ side ] === 'dashed' || styles[ side ] === 'dotted' ) {
-                            segments.push( {
-                                path: curve( cornerBefore, beforeX, beforeY, baseAngle + 45, 0, 1 ) +
-                                      curve( cornerBefore, 0, 0, baseAngle, 1, 0 ),
-                                fill: colors[ side ]
-                            } );
-                            segments.push( {
-                                path: line( side, sideW / 2, 0, 1 ),
-                                stroke: styles[ side ],
-                                weight: sideW,
-                                color: colors[ side ]
-                            } );
-                            segments.push( {
-                                path: curve( cornerAfter, afterX, afterY, baseAngle, 0, 1 ) +
-                                      curve( cornerAfter, 0, 0, baseAngle - 45, 1, 0 ),
-                                fill: colors[ side ]
-                            } );
-                        }
-                        else {
-                            segments.push( {
-                                path: curve( cornerBefore, beforeX, beforeY, baseAngle + 45, 0, 1 ) +
-                                      line( side, sideW, 0, 0 ) +
-                                      curve( cornerAfter, afterX, afterY, baseAngle, 0, 0 ) +
-
-                                      ( styles[ side ] === 'double' && sideW > 2 ?
-                                              curve( cornerAfter, afterX - floor( afterX / 3 ), afterY - floor( afterY / 3 ), baseAngle - 45, 1, 0 ) +
-                                              line( side, ceil( sideW / 3 * 2 ), 1, 0 ) +
-                                              curve( cornerBefore, beforeX - floor( beforeX / 3 ), beforeY - floor( beforeY / 3 ), baseAngle, 1, 0 ) +
-                                              'x ' +
-                                              curve( cornerBefore, floor( beforeX / 3 ), floor( beforeY / 3 ), baseAngle + 45, 0, 1 ) +
-                                              line( side, floor( sideW / 3 ), 1, 0 ) +
-                                              curve( cornerAfter, floor( afterX / 3 ), floor( afterY / 3 ), baseAngle, 0, 0 )
-                                          : '' ) +
-
-                                      curve( cornerAfter, 0, 0, baseAngle - 45, 1, 0 ) +
-                                      line( side, 0, 1, 0 ) +
-                                      curve( cornerBefore, 0, 0, baseAngle, 1, 0 ),
-                                fill: colors[ side ]
-                            } );
-                        }
-                    }
-                }
-
-                addSide( 't', 'l', 'r', 'tl', 'tr', 90 );
-                addSide( 'r', 't', 'b', 'tr', 'br', 0 );
-                addSide( 'b', 'r', 'l', 'br', 'bl', -90 );
-                addSide( 'l', 'b', 't', 'bl', 'tl', -180 );
-            }
-        }
-
-        return segments;
-    },
-
-    destroy: function() {
-        var me = this;
-        if (me.finalized || !me.styleInfos.borderImageInfo.isActive()) {
-            me.targetElement.runtimeStyle.borderColor = '';
-        }
-        PIE.RendererBase.destroy.call( me );
-    }
-
-
-} );
-/**
- * Renderer for border-image
- * @constructor
- * @param {Element} el The target element
- * @param {Object} styleInfos The StyleInfo objects
- * @param {PIE.RootRenderer} parent
- */
-PIE.BorderImageRenderer = PIE.RendererBase.newRenderer( {
-
-    boxZIndex: 5,
-    pieceNames: [ 't', 'tr', 'r', 'br', 'b', 'bl', 'l', 'tl', 'c' ],
-
-    needsUpdate: function() {
-        return this.styleInfos.borderImageInfo.changed();
-    },
-
-    isActive: function() {
-        return this.styleInfos.borderImageInfo.isActive();
-    },
-
-    draw: function() {
-        this.getBox(); //make sure pieces are created
-
-        var props = this.styleInfos.borderImageInfo.getProps(),
-            borderProps = this.styleInfos.borderInfo.getProps(),
-            bounds = this.boundsInfo.getBounds(),
-            el = this.targetElement,
-            pieces = this.pieces;
-
-        PIE.Util.withImageSize( props.src, function( imgSize ) {
-            var elW = bounds.w,
-                elH = bounds.h,
-                zero = PIE.getLength( '0' ),
-                widths = props.widths || ( borderProps ? borderProps.widths : { 't': zero, 'r': zero, 'b': zero, 'l': zero } ),
-                widthT = widths['t'].pixels( el ),
-                widthR = widths['r'].pixels( el ),
-                widthB = widths['b'].pixels( el ),
-                widthL = widths['l'].pixels( el ),
-                slices = props.slice,
-                sliceT = slices['t'].pixels( el ),
-                sliceR = slices['r'].pixels( el ),
-                sliceB = slices['b'].pixels( el ),
-                sliceL = slices['l'].pixels( el );
-
-            // Piece positions and sizes
-            function setSizeAndPos( piece, w, h, x, y ) {
-                var s = pieces[piece].style,
-                    max = Math.max;
-                s.width = max(w, 0);
-                s.height = max(h, 0);
-                s.left = x;
-                s.top = y;
-            }
-            setSizeAndPos( 'tl', widthL, widthT, 0, 0 );
-            setSizeAndPos( 't', elW - widthL - widthR, widthT, widthL, 0 );
-            setSizeAndPos( 'tr', widthR, widthT, elW - widthR, 0 );
-            setSizeAndPos( 'r', widthR, elH - widthT - widthB, elW - widthR, widthT );
-            setSizeAndPos( 'br', widthR, widthB, elW - widthR, elH - widthB );
-            setSizeAndPos( 'b', elW - widthL - widthR, widthB, widthL, elH - widthB );
-            setSizeAndPos( 'bl', widthL, widthB, 0, elH - widthB );
-            setSizeAndPos( 'l', widthL, elH - widthT - widthB, 0, widthT );
-            setSizeAndPos( 'c', elW - widthL - widthR, elH - widthT - widthB, widthL, widthT );
-
-
-            // image croppings
-            function setCrops( sides, crop, val ) {
-                for( var i=0, len=sides.length; i < len; i++ ) {
-                    pieces[ sides[i] ]['imagedata'][ crop ] = val;
-                }
-            }
-
-            // corners
-            setCrops( [ 'tl', 't', 'tr' ], 'cropBottom', ( imgSize.h - sliceT ) / imgSize.h );
-            setCrops( [ 'tl', 'l', 'bl' ], 'cropRight', ( imgSize.w - sliceL ) / imgSize.w );
-            setCrops( [ 'bl', 'b', 'br' ], 'cropTop', ( imgSize.h - sliceB ) / imgSize.h );
-            setCrops( [ 'tr', 'r', 'br' ], 'cropLeft', ( imgSize.w - sliceR ) / imgSize.w );
-
-            // edges and center
-            // TODO right now this treats everything like 'stretch', need to support other schemes
-            //if( props.repeat.v === 'stretch' ) {
-                setCrops( [ 'l', 'r', 'c' ], 'cropTop', sliceT / imgSize.h );
-                setCrops( [ 'l', 'r', 'c' ], 'cropBottom', sliceB / imgSize.h );
-            //}
-            //if( props.repeat.h === 'stretch' ) {
-                setCrops( [ 't', 'b', 'c' ], 'cropLeft', sliceL / imgSize.w );
-                setCrops( [ 't', 'b', 'c' ], 'cropRight', sliceR / imgSize.w );
-            //}
-
-            // center fill
-            pieces['c'].style.display = props.fill ? '' : 'none';
-        }, this );
-    },
-
-    getBox: function() {
-        var box = this.parent.getLayer( this.boxZIndex ),
-            s, piece, i,
-            pieceNames = this.pieceNames,
-            len = pieceNames.length;
-
-        if( !box ) {
-            box = doc.createElement( 'border-image' );
-            s = box.style;
-            s.position = 'absolute';
-
-            this.pieces = {};
-
-            for( i = 0; i < len; i++ ) {
-                piece = this.pieces[ pieceNames[i] ] = PIE.Util.createVmlElement( 'rect' );
-                piece.appendChild( PIE.Util.createVmlElement( 'imagedata' ) );
-                s = piece.style;
-                s['behavior'] = 'url(#default#VML)';
-                s.position = "absolute";
-                s.top = s.left = 0;
-                piece['imagedata'].src = this.styleInfos.borderImageInfo.getProps().src;
-                piece.stroked = false;
-                piece.filled = false;
-                box.appendChild( piece );
-            }
-
-            this.parent.addLayer( this.boxZIndex, box );
-        }
-
-        return box;
-    },
-
-    prepareUpdate: function() {
-        if (this.isActive()) {
-            var me = this,
-                el = me.targetElement,
-                rs = el.runtimeStyle,
-                widths = me.styleInfos.borderImageInfo.getProps().widths;
-
-            // Force border-style to solid so it doesn't collapse
-            rs.borderStyle = 'solid';
-
-            // If widths specified in border-image shorthand, override border-width
-            // NOTE px units needed here as this gets used by the IE9 renderer too
-            if ( widths ) {
-                rs.borderTopWidth = widths['t'].pixels( el ) + 'px';
-                rs.borderRightWidth = widths['r'].pixels( el ) + 'px';
-                rs.borderBottomWidth = widths['b'].pixels( el ) + 'px';
-                rs.borderLeftWidth = widths['l'].pixels( el ) + 'px';
-            }
-
-            // Make the border transparent
-            me.hideBorder();
-        }
-    },
-
-    destroy: function() {
-        var me = this,
-            rs = me.targetElement.runtimeStyle;
-        rs.borderStyle = '';
-        if (me.finalized || !me.styleInfos.borderInfo.isActive()) {
-            rs.borderColor = rs.borderWidth = '';
-        }
-        PIE.RendererBase.destroy.call( this );
-    }
-
-} );
-/**
- * Renderer for outset box-shadows
- * @constructor
- * @param {Element} el The target element
- * @param {Object} styleInfos The StyleInfo objects
- * @param {PIE.RootRenderer} parent
- */
-PIE.BoxShadowOutsetRenderer = PIE.RendererBase.newRenderer( {
-
-    boxZIndex: 1,
-    boxName: 'outset-box-shadow',
-
-    needsUpdate: function() {
-        var si = this.styleInfos;
-        return si.boxShadowInfo.changed() || si.borderRadiusInfo.changed();
-    },
-
-    isActive: function() {
-        var boxShadowInfo = this.styleInfos.boxShadowInfo;
-        return boxShadowInfo.isActive() && boxShadowInfo.getProps().outset[0];
-    },
-
-    draw: function() {
-        var me = this,
-            el = this.targetElement,
-            box = this.getBox(),
-            styleInfos = this.styleInfos,
-            shadowInfos = styleInfos.boxShadowInfo.getProps().outset,
-            radii = styleInfos.borderRadiusInfo.getProps(),
-            len = shadowInfos.length,
-            i = len, j,
-            bounds = this.boundsInfo.getBounds(),
-            w = bounds.w,
-            h = bounds.h,
-            clipAdjust = PIE.ieVersion === 8 ? 1 : 0, //workaround for IE8 bug where VML leaks out top/left of clip region by 1px
-            corners = [ 'tl', 'tr', 'br', 'bl' ], corner,
-            shadowInfo, shape, fill, ss, xOff, yOff, spread, blur, shrink, color, alpha, path,
-            totalW, totalH, focusX, focusY, isBottom, isRight;
-
-
-        function getShadowShape( index, corner, xOff, yOff, color, blur, path ) {
-            var shape = me.getShape( 'shadow' + index + corner, 'fill', box, len - index ),
-                fill = shape.fill;
-
-            // Position and size
-            shape['coordsize'] = w * 2 + ',' + h * 2;
-            shape['coordorigin'] = '1,1';
-
-            // Color and opacity
-            shape['stroked'] = false;
-            shape['filled'] = true;
-            fill.color = color.colorValue( el );
-            if( blur ) {
-                fill['type'] = 'gradienttitle'; //makes the VML gradient follow the shape's outline - hooray for undocumented features?!?!
-                fill['color2'] = fill.color;
-                fill['opacity'] = 0;
-            }
-
-            // Path
-            shape.path = path;
-
-            // This needs to go last for some reason, to prevent rendering at incorrect size
-            ss = shape.style;
-            ss.left = xOff;
-            ss.top = yOff;
-            ss.width = w;
-            ss.height = h;
-
-            return shape;
-        }
-
-
-        while( i-- ) {
-            shadowInfo = shadowInfos[ i ];
-            xOff = shadowInfo.xOffset.pixels( el );
-            yOff = shadowInfo.yOffset.pixels( el );
-            spread = shadowInfo.spread.pixels( el ),
-            blur = shadowInfo.blur.pixels( el );
-            color = shadowInfo.color;
-            // Shape path
-            shrink = -spread - blur;
-            if( !radii && blur ) {
-                // If blurring, use a non-null border radius info object so that getBoxPath will
-                // round the corners of the expanded shadow shape rather than squaring them off.
-                radii = PIE.BorderRadiusStyleInfo.ALL_ZERO;
-            }
-            path = this.getBoxPath( { t: shrink, r: shrink, b: shrink, l: shrink }, 2, radii );
-
-            if( blur ) {
-                totalW = ( spread + blur ) * 2 + w;
-                totalH = ( spread + blur ) * 2 + h;
-                focusX = blur * 2 / totalW;
-                focusY = blur * 2 / totalH;
-                if( blur - spread > w / 2 || blur - spread > h / 2 ) {
-                    // If the blur is larger than half the element's narrowest dimension, we cannot do
-                    // this with a single shape gradient, because its focussize would have to be less than
-                    // zero which results in ugly artifacts. Instead we create four shapes, each with its
-                    // gradient focus past center, and then clip them so each only shows the quadrant
-                    // opposite the focus.
-                    for( j = 4; j--; ) {
-                        corner = corners[j];
-                        isBottom = corner.charAt( 0 ) === 'b';
-                        isRight = corner.charAt( 1 ) === 'r';
-                        shape = getShadowShape( i, corner, xOff, yOff, color, blur, path );
-                        fill = shape.fill;
-                        fill['focusposition'] = ( isRight ? 1 - focusX : focusX ) + ',' +
-                                                ( isBottom ? 1 - focusY : focusY );
-                        fill['focussize'] = '0,0';
-
-                        // Clip to show only the appropriate quadrant. Add 1px to the top/left clip values
-                        // in IE8 to prevent a bug where IE8 displays one pixel outside the clip region.
-                        shape.style.clip = 'rect(' + ( ( isBottom ? totalH / 2 : 0 ) + clipAdjust ) + 'px,' +
-                                                     ( isRight ? totalW : totalW / 2 ) + 'px,' +
-                                                     ( isBottom ? totalH : totalH / 2 ) + 'px,' +
-                                                     ( ( isRight ? totalW / 2 : 0 ) + clipAdjust ) + 'px)';
-                    }
-                } else {
-                    // TODO delete old quadrant shapes if resizing expands past the barrier
-                    shape = getShadowShape( i, '', xOff, yOff, color, blur, path );
-                    fill = shape.fill;
-                    fill['focusposition'] = focusX + ',' + focusY;
-                    fill['focussize'] = ( 1 - focusX * 2 ) + ',' + ( 1 - focusY * 2 );
-                }
-            } else {
-                shape = getShadowShape( i, '', xOff, yOff, color, blur, path );
-                alpha = color.alpha();
-                if( alpha < 1 ) {
-                    // shape.style.filter = 'alpha(opacity=' + ( alpha * 100 ) + ')';
-                    // ss.filter = 'progid:DXImageTransform.Microsoft.BasicImage(opacity=' + ( alpha  ) + ')';
-                    shape.fill.opacity = alpha;
-                }
-            }
-        }
-    }
-
-} );
-/**
- * Renderer for re-rendering img elements using VML. Kicks in if the img has
- * a border-radius applied, or if the -pie-png-fix flag is set.
- * @constructor
- * @param {Element} el The target element
- * @param {Object} styleInfos The StyleInfo objects
- * @param {PIE.RootRenderer} parent
- */
-PIE.ImgRenderer = PIE.RendererBase.newRenderer( {
-
-    boxZIndex: 6,
-    boxName: 'imgEl',
-
-    needsUpdate: function() {
-        var si = this.styleInfos;
-        return this.targetElement.src !== this._lastSrc || si.borderRadiusInfo.changed();
-    },
-
-    isActive: function() {
-        var si = this.styleInfos;
-        return si.borderRadiusInfo.isActive() || si.backgroundInfo.isPngFix();
-    },
-
-    draw: function() {
-        this._lastSrc = src;
-        this.hideActualImg();
-
-        var shape = this.getShape( 'img', 'fill', this.getBox() ),
-            fill = shape.fill,
-            bounds = this.boundsInfo.getBounds(),
-            w = bounds.w,
-            h = bounds.h,
-            borderProps = this.styleInfos.borderInfo.getProps(),
-            borderWidths = borderProps && borderProps.widths,
-            el = this.targetElement,
-            src = el.src,
-            round = Math.round,
-            cs = el.currentStyle,
-            getLength = PIE.getLength,
-            s, zero;
-
-        // In IE6, the BorderRenderer will have hidden the border by moving the border-width to
-        // the padding; therefore we want to pretend the borders have no width so they aren't doubled
-        // when adding in the current padding value below.
-        if( !borderWidths || PIE.ieVersion < 7 ) {
-            zero = PIE.getLength( '0' );
-            borderWidths = { 't': zero, 'r': zero, 'b': zero, 'l': zero };
-        }
-
-        shape.stroked = false;
-        fill.type = 'frame';
-        fill.src = src;
-        fill.position = (w ? 0.5 / w : 0) + ',' + (h ? 0.5 / h : 0);
-        shape.coordsize = w * 2 + ',' + h * 2;
-        shape.coordorigin = '1,1';
-        shape.path = this.getBoxPath( {
-            t: round( borderWidths['t'].pixels( el ) + getLength( cs.paddingTop ).pixels( el ) ),
-            r: round( borderWidths['r'].pixels( el ) + getLength( cs.paddingRight ).pixels( el ) ),
-            b: round( borderWidths['b'].pixels( el ) + getLength( cs.paddingBottom ).pixels( el ) ),
-            l: round( borderWidths['l'].pixels( el ) + getLength( cs.paddingLeft ).pixels( el ) )
-        }, 2 );
-        s = shape.style;
-        s.width = w;
-        s.height = h;
-    },
-
-    hideActualImg: function() {
-        this.targetElement.runtimeStyle.filter = 'alpha(opacity=0)';
-    },
-
-    destroy: function() {
-        PIE.RendererBase.destroy.call( this );
-        this.targetElement.runtimeStyle.filter = '';
-    }
-
-} );
-/**
- * Root renderer for IE9; manages the rendering layers in the element's background
- * @param {Element} el The target element
- * @param {Object} styleInfos The StyleInfo objects
- */
-PIE.IE9RootRenderer = PIE.RendererBase.newRenderer( {
-
-    updatePos: PIE.emptyFn,
-    updateSize: PIE.emptyFn,
-    updateVisibility: PIE.emptyFn,
-    updateProps: PIE.emptyFn,
-
-    outerCommasRE: /^,+|,+$/g,
-    innerCommasRE: /,+/g,
-
-    setBackgroundLayer: function(zIndex, bg) {
-        var me = this,
-            bgLayers = me._bgLayers || ( me._bgLayers = [] ),
-            undef;
-        bgLayers[zIndex] = bg || undef;
-    },
-
-    finishUpdate: function() {
-        var me = this,
-            bgLayers = me._bgLayers,
-            bg;
-        if( bgLayers && ( bg = bgLayers.join( ',' ).replace( me.outerCommasRE, '' ).replace( me.innerCommasRE, ',' ) ) !== me._lastBg ) {
-            me._lastBg = me.targetElement.runtimeStyle.background = bg;
-        }
-    },
-
-    destroy: function() {
-        this.targetElement.runtimeStyle.background = '';
-        delete this._bgLayers;
-    }
-
-} );
-/**
- * Renderer for element backgrounds, specific for IE9. Only handles translating CSS3 gradients
- * to an equivalent SVG data URI.
- * @constructor
- * @param {Element} el The target element
- * @param {Object} styleInfos The StyleInfo objects
- */
-PIE.IE9BackgroundRenderer = PIE.RendererBase.newRenderer( {
-
-    bgLayerZIndex: 1,
-
-    needsUpdate: function() {
-        var si = this.styleInfos;
-        return si.backgroundInfo.changed();
-    },
-
-    isActive: function() {
-        var si = this.styleInfos;
-        return si.backgroundInfo.isActive() || si.borderImageInfo.isActive();
-    },
-
-    draw: function() {
-        var me = this,
-            props = me.styleInfos.backgroundInfo.getProps(),
-            bg, images, i = 0, img, bgAreaSize, bgSize;
-
-        if ( props ) {
-            bg = [];
-
-            images = props.bgImages;
-            if ( images ) {
-                while( img = images[ i++ ] ) {
-                    if (img.imgType === 'linear-gradient' ) {
-                        bgAreaSize = me.getBgAreaSize( img.bgOrigin );
-                        bgSize = ( img.bgSize || PIE.BgSize.DEFAULT ).pixels(
-                            me.targetElement, bgAreaSize.w, bgAreaSize.h, bgAreaSize.w, bgAreaSize.h
-                        ),
-                        bg.push(
-                            'url(data:image/svg+xml,' + escape( me.getGradientSvg( img, bgSize.w, bgSize.h ) ) + ') ' +
-                            me.bgPositionToString( img.bgPosition ) + ' / ' + bgSize.w + 'px ' + bgSize.h + 'px ' +
-                            ( img.bgAttachment || '' ) + ' ' + ( img.bgOrigin || '' ) + ' ' + ( img.bgClip || '' )
-                        );
-                    } else {
-                        bg.push( img.origString );
-                    }
-                }
-            }
-
-            if ( props.color ) {
-                bg.push( props.color.val );
-            }
-
-            me.parent.setBackgroundLayer(me.bgLayerZIndex, bg.join(','));
-        }
-    },
-
-    bgPositionToString: function( bgPosition ) {
-        return bgPosition ? bgPosition.tokens.map(function(token) {
-            return token.tokenValue;
-        }).join(' ') : '0 0';
-    },
-
-    getBgAreaSize: function( bgOrigin ) {
-        var me = this,
-            el = me.targetElement,
-            bounds = me.boundsInfo.getBounds(),
-            elW = bounds.w,
-            elH = bounds.h,
-            w = elW,
-            h = elH,
-            borders, getLength, cs;
-
-        if( bgOrigin !== 'border-box' ) {
-            borders = me.styleInfos.borderInfo.getProps();
-            if( borders && ( borders = borders.widths ) ) {
-                w -= borders[ 'l' ].pixels( el ) + borders[ 'l' ].pixels( el );
-                h -= borders[ 't' ].pixels( el ) + borders[ 'b' ].pixels( el );
-            }
-        }
-
-        if ( bgOrigin === 'content-box' ) {
-            getLength = PIE.getLength;
-            cs = el.currentStyle;
-            w -= getLength( cs.paddingLeft ).pixels( el ) + getLength( cs.paddingRight ).pixels( el );
-            h -= getLength( cs.paddingTop ).pixels( el ) + getLength( cs.paddingBottom ).pixels( el );
-        }
-
-        return { w: w, h: h };
-    },
-
-    getGradientSvg: function( info, bgWidth, bgHeight ) {
-        var el = this.targetElement,
-            stopsInfo = info.stops,
-            stopCount = stopsInfo.length,
-            metrics = PIE.GradientUtil.getGradientMetrics( el, bgWidth, bgHeight, info ),
-            startX = metrics.startX,
-            startY = metrics.startY,
-            endX = metrics.endX,
-            endY = metrics.endY,
-            lineLength = metrics.lineLength,
-            stopPx,
-            i, j, before, after,
-            svg;
-
-        // Find the pixel offsets along the CSS3 gradient-line for each stop.
-        stopPx = [];
-        for( i = 0; i < stopCount; i++ ) {
-            stopPx.push( stopsInfo[i].offset ? stopsInfo[i].offset.pixels( el, lineLength ) :
-                         i === 0 ? 0 : i === stopCount - 1 ? lineLength : null );
-        }
-        // Fill in gaps with evenly-spaced offsets
-        for( i = 1; i < stopCount; i++ ) {
-            if( stopPx[ i ] === null ) {
-                before = stopPx[ i - 1 ];
-                j = i;
-                do {
-                    after = stopPx[ ++j ];
-                } while( after === null );
-                stopPx[ i ] = before + ( after - before ) / ( j - i + 1 );
-            }
-        }
-
-        svg = [
-            '<svg width="' + bgWidth + '" height="' + bgHeight + '" xmlns="http://www.w3.org/2000/svg">' +
-                '<defs>' +
-                    '<linearGradient id="g" gradientUnits="userSpaceOnUse"' +
-                    ' x1="' + ( startX / bgWidth * 100 ) + '%" y1="' + ( startY / bgHeight * 100 ) + '%" x2="' + ( endX / bgWidth * 100 ) + '%" y2="' + ( endY / bgHeight * 100 ) + '%">'
-        ];
-
-        // Convert to percentage along the SVG gradient line and add to the stops list
-        for( i = 0; i < stopCount; i++ ) {
-            svg.push(
-                '<stop offset="' + ( stopPx[ i ] / lineLength ) +
-                    '" stop-color="' + stopsInfo[i].color.colorValue( el ) +
-                    '" stop-opacity="' + stopsInfo[i].color.alpha() + '"/>'
-            );
-        }
-
-        svg.push(
-                    '</linearGradient>' +
-                '</defs>' +
-                '<rect width="100%" height="100%" fill="url(#g)"/>' +
-            '</svg>'
-        );
-
-        return svg.join( '' );
-    },
-
-    destroy: function() {
-        this.parent.setBackgroundLayer( this.bgLayerZIndex );
-    }
-
-} );
-/**
- * Renderer for border-image
- * @constructor
- * @param {Element} el The target element
- * @param {Object} styleInfos The StyleInfo objects
- * @param {PIE.RootRenderer} parent
- */
-PIE.IE9BorderImageRenderer = PIE.RendererBase.newRenderer( {
-
-    REPEAT: 'repeat',
-    STRETCH: 'stretch',
-    ROUND: 'round',
-
-    bgLayerZIndex: 0,
-
-    needsUpdate: function() {
-        return this.styleInfos.borderImageInfo.changed();
-    },
-
-    isActive: function() {
-        return this.styleInfos.borderImageInfo.isActive();
-    },
-
-    draw: function() {
-        var me = this,
-            props = me.styleInfos.borderImageInfo.getProps(),
-            borderProps = me.styleInfos.borderInfo.getProps(),
-            bounds = me.boundsInfo.getBounds(),
-            repeat = props.repeat,
-            repeatH = repeat.h,
-            repeatV = repeat.v,
-            el = me.targetElement,
-            isAsync = 0;
-
-        PIE.Util.withImageSize( props.src, function( imgSize ) {
-            var elW = bounds.w,
-                elH = bounds.h,
-                imgW = imgSize.w,
-                imgH = imgSize.h,
-
-                // The image cannot be referenced as a URL directly in the SVG because IE9 throws a strange
-                // security exception (perhaps due to cross-origin policy within data URIs?) Therefore we
-                // work around this by converting the image data into a data URI itself using a transient
-                // canvas. This unfortunately requires the border-image src to be within the same domain,
-                // which isn't a limitation in true border-image, so we need to try and find a better fix.
-                imgSrc = me.imageToDataURI( props.src, imgW, imgH ),
-
-                REPEAT = me.REPEAT,
-                STRETCH = me.STRETCH,
-                ROUND = me.ROUND,
-                ceil = Math.ceil,
-
-                zero = PIE.getLength( '0' ),
-                widths = props.widths || ( borderProps ? borderProps.widths : { 't': zero, 'r': zero, 'b': zero, 'l': zero } ),
-                widthT = widths['t'].pixels( el ),
-                widthR = widths['r'].pixels( el ),
-                widthB = widths['b'].pixels( el ),
-                widthL = widths['l'].pixels( el ),
-                slices = props.slice,
-                sliceT = slices['t'].pixels( el ),
-                sliceR = slices['r'].pixels( el ),
-                sliceB = slices['b'].pixels( el ),
-                sliceL = slices['l'].pixels( el ),
-                centerW = elW - widthL - widthR,
-                middleH = elH - widthT - widthB,
-                imgCenterW = imgW - sliceL - sliceR,
-                imgMiddleH = imgH - sliceT - sliceB,
-
-                // Determine the size of each tile - 'round' is handled below
-                tileSizeT = repeatH === STRETCH ? centerW : imgCenterW * widthT / sliceT,
-                tileSizeR = repeatV === STRETCH ? middleH : imgMiddleH * widthR / sliceR,
-                tileSizeB = repeatH === STRETCH ? centerW : imgCenterW * widthB / sliceB,
-                tileSizeL = repeatV === STRETCH ? middleH : imgMiddleH * widthL / sliceL,
-
-                svg,
-                patterns = [],
-                rects = [],
-                i = 0;
-
-            // For 'round', subtract from each tile's size enough so that they fill the space a whole number of times
-            if (repeatH === ROUND) {
-                tileSizeT -= (tileSizeT - (centerW % tileSizeT || tileSizeT)) / ceil(centerW / tileSizeT);
-                tileSizeB -= (tileSizeB - (centerW % tileSizeB || tileSizeB)) / ceil(centerW / tileSizeB);
-            }
-            if (repeatV === ROUND) {
-                tileSizeR -= (tileSizeR - (middleH % tileSizeR || tileSizeR)) / ceil(middleH / tileSizeR);
-                tileSizeL -= (tileSizeL - (middleH % tileSizeL || tileSizeL)) / ceil(middleH / tileSizeL);
-            }
-
-
-            // Build the SVG for the border-image rendering. Add each piece as a pattern, which is then stretched
-            // or repeated as the fill of a rect of appropriate size.
-            svg = [
-                '<svg width="' + elW + '" height="' + elH + '" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">'
-            ];
-
-            function addImage( x, y, w, h, cropX, cropY, cropW, cropH, tileW, tileH ) {
-                patterns.push(
-                    '<pattern patternUnits="userSpaceOnUse" id="pattern' + i + '" ' +
-                            'x="' + (repeatH === REPEAT ? x + w / 2 - tileW / 2 : x) + '" ' +
-                            'y="' + (repeatV === REPEAT ? y + h / 2 - tileH / 2 : y) + '" ' +
-                            'width="' + tileW + '" height="' + tileH + '">' +
-                        '<svg width="' + tileW + '" height="' + tileH + '" viewBox="' + cropX + ' ' + cropY + ' ' + cropW + ' ' + cropH + '" preserveAspectRatio="none">' +
-                            '<image xlink:href="' + imgSrc + '" x="0" y="0" width="' + imgW + '" height="' + imgH + '" />' +
-                        '</svg>' +
-                    '</pattern>'
-                );
-                rects.push(
-                    '<rect x="' + x + '" y="' + y + '" width="' + w + '" height="' + h + '" fill="url(#pattern' + i + ')" />'
-                );
-                i++;
-            }
-            addImage( 0, 0, widthL, widthT, 0, 0, sliceL, sliceT, widthL, widthT ); // top left
-            addImage( widthL, 0, centerW, widthT, sliceL, 0, imgCenterW, sliceT, tileSizeT, widthT ); // top center
-            addImage( elW - widthR, 0, widthR, widthT, imgW - sliceR, 0, sliceR, sliceT, widthR, widthT ); // top right
-            addImage( 0, widthT, widthL, middleH, 0, sliceT, sliceL, imgMiddleH, widthL, tileSizeL ); // middle left
-            if ( props.fill ) { // center fill
-                addImage( widthL, widthT, centerW, middleH, sliceL, sliceT, imgCenterW, imgMiddleH, 
-                          tileSizeT || tileSizeB || imgCenterW, tileSizeL || tileSizeR || imgMiddleH );
-            }
-            addImage( elW - widthR, widthT, widthR, middleH, imgW - sliceR, sliceT, sliceR, imgMiddleH, widthR, tileSizeR ); // middle right
-            addImage( 0, elH - widthB, widthL, widthB, 0, imgH - sliceB, sliceL, sliceB, widthL, widthB ); // bottom left
-            addImage( widthL, elH - widthB, centerW, widthB, sliceL, imgH - sliceB, imgCenterW, sliceB, tileSizeB, widthB ); // bottom center
-            addImage( elW - widthR, elH - widthB, widthR, widthB, imgW - sliceR, imgH - sliceB, sliceR, sliceB, widthR, widthB ); // bottom right
-
-            svg.push(
-                    '<defs>' +
-                        patterns.join('\n') +
-                    '</defs>' +
-                    rects.join('\n') +
-                '</svg>'
-            );
-
-            me.parent.setBackgroundLayer( me.bgLayerZIndex, 'url(data:image/svg+xml,' + escape( svg.join( '' ) ) + ') no-repeat border-box border-box' );
-
-            // If the border-image's src wasn't immediately available, the SVG for its background layer
-            // will have been created asynchronously after the main element's update has finished; we'll
-            // therefore need to force the root renderer to sync to the final background once finished.
-            if( isAsync ) {
-                me.parent.finishUpdate();
-            }
-        }, me );
-
-        isAsync = 1;
-    },
-
-    /**
-     * Convert a given image to a data URI
-     */
-    imageToDataURI: (function() {
-        var uris = {};
-        return function( src, width, height ) {
-            var uri = uris[ src ],
-                image, canvas;
-            if ( !uri ) {
-                image = new Image();
-                canvas = doc.createElement( 'canvas' );
-                image.src = src;
-                canvas.width = width;
-                canvas.height = height;
-                canvas.getContext( '2d' ).drawImage( image, 0, 0 );
-                uri = uris[ src ] = canvas.toDataURL();
-            }
-            return uri;
-        }
-    })(),
-
-    prepareUpdate: PIE.BorderImageRenderer.prototype.prepareUpdate,
-
-    destroy: function() {
-        var me = this,
-            rs = me.targetElement.runtimeStyle;
-        me.parent.setBackgroundLayer( me.bgLayerZIndex );
-        rs.borderColor = rs.borderStyle = rs.borderWidth = '';
-    }
-
-} );
-
-PIE.Element = (function() {
-
-    var wrappers = {},
-        lazyInitCssProp = PIE.CSS_PREFIX + 'lazy-init',
-        pollCssProp = PIE.CSS_PREFIX + 'poll',
-        hoverClass = PIE.CLASS_PREFIX + 'hover',
-        activeClass = PIE.CLASS_PREFIX + 'active',
-        focusClass = PIE.CLASS_PREFIX + 'focus',
-        firstChildClass = PIE.CLASS_PREFIX + 'first-child',
-        ignorePropertyNames = { 'background':1, 'bgColor':1, 'display': 1 },
-        classNameRegExes = {},
-        dummyArray = [];
-
-
-    function addClass( el, className ) {
-        el.className += ' ' + className;
-    }
-
-    function removeClass( el, className ) {
-        var re = classNameRegExes[ className ] ||
-            ( classNameRegExes[ className ] = new RegExp( '\\b' + className + '\\b', 'g' ) );
-        el.className = el.className.replace( re, '' );
-    }
-
-    function delayAddClass( el, className /*, className2*/ ) {
-        var classes = dummyArray.slice.call( arguments, 1 ),
-            i = classes.length;
-        setTimeout( function() {
-            while( i-- ) {
-                addClass( el, classes[ i ] );
-            }
-        }, 0 );
-    }
-
-    function delayRemoveClass( el, className /*, className2*/ ) {
-        var classes = dummyArray.slice.call( arguments, 1 ),
-            i = classes.length;
-        setTimeout( function() {
-            while( i-- ) {
-                removeClass( el, classes[ i ] );
-            }
-        }, 0 );
-    }
-
-
-
-    function Element( el ) {
-        var renderers,
-            rootRenderer,
-            boundsInfo = new PIE.BoundsInfo( el ),
-            styleInfos,
-            styleInfosArr,
-            initializing,
-            initialized,
-            eventsAttached,
-            eventListeners = [],
-            delayed,
-            destroyed,
-            poll;
-
-        /**
-         * Initialize PIE for this element.
-         */
-        function init() {
-            if( !initialized ) {
-                var docEl,
-                    bounds,
-                    ieDocMode = PIE.ieDocMode,
-                    cs = el.currentStyle,
-                    lazy = cs.getAttribute( lazyInitCssProp ) === 'true',
-                    childRenderers;
-
-                // Polling for size/position changes: default to on in IE8, off otherwise, overridable by -pie-poll
-                poll = cs.getAttribute( pollCssProp );
-                poll = ieDocMode > 7 ? poll !== 'false' : poll === 'true';
-
-                // Force layout so move/resize events will fire. Set this as soon as possible to avoid layout changes
-                // after load, but make sure it only gets called the first time through to avoid recursive calls to init().
-                if( !initializing ) {
-                    initializing = 1;
-                    el.runtimeStyle.zoom = 1;
-                    initFirstChildPseudoClass();
-                }
-
-                boundsInfo.lock();
-
-                // If the -pie-lazy-init:true flag is set, check if the element is outside the viewport and if so, delay initialization
-                if( lazy && ( bounds = boundsInfo.getBounds() ) && ( docEl = doc.documentElement || doc.body ) &&
-                        ( bounds.y > docEl.clientHeight || bounds.x > docEl.clientWidth || bounds.y + bounds.h < 0 || bounds.x + bounds.w < 0 ) ) {
-                    if( !delayed ) {
-                        delayed = 1;
-                        PIE.OnScroll.observe( init );
-                    }
-                } else {
-                    initialized = 1;
-                    delayed = initializing = 0;
-                    PIE.OnScroll.unobserve( init );
-
-                    // Create the style infos and renderers
-                    if ( ieDocMode === 9 ) {
-                        styleInfos = {
-                            backgroundInfo: new PIE.BackgroundStyleInfo( el ),
-                            borderImageInfo: new PIE.BorderImageStyleInfo( el ),
-                            borderInfo: new PIE.BorderStyleInfo( el )
-                        };
-                        styleInfosArr = [
-                            styleInfos.backgroundInfo,
-                            styleInfos.borderImageInfo
-                        ];
-                        rootRenderer = new PIE.IE9RootRenderer( el, boundsInfo, styleInfos );
-                        childRenderers = [
-                            new PIE.IE9BackgroundRenderer( el, boundsInfo, styleInfos, rootRenderer ),
-                            new PIE.IE9BorderImageRenderer( el, boundsInfo, styleInfos, rootRenderer )
-                        ];
-                    } else {
-
-                        styleInfos = {
-                            backgroundInfo: new PIE.BackgroundStyleInfo( el ),
-                            borderInfo: new PIE.BorderStyleInfo( el ),
-                            borderImageInfo: new PIE.BorderImageStyleInfo( el ),
-                            borderRadiusInfo: new PIE.BorderRadiusStyleInfo( el ),
-                            boxShadowInfo: new PIE.BoxShadowStyleInfo( el ),
-                            visibilityInfo: new PIE.VisibilityStyleInfo( el )
-                        };
-                        styleInfosArr = [
-                            styleInfos.backgroundInfo,
-                            styleInfos.borderInfo,
-                            styleInfos.borderImageInfo,
-                            styleInfos.borderRadiusInfo,
-                            styleInfos.boxShadowInfo,
-                            styleInfos.visibilityInfo
-                        ];
-                        rootRenderer = new PIE.RootRenderer( el, boundsInfo, styleInfos );
-                        childRenderers = [
-                            new PIE.BoxShadowOutsetRenderer( el, boundsInfo, styleInfos, rootRenderer ),
-                            new PIE.BackgroundRenderer( el, boundsInfo, styleInfos, rootRenderer ),
-                            //new PIE.BoxShadowInsetRenderer( el, boundsInfo, styleInfos, rootRenderer ),
-                            new PIE.BorderRenderer( el, boundsInfo, styleInfos, rootRenderer ),
-                            new PIE.BorderImageRenderer( el, boundsInfo, styleInfos, rootRenderer )
-                        ];
-                        if( el.tagName === 'IMG' ) {
-                            childRenderers.push( new PIE.ImgRenderer( el, boundsInfo, styleInfos, rootRenderer ) );
-                        }
-                        rootRenderer.childRenderers = childRenderers; // circular reference, can't pass in constructor; TODO is there a cleaner way?
-                    }
-                    renderers = [ rootRenderer ].concat( childRenderers );
-
-                    // Add property change listeners to ancestors if requested
-                    initAncestorEventListeners();
-
-                    // Add to list of polled elements in IE8
-                    if( poll ) {
-                        PIE.Heartbeat.observe( update );
-                        PIE.Heartbeat.run();
-                    }
-
-                    // Trigger rendering
-                    update( 1 );
-                }
-
-                if( !eventsAttached ) {
-                    eventsAttached = 1;
-                    if( ieDocMode < 9 ) {
-                        addListener( el, 'onmove', handleMoveOrResize );
-                    }
-                    addListener( el, 'onresize', handleMoveOrResize );
-                    addListener( el, 'onpropertychange', propChanged );
-                    addListener( el, 'onmouseenter', mouseEntered );
-                    addListener( el, 'onmouseleave', mouseLeft );
-                    addListener( el, 'onmousedown', mousePressed );
-                    if( el.tagName in PIE.focusableElements ) {
-                        addListener( el, 'onfocus', focused );
-                        addListener( el, 'onblur', blurred );
-                    }
-                    PIE.OnResize.observe( handleMoveOrResize );
-
-                    PIE.OnUnload.observe( removeEventListeners );
-                }
-
-                boundsInfo.unlock();
-            }
-        }
-
-
-
-
-        /**
-         * Event handler for onmove and onresize events. Invokes update() only if the element's
-         * bounds have previously been calculated, to prevent multiple runs during page load when
-         * the element has no initial CSS3 properties.
-         */
-        function handleMoveOrResize() {
-            if( boundsInfo && boundsInfo.hasBeenQueried() ) {
-                update();
-            }
-        }
-
-
-        /**
-         * Update position and/or size as necessary. Both move and resize events call
-         * this rather than the updatePos/Size functions because sometimes, particularly
-         * during page load, one will fire but the other won't.
-         */
-        function update( force ) {
-            if( !destroyed ) {
-                if( initialized ) {
-                    var i, len = renderers.length;
-
-                    lockAll();
-                    for( i = 0; i < len; i++ ) {
-                        renderers[i].prepareUpdate();
-                    }
-                    if( force || boundsInfo.positionChanged() ) {
-                        /* TODO just using getBoundingClientRect (used internally by BoundsInfo) for detecting
-                           position changes may not always be accurate; it's possible that
-                           an element will actually move relative to its positioning parent, but its position
-                           relative to the viewport will stay the same. Need to come up with a better way to
-                           track movement. The most accurate would be the same logic used in RootRenderer.updatePos()
-                           but that is a more expensive operation since it does some DOM walking, and we want this
-                           check to be as fast as possible. */
-                        for( i = 0; i < len; i++ ) {
-                            renderers[i].updatePos();
-                        }
-                    }
-                    if( force || boundsInfo.sizeChanged() ) {
-                        for( i = 0; i < len; i++ ) {
-                            renderers[i].updateSize();
-                        }
-                    }
-                    rootRenderer.finishUpdate();
-                    unlockAll();
-                }
-                else if( !initializing ) {
-                    init();
-                }
-            }
-        }
-
-        /**
-         * Handle property changes to trigger update when appropriate.
-         */
-        function propChanged() {
-            var i, len = renderers.length,
-                renderer,
-                e = event;
-
-            // Some elements like <table> fire onpropertychange events for old-school background properties
-            // ('background', 'bgColor') when runtimeStyle background properties are changed, which
-            // results in an infinite loop; therefore we filter out those property names. Also, 'display'
-            // is ignored because size calculations don't work correctly immediately when its onpropertychange
-            // event fires, and because it will trigger an onresize event anyway.
-            if( !destroyed && !( e && e.propertyName in ignorePropertyNames ) ) {
-                if( initialized ) {
-                    lockAll();
-                    for( i = 0; i < len; i++ ) {
-                        renderers[i].prepareUpdate();
-                    }
-                    for( i = 0; i < len; i++ ) {
-                        renderer = renderers[i];
-                        // Make sure position is synced if the element hasn't already been rendered.
-                        // TODO this feels sloppy - look into merging propChanged and update functions
-                        if( !renderer.isPositioned ) {
-                            renderer.updatePos();
-                        }
-                        if( renderer.needsUpdate() ) {
-                            renderer.updateProps();
-                        }
-                    }
-                    rootRenderer.finishUpdate();
-                    unlockAll();
-                }
-                else if( !initializing ) {
-                    init();
-                }
-            }
-        }
-
-
-        /**
-         * Handle mouseenter events. Adds a custom class to the element to allow IE6 to add
-         * hover styles to non-link elements, and to trigger a propertychange update.
-         */
-        function mouseEntered() {
-            //must delay this because the mouseenter event fires before the :hover styles are added.
-            delayAddClass( el, hoverClass );
-        }
-
-        /**
-         * Handle mouseleave events
-         */
-        function mouseLeft() {
-            //must delay this because the mouseleave event fires before the :hover styles are removed.
-            delayRemoveClass( el, hoverClass, activeClass );
-        }
-
-        /**
-         * Handle mousedown events. Adds a custom class to the element to allow IE6 to add
-         * active styles to non-link elements, and to trigger a propertychange update.
-         */
-        function mousePressed() {
-            //must delay this because the mousedown event fires before the :active styles are added.
-            delayAddClass( el, activeClass );
-
-            // listen for mouseups on the document; can't just be on the element because the user might
-            // have dragged out of the element while the mouse button was held down
-            PIE.OnMouseup.observe( mouseReleased );
-        }
-
-        /**
-         * Handle mouseup events
-         */
-        function mouseReleased() {
-            //must delay this because the mouseup event fires before the :active styles are removed.
-            delayRemoveClass( el, activeClass );
-
-            PIE.OnMouseup.unobserve( mouseReleased );
-        }
-
-        /**
-         * Handle focus events. Adds a custom class to the element to trigger a propertychange update.
-         */
-        function focused() {
-            //must delay this because the focus event fires before the :focus styles are added.
-            delayAddClass( el, focusClass );
-        }
-
-        /**
-         * Handle blur events
-         */
-        function blurred() {
-            //must delay this because the blur event fires before the :focus styles are removed.
-            delayRemoveClass( el, focusClass );
-        }
-
-
-        /**
-         * Handle property changes on ancestors of the element; see initAncestorEventListeners()
-         * which adds these listeners as requested with the -pie-watch-ancestors CSS property.
-         */
-        function ancestorPropChanged() {
-            var name = event.propertyName;
-            if( name === 'className' || name === 'id' ) {
-                propChanged();
-            }
-        }
-
-        function lockAll() {
-            boundsInfo.lock();
-            for( var i = styleInfosArr.length; i--; ) {
-                styleInfosArr[i].lock();
-            }
-        }
-
-        function unlockAll() {
-            for( var i = styleInfosArr.length; i--; ) {
-                styleInfosArr[i].unlock();
-            }
-            boundsInfo.unlock();
-        }
-
-
-        function addListener( targetEl, type, handler ) {
-            targetEl.attachEvent( type, handler );
-            eventListeners.push( [ targetEl, type, handler ] );
-        }
-
-        /**
-         * Remove all event listeners from the element and any monitored ancestors.
-         */
-        function removeEventListeners() {
-            if (eventsAttached) {
-                var i = eventListeners.length,
-                    listener;
-
-                while( i-- ) {
-                    listener = eventListeners[ i ];
-                    listener[ 0 ].detachEvent( listener[ 1 ], listener[ 2 ] );
-                }
-
-                PIE.OnUnload.unobserve( removeEventListeners );
-                eventsAttached = 0;
-                eventListeners = [];
-            }
-        }
-
-
-        /**
-         * Clean everything up when the behavior is removed from the element, or the element
-         * is manually destroyed.
-         */
-        function destroy() {
-            if( !destroyed ) {
-                var i, len;
-
-                removeEventListeners();
-
-                destroyed = 1;
-
-                // destroy any active renderers
-                if( renderers ) {
-                    for( i = 0, len = renderers.length; i < len; i++ ) {
-                        renderers[i].finalized = 1;
-                        renderers[i].destroy();
-                    }
-                }
-
-                // Remove from list of polled elements in IE8
-                if( poll ) {
-                    PIE.Heartbeat.unobserve( update );
-                }
-                // Stop onresize listening
-                PIE.OnResize.unobserve( update );
-
-                // Kill references
-                renderers = boundsInfo = styleInfos = styleInfosArr = el = null;
-            }
-        }
-
-
-        /**
-         * If requested via the custom -pie-watch-ancestors CSS property, add onpropertychange and
-         * other event listeners to ancestor(s) of the element so we can pick up style changes
-         * based on CSS rules using descendant selectors.
-         */
-        function initAncestorEventListeners() {
-            var watch = el.currentStyle.getAttribute( PIE.CSS_PREFIX + 'watch-ancestors' ),
-                i, a;
-            if( watch ) {
-                watch = parseInt( watch, 10 );
-                i = 0;
-                a = el.parentNode;
-                while( a && ( watch === 'NaN' || i++ < watch ) ) {
-                    addListener( a, 'onpropertychange', ancestorPropChanged );
-                    addListener( a, 'onmouseenter', mouseEntered );
-                    addListener( a, 'onmouseleave', mouseLeft );
-                    addListener( a, 'onmousedown', mousePressed );
-                    if( a.tagName in PIE.focusableElements ) {
-                        addListener( a, 'onfocus', focused );
-                        addListener( a, 'onblur', blurred );
-                    }
-                    a = a.parentNode;
-                }
-            }
-        }
-
-
-        /**
-         * If the target element is a first child, add a pie_first-child class to it. This allows using
-         * the added class as a workaround for the fact that PIE's rendering element breaks the :first-child
-         * pseudo-class selector.
-         */
-        function initFirstChildPseudoClass() {
-            var tmpEl = el,
-                isFirst = 1;
-            while( tmpEl = tmpEl.previousSibling ) {
-                if( tmpEl.nodeType === 1 ) {
-                    isFirst = 0;
-                    break;
-                }
-            }
-            if( isFirst ) {
-                addClass( el, firstChildClass );
-            }
-        }
-
-
-        // These methods are all already bound to this instance so there's no need to wrap them
-        // in a closure to maintain the 'this' scope object when calling them.
-        this.init = init;
-        this.update = update;
-        this.destroy = destroy;
-        this.el = el;
-    }
-
-    Element.getInstance = function( el ) {
-        var id = PIE.Util.getUID( el );
-        return wrappers[ id ] || ( wrappers[ id ] = new Element( el ) );
-    };
-
-    Element.destroy = function( el ) {
-        var id = PIE.Util.getUID( el ),
-            wrapper = wrappers[ id ];
-        if( wrapper ) {
-            wrapper.destroy();
-            delete wrappers[ id ];
-        }
-    };
-
-    Element.destroyAll = function() {
-        var els = [], wrapper;
-        if( wrappers ) {
-            for( var w in wrappers ) {
-                if( wrappers.hasOwnProperty( w ) ) {
-                    wrapper = wrappers[ w ];
-                    els.push( wrapper.el );
-                    wrapper.destroy();
-                }
-            }
-            wrappers = {};
-        }
-        return els;
-    };
-
-    return Element;
-})();
-
-/*
- * This file exposes the public API for invoking PIE.
- */
-
-
-/**
- * @property supportsVML
- * True if the current IE browser environment has a functioning VML engine. Should be true
- * in most IEs, but in rare cases may be false. If false, PIE will exit immediately when
- * attached to an element; this property may be used for debugging or by external scripts
- * to perform some special action when VML support is absent.
- * @type {boolean}
- */
-PIE[ 'supportsVML' ] = PIE.supportsVML;
-
-
-/**
- * Programatically attach PIE to a single element.
- * @param {Element} el
- */
-PIE[ 'attach' ] = function( el ) {
-    if (PIE.ieDocMode < 10 && PIE.supportsVML) {
-        PIE.Element.getInstance( el ).init();
-    }
-};
-
-
-/**
- * Programatically detach PIE from a single element.
- * @param {Element} el
- */
-PIE[ 'detach' ] = function( el ) {
-    PIE.Element.destroy( el );
-};
-
-
-} // if( !PIE )
-var el = element;
-
-function init() {
-    var PIE = window[ 'PIE' ];
-    if( PIE && doc.media !== 'print' ) { // IE strangely attaches a second copy of the behavior to elements when printing
-        PIE['attach']( el );
-    }
-}
-
-function cleanup() {
-    var PIE = window[ 'PIE' ];
-    if (PIE) {
-        PIE['detach']( el );
-        PIE = el = 0;
-    }
-}
-
-if( el.readyState === 'complete' ) {
-    init();
-}
-</script>
-</PUBLIC:COMPONENT>
diff --git a/templates/tour/pie/PIE_uncompressed.js b/templates/tour/pie/PIE_uncompressed.js
deleted file mode 100644
index 66e54ba4c8a..00000000000
--- a/templates/tour/pie/PIE_uncompressed.js
+++ /dev/null
@@ -1,4443 +0,0 @@
-/*
-PIE: CSS3 rendering for IE
-Version 1.0beta5
-http://css3pie.com
-Dual-licensed for use under the Apache License Version 2.0 or the General Public License (GPL) Version 2.
-*/
-(function(){
-var doc = document;var PIE = window['PIE'];
-
-if( !PIE ) {
-    PIE = window['PIE'] = {
-        CSS_PREFIX: '-pie-',
-        STYLE_PREFIX: 'Pie',
-        CLASS_PREFIX: 'pie_',
-        tableCellTags: {
-            'TD': 1,
-            'TH': 1
-        },
-
-        /**
-         * Lookup table of elements which cannot take custom children.
-         */
-        childlessElements: {
-            'TABLE':1,
-            'THEAD':1,
-            'TBODY':1,
-            'TFOOT':1,
-            'TR':1,
-            'INPUT':1,
-            'TEXTAREA':1,
-            'SELECT':1,
-            'OPTION':1,
-            'IMG':1,
-            'HR':1
-        },
-
-        /**
-         * Elements that can receive user focus
-         */
-        focusableElements: {
-            'A':1,
-            'INPUT':1,
-            'TEXTAREA':1,
-            'SELECT':1,
-            'BUTTON':1
-        },
-
-        /**
-         * Values of the type attribute for input elements displayed as buttons
-         */
-        inputButtonTypes: {
-            'submit':1,
-            'button':1,
-            'reset':1
-        },
-
-        emptyFn: function() {}
-    };
-
-    // Force the background cache to be used. No reason it shouldn't be.
-    try {
-        doc.execCommand( 'BackgroundImageCache', false, true );
-    } catch(e) {}
-
-    (function() {
-        /*
-         * IE version detection approach by James Padolsey, with modifications -- from
-         * http://james.padolsey.com/javascript/detect-ie-in-js-using-conditional-comments/
-         */
-        var ieVersion = 4,
-            div = doc.createElement('div'),
-            all = div.getElementsByTagName('i'),
-            shape;
-        while (
-            div.innerHTML = '<!--[if gt IE ' + (++ieVersion) + ']><i></i><![endif]-->',
-            all[0]
-        ) {}
-        PIE.ieVersion = ieVersion;
-
-        // Detect IE6
-        if( ieVersion === 6 ) {
-            // IE6 can't access properties with leading dash, but can without it.
-            PIE.CSS_PREFIX = PIE.CSS_PREFIX.replace( /^-/, '' );
-        }
-
-        PIE.ieDocMode = doc.documentMode || PIE.ieVersion;
-
-        // Detect VML support (a small number of IE installs don't have a working VML engine)
-        div.innerHTML = '<v:shape adj="1"/>';
-        shape = div.firstChild;
-        shape.style['behavior'] = 'url(#default#VML)';
-        PIE.supportsVML = (typeof shape['adj'] === "object");
-    }());
-/**
- * Utility functions
- */
-(function() {
-    var vmlCreatorDoc,
-        idNum = 0,
-        imageSizes = {};
-
-
-    PIE.Util = {
-
-        /**
-         * To create a VML element, it must be created by a Document which has the VML
-         * namespace set. Unfortunately, if you try to add the namespace programatically
-         * into the main document, you will get an "Unspecified error" when trying to
-         * access document.namespaces before the document is finished loading. To get
-         * around this, we create a DocumentFragment, which in IE land is apparently a
-         * full-fledged Document. It allows adding namespaces immediately, so we add the
-         * namespace there and then have it create the VML element.
-         * @param {string} tag The tag name for the VML element
-         * @return {Element} The new VML element
-         */
-        createVmlElement: function( tag ) {
-            var vmlPrefix = 'css3vml';
-            if( !vmlCreatorDoc ) {
-                vmlCreatorDoc = doc.createDocumentFragment();
-                vmlCreatorDoc.namespaces.add( vmlPrefix, 'urn:schemas-microsoft-com:vml' );
-            }
-            return vmlCreatorDoc.createElement( vmlPrefix + ':' + tag );
-        },
-
-
-        /**
-         * Generate and return a unique ID for a given object. The generated ID is stored
-         * as a property of the object for future reuse.
-         * @param {Object} obj
-         */
-        getUID: function( obj ) {
-            return obj && obj[ '_pieId' ] || ( obj[ '_pieId' ] = '_' + ++idNum );
-        },
-
-
-        /**
-         * Simple utility for merging objects
-         * @param {Object} obj1 The main object into which all others will be merged
-         * @param {...Object} var_args Other objects which will be merged into the first, in order
-         */
-        merge: function( obj1 ) {
-            var i, len, p, objN, args = arguments;
-            for( i = 1, len = args.length; i < len; i++ ) {
-                objN = args[i];
-                for( p in objN ) {
-                    if( objN.hasOwnProperty( p ) ) {
-                        obj1[ p ] = objN[ p ];
-                    }
-                }
-            }
-            return obj1;
-        },
-
-
-        /**
-         * Execute a callback function, passing it the dimensions of a given image once
-         * they are known.
-         * @param {string} src The source URL of the image
-         * @param {function({w:number, h:number})} func The callback function to be called once the image dimensions are known
-         * @param {Object} ctx A context object which will be used as the 'this' value within the executed callback function
-         */
-        withImageSize: function( src, func, ctx ) {
-            var size = imageSizes[ src ], img, queue;
-            if( size ) {
-                // If we have a queue, add to it
-                if( Object.prototype.toString.call( size ) === '[object Array]' ) {
-                    size.push( [ func, ctx ] );
-                }
-                // Already have the size cached, call func right away
-                else {
-                    func.call( ctx, size );
-                }
-            } else {
-                queue = imageSizes[ src ] = [ [ func, ctx ] ]; //create queue
-                img = new Image();
-                img.onload = function() {
-                    size = imageSizes[ src ] = { w: img.width, h: img.height };
-                    for( var i = 0, len = queue.length; i < len; i++ ) {
-                        queue[ i ][ 0 ].call( queue[ i ][ 1 ], size );
-                    }
-                    img.onload = null;
-                };
-                img.src = src;
-            }
-        }
-    };
-})();/**
- * Utility functions for handling gradients
- */
-PIE.GradientUtil = {
-
-    getGradientMetrics: function( el, width, height, gradientInfo ) {
-        var angle = gradientInfo.angle,
-            startPos = gradientInfo.gradientStart,
-            startX, startY,
-            endX, endY,
-            startCornerX, startCornerY,
-            endCornerX, endCornerY,
-            deltaX, deltaY,
-            p, UNDEF;
-
-        // Find the "start" and "end" corners; these are the corners furthest along the gradient line.
-        // This is used below to find the start/end positions of the CSS3 gradient-line, and also in finding
-        // the total length of the VML rendered gradient-line corner to corner.
-        function findCorners() {
-            startCornerX = ( angle >= 90 && angle < 270 ) ? width : 0;
-            startCornerY = angle < 180 ? height : 0;
-            endCornerX = width - startCornerX;
-            endCornerY = height - startCornerY;
-        }
-
-        // Normalize the angle to a value between [0, 360)
-        function normalizeAngle() {
-            while( angle < 0 ) {
-                angle += 360;
-            }
-            angle = angle % 360;
-        }
-
-        // Find the start and end points of the gradient
-        if( startPos ) {
-            startPos = startPos.coords( el, width, height );
-            startX = startPos.x;
-            startY = startPos.y;
-        }
-        if( angle ) {
-            angle = angle.degrees();
-
-            normalizeAngle();
-            findCorners();
-
-            // If no start position was specified, then choose a corner as the starting point.
-            if( !startPos ) {
-                startX = startCornerX;
-                startY = startCornerY;
-            }
-
-            // Find the end position by extending a perpendicular line from the gradient-line which
-            // intersects the corner opposite from the starting corner.
-            p = PIE.GradientUtil.perpendicularIntersect( startX, startY, angle, endCornerX, endCornerY );
-            endX = p[0];
-            endY = p[1];
-        }
-        else if( startPos ) {
-            // Start position but no angle specified: find the end point by rotating 180deg around the center
-            endX = width - startX;
-            endY = height - startY;
-        }
-        else {
-            // Neither position nor angle specified; create vertical gradient from top to bottom
-            startX = startY = endX = 0;
-            endY = height;
-        }
-        deltaX = endX - startX;
-        deltaY = endY - startY;
-
-        if( angle === UNDEF ) {
-            // Get the angle based on the change in x/y from start to end point. Checks first for horizontal
-            // or vertical angles so they get exact whole numbers rather than what atan2 gives.
-            angle = ( !deltaX ? ( deltaY < 0 ? 90 : 270 ) :
-                        ( !deltaY ? ( deltaX < 0 ? 180 : 0 ) :
-                            -Math.atan2( deltaY, deltaX ) / Math.PI * 180
-                        )
-                    );
-            normalizeAngle();
-            findCorners();
-        }
-
-        return {
-            angle: angle,
-            startX: startX,
-            startY: startY,
-            endX: endX,
-            endY: endY,
-            startCornerX: startCornerX,
-            startCornerY: startCornerY,
-            endCornerX: endCornerX,
-            endCornerY: endCornerY,
-            deltaX: deltaX,
-            deltaY: deltaY,
-            lineLength: PIE.GradientUtil.distance( startX, startY, endX, endY )
-        }
-    },
-
-    /**
-     * Find the point along a given line (defined by a starting point and an angle), at which
-     * that line is intersected by a perpendicular line extending through another point.
-     * @param x1 - x coord of the starting point
-     * @param y1 - y coord of the starting point
-     * @param angle - angle of the line extending from the starting point (in degrees)
-     * @param x2 - x coord of point along the perpendicular line
-     * @param y2 - y coord of point along the perpendicular line
-     * @return [ x, y ]
-     */
-    perpendicularIntersect: function( x1, y1, angle, x2, y2 ) {
-        // Handle straight vertical and horizontal angles, for performance and to avoid
-        // divide-by-zero errors.
-        if( angle === 0 || angle === 180 ) {
-            return [ x2, y1 ];
-        }
-        else if( angle === 90 || angle === 270 ) {
-            return [ x1, y2 ];
-        }
-        else {
-            // General approach: determine the Ax+By=C formula for each line (the slope of the second
-            // line is the negative inverse of the first) and then solve for where both formulas have
-            // the same x/y values.
-            var a1 = Math.tan( -angle * Math.PI / 180 ),
-                c1 = a1 * x1 - y1,
-                a2 = -1 / a1,
-                c2 = a2 * x2 - y2,
-                d = a2 - a1,
-                endX = ( c2 - c1 ) / d,
-                endY = ( a1 * c2 - a2 * c1 ) / d;
-            return [ endX, endY ];
-        }
-    },
-
-    /**
-     * Find the distance between two points
-     * @param {Number} p1x
-     * @param {Number} p1y
-     * @param {Number} p2x
-     * @param {Number} p2y
-     * @return {Number} the distance
-     */
-    distance: function( p1x, p1y, p2x, p2y ) {
-        var dx = p2x - p1x,
-            dy = p2y - p1y;
-        return Math.abs(
-            dx === 0 ? dy :
-            dy === 0 ? dx :
-            Math.sqrt( dx * dx + dy * dy )
-        );
-    }
-
-};/**
- * 
- */
-PIE.Observable = function() {
-    /**
-     * List of registered observer functions
-     */
-    this.observers = [];
-
-    /**
-     * Hash of function ids to their position in the observers list, for fast lookup
-     */
-    this.indexes = {};
-};
-PIE.Observable.prototype = {
-
-    observe: function( fn ) {
-        var id = PIE.Util.getUID( fn ),
-            indexes = this.indexes,
-            observers = this.observers;
-        if( !( id in indexes ) ) {
-            indexes[ id ] = observers.length;
-            observers.push( fn );
-        }
-    },
-
-    unobserve: function( fn ) {
-        var id = PIE.Util.getUID( fn ),
-            indexes = this.indexes;
-        if( id && id in indexes ) {
-            delete this.observers[ indexes[ id ] ];
-            delete indexes[ id ];
-        }
-    },
-
-    fire: function() {
-        var o = this.observers,
-            i = o.length;
-        while( i-- ) {
-            o[ i ] && o[ i ]();
-        }
-    }
-
-};/*
- * Simple heartbeat timer - this is a brute-force workaround for syncing issues caused by IE not
- * always firing the onmove and onresize events when elements are moved or resized. We check a few
- * times every second to make sure the elements have the correct position and size. See Element.js
- * which adds heartbeat listeners based on the custom -pie-poll flag, which defaults to true in IE8
- * and false elsewhere.
- */
-
-PIE.Heartbeat = new PIE.Observable();
-PIE.Heartbeat.run = function() {
-    var me = this;
-    if( !me.running ) {
-        setInterval( function() { me.fire() }, 250 );
-        me.running = 1;
-    }
-};
-/**
- * Create an observable listener for the onunload event
- */
-(function() {
-    PIE.OnUnload = new PIE.Observable();
-
-    function handleUnload() {
-        PIE.OnUnload.fire();
-        window.detachEvent( 'onunload', handleUnload );
-        window[ 'PIE' ] = null;
-    }
-
-    window.attachEvent( 'onunload', handleUnload );
-
-    /**
-     * Attach an event which automatically gets detached onunload
-     */
-    PIE.OnUnload.attachManagedEvent = function( target, name, handler ) {
-        target.attachEvent( name, handler );
-        this.observe( function() {
-            target.detachEvent( name, handler );
-        } );
-    };
-})()/**
- * Create a single observable listener for window resize events.
- */
-PIE.OnResize = new PIE.Observable();
-
-PIE.OnUnload.attachManagedEvent( window, 'onresize', function() { PIE.OnResize.fire(); } );
-/**
- * Create a single observable listener for scroll events. Used for lazy loading based
- * on the viewport, and for fixed position backgrounds.
- */
-(function() {
-    PIE.OnScroll = new PIE.Observable();
-
-    function scrolled() {
-        PIE.OnScroll.fire();
-    }
-
-    PIE.OnUnload.attachManagedEvent( window, 'onscroll', scrolled );
-
-    PIE.OnResize.observe( scrolled );
-})();
-/**
- * Listen for printing events, destroy all active PIE instances when printing, and
- * restore them afterward.
- */
-(function() {
-
-    var elements;
-
-    function beforePrint() {
-        elements = PIE.Element.destroyAll();
-    }
-
-    function afterPrint() {
-        if( elements ) {
-            for( var i = 0, len = elements.length; i < len; i++ ) {
-                PIE[ 'attach' ]( elements[i] );
-            }
-            elements = 0;
-        }
-    }
-
-    PIE.OnUnload.attachManagedEvent( window, 'onbeforeprint', beforePrint );
-    PIE.OnUnload.attachManagedEvent( window, 'onafterprint', afterPrint );
-
-})();/**
- * Create a single observable listener for document mouseup events.
- */
-PIE.OnMouseup = new PIE.Observable();
-
-PIE.OnUnload.attachManagedEvent( doc, 'onmouseup', function() { PIE.OnMouseup.fire(); } );
-/**
- * Wrapper for length and percentage style values. The value is immutable. A singleton instance per unique
- * value is returned from PIE.getLength() - always use that instead of instantiating directly.
- * @constructor
- * @param {string} val The CSS string representing the length. It is assumed that this will already have
- *                 been validated as a valid length or percentage syntax.
- */
-PIE.Length = (function() {
-    var lengthCalcEl = doc.createElement( 'length-calc' ),
-        parent = doc.documentElement,
-        s = lengthCalcEl.style,
-        conversions = {},
-        units = [ 'mm', 'cm', 'in', 'pt', 'pc' ],
-        i = units.length,
-        instances = {};
-
-    s.position = 'absolute';
-    s.top = s.left = '-9999px';
-
-    parent.appendChild( lengthCalcEl );
-    while( i-- ) {
-        lengthCalcEl.style.width = '100' + units[i];
-        conversions[ units[i] ] = lengthCalcEl.offsetWidth / 100;
-    }
-    parent.removeChild( lengthCalcEl );
-
-    // All calcs from here on will use 1em
-    lengthCalcEl.style.width = '1em';
-
-
-    function Length( val ) {
-        this.val = val;
-    }
-    Length.prototype = {
-        /**
-         * Regular expression for matching the length unit
-         * @private
-         */
-        unitRE: /(px|em|ex|mm|cm|in|pt|pc|%)$/,
-
-        /**
-         * Get the numeric value of the length
-         * @return {number} The value
-         */
-        getNumber: function() {
-            var num = this.num,
-                UNDEF;
-            if( num === UNDEF ) {
-                num = this.num = parseFloat( this.val );
-            }
-            return num;
-        },
-
-        /**
-         * Get the unit of the length
-         * @return {string} The unit
-         */
-        getUnit: function() {
-            var unit = this.unit,
-                m;
-            if( !unit ) {
-                m = this.val.match( this.unitRE );
-                unit = this.unit = ( m && m[0] ) || 'px';
-            }
-            return unit;
-        },
-
-        /**
-         * Determine whether this is a percentage length value
-         * @return {boolean}
-         */
-        isPercentage: function() {
-            return this.getUnit() === '%';
-        },
-
-        /**
-         * Resolve this length into a number of pixels.
-         * @param {Element} el - the context element, used to resolve font-relative values
-         * @param {(function():number|number)=} pct100 - the number of pixels that equal a 100% percentage. This can be either a number or a
-         *                  function which will be called to return the number.
-         */
-        pixels: function( el, pct100 ) {
-            var num = this.getNumber(),
-                unit = this.getUnit();
-            switch( unit ) {
-                case "px":
-                    return num;
-                case "%":
-                    return num * ( typeof pct100 === 'function' ? pct100() : pct100 ) / 100;
-                case "em":
-                    return num * this.getEmPixels( el );
-                case "ex":
-                    return num * this.getEmPixels( el ) / 2;
-                default:
-                    return num * conversions[ unit ];
-            }
-        },
-
-        /**
-         * The em and ex units are relative to the font-size of the current element,
-         * however if the font-size is set using non-pixel units then we get that value
-         * rather than a pixel conversion. To get around this, we keep a floating element
-         * with width:1em which we insert into the target element and then read its offsetWidth.
-         * For elements that won't accept a child we insert into the parent node and perform
-         * additional calculation. If the font-size *is* specified in pixels, then we use that
-         * directly to avoid the expensive DOM manipulation.
-         * @param {Element} el
-         * @return {number}
-         */
-        getEmPixels: function( el ) {
-            var fs = el.currentStyle.fontSize,
-                px, parent, me;
-
-            if( fs.indexOf( 'px' ) > 0 ) {
-                return parseFloat( fs );
-            }
-            else if( el.tagName in PIE.childlessElements ) {
-                me = this;
-                parent = el.parentNode;
-                return PIE.getLength( fs ).pixels( parent, function() {
-                    return me.getEmPixels( parent );
-                } );
-            }
-            else {
-                el.appendChild( lengthCalcEl );
-                px = lengthCalcEl.offsetWidth;
-                if( lengthCalcEl.parentNode === el ) { //not sure how this could be false but it sometimes is
-                    el.removeChild( lengthCalcEl );
-                }
-                return px;
-            }
-        }
-    };
-
-
-    /**
-     * Retrieve a PIE.Length instance for the given value. A shared singleton instance is returned for each unique value.
-     * @param {string} val The CSS string representing the length. It is assumed that this will already have
-     *                 been validated as a valid length or percentage syntax.
-     */
-    PIE.getLength = function( val ) {
-        return instances[ val ] || ( instances[ val ] = new Length( val ) );
-    };
-
-    return Length;
-})();
-/**
- * Wrapper for a CSS3 bg-position value. Takes up to 2 position keywords and 2 lengths/percentages.
- * @constructor
- * @param {Array.<PIE.Tokenizer.Token>} tokens The tokens making up the background position value.
- */
-PIE.BgPosition = (function() {
-
-    var length_fifty = PIE.getLength( '50%' ),
-        vert_idents = { 'top': 1, 'center': 1, 'bottom': 1 },
-        horiz_idents = { 'left': 1, 'center': 1, 'right': 1 };
-
-
-    function BgPosition( tokens ) {
-        this.tokens = tokens;
-    }
-    BgPosition.prototype = {
-        /**
-         * Normalize the values into the form:
-         * [ xOffsetSide, xOffsetLength, yOffsetSide, yOffsetLength ]
-         * where: xOffsetSide is either 'left' or 'right',
-         *        yOffsetSide is either 'top' or 'bottom',
-         *        and x/yOffsetLength are both PIE.Length objects.
-         * @return {Array}
-         */
-        getValues: function() {
-            if( !this._values ) {
-                var tokens = this.tokens,
-                    len = tokens.length,
-                    Tokenizer = PIE.Tokenizer,
-                    identType = Tokenizer.Type,
-                    length_zero = PIE.getLength( '0' ),
-                    type_ident = identType.IDENT,
-                    type_length = identType.LENGTH,
-                    type_percent = identType.PERCENT,
-                    type, value,
-                    vals = [ 'left', length_zero, 'top', length_zero ];
-
-                // If only one value, the second is assumed to be 'center'
-                if( len === 1 ) {
-                    tokens.push( new Tokenizer.Token( type_ident, 'center' ) );
-                    len++;
-                }
-
-                // Two values - CSS2
-                if( len === 2 ) {
-                    // If both idents, they can appear in either order, so switch them if needed
-                    if( type_ident & ( tokens[0].tokenType | tokens[1].tokenType ) &&
-                        tokens[0].tokenValue in vert_idents && tokens[1].tokenValue in horiz_idents ) {
-                        tokens.push( tokens.shift() );
-                    }
-                    if( tokens[0].tokenType & type_ident ) {
-                        if( tokens[0].tokenValue === 'center' ) {
-                            vals[1] = length_fifty;
-                        } else {
-                            vals[0] = tokens[0].tokenValue;
-                        }
-                    }
-                    else if( tokens[0].isLengthOrPercent() ) {
-                        vals[1] = PIE.getLength( tokens[0].tokenValue );
-                    }
-                    if( tokens[1].tokenType & type_ident ) {
-                        if( tokens[1].tokenValue === 'center' ) {
-                            vals[3] = length_fifty;
-                        } else {
-                            vals[2] = tokens[1].tokenValue;
-                        }
-                    }
-                    else if( tokens[1].isLengthOrPercent() ) {
-                        vals[3] = PIE.getLength( tokens[1].tokenValue );
-                    }
-                }
-
-                // Three or four values - CSS3
-                else {
-                    // TODO
-                }
-
-                this._values = vals;
-            }
-            return this._values;
-        },
-
-        /**
-         * Find the coordinates of the background image from the upper-left corner of the background area.
-         * Note that these coordinate values are not rounded.
-         * @param {Element} el
-         * @param {number} width - the width for percentages (background area width minus image width)
-         * @param {number} height - the height for percentages (background area height minus image height)
-         * @return {Object} { x: Number, y: Number }
-         */
-        coords: function( el, width, height ) {
-            var vals = this.getValues(),
-                pxX = vals[1].pixels( el, width ),
-                pxY = vals[3].pixels( el, height );
-
-            return {
-                x: vals[0] === 'right' ? width - pxX : pxX,
-                y: vals[2] === 'bottom' ? height - pxY : pxY
-            };
-        }
-    };
-
-    return BgPosition;
-})();
-/**
- * Wrapper for a CSS3 background-size value.
- * @constructor
- * @param {String|PIE.Length} w The width parameter
- * @param {String|PIE.Length} h The height parameter, if any
- */
-PIE.BgSize = (function() {
-
-    var CONTAIN = 'contain',
-        COVER = 'cover',
-        AUTO = 'auto';
-
-
-    function BgSize( w, h ) {
-        this.w = w;
-        this.h = h;
-    }
-    BgSize.prototype = {
-
-        pixels: function( el, areaW, areaH, imgW, imgH ) {
-            var me = this,
-                w = me.w,
-                h = me.h,
-                areaRatio = areaW / areaH,
-                imgRatio = imgW / imgH;
-
-            if ( w === CONTAIN ) {
-                w = imgRatio > areaRatio ? areaW : areaH * imgRatio;
-                h = imgRatio > areaRatio ? areaW / imgRatio : areaH;
-            }
-            else if ( w === COVER ) {
-                w = imgRatio < areaRatio ? areaW : areaH * imgRatio;
-                h = imgRatio < areaRatio ? areaW / imgRatio : areaH;
-            }
-            else if ( w === AUTO ) {
-                h = ( h === AUTO ? imgH : h.pixels( el, areaH ) );
-                w = h * imgRatio;
-            }
-            else {
-                w = w.pixels( el, areaW );
-                h = ( h === AUTO ? w / imgRatio : h.pixels( el, areaH ) );
-            }
-
-            return { w: w, h: h };
-        }
-
-    };
-
-    BgSize.DEFAULT = new BgSize( AUTO, AUTO );
-
-    return BgSize;
-})();
-/**
- * Wrapper for angle values; handles conversion to degrees from all allowed angle units
- * @constructor
- * @param {string} val The raw CSS value for the angle. It is assumed it has been pre-validated.
- */
-PIE.Angle = (function() {
-    function Angle( val ) {
-        this.val = val;
-    }
-    Angle.prototype = {
-        unitRE: /[a-z]+$/i,
-
-        /**
-         * @return {string} The unit of the angle value
-         */
-        getUnit: function() {
-            return this._unit || ( this._unit = this.val.match( this.unitRE )[0].toLowerCase() );
-        },
-
-        /**
-         * Get the numeric value of the angle in degrees.
-         * @return {number} The degrees value
-         */
-        degrees: function() {
-            var deg = this._deg, u, n;
-            if( deg === undefined ) {
-                u = this.getUnit();
-                n = parseFloat( this.val, 10 );
-                deg = this._deg = ( u === 'deg' ? n : u === 'rad' ? n / Math.PI * 180 : u === 'grad' ? n / 400 * 360 : u === 'turn' ? n * 360 : 0 );
-            }
-            return deg;
-        }
-    };
-
-    return Angle;
-})();/**
- * Abstraction for colors values. Allows detection of rgba values. A singleton instance per unique
- * value is returned from PIE.getColor() - always use that instead of instantiating directly.
- * @constructor
- * @param {string} val The raw CSS string value for the color
- */
-PIE.Color = (function() {
-    var instances = {};
-
-    function Color( val ) {
-        this.val = val;
-    }
-
-    /**
-     * Regular expression for matching rgba colors and extracting their components
-     * @type {RegExp}
-     */
-    Color.rgbaRE = /\s*rgba\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d+|\d*\.\d+)\s*\)\s*/;
-
-    Color.names = {
-        "aliceblue":"F0F8FF", "antiquewhite":"FAEBD7", "aqua":"0FF",
-        "aquamarine":"7FFFD4", "azure":"F0FFFF", "beige":"F5F5DC",
-        "bisque":"FFE4C4", "black":"000", "blanchedalmond":"FFEBCD",
-        "blue":"00F", "blueviolet":"8A2BE2", "brown":"A52A2A",
-        "burlywood":"DEB887", "cadetblue":"5F9EA0", "chartreuse":"7FFF00",
-        "chocolate":"D2691E", "coral":"FF7F50", "cornflowerblue":"6495ED",
-        "cornsilk":"FFF8DC", "crimson":"DC143C", "cyan":"0FF",
-        "darkblue":"00008B", "darkcyan":"008B8B", "darkgoldenrod":"B8860B",
-        "darkgray":"A9A9A9", "darkgreen":"006400", "darkkhaki":"BDB76B",
-        "darkmagenta":"8B008B", "darkolivegreen":"556B2F", "darkorange":"FF8C00",
-        "darkorchid":"9932CC", "darkred":"8B0000", "darksalmon":"E9967A",
-        "darkseagreen":"8FBC8F", "darkslateblue":"483D8B", "darkslategray":"2F4F4F",
-        "darkturquoise":"00CED1", "darkviolet":"9400D3", "deeppink":"FF1493",
-        "deepskyblue":"00BFFF", "dimgray":"696969", "dodgerblue":"1E90FF",
-        "firebrick":"B22222", "floralwhite":"FFFAF0", "forestgreen":"228B22",
-        "fuchsia":"F0F", "gainsboro":"DCDCDC", "ghostwhite":"F8F8FF",
-        "gold":"FFD700", "goldenrod":"DAA520", "gray":"808080",
-        "green":"008000", "greenyellow":"ADFF2F", "honeydew":"F0FFF0",
-        "hotpink":"FF69B4", "indianred":"CD5C5C", "indigo":"4B0082",
-        "ivory":"FFFFF0", "khaki":"F0E68C", "lavender":"E6E6FA",
-        "lavenderblush":"FFF0F5", "lawngreen":"7CFC00", "lemonchiffon":"FFFACD",
-        "lightblue":"ADD8E6", "lightcoral":"F08080", "lightcyan":"E0FFFF",
-        "lightgoldenrodyellow":"FAFAD2", "lightgreen":"90EE90", "lightgrey":"D3D3D3",
-        "lightpink":"FFB6C1", "lightsalmon":"FFA07A", "lightseagreen":"20B2AA",
-        "lightskyblue":"87CEFA", "lightslategray":"789", "lightsteelblue":"B0C4DE",
-        "lightyellow":"FFFFE0", "lime":"0F0", "limegreen":"32CD32",
-        "linen":"FAF0E6", "magenta":"F0F", "maroon":"800000",
-        "mediumauqamarine":"66CDAA", "mediumblue":"0000CD", "mediumorchid":"BA55D3",
-        "mediumpurple":"9370D8", "mediumseagreen":"3CB371", "mediumslateblue":"7B68EE",
-        "mediumspringgreen":"00FA9A", "mediumturquoise":"48D1CC", "mediumvioletred":"C71585",
-        "midnightblue":"191970", "mintcream":"F5FFFA", "mistyrose":"FFE4E1",
-        "moccasin":"FFE4B5", "navajowhite":"FFDEAD", "navy":"000080",
-        "oldlace":"FDF5E6", "olive":"808000", "olivedrab":"688E23",
-        "orange":"FFA500", "orangered":"FF4500", "orchid":"DA70D6",
-        "palegoldenrod":"EEE8AA", "palegreen":"98FB98", "paleturquoise":"AFEEEE",
-        "palevioletred":"D87093", "papayawhip":"FFEFD5", "peachpuff":"FFDAB9",
-        "peru":"CD853F", "pink":"FFC0CB", "plum":"DDA0DD",
-        "powderblue":"B0E0E6", "purple":"800080", "red":"F00",
-        "rosybrown":"BC8F8F", "royalblue":"4169E1", "saddlebrown":"8B4513",
-        "salmon":"FA8072", "sandybrown":"F4A460", "seagreen":"2E8B57",
-        "seashell":"FFF5EE", "sienna":"A0522D", "silver":"C0C0C0",
-        "skyblue":"87CEEB", "slateblue":"6A5ACD", "slategray":"708090",
-        "snow":"FFFAFA", "springgreen":"00FF7F", "steelblue":"4682B4",
-        "tan":"D2B48C", "teal":"008080", "thistle":"D8BFD8",
-        "tomato":"FF6347", "turquoise":"40E0D0", "violet":"EE82EE",
-        "wheat":"F5DEB3", "white":"FFF", "whitesmoke":"F5F5F5",
-        "yellow":"FF0", "yellowgreen":"9ACD32"
-    };
-
-    Color.prototype = {
-        /**
-         * @private
-         */
-        parse: function() {
-            if( !this._color ) {
-                var me = this,
-                    v = me.val,
-                    vLower,
-                    m = v.match( Color.rgbaRE );
-                if( m ) {
-                    me._color = 'rgb(' + m[1] + ',' + m[2] + ',' + m[3] + ')';
-                    me._alpha = parseFloat( m[4] );
-                }
-                else {
-                    if( ( vLower = v.toLowerCase() ) in Color.names ) {
-                        v = '#' + Color.names[vLower];
-                    }
-                    me._color = v;
-                    me._alpha = ( v === 'transparent' ? 0 : 1 );
-                }
-            }
-        },
-
-        /**
-         * Retrieve the value of the color in a format usable by IE natively. This will be the same as
-         * the raw input value, except for rgba values which will be converted to an rgb value.
-         * @param {Element} el The context element, used to get 'currentColor' keyword value.
-         * @return {string} Color value
-         */
-        colorValue: function( el ) {
-            this.parse();
-            return this._color === 'currentColor' ? el.currentStyle.color : this._color;
-        },
-
-        /**
-         * Retrieve the alpha value of the color. Will be 1 for all values except for rgba values
-         * with an alpha component.
-         * @return {number} The alpha value, from 0 to 1.
-         */
-        alpha: function() {
-            this.parse();
-            return this._alpha;
-        }
-    };
-
-
-    /**
-     * Retrieve a PIE.Color instance for the given value. A shared singleton instance is returned for each unique value.
-     * @param {string} val The CSS string representing the color. It is assumed that this will already have
-     *                 been validated as a valid color syntax.
-     */
-    PIE.getColor = function(val) {
-        return instances[ val ] || ( instances[ val ] = new Color( val ) );
-    };
-
-    return Color;
-})();/**
- * A tokenizer for CSS value strings.
- * @constructor
- * @param {string} css The CSS value string
- */
-PIE.Tokenizer = (function() {
-    function Tokenizer( css ) {
-        this.css = css;
-        this.ch = 0;
-        this.tokens = [];
-        this.tokenIndex = 0;
-    }
-
-    /**
-     * Enumeration of token type constants.
-     * @enum {number}
-     */
-    var Type = Tokenizer.Type = {
-        ANGLE: 1,
-        CHARACTER: 2,
-        COLOR: 4,
-        DIMEN: 8,
-        FUNCTION: 16,
-        IDENT: 32,
-        LENGTH: 64,
-        NUMBER: 128,
-        OPERATOR: 256,
-        PERCENT: 512,
-        STRING: 1024,
-        URL: 2048
-    };
-
-    /**
-     * A single token
-     * @constructor
-     * @param {number} type The type of the token - see PIE.Tokenizer.Type
-     * @param {string} value The value of the token
-     */
-    Tokenizer.Token = function( type, value ) {
-        this.tokenType = type;
-        this.tokenValue = value;
-    };
-    Tokenizer.Token.prototype = {
-        isLength: function() {
-            return this.tokenType & Type.LENGTH || ( this.tokenType & Type.NUMBER && this.tokenValue === '0' );
-        },
-        isLengthOrPercent: function() {
-            return this.isLength() || this.tokenType & Type.PERCENT;
-        }
-    };
-
-    Tokenizer.prototype = {
-        whitespace: /\s/,
-        number: /^[\+\-]?(\d*\.)?\d+/,
-        url: /^url\(\s*("([^"]*)"|'([^']*)'|([!#$%&*-~]*))\s*\)/i,
-        ident: /^\-?[_a-z][\w-]*/i,
-        string: /^("([^"]*)"|'([^']*)')/,
-        operator: /^[\/,]/,
-        hash: /^#[\w]+/,
-        hashColor: /^#([\da-f]{6}|[\da-f]{3})/i,
-
-        unitTypes: {
-            'px': Type.LENGTH, 'em': Type.LENGTH, 'ex': Type.LENGTH,
-            'mm': Type.LENGTH, 'cm': Type.LENGTH, 'in': Type.LENGTH,
-            'pt': Type.LENGTH, 'pc': Type.LENGTH,
-            'deg': Type.ANGLE, 'rad': Type.ANGLE, 'grad': Type.ANGLE
-        },
-
-        colorFunctions: {
-            'rgb': 1, 'rgba': 1, 'hsl': 1, 'hsla': 1
-        },
-
-
-        /**
-         * Advance to and return the next token in the CSS string. If the end of the CSS string has
-         * been reached, null will be returned.
-         * @param {boolean} forget - if true, the token will not be stored for the purposes of backtracking with prev().
-         * @return {PIE.Tokenizer.Token}
-         */
-        next: function( forget ) {
-            var css, ch, firstChar, match, val,
-                me = this;
-
-            function newToken( type, value ) {
-                var tok = new Tokenizer.Token( type, value );
-                if( !forget ) {
-                    me.tokens.push( tok );
-                    me.tokenIndex++;
-                }
-                return tok;
-            }
-            function failure() {
-                me.tokenIndex++;
-                return null;
-            }
-
-            // In case we previously backed up, return the stored token in the next slot
-            if( this.tokenIndex < this.tokens.length ) {
-                return this.tokens[ this.tokenIndex++ ];
-            }
-
-            // Move past leading whitespace characters
-            while( this.whitespace.test( this.css.charAt( this.ch ) ) ) {
-                this.ch++;
-            }
-            if( this.ch >= this.css.length ) {
-                return failure();
-            }
-
-            ch = this.ch;
-            css = this.css.substring( this.ch );
-            firstChar = css.charAt( 0 );
-            switch( firstChar ) {
-                case '#':
-                    if( match = css.match( this.hashColor ) ) {
-                        this.ch += match[0].length;
-                        return newToken( Type.COLOR, match[0] );
-                    }
-                    break;
-
-                case '"':
-                case "'":
-                    if( match = css.match( this.string ) ) {
-                        this.ch += match[0].length;
-                        return newToken( Type.STRING, match[2] || match[3] || '' );
-                    }
-                    break;
-
-                case "/":
-                case ",":
-                    this.ch++;
-                    return newToken( Type.OPERATOR, firstChar );
-
-                case 'u':
-                    if( match = css.match( this.url ) ) {
-                        this.ch += match[0].length;
-                        return newToken( Type.URL, match[2] || match[3] || match[4] || '' );
-                    }
-            }
-
-            // Numbers and values starting with numbers
-            if( match = css.match( this.number ) ) {
-                val = match[0];
-                this.ch += val.length;
-
-                // Check if it is followed by a unit
-                if( css.charAt( val.length ) === '%' ) {
-                    this.ch++;
-                    return newToken( Type.PERCENT, val + '%' );
-                }
-                if( match = css.substring( val.length ).match( this.ident ) ) {
-                    val += match[0];
-                    this.ch += match[0].length;
-                    return newToken( this.unitTypes[ match[0].toLowerCase() ] || Type.DIMEN, val );
-                }
-
-                // Plain ol' number
-                return newToken( Type.NUMBER, val );
-            }
-
-            // Identifiers
-            if( match = css.match( this.ident ) ) {
-                val = match[0];
-                this.ch += val.length;
-
-                // Named colors
-                if( val.toLowerCase() in PIE.Color.names || val === 'currentColor' || val === 'transparent' ) {
-                    return newToken( Type.COLOR, val );
-                }
-
-                // Functions
-                if( css.charAt( val.length ) === '(' ) {
-                    this.ch++;
-
-                    // Color values in function format: rgb, rgba, hsl, hsla
-                    if( val.toLowerCase() in this.colorFunctions ) {
-                        function isNum( tok ) {
-                            return tok && tok.tokenType & Type.NUMBER;
-                        }
-                        function isNumOrPct( tok ) {
-                            return tok && ( tok.tokenType & ( Type.NUMBER | Type.PERCENT ) );
-                        }
-                        function isValue( tok, val ) {
-                            return tok && tok.tokenValue === val;
-                        }
-                        function next() {
-                            return me.next( 1 );
-                        }
-
-                        if( ( val.charAt(0) === 'r' ? isNumOrPct( next() ) : isNum( next() ) ) &&
-                            isValue( next(), ',' ) &&
-                            isNumOrPct( next() ) &&
-                            isValue( next(), ',' ) &&
-                            isNumOrPct( next() ) &&
-                            ( val === 'rgb' || val === 'hsa' || (
-                                isValue( next(), ',' ) &&
-                                isNum( next() )
-                            ) ) &&
-                            isValue( next(), ')' ) ) {
-                            return newToken( Type.COLOR, this.css.substring( ch, this.ch ) );
-                        }
-                        return failure();
-                    }
-
-                    return newToken( Type.FUNCTION, val );
-                }
-
-                // Other identifier
-                return newToken( Type.IDENT, val );
-            }
-
-            // Standalone character
-            this.ch++;
-            return newToken( Type.CHARACTER, firstChar );
-        },
-
-        /**
-         * Determine whether there is another token
-         * @return {boolean}
-         */
-        hasNext: function() {
-            var next = this.next();
-            this.prev();
-            return !!next;
-        },
-
-        /**
-         * Back up and return the previous token
-         * @return {PIE.Tokenizer.Token}
-         */
-        prev: function() {
-            return this.tokens[ this.tokenIndex-- - 2 ];
-        },
-
-        /**
-         * Retrieve all the tokens in the CSS string
-         * @return {Array.<PIE.Tokenizer.Token>}
-         */
-        all: function() {
-            while( this.next() ) {}
-            return this.tokens;
-        },
-
-        /**
-         * Return a list of tokens from the current position until the given function returns
-         * true. The final token will not be included in the list.
-         * @param {function():boolean} func - test function
-         * @param {boolean} require - if true, then if the end of the CSS string is reached
-         *        before the test function returns true, null will be returned instead of the
-         *        tokens that have been found so far.
-         * @return {Array.<PIE.Tokenizer.Token>}
-         */
-        until: function( func, require ) {
-            var list = [], t, hit;
-            while( t = this.next() ) {
-                if( func( t ) ) {
-                    hit = true;
-                    this.prev();
-                    break;
-                }
-                list.push( t );
-            }
-            return require && !hit ? null : list;
-        }
-    };
-
-    return Tokenizer;
-})();/**
- * Handles calculating, caching, and detecting changes to size and position of the element.
- * @constructor
- * @param {Element} el the target element
- */
-PIE.BoundsInfo = function( el ) {
-    this.targetElement = el;
-};
-PIE.BoundsInfo.prototype = {
-
-    _locked: 0,
-
-    positionChanged: function() {
-        var last = this._lastBounds,
-            bounds;
-        return !last || ( ( bounds = this.getBounds() ) && ( last.x !== bounds.x || last.y !== bounds.y ) );
-    },
-
-    sizeChanged: function() {
-        var last = this._lastBounds,
-            bounds;
-        return !last || ( ( bounds = this.getBounds() ) && ( last.w !== bounds.w || last.h !== bounds.h ) );
-    },
-
-    getLiveBounds: function() {
-        var el = this.targetElement,
-            rect = el.getBoundingClientRect(),
-            isIE9 = PIE.ieDocMode === 9;
-        return {
-            x: rect.left,
-            y: rect.top,
-            // In some cases scrolling the page will cause IE9 to report incorrect dimensions
-            // in the rect returned by getBoundingClientRect, so we must query offsetWidth/Height instead
-            w: isIE9 ? el.offsetWidth : rect.right - rect.left,
-            h: isIE9 ? el.offsetHeight : rect.bottom - rect.top
-        };
-    },
-
-    getBounds: function() {
-        return this._locked ? 
-                ( this._lockedBounds || ( this._lockedBounds = this.getLiveBounds() ) ) :
-                this.getLiveBounds();
-    },
-
-    hasBeenQueried: function() {
-        return !!this._lastBounds;
-    },
-
-    lock: function() {
-        ++this._locked;
-    },
-
-    unlock: function() {
-        if( !--this._locked ) {
-            if( this._lockedBounds ) this._lastBounds = this._lockedBounds;
-            this._lockedBounds = null;
-        }
-    }
-
-};
-(function() {
-
-function cacheWhenLocked( fn ) {
-    var uid = PIE.Util.getUID( fn );
-    return function() {
-        if( this._locked ) {
-            var cache = this._lockedValues || ( this._lockedValues = {} );
-            return ( uid in cache ) ? cache[ uid ] : ( cache[ uid ] = fn.call( this ) );
-        } else {
-            return fn.call( this );
-        }
-    }
-}
-
-
-PIE.StyleInfoBase = {
-
-    _locked: 0,
-
-    /**
-     * Create a new StyleInfo class, with the standard constructor, and augmented by
-     * the StyleInfoBase's members.
-     * @param proto
-     */
-    newStyleInfo: function( proto ) {
-        function StyleInfo( el ) {
-            this.targetElement = el;
-            this._lastCss = this.getCss();
-        }
-        PIE.Util.merge( StyleInfo.prototype, PIE.StyleInfoBase, proto );
-        StyleInfo._propsCache = {};
-        return StyleInfo;
-    },
-
-    /**
-     * Get an object representation of the target CSS style, caching it for each unique
-     * CSS value string.
-     * @return {Object}
-     */
-    getProps: function() {
-        var css = this.getCss(),
-            cache = this.constructor._propsCache;
-        return css ? ( css in cache ? cache[ css ] : ( cache[ css ] = this.parseCss( css ) ) ) : null;
-    },
-
-    /**
-     * Get the raw CSS value for the target style
-     * @return {string}
-     */
-    getCss: cacheWhenLocked( function() {
-        var el = this.targetElement,
-            ctor = this.constructor,
-            s = el.style,
-            cs = el.currentStyle,
-            cssProp = this.cssProperty,
-            styleProp = this.styleProperty,
-            prefixedCssProp = ctor._prefixedCssProp || ( ctor._prefixedCssProp = PIE.CSS_PREFIX + cssProp ),
-            prefixedStyleProp = ctor._prefixedStyleProp || ( ctor._prefixedStyleProp = PIE.STYLE_PREFIX + styleProp.charAt(0).toUpperCase() + styleProp.substring(1) );
-        return s[ prefixedStyleProp ] || cs.getAttribute( prefixedCssProp ) || s[ styleProp ] || cs.getAttribute( cssProp );
-    } ),
-
-    /**
-     * Determine whether the target CSS style is active.
-     * @return {boolean}
-     */
-    isActive: cacheWhenLocked( function() {
-        return !!this.getProps();
-    } ),
-
-    /**
-     * Determine whether the target CSS style has changed since the last time it was used.
-     * @return {boolean}
-     */
-    changed: cacheWhenLocked( function() {
-        var currentCss = this.getCss(),
-            changed = currentCss !== this._lastCss;
-        this._lastCss = currentCss;
-        return changed;
-    } ),
-
-    cacheWhenLocked: cacheWhenLocked,
-
-    lock: function() {
-        ++this._locked;
-    },
-
-    unlock: function() {
-        if( !--this._locked ) {
-            delete this._lockedValues;
-        }
-    }
-};
-
-})();/**
- * Handles parsing, caching, and detecting changes to background (and -pie-background) CSS
- * @constructor
- * @param {Element} el the target element
- */
-PIE.BackgroundStyleInfo = PIE.StyleInfoBase.newStyleInfo( {
-
-    cssProperty: PIE.CSS_PREFIX + 'background',
-    styleProperty: PIE.STYLE_PREFIX + 'Background',
-
-    attachIdents: { 'scroll':1, 'fixed':1, 'local':1 },
-    repeatIdents: { 'repeat-x':1, 'repeat-y':1, 'repeat':1, 'no-repeat':1 },
-    originAndClipIdents: { 'padding-box':1, 'border-box':1, 'content-box':1 },
-    positionIdents: { 'top':1, 'right':1, 'bottom':1, 'left':1, 'center':1 },
-    sizeIdents: { 'contain':1, 'cover':1 },
-    propertyNames: {
-        CLIP: 'backgroundClip',
-        COLOR: 'backgroundColor',
-        IMAGE: 'backgroundImage',
-        ORIGIN: 'backgroundOrigin',
-        POSITION: 'backgroundPosition',
-        REPEAT: 'backgroundRepeat',
-        SIZE: 'backgroundSize'
-    },
-
-    /**
-     * For background styles, we support the -pie-background property but fall back to the standard
-     * backround* properties.  The reason we have to use the prefixed version is that IE natively
-     * parses the standard properties and if it sees something it doesn't know how to parse, for example
-     * multiple values or gradient definitions, it will throw that away and not make it available through
-     * currentStyle.
-     *
-     * Format of return object:
-     * {
-     *     color: <PIE.Color>,
-     *     bgImages: [
-     *         {
-     *             imgType: 'image',
-     *             imgUrl: 'image.png',
-     *             imgRepeat: <'no-repeat' | 'repeat-x' | 'repeat-y' | 'repeat'>,
-     *             bgPosition: <PIE.BgPosition>,
-     *             bgAttachment: <'scroll' | 'fixed' | 'local'>,
-     *             bgOrigin: <'border-box' | 'padding-box' | 'content-box'>,
-     *             bgClip: <'border-box' | 'padding-box'>,
-     *             bgSize: <PIE.BgSize>,
-     *             origString: 'url(img.png) no-repeat top left'
-     *         },
-     *         {
-     *             imgType: 'linear-gradient',
-     *             gradientStart: <PIE.BgPosition>,
-     *             angle: <PIE.Angle>,
-     *             stops: [
-     *                 { color: <PIE.Color>, offset: <PIE.Length> },
-     *                 { color: <PIE.Color>, offset: <PIE.Length> }, ...
-     *             ]
-     *         }
-     *     ]
-     * }
-     * @param {String} css
-     * @override
-     */
-    parseCss: function( css ) {
-        var el = this.targetElement,
-            cs = el.currentStyle,
-            tokenizer, token, image,
-            tok_type = PIE.Tokenizer.Type,
-            type_operator = tok_type.OPERATOR,
-            type_ident = tok_type.IDENT,
-            type_color = tok_type.COLOR,
-            tokType, tokVal,
-            beginCharIndex = 0,
-            positionIdents = this.positionIdents,
-            gradient, stop, width, height,
-            props = { bgImages: [] };
-
-        function isBgPosToken( token ) {
-            return token && token.isLengthOrPercent() || ( token.tokenType & type_ident && token.tokenValue in positionIdents );
-        }
-
-        function sizeToken( token ) {
-            return token && ( ( token.isLengthOrPercent() && PIE.getLength( token.tokenValue ) ) || ( token.tokenValue === 'auto' && 'auto' ) );
-        }
-
-        // If the CSS3-specific -pie-background property is present, parse it
-        if( this.getCss3() ) {
-            tokenizer = new PIE.Tokenizer( css );
-            image = {};
-
-            while( token = tokenizer.next() ) {
-                tokType = token.tokenType;
-                tokVal = token.tokenValue;
-
-                if( !image.imgType && tokType & tok_type.FUNCTION && tokVal === 'linear-gradient' ) {
-                    gradient = { stops: [], imgType: tokVal };
-                    stop = {};
-                    while( token = tokenizer.next() ) {
-                        tokType = token.tokenType;
-                        tokVal = token.tokenValue;
-
-                        // If we reached the end of the function and had at least 2 stops, flush the info
-                        if( tokType & tok_type.CHARACTER && tokVal === ')' ) {
-                            if( stop.color ) {
-                                gradient.stops.push( stop );
-                            }
-                            if( gradient.stops.length > 1 ) {
-                                PIE.Util.merge( image, gradient );
-                            }
-                            break;
-                        }
-
-                        // Color stop - must start with color
-                        if( tokType & type_color ) {
-                            // if we already have an angle/position, make sure that the previous token was a comma
-                            if( gradient.angle || gradient.gradientStart ) {
-                                token = tokenizer.prev();
-                                if( token.tokenType !== type_operator ) {
-                                    break; //fail
-                                }
-                                tokenizer.next();
-                            }
-
-                            stop = {
-                                color: PIE.getColor( tokVal )
-                            };
-                            // check for offset following color
-                            token = tokenizer.next();
-                            if( token.isLengthOrPercent() ) {
-                                stop.offset = PIE.getLength( token.tokenValue );
-                            } else {
-                                tokenizer.prev();
-                            }
-                        }
-                        // Angle - can only appear in first spot
-                        else if( tokType & tok_type.ANGLE && !gradient.angle && !stop.color && !gradient.stops.length ) {
-                            gradient.angle = new PIE.Angle( token.tokenValue );
-                        }
-                        else if( isBgPosToken( token ) && !gradient.gradientStart && !stop.color && !gradient.stops.length ) {
-                            tokenizer.prev();
-                            gradient.gradientStart = new PIE.BgPosition(
-                                tokenizer.until( function( t ) {
-                                    return !isBgPosToken( t );
-                                }, false )
-                            );
-                        }
-                        else if( tokType & type_operator && tokVal === ',' ) {
-                            if( stop.color ) {
-                                gradient.stops.push( stop );
-                                stop = {};
-                            }
-                        }
-                        else {
-                            // Found something we didn't recognize; fail without adding image
-                            break;
-                        }
-                    }
-                }
-                else if( !image.imgType && tokType & tok_type.URL ) {
-                    image.imgUrl = tokVal;
-                    image.imgType = 'image';
-                }
-                else if( isBgPosToken( token ) && !image.bgPosition ) {
-                    tokenizer.prev();
-                    image.bgPosition = new PIE.BgPosition(
-                        tokenizer.until( function( t ) {
-                            return !isBgPosToken( t );
-                        }, false )
-                    );
-                }
-                else if( tokType & type_ident ) {
-                    if( tokVal in this.repeatIdents && !image.imgRepeat ) {
-                        image.imgRepeat = tokVal;
-                    }
-                    else if( tokVal in this.originAndClipIdents && !image.bgOrigin ) {
-                        image.bgOrigin = tokVal;
-                        if( ( token = tokenizer.next() ) && ( token.tokenType & type_ident ) &&
-                            token.tokenValue in this.originAndClipIdents ) {
-                            image.bgClip = token.tokenValue;
-                        } else {
-                            image.bgClip = tokVal;
-                            tokenizer.prev();
-                        }
-                    }
-                    else if( tokVal in this.attachIdents && !image.bgAttachment ) {
-                        image.bgAttachment = tokVal;
-                    }
-                    else {
-                        return null;
-                    }
-                }
-                else if( tokType & type_color && !props.color ) {
-                    props.color = PIE.getColor( tokVal );
-                }
-                else if( tokType & type_operator && tokVal === '/' && !image.bgSize && image.bgPosition ) {
-                    // background size
-                    token = tokenizer.next();
-                    if( token.tokenType & type_ident && token.tokenValue in this.sizeIdents ) {
-                        image.bgSize = new PIE.BgSize( token.tokenValue );
-                    }
-                    else if( width = sizeToken( token ) ) {
-                        height = sizeToken( tokenizer.next() );
-                        if ( !height ) {
-                            height = width;
-                            tokenizer.prev();
-                        }
-                        image.bgSize = new PIE.BgSize( width, height );
-                    }
-                    else {
-                        return null;
-                    }
-                }
-                // new layer
-                else if( tokType & type_operator && tokVal === ',' && image.imgType ) {
-                    image.origString = css.substring( beginCharIndex, tokenizer.ch - 1 );
-                    beginCharIndex = tokenizer.ch;
-                    props.bgImages.push( image );
-                    image = {};
-                }
-                else {
-                    // Found something unrecognized; chuck everything
-                    return null;
-                }
-            }
-
-            // leftovers
-            if( image.imgType ) {
-                image.origString = css.substring( beginCharIndex );
-                props.bgImages.push( image );
-            }
-        }
-
-        // Otherwise, use the standard background properties; let IE give us the values rather than parsing them
-        else {
-            this.withActualBg( PIE.ieDocMode < 9 ?
-                function() {
-                    var propNames = this.propertyNames,
-                        posX = cs[propNames.POSITION + 'X'],
-                        posY = cs[propNames.POSITION + 'Y'],
-                        img = cs[propNames.IMAGE],
-                        color = cs[propNames.COLOR];
-
-                    if( color !== 'transparent' ) {
-                        props.color = PIE.getColor( color )
-                    }
-                    if( img !== 'none' ) {
-                        props.bgImages = [ {
-                            imgType: 'image',
-                            imgUrl: new PIE.Tokenizer( img ).next().tokenValue,
-                            imgRepeat: cs[propNames.REPEAT],
-                            bgPosition: new PIE.BgPosition( new PIE.Tokenizer( posX + ' ' + posY ).all() )
-                        } ];
-                    }
-                } :
-                function() {
-                    var propNames = this.propertyNames,
-                        splitter = /\s*,\s*/,
-                        images = cs[propNames.IMAGE].split( splitter ),
-                        color = cs[propNames.COLOR],
-                        repeats, positions, origins, clips, sizes, i, len, image, sizeParts;
-
-                    if( color !== 'transparent' ) {
-                        props.color = PIE.getColor( color )
-                    }
-
-                    len = images.length;
-                    if( len && images[0] !== 'none' ) {
-                        repeats = cs[propNames.REPEAT].split( splitter );
-                        positions = cs[propNames.POSITION].split( splitter );
-                        origins = cs[propNames.ORIGIN].split( splitter );
-                        clips = cs[propNames.CLIP].split( splitter );
-                        sizes = cs[propNames.SIZE].split( splitter );
-
-                        props.bgImages = [];
-                        for( i = 0; i < len; i++ ) {
-                            image = images[ i ];
-                            if( image && image !== 'none' ) {
-                                sizeParts = sizes[i].split( ' ' );
-                                props.bgImages.push( {
-                                    origString: image + ' ' + repeats[ i ] + ' ' + positions[ i ] + ' / ' + sizes[ i ] + ' ' +
-                                                origins[ i ] + ' ' + clips[ i ],
-                                    imgType: 'image',
-                                    imgUrl: new PIE.Tokenizer( image ).next().tokenValue,
-                                    imgRepeat: repeats[ i ],
-                                    bgPosition: new PIE.BgPosition( new PIE.Tokenizer( positions[ i ] ).all() ),
-                                    bgOrigin: origins[ i ],
-                                    bgClip: clips[ i ],
-                                    bgSize: new PIE.BgSize( sizeParts[ 0 ], sizeParts[ 1 ] )
-                                } );
-                            }
-                        }
-                    }
-                }
-            );
-        }
-
-        return ( props.color || props.bgImages[0] ) ? props : null;
-    },
-
-    /**
-     * Execute a function with the actual background styles (not overridden with runtimeStyle
-     * properties set by the renderers) available via currentStyle.
-     * @param fn
-     */
-    withActualBg: function( fn ) {
-        var isIE9 = PIE.ieDocMode > 8,
-            propNames = this.propertyNames,
-            rs = this.targetElement.runtimeStyle,
-            rsImage = rs[propNames.IMAGE],
-            rsColor = rs[propNames.COLOR],
-            rsRepeat = rs[propNames.REPEAT],
-            rsClip, rsOrigin, rsSize, rsPosition, ret;
-
-        if( rsImage ) rs[propNames.IMAGE] = '';
-        if( rsColor ) rs[propNames.COLOR] = '';
-        if( rsRepeat ) rs[propNames.REPEAT] = '';
-        if( isIE9 ) {
-            rsClip = rs[propNames.CLIP];
-            rsOrigin = rs[propNames.ORIGIN];
-            rsPosition = rs[propNames.POSITION];
-            rsSize = rs[propNames.SIZE];
-            if( rsClip ) rs[propNames.CLIP] = '';
-            if( rsOrigin ) rs[propNames.ORIGIN] = '';
-            if( rsPosition ) rs[propNames.POSITION] = '';
-            if( rsSize ) rs[propNames.SIZE] = '';
-        }
-
-        ret = fn.call( this );
-
-        if( rsImage ) rs[propNames.IMAGE] = rsImage;
-        if( rsColor ) rs[propNames.COLOR] = rsColor;
-        if( rsRepeat ) rs[propNames.REPEAT] = rsRepeat;
-        if( isIE9 ) {
-            if( rsClip ) rs[propNames.CLIP] = rsClip;
-            if( rsOrigin ) rs[propNames.ORIGIN] = rsOrigin;
-            if( rsPosition ) rs[propNames.POSITION] = rsPosition;
-            if( rsSize ) rs[propNames.SIZE] = rsSize;
-        }
-
-        return ret;
-    },
-
-    getCss: PIE.StyleInfoBase.cacheWhenLocked( function() {
-        return this.getCss3() ||
-               this.withActualBg( function() {
-                   var cs = this.targetElement.currentStyle,
-                       propNames = this.propertyNames;
-                   return cs[propNames.COLOR] + ' ' + cs[propNames.IMAGE] + ' ' + cs[propNames.REPEAT] + ' ' +
-                   cs[propNames.POSITION + 'X'] + ' ' + cs[propNames.POSITION + 'Y'];
-               } );
-    } ),
-
-    getCss3: PIE.StyleInfoBase.cacheWhenLocked( function() {
-        var el = this.targetElement;
-        return el.style[ this.styleProperty ] || el.currentStyle.getAttribute( this.cssProperty );
-    } ),
-
-    /**
-     * Tests if style.PiePngFix or the -pie-png-fix property is set to true in IE6.
-     */
-    isPngFix: function() {
-        var val = 0, el;
-        if( PIE.ieVersion < 7 ) {
-            el = this.targetElement;
-            val = ( '' + ( el.style[ PIE.STYLE_PREFIX + 'PngFix' ] || el.currentStyle.getAttribute( PIE.CSS_PREFIX + 'png-fix' ) ) === 'true' );
-        }
-        return val;
-    },
-    
-    /**
-     * The isActive logic is slightly different, because getProps() always returns an object
-     * even if it is just falling back to the native background properties.  But we only want
-     * to report is as being "active" if either the -pie-background override property is present
-     * and parses successfully or '-pie-png-fix' is set to true in IE6.
-     */
-    isActive: PIE.StyleInfoBase.cacheWhenLocked( function() {
-        return (this.getCss3() || this.isPngFix()) && !!this.getProps();
-    } )
-
-} );/**
- * Handles parsing, caching, and detecting changes to border CSS
- * @constructor
- * @param {Element} el the target element
- */
-PIE.BorderStyleInfo = PIE.StyleInfoBase.newStyleInfo( {
-
-    sides: [ 'Top', 'Right', 'Bottom', 'Left' ],
-    namedWidths: {
-        'thin': '1px',
-        'medium': '3px',
-        'thick': '5px'
-    },
-
-    parseCss: function( css ) {
-        var w = {},
-            s = {},
-            c = {},
-            active = false,
-            colorsSame = true,
-            stylesSame = true,
-            widthsSame = true;
-
-        this.withActualBorder( function() {
-            var el = this.targetElement,
-                cs = el.currentStyle,
-                i = 0,
-                style, color, width, lastStyle, lastColor, lastWidth, side, ltr;
-            for( ; i < 4; i++ ) {
-                side = this.sides[ i ];
-
-                ltr = side.charAt(0).toLowerCase();
-                style = s[ ltr ] = cs[ 'border' + side + 'Style' ];
-                color = cs[ 'border' + side + 'Color' ];
-                width = cs[ 'border' + side + 'Width' ];
-
-                if( i > 0 ) {
-                    if( style !== lastStyle ) { stylesSame = false; }
-                    if( color !== lastColor ) { colorsSame = false; }
-                    if( width !== lastWidth ) { widthsSame = false; }
-                }
-                lastStyle = style;
-                lastColor = color;
-                lastWidth = width;
-
-                c[ ltr ] = PIE.getColor( color );
-
-                width = w[ ltr ] = PIE.getLength( s[ ltr ] === 'none' ? '0' : ( this.namedWidths[ width ] || width ) );
-                if( width.pixels( this.targetElement ) > 0 ) {
-                    active = true;
-                }
-            }
-        } );
-
-        return active ? {
-            widths: w,
-            styles: s,
-            colors: c,
-            widthsSame: widthsSame,
-            colorsSame: colorsSame,
-            stylesSame: stylesSame
-        } : null;
-    },
-
-    getCss: PIE.StyleInfoBase.cacheWhenLocked( function() {
-        var el = this.targetElement,
-            cs = el.currentStyle,
-            css;
-
-        // Don't redraw or hide borders for cells in border-collapse:collapse tables
-        if( !( el.tagName in PIE.tableCellTags && el.offsetParent.currentStyle.borderCollapse === 'collapse' ) ) {
-            this.withActualBorder( function() {
-                css = cs.borderWidth + '|' + cs.borderStyle + '|' + cs.borderColor;
-            } );
-        }
-        return css;
-    } ),
-
-    /**
-     * Execute a function with the actual border styles (not overridden with runtimeStyle
-     * properties set by the renderers) available via currentStyle.
-     * @param fn
-     */
-    withActualBorder: function( fn ) {
-        var rs = this.targetElement.runtimeStyle,
-            rsWidth = rs.borderWidth,
-            rsColor = rs.borderColor,
-            ret;
-
-        if( rsWidth ) rs.borderWidth = '';
-        if( rsColor ) rs.borderColor = '';
-
-        ret = fn.call( this );
-
-        if( rsWidth ) rs.borderWidth = rsWidth;
-        if( rsColor ) rs.borderColor = rsColor;
-
-        return ret;
-    }
-
-} );
-/**
- * Handles parsing, caching, and detecting changes to border-radius CSS
- * @constructor
- * @param {Element} el the target element
- */
-(function() {
-
-PIE.BorderRadiusStyleInfo = PIE.StyleInfoBase.newStyleInfo( {
-
-    cssProperty: 'border-radius',
-    styleProperty: 'borderRadius',
-
-    parseCss: function( css ) {
-        var p = null, x, y,
-            tokenizer, token, length,
-            hasNonZero = false;
-
-        if( css ) {
-            tokenizer = new PIE.Tokenizer( css );
-
-            function collectLengths() {
-                var arr = [], num;
-                while( ( token = tokenizer.next() ) && token.isLengthOrPercent() ) {
-                    length = PIE.getLength( token.tokenValue );
-                    num = length.getNumber();
-                    if( num < 0 ) {
-                        return null;
-                    }
-                    if( num > 0 ) {
-                        hasNonZero = true;
-                    }
-                    arr.push( length );
-                }
-                return arr.length > 0 && arr.length < 5 ? {
-                        'tl': arr[0],
-                        'tr': arr[1] || arr[0],
-                        'br': arr[2] || arr[0],
-                        'bl': arr[3] || arr[1] || arr[0]
-                    } : null;
-            }
-
-            // Grab the initial sequence of lengths
-            if( x = collectLengths() ) {
-                // See if there is a slash followed by more lengths, for the y-axis radii
-                if( token ) {
-                    if( token.tokenType & PIE.Tokenizer.Type.OPERATOR && token.tokenValue === '/' ) {
-                        y = collectLengths();
-                    }
-                } else {
-                    y = x;
-                }
-
-                // Treat all-zero values the same as no value
-                if( hasNonZero && x && y ) {
-                    p = { x: x, y : y };
-                }
-            }
-        }
-
-        return p;
-    }
-} );
-
-var zero = PIE.getLength( '0' ),
-    zeros = { 'tl': zero, 'tr': zero, 'br': zero, 'bl': zero };
-PIE.BorderRadiusStyleInfo.ALL_ZERO = { x: zeros, y: zeros };
-
-})();/**
- * Handles parsing, caching, and detecting changes to border-image CSS
- * @constructor
- * @param {Element} el the target element
- */
-PIE.BorderImageStyleInfo = PIE.StyleInfoBase.newStyleInfo( {
-
-    cssProperty: 'border-image',
-    styleProperty: 'borderImage',
-
-    repeatIdents: { 'stretch':1, 'round':1, 'repeat':1, 'space':1 },
-
-    parseCss: function( css ) {
-        var p = null, tokenizer, token, type, value,
-            slices, widths, outsets,
-            slashCount = 0,
-            Type = PIE.Tokenizer.Type,
-            IDENT = Type.IDENT,
-            NUMBER = Type.NUMBER,
-            PERCENT = Type.PERCENT;
-
-        if( css ) {
-            tokenizer = new PIE.Tokenizer( css );
-            p = {};
-
-            function isSlash( token ) {
-                return token && ( token.tokenType & Type.OPERATOR ) && ( token.tokenValue === '/' );
-            }
-
-            function isFillIdent( token ) {
-                return token && ( token.tokenType & IDENT ) && ( token.tokenValue === 'fill' );
-            }
-
-            function collectSlicesEtc() {
-                slices = tokenizer.until( function( tok ) {
-                    return !( tok.tokenType & ( NUMBER | PERCENT ) );
-                } );
-
-                if( isFillIdent( tokenizer.next() ) && !p.fill ) {
-                    p.fill = true;
-                } else {
-                    tokenizer.prev();
-                }
-
-                if( isSlash( tokenizer.next() ) ) {
-                    slashCount++;
-                    widths = tokenizer.until( function( token ) {
-                        return !token.isLengthOrPercent() && !( ( token.tokenType & IDENT ) && token.tokenValue === 'auto' );
-                    } );
-
-                    if( isSlash( tokenizer.next() ) ) {
-                        slashCount++;
-                        outsets = tokenizer.until( function( token ) {
-                            return !token.isLength();
-                        } );
-                    }
-                } else {
-                    tokenizer.prev();
-                }
-            }
-
-            while( token = tokenizer.next() ) {
-                type = token.tokenType;
-                value = token.tokenValue;
-
-                // Numbers and/or 'fill' keyword: slice values. May be followed optionally by width values, followed optionally by outset values
-                if( type & ( NUMBER | PERCENT ) && !slices ) {
-                    tokenizer.prev();
-                    collectSlicesEtc();
-                }
-                else if( isFillIdent( token ) && !p.fill ) {
-                    p.fill = true;
-                    collectSlicesEtc();
-                }
-
-                // Idents: one or values for 'repeat'
-                else if( ( type & IDENT ) && this.repeatIdents[value] && !p.repeat ) {
-                    p.repeat = { h: value };
-                    if( token = tokenizer.next() ) {
-                        if( ( token.tokenType & IDENT ) && this.repeatIdents[token.tokenValue] ) {
-                            p.repeat.v = token.tokenValue;
-                        } else {
-                            tokenizer.prev();
-                        }
-                    }
-                }
-
-                // URL of the image
-                else if( ( type & Type.URL ) && !p.src ) {
-                    p.src =  value;
-                }
-
-                // Found something unrecognized; exit.
-                else {
-                    return null;
-                }
-            }
-
-            // Validate what we collected
-            if( !p.src || !slices || slices.length < 1 || slices.length > 4 ||
-                ( widths && widths.length > 4 ) || ( slashCount === 1 && widths.length < 1 ) ||
-                ( outsets && outsets.length > 4 ) || ( slashCount === 2 && outsets.length < 1 ) ) {
-                return null;
-            }
-
-            // Fill in missing values
-            if( !p.repeat ) {
-                p.repeat = { h: 'stretch' };
-            }
-            if( !p.repeat.v ) {
-                p.repeat.v = p.repeat.h;
-            }
-
-            function distributeSides( tokens, convertFn ) {
-                return {
-                    't': convertFn( tokens[0] ),
-                    'r': convertFn( tokens[1] || tokens[0] ),
-                    'b': convertFn( tokens[2] || tokens[0] ),
-                    'l': convertFn( tokens[3] || tokens[1] || tokens[0] )
-                };
-            }
-
-            p.slice = distributeSides( slices, function( tok ) {
-                return PIE.getLength( ( tok.tokenType & NUMBER ) ? tok.tokenValue + 'px' : tok.tokenValue );
-            } );
-
-            if( widths && widths[0] ) {
-                p.widths = distributeSides( widths, function( tok ) {
-                    return tok.isLengthOrPercent() ? PIE.getLength( tok.tokenValue ) : tok.tokenValue;
-                } );
-            }
-
-            if( outsets && outsets[0] ) {
-                p.outset = distributeSides( outsets, function( tok ) {
-                    return tok.isLength() ? PIE.getLength( tok.tokenValue ) : tok.tokenValue;
-                } );
-            }
-        }
-
-        return p;
-    }
-
-} );/**
- * Handles parsing, caching, and detecting changes to box-shadow CSS
- * @constructor
- * @param {Element} el the target element
- */
-PIE.BoxShadowStyleInfo = PIE.StyleInfoBase.newStyleInfo( {
-
-    cssProperty: 'box-shadow',
-    styleProperty: 'boxShadow',
-
-    parseCss: function( css ) {
-        var props,
-            getLength = PIE.getLength,
-            Type = PIE.Tokenizer.Type,
-            tokenizer;
-
-        if( css ) {
-            tokenizer = new PIE.Tokenizer( css );
-            props = { outset: [], inset: [] };
-
-            function parseItem() {
-                var token, type, value, color, lengths, inset, len;
-
-                while( token = tokenizer.next() ) {
-                    value = token.tokenValue;
-                    type = token.tokenType;
-
-                    if( type & Type.OPERATOR && value === ',' ) {
-                        break;
-                    }
-                    else if( token.isLength() && !lengths ) {
-                        tokenizer.prev();
-                        lengths = tokenizer.until( function( token ) {
-                            return !token.isLength();
-                        } );
-                    }
-                    else if( type & Type.COLOR && !color ) {
-                        color = value;
-                    }
-                    else if( type & Type.IDENT && value === 'inset' && !inset ) {
-                        inset = true;
-                    }
-                    else { //encountered an unrecognized token; fail.
-                        return false;
-                    }
-                }
-
-                len = lengths && lengths.length;
-                if( len > 1 && len < 5 ) {
-                    ( inset ? props.inset : props.outset ).push( {
-                        xOffset: getLength( lengths[0].tokenValue ),
-                        yOffset: getLength( lengths[1].tokenValue ),
-                        blur: getLength( lengths[2] ? lengths[2].tokenValue : '0' ),
-                        spread: getLength( lengths[3] ? lengths[3].tokenValue : '0' ),
-                        color: PIE.getColor( color || 'currentColor' )
-                    } );
-                    return true;
-                }
-                return false;
-            }
-
-            while( parseItem() ) {}
-        }
-
-        return props && ( props.inset.length || props.outset.length ) ? props : null;
-    }
-} );
-/**
- * Retrieves the state of the element's visibility and display
- * @constructor
- * @param {Element} el the target element
- */
-PIE.VisibilityStyleInfo = PIE.StyleInfoBase.newStyleInfo( {
-
-    getCss: PIE.StyleInfoBase.cacheWhenLocked( function() {
-        var cs = this.targetElement.currentStyle;
-        return cs.visibility + '|' + cs.display;
-    } ),
-
-    parseCss: function() {
-        var el = this.targetElement,
-            rs = el.runtimeStyle,
-            cs = el.currentStyle,
-            rsVis = rs.visibility,
-            csVis;
-
-        rs.visibility = '';
-        csVis = cs.visibility;
-        rs.visibility = rsVis;
-
-        return {
-            visible: csVis !== 'hidden',
-            displayed: cs.display !== 'none'
-        }
-    },
-
-    /**
-     * Always return false for isActive, since this property alone will not trigger
-     * a renderer to do anything.
-     */
-    isActive: function() {
-        return false;
-    }
-
-} );
-PIE.RendererBase = {
-
-    /**
-     * Create a new Renderer class, with the standard constructor, and augmented by
-     * the RendererBase's members.
-     * @param proto
-     */
-    newRenderer: function( proto ) {
-        function Renderer( el, boundsInfo, styleInfos, parent ) {
-            this.targetElement = el;
-            this.boundsInfo = boundsInfo;
-            this.styleInfos = styleInfos;
-            this.parent = parent;
-        }
-        PIE.Util.merge( Renderer.prototype, PIE.RendererBase, proto );
-        return Renderer;
-    },
-
-    /**
-     * Flag indicating the element has already been positioned at least once.
-     * @type {boolean}
-     */
-    isPositioned: false,
-
-    /**
-     * Determine if the renderer needs to be updated
-     * @return {boolean}
-     */
-    needsUpdate: function() {
-        return false;
-    },
-
-    /**
-     * Run any preparation logic that would affect the main update logic of this
-     * renderer or any of the other renderers, e.g. things that might affect the
-     * element's size or style properties.
-     */
-    prepareUpdate: PIE.emptyFn,
-
-    /**
-     * Tell the renderer to update based on modified properties
-     */
-    updateProps: function() {
-        this.destroy();
-        if( this.isActive() ) {
-            this.draw();
-        }
-    },
-
-    /**
-     * Tell the renderer to update based on modified element position
-     */
-    updatePos: function() {
-        this.isPositioned = true;
-    },
-
-    /**
-     * Tell the renderer to update based on modified element dimensions
-     */
-    updateSize: function() {
-        if( this.isActive() ) {
-            this.draw();
-        } else {
-            this.destroy();
-        }
-    },
-
-
-    /**
-     * Add a layer element, with the given z-order index, to the renderer's main box element. We can't use
-     * z-index because that breaks when the root rendering box's z-index is 'auto' in IE8+ standards mode.
-     * So instead we make sure they are inserted into the DOM in the correct order.
-     * @param {number} index
-     * @param {Element} el
-     */
-    addLayer: function( index, el ) {
-        this.removeLayer( index );
-        for( var layers = this._layers || ( this._layers = [] ), i = index + 1, len = layers.length, layer; i < len; i++ ) {
-            layer = layers[i];
-            if( layer ) {
-                break;
-            }
-        }
-        layers[index] = el;
-        this.getBox().insertBefore( el, layer || null );
-    },
-
-    /**
-     * Retrieve a layer element by its index, or null if not present
-     * @param {number} index
-     * @return {Element}
-     */
-    getLayer: function( index ) {
-        var layers = this._layers;
-        return layers && layers[index] || null;
-    },
-
-    /**
-     * Remove a layer element by its index
-     * @param {number} index
-     */
-    removeLayer: function( index ) {
-        var layer = this.getLayer( index ),
-            box = this._box;
-        if( layer && box ) {
-            box.removeChild( layer );
-            this._layers[index] = null;
-        }
-    },
-
-
-    /**
-     * Get a VML shape by name, creating it if necessary.
-     * @param {string} name A name identifying the element
-     * @param {string=} subElName If specified a subelement of the shape will be created with this tag name
-     * @param {Element} parent The parent element for the shape; will be ignored if 'group' is specified
-     * @param {number=} group If specified, an ordinal group for the shape. 1 or greater. Groups are rendered
-     *                  using container elements in the correct order, to get correct z stacking without z-index.
-     */
-    getShape: function( name, subElName, parent, group ) {
-        var shapes = this._shapes || ( this._shapes = {} ),
-            shape = shapes[ name ],
-            s;
-
-        if( !shape ) {
-            shape = shapes[ name ] = PIE.Util.createVmlElement( 'shape' );
-            if( subElName ) {
-                shape.appendChild( shape[ subElName ] = PIE.Util.createVmlElement( subElName ) );
-            }
-
-            if( group ) {
-                parent = this.getLayer( group );
-                if( !parent ) {
-                    this.addLayer( group, doc.createElement( 'group' + group ) );
-                    parent = this.getLayer( group );
-                }
-            }
-
-            parent.appendChild( shape );
-
-            s = shape.style;
-            s.position = 'absolute';
-            s.left = s.top = 0;
-            s['behavior'] = 'url(#default#VML)';
-        }
-        return shape;
-    },
-
-    /**
-     * Delete a named shape which was created by getShape(). Returns true if a shape with the
-     * given name was found and deleted, or false if there was no shape of that name.
-     * @param {string} name
-     * @return {boolean}
-     */
-    deleteShape: function( name ) {
-        var shapes = this._shapes,
-            shape = shapes && shapes[ name ];
-        if( shape ) {
-            shape.parentNode.removeChild( shape );
-            delete shapes[ name ];
-        }
-        return !!shape;
-    },
-
-
-    /**
-     * For a given set of border radius length/percentage values, convert them to concrete pixel
-     * values based on the current size of the target element.
-     * @param {Object} radii
-     * @return {Object}
-     */
-    getRadiiPixels: function( radii ) {
-        var el = this.targetElement,
-            bounds = this.boundsInfo.getBounds(),
-            w = bounds.w,
-            h = bounds.h,
-            tlX, tlY, trX, trY, brX, brY, blX, blY, f;
-
-        tlX = radii.x['tl'].pixels( el, w );
-        tlY = radii.y['tl'].pixels( el, h );
-        trX = radii.x['tr'].pixels( el, w );
-        trY = radii.y['tr'].pixels( el, h );
-        brX = radii.x['br'].pixels( el, w );
-        brY = radii.y['br'].pixels( el, h );
-        blX = radii.x['bl'].pixels( el, w );
-        blY = radii.y['bl'].pixels( el, h );
-
-        // If any corner ellipses overlap, reduce them all by the appropriate factor. This formula
-        // is taken straight from the CSS3 Backgrounds and Borders spec.
-        f = Math.min(
-            w / ( tlX + trX ),
-            h / ( trY + brY ),
-            w / ( blX + brX ),
-            h / ( tlY + blY )
-        );
-        if( f < 1 ) {
-            tlX *= f;
-            tlY *= f;
-            trX *= f;
-            trY *= f;
-            brX *= f;
-            brY *= f;
-            blX *= f;
-            blY *= f;
-        }
-
-        return {
-            x: {
-                'tl': tlX,
-                'tr': trX,
-                'br': brX,
-                'bl': blX
-            },
-            y: {
-                'tl': tlY,
-                'tr': trY,
-                'br': brY,
-                'bl': blY
-            }
-        }
-    },
-
-    /**
-     * Return the VML path string for the element's background box, with corners rounded.
-     * @param {Object.<{t:number, r:number, b:number, l:number}>} shrink - if present, specifies number of
-     *        pixels to shrink the box path inward from the element's four sides.
-     * @param {number=} mult If specified, all coordinates will be multiplied by this number
-     * @param {Object=} radii If specified, this will be used for the corner radii instead of the properties
-     *        from this renderer's borderRadiusInfo object.
-     * @return {string} the VML path
-     */
-    getBoxPath: function( shrink, mult, radii ) {
-        mult = mult || 1;
-
-        var r, str,
-            bounds = this.boundsInfo.getBounds(),
-            w = bounds.w * mult,
-            h = bounds.h * mult,
-            radInfo = this.styleInfos.borderRadiusInfo,
-            floor = Math.floor, ceil = Math.ceil,
-            shrinkT = shrink ? shrink.t * mult : 0,
-            shrinkR = shrink ? shrink.r * mult : 0,
-            shrinkB = shrink ? shrink.b * mult : 0,
-            shrinkL = shrink ? shrink.l * mult : 0,
-            tlX, tlY, trX, trY, brX, brY, blX, blY;
-
-        if( radii || radInfo.isActive() ) {
-            r = this.getRadiiPixels( radii || radInfo.getProps() );
-
-            tlX = r.x['tl'] * mult;
-            tlY = r.y['tl'] * mult;
-            trX = r.x['tr'] * mult;
-            trY = r.y['tr'] * mult;
-            brX = r.x['br'] * mult;
-            brY = r.y['br'] * mult;
-            blX = r.x['bl'] * mult;
-            blY = r.y['bl'] * mult;
-
-            str = 'm' + floor( shrinkL ) + ',' + floor( tlY ) +
-                'qy' + floor( tlX ) + ',' + floor( shrinkT ) +
-                'l' + ceil( w - trX ) + ',' + floor( shrinkT ) +
-                'qx' + ceil( w - shrinkR ) + ',' + floor( trY ) +
-                'l' + ceil( w - shrinkR ) + ',' + ceil( h - brY ) +
-                'qy' + ceil( w - brX ) + ',' + ceil( h - shrinkB ) +
-                'l' + floor( blX ) + ',' + ceil( h - shrinkB ) +
-                'qx' + floor( shrinkL ) + ',' + ceil( h - blY ) + ' x e';
-        } else {
-            // simplified path for non-rounded box
-            str = 'm' + floor( shrinkL ) + ',' + floor( shrinkT ) +
-                  'l' + ceil( w - shrinkR ) + ',' + floor( shrinkT ) +
-                  'l' + ceil( w - shrinkR ) + ',' + ceil( h - shrinkB ) +
-                  'l' + floor( shrinkL ) + ',' + ceil( h - shrinkB ) +
-                  'xe';
-        }
-        return str;
-    },
-
-
-    /**
-     * Get the container element for the shapes, creating it if necessary.
-     */
-    getBox: function() {
-        var box = this.parent.getLayer( this.boxZIndex ), s;
-
-        if( !box ) {
-            box = doc.createElement( this.boxName );
-            s = box.style;
-            s.position = 'absolute';
-            s.top = s.left = 0;
-            this.parent.addLayer( this.boxZIndex, box );
-        }
-
-        return box;
-    },
-
-
-    /**
-     * Hide the actual border of the element. In IE7 and up we can just set its color to transparent;
-     * however IE6 does not support transparent borders so we have to get tricky with it. Also, some elements
-     * like form buttons require removing the border width altogether, so for those we increase the padding
-     * by the border size.
-     */
-    hideBorder: function() {
-        var el = this.targetElement,
-            cs = el.currentStyle,
-            rs = el.runtimeStyle,
-            tag = el.tagName,
-            isIE6 = PIE.ieVersion === 6,
-            sides, side, i;
-
-        if( ( isIE6 && ( tag in PIE.childlessElements || tag === 'FIELDSET' ) ) ||
-                tag === 'BUTTON' || ( tag === 'INPUT' && el.type in PIE.inputButtonTypes ) ) {
-            rs.borderWidth = '';
-            sides = this.styleInfos.borderInfo.sides;
-            for( i = sides.length; i--; ) {
-                side = sides[ i ];
-                rs[ 'padding' + side ] = '';
-                rs[ 'padding' + side ] = ( PIE.getLength( cs[ 'padding' + side ] ) ).pixels( el ) +
-                                         ( PIE.getLength( cs[ 'border' + side + 'Width' ] ) ).pixels( el ) +
-                                         ( PIE.ieVersion !== 8 && i % 2 ? 1 : 0 ); //needs an extra horizontal pixel to counteract the extra "inner border" going away
-            }
-            rs.borderWidth = 0;
-        }
-        else if( isIE6 ) {
-            // Wrap all the element's children in a custom element, set the element to visiblity:hidden,
-            // and set the wrapper element to visiblity:visible. This hides the outer element's decorations
-            // (background and border) but displays all the contents.
-            // TODO find a better way to do this that doesn't mess up the DOM parent-child relationship,
-            // as this can interfere with other author scripts which add/modify/delete children. Also, this
-            // won't work for elements which cannot take children, e.g. input/button/textarea/img/etc. Look into
-            // using a compositor filter or some other filter which masks the border.
-            if( el.childNodes.length !== 1 || el.firstChild.tagName !== 'ie6-mask' ) {
-                var cont = doc.createElement( 'ie6-mask' ),
-                    s = cont.style, child;
-                s.visibility = 'visible';
-                s.zoom = 1;
-                while( child = el.firstChild ) {
-                    cont.appendChild( child );
-                }
-                el.appendChild( cont );
-                rs.visibility = 'hidden';
-            }
-        }
-        else {
-            rs.borderColor = 'transparent';
-        }
-    },
-
-    unhideBorder: function() {
-        
-    },
-
-
-    /**
-     * Destroy the rendered objects. This is a base implementation which handles common renderer
-     * structures, but individual renderers may override as necessary.
-     */
-    destroy: function() {
-        this.parent.removeLayer( this.boxZIndex );
-        delete this._shapes;
-        delete this._layers;
-    }
-};
-/**
- * Root renderer; creates the outermost container element and handles keeping it aligned
- * with the target element's size and position.
- * @param {Element} el The target element
- * @param {Object} styleInfos The StyleInfo objects
- */
-PIE.RootRenderer = PIE.RendererBase.newRenderer( {
-
-    isActive: function() {
-        var children = this.childRenderers;
-        for( var i in children ) {
-            if( children.hasOwnProperty( i ) && children[ i ].isActive() ) {
-                return true;
-            }
-        }
-        return false;
-    },
-
-    needsUpdate: function() {
-        return this.styleInfos.visibilityInfo.changed();
-    },
-
-    updatePos: function() {
-        if( this.isActive() ) {
-            var el = this.getPositioningElement(),
-                par = el,
-                docEl,
-                parRect,
-                tgtCS = el.currentStyle,
-                tgtPos = tgtCS.position,
-                boxPos,
-                s = this.getBox().style, cs,
-                x = 0, y = 0,
-                elBounds = this.boundsInfo.getBounds();
-
-            if( tgtPos === 'fixed' && PIE.ieVersion > 6 ) {
-                x = elBounds.x;
-                y = elBounds.y;
-                boxPos = tgtPos;
-            } else {
-                // Get the element's offsets from its nearest positioned ancestor. Uses
-                // getBoundingClientRect for accuracy and speed.
-                do {
-                    par = par.offsetParent;
-                } while( par && ( par.currentStyle.position === 'static' ) );
-                if( par ) {
-                    parRect = par.getBoundingClientRect();
-                    cs = par.currentStyle;
-                    x = elBounds.x - parRect.left - ( parseFloat(cs.borderLeftWidth) || 0 );
-                    y = elBounds.y - parRect.top - ( parseFloat(cs.borderTopWidth) || 0 );
-                } else {
-                    docEl = doc.documentElement;
-                    x = elBounds.x + docEl.scrollLeft - docEl.clientLeft;
-                    y = elBounds.y + docEl.scrollTop - docEl.clientTop;
-                }
-                boxPos = 'absolute';
-            }
-
-            s.position = boxPos;
-            s.left = x;
-            s.top = y;
-            s.zIndex = tgtPos === 'static' ? -1 : tgtCS.zIndex;
-            this.isPositioned = true;
-        }
-    },
-
-    updateSize: PIE.emptyFn,
-
-    updateVisibility: function() {
-        var vis = this.styleInfos.visibilityInfo.getProps();
-        this.getBox().style.display = ( vis.visible && vis.displayed ) ? '' : 'none';
-    },
-
-    updateProps: function() {
-        if( this.isActive() ) {
-            this.updateVisibility();
-        } else {
-            this.destroy();
-        }
-    },
-
-    getPositioningElement: function() {
-        var el = this.targetElement;
-        return el.tagName in PIE.tableCellTags ? el.offsetParent : el;
-    },
-
-    getBox: function() {
-        var box = this._box, el;
-        if( !box ) {
-            el = this.getPositioningElement();
-            box = this._box = doc.createElement( 'css3-container' );
-            box.style['direction'] = 'ltr'; //fix positioning bug in rtl environments
-
-            this.updateVisibility();
-
-            el.parentNode.insertBefore( box, el );
-        }
-        return box;
-    },
-
-    finishUpdate: PIE.emptyFn,
-
-    destroy: function() {
-        var box = this._box, par;
-        if( box && ( par = box.parentNode ) ) {
-            par.removeChild( box );
-        }
-        delete this._box;
-        delete this._layers;
-    }
-
-} );
-/**
- * Renderer for element backgrounds.
- * @constructor
- * @param {Element} el The target element
- * @param {Object} styleInfos The StyleInfo objects
- * @param {PIE.RootRenderer} parent
- */
-PIE.BackgroundRenderer = PIE.RendererBase.newRenderer( {
-
-    boxZIndex: 2,
-    boxName: 'background',
-
-    needsUpdate: function() {
-        var si = this.styleInfos;
-        return si.backgroundInfo.changed() || si.borderRadiusInfo.changed();
-    },
-
-    isActive: function() {
-        var si = this.styleInfos;
-        return si.borderImageInfo.isActive() ||
-               si.borderRadiusInfo.isActive() ||
-               si.backgroundInfo.isActive() ||
-               ( si.boxShadowInfo.isActive() && si.boxShadowInfo.getProps().inset );
-    },
-
-    /**
-     * Draw the shapes
-     */
-    draw: function() {
-        var bounds = this.boundsInfo.getBounds();
-        if( bounds.w && bounds.h ) {
-            this.drawBgColor();
-            this.drawBgImages();
-        }
-    },
-
-    /**
-     * Draw the background color shape
-     */
-    drawBgColor: function() {
-        var props = this.styleInfos.backgroundInfo.getProps(),
-            bounds = this.boundsInfo.getBounds(),
-            el = this.targetElement,
-            color = props && props.color,
-            shape, w, h, s, alpha;
-
-        if( color && color.alpha() > 0 ) {
-            this.hideBackground();
-
-            shape = this.getShape( 'bgColor', 'fill', this.getBox(), 1 );
-            w = bounds.w;
-            h = bounds.h;
-            shape.stroked = false;
-            shape.coordsize = w * 2 + ',' + h * 2;
-            shape.coordorigin = '1,1';
-            shape.path = this.getBoxPath( null, 2 );
-            s = shape.style;
-            s.width = w;
-            s.height = h;
-            shape.fill.color = color.colorValue( el );
-
-            alpha = color.alpha();
-            if( alpha < 1 ) {
-                shape.fill.opacity = alpha;
-            }
-        } else {
-            this.deleteShape( 'bgColor' );
-        }
-    },
-
-    /**
-     * Draw all the background image layers
-     */
-    drawBgImages: function() {
-        var props = this.styleInfos.backgroundInfo.getProps(),
-            bounds = this.boundsInfo.getBounds(),
-            images = props && props.bgImages,
-            img, shape, w, h, s, i;
-
-        if( images ) {
-            this.hideBackground();
-
-            w = bounds.w;
-            h = bounds.h;
-
-            i = images.length;
-            while( i-- ) {
-                img = images[i];
-                shape = this.getShape( 'bgImage' + i, 'fill', this.getBox(), 2 );
-
-                shape.stroked = false;
-                shape.fill.type = 'tile';
-                shape.fillcolor = 'none';
-                shape.coordsize = w * 2 + ',' + h * 2;
-                shape.coordorigin = '1,1';
-                shape.path = this.getBoxPath( 0, 2 );
-                s = shape.style;
-                s.width = w;
-                s.height = h;
-
-                if( img.imgType === 'linear-gradient' ) {
-                    this.addLinearGradient( shape, img );
-                }
-                else {
-                    shape.fill.src = img.imgUrl;
-                    this.positionBgImage( shape, i );
-                }
-            }
-        }
-
-        // Delete any bgImage shapes previously created which weren't used above
-        i = images ? images.length : 0;
-        while( this.deleteShape( 'bgImage' + i++ ) ) {}
-    },
-
-
-    /**
-     * Set the position and clipping of the background image for a layer
-     * @param {Element} shape
-     * @param {number} index
-     */
-    positionBgImage: function( shape, index ) {
-        var me = this;
-        PIE.Util.withImageSize( shape.fill.src, function( size ) {
-            var el = me.targetElement,
-                bounds = me.boundsInfo.getBounds(),
-                elW = bounds.w,
-                elH = bounds.h;
-
-            // It's possible that the element dimensions are zero now but weren't when the original
-            // update executed, make sure that's not the case to avoid divide-by-zero error
-            if( elW && elH ) {
-                var fill = shape.fill,
-                    si = me.styleInfos,
-                    border = si.borderInfo.getProps(),
-                    bw = border && border.widths,
-                    bwT = bw ? bw['t'].pixels( el ) : 0,
-                    bwR = bw ? bw['r'].pixels( el ) : 0,
-                    bwB = bw ? bw['b'].pixels( el ) : 0,
-                    bwL = bw ? bw['l'].pixels( el ) : 0,
-                    bg = si.backgroundInfo.getProps().bgImages[ index ],
-                    bgPos = bg.bgPosition ? bg.bgPosition.coords( el, elW - size.w - bwL - bwR, elH - size.h - bwT - bwB ) : { x:0, y:0 },
-                    repeat = bg.imgRepeat,
-                    pxX, pxY,
-                    clipT = 0, clipL = 0,
-                    clipR = elW + 1, clipB = elH + 1, //make sure the default clip region is not inside the box (by a subpixel)
-                    clipAdjust = PIE.ieVersion === 8 ? 0 : 1; //prior to IE8 requires 1 extra pixel in the image clip region
-
-                // Positioning - find the pixel offset from the top/left and convert to a ratio
-                // The position is shifted by half a pixel, to adjust for the half-pixel coordorigin shift which is
-                // needed to fix antialiasing but makes the bg image fuzzy.
-                pxX = Math.round( bgPos.x ) + bwL + 0.5;
-                pxY = Math.round( bgPos.y ) + bwT + 0.5;
-                fill.position = ( pxX / elW ) + ',' + ( pxY / elH );
-
-                // Repeating - clip the image shape
-                if( repeat && repeat !== 'repeat' ) {
-                    if( repeat === 'repeat-x' || repeat === 'no-repeat' ) {
-                        clipT = pxY + 1;
-                        clipB = pxY + size.h + clipAdjust;
-                    }
-                    if( repeat === 'repeat-y' || repeat === 'no-repeat' ) {
-                        clipL = pxX + 1;
-                        clipR = pxX + size.w + clipAdjust;
-                    }
-                    shape.style.clip = 'rect(' + clipT + 'px,' + clipR + 'px,' + clipB + 'px,' + clipL + 'px)';
-                }
-            }
-        } );
-    },
-
-
-    /**
-     * Draw the linear gradient for a gradient layer
-     * @param {Element} shape
-     * @param {Object} info The object holding the information about the gradient
-     */
-    addLinearGradient: function( shape, info ) {
-        var el = this.targetElement,
-            bounds = this.boundsInfo.getBounds(),
-            w = bounds.w,
-            h = bounds.h,
-            fill = shape.fill,
-            stops = info.stops,
-            stopCount = stops.length,
-            PI = Math.PI,
-            GradientUtil = PIE.GradientUtil,
-            perpendicularIntersect = GradientUtil.perpendicularIntersect,
-            distance = GradientUtil.distance,
-            metrics = GradientUtil.getGradientMetrics( el, w, h, info ),
-            angle = metrics.angle,
-            startX = metrics.startX,
-            startY = metrics.startY,
-            startCornerX = metrics.startCornerX,
-            startCornerY = metrics.startCornerY,
-            endCornerX = metrics.endCornerX,
-            endCornerY = metrics.endCornerY,
-            deltaX = metrics.deltaX,
-            deltaY = metrics.deltaY,
-            lineLength = metrics.lineLength,
-            vmlAngle, vmlGradientLength, vmlColors,
-            stopPx, vmlOffsetPct,
-            p, i, j, before, after;
-
-        // In VML land, the angle of the rendered gradient depends on the aspect ratio of the shape's
-        // bounding box; for example specifying a 45 deg angle actually results in a gradient
-        // drawn diagonally from one corner to its opposite corner, which will only appear to the
-        // viewer as 45 degrees if the shape is equilateral.  We adjust for this by taking the x/y deltas
-        // between the start and end points, multiply one of them by the shape's aspect ratio,
-        // and get their arctangent, resulting in an appropriate VML angle. If the angle is perfectly
-        // horizontal or vertical then we don't need to do this conversion.
-        vmlAngle = ( angle % 90 ) ? Math.atan2( deltaX * w / h, deltaY ) / PI * 180 : ( angle + 90 );
-
-        // VML angles are 180 degrees offset from CSS angles
-        vmlAngle += 180;
-        vmlAngle = vmlAngle % 360;
-
-        // Add all the stops to the VML 'colors' list, including the first and last stops.
-        // For each, we find its pixel offset along the gradient-line; if the offset of a stop is less
-        // than that of its predecessor we increase it to be equal. We then map that pixel offset to a
-        // percentage along the VML gradient-line, which runs from shape corner to corner.
-        p = perpendicularIntersect( startCornerX, startCornerY, angle, endCornerX, endCornerY );
-        vmlGradientLength = distance( startCornerX, startCornerY, p[0], p[1] );
-        vmlColors = [];
-        p = perpendicularIntersect( startX, startY, angle, startCornerX, startCornerY );
-        vmlOffsetPct = distance( startX, startY, p[0], p[1] ) / vmlGradientLength * 100;
-
-        // Find the pixel offsets along the CSS3 gradient-line for each stop.
-        stopPx = [];
-        for( i = 0; i < stopCount; i++ ) {
-            stopPx.push( stops[i].offset ? stops[i].offset.pixels( el, lineLength ) :
-                         i === 0 ? 0 : i === stopCount - 1 ? lineLength : null );
-        }
-        // Fill in gaps with evenly-spaced offsets
-        for( i = 1; i < stopCount; i++ ) {
-            if( stopPx[ i ] === null ) {
-                before = stopPx[ i - 1 ];
-                j = i;
-                do {
-                    after = stopPx[ ++j ];
-                } while( after === null );
-                stopPx[ i ] = before + ( after - before ) / ( j - i + 1 );
-            }
-            // Make sure each stop's offset is no less than the one before it
-            stopPx[ i ] = Math.max( stopPx[ i ], stopPx[ i - 1 ] );
-        }
-
-        // Convert to percentage along the VML gradient line and add to the VML 'colors' value
-        for( i = 0; i < stopCount; i++ ) {
-            vmlColors.push(
-                ( vmlOffsetPct + ( stopPx[ i ] / vmlGradientLength * 100 ) ) + '% ' + stops[i].color.colorValue( el )
-            );
-        }
-
-        // Now, finally, we're ready to render the gradient fill. Set the start and end colors to
-        // the first and last stop colors; this just sets outer bounds for the gradient.
-        fill['angle'] = vmlAngle;
-        fill['type'] = 'gradient';
-        fill['method'] = 'sigma';
-        fill['color'] = stops[0].color.colorValue( el );
-        fill['color2'] = stops[stopCount - 1].color.colorValue( el );
-        if( fill['colors'] ) { //sometimes the colors object isn't initialized so we have to assign it directly (?)
-            fill['colors'].value = vmlColors.join( ',' );
-        } else {
-            fill['colors'] = vmlColors.join( ',' );
-        }
-    },
-
-
-    /**
-     * Hide the actual background image and color of the element.
-     */
-    hideBackground: function() {
-        var rs = this.targetElement.runtimeStyle;
-        rs.backgroundImage = 'url(about:blank)'; //ensures the background area reacts to mouse events
-        rs.backgroundColor = 'transparent';
-    },
-
-    destroy: function() {
-        PIE.RendererBase.destroy.call( this );
-        var rs = this.targetElement.runtimeStyle;
-        rs.backgroundImage = rs.backgroundColor = '';
-    }
-
-} );
-/**
- * Renderer for element borders.
- * @constructor
- * @param {Element} el The target element
- * @param {Object} styleInfos The StyleInfo objects
- * @param {PIE.RootRenderer} parent
- */
-PIE.BorderRenderer = PIE.RendererBase.newRenderer( {
-
-    boxZIndex: 4,
-    boxName: 'border',
-
-    needsUpdate: function() {
-        var si = this.styleInfos;
-        return si.borderInfo.changed() || si.borderRadiusInfo.changed();
-    },
-
-    isActive: function() {
-        var si = this.styleInfos;
-        return ( si.borderRadiusInfo.isActive() ||
-                 si.backgroundInfo.isActive() ) &&
-               !si.borderImageInfo.isActive() &&
-               si.borderInfo.isActive(); //check BorderStyleInfo last because it's the most expensive
-    },
-
-    /**
-     * Draw the border shape(s)
-     */
-    draw: function() {
-        var el = this.targetElement,
-            props = this.styleInfos.borderInfo.getProps(),
-            bounds = this.boundsInfo.getBounds(),
-            w = bounds.w,
-            h = bounds.h,
-            shape, stroke, s,
-            segments, seg, i, len;
-
-        if( props ) {
-            this.hideBorder();
-
-            segments = this.getBorderSegments( 2 );
-            for( i = 0, len = segments.length; i < len; i++) {
-                seg = segments[i];
-                shape = this.getShape( 'borderPiece' + i, seg.stroke ? 'stroke' : 'fill', this.getBox() );
-                shape.coordsize = w * 2 + ',' + h * 2;
-                shape.coordorigin = '1,1';
-                shape.path = seg.path;
-                s = shape.style;
-                s.width = w;
-                s.height = h;
-
-                shape.filled = !!seg.fill;
-                shape.stroked = !!seg.stroke;
-                if( seg.stroke ) {
-                    stroke = shape.stroke;
-                    stroke['weight'] = seg.weight + 'px';
-                    stroke.color = seg.color.colorValue( el );
-                    stroke['dashstyle'] = seg.stroke === 'dashed' ? '2 2' : seg.stroke === 'dotted' ? '1 1' : 'solid';
-                    stroke['linestyle'] = seg.stroke === 'double' && seg.weight > 2 ? 'ThinThin' : 'Single';
-                } else {
-                    shape.fill.color = seg.fill.colorValue( el );
-                }
-            }
-
-            // remove any previously-created border shapes which didn't get used above
-            while( this.deleteShape( 'borderPiece' + i++ ) ) {}
-        }
-    },
-
-
-    /**
-     * Get the VML path definitions for the border segment(s).
-     * @param {number=} mult If specified, all coordinates will be multiplied by this number
-     * @return {Array.<string>}
-     */
-    getBorderSegments: function( mult ) {
-        var el = this.targetElement,
-            bounds, elW, elH,
-            borderInfo = this.styleInfos.borderInfo,
-            segments = [],
-            floor, ceil, wT, wR, wB, wL,
-            round = Math.round,
-            borderProps, radiusInfo, radii, widths, styles, colors;
-
-        if( borderInfo.isActive() ) {
-            borderProps = borderInfo.getProps();
-
-            widths = borderProps.widths;
-            styles = borderProps.styles;
-            colors = borderProps.colors;
-
-            if( borderProps.widthsSame && borderProps.stylesSame && borderProps.colorsSame ) {
-                if( colors['t'].alpha() > 0 ) {
-                    // shortcut for identical border on all sides - only need 1 stroked shape
-                    wT = widths['t'].pixels( el ); //thickness
-                    wR = wT / 2; //shrink
-                    segments.push( {
-                        path: this.getBoxPath( { t: wR, r: wR, b: wR, l: wR }, mult ),
-                        stroke: styles['t'],
-                        color: colors['t'],
-                        weight: wT
-                    } );
-                }
-            }
-            else {
-                mult = mult || 1;
-                bounds = this.boundsInfo.getBounds();
-                elW = bounds.w;
-                elH = bounds.h;
-
-                wT = round( widths['t'].pixels( el ) );
-                wR = round( widths['r'].pixels( el ) );
-                wB = round( widths['b'].pixels( el ) );
-                wL = round( widths['l'].pixels( el ) );
-                var pxWidths = {
-                    't': wT,
-                    'r': wR,
-                    'b': wB,
-                    'l': wL
-                };
-
-                radiusInfo = this.styleInfos.borderRadiusInfo;
-                if( radiusInfo.isActive() ) {
-                    radii = this.getRadiiPixels( radiusInfo.getProps() );
-                }
-
-                floor = Math.floor;
-                ceil = Math.ceil;
-
-                function radius( xy, corner ) {
-                    return radii ? radii[ xy ][ corner ] : 0;
-                }
-
-                function curve( corner, shrinkX, shrinkY, startAngle, ccw, doMove ) {
-                    var rx = radius( 'x', corner),
-                        ry = radius( 'y', corner),
-                        deg = 65535,
-                        isRight = corner.charAt( 1 ) === 'r',
-                        isBottom = corner.charAt( 0 ) === 'b';
-                    return ( rx > 0 && ry > 0 ) ?
-                                ( doMove ? 'al' : 'ae' ) +
-                                ( isRight ? ceil( elW - rx ) : floor( rx ) ) * mult + ',' + // center x
-                                ( isBottom ? ceil( elH - ry ) : floor( ry ) ) * mult + ',' + // center y
-                                ( floor( rx ) - shrinkX ) * mult + ',' + // width
-                                ( floor( ry ) - shrinkY ) * mult + ',' + // height
-                                ( startAngle * deg ) + ',' + // start angle
-                                ( 45 * deg * ( ccw ? 1 : -1 ) // angle change
-                            ) : (
-                                ( doMove ? 'm' : 'l' ) +
-                                ( isRight ? elW - shrinkX : shrinkX ) * mult + ',' +
-                                ( isBottom ? elH - shrinkY : shrinkY ) * mult
-                            );
-                }
-
-                function line( side, shrink, ccw, doMove ) {
-                    var
-                        start = (
-                            side === 't' ?
-                                floor( radius( 'x', 'tl') ) * mult + ',' + ceil( shrink ) * mult :
-                            side === 'r' ?
-                                ceil( elW - shrink ) * mult + ',' + floor( radius( 'y', 'tr') ) * mult :
-                            side === 'b' ?
-                                ceil( elW - radius( 'x', 'br') ) * mult + ',' + floor( elH - shrink ) * mult :
-                            // side === 'l' ?
-                                floor( shrink ) * mult + ',' + ceil( elH - radius( 'y', 'bl') ) * mult
-                        ),
-                        end = (
-                            side === 't' ?
-                                ceil( elW - radius( 'x', 'tr') ) * mult + ',' + ceil( shrink ) * mult :
-                            side === 'r' ?
-                                ceil( elW - shrink ) * mult + ',' + ceil( elH - radius( 'y', 'br') ) * mult :
-                            side === 'b' ?
-                                floor( radius( 'x', 'bl') ) * mult + ',' + floor( elH - shrink ) * mult :
-                            // side === 'l' ?
-                                floor( shrink ) * mult + ',' + floor( radius( 'y', 'tl') ) * mult
-                        );
-                    return ccw ? ( doMove ? 'm' + end : '' ) + 'l' + start :
-                                 ( doMove ? 'm' + start : '' ) + 'l' + end;
-                }
-
-
-                function addSide( side, sideBefore, sideAfter, cornerBefore, cornerAfter, baseAngle ) {
-                    var vert = side === 'l' || side === 'r',
-                        sideW = pxWidths[ side ],
-                        beforeX, beforeY, afterX, afterY;
-
-                    if( sideW > 0 && styles[ side ] !== 'none' && colors[ side ].alpha() > 0 ) {
-                        beforeX = pxWidths[ vert ? side : sideBefore ];
-                        beforeY = pxWidths[ vert ? sideBefore : side ];
-                        afterX = pxWidths[ vert ? side : sideAfter ];
-                        afterY = pxWidths[ vert ? sideAfter : side ];
-
-                        if( styles[ side ] === 'dashed' || styles[ side ] === 'dotted' ) {
-                            segments.push( {
-                                path: curve( cornerBefore, beforeX, beforeY, baseAngle + 45, 0, 1 ) +
-                                      curve( cornerBefore, 0, 0, baseAngle, 1, 0 ),
-                                fill: colors[ side ]
-                            } );
-                            segments.push( {
-                                path: line( side, sideW / 2, 0, 1 ),
-                                stroke: styles[ side ],
-                                weight: sideW,
-                                color: colors[ side ]
-                            } );
-                            segments.push( {
-                                path: curve( cornerAfter, afterX, afterY, baseAngle, 0, 1 ) +
-                                      curve( cornerAfter, 0, 0, baseAngle - 45, 1, 0 ),
-                                fill: colors[ side ]
-                            } );
-                        }
-                        else {
-                            segments.push( {
-                                path: curve( cornerBefore, beforeX, beforeY, baseAngle + 45, 0, 1 ) +
-                                      line( side, sideW, 0, 0 ) +
-                                      curve( cornerAfter, afterX, afterY, baseAngle, 0, 0 ) +
-
-                                      ( styles[ side ] === 'double' && sideW > 2 ?
-                                              curve( cornerAfter, afterX - floor( afterX / 3 ), afterY - floor( afterY / 3 ), baseAngle - 45, 1, 0 ) +
-                                              line( side, ceil( sideW / 3 * 2 ), 1, 0 ) +
-                                              curve( cornerBefore, beforeX - floor( beforeX / 3 ), beforeY - floor( beforeY / 3 ), baseAngle, 1, 0 ) +
-                                              'x ' +
-                                              curve( cornerBefore, floor( beforeX / 3 ), floor( beforeY / 3 ), baseAngle + 45, 0, 1 ) +
-                                              line( side, floor( sideW / 3 ), 1, 0 ) +
-                                              curve( cornerAfter, floor( afterX / 3 ), floor( afterY / 3 ), baseAngle, 0, 0 )
-                                          : '' ) +
-
-                                      curve( cornerAfter, 0, 0, baseAngle - 45, 1, 0 ) +
-                                      line( side, 0, 1, 0 ) +
-                                      curve( cornerBefore, 0, 0, baseAngle, 1, 0 ),
-                                fill: colors[ side ]
-                            } );
-                        }
-                    }
-                }
-
-                addSide( 't', 'l', 'r', 'tl', 'tr', 90 );
-                addSide( 'r', 't', 'b', 'tr', 'br', 0 );
-                addSide( 'b', 'r', 'l', 'br', 'bl', -90 );
-                addSide( 'l', 'b', 't', 'bl', 'tl', -180 );
-            }
-        }
-
-        return segments;
-    },
-
-    destroy: function() {
-        var me = this;
-        if (me.finalized || !me.styleInfos.borderImageInfo.isActive()) {
-            me.targetElement.runtimeStyle.borderColor = '';
-        }
-        PIE.RendererBase.destroy.call( me );
-    }
-
-
-} );
-/**
- * Renderer for border-image
- * @constructor
- * @param {Element} el The target element
- * @param {Object} styleInfos The StyleInfo objects
- * @param {PIE.RootRenderer} parent
- */
-PIE.BorderImageRenderer = PIE.RendererBase.newRenderer( {
-
-    boxZIndex: 5,
-    pieceNames: [ 't', 'tr', 'r', 'br', 'b', 'bl', 'l', 'tl', 'c' ],
-
-    needsUpdate: function() {
-        return this.styleInfos.borderImageInfo.changed();
-    },
-
-    isActive: function() {
-        return this.styleInfos.borderImageInfo.isActive();
-    },
-
-    draw: function() {
-        this.getBox(); //make sure pieces are created
-
-        var props = this.styleInfos.borderImageInfo.getProps(),
-            borderProps = this.styleInfos.borderInfo.getProps(),
-            bounds = this.boundsInfo.getBounds(),
-            el = this.targetElement,
-            pieces = this.pieces;
-
-        PIE.Util.withImageSize( props.src, function( imgSize ) {
-            var elW = bounds.w,
-                elH = bounds.h,
-                zero = PIE.getLength( '0' ),
-                widths = props.widths || ( borderProps ? borderProps.widths : { 't': zero, 'r': zero, 'b': zero, 'l': zero } ),
-                widthT = widths['t'].pixels( el ),
-                widthR = widths['r'].pixels( el ),
-                widthB = widths['b'].pixels( el ),
-                widthL = widths['l'].pixels( el ),
-                slices = props.slice,
-                sliceT = slices['t'].pixels( el ),
-                sliceR = slices['r'].pixels( el ),
-                sliceB = slices['b'].pixels( el ),
-                sliceL = slices['l'].pixels( el );
-
-            // Piece positions and sizes
-            function setSizeAndPos( piece, w, h, x, y ) {
-                var s = pieces[piece].style,
-                    max = Math.max;
-                s.width = max(w, 0);
-                s.height = max(h, 0);
-                s.left = x;
-                s.top = y;
-            }
-            setSizeAndPos( 'tl', widthL, widthT, 0, 0 );
-            setSizeAndPos( 't', elW - widthL - widthR, widthT, widthL, 0 );
-            setSizeAndPos( 'tr', widthR, widthT, elW - widthR, 0 );
-            setSizeAndPos( 'r', widthR, elH - widthT - widthB, elW - widthR, widthT );
-            setSizeAndPos( 'br', widthR, widthB, elW - widthR, elH - widthB );
-            setSizeAndPos( 'b', elW - widthL - widthR, widthB, widthL, elH - widthB );
-            setSizeAndPos( 'bl', widthL, widthB, 0, elH - widthB );
-            setSizeAndPos( 'l', widthL, elH - widthT - widthB, 0, widthT );
-            setSizeAndPos( 'c', elW - widthL - widthR, elH - widthT - widthB, widthL, widthT );
-
-
-            // image croppings
-            function setCrops( sides, crop, val ) {
-                for( var i=0, len=sides.length; i < len; i++ ) {
-                    pieces[ sides[i] ]['imagedata'][ crop ] = val;
-                }
-            }
-
-            // corners
-            setCrops( [ 'tl', 't', 'tr' ], 'cropBottom', ( imgSize.h - sliceT ) / imgSize.h );
-            setCrops( [ 'tl', 'l', 'bl' ], 'cropRight', ( imgSize.w - sliceL ) / imgSize.w );
-            setCrops( [ 'bl', 'b', 'br' ], 'cropTop', ( imgSize.h - sliceB ) / imgSize.h );
-            setCrops( [ 'tr', 'r', 'br' ], 'cropLeft', ( imgSize.w - sliceR ) / imgSize.w );
-
-            // edges and center
-            // TODO right now this treats everything like 'stretch', need to support other schemes
-            //if( props.repeat.v === 'stretch' ) {
-                setCrops( [ 'l', 'r', 'c' ], 'cropTop', sliceT / imgSize.h );
-                setCrops( [ 'l', 'r', 'c' ], 'cropBottom', sliceB / imgSize.h );
-            //}
-            //if( props.repeat.h === 'stretch' ) {
-                setCrops( [ 't', 'b', 'c' ], 'cropLeft', sliceL / imgSize.w );
-                setCrops( [ 't', 'b', 'c' ], 'cropRight', sliceR / imgSize.w );
-            //}
-
-            // center fill
-            pieces['c'].style.display = props.fill ? '' : 'none';
-        }, this );
-    },
-
-    getBox: function() {
-        var box = this.parent.getLayer( this.boxZIndex ),
-            s, piece, i,
-            pieceNames = this.pieceNames,
-            len = pieceNames.length;
-
-        if( !box ) {
-            box = doc.createElement( 'border-image' );
-            s = box.style;
-            s.position = 'absolute';
-
-            this.pieces = {};
-
-            for( i = 0; i < len; i++ ) {
-                piece = this.pieces[ pieceNames[i] ] = PIE.Util.createVmlElement( 'rect' );
-                piece.appendChild( PIE.Util.createVmlElement( 'imagedata' ) );
-                s = piece.style;
-                s['behavior'] = 'url(#default#VML)';
-                s.position = "absolute";
-                s.top = s.left = 0;
-                piece['imagedata'].src = this.styleInfos.borderImageInfo.getProps().src;
-                piece.stroked = false;
-                piece.filled = false;
-                box.appendChild( piece );
-            }
-
-            this.parent.addLayer( this.boxZIndex, box );
-        }
-
-        return box;
-    },
-
-    prepareUpdate: function() {
-        if (this.isActive()) {
-            var me = this,
-                el = me.targetElement,
-                rs = el.runtimeStyle,
-                widths = me.styleInfos.borderImageInfo.getProps().widths;
-
-            // Force border-style to solid so it doesn't collapse
-            rs.borderStyle = 'solid';
-
-            // If widths specified in border-image shorthand, override border-width
-            // NOTE px units needed here as this gets used by the IE9 renderer too
-            if ( widths ) {
-                rs.borderTopWidth = widths['t'].pixels( el ) + 'px';
-                rs.borderRightWidth = widths['r'].pixels( el ) + 'px';
-                rs.borderBottomWidth = widths['b'].pixels( el ) + 'px';
-                rs.borderLeftWidth = widths['l'].pixels( el ) + 'px';
-            }
-
-            // Make the border transparent
-            me.hideBorder();
-        }
-    },
-
-    destroy: function() {
-        var me = this,
-            rs = me.targetElement.runtimeStyle;
-        rs.borderStyle = '';
-        if (me.finalized || !me.styleInfos.borderInfo.isActive()) {
-            rs.borderColor = rs.borderWidth = '';
-        }
-        PIE.RendererBase.destroy.call( this );
-    }
-
-} );
-/**
- * Renderer for outset box-shadows
- * @constructor
- * @param {Element} el The target element
- * @param {Object} styleInfos The StyleInfo objects
- * @param {PIE.RootRenderer} parent
- */
-PIE.BoxShadowOutsetRenderer = PIE.RendererBase.newRenderer( {
-
-    boxZIndex: 1,
-    boxName: 'outset-box-shadow',
-
-    needsUpdate: function() {
-        var si = this.styleInfos;
-        return si.boxShadowInfo.changed() || si.borderRadiusInfo.changed();
-    },
-
-    isActive: function() {
-        var boxShadowInfo = this.styleInfos.boxShadowInfo;
-        return boxShadowInfo.isActive() && boxShadowInfo.getProps().outset[0];
-    },
-
-    draw: function() {
-        var me = this,
-            el = this.targetElement,
-            box = this.getBox(),
-            styleInfos = this.styleInfos,
-            shadowInfos = styleInfos.boxShadowInfo.getProps().outset,
-            radii = styleInfos.borderRadiusInfo.getProps(),
-            len = shadowInfos.length,
-            i = len, j,
-            bounds = this.boundsInfo.getBounds(),
-            w = bounds.w,
-            h = bounds.h,
-            clipAdjust = PIE.ieVersion === 8 ? 1 : 0, //workaround for IE8 bug where VML leaks out top/left of clip region by 1px
-            corners = [ 'tl', 'tr', 'br', 'bl' ], corner,
-            shadowInfo, shape, fill, ss, xOff, yOff, spread, blur, shrink, color, alpha, path,
-            totalW, totalH, focusX, focusY, isBottom, isRight;
-
-
-        function getShadowShape( index, corner, xOff, yOff, color, blur, path ) {
-            var shape = me.getShape( 'shadow' + index + corner, 'fill', box, len - index ),
-                fill = shape.fill;
-
-            // Position and size
-            shape['coordsize'] = w * 2 + ',' + h * 2;
-            shape['coordorigin'] = '1,1';
-
-            // Color and opacity
-            shape['stroked'] = false;
-            shape['filled'] = true;
-            fill.color = color.colorValue( el );
-            if( blur ) {
-                fill['type'] = 'gradienttitle'; //makes the VML gradient follow the shape's outline - hooray for undocumented features?!?!
-                fill['color2'] = fill.color;
-                fill['opacity'] = 0;
-            }
-
-            // Path
-            shape.path = path;
-
-            // This needs to go last for some reason, to prevent rendering at incorrect size
-            ss = shape.style;
-            ss.left = xOff;
-            ss.top = yOff;
-            ss.width = w;
-            ss.height = h;
-
-            return shape;
-        }
-
-
-        while( i-- ) {
-            shadowInfo = shadowInfos[ i ];
-            xOff = shadowInfo.xOffset.pixels( el );
-            yOff = shadowInfo.yOffset.pixels( el );
-            spread = shadowInfo.spread.pixels( el ),
-            blur = shadowInfo.blur.pixels( el );
-            color = shadowInfo.color;
-            // Shape path
-            shrink = -spread - blur;
-            if( !radii && blur ) {
-                // If blurring, use a non-null border radius info object so that getBoxPath will
-                // round the corners of the expanded shadow shape rather than squaring them off.
-                radii = PIE.BorderRadiusStyleInfo.ALL_ZERO;
-            }
-            path = this.getBoxPath( { t: shrink, r: shrink, b: shrink, l: shrink }, 2, radii );
-
-            if( blur ) {
-                totalW = ( spread + blur ) * 2 + w;
-                totalH = ( spread + blur ) * 2 + h;
-                focusX = blur * 2 / totalW;
-                focusY = blur * 2 / totalH;
-                if( blur - spread > w / 2 || blur - spread > h / 2 ) {
-                    // If the blur is larger than half the element's narrowest dimension, we cannot do
-                    // this with a single shape gradient, because its focussize would have to be less than
-                    // zero which results in ugly artifacts. Instead we create four shapes, each with its
-                    // gradient focus past center, and then clip them so each only shows the quadrant
-                    // opposite the focus.
-                    for( j = 4; j--; ) {
-                        corner = corners[j];
-                        isBottom = corner.charAt( 0 ) === 'b';
-                        isRight = corner.charAt( 1 ) === 'r';
-                        shape = getShadowShape( i, corner, xOff, yOff, color, blur, path );
-                        fill = shape.fill;
-                        fill['focusposition'] = ( isRight ? 1 - focusX : focusX ) + ',' +
-                                                ( isBottom ? 1 - focusY : focusY );
-                        fill['focussize'] = '0,0';
-
-                        // Clip to show only the appropriate quadrant. Add 1px to the top/left clip values
-                        // in IE8 to prevent a bug where IE8 displays one pixel outside the clip region.
-                        shape.style.clip = 'rect(' + ( ( isBottom ? totalH / 2 : 0 ) + clipAdjust ) + 'px,' +
-                                                     ( isRight ? totalW : totalW / 2 ) + 'px,' +
-                                                     ( isBottom ? totalH : totalH / 2 ) + 'px,' +
-                                                     ( ( isRight ? totalW / 2 : 0 ) + clipAdjust ) + 'px)';
-                    }
-                } else {
-                    // TODO delete old quadrant shapes if resizing expands past the barrier
-                    shape = getShadowShape( i, '', xOff, yOff, color, blur, path );
-                    fill = shape.fill;
-                    fill['focusposition'] = focusX + ',' + focusY;
-                    fill['focussize'] = ( 1 - focusX * 2 ) + ',' + ( 1 - focusY * 2 );
-                }
-            } else {
-                shape = getShadowShape( i, '', xOff, yOff, color, blur, path );
-                alpha = color.alpha();
-                if( alpha < 1 ) {
-                    // shape.style.filter = 'alpha(opacity=' + ( alpha * 100 ) + ')';
-                    // ss.filter = 'progid:DXImageTransform.Microsoft.BasicImage(opacity=' + ( alpha  ) + ')';
-                    shape.fill.opacity = alpha;
-                }
-            }
-        }
-    }
-
-} );
-/**
- * Renderer for re-rendering img elements using VML. Kicks in if the img has
- * a border-radius applied, or if the -pie-png-fix flag is set.
- * @constructor
- * @param {Element} el The target element
- * @param {Object} styleInfos The StyleInfo objects
- * @param {PIE.RootRenderer} parent
- */
-PIE.ImgRenderer = PIE.RendererBase.newRenderer( {
-
-    boxZIndex: 6,
-    boxName: 'imgEl',
-
-    needsUpdate: function() {
-        var si = this.styleInfos;
-        return this.targetElement.src !== this._lastSrc || si.borderRadiusInfo.changed();
-    },
-
-    isActive: function() {
-        var si = this.styleInfos;
-        return si.borderRadiusInfo.isActive() || si.backgroundInfo.isPngFix();
-    },
-
-    draw: function() {
-        this._lastSrc = src;
-        this.hideActualImg();
-
-        var shape = this.getShape( 'img', 'fill', this.getBox() ),
-            fill = shape.fill,
-            bounds = this.boundsInfo.getBounds(),
-            w = bounds.w,
-            h = bounds.h,
-            borderProps = this.styleInfos.borderInfo.getProps(),
-            borderWidths = borderProps && borderProps.widths,
-            el = this.targetElement,
-            src = el.src,
-            round = Math.round,
-            cs = el.currentStyle,
-            getLength = PIE.getLength,
-            s, zero;
-
-        // In IE6, the BorderRenderer will have hidden the border by moving the border-width to
-        // the padding; therefore we want to pretend the borders have no width so they aren't doubled
-        // when adding in the current padding value below.
-        if( !borderWidths || PIE.ieVersion < 7 ) {
-            zero = PIE.getLength( '0' );
-            borderWidths = { 't': zero, 'r': zero, 'b': zero, 'l': zero };
-        }
-
-        shape.stroked = false;
-        fill.type = 'frame';
-        fill.src = src;
-        fill.position = (w ? 0.5 / w : 0) + ',' + (h ? 0.5 / h : 0);
-        shape.coordsize = w * 2 + ',' + h * 2;
-        shape.coordorigin = '1,1';
-        shape.path = this.getBoxPath( {
-            t: round( borderWidths['t'].pixels( el ) + getLength( cs.paddingTop ).pixels( el ) ),
-            r: round( borderWidths['r'].pixels( el ) + getLength( cs.paddingRight ).pixels( el ) ),
-            b: round( borderWidths['b'].pixels( el ) + getLength( cs.paddingBottom ).pixels( el ) ),
-            l: round( borderWidths['l'].pixels( el ) + getLength( cs.paddingLeft ).pixels( el ) )
-        }, 2 );
-        s = shape.style;
-        s.width = w;
-        s.height = h;
-    },
-
-    hideActualImg: function() {
-        this.targetElement.runtimeStyle.filter = 'alpha(opacity=0)';
-    },
-
-    destroy: function() {
-        PIE.RendererBase.destroy.call( this );
-        this.targetElement.runtimeStyle.filter = '';
-    }
-
-} );
-/**
- * Root renderer for IE9; manages the rendering layers in the element's background
- * @param {Element} el The target element
- * @param {Object} styleInfos The StyleInfo objects
- */
-PIE.IE9RootRenderer = PIE.RendererBase.newRenderer( {
-
-    updatePos: PIE.emptyFn,
-    updateSize: PIE.emptyFn,
-    updateVisibility: PIE.emptyFn,
-    updateProps: PIE.emptyFn,
-
-    outerCommasRE: /^,+|,+$/g,
-    innerCommasRE: /,+/g,
-
-    setBackgroundLayer: function(zIndex, bg) {
-        var me = this,
-            bgLayers = me._bgLayers || ( me._bgLayers = [] ),
-            undef;
-        bgLayers[zIndex] = bg || undef;
-    },
-
-    finishUpdate: function() {
-        var me = this,
-            bgLayers = me._bgLayers,
-            bg;
-        if( bgLayers && ( bg = bgLayers.join( ',' ).replace( me.outerCommasRE, '' ).replace( me.innerCommasRE, ',' ) ) !== me._lastBg ) {
-            me._lastBg = me.targetElement.runtimeStyle.background = bg;
-        }
-    },
-
-    destroy: function() {
-        this.targetElement.runtimeStyle.background = '';
-        delete this._bgLayers;
-    }
-
-} );
-/**
- * Renderer for element backgrounds, specific for IE9. Only handles translating CSS3 gradients
- * to an equivalent SVG data URI.
- * @constructor
- * @param {Element} el The target element
- * @param {Object} styleInfos The StyleInfo objects
- */
-PIE.IE9BackgroundRenderer = PIE.RendererBase.newRenderer( {
-
-    bgLayerZIndex: 1,
-
-    needsUpdate: function() {
-        var si = this.styleInfos;
-        return si.backgroundInfo.changed();
-    },
-
-    isActive: function() {
-        var si = this.styleInfos;
-        return si.backgroundInfo.isActive() || si.borderImageInfo.isActive();
-    },
-
-    draw: function() {
-        var me = this,
-            props = me.styleInfos.backgroundInfo.getProps(),
-            bg, images, i = 0, img, bgAreaSize, bgSize;
-
-        if ( props ) {
-            bg = [];
-
-            images = props.bgImages;
-            if ( images ) {
-                while( img = images[ i++ ] ) {
-                    if (img.imgType === 'linear-gradient' ) {
-                        bgAreaSize = me.getBgAreaSize( img.bgOrigin );
-                        bgSize = ( img.bgSize || PIE.BgSize.DEFAULT ).pixels(
-                            me.targetElement, bgAreaSize.w, bgAreaSize.h, bgAreaSize.w, bgAreaSize.h
-                        ),
-                        bg.push(
-                            'url(data:image/svg+xml,' + escape( me.getGradientSvg( img, bgSize.w, bgSize.h ) ) + ') ' +
-                            me.bgPositionToString( img.bgPosition ) + ' / ' + bgSize.w + 'px ' + bgSize.h + 'px ' +
-                            ( img.bgAttachment || '' ) + ' ' + ( img.bgOrigin || '' ) + ' ' + ( img.bgClip || '' )
-                        );
-                    } else {
-                        bg.push( img.origString );
-                    }
-                }
-            }
-
-            if ( props.color ) {
-                bg.push( props.color.val );
-            }
-
-            me.parent.setBackgroundLayer(me.bgLayerZIndex, bg.join(','));
-        }
-    },
-
-    bgPositionToString: function( bgPosition ) {
-        return bgPosition ? bgPosition.tokens.map(function(token) {
-            return token.tokenValue;
-        }).join(' ') : '0 0';
-    },
-
-    getBgAreaSize: function( bgOrigin ) {
-        var me = this,
-            el = me.targetElement,
-            bounds = me.boundsInfo.getBounds(),
-            elW = bounds.w,
-            elH = bounds.h,
-            w = elW,
-            h = elH,
-            borders, getLength, cs;
-
-        if( bgOrigin !== 'border-box' ) {
-            borders = me.styleInfos.borderInfo.getProps();
-            if( borders && ( borders = borders.widths ) ) {
-                w -= borders[ 'l' ].pixels( el ) + borders[ 'l' ].pixels( el );
-                h -= borders[ 't' ].pixels( el ) + borders[ 'b' ].pixels( el );
-            }
-        }
-
-        if ( bgOrigin === 'content-box' ) {
-            getLength = PIE.getLength;
-            cs = el.currentStyle;
-            w -= getLength( cs.paddingLeft ).pixels( el ) + getLength( cs.paddingRight ).pixels( el );
-            h -= getLength( cs.paddingTop ).pixels( el ) + getLength( cs.paddingBottom ).pixels( el );
-        }
-
-        return { w: w, h: h };
-    },
-
-    getGradientSvg: function( info, bgWidth, bgHeight ) {
-        var el = this.targetElement,
-            stopsInfo = info.stops,
-            stopCount = stopsInfo.length,
-            metrics = PIE.GradientUtil.getGradientMetrics( el, bgWidth, bgHeight, info ),
-            startX = metrics.startX,
-            startY = metrics.startY,
-            endX = metrics.endX,
-            endY = metrics.endY,
-            lineLength = metrics.lineLength,
-            stopPx,
-            i, j, before, after,
-            svg;
-
-        // Find the pixel offsets along the CSS3 gradient-line for each stop.
-        stopPx = [];
-        for( i = 0; i < stopCount; i++ ) {
-            stopPx.push( stopsInfo[i].offset ? stopsInfo[i].offset.pixels( el, lineLength ) :
-                         i === 0 ? 0 : i === stopCount - 1 ? lineLength : null );
-        }
-        // Fill in gaps with evenly-spaced offsets
-        for( i = 1; i < stopCount; i++ ) {
-            if( stopPx[ i ] === null ) {
-                before = stopPx[ i - 1 ];
-                j = i;
-                do {
-                    after = stopPx[ ++j ];
-                } while( after === null );
-                stopPx[ i ] = before + ( after - before ) / ( j - i + 1 );
-            }
-        }
-
-        svg = [
-            '<svg width="' + bgWidth + '" height="' + bgHeight + '" xmlns="http://www.w3.org/2000/svg">' +
-                '<defs>' +
-                    '<linearGradient id="g" gradientUnits="userSpaceOnUse"' +
-                    ' x1="' + ( startX / bgWidth * 100 ) + '%" y1="' + ( startY / bgHeight * 100 ) + '%" x2="' + ( endX / bgWidth * 100 ) + '%" y2="' + ( endY / bgHeight * 100 ) + '%">'
-        ];
-
-        // Convert to percentage along the SVG gradient line and add to the stops list
-        for( i = 0; i < stopCount; i++ ) {
-            svg.push(
-                '<stop offset="' + ( stopPx[ i ] / lineLength ) +
-                    '" stop-color="' + stopsInfo[i].color.colorValue( el ) +
-                    '" stop-opacity="' + stopsInfo[i].color.alpha() + '"/>'
-            );
-        }
-
-        svg.push(
-                    '</linearGradient>' +
-                '</defs>' +
-                '<rect width="100%" height="100%" fill="url(#g)"/>' +
-            '</svg>'
-        );
-
-        return svg.join( '' );
-    },
-
-    destroy: function() {
-        this.parent.setBackgroundLayer( this.bgLayerZIndex );
-    }
-
-} );
-/**
- * Renderer for border-image
- * @constructor
- * @param {Element} el The target element
- * @param {Object} styleInfos The StyleInfo objects
- * @param {PIE.RootRenderer} parent
- */
-PIE.IE9BorderImageRenderer = PIE.RendererBase.newRenderer( {
-
-    REPEAT: 'repeat',
-    STRETCH: 'stretch',
-    ROUND: 'round',
-
-    bgLayerZIndex: 0,
-
-    needsUpdate: function() {
-        return this.styleInfos.borderImageInfo.changed();
-    },
-
-    isActive: function() {
-        return this.styleInfos.borderImageInfo.isActive();
-    },
-
-    draw: function() {
-        var me = this,
-            props = me.styleInfos.borderImageInfo.getProps(),
-            borderProps = me.styleInfos.borderInfo.getProps(),
-            bounds = me.boundsInfo.getBounds(),
-            repeat = props.repeat,
-            repeatH = repeat.h,
-            repeatV = repeat.v,
-            el = me.targetElement,
-            isAsync = 0;
-
-        PIE.Util.withImageSize( props.src, function( imgSize ) {
-            var elW = bounds.w,
-                elH = bounds.h,
-                imgW = imgSize.w,
-                imgH = imgSize.h,
-
-                // The image cannot be referenced as a URL directly in the SVG because IE9 throws a strange
-                // security exception (perhaps due to cross-origin policy within data URIs?) Therefore we
-                // work around this by converting the image data into a data URI itself using a transient
-                // canvas. This unfortunately requires the border-image src to be within the same domain,
-                // which isn't a limitation in true border-image, so we need to try and find a better fix.
-                imgSrc = me.imageToDataURI( props.src, imgW, imgH ),
-
-                REPEAT = me.REPEAT,
-                STRETCH = me.STRETCH,
-                ROUND = me.ROUND,
-                ceil = Math.ceil,
-
-                zero = PIE.getLength( '0' ),
-                widths = props.widths || ( borderProps ? borderProps.widths : { 't': zero, 'r': zero, 'b': zero, 'l': zero } ),
-                widthT = widths['t'].pixels( el ),
-                widthR = widths['r'].pixels( el ),
-                widthB = widths['b'].pixels( el ),
-                widthL = widths['l'].pixels( el ),
-                slices = props.slice,
-                sliceT = slices['t'].pixels( el ),
-                sliceR = slices['r'].pixels( el ),
-                sliceB = slices['b'].pixels( el ),
-                sliceL = slices['l'].pixels( el ),
-                centerW = elW - widthL - widthR,
-                middleH = elH - widthT - widthB,
-                imgCenterW = imgW - sliceL - sliceR,
-                imgMiddleH = imgH - sliceT - sliceB,
-
-                // Determine the size of each tile - 'round' is handled below
-                tileSizeT = repeatH === STRETCH ? centerW : imgCenterW * widthT / sliceT,
-                tileSizeR = repeatV === STRETCH ? middleH : imgMiddleH * widthR / sliceR,
-                tileSizeB = repeatH === STRETCH ? centerW : imgCenterW * widthB / sliceB,
-                tileSizeL = repeatV === STRETCH ? middleH : imgMiddleH * widthL / sliceL,
-
-                svg,
-                patterns = [],
-                rects = [],
-                i = 0;
-
-            // For 'round', subtract from each tile's size enough so that they fill the space a whole number of times
-            if (repeatH === ROUND) {
-                tileSizeT -= (tileSizeT - (centerW % tileSizeT || tileSizeT)) / ceil(centerW / tileSizeT);
-                tileSizeB -= (tileSizeB - (centerW % tileSizeB || tileSizeB)) / ceil(centerW / tileSizeB);
-            }
-            if (repeatV === ROUND) {
-                tileSizeR -= (tileSizeR - (middleH % tileSizeR || tileSizeR)) / ceil(middleH / tileSizeR);
-                tileSizeL -= (tileSizeL - (middleH % tileSizeL || tileSizeL)) / ceil(middleH / tileSizeL);
-            }
-
-
-            // Build the SVG for the border-image rendering. Add each piece as a pattern, which is then stretched
-            // or repeated as the fill of a rect of appropriate size.
-            svg = [
-                '<svg width="' + elW + '" height="' + elH + '" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">'
-            ];
-
-            function addImage( x, y, w, h, cropX, cropY, cropW, cropH, tileW, tileH ) {
-                patterns.push(
-                    '<pattern patternUnits="userSpaceOnUse" id="pattern' + i + '" ' +
-                            'x="' + (repeatH === REPEAT ? x + w / 2 - tileW / 2 : x) + '" ' +
-                            'y="' + (repeatV === REPEAT ? y + h / 2 - tileH / 2 : y) + '" ' +
-                            'width="' + tileW + '" height="' + tileH + '">' +
-                        '<svg width="' + tileW + '" height="' + tileH + '" viewBox="' + cropX + ' ' + cropY + ' ' + cropW + ' ' + cropH + '" preserveAspectRatio="none">' +
-                            '<image xlink:href="' + imgSrc + '" x="0" y="0" width="' + imgW + '" height="' + imgH + '" />' +
-                        '</svg>' +
-                    '</pattern>'
-                );
-                rects.push(
-                    '<rect x="' + x + '" y="' + y + '" width="' + w + '" height="' + h + '" fill="url(#pattern' + i + ')" />'
-                );
-                i++;
-            }
-            addImage( 0, 0, widthL, widthT, 0, 0, sliceL, sliceT, widthL, widthT ); // top left
-            addImage( widthL, 0, centerW, widthT, sliceL, 0, imgCenterW, sliceT, tileSizeT, widthT ); // top center
-            addImage( elW - widthR, 0, widthR, widthT, imgW - sliceR, 0, sliceR, sliceT, widthR, widthT ); // top right
-            addImage( 0, widthT, widthL, middleH, 0, sliceT, sliceL, imgMiddleH, widthL, tileSizeL ); // middle left
-            if ( props.fill ) { // center fill
-                addImage( widthL, widthT, centerW, middleH, sliceL, sliceT, imgCenterW, imgMiddleH, 
-                          tileSizeT || tileSizeB || imgCenterW, tileSizeL || tileSizeR || imgMiddleH );
-            }
-            addImage( elW - widthR, widthT, widthR, middleH, imgW - sliceR, sliceT, sliceR, imgMiddleH, widthR, tileSizeR ); // middle right
-            addImage( 0, elH - widthB, widthL, widthB, 0, imgH - sliceB, sliceL, sliceB, widthL, widthB ); // bottom left
-            addImage( widthL, elH - widthB, centerW, widthB, sliceL, imgH - sliceB, imgCenterW, sliceB, tileSizeB, widthB ); // bottom center
-            addImage( elW - widthR, elH - widthB, widthR, widthB, imgW - sliceR, imgH - sliceB, sliceR, sliceB, widthR, widthB ); // bottom right
-
-            svg.push(
-                    '<defs>' +
-                        patterns.join('\n') +
-                    '</defs>' +
-                    rects.join('\n') +
-                '</svg>'
-            );
-
-            me.parent.setBackgroundLayer( me.bgLayerZIndex, 'url(data:image/svg+xml,' + escape( svg.join( '' ) ) + ') no-repeat border-box border-box' );
-
-            // If the border-image's src wasn't immediately available, the SVG for its background layer
-            // will have been created asynchronously after the main element's update has finished; we'll
-            // therefore need to force the root renderer to sync to the final background once finished.
-            if( isAsync ) {
-                me.parent.finishUpdate();
-            }
-        }, me );
-
-        isAsync = 1;
-    },
-
-    /**
-     * Convert a given image to a data URI
-     */
-    imageToDataURI: (function() {
-        var uris = {};
-        return function( src, width, height ) {
-            var uri = uris[ src ],
-                image, canvas;
-            if ( !uri ) {
-                image = new Image();
-                canvas = doc.createElement( 'canvas' );
-                image.src = src;
-                canvas.width = width;
-                canvas.height = height;
-                canvas.getContext( '2d' ).drawImage( image, 0, 0 );
-                uri = uris[ src ] = canvas.toDataURL();
-            }
-            return uri;
-        }
-    })(),
-
-    prepareUpdate: PIE.BorderImageRenderer.prototype.prepareUpdate,
-
-    destroy: function() {
-        var me = this,
-            rs = me.targetElement.runtimeStyle;
-        me.parent.setBackgroundLayer( me.bgLayerZIndex );
-        rs.borderColor = rs.borderStyle = rs.borderWidth = '';
-    }
-
-} );
-
-PIE.Element = (function() {
-
-    var wrappers = {},
-        lazyInitCssProp = PIE.CSS_PREFIX + 'lazy-init',
-        pollCssProp = PIE.CSS_PREFIX + 'poll',
-        hoverClass = PIE.CLASS_PREFIX + 'hover',
-        activeClass = PIE.CLASS_PREFIX + 'active',
-        focusClass = PIE.CLASS_PREFIX + 'focus',
-        firstChildClass = PIE.CLASS_PREFIX + 'first-child',
-        ignorePropertyNames = { 'background':1, 'bgColor':1, 'display': 1 },
-        classNameRegExes = {},
-        dummyArray = [];
-
-
-    function addClass( el, className ) {
-        el.className += ' ' + className;
-    }
-
-    function removeClass( el, className ) {
-        var re = classNameRegExes[ className ] ||
-            ( classNameRegExes[ className ] = new RegExp( '\\b' + className + '\\b', 'g' ) );
-        el.className = el.className.replace( re, '' );
-    }
-
-    function delayAddClass( el, className /*, className2*/ ) {
-        var classes = dummyArray.slice.call( arguments, 1 ),
-            i = classes.length;
-        setTimeout( function() {
-            while( i-- ) {
-                addClass( el, classes[ i ] );
-            }
-        }, 0 );
-    }
-
-    function delayRemoveClass( el, className /*, className2*/ ) {
-        var classes = dummyArray.slice.call( arguments, 1 ),
-            i = classes.length;
-        setTimeout( function() {
-            while( i-- ) {
-                removeClass( el, classes[ i ] );
-            }
-        }, 0 );
-    }
-
-
-
-    function Element( el ) {
-        var renderers,
-            rootRenderer,
-            boundsInfo = new PIE.BoundsInfo( el ),
-            styleInfos,
-            styleInfosArr,
-            initializing,
-            initialized,
-            eventsAttached,
-            eventListeners = [],
-            delayed,
-            destroyed,
-            poll;
-
-        /**
-         * Initialize PIE for this element.
-         */
-        function init() {
-            if( !initialized ) {
-                var docEl,
-                    bounds,
-                    ieDocMode = PIE.ieDocMode,
-                    cs = el.currentStyle,
-                    lazy = cs.getAttribute( lazyInitCssProp ) === 'true',
-                    childRenderers;
-
-                // Polling for size/position changes: default to on in IE8, off otherwise, overridable by -pie-poll
-                poll = cs.getAttribute( pollCssProp );
-                poll = ieDocMode > 7 ? poll !== 'false' : poll === 'true';
-
-                // Force layout so move/resize events will fire. Set this as soon as possible to avoid layout changes
-                // after load, but make sure it only gets called the first time through to avoid recursive calls to init().
-                if( !initializing ) {
-                    initializing = 1;
-                    el.runtimeStyle.zoom = 1;
-                    initFirstChildPseudoClass();
-                }
-
-                boundsInfo.lock();
-
-                // If the -pie-lazy-init:true flag is set, check if the element is outside the viewport and if so, delay initialization
-                if( lazy && ( bounds = boundsInfo.getBounds() ) && ( docEl = doc.documentElement || doc.body ) &&
-                        ( bounds.y > docEl.clientHeight || bounds.x > docEl.clientWidth || bounds.y + bounds.h < 0 || bounds.x + bounds.w < 0 ) ) {
-                    if( !delayed ) {
-                        delayed = 1;
-                        PIE.OnScroll.observe( init );
-                    }
-                } else {
-                    initialized = 1;
-                    delayed = initializing = 0;
-                    PIE.OnScroll.unobserve( init );
-
-                    // Create the style infos and renderers
-                    if ( ieDocMode === 9 ) {
-                        styleInfos = {
-                            backgroundInfo: new PIE.BackgroundStyleInfo( el ),
-                            borderImageInfo: new PIE.BorderImageStyleInfo( el ),
-                            borderInfo: new PIE.BorderStyleInfo( el )
-                        };
-                        styleInfosArr = [
-                            styleInfos.backgroundInfo,
-                            styleInfos.borderImageInfo
-                        ];
-                        rootRenderer = new PIE.IE9RootRenderer( el, boundsInfo, styleInfos );
-                        childRenderers = [
-                            new PIE.IE9BackgroundRenderer( el, boundsInfo, styleInfos, rootRenderer ),
-                            new PIE.IE9BorderImageRenderer( el, boundsInfo, styleInfos, rootRenderer )
-                        ];
-                    } else {
-
-                        styleInfos = {
-                            backgroundInfo: new PIE.BackgroundStyleInfo( el ),
-                            borderInfo: new PIE.BorderStyleInfo( el ),
-                            borderImageInfo: new PIE.BorderImageStyleInfo( el ),
-                            borderRadiusInfo: new PIE.BorderRadiusStyleInfo( el ),
-                            boxShadowInfo: new PIE.BoxShadowStyleInfo( el ),
-                            visibilityInfo: new PIE.VisibilityStyleInfo( el )
-                        };
-                        styleInfosArr = [
-                            styleInfos.backgroundInfo,
-                            styleInfos.borderInfo,
-                            styleInfos.borderImageInfo,
-                            styleInfos.borderRadiusInfo,
-                            styleInfos.boxShadowInfo,
-                            styleInfos.visibilityInfo
-                        ];
-                        rootRenderer = new PIE.RootRenderer( el, boundsInfo, styleInfos );
-                        childRenderers = [
-                            new PIE.BoxShadowOutsetRenderer( el, boundsInfo, styleInfos, rootRenderer ),
-                            new PIE.BackgroundRenderer( el, boundsInfo, styleInfos, rootRenderer ),
-                            //new PIE.BoxShadowInsetRenderer( el, boundsInfo, styleInfos, rootRenderer ),
-                            new PIE.BorderRenderer( el, boundsInfo, styleInfos, rootRenderer ),
-                            new PIE.BorderImageRenderer( el, boundsInfo, styleInfos, rootRenderer )
-                        ];
-                        if( el.tagName === 'IMG' ) {
-                            childRenderers.push( new PIE.ImgRenderer( el, boundsInfo, styleInfos, rootRenderer ) );
-                        }
-                        rootRenderer.childRenderers = childRenderers; // circular reference, can't pass in constructor; TODO is there a cleaner way?
-                    }
-                    renderers = [ rootRenderer ].concat( childRenderers );
-
-                    // Add property change listeners to ancestors if requested
-                    initAncestorEventListeners();
-
-                    // Add to list of polled elements in IE8
-                    if( poll ) {
-                        PIE.Heartbeat.observe( update );
-                        PIE.Heartbeat.run();
-                    }
-
-                    // Trigger rendering
-                    update( 1 );
-                }
-
-                if( !eventsAttached ) {
-                    eventsAttached = 1;
-                    if( ieDocMode < 9 ) {
-                        addListener( el, 'onmove', handleMoveOrResize );
-                    }
-                    addListener( el, 'onresize', handleMoveOrResize );
-                    addListener( el, 'onpropertychange', propChanged );
-                    addListener( el, 'onmouseenter', mouseEntered );
-                    addListener( el, 'onmouseleave', mouseLeft );
-                    addListener( el, 'onmousedown', mousePressed );
-                    if( el.tagName in PIE.focusableElements ) {
-                        addListener( el, 'onfocus', focused );
-                        addListener( el, 'onblur', blurred );
-                    }
-                    PIE.OnResize.observe( handleMoveOrResize );
-
-                    PIE.OnUnload.observe( removeEventListeners );
-                }
-
-                boundsInfo.unlock();
-            }
-        }
-
-
-
-
-        /**
-         * Event handler for onmove and onresize events. Invokes update() only if the element's
-         * bounds have previously been calculated, to prevent multiple runs during page load when
-         * the element has no initial CSS3 properties.
-         */
-        function handleMoveOrResize() {
-            if( boundsInfo && boundsInfo.hasBeenQueried() ) {
-                update();
-            }
-        }
-
-
-        /**
-         * Update position and/or size as necessary. Both move and resize events call
-         * this rather than the updatePos/Size functions because sometimes, particularly
-         * during page load, one will fire but the other won't.
-         */
-        function update( force ) {
-            if( !destroyed ) {
-                if( initialized ) {
-                    var i, len = renderers.length;
-
-                    lockAll();
-                    for( i = 0; i < len; i++ ) {
-                        renderers[i].prepareUpdate();
-                    }
-                    if( force || boundsInfo.positionChanged() ) {
-                        /* TODO just using getBoundingClientRect (used internally by BoundsInfo) for detecting
-                           position changes may not always be accurate; it's possible that
-                           an element will actually move relative to its positioning parent, but its position
-                           relative to the viewport will stay the same. Need to come up with a better way to
-                           track movement. The most accurate would be the same logic used in RootRenderer.updatePos()
-                           but that is a more expensive operation since it does some DOM walking, and we want this
-                           check to be as fast as possible. */
-                        for( i = 0; i < len; i++ ) {
-                            renderers[i].updatePos();
-                        }
-                    }
-                    if( force || boundsInfo.sizeChanged() ) {
-                        for( i = 0; i < len; i++ ) {
-                            renderers[i].updateSize();
-                        }
-                    }
-                    rootRenderer.finishUpdate();
-                    unlockAll();
-                }
-                else if( !initializing ) {
-                    init();
-                }
-            }
-        }
-
-        /**
-         * Handle property changes to trigger update when appropriate.
-         */
-        function propChanged() {
-            var i, len = renderers.length,
-                renderer,
-                e = event;
-
-            // Some elements like <table> fire onpropertychange events for old-school background properties
-            // ('background', 'bgColor') when runtimeStyle background properties are changed, which
-            // results in an infinite loop; therefore we filter out those property names. Also, 'display'
-            // is ignored because size calculations don't work correctly immediately when its onpropertychange
-            // event fires, and because it will trigger an onresize event anyway.
-            if( !destroyed && !( e && e.propertyName in ignorePropertyNames ) ) {
-                if( initialized ) {
-                    lockAll();
-                    for( i = 0; i < len; i++ ) {
-                        renderers[i].prepareUpdate();
-                    }
-                    for( i = 0; i < len; i++ ) {
-                        renderer = renderers[i];
-                        // Make sure position is synced if the element hasn't already been rendered.
-                        // TODO this feels sloppy - look into merging propChanged and update functions
-                        if( !renderer.isPositioned ) {
-                            renderer.updatePos();
-                        }
-                        if( renderer.needsUpdate() ) {
-                            renderer.updateProps();
-                        }
-                    }
-                    rootRenderer.finishUpdate();
-                    unlockAll();
-                }
-                else if( !initializing ) {
-                    init();
-                }
-            }
-        }
-
-
-        /**
-         * Handle mouseenter events. Adds a custom class to the element to allow IE6 to add
-         * hover styles to non-link elements, and to trigger a propertychange update.
-         */
-        function mouseEntered() {
-            //must delay this because the mouseenter event fires before the :hover styles are added.
-            delayAddClass( el, hoverClass );
-        }
-
-        /**
-         * Handle mouseleave events
-         */
-        function mouseLeft() {
-            //must delay this because the mouseleave event fires before the :hover styles are removed.
-            delayRemoveClass( el, hoverClass, activeClass );
-        }
-
-        /**
-         * Handle mousedown events. Adds a custom class to the element to allow IE6 to add
-         * active styles to non-link elements, and to trigger a propertychange update.
-         */
-        function mousePressed() {
-            //must delay this because the mousedown event fires before the :active styles are added.
-            delayAddClass( el, activeClass );
-
-            // listen for mouseups on the document; can't just be on the element because the user might
-            // have dragged out of the element while the mouse button was held down
-            PIE.OnMouseup.observe( mouseReleased );
-        }
-
-        /**
-         * Handle mouseup events
-         */
-        function mouseReleased() {
-            //must delay this because the mouseup event fires before the :active styles are removed.
-            delayRemoveClass( el, activeClass );
-
-            PIE.OnMouseup.unobserve( mouseReleased );
-        }
-
-        /**
-         * Handle focus events. Adds a custom class to the element to trigger a propertychange update.
-         */
-        function focused() {
-            //must delay this because the focus event fires before the :focus styles are added.
-            delayAddClass( el, focusClass );
-        }
-
-        /**
-         * Handle blur events
-         */
-        function blurred() {
-            //must delay this because the blur event fires before the :focus styles are removed.
-            delayRemoveClass( el, focusClass );
-        }
-
-
-        /**
-         * Handle property changes on ancestors of the element; see initAncestorEventListeners()
-         * which adds these listeners as requested with the -pie-watch-ancestors CSS property.
-         */
-        function ancestorPropChanged() {
-            var name = event.propertyName;
-            if( name === 'className' || name === 'id' ) {
-                propChanged();
-            }
-        }
-
-        function lockAll() {
-            boundsInfo.lock();
-            for( var i = styleInfosArr.length; i--; ) {
-                styleInfosArr[i].lock();
-            }
-        }
-
-        function unlockAll() {
-            for( var i = styleInfosArr.length; i--; ) {
-                styleInfosArr[i].unlock();
-            }
-            boundsInfo.unlock();
-        }
-
-
-        function addListener( targetEl, type, handler ) {
-            targetEl.attachEvent( type, handler );
-            eventListeners.push( [ targetEl, type, handler ] );
-        }
-
-        /**
-         * Remove all event listeners from the element and any monitored ancestors.
-         */
-        function removeEventListeners() {
-            if (eventsAttached) {
-                var i = eventListeners.length,
-                    listener;
-
-                while( i-- ) {
-                    listener = eventListeners[ i ];
-                    listener[ 0 ].detachEvent( listener[ 1 ], listener[ 2 ] );
-                }
-
-                PIE.OnUnload.unobserve( removeEventListeners );
-                eventsAttached = 0;
-                eventListeners = [];
-            }
-        }
-
-
-        /**
-         * Clean everything up when the behavior is removed from the element, or the element
-         * is manually destroyed.
-         */
-        function destroy() {
-            if( !destroyed ) {
-                var i, len;
-
-                removeEventListeners();
-
-                destroyed = 1;
-
-                // destroy any active renderers
-                if( renderers ) {
-                    for( i = 0, len = renderers.length; i < len; i++ ) {
-                        renderers[i].finalized = 1;
-                        renderers[i].destroy();
-                    }
-                }
-
-                // Remove from list of polled elements in IE8
-                if( poll ) {
-                    PIE.Heartbeat.unobserve( update );
-                }
-                // Stop onresize listening
-                PIE.OnResize.unobserve( update );
-
-                // Kill references
-                renderers = boundsInfo = styleInfos = styleInfosArr = el = null;
-            }
-        }
-
-
-        /**
-         * If requested via the custom -pie-watch-ancestors CSS property, add onpropertychange and
-         * other event listeners to ancestor(s) of the element so we can pick up style changes
-         * based on CSS rules using descendant selectors.
-         */
-        function initAncestorEventListeners() {
-            var watch = el.currentStyle.getAttribute( PIE.CSS_PREFIX + 'watch-ancestors' ),
-                i, a;
-            if( watch ) {
-                watch = parseInt( watch, 10 );
-                i = 0;
-                a = el.parentNode;
-                while( a && ( watch === 'NaN' || i++ < watch ) ) {
-                    addListener( a, 'onpropertychange', ancestorPropChanged );
-                    addListener( a, 'onmouseenter', mouseEntered );
-                    addListener( a, 'onmouseleave', mouseLeft );
-                    addListener( a, 'onmousedown', mousePressed );
-                    if( a.tagName in PIE.focusableElements ) {
-                        addListener( a, 'onfocus', focused );
-                        addListener( a, 'onblur', blurred );
-                    }
-                    a = a.parentNode;
-                }
-            }
-        }
-
-
-        /**
-         * If the target element is a first child, add a pie_first-child class to it. This allows using
-         * the added class as a workaround for the fact that PIE's rendering element breaks the :first-child
-         * pseudo-class selector.
-         */
-        function initFirstChildPseudoClass() {
-            var tmpEl = el,
-                isFirst = 1;
-            while( tmpEl = tmpEl.previousSibling ) {
-                if( tmpEl.nodeType === 1 ) {
-                    isFirst = 0;
-                    break;
-                }
-            }
-            if( isFirst ) {
-                addClass( el, firstChildClass );
-            }
-        }
-
-
-        // These methods are all already bound to this instance so there's no need to wrap them
-        // in a closure to maintain the 'this' scope object when calling them.
-        this.init = init;
-        this.update = update;
-        this.destroy = destroy;
-        this.el = el;
-    }
-
-    Element.getInstance = function( el ) {
-        var id = PIE.Util.getUID( el );
-        return wrappers[ id ] || ( wrappers[ id ] = new Element( el ) );
-    };
-
-    Element.destroy = function( el ) {
-        var id = PIE.Util.getUID( el ),
-            wrapper = wrappers[ id ];
-        if( wrapper ) {
-            wrapper.destroy();
-            delete wrappers[ id ];
-        }
-    };
-
-    Element.destroyAll = function() {
-        var els = [], wrapper;
-        if( wrappers ) {
-            for( var w in wrappers ) {
-                if( wrappers.hasOwnProperty( w ) ) {
-                    wrapper = wrappers[ w ];
-                    els.push( wrapper.el );
-                    wrapper.destroy();
-                }
-            }
-            wrappers = {};
-        }
-        return els;
-    };
-
-    return Element;
-})();
-
-/*
- * This file exposes the public API for invoking PIE.
- */
-
-
-/**
- * @property supportsVML
- * True if the current IE browser environment has a functioning VML engine. Should be true
- * in most IEs, but in rare cases may be false. If false, PIE will exit immediately when
- * attached to an element; this property may be used for debugging or by external scripts
- * to perform some special action when VML support is absent.
- * @type {boolean}
- */
-PIE[ 'supportsVML' ] = PIE.supportsVML;
-
-
-/**
- * Programatically attach PIE to a single element.
- * @param {Element} el
- */
-PIE[ 'attach' ] = function( el ) {
-    if (PIE.ieDocMode < 10 && PIE.supportsVML) {
-        PIE.Element.getInstance( el ).init();
-    }
-};
-
-
-/**
- * Programatically detach PIE from a single element.
- * @param {Element} el
- */
-PIE[ 'detach' ] = function( el ) {
-    PIE.Element.destroy( el );
-};
-
-
-} // if( !PIE )
-})();
\ No newline at end of file
diff --git a/templates/tour/videoplayer.swf b/templates/tour/videoplayer.swf
deleted file mode 100644
index 4ca62e207df..00000000000
Binary files a/templates/tour/videoplayer.swf and /dev/null differ
diff --git a/templates/tour/videos/IAmWeAreReal.flv b/templates/tour/videos/IAmWeAreReal.flv
deleted file mode 100644
index 75da79d5e29..00000000000
Binary files a/templates/tour/videos/IAmWeAreReal.flv and /dev/null differ
diff --git a/templates/tour/zh-CN/index.html b/templates/tour/zh-CN/index.html
deleted file mode 100644
index 958b03c23b1..00000000000
--- a/templates/tour/zh-CN/index.html
+++ /dev/null
@@ -1,1586 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN" dir="ltr">
-	<head>
-		<title>Ubuntu 在线体验</title>
-		<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon" />
-		<meta charset="UTF-8" />
-		<meta name="description" content="Enjoy the simplicity of Ubuntu's stylish, intuitive interface. Take Ubuntu for a test drive with our online tour and download when you're ready!" />
-		<meta name="keywords" content="ubuntu, ubuntu online, ubuntu tour" />
-		<link rel="stylesheet" href="../css/loader.css" type="text/css" />
-		<link rel="stylesheet" href="../css/error.css" type="text/css" />
-		<link rel="stylesheet" href="../css/base.css" type="text/css" />
-		<link rel="stylesheet" href="../css/folder.css" type="text/css" />
-		<link rel="stylesheet" href="../css/firefox.css" type="text/css" />
-		<link rel="stylesheet" href="../css/email.css" type="text/css" />
-		<link rel="stylesheet" href="../css/systemoverlay.css" type="text/css" />
-		<link rel="stylesheet" href="../css/ubuntuone.css" type="text/css" />
-		<link rel="stylesheet" href="../css/shotwell.css" type="text/css" />
-		<link rel="stylesheet" href="../css/tourguide.css" type="text/css" />
-		<link rel="stylesheet" href="../css/welcome.css" type="text/css" />
-		<link rel="stylesheet" href="../css/shutdown.css" type="text/css" />
-		<link rel="stylesheet" href="../css/movieplayer.css" type="text/css" />
-		<link rel="stylesheet" href="../css/libre.css" type="text/css" />
-		<link rel="stylesheet" href="../css/notification.css" type="text/css" />
-		<link rel="stylesheet" href="../css/software-centre.css" type="text/css" />
-		<!--[if IE 8]>
-		<link rel="stylesheet" href="../css/iefix.css" type="text/css" />
-		<![endif]-->
-		<link href='http://fonts.googleapis.com/css?family=Ubuntu:400,700' rel='stylesheet' type='text/css' />
-		<script type="text/javascript">
-			WebFontConfig = {
-				google : {
-					families : ['Ubuntu:400,700:latin']
-				}
-			}; (function() {
-				var wf = document.createElement('script');
-				wf.src = ('https:' == document.location.protocol ? 'https' : 'http') + '://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js';
-				wf.type = 'text/javascript';
-				wf.async = 'true';
-				var s = document.getElementsByTagName('script')[0];
-				s.parentNode.insertBefore(wf, s);
-			})();
-
-		</script>
-	</head>
-	<body>
-		<div id="loader">
-			<div id="dot-container">
-				<noscript>
-					<p>
-						This demo uses JavaScript. Either your browser doesn't support JavaScript, or it's currently switched off.
-						<br/>
-						<br/>
-						Don't panic. We've got <a href="/ubuntu/take-the-tour-gallery">a non-JavaScript version</a> of the online tour you can view instead. :)
-					</p>
-				</noscript>
-			</div>
-		</div>
-		<div id="top" class="dropShadow">
-			<div id="top-left">
-				<div id="control-buttons">
-					<div id="close"></div>
-					<div id="min"></div>
-					<div id="max"></div>
-				</div>
-				<div id="dash-control-buttons">
-					<div class="close"></div>
-					<div class="min"></div>
-					<div class="max"></div>
-				</div>
-				<div id="title"></div>
-			</div>
-			<div id="top-right">
-				<div id="message"><img src="../img/top/nomessage.png" class="message-logo" alt="" />
-					<ul class="drop-down">
-						<li class="disabled"><img src="../img/top/available.jpg" alt=""/> 在线
-						</li>
-						<li class="disabled"><img src="../img/top/away.jpg" alt=""/> 离开
-						</li>
-						<li class="disabled"><img src="../img/top/busy.jpg" alt=""/> 忙碌
-						</li>
-						<li class="disabled"><img src="../img/top/invisible.jpg" alt=""/> 隐身
-						</li>
-						<li class="disabled"><img src="../img/top/offline.jpg" alt=""/> 离线
-						</li>
-						<li class="divider"></li>
-						<li class="disabled"><img src="../img/top/chat.png" alt=""/> 聊天
-						</li>
-						<li class="divider"></li>
-						<li class="disabled"><img src="../img/top/broadcast.png" alt=""/> 设定社交网络帐号…
-						</li>
-						<li class="divider"></li>
-						<li class="disabled"><img src="../img/top/mail.png" alt=""/> 设置电子邮箱...
-						</li>
-						<li class="divider"></li>
-						<li class="disabled"><img src="../img/top/uone.png" alt=""/> Ubuntu One
-						</li>
-						<li class="divider"></li>
-						<li class="disabled">
-							清空
-						</li>
-					</ul>
-				</div>
-				<div id="bluetooth"><img src="../img/top/bluetooth.png" alt=""/>
-					<ul class="drop-down">
-						<li class="disabled bluetooth">
-							打开蓝牙
-						</li>
-						<li>
-							关闭蓝牙
-						</li>
-						<li class="divider"></li>
-						<li class="disabled BtOn">
-							可见
-						</li>
-						<li class="divider BtOn"></li>
-						<li class="disabled BtOn">
-							发送文件到设备...
-						</li>
-						<li class="disabled BtOn">
-							浏览设备上的文件...
-						</li>
-						<li class="divider"></li>
-						<li class="disabled BtOn">
-							设置新设备...
-						</li>
-						<li class="divider BtOn"></li>
-						<li class="disabled">
-							首选项
-						</li>
-					</ul>
-				</div>
-				<div id="connection"><img src="../img/top/connection.png" alt=""/>
-					<ul class="drop-down">
-						<li class="disabled">
-							自动 eth0
-						</li>
-						<li class="disabled">
-							断开
-						</li>
-						<li class="divider"></li>
-						<!--<li class="disabled"><img src="../img/top/wireless-icon.png" alt=""/> My Wireless Connection</li>
-						<li class="disabled">断开</li>
-						<li class="divider"></li>-->
-						<li class="disabled">
-							连接信息
-						</li>
-						<li class="disabled">
-							编辑连接...
-						</li>
-					</ul>
-				</div>
-				<div id="speakers"><img src="../img/top/speakers3.png" class="speakers-logo"  alt=""/>
-					<ul class="drop-down">
-						<li>
-							静音
-						</li>
-						<li class="system-volume">
-							<div class="large-icon"></div><div class="small-icon"></div><div class="slider"></div><div class="slider-active"></div>
-						</li>
-						<li class="divider"></li>
-						<li class="disabled"><img src="../img/top/rhythmbox.png" alt=""/> Rhythmbox
-						</li>
-						<li class="banshee">
-							<div class="banshee-rewind"></div><div class="banshee-forward"></div><div class="banshee-play"></div>
-						</li>
-						<li class="divider"></li>
-						<li class="disabled">
-							声音设定...
-						</li>
-					</ul>
-				</div>
-				<div id="time">
-					<p></p>
-					<ul class="drop-down">
-						<li class="system-calendar"></li>
-						<li class="divider"></li>
-						<li class="disabled">
-							时间设置...
-						</li>
-					</ul>
-				</div>
-				<div id="power"><img src="../img/top/power.png"  alt=""/>
-					<ul class="drop-down">
-						<li class="disabled">
-							系统设置...
-						</li>
-						<li class="disabled">
-							显示...
-						</li>
-						<li class="disabled">
-							启动应用程序...
-						</li>
-						<li class="disabled">
-							软件已为最新
-						</li>
-						<li class="divider"></li>
-						<li class="disabled">
-							已连接的设备
-						</li>
-						<li class="disabled">
-							打印机
-						</li>
-						<li class="divider"></li>
-						<li class="disabled">
-							锁定屏幕
-						</li>
-						<li class="disabled">
-							注销...
-						</li>
-						<li class="disabled">
-							待机
-						</li>
-						<li class="disabled">
-							休眠
-						</li>
-						<li>
-							关机...
-						</li>
-					</ul>
-				</div>
-			</div>
-		</div>
-		<div id="tooltip">
-			<div class="shadow-arrow"></div>
-			<div class="arrow-right"></div>
-			<div id="tooltip-text"></div>
-		</div>
-		<div id="menu">
-			<ul>
-				<li class="dash">
-					<span>主面板</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="home"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>主文件夹</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="firefox"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Firefox 网络浏览器</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="software"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Ubuntu 软件中心</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="writer"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>LibreOffice 文字处理</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="impress"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>LibreOffice 演示文稿</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="calc"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>LibreOffice 电子表格</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="uone"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Ubuntu One</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="email"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Thunderbird 邮件客户端</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="shotwell temp"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>Shotwell 照片管理器</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<li class="movieplayer temp"><img src="../img/menu/open-arrow.png" class="open-arrow" alt=""/><span>电影播放机</span><img src="../img/menu/selected-arrow.png" class="selected-window-arrow" alt=""/>
-				</li>
-				<!--<li class="workspace"><span>Workspace Switcher</span></li>-->
-				<li class="rubbish bottom">
-					<span>回收站</span>
-				</li>
-			</ul>
-		</div>
-		<div id="systemOverlay">
-			<div class="copyDash"></div>
-			<div id="overlayContents">
-				<input type="text" name="search" value="Search"/>
-				<div id="display-home" class="app-container">
-					<div class="recent-apps bottom"><img src="../img/overlay/recentapps.png" alt=""/> 最近的应用 <div class="app-list"></div>
-					</div>
-					<div class="recent-files bottom"><img src="../img/overlay/recentfiles.png" alt=""/> 最近打开的文件<div class="app-list"></div>
-					</div>
-				</div>
-				<div id="display-apps" class="app-container">
-					<div class="frequently bottom"><img src="../img/overlay/recentapps.png" alt=""/> 最近使用的 <div class="app-list"></div>
-					</div>
-					<div class="installed bottom"><img src="../img/overlay/installed.png" alt=""/> 已安装<div class="app-list"></div>
-					</div>
-				</div>
-				<div id="display-find-files" class="app-container">
-					<div class="files bottom"><img src="../img/overlay/recentfiles.png" alt=""/> 最近的<div class="app-list"></div>
-					</div>
-					<div class="downloads bottom"><img src="../img/overlay/downloaded.png" alt=""/> 下载<div class="app-list"></div>
-					</div>
-					<div class="folders"><img src="../img/overlay/folders.png" alt=""/> 文件夹<div class="app-list"></div>
-					</div>
-					
-				</div>
-				<div id="display-find-music" class="app-container">
-					<div class="songs bottom"><img src="../img/overlay/folders.png" alt=""/> 曲目<div class="app-list"></div>
-					</div>
-					<div class="albums"><img src="../img/overlay/folders.png" alt=""/> 专辑<div class="app-list"></div>
-					</div>
-				</div>
-				<div id="display-find-video" class="app-container">
-					<div class="videos bottom"><img src="../img/overlay/folders.png" alt=""/> 视频<div class="app-list"></div>
-					</div>
-				</div>
-				<div id="display-search" class="app-container">
-					<div class="applications bottom"><img src="../img/overlay/search-apps-logo.jpg" alt=""/> 应用程序<div class="app-list"></div>
-					</div>
-					<div class="files"><img src="../img/overlay/search-files-logo.jpg" alt=""/> 文件和文件夹...<div class="app-list"></div>
-					</div>
-				</div>
-			</div>
-			<div id="dash-bottom-bar">
-				<div class="bottom-wrapper">
-					<div class="home-icon active"></div>
-					<div class="applications-icon"></div>
-					<div class="files-icon"></div>
-					<div class="music-icon"></div>
-					<div class="video-icon last"></div>
-				</div>
-			</div>
-		</div>
-		<div id="ubuntuone-window" class="uone window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="window-title">
-					Ubuntu One 控制面板
-				</div>
-			</div>
-			<div class="content">
-				<div class="header"></div>
-				<div class="body">
-					<h1>个人云的力量</h1>
-					<div class="features">
-						<div class="files-anywhere">
-							<span class="logo"></span>
-							<div>
-								<h3>随时随地使用自己的文件</h3>
-								<p>
-									在 Ubuntu、Windows、网页和手机上备份并访问您的文件
-								</p>
-							</div>
-						</div>
-						<div class="rock-out">
-							<span class="logo"></span>
-							<div>
-								<h3>随处聆听</h3>
-								<p>
-									所有收藏都可以同步到您的 Android 和 iPhone 手机上去
-								</p>
-							</div>
-						</div>
-						<div class="keep-connected">
-							<span class="logo"></span>
-							<div>
-								<h3>保持连接</h3>
-								<p>
-									在桌面，手机和网页上同步您的联系人
-								</p>
-							</div>
-						</div>
-						<div class="stay-productive">
-							<span class="logo"></span>
-							<div>
-								<h3>保持效率</h3>
-								<p>
-									同步您的 Firefox 书签和 Tomboy 笔记
-								</p>
-							</div>
-						</div>
-					</div>
-					<div class="ubuntuone-buttons">
-						<div class="learn-more"><img src="../img/ubuntuone/ubuntuone-logo.jpg" width="47" height="48" alt=""/>
-							<div>
-								了解更多
-							</div>
-						</div>
-						<div class="join-now">
-							<h2>现在就加入</h2>
-						</div>
-						<div class="have-account">
-							我已经有一个账户
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div id="libreoffice-calc-window" class="calc window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="window-title">
-					未命名 1 - LibreOffice 电子表格
-				</div>
-			</div>
-			<div class="content">
-				<span>文件</span>
-				<span>编辑</span>
-				<span>查看</span>
-				<span>插入</span>
-				<span>格式</span>
-				<span>表格</span>
-				<span>工具</span>
-				<span>窗口</span>
-				<span>帮助</span>
-			</div>
-		</div>
-		<div id="libreoffice-writer-window" class="writer window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="window-title">
-					未命名 - LibreOffice 文字处理
-				</div>
-			</div>
-			<div class="content">
-				<span>文件</span>
-				<span>编辑</span>
-				<span>查看</span>
-				<span>插入</span>
-				<span>格式</span>
-				<span>表格</span>
-				<span>工具</span>
-				<span>窗口</span>
-				<span>帮助</span>
-			</div>
-		</div>
-		<div id="libreoffice-impress-window" class="impress window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="window-title">
-					未命名 1 - LibreOffice 演示文稿
-				</div>
-			</div>
-			<div class="content">
-				<span>文件</span>
-				<span>编辑</span>
-				<span>查看</span>
-				<span>插入</span>
-				<span>格式</span>
-				<span>表格</span>
-				<span>工具</span>
-				<span>窗口</span>
-				<span>帮助</span>
-			</div>
-		</div>
-		<div class="error-window window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="window-title"></div>
-			</div>
-			<div class="error-container">
-				<h1>感谢体验 Ubuntu</h1>
-				<a class="download"  href="http://www.ubuntu.com/download/ubuntu/download?utm_source=tour&utm_medium=online&utm_campaign=tour" target="_blank">下载 Ubuntu</a>
-				<h2>请注意：这个仅仅是个在线演示。您需要下载后方可享用真实的功能</h2>
-			</div>
-		</div>
-		<!--<div id="error-window" class="error-window window">
-		<div class="control">
-		<div class="close"></div>
-		<div class="window-title"></div>
-		</div>
-		<div class="content">
-		<img src="../img/error/warning.jpg"/>
-		<div class="message">
-		<p>Thanks for exploring Ubuntu</p>
-		<p>请注意：这个仅仅是个在线演示。您需要下载后方可享用真实的功能</p>
-		</div>
-		<div class="error-buttons"><div class="download highlight">下载 Ubuntu</div></div>
-		</div>
-		</div>-->
-		<!--<div id="workspaces">
-		<div id="void">
-		<div id="workspace-container">
-		<div id="workspace1"><div class="fadedOverlay"></div></div>
-		<div id="workspace2"><div class="fadedOverlay"></div></div>
-		<div id="workspace3"><div class="fadedOverlay"></div></div>
-		<div id="workspace4"><div class="fadedOverlay"></div></div>
-		<div class="reflection" style="clear:both;"></div>
-		<div class="reflection"></div>
-		</div>
-		</div>
-		</div>-->
-		<div id="email-window" class="email-window window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="min"></div>
-				<div class="max"></div>
-				<div class="window-title">
-					电子邮件
-				</div>
-			</div>
-			<div class="buttons">
-				<div class="email-get-mail">
-					获取邮件
-				</div>
-				<div class="email-divider"></div>
-				<div class="email-write">
-					撰写
-				</div>
-				<!--<div class="email-address-book"></div>
-				<div class="email-divider"></div>
-				<div class="email-tag"></div>
-				<div class="email-search"><input type="text" name="submitEmailSearch" id="submitEmailSearch"/></div>-->
-			</div>
-			<div style="clear:both;"></div>
-			<div class="email-content">
-				<div class="folder-list">
-					<div class="bottom-buttons">
-						全部文件夹
-					</div>
-					<div style="clear:both;"></div>
-					<div class="list">
-						<div id="folder-inbox" class="selected"><img src="../img/email/inbox.png" alt=""/> 收件箱
-						</div>
-						<div id="folder-draft"><img src="../img/email/drafts.png" alt=""/> 草稿
-						</div>
-						<div id="folder-sent"><img src="../img/email/sent.png" alt=""/> 已发送
-						</div>
-						<div id="folder-archive"><img src="../img/email/archive-logo.png" alt=""/> 存档
-						</div>
-						<div id="folder-trash"><img src="../img/email/trash.png" alt=""/> 垃圾箱
-						</div>
-					</div>
-				</div>
-				<div class="email-contents">
-					<div class="email-categories">
-						<div><img src="../img/email/t.png" alt=""/>
-						</div>
-						<div><img src="../img/email/star.png" alt=""/>
-						</div>
-						<div><img src="../img/email/clip.png" alt=""/>
-						</div>
-						<div class="subject">
-							主题
-						</div>
-						<div><img src="../img/email/glasses.png" alt=""/>
-						</div>
-						<div class="from">
-							来自
-						</div>
-						<div><img src="../img/email/fire.png" alt=""/>
-						</div>
-						<div class="date">
-							日期
-						</div>
-					</div>
-					<div style="clear:both;"></div>
-					<div class="email-list"></div>
-					<div class="email-body">
-						<div class="message-header">
-							<div class="email-buttons">
-								<div>
-									<span class="message-reply">回复</span>
-									<span class="message-forward">转发</span>
-									<span class="message-archive">存档</span>
-									<span class="message-junk">垃圾</span>
-									<span class="message-delete">删除</span>
-								</div>
-							</div>
-							<div style="clear:both;"></div>
-							<div class="date"></div>
-							<dl class="from">
-								<dt>
-									来自
-								</dt><dd></dd>
-							</dl>
-							<dl class="subject">
-								<dt>
-									主题
-								</dt><dd></dd>
-							</dl>
-							<dl class="to">
-								<dt>
-									至
-								</dt><dd></dd>
-							</dl>
-							<dl class="cc">
-								<dt>
-									抄送
-								</dt><dd></dd>
-							</dl>
-						</div>
-						<div class="junk-mail-banner"><img src="../img/email/large-fire.jpg" alt=""/> 垃圾邮件
-							<div class="not-junk">
-								不是垃圾邮件
-							</div>
-						</div>
-						<div class="message-body"></div>
-					</div>
-				</div>
-				<div style="clear:both;"></div>
-				<div class="emails-info">
-					<div>
-						未读: <span id="details-unread">1</span> 总计： <span id="details-total">1</span>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div id="email-write" class="email-write window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="min"></div>
-				<div class="max"></div>
-				<div class="window-title">
-					撰写
-				</div>
-			</div>
-			<div class="buttons">
-				<div id="write-send">
-					发送
-				</div>
-				<div class="email-divider"></div>
-				<div id="write-attach">
-					附加
-				</div>
-			</div>
-			<div style="clear:both;"></div>
-			<div id="write-from">
-				<div>
-					发件人：
-				</div>
-				<input type="text" name="from" value="You"/>
-			</div>
-			<div id="write-to">
-				<div>
-					收件人：
-				</div>
-				<input type="text" name="to"/>
-			</div>
-			<div id="write-subject">
-				<div>
-					主题：
-				</div>
-				<input type="text" name="subject"/>
-			</div>
-			<div><img src="../img/email/disabled-format-buttons.jpg" width="853" height="32" alt=""/>
-			</div>
-			<div id="write-body">
-				<textarea name="body"></textarea>
-</div>			<div class="loading-bar">
-				<div class="progress"></div>
-			</div>
-		</div>
-		<div id="software-centre" class="software window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="min"></div>
-				<div class="max"></div>
-				<div class="window-title">
-					Ubuntu 软件中心
-				</div>
-			</div>
-			<div class="top-panel">
-				<div class="back disabled"></div>
-				<div class="forward disabled"></div>
-				<div class="all-software selected"><img src="../img/software-centre/all-software.png" alt=""/>所有软件
-				</div>
-				<div class="installed"><img src="../img/software-centre/installed.png" alt=""/>已安装
-				</div>
-				<div class="history"><img src="../img/software-centre/history.png" alt=""/>历史记录
-				</div>
-			</div>
-			<div class="container detailed">
-				<div class="title"><img src="../img/software-centre/visolate.png" class="app-image" width="100" alt=""/><h1>Visolate</h1>
-					<p class="subheading">
-						PCB CNC 转换器
-					</p>
-					<p class="rating"><img src="../img/software-centre/rating.jpg" alt="" /> (91 次打分)
-					</p>
-				</div>
-				<div class="price">
-					<span class="theprice">免费</span><span class="button">安装</span>
-					<div class="loading-bar">
-						<div class="progress"></div>
-					</div>
-				</div>
-				<div class="description-container">
-					<div class="description-image"><img src="../img/software-centre/screenshot-blender.jpg" alt="" />
-					</div>
-					<div class="description"><img src="../img/software-centre/screenshot-blender.jpg" alt="" />Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse quam augue, convallis id commodo id, tristique ac mi. Ut dapibus, neque eget elementum pretium, nunc turpis congue eros, et interdum nisi nisi at diam. Duis dictum, justo eget imperdiet pulvinar, dolor est fermentum nisl, luctus imperdiet metus elit a purus. Quisque nisl enim, lacinia ut venenatis in, porttitor eget orci. Quisque non nibh nec risus tincidunt sollicitudin vitae et nisl. Proin odio lacus, vulputate non auctor sit amet, dapibus quis tortor. Donec elit libero, pellentesque quis dictum sed, hendrerit non libero. Aliquam eu diam id leo auctor tincidunt. Phasellus cursus felis at nulla facilisis semper. Cras mauris urna, adipiscing sed scelerisque ut, gravida id neque. Mauris ut vestibulum justo. Curabitur convallis elementum pellentesque. Duis sit amet arcu ac eros pretium scelerisque. Nunc nec nisi nulla.
-					</div>
-					<div style="clear:both;"></div>
-				</div>
-			</div>
-			<div class="container home">
-				<div class="header-image">
-					<span class="header-title">金牌应用程序</span>
-					<span class="header-subtitle">来看看我们喜欢的软件</span>
-				</div>
-				<div class="navigation">
-					<ul>
-						<li>
-							附件
-						</li>
-						<li>
-							开发工具
-						</li>
-						<li>
-							教育
-						</li>
-						<li>
-							字体
-						</li>
-						<li>
-							游戏
-						</li>
-						<li>
-							图形
-						</li>
-						<li>
-							互联网
-						</li>
-						<li>
-							办公
-						</li>
-						<li>
-							科学与工程
-						</li>
-						<li>
-							影音
-						</li>
-						<li>
-							系统
-						</li>
-						<li>
-							主题与系统增强
-						</li>
-					</ul>
-				</div>
-				<div class="whats-new">
-					<h2> 更新</h2>
-					<div class="app-container">
-						<div class="chromium">
-							<h3>Chromium 网页浏览器</h3>
-							<p>
-								互联网
-							</p>
-							<p class="cost">
-								免费
-							</p>
-						</div>
-						<div class="beep">
-							<h3>BEEP</h3>
-							<p>
-								游戏
-							</p>
-							<p class="cost">
-								$9.99
-							</p>
-						</div>
-						<div class="inkscape">
-							<h3>Inkscape 图形编辑器</h3>
-							<p>
-								图形
-							</p>
-							<p class="cost">
-								免费
-							</p>
-						</div>
-						<div class="worldofgoo">
-							<h3>World of Goo</h3>
-							<p>
-								游戏
-							</p>
-							<p class="cost">
-								$19.99
-							</p>
-						</div>
-						<div class="blender">
-							<h3>Blender</h3>
-							<p>
-								图形
-							</p>
-							<p class="cost">
-								免费
-							</p>
-						</div>
-						<div class="braid">
-							<h3>Braid</h3>
-							<p>
-								游戏
-							</p>
-							<p class="cost">
-								$9.99
-							</p>
-						</div>
-					</div>
-				</div>
-				<div class="whats-new">
-					<h2> 最高评分</h2>
-					<div class="app-container">
-						<div class="beep">
-							<h3>BEEP</h3>
-							<p>
-								游戏
-							</p>
-							<p class="cost">
-								$9.99
-							</p>
-						</div>
-						<div class="chromium">
-							<h3>Chromium 网页浏览器</h3>
-							<p>
-								互联网
-							</p>
-							<p class="cost">
-								免费
-							</p>
-						</div>
-						<div class="worldofgoo">
-							<h3>World of Goo</h3>
-							<p>
-								游戏
-							</p>
-							<p class="cost">
-								$19.99
-							</p>
-						</div>
-						<div class="braid">
-							<h3>Braid</h3>
-							<p>
-								游戏
-							</p>
-							<p class="cost">
-								$9.99
-							</p>
-						</div>
-						<div class="inkscape">
-							<h3>Inkscape 图形编辑器</h3>
-							<p>
-								图形
-							</p>
-							<p class="cost">
-								免费
-							</p>
-						</div>
-						<div class="blender">
-							<h3>Blender</h3>
-							<p>
-								图形
-							</p>
-							<p class="cost">
-								免费
-							</p>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div id="shotwell" class="shotwell window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="min"></div>
-				<div class="max"></div>
-				<div class="window-title">
-					Shotwell 图片查看器
-				</div>
-			</div>
-			<div class="sidebar">
-				<div class="nav">
-					<ul>
-						<li class="library">
-							库
-						</li>
-					</ul>
-				</div>
-				<div class="details">
-					<div class="overall">
-						<div>
-							条目： <span class="items">16 张照片</span>
-						</div>
-						<div>
-							发件人： <span class="from">2001年10月26日星期五</span>
-						</div>
-						<div>
-							收件人： <span class="to">2010年10月11日星期一</span>
-						</div>
-					</div>
-					<div class="single">
-						<div>
-							标题： <span class="title"></span>
-						</div>
-						<div>
-							日期: <span class="date"></span>
-						</div>
-						<div>
-							大小： <span class="size"></span>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="container">
-				<div class="images"></div>
-				<div class="tools">
-					<div class="jump-image">
-						<div class="next"></div><div class="prev"></div>
-					</div>
-					<div class="slider-container">
-						<div class="small-icon"></div><div class="slider"></div><div class="slider-active"></div><div class="large-icon"></div>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div id="movieplayer" class="movieplayer window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="min"></div>
-				<div class="max"></div>
-				<div class="window-title">
-					电影播放机
-				</div>
-			</div>
-			<div class="container">
-				<div class="video"></div>
-			</div>
-		</div>
-		<div id="firefox-window" class="firefox-window window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="min"></div>
-				<div class="max"></div>
-				<div class="window-title">
-					浏览互联网
-				</div>
-			</div>
-			<div class="buttons">
-				<div class="firefox-back"></div>
-				<div class="firefox-forward"></div>
-				<div class="firefox-url">
-					<input type="text" name="submitURL" id="submitURL" value="http://www.ubuntu.com"/>
-				</div>
-				<div class="firefox-search">
-					<input type="text" name="submitSearch" id="submitSearch" value="Wikipedia" class="fade-text"/>
-				</div>
-			</div>
-			<div style="clear:both;"></div>
-			<div class="firefox-internet">
-				<div class="web-overlay-tran"></div>
-				<div class="theIframe">
-					<iframe src="../http://www.ubuntu.com" id="firefoxInternet" >
-						<p>
-							您的浏览器不支持 iframes
-						</p>
-					</iframe>
-				</div>
-			</div>
-		</div>
-		<div id="shutdown-window" class="window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="window-title">
-					关机
-				</div>
-			</div>
-			<div class="content">
-				<img src="../img/powerwarning.jpg" alt=""/>
-				<div class="message">
-					<p>
-						您确定要关闭所有程序并关闭计算机？
-					</p>
-				</div>
-				<div class="shutdown-buttons">
-					<div class="shutdown highlight">
-						关机
-					</div>
-					<div class="cancel">
-						取消
-					</div>
-				</div>
-			</div>
-		</div>
-		<div id="folder-window" class="folder window">
-			<div class="control">
-				<div class="close"></div>
-				<div class="min"></div>
-				<div class="max"></div>
-				<div class="window-title"></div>
-			</div>
-			<div style="clear:both;"></div>
-			<div class="folder-list">
-				<div class="list">
-					<p>
-						计算机
-					</p>
-					<ul>
-						<li class="home selected" data-folder="home"><img src="../img/folder/home-icon.png" alt=""/> 主文件夹
-						</li>
-						<li class="desktop" data-folder="5"><img src="../img/folder/desktop-icon.png"  alt=""/> 桌面
-						</li>
-						<li class="documents" data-folder="0"><img src="../img/folder/documents-icon.png"  alt=""/> 文档
-						</li>
-						<li class="downloads" data-folder="1"><img src="../img/folder/downloads-icon.png"  alt=""/> 下载
-						</li>
-						<li class="music" data-folder="2"><img src="../img/folder/music-icon.png"  alt=""/> 音乐
-						</li>
-						<li class="pictures" data-folder="4"><img src="../img/folder/pictures-icon.png"  alt=""/> 图片
-						</li>
-						<li class="videos" data-folder="3"><img src="../img/folder/videos-icon.png"  alt=""/> 视频
-						</li>
-						<li class="rubbish" data-folder="bin"><img src="../img/folder/rubbish-icon.png"  alt=""/> 回收站
-						</li>
-					</ul>
-				</div>
-			</div>
-			<div class="folder-contents">
-				<div class="buttons">
-					<div class="folder-back"></div>
-					<div class="folder-forward"></div>
-				</div>
-				<div class="bottom-buttons"></div>
-				<div style="clear:both;"></div>
-				<div class="contents"></div>
-				<div class="selected-details"></div>
-			</div>
-		</div>
-		<!--<div id="welcome">
-			<div id="welcome-screen">
-				<div class="close"></div>
-				<h1>欢迎尝试Ubuntu 在线体验</h1>
-				<h2>用我们的在线演示来尝试 Ubuntu。</h2>
-				<ul>
-					<li>
-						<a class="browse-files" href="#browse-files">浏览文件</a>
-					</li>
-					<li>
-						<a class="surf-the-web" href="#surf-the-web">浏览网络</a>
-					</li>
-					<li>
-						<a class="check-email" href="#check-email">检查邮件</a>
-					</li>
-					<li>
-						<a class="view-photos" href="#view-photos">观看照片</a>
-					</li>
-					<li>
-						<a class="find-apps" href="#find-apps">寻找程序</a>
-					</li>
-					<li>
-						<a class="create-documents" href="#create-documents">创建文档</a>
-					</li>
-					<li>
-						<a class="create-spreadsheets" href="#create-spreadsheets">创建表格</a>
-					</li>
-					<li>
-						<a class="create-presentations" href="#create-presentations">创建演示文稿</a>
-					</li>
-				</ul>
-				<div class="language-mode">
-					<span class="active">English</span>
-					<a href="/tour/zh-CN/">中文</a>
-				</div>
-				<a class="explore-mode primary" href="#">四处看看</a>
-				<a class="tour-mode" href="#">观看此向导</a>
-			</div>
-		</div>-->
-		
-		
-		
-		<div id="welcome">
-			<div id="welcome-screen" class="selected-window">
-				<div class="control">
-					<div class="window-title">W欢迎尝试Ubuntu 在线体验</div>
-				</div>
-				<div class="welcome-header">
-					<h1>W欢迎尝试Ubuntu 在线体验</h1>
-					<h2>用我们的在线演示来尝试 Ubuntu。</h2>
-				</div>
-				<ul>
-					<li>
-						<a class="browse-files" href="#browse-files">浏览文件</a>
-					</li>
-					<li>
-						<a class="check-email" href="#check-email">检查邮件</a>
-					</li>
-					<li>
-						<a class="surf-the-web" href="#surf-the-web">浏览网络</a>
-					</li>
-					<li>
-						<a class="find-apps" href="#find-apps">寻找程序</a>
-					</li>
-					<li>
-						<a class="create-documents" href="#create-documents">创建文档</a>
-					</li>
-					<li>
-						<a class="view-photos" href="#view-photos">观看照片</a>
-					</li>
-					<li>
-						<a class="create-presentations" href="#create-presentations">创建演示文稿</a>
-					</li>
-					<li>
-						<a class="create-spreadsheets" href="#create-spreadsheets">创建表格</a>
-					</li>
-				</ul>
-				<div class="language-mode">
-					<a href="/tour/en/">English</a>
-					<span class="active">中文</span>
-				</div>
-				<a class="explore-mode primary" href="#">四处看看</a>
-				<a class="tour-mode" href="#">观看此向导</a>
-			</div>
-		</div>
-		
-		
-		
-		
-		
-		<div id="tour-guide">
-			<div class="next-button"><img src="../img/tourguide/arrow-next.png" alt="" />
-			</div>
-			<div class="prev-button"><img src="../img/tourguide/arrow-prev.png" alt="" />
-			</div>
-			<div class="guide-container welcome">
-				<div class="guide-logo"></div>
-				<h3></h3>
-				<p>
-					希望您喜欢 Ubuntu 在线漫游 <a href="http://www.ubuntu.com/download/ubuntu/download?utm_source=tour&utm_medium=online&utm_campaign=tour" target="_blank">准备好下载了吗？</a> 或 <a href="/ubuntu/take-the-tour" >返回网站</a>
-				</p>
-			</div>
-			<div class="guide-container home">
-				<div class="guide-logo"><img src="../img/tourguide/file-small.png" />
-				</div>
-				<h3>浏览文件</h3>
-				<p>
-					您可以轻松快捷的从 Ubuntu 的主目录访问您的文件和文件夹。
-				</p>
-			</div>
-			<div class="guide-container firefox">
-				<div class="guide-logo"><img src="../img/tourguide/firefox-small.png" />
-				</div>
-				<h3>浏览网络</h3>
-				<p>
-					使用Ubuntu 和 Firefox可以安全快速的浏览网络。
-				</p>
-			</div>
-			<div class="guide-container email">
-				<div class="guide-logo"><img src="../img/tourguide/mail-small.png" />
-				</div>
-				<h3>检查邮件</h3>
-				<p>
-					使用雷鸟来读、写和发送邮件，将会简便快捷。
-				</p>
-			</div>
-			<div class="guide-container shotwell">
-				<div class="guide-logo"><img src="../img/tourguide/shotwell-small.png" />
-				</div>
-				<h3>观看照片</h3>
-				<p>
-					您可以使用 Shotwell 上传、组织、编写和共享您的照片。
-				</p>
-			</div>
-			<div class="guide-container software">
-				<div class="guide-logo"><img src="../img/tourguide/apps-small.png" />
-				</div>
-				<h3>寻找程序</h3>
-				<p>
-					快速从Ubuntu软件中心搜索和下载应用。
-				</p>
-			</div>
-			<div class="guide-container writer">
-				<div class="guide-logo"><img src="../img/tourguide/document-small.png" />
-				</div>
-				<h3>创建文档</h3>
-				<p>
-					LibreOffice 文稿 让撰写专业文档变得更简单。
-				</p>
-			</div>
-			<div class="guide-container calc">
-				<div class="guide-logo"><img src="../img/tourguide/calc-small.png" />
-				</div>
-				<h3>创建表格</h3>
-				<p>
-					LibreOffice 表格提供了一切创建清晰精确表格之所需。
-				</p>
-			</div>
-			<div class="guide-container impress">
-				<div class="guide-logo"><img src="../img/tourguide/impress-small.png" />
-				</div>
-				<h3>创建演示文稿</h3>
-				<p>
-					使用直观的 LibreOffice 演示文稿 来创建一个良好的影响
-				</p>
-			</div>
-			<div class="guide-container movieplayer">
-				<div class="guide-logo"><img src="../img/tourguide/video-small.png" />
-				</div>
-				<h3>观看视频</h3>
-				<p>
-					您可以观看所有您喜爱的电影，视频，DVD，下载或者自创的视频。
-				</p>
-			</div>
-			<div class="explore-tooltip-download">
-				下载
-			</div>
-			<div class="explore-tooltip-welcome">
-				欢迎画面
-			</div>
-			<div class="explore-to-welcome"></div>
-			<div class="explore-to-download"></div>
-		</div>
-		<div id="Translation-Strings">
-			<!--
-			* Email system
-			-->
-			<p class="_email_1_title_">
-				辅助功能
-			</p>
-			<p class="_email_2_title_">
-				快速
-			</p>
-			<p class="_email_3_title_">
-				兼容
-			</p>
-			<p class="_email_4_title_">
-				安全
-			</p>
-			<p class="_email_5_title_">
-				你的 Ubuntu，你做主
-			</p>
-			<p class="_email_1_body_">
-				可用性是 Ubuntu 哲学的中心。我们相信计算机是给所有人使用的，不分民族、种族、性别，抑或残疾与否。Ubuntu 已被完整地翻译成38种语言，也同时包含必须的辅助技术，所有这些都是完全免费的。
-			</p>
-			<p class="_email_2_body_">
-				Ubuntu 在任何计算机上都能流畅运行，在新机器上更是无与伦比。没有不必要的程序或试用版软件拖慢启动速度，从开机到打开浏览器只需几秒钟。不同于其他操作系统，Ubuntu 不会让您面对着屏幕苦苦等待，因为它的速度飞快，而且能为您始终保持这种快速的体验。
-			</p>
-			<p class="_email_3_body_">
-				很多设备都可以很好的在 Ubuntu 下工作。只需将您的 MP3 播放器、相机或者打印机连接到计算机上，您就可以直接使用，这个过程轻松简单，无需驱动程序安装光盘。同时还和 Windows 系统兼容，所以您可以轻松地打开、编辑和分享微软Office的文档。
-			</p>
-			<p class="_email_4_body_">
-				您可以安全地使用 Ubuntu 上网冲浪 - 您的文件和数据会得到严密的保护。Ubuntu 内置防火墙和病毒防护功能。万一出现危险状况，您只需轻点鼠标即可获得我们为您提供的自动更新。通过使用 AppArmor，您的重要应用程序皆处于保护之下，使攻击者无法闯入系统。Firefox 和 gnome-keyring 则让 Ubuntu 能保护您的隐私信息不被泄漏。无论是访问银行账户，还是与同事和朋友共享敏感信息，您都可以高枕无忧。
-			</p>
-			<p class="_email_5_body_">
-				享受 Ubuntu 独具风格的直观界面。Ubuntu 快速、安全、拥有数千款应用可供选择，这是为您量身定制的简洁、连续的使用体验。
-			</p>
-			<p class="_random_reply_">
-				请注意：这个仅仅是个在线演示。您需要下载后方可享用真实的功能
-				<br/>
-				<br/>
-				<a href="http://www.ubuntu.com/download/ubuntu/download?utm_source=tour&utm_medium=online&utm_campaign=tour" target="_blank">下载 Ubuntu</a>
-			</p>
-			<p class="_write_">
-				撰写
-			</p>
-			<p class="_no_subject_">
-				无主题
-			</p>
-			<p class="_recipient_">
-				收件人
-			</p>
-			<p class="_from_">
-				来自
-			</p>
-			<p class="_you_">
-				您
-			</p>
-			<p class="_on_">
-				开启
-			</p>
-			<p class="_wrote_">
-				写道：
-			</p>
-			<p class="_original_message_">
-				原始信息
-			</p>
-			<p class="_fwd_">
-				转发
-			</p>
-			<!--
-			* Folder System
-			-->
-			<p class="_home_folder_">
-				主文件夹
-			</p>
-			<p class="_desktop_folder_">
-				桌面
-			</p>
-			<p class="_pictures_folder_">
-				图片
-			</p>
-			<p class="_videos_folder_">
-				视频
-			</p>
-			<p class="_music_folder_">
-				音乐
-			</p>
-			<p class="_downloads_folder_">
-				下载
-			</p>
-			<p class="_documents_folder_">
-				文档
-			</p>
-			<p class="_canonical_folder_">
-				Canonical
-			</p>
-			<p class="_backup_folder_">
-				备份
-			</p>
-			<p class="_local_folder_">
-				本地
-			</p>
-			<p class="_work_folder_">
-				工作
-			</p>
-			<p class="_branches_folder_">
-				分支
-			</p>
-			<p class="_rubbish_bin_folder_">
-				回收站
-			</p>
-			<!--
-			* Software Center System
-			-->
-			<p class="_remove_">
-				移除
-			</p>
-			<p class="_price_free_">
-				免费
-			</p>
-			<p class="_installed_">
-				已安装
-			</p>
-			<p class="_install_">
-				安装
-			</p>
-			<p class="_installing_">
-				正在安装
-			</p>
-			<p class="_chromium_app_">
-				Chromium 网页浏览器
-			</p>
-			<p class="_chromium_sub_">
-				访问互联网
-			</p>
-			<p class="_chromium_desc_">
-				Chromium 是一个开源的浏览器项目，致力于让所有用户都能安全、快速、稳定地访问网络。
-				<br/>
-				<br/>
-				Chromium 是 Google Chrome 的基础，只是名称和标志与 Chrome 不同，同时也去除了用户行为跟踪和自动升级系统。
-				<br/>
-				<br/>
-				此软件包含有 Chromium 浏览器
-			</p>
-			<p class="_beep_app_">
-				BEEP
-			</p>
-			<p class="_beep_sub_">
-				物理解谜类 2D 设计游戏
-			</p>
-			<p class="_beep_desc_">
-				BEEP 是一个使用物理引擎的横向卷轴游戏。游戏中您可以控制一个装配有反重力设备、飞行器和枪支的机器人，进行行驶、跳跃、飞行、游泳并射击开拓一条道路。游戏共24关，设有6个完全不同的场景。
-				<br/>
-				<br/>
-				使用 BEEP 的反重力装置来直接操控物理设施。反重力装置不仅是一种工具，还是一样武器。使用它来打击敌方的机器人、建造铁塔并解决问题。
-				<br/>
-				<br/>
-				BEEP 号从遥远的时空旅行了几千年来探索银河系。和 BEEP 号一起穿越一个陌生的星系并派出机器人登陆星球表面。
-			</p>
-			<p class="_inkscape_app_">
-				Inkscape 矢量图形编辑器
-			</p>
-			<p class="_inkscape_sub_">
-				创建和编辑可缩放矢量图形(SVG)图像
-			</p>
-			<p class="_inkscape_desc_">
-				Inkscape 可加载和保存 SVG 格式文件。SVG 格式是由万维网联盟维护的一个标准。
-				<br/>
-				<br/>
-				Inkscape 的用户界面与 CorelDraw 和同类的画图软件相似。它带有矩形、椭圆、文字、位图和自由曲线工具。此外，向量和位图对象都可以有 Alpha 透明度，并均可任意变形。
-				<br/>
-				<br/>
-				Inkscape 支持同时打开多个文件，以及每个文件多个查看器。图片可以打印或导出为 png 位图。
-				<br/>
-				<br/>
-				部分导入和导出特性由 dia, libwmf-bin, pstoedit skencil, imagemagick 和 perlmagick 等软件提供。
-				<br/>
-				<br/>
-				其它插件需要 ruby,  libxme-xql-perl,  python-numpy 和 python-lxml。为了让这些插件和特效工作，您需要安装这些软件包。
-				<br/>
-				<br/>
-				如果您要使用拼写检查，您需要安装 aspell 和相应的语言支持。例如: aspell-en 或者 aspell-de。
-			</p>
-			<p class="_world_of_goo_app_">
-				World of Goo
-			</p>
-			<p class="_world_of_goo_sub_">
-				包含物理学知识的拼图游戏
-			</p>
-			<p class="_world_of_goo_desc_">
-				拖拽一种名为粘豆包的粘性小球来搭建庞大复杂的结构，如桥梁、加农炮炮弹、齐柏林飞艇和巨舌。生活在粘粘世界里的成千上万的粘豆包想要探索世界！
-				<br/>
-				<br/>
-				但是它们不知道自己身处游戏之中，且十分美味。一段最让人着迷的迷宫会为您准备一段永远难忘的探险！
-			</p>
-			<p class="_blender_app_">
-				Blender
-			</p>
-			<p class="_blender_sub_">
-				创建和编辑三维模型及动画
-			</p>
-			<p class="_blender_desc_">
-				Blender 是一个集成 3D 套件，提供的功能包括但不限于：建模、动画、渲染、后期制作、交互式创作和回放。Blender 拥有一个完全用 OpenGL 实现并针对速度优化的界面。其具有 Python 绑定功能，可用于编写脚本。例如，对 3D Studio 和 Wavefront OBJ 这些流行的文件格式的导入导出功能就是由社区使用脚本实现 的。此外，Blender 可以完全正常地使用动画、游戏模型或其他以二进制格式或浏览器插件实现的第三方引擎和交互内容。
-			</p>
-			<p class="_braid_app_">
-				Braid
-			</p>
-			<p class="_braid_sub_">
-				操控时间流来解决问题
-			</p>
-			<p class="_braid_desc_">
-				操控时间流来解决问题 Braid 是一个拥有开放式画风的游戏，您通过操控时间流来解决问题。Braid 中的每个问题都是独一无二的，没有筛选。
-				<br/>
-				<br/>
-				Braid 珍视您的时间和精力，它会尽全部努力开拓您的思维。
-				<br/>
-				<br/>
-				所有游戏均基于时间操控。到一个时间概念与平常大不相同的地方旅行，观察、学习并主宰这些地方。
-			</p>
-			<p class="_banshee_app_">
-				Banshee 媒体播放器
-			</p>
-			<p class="_brasero_app_">
-				Brasero 光盘刻录器
-			</p>
-			<p class="_movie_player_app_">
-				电影播放机
-			</p>
-			<p class="_shotwell_app_">
-				Shotwell 照片管理器
-			</p>
-			<p class="_pitivi_app_">
-				PiTiVi 视频编辑器
-			</p>
-			<p class="_sound_recorder_app_">
-				录音机
-			</p>
-			<p class="_empathy_app_">
-				Empathy 即时通讯
-			</p>
-			<p class="_thunderbird_app_">
-				Thunderbird 邮件/新闻
-			</p>
-			<p class="_firefox_app_">
-				Firefox 网络浏览器
-			</p>
-			<p class="_gwibber_app_">
-				硅博社交网络客户端
-			</p>
-			<p class="_remote_desktop_app_">
-				远程桌面查看器
-			</p>
-			<p class="_terminal_app_">
-				终端服务客户端
-			</p>
-			<p class="_about_me_app_">
-				关于我
-			</p>
-			<p class="_additional_drivers_app_">
-				附加驱动
-			</p>
-			<p class="_aisleroit_app_">
-				纸牌王
-			</p>
-			<p class="_appearance_app_">
-				外观
-			</p>
-			<p class="_bluetooth_app_">
-				蓝牙
-			</p>
-			<!--
-			* Dash
-			-->
-			<p class="_search_">搜索</p>
-			<!--
-			* Notifications
-			-->
-			<p class="_turn_off_bluetooth_">
-				关闭蓝牙
-			</p>
-			<p class="_turn_on_bluetooth_">
-				打开蓝牙
-			</p>
-			<p class="_visible_">
-				可见
-			</p>
-			<p class="_mute_">
-				静音
-			</p>
-			<p class="_unmute_">
-				取消静音
-			</p>
-			<p class="_shut_down_">
-				关机...
-			</p>
-			<!--
-				Files Details - Images
-			-->
-			<p class="_photo_size_">
-				15.2KB	
-			</p>
-			<p class="_photo_date_">
-				2001年10月26日星期五
-			</p>
-			<p class="_buck_off_title_">
-				翘首	
-			</p>
-			<p class="_darkening_clockwork_title_">
-				变暗的时钟
-			</p>
-			<p class="_dybbølsbro_station_title_">
-				Dybbølsbro Station
-			</p>
-			<p class="_federica_miglio_title_">
-				Federica Miglio
-			</p>
-			<p class="_jardin_polar_title_">
-				Jardin Polar
-			</p>
-			<p class="_langelinie_alle_title_">
-				Langelinie Alle
-			</p>
-			<p class="_momiji_dream_title_">
-				Momiji Dream
-			</p>
-			<p class="_mount_snowdon_title_">
-				斯诺登之山
-			</p>
-			<p class="_not_alone_title_">
-				不孤单
-			</p>
-			<p class="_power_of_words_title_">
-				语言的力量
-			</p>
-			<p class="_purple_dancers_title_">
-				紫色花语
-			</p>
-			<p class="_sand_maze_title_">
-				沙漠迷宫
-			</p>
-			<p class="_small_flowers_title_">
-				小花
-			</p>
-			<p class="_stalking_ocelot_title_">
-				潜行的山猫
-			</p>
-			<p class="_the_grass_aint_greener_title_">
-				爱绿
-			</p>
-			<p class="_wildWheat_title_">
-				麦田
-			</p>
-			<!--
-				Files Details - Video
-			-->
-			<p class="_introduction_ubuntu_title_">
-				Ubuntu 简介
-			</p>
-			<p class="_video_size_">
-				5.3MB
-			</p>
-			<p class="_video_date_">
-				2010年10月11日星期一
-			</p>
-			<!--
-				Files Details - Music
-			-->
-			<p class="_happyness_title_">
-				喜悦
-			</p>
-			<p class="_music_size_">
-				3.3MB
-			</p>
-			<p class="_music_date_">
-				2010年08月14日 星期三
-			</p>
-		</div>
-		<script type="text/javascript" src="../js/jquery.min.js"></script>
-		<script type="text/javascript" src="../js/jquery-ui.min.js"></script>
-		<script type="text/javascript" src="../js/lang.js"></script>
-		<script type="text/javascript" src="../js/scripts.js"></script>
-		<script type="text/javascript" src="../js/welcomesystem.js"></script>
-		<script type="text/javascript" src="../js/guidedtoursystem.js"></script>
-		<script type="text/javascript" src="../js/filesystem.js"></script>
-		<script type="text/javascript" src="../js/folders.js"></script>
-		<script type="text/javascript" src="../js/systemoverlay.js"></script>
-		<script type="text/javascript" src="../js/systemmenu.js"></script>
-		<script type="text/javascript" src="../js/internetsystem.js"></script>
-		<script type="text/javascript" src="../js/emailsystem.js"></script>
-		<script type="text/javascript" src="../js/systemsettings.js"></script>
-		<script type="text/javascript" src="../js/email.js"></script>
-		<script type="text/javascript" src="../js/errormessage.js"></script>
-		<script type="text/javascript" src="../js/ubuntuonesystem.js"></script>
-		<script type="text/javascript" src="../js/file.js"></script>
-		<script type="text/javascript" src="../js/shotwellsystem.js"></script>
-		<script type="text/javascript" src="../js/shutdownSystem.js"></script>
-		<script type="text/javascript" src="../js/movieplayersystem.js"></script>
-		<script type="text/javascript" src="../js/libresystem.js"></script>
-		<script type="text/javascript" src="../js/softwaresystem.js"></script>
-		<script type="text/javascript" src="../js/notificationsystem.js"></script>
-		<script type="text/javascript" src="../js/analytics.js"></script>
-	</body>
-</html>
diff --git a/templates/tv/_box_contact.html b/templates/tv/_box_contact.html
old mode 100644
new mode 100755
diff --git a/templates/tv/_nav_secondary.html b/templates/tv/_nav_secondary.html
old mode 100644
new mode 100755
index 6c47cb0e087..b7ddaff244f
--- a/templates/tv/_nav_secondary.html
+++ b/templates/tv/_nav_secondary.html
@@ -1,5 +1,4 @@
-	<ul{% if list_class %} class="{{ list_class }}"{% endif %}>
-		{% if arrow %} <li class="arrow-up"></li> {% endif %}
+	<ul{% if list_class %} class="{{ list_class }}"{% endif %} class="second-level-nav">
 		<li class="first{% if level_1 == 'tv' and not level_2 %} active{% endif %}"><a href="/tv">Overview</a></li>
 		<li{% if level_2 == 'experience' %} class="active"{% endif %}><a href="/tv/experience">Experience</a></li>
 		<li{% if level_2 == 'industry' %} class="active"{% endif %}><a href="/tv/industry">Industry</a></li>
diff --git a/templates/tv/_nav_tertiary.html b/templates/tv/_nav_tertiary.html
old mode 100644
new mode 100755
diff --git a/templates/tv/base_tv.html b/templates/tv/base_tv.html
old mode 100644
new mode 100755
diff --git a/templates/tv/commercial-info.html b/templates/tv/commercial-info.html
old mode 100644
new mode 100755
index 067d4e50c1f..7b6436d19eb
--- a/templates/tv/commercial-info.html
+++ b/templates/tv/commercial-info.html
@@ -15,36 +15,36 @@ <h2>Terms</h2>
 		<p>Companies wishing to distribute an Ubuntu-branded commercial device pay a per unit service fee covering the engineering, maintenance, quality assurance, third-party licensing fees and Canonical consulting costs. Engagements are structured with some NRE, baseline volume commitments, and volume-based pricing for service fees.</p>
 		<p>Canonical shares post-purchase services revenue from the sale of content, applications and subscriptions through Ubuntu TV products with OEM&rsquo;s and distribution / channel partners.</p>
 	</div>
-	<span><img src="{{ STATIC_URL }}img/pictograms/pictogram-partner-124x124.png" alt="" width="124" height="124" /></span>
+	<span><img src="{{ STATIC_URL }}img/pictograms/pictogram-partner-124x124.png" alt="" width="124" height="124" class="priority-0" /></span>
 </div><!-- / .row -->
 
 <div class="row row-image-centered">
-	<span><img src="{{ STATIC_URL }}img/pictograms/pictogram-engineering-124x124.png" alt="" /></span>
+	<span><img src="{{ STATIC_URL }}img/pictograms/pictogram-engineering-124x124.png" alt="" class="priority-0" /></span>
 	<div class="eight-col">
 		<h2>Engineering</h2>
-		<p>Ubuntu TV is a complete solution for ODMs. Engagement terms cover component and system enablement and certification. Canonical coordinates with component manufacturers to develop, integrate or update drivers, integrate third-party commercial software and customize Ubuntu to meet our customer-specific needs.</p>
+		<p>Ubuntu TV is a complete solution for ODMs. Engagement terms cover component and system enablement and certification. Canonical coordinates with component manufacturers to develop, integrate or update drivers, integrate third-party commercial software and customise Ubuntu to meet our customer-specific needs.</p>
 		<p>Canonical engineering capacity is distributed globally, with a particular focus on Taipei for device-oriented engagements. Customer engagements can be led from the US, Europe or Asia, with local teams responsible for customer-facing engagements.</p>
 	</div>
 </div><!-- / .row -->
-	
+
 <div class="row row-image-centered">
 	<div class="eight-col">
 		<h2>Maintenance</h2>
 		<p>Modern connected device strategies emphasise the ability to update and upgrade software in-place, often automatically. This enables a long-term relationship between the hardware vendor and their customers, with ever-increasing value propositions for customers who want the latest experiences and services on existing hardware.</p>
 		<p>The ability to update your devices is central to your security and long-term competitiveness. Canonical takes care of all security and critical bug fixes to the base platform offering and provides the infrastructure to support your update management strategy. Ubuntu has a world-class track record maintaining a secure and stable operating system in the PC sector, and we bring this expertise to customers&rsquo; products.</p>
 	</div>
-	<span><img src="{{ STATIC_URL }}img/pictograms/pictogram-upgrade-124x124.png" alt="" /></span>
+	<span><img src="{{ STATIC_URL }}img/pictograms/pictogram-upgrade-124x124.png" alt="" class="priority-0" /></span>
 </div><!-- / .row -->
-	
+
 <div class="row">
 	<div class="eight-col prepend-four">
 		<h2>Third-party license fees</h2>
 		<p>Canonical has agreements in place with third parties and industry organisations to include codecs for common media formats. In addition, we manage access fees for services that provide channel listings or additional information on the content being viewed. Commercial engagements around Ubuntu devices with Canonical cover these fees and related items, such as subscriptions, royalty collection fees and regulatory broadcast fees.</p>
 	</div>
 </div><!-- / .row -->
-	
+
 <div class="row no-border">
-	<div class="append-four">
+	<div class="eight-col append-four">
 		<h2>Ubuntu TV licensing</h2>
 		<p>Components for Ubuntu TV produced by Canonical are generally licensed under the GPLv3 or LGPLv3. Alternative licensing is available on the proviso that Canonical retains discretionary rights to include work done in the public versions of Unity and Ubuntu.</p>
 	</div>
diff --git a/templates/tv/contributors.html b/templates/tv/contributors.html
old mode 100644
new mode 100755
index 05973b5a125..3c1ea67d757
--- a/templates/tv/contributors.html
+++ b/templates/tv/contributors.html
@@ -20,9 +20,9 @@ <h2>Welcome to Ubuntu, where you can shape the future to suit yourself.</h2>
 		<h2>Get involved</h2>
 		<p>If you&rsquo;d like to get involved with the ongoing development of Ubuntu TV, you&rsquo;ll find yourself welcome and among friends who share a passion for classy entertainment experiences. For more general information on contributing to Ubuntu projects, <a href="https://wiki.ubuntu.com/UbuntuTV/Contributing">visit the Ubuntu Wiki</a>.</p>
 		<p>Code contributions to Ubuntu TV follow the same process as the Unity project.</p>
-		<p><a href="http://www.canonical.com/contributors">Learn more about the process &rsaquo;</a></p>
+		<p><a href="/legal/contributors">Learn more about the process&nbsp;&rsaquo;</a></p>
 	</div>
-	<span><img src="{{ STATIC_URL }}img/pictograms/pictogram-community-124x124.gif" alt="" /></span>
+	<span><img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-community-warmgrey.svg" alt="" width="124" height="124" /></span>
 </div><!-- /.row -->
 
 <div class="row">
@@ -30,7 +30,7 @@ <h2>Get involved</h2>
 		<h2>The Ubuntu Code of Conduct</h2>
 		<p>The quality of our work is a product of the quality of our discussions. We promote debate and participation, and we ensure that conversations stay productive, positive and constructive. <a href="/about/about-ubuntu/conduct">Our Code of Conduct</a> sets the tone for all Ubuntu work, including this TV initiative. It lays out the expectations that we have of those who participate, represent or engage with the project.</p>
 		<p>Essentially, it calls on people to treat one another with respect, regardless of their differences of opinion, and it is the foundation for all of our governance practices.</p>
-		<p><a href="/about/about-ubuntu/governance">Learn more about Ubuntu Governance &rsaquo;</a></p>
+		<p><a href="/about/about-ubuntu/governance">Learn more about Ubuntu Governance&nbsp;&rsaquo;</a></p>
 	</div><!-- /.eight-col -->
 </div><!-- /.row -->
 
@@ -39,11 +39,11 @@ <h2>The Ubuntu Code of Conduct</h2>
 		<h2>Communicating with other contributors</h2>
 		<p>The Ubuntu TV team uses email and IRC to keep in touch, plan work and manage releases. Start with the <a href="https://launchpad.net/ubuntutv">team Launchpad page</a>, where you can join our mailing list. There&rsquo;s a fair amount of traffic, but it&rsquo;s all signal! For real-time interaction, hop on to the #ubuntu-tv IRC channel on Freenode.</p>
 	</div><!-- /.eight-col -->
-	<span><img src="{{ STATIC_URL }}img/pictograms/pictogram-discussion-124x124.gif" alt="" /></span>
+	<span><img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-discussion-warmgrey.svg" alt="" width="124" height="124" /></span>
 </div><!-- /.row -->
 
-<div class="row">
-	<div class="prepend-four">
+<div class="row row-grey">
+	<div class="eight-col">
 		<h2>Licensing for Ubuntu TV</h2>
 		<p>The Ubuntu TV project prefers the GPL version 3. Ubuntu TV relies on the same libraries as Unity 2D with the following media-oriented additions:</p>
 		<ul class="list-bullets">
@@ -54,22 +54,15 @@ <h2>Licensing for Ubuntu TV</h2>
 	</div><!-- /.eight-col -->
 </div><!-- /.row -->
 
-<div class="row">
-	<div class="twelve-col">
-		<h2>The architecture of Ubuntu TV</h2>
-		<img class="image-architecture" src="{{ STATIC_URL }}img/devices/diagram-architecture-841x330.jpg" width="841" height="330" alt="The layered architecture of Ubuntu TV - Hardware, Ubuntu Core, Example Apps, Lenses &amp; Scopes, Unity" />
-	</div>
-</div><!-- /.row -->
-	
 <div class="row row-image-centered">
-	<span><img src="{{ STATIC_URL }}img/pictograms/pictogram-download-124x124.gif" alt="" /></span>
+	<span><img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-download-warmgrey.svg" alt="" width="124" height="124" /></span>
 	<div class="eight-col">
 		<h2>Download the code</h2>
 		<p>The entire source code for the Ubuntu TV demo is available on the <a href="https://launchpad.net/ubuntutv">Ubuntu TV Launchpad page</a>. To download, compile and run the code, you will need Ubuntu 11.10 and a working OpenGL driver, preferably with synchronisation to VBlank enabled.</p>
 		<p>Detailed compilation and installation instructions are maintained in the <a href="https://wiki.ubuntu.com/UbuntuTV/Contributing">Ubuntu Wiki</a>.</p>
 	</div><!-- /.eight-col -->
 </div><!-- /.row -->
-	
+
 <div class="row no-border">
 	<h2>What about MythTV and XBMC?</h2>
 	<div class="seven-col no-border">
@@ -78,7 +71,9 @@ <h2>What about MythTV and XBMC?</h2>
 		<p>Any improvements or changes we make to either project are contributed back. And we welcome contributions from both communities.</p>
 	</div>
 	<div class="prepend-one four-col last-col">
-		<p class="pull-quote">&ldquo;We&rsquo;re very pleased to collaborate with members of both communities.&rdquo;</p>
+		<blockquote class="pull-quote">
+			<p><span>&ldquo;</span>We&rsquo;re very pleased to collaborate with members of both communities. <span>&rdquo;</span></p>
+		</blockquote>
 	</div>
 </div><!-- /.row -->
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/tv/experience.html b/templates/tv/experience.html
old mode 100644
new mode 100755
index 16ce3ee07f7..a38f7e28ad0
--- a/templates/tv/experience.html
+++ b/templates/tv/experience.html
@@ -7,21 +7,20 @@
 {% endblock second_level_nav_items %}
 
 {% block content %}
-<div class="row row-hero no-border">
-	<h1>Experience Ubuntu TV</h1>
-</div>
-
 <div class="row row-hero">
+	<h1>Experience Ubuntu TV</h1>
 	<div class="intro clearfix">
-		<img src="{{ STATIC_URL }}img/devices/product-tv-experience-top-590x386.png" width="590" height="386" alt="" />
-		<h2>Just TV. No wires. No boxes.</h2>
-		<p>Viewers want entertainment, not electronics. They want to relax and enjoy the movie, not juggle remote controls.</p>
-		<p>Beautiful simplicity is the driving force behind Ubuntu TV. It integrates broadcast, time shift, online box office, personal cloud, apps and disk media experiences &mdash; all without wires, connectors or more boxes. It really is just the TV.</p>
+		<img src="{{ STATIC_URL }}img/tv/experience/image-tv-experience.jpg" width="590" height="386" alt="" />
+		<div class="twelve-col">
+			<h2>Just TV. No wires. No boxes.</h2>
+			<p>Viewers want entertainment, not electronics. They want to relax and enjoy the movie, not juggle remote controls.</p>
+			<p>Beautiful simplicity is the driving force behind Ubuntu TV. It integrates broadcast, time shift, online box office, personal cloud, apps and disk media experiences &mdash; all without wires, connectors or more boxes. It really is just the TV.</p>
+		</div>
 	</div><!-- /.intro -->
 </div><!-- /.row -->
 
 <div class="row">
-	<div class="four-col">
+	<div class="four-col priority-0">
 		<blockquote class="quote-grey">One<br/>remote</blockquote>
 	</div>
 	<div class="eight-col last-col">
@@ -31,23 +30,13 @@ <h2>One remote for everything</h2>
 </div><!-- /.row -->
 
 <div class="row row-image-centered">
-	<div class="eight-col">
-	<h2>Personal world, personal cloud</h2>
-		<p>Ubuntu One is built-in to the Ubuntu TV, so photos and videos from any supported device magically appear on the screen. Wherever your customers keep their content &mdash; in the cloud, on a Windows PC or on their phones, Ubuntu TV brings it all together in the living room. Personal videos can be streamed straight from the cloud to the TV, as can slide shows of holiday photos. It's a connected world, and it&rsquo;s a personal world. Ubuntu celebrates both.</p>
-	</div>
-	<span>
-		<img src="{{ STATIC_URL }}img/logos/logo-uone-262x106.png" width="262" height="106" alt="Ubuntu One"/>
-	</span>
-</div><!-- /.row -->
-
-<div class="row row-image-centered">
-	<span>
-		<img src="{{ STATIC_URL }}img/devices/product-tv-experience-features-442x327.jpg" width="442" height="327" alt="Ubuntu TV features include the ability to browse the latest movies and TV"/>
-	</span>
 	<div class="six-col">
 		<h2>Just click to go to the movies</h2>
 		<p>Ubuntu TV has a box office built-in, so viewers can browse the latest movies and TV shows online, buy and start watching in seconds.  Canonical manages relationships with online services, streaming services and content distributors globally. All login information and payment details are securely stored in the personal cloud account.  For viewers, it could not be easier, and for hardware manufacturers, Ubuntu TV offers access to content revenues without the complexity of software and content management.</p>
 	</div>
+	<span>
+		<img src="{{ STATIC_URL }}img/devices/product-tv-experience-features-442x327.jpg" width="442" height="327" alt="Ubuntu TV features include the ability to browse the latest movies and TV"/>
+	</span>
 </div><!-- /.row -->
 
 <div class="row">
@@ -65,13 +54,13 @@ <h2>The second screen and the shared screen</h2>
 		<p>A key TV trend is the second-screen experience, in which viewers seek more information about what they are watching, but without interfering with the content on the TV screen.  Ubuntu TV is designed to work with your phones, tablets or laptops via apps that talk to the television. So whether it's game stats, movie information or the reaction to a live show in Twitter, viewers can enjoy relevant second-screen content more easily than ever.</p>
 	</div>
 	<div class="four-col last-col text-center">
-		<img src="{{ STATIC_URL }}img/pictograms/pictogram-tweet-109x132.png" width="109" height="132" alt="Ubuntu tweet pictogram"/>
+		<img src="{{ STATIC_URL }}img/pictograms/picto-pack/picto-tweet-warmgrey.svg" width="109" height="132" alt="Ubuntu tweet pictogram"/>
 	</div>
 </div><!-- /.row -->
 
 <div class="row row-image-centered no-border">
 	<span>
-		<img src="{{ STATIC_URL }}img/pictograms/pictogram-download-165x165.png" width="165" height="165" alt="Ubuntu download pictogram"/>
+		<img src="{{ STATIC_URL }}img/pictograms/pictogram-download-165x165.png" width="165" height="165" alt="Ubuntu download pictogram" class="priority-0" />
 	</span>
 	<div class="eight-col last-col">
 		<h2>Smart apps for smart TVs</h2>
diff --git a/templates/tv/features-and-specs.html b/templates/tv/features-and-specs.html
old mode 100644
new mode 100755
index 9606b542853..d0e65615764
--- a/templates/tv/features-and-specs.html
+++ b/templates/tv/features-and-specs.html
@@ -19,7 +19,7 @@ <h1>Features and specifications</h1>
 		<h2>All broadcast television</h2>
 		<p>Terrestrial broadcast in US and EU standard formats, for standard or high definition content, with integrated electronic programme guides.</p>
 	</div><!-- / .six-col -->
-	
+
 	<div class="six-col last-col">
 		<h2>Cable and satellite possibilities</h2>
 		<p>Integrate your cable or satellite service into Ubuntu TV, to provide a unified customer experience. Ubuntu bridges the gap between television manufacturers and cable or satellite providers.</p>
@@ -46,7 +46,7 @@ <h2>Endless online entertainment</h2>
 		<h2>Enhanced viewing</h2>
 		<p>Second-screen experiences are an emerging trend in broadcast television. Link phones or tablets to Ubuntu TV, presenting related content to viewers while they watch.  Provide information on movies by the same director, for example, or the  reaction on Twitter during live shows &mdash; without any distraction from the action.</p>
 	</div><!-- / .six-col -->
-	<div class="six-col last-col">
+	<div class="six-col last-col no-margin-bottom">
 		<img src="{{ STATIC_URL }}img/devices/screenshot-movie-440x331.jpg" width="440" height="331" alt="Ubuntu TV displaying movie details" />
 	</div><!-- / .six-col -->
 </div><!-- / .row -->
@@ -63,30 +63,20 @@ <h2>Individual preferences and suggestions</h2>
 </div><!-- / .row -->
 
 <div class="row">
-	<div class="six-col">
+	<div class="six-col no-margin-bottom">
 		<img src="{{ STATIC_URL }}img/devices/screenshot-pause-and-play-440x331.jpg" width="440" height="331" alt="Ubuntu TV pick up where you left off" />
 	</div><!-- / .six-col -->
-	
+
 	<div class="six-col last-col">
 		<h2>Pick up where you left off</h2>
 		<p>Viewers enjoy content on multiple devices &mdash; phones, tablets, and the TV. With Ubuntu TV, they can pick up where they left off on a different device. For example, a viewer can watch part of a movie on their phone, then watch the rest on the TV &mdash; without having to search for their place.</p>
 	</div><!-- / .six-col -->
 </div><!-- / .row -->
 
-<div class="row row-image-centered">
-	<div class="eight-col">
-		<h2>Sharing across devices</h2>
-		<p>Stream music, photos and videos from the PC to the TV. And with Ubuntu TV apps for iOS, Android and Ubuntu, media can be shared between the TV and portable devices using the personal cloud service, Ubuntu One.</p>
-	</div><!-- / .eight-col -->
-	<span>
-		<img src="{{ STATIC_URL }}img/pictograms/pictogram-share-124x124.png" width="124" height="124" alt="Ubuntu share pictogram" />
-	</span>
-</div><!-- / .row -->
-
 <div class="row">
 	<div class="eight-col">
 		<h2>Expandability built-in</h2>
-		<p>Ubuntu TV runs applications from you or from third party developers. Deliver apps through an online store, update them when necessary and benefit from the growing ecosystem of Ubuntu application developers.</p>	
+		<p>Ubuntu TV runs applications from you or from third party developers. Deliver apps through an online store, update them when necessary and benefit from the growing ecosystem of Ubuntu application developers.</p>
 	</div>
 </div><!-- / .row -->
 
@@ -96,25 +86,27 @@ <h2>Expandability built-in</h2>
 			<h3>Technical specifications and requirements</h3>
 			<div>
 				<p><span>Ubuntu TV benefits from the comprehensive hardware support that&rsquo;s always been a hallmark of Ubuntu for PCs. Highlights include:</span></p>
-				<ul class="list-ubuntu six-col">
-					<li>Support for ARM and x86 boards<sup><a href="#fn1" id="r1">1</a></sup></li>
-					<li>Local storage support for DVR functionality<sup><a href="#fn2" id="r2">2</a></sup></li>
-					<li>Minimum disk space: 2GB</li>
-					<li>Minimum memory: 1GB</li>
-					<li>Minimum video memory: 512 MB</li>
-					<li>HDMI</li>
-					<li>CEC support</li>
-				</ul>
-				
-				<ul class="list-ubuntu six-col last-col">
-					<li>Digital audio out</li>
-					<li>Hardware accelerated video capable of displaying content at 1080p<sup><a href="#fn3" id="r3">3</a></sup></li>
-					<li>Network connectivity: Gigabit Ethernet &amp; Wireless b/g/n</li>
-					<li>USB host support</li>
-					<li>Bluetooth HCI interface</li>
-					<li>Modular tuner for broadcast TV (satellite, cable, terrestrial)</li>
-				</ul>
-				
+				<div class="combined-list">
+					<ul class="list-ubuntu six-col">
+						<li>Support for ARM and x86 boards<sup><a href="#fn1" id="r1">1</a></sup></li>
+						<li>Local storage support for DVR functionality<sup><a href="#fn2" id="r2">2</a></sup></li>
+						<li>Minimum disk space: 2GB</li>
+						<li>Minimum memory: 1GB</li>
+						<li>Minimum video memory: 512 MB</li>
+						<li>HDMI</li>
+						<li class="last-item">CEC support</li>
+					</ul>
+
+					<ul class="list-ubuntu six-col last-col">
+						<li>Digital audio out</li>
+						<li>Hardware accelerated video capable of displaying content at 1080p<sup><a href="#fn3" id="r3">3</a></sup></li>
+						<li>Network connectivity: Gigabit Ethernet &amp; Wireless b/g/n</li>
+						<li>USB host support</li>
+						<li>Bluetooth HCI interface</li>
+						<li class="last-item">Modular tuner for broadcast TV (satellite, cable, terrestrial)</li>
+					</ul>
+				</div>
+
 				<div class="twelve-col no-bulletsd smaller">
 					<p id="fn1"><a href="#r1">1.</a> A list of supported boards can be provided</p>
 					<p id="fn2"><a href="#r2">2.</a> Solid-state storage recommended</p>
diff --git a/templates/tv/index.html b/templates/tv/index.html
old mode 100644
new mode 100755
index ebae171a9e1..5cde973e83d
--- a/templates/tv/index.html
+++ b/templates/tv/index.html
@@ -12,15 +12,17 @@
 	<h1>TV for human beings</h1>
 </div>
 
-<div class="row row-grey row-hero">
+<div class="row row-grey">
 	<div class="intro four-col">
 		<h2>Everything you want in a TV.</h2>
 		<h2>In a TV.</h2>
 	</div>
 	<div class="eight-col last-col">
-		<iframe width="600" height="365" src="http://www.youtube.com/embed/jq_WaOLjdyQ?showinfo=0&amp;hd=1&amp;rel=0&amp;modestbranding=0"></iframe>
+		<div class="video-container">
+			<iframe width="600" height="365" src="//www.youtube.com/embed/jq_WaOLjdyQ?showinfo=0&amp;hd=1&amp;rel=0&amp;modestbranding=0"></iframe>
+		</div>
 	</div>
-	<ul class="twelve-col feature-list-four no-bullets">
+	<ul class="twelve-col feature-list-four no-bullets no-margin-bottom">
 		<li class="six-col box">Easy integration of broadcast, online services and applications.</li>
 		<li class="six-col box last-col">Modern broadcast TV experience &ndash; search , watch, record and play.</li>
 		<li class="six-col box">Millions of movies and TV shows streamed over the web on demand.</li>
@@ -29,21 +31,23 @@ <h2>In a TV.</h2>
 </div><!-- /.row -->
 
 <div class="row">
+	<div class="twelve-col no-margin-bottom">
 		<h2>Experience beautiful simplicity</h2>
-		<p>One interface, one device and one remote. And, of course, Ubuntu One.</p>
-		<p><a href="/tv/experience">Learn more about the experience &rsaquo;</a></p>
-	<p><img src="{{ STATIC_URL }}img/devices/screenshot-tv-homepage-wide-image-900x334.jpg" class="left touch-border" alt="Ubuntu TV's featured movie window" width="900" height="334" /></p>
+		<p>One interface, one device and one remote.</p>
+		<p><a href="/tv/experience">Learn more about the experience&nbsp;&rsaquo;</a></p>
+		<p><img src="{{ STATIC_URL }}img/devices/screenshot-tv-homepage-wide-image-900x334.jpg" class="left touch-border" alt="Ubuntu TV's featured movie window" width="900" height="334" /></p>
+	</div>
 </div><!-- /.row -->
-	
+
 <div class="row no-border">
 		<h2>See the features</h2>
 		<p>Everything from broadcast and web streaming to PVR and personal cloud.</p>
-		<p><a href="/tv/features-and-specs">See the full list of features &rsaquo;</a></p>
+		<p><a href="/tv/features-and-specs">See the full list of features&nbsp;&rsaquo;</a></p>
 
-		<ul class="no-bullets">
-			<li class="four-col"><img src="{{ STATIC_URL }}img/devices/photo-tv-features-screen-1-282x220.jpg" alt="Ubuntu TV watch or record functionality" /></li>
+		<ul class="no-bullets no-margin-bottom">
+			<li class="four-col"><img src="{{ STATIC_URL }}img/devices/photo-tv-features-screen-1-282x220.jpg" alt="Ubuntu TV watch or record functionality" class="priority-0" /></li>
 			<li class="four-col"><img src="{{ STATIC_URL }}img/devices/photo-tv-features-screen-2-282x220.jpg" alt="Ubuntu TV view trailer, rent or buy film functionality" /></li>
-			<li class="four-col last-col"><img src="{{ STATIC_URL }}img/devices/photo-tv-features-screen-3-282x220.jpg" alt="Ubuntu TV recorded movies and programs window" /></li>
+			<li class="four-col last-col"><img src="{{ STATIC_URL }}img/devices/photo-tv-features-screen-3-282x220.jpg" alt="Ubuntu TV recorded movies and programs window" class="priority-0" /></li>
 		</ul>
 </div><!-- /.row -->
 	{% endblock content %}
\ No newline at end of file
diff --git a/templates/tv/industry.html b/templates/tv/industry.html
old mode 100644
new mode 100755
index 8f9099e62c1..435649d42ea
--- a/templates/tv/industry.html
+++ b/templates/tv/industry.html
@@ -11,7 +11,7 @@
 	<h1>Made for the TV industry</h1>
 	<div class="eight-col">
 		<p class="intro">Ubuntu TV is a turn-key OS for the next generation of connected televisions, bridging the gap between manufacturers and the content industry.</p>
-		<p>The company behind it, Canonical, has been working with OEMs and ODMs for years, serving an Ubuntu user base that&rsquo;s millions strong. We understand the complex challenges of product development, manufacturing, content licensing and distribution. <a href="/phone/backed-by-canonical">Learn more about Canonical &rsaquo;</a></p>
+		<p>The company behind it, Canonical, has been working with OEMs and ODMs for years, serving an Ubuntu user base that&rsquo;s millions strong. We understand the complex challenges of product development, manufacturing, content licensing and distribution. <a href="/partners/backed-by-canonical">Learn more about Canonical&nbsp;&rsaquo;</a></p>
 	</div><!-- /.eight-col -->
 </div><!-- / .row -->
 
@@ -22,10 +22,10 @@ <h2>The smart solution for TV makers</h2>
 		<p>Post-sale revenue and long-term customer relationships are clearly vital for TV makers. Yet for a specialised, hardware-oriented industry facing tightening margins, they bring complexity &mdash; managing software, managing regional content distribution and managing network services are challenging. By partnering with Canonical, you can move faster into a world defined by the quality of online services, rich content, software updates, device security and developer ecosystems.</p>
 		<p>Our focus on design and user experience means that everything built with Ubuntu is as user-friendly as it is attractive. And our expertise in delivering updates to systems in the field means consumer relationships can be nurtured, while the security of the platform is maintained.</p>
 	</div><!-- /.seven-col -->
-	<div class="four-col prepend-one last-col">
-		<p class="pull-quote">
-			&ldquo;Everything built with Ubuntu is as user-friendly as it is attractive.&rdquo;
-		</p>
+	<div class="four-col prepend-one last-col priority-0">
+		<blockquote class="pull-quote">
+			<p><span>&ldquo;</span>Everything built with Ubuntu is as user-friendly as it is attractive. <span>&rdquo;</span></p>
+		</blockquote>
 	</div><!-- /.four-col -->
 </div><!-- / .row -->
 
@@ -36,10 +36,10 @@ <h2>The smart solution for content providers</h2>
 		<p>The next generation of televisions are likely to bypass set-top offerings entirely, in favour of fully integrated content services. So while many content providers want to control the media pipeline from the internet to the user &mdash; to the extent of becoming ISPs in their own right &mdash; it might not matter for much longer. Unless you’re in the TV, you won’t be visible to the customer.</p>
 		<p>Ubuntu TV bridges the gap between content providers and television manufacturers, enabling both to deliver tightly integrated, holistic home theatre experiences. It ensures that content providers do not have an impossible matrix of screen vendors to engage with, and that TV makers do not have an impossible range of SKUs to manage.</p>
 	</div><!-- /.seven-col -->
-	<div class="four-col prepend-one last-col">
-		<p class="pull-quote">
-			&ldquo;Deliver tightly integrated, holistic home theatre experiences.&rdquo;
-		</p>
+	<div class="four-col prepend-one last-col priority-0">
+		<blockquote class="pull-quote">
+			<p><span>&ldquo;</span>Deliver tightly integrated, holistic home theatre experiences. <span>&rdquo;</span></p>
+		</blockquote>
 	</div><!-- /.four-col -->
 </div><!-- / .row -->
 
@@ -48,13 +48,12 @@ <h2>Our platform. Your apps and services.</h2>
 	<div class="seven-col">
 		<p>Ubuntu’s open platform means you can integrate your own applications and services. You can build on the standard television applications in Ubuntu, or add your own.</p>
 		<p>Ubuntu’s established developer platform is well understood in the embedded and consumer software industry. Add the widespread adoption of cross-platform HTML5 toolkits, and you have a healthy market for software on Ubuntu devices &mdash; reducing cost and improving time to market for software enhancements to your television.</p>
-		<p>Ubuntu One, our services framework, helps you offer compelling services along with your own hardware, and even to customers in the broader Ubuntu ecosystem, on hardware from third parties.</p>
-		<p>We know you need a services framework that can be shared between industry players, creating an ecosystem larger than any one brand. So although the Ubuntu One services framework can’t be white-labelled, it can be extended with services specific to partners. Revenue for long-term services is shared, ensuring that our mutual interests in the quality of customer experience are aligned.</p>
+		<p>We know you need a services framework that can be shared between industry players, creating an ecosystem larger than any one brand. So although the Ubuntu One services framework can&rsquo;t be white-labelled, it can be extended with services specific to partners. Revenue for long-term services is shared, ensuring that our mutual interests in the quality of customer experience are aligned.</p>
 	</div><!-- /.seven-col -->
-	<div class="four-col prepend-one last-col">
-		<p class="pull-quote">
-			&ldquo;A services framework that can be shared between industry players, creating an ecosystem larger than any one brand.&rdquo;
-		</p>
+	<div class="four-col prepend-one last-col priority-0">
+		<blockquote class="pull-quote">
+			<p><span>&ldquo;</span>A services framework that can be shared between industry players, creating an ecosystem larger than any one brand. <span>&rdquo;</span></p>
+		</blockquote>
 	</div><!-- /.four-col -->
 </div><!-- / .row -->
 
@@ -67,7 +66,7 @@ <h2>A whole world of applications</h2>
 </div><!-- /.row -->
 
 <div class="row">
-	<h2>Ubuntu on every device, elegantly</h2>	
+	<h2>Ubuntu on every device, elegantly</h2>
 	<div class="six-col">
 		<p>Ubuntu TV joins the Ubuntu Desktop in the range of form factors that make up the connected lifestyle.</p>
 		<p>We’ve designed solutions for all major device categories: desktops, phones, tablets and televisions. Our services framework and core operating system &mdash; widely understood by developers &mdash; are consistent across the range, representing a single, open platform. Only the user experience for each form factor, characterised by the Unity interface, is adapted specifically for that device. This makes Ubuntu especially practical for manufacturers in many product categories.</p>
@@ -85,10 +84,10 @@ <h2>Plays well with Windows. And iOS. And Android.</h2>
 		<p>The home network connects multiple devices running a wide range of operating systems. Phones, PCs and TVs all generate and share information. But thanks to Ubuntu One, the services framework in the Ubuntu platform, the Ubuntu TV can stream content with any other device, whether it runs Windows, iOS or Android.</p>
 		<p>Ubuntu devices can be updated at any time, so services can be enhanced throughout a device’s lifetime. Compatibility with new protocols, platforms and device categories can be added as and when they are needed. The goal is constant enhancement and improvement to the customer experience with Ubuntu devices &mdash; your devices &mdash; and long term value in our relationships together and with the consumer.</p>
 	</div><!-- /.seven-col -->
-	<div class="four-col prepend-one last-col">
-		<p class="pull-quote">
-			&ldquo;Ubuntu TV can stream content with any other device, whether it runs Windows, iOS or Android&rdquo;
-		</p>
+	<div class="four-col prepend-one last-col priority-0">
+		<blockquote class="pull-quote">
+			<p><span>&ldquo;</span>Ubuntu TV can stream content with any other device, whether it runs Windows, iOS or Android <span>&rdquo;</span></p>
+		</blockquote>
 	</div><!-- /.four-col -->
 </div><!-- / .row -->
 
@@ -97,12 +96,12 @@ <h2>All the goodness of Ubuntu</h2>
 	<div class="seven-col">
 		<p>Ubuntu is the world’s favourite free software desktop. From the cloud to consumer electronics, it’s the trusted OS.</p>
 		<p>Developers love the Ubuntu Desktop because it includes lifetime security updates and is released with updated components every six months. Industry loves the amazing hardware compatibility that ensures Ubuntu runs on virtually any x86 or ARM device.</p>
-		<p>Ubuntu is the leading open Linux on ARM, for both servers and consumer electronics. Canonical leads the global ARM Linux ecosystem, especially in Taipei, where ARM is a game changer in the traditional PC and server market. All over the world, <a href="/phone/backed-by-canonical">Canonical expertise</a> helps our partners get new products to market.</p>
+		<p>Ubuntu is the leading open Linux on ARM, for both servers and consumer electronics. Canonical leads the global ARM Linux ecosystem, especially in Taipei, where ARM is a game changer in the traditional PC and server market. All over the world, <a href="/partners/backed-by-canonical">Canonical expertise</a> helps our partners get new products to market.</p>
 	</div><!-- /.seven-col -->
-	<div class="four-col prepend-one last-col">
-		<p class="pull-quote">
-			&ldquo;All over the world, Canonical expertise helps our partners get new products to market&rdquo;
-		</p>
+	<div class="four-col prepend-one last-col priority-0">
+		<blockquote class="pull-quote">
+			<p><span>&ldquo;</span>All over the world, Canonical expertise helps our partners get new products to market <span>&rdquo;</span></p>
+		</blockquote>
 	</div><!-- /.four-col -->
 </div><!-- / .row -->
 
diff --git a/templates/tv/shared/_contextual_footer.html b/templates/tv/shared/_contextual_footer.html
old mode 100644
new mode 100755
index e7a536fd1e7..bbeb787a1cf
--- a/templates/tv/shared/_contextual_footer.html
+++ b/templates/tv/shared/_contextual_footer.html
@@ -1,9 +1,9 @@
 	<div class="feature-two four-col">
 		<h3>Start building now</h3>
 		<p>The commercial and technical lowdown, for executives and engineers.</p>
-		<p><a href="/phone/backed-by-canonical">Learn more about building with us&nbsp;&rsaquo;</a></p>
+		<p><a href="/partners/backed-by-canonical">Learn more about building with us&nbsp;&rsaquo;</a></p>
 	</div>
-	<div class="feature-four three-col last-col">
+	<div class="feature-four four-col last-col">
 		<h3>Further reading</h3>
 		{% include "templates/_further_reading_links.html" %}
 	</div>
diff --git a/templates/ua-assurance-terms/_nav_secondary.html b/templates/ua-assurance-terms/_nav_secondary.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/templates/ua-assurance-terms/index.html b/templates/ua-assurance-terms/index.html
deleted file mode 100644
index 79659e567ab..00000000000
--- a/templates/ua-assurance-terms/index.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% extends "templates/one-column.html" %}
-
-{% block title %}Ubuntu Advantage Assurance terms{% endblock %}
-
-{% block content %}
-<div class="row row-hero no-border">
-		<h1>Ubuntu Advantage Assurance terms</h1>
-		
-		<h2>Protecting your business from IP infringement</h2>
-		<p>The Ubuntu Assurance Programme from Canonical covers Canonical support customers for claims of intellectual property infringements arising from their use of Ubuntu. The Ubuntu Assurance is included in all Canonical support contracts. This offering is designed to safeguard Canonical's customers and make deploying Ubuntu even easier through an indemnification offering from Canonical.</p>
-		
-		<h2>Our assurances</h2>
-		<p>Throughout the open source world, all possible care is taken to respect intellectual property rights. In the unlikely event of an intellectual property issue in Ubuntu, Canonical will replace or modify the infringing portion of the software so that it becomes non-infringing, or obtain the rights for our support customers to continue using the software.</p>
-		
-		<h2>Indemnification</h2>
-		<p>In order to allow our support customers to deploy Ubuntu without complicated legal concerns, Canonical will assume the legal defence, pay all legal defence costs, and pay any resulting damages judgement or settlement, for any claim brought against our support customers worldwide by any third party for alleged infringement of patents, copyrights, trademarks, or trade secrets due to our support customer's use of the Ubuntu software during the term of their support services contract.</p>
-		<p>This indemnification is not applicable to users of Ubuntu who do not have a specific agreement in place with Canonical or a Canonical authorised reseller covering their purchase of support for Ubuntu.</p>
-		<p>Aggregate defence costs and indemnity payments made to or on behalf of customers spending greater than 15,000 USD shall be the lesser of $2.0 million or 200% of the customer's aggregate spending with Canonical in the 12 months preceding the date a claim is first brought against such customer. For customers spending below 15,000 USD the aggregate defense costs and indemnity payments will be capped at 100% of the customer's aggregate spending with Canonical in the 12 months preceding the date a claim is first brought against such customer.</p>
-		<p>If Canonical believes, or it is determined through adjudication, that any part of the software as distributed to a support customer by Canonical violates a third party&rsquo;s intellectual property rights, Canonical will provide such customer with a functionally equivalent non-infringing substitute at no cost, or refund 100% of payments made to Canonical for services and support in the preceding 12 months.</p>
-		<p>Qualification for the Assurance Programme is conditioned on the customer meeting the following eligibility requirements.</p>
-		
-		<h2>Eligibility requirements</h2>
-		<p>The customer must be a current Canonical support customer with an account in good standing at the time of the claim of infringement.</p>
-
-		<p>The customer must maintain at least the same level of Canonical services and support as that customer had in place at the time a claim is brought, while that claim is pending. The customer must notify Canonical in writing within five days of receiving notice of a claim, must allow Canonical to assume sole control of the defence and any settlement negotiations, and must provide Canonical all the information, authority, and ongoing assistance it needs to effectively defend or settle the claim.</p>
-
-		<p>The customer must not already be in litigation with, or have received notice of alleged infringement from, a party against whom indemnification is sought when purchasing a support agreement from Canonical. Indemnification will not cover counter-claims brought against a customer in response to litigation initiated by the customer. Indemnification will not cover punitive damages for willful or intentional acts of the customer.</p>
-
-		<p>The customer may not modify the software provided by Canonical.</p>
-
-		<p>If at any time Canonical offers to provide the customer with an updated version of the software modified to reduce or eliminate the likelihood of infringement of third-party rights (a &ldquo;non-infringing substitute&rdquo;), the customer must implement the new version, and cease all use of previous version(s), within thirty days of receiving notice from Canonical of the new version&rsquo;s availability.</p>
-</div><!-- / .row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/ua-dell-tc/_nav_secondary.html b/templates/ua-dell-tc/_nav_secondary.html
old mode 100644
new mode 100755
diff --git a/templates/ua-dell-tc/index.html b/templates/ua-dell-tc/index.html
old mode 100644
new mode 100755
index 0007b64c3e8..23f0d41fbe1
--- a/templates/ua-dell-tc/index.html
+++ b/templates/ua-dell-tc/index.html
@@ -1,14 +1,14 @@
 {% extends "templates/one-column.html" %}
 
-{% block title %}Dell Ubuntu Advantage Reseller End User Terms{% endblock %}
+{% block title %}Dell Ubuntu Advantage Reseller end user terms{% endblock %}
 
 {% block content %}
 <div class="row row-hero no-border">
-		<h1>Dell Ubuntu Advantage Reseller End User Terms</h1>
-		<h2>AGREEMENT TERMS</h2>
+		<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>
 
-		<h3>BACKGROUND</h3>
+		<h3>Background</h3>
 		<p>A. Canonical is the commercial sponsor of the Ubuntu operating system and Customer is an end user of one or more versions of the Ubuntu operating system.</p>
 		<p>B. Customer wishes to purchase Services, directly from Canonical or through a Canonical Reseller.</p>
 		<p>C. Canonical will perform the Services for Customer, either directly or through a Canonical Reseller or other third party service provider, and Customer will pay Fees pursuant to this Agreement.</p>
@@ -37,20 +37,20 @@ <h3>BACKGROUND</h3>
 			</ul>
 		<h4>(2) Services</h4>
 		<p>(a) Subject to this Agreement and in consideration of Customer&#39;s payment in full of the applicable Fees, Canonical shall provide, or cause its Reseller or other service provider to provide the Services on Canonical&#39;s behalf during the Term.  Canonical will deliver the Services using reasonable skill and care and through suitably qualified Personnel.</p>
-		<h4>(3) Licences and Intellectual Property</h4>
+		<h4>(3) Licences and intellectual property</h4>
 		<p>(a) Subject to this Agreement, Customer&#39;s compliance with the Canonical Trade Mark Policy, and in consideration of Customer&#39;s payment of the Fees, Canonical grants to the Customer, for the Term, a worldwide, non-exclusive licence to use the Licensed Trade Marks solely in association with Ubuntu on the Customer Hardware.</p>
 		<p>(b) Any and all Intellectual Property Rights developed or created by or on behalf of a Party shall be owned solely by the Party that developed or created such Intellectual Property Rights. For example, any Intellectual Property Rights created by Canonical in the provision of the Services shall remain the property of Canonical.</p>
 		<p>(c) Customer shall comply with all applicable software licences, including without limitation licences for Open Source Software provided by Canonical in the provision of the Services and in Ubuntu.</p>
 		<p>(d) Canonical shall comply with the licence terms of all Customer Software provided to it by Customer, where such software is noted in the relevant Supplement Agreement and the licence terms are attached thereto.</p>
-		<h4>(4) Customer Responsibilities</h4>
+		<h4>(4) Customer responsibilities</h4>
 		<p>(a) Customer may use the Services only in connection with the Customer Hardware and only during the Term.  Customer shall not use the Services to manage additional or different equipment without the prior written consent of Canonical.  Customer may not resell the Services.</p>
 		<p>(b) Where any information or action on the part of the Customer or its representatives is required by the Canonical Group to enable Canonical to provide the Services, Customer and/or its representatives shall, at its own expense, provide such information and assistance (including access to Customer&#39;s Personnel) in a timely manner.</p>
 		<p>(c) Customer shall be responsible for ensuring back-up of all data and software and Canonical shall not be liable for any loss of data or software or corruption to or damage of data or software.</p>
 		<p>(d) Customer has and will for the Term maintain sufficient rights and licences in any applicable Customer Software to allow the Canonical Group to perform the Services either in its original form or as modified by Customer in accordance with this Agreement and without any member of the Canonical Group being in breach of either Customer or any third party&#39;s rights.</p>
 		<p>(e) Customer is responsible for the maintenance and support of any software or services other than Ubuntu or Canonical provided software or services, including Customer Software, any local repositories and any system connectivity.  Canonical shall have no responsibility for the maintenance or support of these, and shall have no liability for any failure to deliver the Services which results from Customer&#39;s failure to procure appropriate support for software or services other than Ubuntu or Canonical provided software or services.</p>
-		<h4>(5) Service Specific Terms</h4>
+		<h4>(5) Service specific terms</h4>
 		<p>(a) With respect to Services which include access to online services provided by Canonical such as Canonical&#39;s "Hosted Landscape" Service or support portal, the Customer shall not: allow any unauthorized access to the Services; or tamper with the Services or insert any data or information into the Services, which may affect the Services, cause any damage to Canonical or third parties, or be unlawful.</p>
-		<h4>(6) Confidentiality and Data Protection</h4>
+		<h4>(6) Confidentiality and data protection</h4>
 		<p>(a) Each Party shall and shall cause its officers, Personnel and agents to keep secret and confidential all Confidential Information of the other and shall 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 Canonical may disclose Customer Confidential Information within the Canonical Group, including to the officers, Personnel and agents of the Canonical Group.</p>
 		<p>(b) The obligation of confidence shall 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.</p>
 		<p>(c) Each Party shall give the other prompt written notice of any disclosure of the party&#39;s Confidential Information as required by operation of law.</p>
@@ -62,16 +62,16 @@ <h4>(7) Fees, Payment and Expenses</h4>
 		<p>(d) Customer shall, for a period of 6 years following their creation, keep complete books and records containing all data reasonably required for verification of all amounts payable hereunder and shall permit Canonical and its duly authorised representatives to inspect, audit and take copies of such books and records.  If any such audit discloses a payment shortfall, Customer shall make full payment of the shortfall, together with interest calculated in accordance with Clause 7.5, within thirty (30) days of the date of Canonical&#39;s invoice, and if the shortfall exceeded by 5% or more the payment due in the period covered by the audit, Customer shall reimburse Canonical for the reasonable costs of the audit.</p>
 		<p>(e) Canonical may charge interest on any past due payment amounts, plus any related collection and legal costs.  Such interest shall accrue on a daily basis at the annual rate of 2% above the base rate of Barclays Bank <span class="caps">PLC </span>in force from the due date until the date of payment, or the highest rate allowable by applicable law (if lower), whether before or after judgement.</p>
 		<p>(f) With respect to any Services performed at Customer&#39;s site, Customer shall reimburse Canonical for all travel-related expenses including transportation, lodging, and meal expenses.  Expenses shall be determined based on Canonical&#39;s standard travel policy.</p>
-		<h4>(8) Warranty Disclaimer</h4>
+		<h4>(8) Warranty disclaimer</h4>
 		<p>(a) <span class="caps">NEITHER PARTY MAKES ANY REPRESENTATIONS</span> OR <span class="caps">WARRANTIES</span> OF <span class="caps">ANY KIND, WHETHER ORAL</span> OR <span class="caps">WRITTEN, WHETHER EXPRESS, IMPLIED,</span> OR <span class="caps">ARISING</span> BY <span class="caps">STATUTE, CUSTOM, COURSE</span> OF <span class="caps">DEALING</span> OR <span class="caps">TRADE USAGE, WITH RESPECT</span> TO <span class="caps">THE SUBJECT MATTER HEREOF</span> OR <span class="caps">OTHERWISE</span> IN <span class="caps">CONNECTION WITH THIS AGREEMENT</span> OR <span class="caps">ANY SUPPLEMENT AGREEMENT.  EACH PARTY SPECIFICALLY DISCLAIMS ANY AND ALL IMPLIED WARRANTIES</span> OR <span class="caps">CONDITIONS</span> OF <span class="caps">TITLE, SATISFACTORY QUALITY, MERCHANTABILITY, SATISFACTORINESS, FITNESS FOR</span> A <span class="caps">PARTICULAR PURPOSE AND NON</span>-INFRINGEMENT.</p>
-		<h4>(9) Ubuntu Assurance</h4>
+		<h4>(9) Ubuntu assurance</h4>
 		<p>(a) Customer is entitled to participate in the Ubuntu Assurance Programme in place from time to time, subject to the terms and conditions thereof.  If Customer is purchasing the Services through a Canonical Reseller, Canonical&#39;s liability caps in the Ubuntu Assurance Programme will be based on Canonical&#39;s list prices for the Services rather than the Fees.</p>
 		<p>(b) Should any third party claim that Customer&#39;s use of Ubuntu and/or Canonical&#39;s provision of the Services infringes the Intellectual Property Rights of that third party, Customer shall immediately notify Canonical and cease to use the affected parts of Ubuntu and/or Canonical may suspend provision of the affected parts of the Services. At Canonical&#39;s request, the Customer shall permit Canonical to have sole conduct of the claim and shall provide all assistance reasonably requested by Canonical to defend the claim. Canonical may, at its sole option and as Customer&#39;s sole and exclusive remedy: procure a right to enable it to continue performance of the affected Services or for the Customer to utilise the affected parts of Ubuntu; provide replacement software that is non-infringing or alter the Services so that the infringement is avoided.</p>
-		<h4>(10) Liability Limitations</h4>
+		<h4>(10) Liability limitations</h4>
 		<p>(a) <span class="caps">SUBJECT</span> TO <span class="caps">CLAUSES</span> 10.2 <span class="caps">AND</span> 10.3, <span class="caps">AND EXCEPT</span> IN <span class="caps">THE CASE</span> OF A <span class="caps">BREACH</span> OF <span class="caps">THE CONFIDENTIALITY PROVISIONS HEREIN, EACH PARTY</span>&#39;S <span class="caps">AGGREGATE LIABILITY</span> TO <span class="caps">THE OTHER</span> OR <span class="caps">ANY THIRD PARTY FOR ALL CLAIMS ARISING OUT</span> OF OR IN <span class="caps">CONNECTION WITH</span> A <span class="caps">SUPPLEMENT AGREEMENT</span> OR <span class="caps">ANY COLLATERAL CONTRACT THERETO</span> OR <span class="caps">OUT</span> OF <span class="caps">THE PRODUCTION, SALE, SUPPLY</span> OR <span class="caps">USE</span> OF <span class="caps">UBUNTU</span> OR <span class="caps">SERVICES THEREUNDER, WHETHER BASED UPON CONTRACT, TORT </span>(INCLUDING <span class="caps">NEGLIGENCE</span>) OR <span class="caps">OTHERWISE, SHALL NOT EXCEED </span>(I) IF <span class="caps">THE SERVICES ARE PURCHASED DIRECTLY FROM CANONICAL, THE ACTUAL AMOUNT</span> OF <span class="caps">FEES PAID</span> OR <span class="caps">PAYABLE</span> BY <span class="caps">THE CUSTOMER</span> TO <span class="caps">CANONICAL DURING THE PRECEDING</span> 12 <span class="caps">MONTHS,</span> OR (II) IF <span class="caps">THE SERVICES ARE PURCHASED THROUGH CANONICAL</span>&#39;S <span class="caps">RESELLER, CANONICAL</span>&#39;S <span class="caps">LIST PRICE FOR</span> 12 <span class="caps">MONTHS</span> OF <span class="caps">THE SERVICES.</span></p>
 		<p>(b) <span class="caps">SUBJECT</span> TO <span class="caps">CLAUSE</span> 10.3, <span class="caps">AND EXCEPT</span> IN <span class="caps">THE CASE</span> OF A <span class="caps">BREACH</span> OF <span class="caps">THE CONFIDENTIALITY PROVISIONS HEREIN,</span> IN NO <span class="caps">EVENT SHALL EITHER PARTY</span> BE <span class="caps">LIABLE</span> TO <span class="caps">THE OTHER</span> OR <span class="caps">ANY THIRD PARTY FOR ANY INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE,</span> OR <span class="caps">CONSEQUENTIAL LOSS</span> OR <span class="caps">DAMAGE</span> OR <span class="caps">FOR ANY LOSS</span> OF OR <span class="caps">DAMAGE</span> TO <span class="caps">DATA,</span> EX <span class="caps">GRATIA PAYMENTS, DIRECT</span> OR <span class="caps">INDIRECT LOSS</span> OF <span class="caps">PROFIT, LOSS</span> OF <span class="caps">CONTRACT</span> OR <span class="caps">LOSS</span> OF <span class="caps">OTHER ECONOMIC ADVANTAGE </span>(IN <span class="caps">EACH CASE WHETHER DIRECT</span> OR <span class="caps">INDIRECT</span>) <span class="caps">HOWSOEVER ARISING OUT</span> OF OR IN <span class="caps">CONNECTION WITH THIS AGREEMENT</span> OR <span class="caps">ANY COLLATERAL CONTRACT,</span> OR <span class="caps">THE PRODUCTION, SALE, SUPPLY</span> OR <span class="caps">USE </span>(BY <span class="caps">CANONICAL, THE CUSTOMER</span> OR <span class="caps">ANY THIRD PARTY</span>) OF <span class="caps">UBUNTU</span> OR <span class="caps">SERVICES PROVIDED UNDER THIS AGREEMENT, EVEN</span> IF <span class="caps">THAT PARTY HAS PREVIOUSLY BEEN ADVISED</span> OF <span class="caps">THE POSSIBILITY</span> OF <span class="caps">THE SAME AND WHETHER FORESEEABLE</span> OR <span class="caps">NOT. THESE LIMITATIONS SHALL APPLY NOTWITHSTANDING ANY FAILURE</span> OF <span class="caps">ESSENTIAL PURPOSE</span> OF <span class="caps">ANY LIMITED REMEDY. FOR THE AVOIDANCE</span> OF <span class="caps">DOUBT THIS CLAUSE</span> 10.2 <span class="caps">SHALL NOT APPLY</span> IN <span class="caps">RELATION</span> TO <span class="caps">THE CUSTOMER</span>&#39;S <span class="caps">OBLIGATION</span> TO <span class="caps">PAY THE FEES.</span></p>
 		<p>(c) The Parties understand and agree that the limitations of liability set forth in this Clause 10 are a reasonable allocation of risk between the Parties, and, absent such allocation, Canonical would not have entered into this Agreement.  Nothing in this Agreement shall exclude or limit the liability of either Party for death or personal injury; any misrepresentation fraudulent or otherwise; or any other liability which it is not permitted to exclude or limit as a matter of applicable law.</p>
-		<h4>(11) Term and Termination</h4>
+		<h4>(11) Term and termination</h4>
 		<p>(a) This Agreement shall come into force on the date the Customer accepts its terms and conditions, either (i) by clicking the "Accept" or similar button, (ii) by signing this Agreement, or (iii) by signing or accepting an agreement that incorporates this Agreement by reference.  This Agreement shall continue for the Term, unless earlier terminated as provided in Clause 11.2.</p>
 		<p>(b) This Agreement may be terminated immediately by notice in writing if the other Party:</p>
 		<p>i) commits a material breach of this Agreement (including without limitation late payment) and, if such breach is capable of remedy, fails to remedy the breach within 14 days of receiving notice thereof;<br />
@@ -93,9 +93,9 @@ <h4>(13) General</h4>
 		<p>(i) Any notice required to be given or sent under this Agreement shall be in writing and either delivered personally or sent by first class registered post (or equivalent) to the registered office for the time being of the recipient.</p>
 		<p>(j) Canonical may provide copies of this Agreement in different languages for information purposes.  In the event of any conflict between the versions of this Agreement in different languages, the English language version of this Agreement shall prevail and shall be used in any court proceedings.</p>
 		<p>(k) Customer acknowledges that export laws and regulations of the United States and European territories may apply to Ubuntu and other materials delivered by Canonical under this Agreement. Customer agrees that such export control laws and regulations govern its use of Ubuntu and any such materials and shall comply with all such laws and regulations. Customer will not export, directly or indirectly, Ubuntu or any such materials in violation of these laws or regulations, nor will it use them for any purpose prohibited by these laws.</p>
-		<h4>(14) Governing Law</h4>
+		<h4>(14) Governing law</h4>
 		<p>(a) This Agreement shall be governed by and construed in accordance with the laws of England and the Parties hereby 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 shall not apply to this Agreement.</p>
-		<p><a href="{{ STATIC_URL }}files/dell-ua-reseller-end-user-terms.pdf" title="PDF of the Dell Ubuntu Advantage Reseller End User Terms">Download the pdf &rsaquo;</a></p>
+		<p><a href="{{ STATIC_URL }}files/dell-ua-reseller-end-user-terms.pdf" title="PDF of the Dell Ubuntu Advantage Reseller End User Terms">Download the pdf&nbsp;&rsaquo;</a></p>
 	</div>
 </div><!-- / .row -->
 {% endblock content %}
\ No newline at end of file
diff --git a/templates/ua-servicedescription/_nav_secondary.html b/templates/ua-servicedescription/_nav_secondary.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/templates/ua-servicedescription/index.html b/templates/ua-servicedescription/index.html
deleted file mode 100644
index 2f6c692be98..00000000000
--- a/templates/ua-servicedescription/index.html
+++ /dev/null
@@ -1,1670 +0,0 @@
-{% extends "templates/one-column.html" %}
-
-{% block title %}Ubuntu Advantage Service Description{% endblock %}
-
-{% block content %}
-<div class="row row-hero no-border">
-		<h1>Ubuntu Advantage Service Description</h1>
-		<h2>1 Overview</h2>
-		<p>This service description defines the Services Canonical will provide to the customer under the customer&#39;s agreement with Canonical. This service description defines the following products, but only those products listed in Customer&#39;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, Cloud Availability Zone, Cloud Availability Zone - Advanced 24&#215;7 Guest Support Upgrade, Landscape Dedicated Server, Landscape Agent, Ubuntu Advantage Ceph Storage Standard, Ubuntu Advantage Ceph Storage Advanced, Ubuntu Advantage Technical Account Manager, and Ubuntu Advantage Dedicated Services Engineer.</p>
-		<h2>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&#39;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&#39;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>
-		<h4>Table of number of technical contacts</h4>
-		<table>
-		<tr>
-		<th>Ubuntu Advantage Subscription levels</th>
-		<th>Technical contacts</th>
-		</tr>
-		<tr>
-		<td>Essential</td>
-		<td>1</td>
-		</tr>
-		<tr>
-		<td>Standard</td>
-		<td>2</td>
-		</tr>
-		<tr>
-		<td>Advanced</td>
-		<td>3</td>
-		</tr>
-		</table>
-		<p>2.3 Customer may change the specific technical contacts at any time by written request.</p>
-		<h2>3 Systems management and monitoring</h2>
-		<p>3.1 Canonical will include its &#8220;Landscape&#8221; 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. The customer may register the customer&#39;s systems with Canonical&#39;s server at landscape.canonical.com and use the service to manage and monitor those systems.</p>
-		<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>
-		<h2>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&#39;s systems.</p>
-		<p>5.2 Canonical will provide a reasonable level of assistance to the customer to install Ubuntu on the customer&#39;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 &#8220;certified&#8221; systems.</p>
-		<p>5.3 Canonical will support the installation, applications and system administration of Ubuntu as described in the appendices to this service description.</p>
-		<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 workaround or a full resolution. Canonical does not guarantee a resolution or resolution time.</p>
-		<h2>6 Submitting support requests</h2>
-		<p>6.1 The customer may submit support requests (&#8220;cases&#8221;) through Canonical&#39;s support web portal or by contacting the support team by telephone.</p>
-		<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>
-		<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>
-		<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>
-		<p>6.5 There is no limit to the number of cases customer may submit for the customer&#39;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&#39;s support engineers.</p>
-		<h2>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>
-		<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>
-		<p>7.3 Canonical&#39;s support engineer will work on diagnosing and resolving the case during the effort period for the applicable severity level listed below.</p>
-		<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>
-		<h4>Server and Cloud Availability Zone response levels table</h4>
-		<table>
-		<tr>
-		<th>Severity Level</th>
-		<th>Effort Period</th>
-		<th>Response method</th>
-		<th>Essential Response Time</th>
-		<th>Standard Response Time</th>
-		<th>Advanced Response Time</th>
-		</tr>
-		<tr>
-		<td>Level 1</td>
-		<td>Continuous effort</td>
-		<td>Phone</td>
-		<td>4 business hours</td>
-		<td>2 business hours</td>
-		<td>1 hour</td>
-		</tr>
-		<tr>
-		<td>Level 2</td>
-		<td>Local business hours</td>
-		<td>Phone</td>
-		<td>1 business day</td>
-		<td>4 business hours</td>
-		<td>4 hours</td>
-		</tr>
-		<tr>
-		<td>Level 3</td>
-		<td>Local business hours</td>
-		<td>Online or phone</td>
-		<td>2 business days</td>
-		<td>1 business day</td>
-		<td>4 hours</td>
-		</tr>
-		<tr>
-		<td>Level 4</td>
-		<td>Local business hours</td>
-		<td>Online or phone</td>
-		<td>4 business days</td>
-		<td>2 business days</td>
-		<td>1 business day</td>
-		</tr>
-		</table>
-		<h4>Desktop response levels table</h4>
-		<table>
-		<tr>
-		<th>Severity Level</th>
-		<th>Effort Period</th>
-		<th>Response method</th>
-		<th>Standard Response Time</th>
-		<th>Advanced Response Time</th>
-		</tr>
-		<tr>
-		<td>Level 1</td>
-		<td>Continuous effort</td>
-		<td>Phone</td>
-		<td>2 business days</td>
-		<td>4 business hours</td>
-		</tr>
-		<tr>
-		<td>Level 2</td>
-		<td>Local business hours</td>
-		<td>Phone</td>
-		<td>2 business days</td>
-		<td>1 business day</td>
-		</tr>
-		<tr>
-		<td>Level 3</td>
-		<td>Local business hours</td>
-		<td>Online or phone</td>
-		<td>2 business days</td>
-		<td>2 business days</td>
-		</tr>
-		</table>
-		<h2>8 Support response definitions</h2>
-		<p>8.1 When setting the severity level, Canonical&#39;s support team will use the definitions, and carry out operational procedures as stated in the table below.</p>
-		<h4>Response definitions table</h4>
-		<table>
-		<tr>
-		<th>Severity</th>
-		<th>Definition</th>
-		<th>Responsibilities</th>
-		</tr>
-		<tr>
-		<td>Level 1</td>
-		<td>Core functionality not available.</td>
-		<td>Canonical will use continuous effort, through appropriate support engineer(s) and/or development engineer(s), to produce a workaround.As soon as core functionality is available, the severity level will be lowered to level 3.</td>
-		</tr>
-		<tr>
-		<td>Level 2</td>
-		<td>Core functionality severely degraded.</td>
-		<td>Canonical will use reasonable efforts during coverage hours to produce a work-around.The support engineer will aim to produce a work-around that is sufficient to adjust the priority level to level 3.</td>
-		</tr>
-		<tr>
-		<td>Level 3</td>
-		<td>Standard support request.</td>
-		<td>Canonical will use reasonable efforts during the coverage hours to provide the customer with a work-around as soon as possible balanced against higher severity level cases.After providing a work-around, Canonical&#39;s support engineers will work on developing a permanent resolution to the case.</td>
-		</tr>
-		<tr>
-		<td>Level 4</td>
-		<td>Non-urgent issues, including cosmetic issues, feature requests or information requests.</td>
-		<td>Canonical will review cosmetic issues and feature requests to determine whether it is a product enhancement for a future release.Canonical will review and respond to information requests with a reasonable level of effort during coverage hours.</td>
-		</tr>
-		</table>
-		<h2>9 Support coverage hours, languages</h2>
-		<p>9.1 Canonical will provide support during the following coverage hours:</p>
-		<h4>Hours of coverage table</h4>
-		<table>
-		<tr>
-		<th>Ubuntu Advantage Subscription</th>
-		<th>Hours</th>
-		<th>Days of coverage</th>
-		</tr>
-		<tr>
-		<td>Standard Desktop</td>
-		<td>Customer&#39;s selection - see next table</td>
-		<td>Monday - Friday</td>
-		</tr>
-		<tr>
-		<td>Advanced Desktop</td>
-		<td>Customer&#39;s selection - see next table</td>
-		<td>Monday - Friday</td>
-		</tr>
-		<tr>
-		<td>Essential Server</td>
-		<td>Customer&#39;s selection - see next table</td>
-		<td>Monday - Friday</td>
-		</tr>
-		<tr>
-		<td>Standard Server</td>
-		<td>Customer&#39;s selection - see next table</td>
-		<td>Monday - Friday</td>
-		</tr>
-		<tr>
-		<td>Advanced Server</td>
-		<td>24 hours a day</td>
-		<td>Monday - Sunday</td>
-		</tr>
-		<tr>
-		<td>Cloud Availability Zone</td>
-		<td>24 hours a day</td>
-		<td>Monday - Sunday</td>
-		</tr>
-		<tr>
-		<td>Landscape Dedicated Server</td>
-		<td>24 hours a day</td>
-		<td>Monday - Sunday</td>
-		</tr>
-		</table>
-		<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&#39;s location.</p>
-		<h4>Local business hours table</h4>
-		<table>
-		<tr>
-		<th>&nbsp;</th>
-		<th>North America</th>
-		<th>UK &amp;<br />Central Europe</th>
-		<th>Eastern Europe,<br />Middle East</th>
-		<th>Asia Pacific</th>
-		</tr>
-		<tr>
-		<td>Local Hours</td>
-		<td>09:00-21:00&nbsp;EST</td>
-		<td>08:00-17:00&nbsp;GMT<br />09:00-18:00&nbsp;CET</td>
-		<td>10:00-17:00&nbsp;MSK<br />09:00-17:00&nbsp;EET</td>
-		<td>09:00-18:00&nbsp;CST</td>
-		</tr>
-		<tr>
-		<td><span class="caps">UTC</span> Equivalent</td>
-		<td>12:00 - 05:00</td>
-		<td>08:00 - 17:00</td>
-		<td>06:00 - 15:00</td>
-		<td>01:00 - 10:00</td>
-		</tr>
-		</table>
-		<p>9.3 Customer support will be provided in one of the following languages: English, French or Chinese Mandarin.</p>
-		<h2>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>
-		<h4>Escalation contact table</h4>
-		<table>
-		<tr>
-		<th>Escalation level</th>
-		<th>Contact</th>
-		</tr>
-		<tr>
-		<td>Level 3</td>
-		<td>Support and Services Team +1 514 940 8895</td>
-		</tr>
-		<tr>
-		<td>Level 2</td>
-		<td>Support manager  <a href="mailto:%73%75%70%70%6F%72%74%2D%6D%61%6E%61%67%65%72%40%63%61%6E%6F%6E%69%63%61%6C%2E%63%6F%6D">support-manager@canonical.com</a> +1 514 940 8910</td>
-		</tr>
-		<tr>
-		<td>Level 1</td>
-		<td>Operations director  <a href="mailto:%6F%70%65%72%61%74%69%6F%6E%73%2D%64%69%72%65%63%74%6F%72%40%63%61%6E%6F%6E%69%63%61%6C%2E%63%6F%6D">operations-director@canonical.com</a></td>
-		</tr>
-		</table>
-		<h2>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  <a href="http://www.canonical.com/enterprise-services/ubuntu-advantage/assurance">www.canonical.com/enterprise-services/ubuntu-advantage/assurance</a>.</p>
-		<h2>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>
-		<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>
-		<h2>13 Cloud Availability Zone</h2>
-		<p>13.1 If the customer purchases the Cloud Availability Zone service, Canonical will provide the following for up to the number of cloud infrastructure nodes specified in the table below:</p>
-		<ul>
-		<li>24&#215;7 support for the Ubuntu Server components required to host an OpenStack cloud</li>
-		<li>Landscape management agents</li>
-		<li>Up to 64 TB of Ubuntu Advantage Ceph Advanced</li>
-		</ul>
-		<h4>Table of Cloud Availability Zone node number</h4>
-		<table>
-		<tr>
-		<th>Cloud Availability Zone size</th>
-		<th>Number of nodes</th>
-		</tr>
-		<tr>
-		<td>Small</td>
-		<td>Up to 100</td>
-		</tr>
-		<tr>
-		<td>Medium</td>
-		<td>Up to 500</td>
-		</tr>
-		<tr>
-		<td>Large</td>
-		<td>More than 500</td>
-		</tr>
-		</table>
-		<p>Canonical will provide Ubuntu Advantage Server Standard (but not including Landscape management) for an unlimited number of guests hosted on the infrastructure supported by the Cloud Availability Zone services.</p>
-		<p>13.2 If the customer purchases the Cloud Availability Zone - Advanced 24&#215;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>
-		<h2>14 Ceph Storage</h2>
-		<p>14.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>
-		<p>14.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>
-		<p>14.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>
-		<h2>15 Additional services</h2>
-		<h3>15.1 Technical Account Manager</h3>
-		<p>If the customer purchases the Technical Account Manager (&#8220;TAM&#8221;) service, Canonical will provide enhanced support by providing a named contact who personally collaborates with the customer&#39;s IT staff.</p>
-		<p>15.1.1 The <span class="caps">TAM </span>will provide installation, configuration, maintenance and management support for Ubuntu on the customer&#39;s systems covered by the applicable Ubuntu Advantage services.</p>
-		<p>15.1.2 The <span class="caps">TAM </span>will provide the services described below for up to 10 hours per week during the term of service. The customer may contact the <span class="caps">TAM </span>during applicable business hours.</p>
-		<p>15.1.3 The <span class="caps">TAM </span>will take part in regular review calls of the customer&#39;s operational issues on a mutually agreed biweekly schedule.</p>
-		<p>15.1.4 The <span class="caps">TAM </span>will visit the customer annually for on-site technical reviews.</p>
-		<p>15.1.5 the <span class="caps">TAM </span>will organise multi-vendor issue coordination through <span class="caps">TSAN</span>et or Canonical&#39;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>
-		<h4><span class="caps">TAM </span>response levels table</h4>
-		<table>
-		<tr>
-		<th>Severity Level</th>
-		<th>Effort Period</th>
-		<th>Response Method</th>
-		<th>Response Time</th>
-		</tr>
-		<tr>
-		<td>Level 1</td>
-		<td>Business day</td>
-		<td>Phone</td>
-		<td>1 hour</td>
-		</tr>
-		<tr>
-		<td>Level 2</td>
-		<td>Business day</td>
-		<td>Phone</td>
-		<td>4 hours</td>
-		</tr>
-		<tr>
-		<td>Level 3</td>
-		<td>Business day</td>
-		<td>Online or phone</td>
-		<td>4 hours</td>
-		</tr>
-		</table>
-		<p>15.1.6 Canonical will undertake a quarterly service review meeting with the customer to assess service performance and determine areas of improvement.</p>
-		<h3>15.2 Dedicated Services Engineer</h3>
-		<p>If the customer purchases the Dedicated Services Engineer (&#8220;DSE&#8221;) service, Canonical will provide enhanced support and on-site expertise by embedding a full time employee in the customer&#39;s IT staff.</p>
-		<p>15.2.1 Canonical will assign a Dedicated Services Engineer on-site at the customer&#39;s place of business.</p>
-		<p>15.2.2 The <span class="caps">DSE </span>will be available to the customer full time during local business hours.</p>
-		<p>15.2.3 The <span class="caps">DSE </span>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>
-		<p>15.2.4 The <span class="caps">DSE </span>will coordinate Ubuntu Advantage support at all the customer&#39;s sites. The <span class="caps">DSE </span>will manage support escalations and issue prioritization in accordance with Canonical&#39;s standard support response definitions.</p>
-		<h3>15.3 Landscape Dedicated Server</h3>
-		<p>15.3.1 Landscape Dedicated Server subscriptions provide the customer with the Landscape Dedicated Server software for the customer&#39;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>
-		<p>15.3.2 Ubuntu Advantage services include Canonical&#39;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>
-		<p>15.3.3 The customer will be required to provide their own server hardware in order to run the Landscape Dedicated Server software on the customer&#39;s premises. Canonical will provide the customer with recommendations for the hardware specifications and minimum requirements to run the Landscape Dedicated Server.</p>
-		<h3>15.4 Landscape Agent</h3>
-		<p>15.4.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>
-		<h2>Appendix 1 - Server support scope details</h2>
-		<p>Installation This covers all the aspects involved with installing and configuring Ubuntu Server, as well as the hosted Landscape service.</p>
-		<table>
-		<tr>
-		<th>Server installation scope</th>
-		<th>Description</th>
-		<th>Essential</th>
-		<th>Standard</th>
-		<th>Advanced</th>
-		</tr>
-		<tr>
-		<td>CD installation</td>
-		<td>
-		<ul>
-		<li>Install Ubuntu from a <span class="caps">CDROM </span>or <span class="caps">USB </span>drive</li>
-		</ul>
-		</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Disk/Volume Management</td>
-		<td>
-		<ul>
-		<li>Set-up <span class="caps">RAID </span>and <span class="caps">LVM </span>during installation</li>
-		<li>Assistance recovering</li>
-		<li>Debug and troubleshooting <span class="caps">RAID </span>issues</li>
-		</ul>
-		</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Hardware set-up</td>
-		<td>
-		<ul>
-		<li>Assessing hardware compatibility with Ubuntu</li>
-		<li>Choosing the 32 or 64 bit versions of Ubuntu</li>
-		<li>Configuring Ubuntu to use appropriate hardware</li>
-		<li>Optimising Ubuntu with certified or compatible hardware</li>
-		<li>Configuration of compatible peripherals</li>
-		</ul>
-		</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Landscape installation</td>
-		<td>
-		<ul>
-		<li>Installing Landscape service and set-up</li>
-		<li>Assistance registering systems on the Landscape service</li>
-		<li>Troubleshooting Landscape client or service problems</li>
-		</ul>
-		</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Networking</td>
-		<td>
-		<ul>
-		<li>Setting up wireless or wired network</li>
-		<li>Configuring dynamic or static network configuration</li>
-		<li>Setting up proxy settings in applications</li>
-		<li>Setting up interface aliases</li>
-		</ul>
-		</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Package and task selection</td>
-		<td>
-		<ul>
-		<li>Recommendation on the specific packages to install for a particular use</li>
-		<li>Recommendation on the specific task selection</li>
-		</ul>
-		</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Network and automated</td>
-		<td>
-		<ul>
-		<li>Install Ubuntu using a local <span class="caps">NFS </span>server</li>
-		<li>Install Ubuntu using a local <span class="caps">FTP </span>server</li>
-		</ul>
-		</td>
-		<td>No</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Windows Integration</td>
-		<td>
-		<ul>
-		<li>Support integration with Microsoft file/print and authentication environments such as Active Directory and Windows NT</li>
-		</ul>
-		</td>
-		<td>No</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		</table>
-		<h3>Applications</h3>
-		<p>This covers the various server configurations and included programs that are supported.</p>
-		<table>
-		<tr>
-		<th>Server applications scope</th>
-		<th>Description</th>
-		<th>Essential</th>
-		<th>Standard</th>
-		<th>Advanced</th>
-		</tr>
-		<tr>
-		<td>Certified applications</td>
-		<td>
-		<ul>
-		<li>Installation applications distributed through the Partner repository</li>
-		<li>Debugging issues that are caused by Ubuntu</li>
-		</ul>
-		<p><em>Note: The customer must have a valid support contract with the certified application&#39;s vendor for complex debugging</em></p></td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td><span class="caps">FTP </span>server</td>
-		<td>
-		<ul>
-		<li>Installing and configuring <span class="caps">FTP </span>server</li>
-		<li>Enabling anonymous access and group permissions</li>
-		<li>Configuring security for the service</li>
-		<li>Optimising the server for performance</li>
-		<li>Debugging and resolving issues that arise</li>
-		</ul>
-		</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>File sharing</td>
-		<td>
-		<ul>
-		<li>Installing file sharing for Windows machines (Samba) or Linux machines (NFS)</li>
-		<li>Help configuring the file sharing service for users and groups</li>
-		<li>Setting up Ubuntu Server to authorise from a Windows Network</li>
-		<li>Assistance setting up entitled desktops to access the file sharing server</li>
-		<li>Troubleshooting and resolving file sharing issues</li>
-		</ul>
-		</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td><span class="caps">LAMP</span></td>
-		<td>
-		<ul>
-		<li>Basic <span class="caps">LAMP </span>application support: Linux, Apache, MySQL <span class="caps">PHP</span>/Perl/Python</li>
-		</ul>
-		</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Mail server</td>
-		<td>
-		<ul>
-		<li>Installation and configuration of mail server</li>
-		<li>Assistance with anti-spam and anti-virus configuration</li>
-		<li>Setting up client security with <span class="caps">SSL</span>/TLS</li>
-		<li>Troubleshooting and resolving mail server issues</li>
-		</ul>
-		</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Network services</td>
-		<td>
-		<ul>
-		<li>Installation and configuration of the <span class="caps">DHCP, DNS, </span>and <span class="caps">NTP </span>to provide network services</li>
-		<li>Advanced set-up of <span class="caps">DHCP </span>options such as fixed IP addresses</li>
-		<li>Advanced set-ups using bonding, network file system</li>
-		<li>Advice on integration with internal name services</li>
-		<li>Troubleshooting issues with the servers</li>
-		</ul>
-		</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Web server</td>
-		<td>
-		<ul>
-		<li>Assistance configuring Apache for site requirements</li>
-		<li>Installation of modules to support dynamic sites such as Perl and <span class="caps">PHP</span></li>
-		<li>Assistance with logging and tuning Apache performance</li>
-		<li>Debugging and resolving issues with the Web Server</li>
-		</ul>
-		</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>X Terminal server</td>
-		<td>
-		<ul>
-		<li>Configuration of the server to perform terminal services</li>
-		<li>Configuration of local client machines to use remote X server</li>
-		<li>Configuration of local client machines to provide sound</li>
-		<li>Configuring appropriate security for the environment</li>
-		</ul>
-		</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Advanced Networking</td>
-		<td>
-		<ul>
-		<li>Configure <span class="caps">VPN </span>servers using Ubuntu</li>
-		<li>Assistance with using network bonding for load-balancing or fail-over protection</li>
-		<li>Run routing protocols on Ubuntu</li>
-		</ul>
-		</td>
-		<td>No</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Database</td>
-		<td>
-		<ul>
-		<li>Installing Postgres database server</li>
-		<li>Setting-up databases and basic optimising the servers performance</li>
-		<li>Assistance securing the database server with access security</li>
-		<li>Assistance setting up backup and restore procedures for Databases</li>
-		<li>Debugging and solving problems with the database server</li>
-		</ul>
-		</td>
-		<td>No</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Enterprise Java</td>
-		<td>
-		<ul>
-		<li>Installing and configuring Tomcat and Tomcat applications</li>
-		</ul>
-		</td>
-		<td>No</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Virtualisation</td>
-		<td>
-		<ul>
-		<li>Installing <span class="caps">KVM </span>virtualisation and configuring host system</li>
-		<li>Installing and setting up supported guest operating systems</li>
-		<li>Assistance with advanced configuration such as networking</li>
-		<li>Troubleshooting and resolving virtualisation issues</li>
-		</ul>
-		</td>
-		<td>No</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Directory serving and Authentication using OpenLDAP and Kerberos</td>
-		<td>
-		<ul>
-		<li>Installation of OpenLDAP directory server</li>
-		<li>Installation and use of OpenLDAP with Kerberos (optionally) to create a user management solution</li>
-		<li>Assistance integrating the Directory with other services</li>
-		<li>Debugging and solving problems with the service</li>
-		<li>Configuration of the Kerberos server to provide <span class="caps">SSO</span></li>
-		<li>Assistance setting up policies and services to use Kerberos</li>
-		<li>Advice on setting up a reliable and distributed Kerberos system</li>
-		<li>Troubleshooting and resolving issues with Kerberos</li>
-		</ul>
-		</td>
-		<td>No</td>
-		<td>No</td>
-		<td>Yes</td>
-		</tr>
-		</table>
-		<h3>System administration</h3>
-		<p>System administration covers the general configuration, management and maintenance activities. The major categories of support covered are set out below:</p>
-		<table>
-		<tr>
-		<th>Server system administration scope</th>
-		<th>Description</th>
-		<th>Essential</th>
-		<th>Standard</th>
-		<th>Advanced</th>
-		</tr>
-		<tr>
-		<td>Basic Backup</td>
-		<td>
-		<ul>
-		<li>Installation of an appropriate backup application</li>
-		<li>Assistance configuring and deploying backup system</li>
-		<li>Help restoring from back-ups previously taken</li>
-		<li>Troubleshooting and resolving backup or restore problems</li>
-		</ul>
-		</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Cryptography</td>
-		<td>
-		<ul>
-		<li>Assistance with the use of open source software (gnutls, gnupg) for a complete suite of cryptographic and certificate services tools; cryptography, secure communications and digital certificates.</li></ul></td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Firewall</td>
-		<td>
-		<ul>
-		<li>Installing the appropriate fire-walling application and kernel support</li>
-		<li>Assistance configuring the firewall to protect and alert against intrusion</li>
-		<li>Configuring the firewall to provide masquerading for a private server service</li>
-		</ul>
-		</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Hardware management</td>
-		<td>
-		<ul>
-		<li>Configuration of Certified and Compatible systems, devices and peripherals</li>
-		<li>Removing configured hardware and reconfiguring Ubuntu</li>
-		<li>Optimising Ubuntu performance with specific hardware</li>
-		<li>Debugging and resolving hardware issues</li>
-		</ul>
-		</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Kernel support</td>
-		<td>
-		<ul>
-		<li>Advice on installing the right Ubuntu kernel</li>
-		<li>Kernel module installation, configuration and optimisation</li>
-		<li>Kernel debugging and issue resolution</li>
-		</ul>
-		</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Landscape</td>
-		<td>
-		<ul>
-		<li>Guidance on using the Landscape service for systems administration</li>
-		<li>Help using the Landscape service to manage security and bug-fix updates</li>
-		<li>Installing and configuring automated updates</li>
-		</ul>
-		</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Network printing</td>
-		<td>
-		<ul>
-		<li>Making a local printer available on the network</li>
-		<li>Configuring networking printing options</li>
-		<li>Configuring entitled systems to print using the network printer</li>
-		<li>Optimising network printing and resolving issues</li>
-		</ul>
-		</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Server networking</td>
-		<td>
-		<ul>
-		<li>Network card detection and installation</li>
-		<li>Driver and security configuration for wireless networks</li>
-		<li>Configuring dynamic and static network settings</li>
-		<li>Advanced configuration such as IP routing and aliasing</li>
-		<li>Setting up the server to act as an Internet gateway</li>
-		</ul>
-		</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>System updates &amp; upgrades</td>
-		<td>
-		<ul>
-		<li>Assistance installing security or critical fix updates</li>
-		<li>Help planning and undertaking upgrades between Ubuntu releases</li>
-		<li>Troubleshooting and resolving update problems</li>
-		</ul>
-		</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Using package tools</td>
-		<td>
-		<ul>
-		<li>Assistance using Ubuntu packaging tools</li>
-		</ul>
-		</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Logging and monitoring</td>
-		<td>
-		<ul>
-		<li>Setting up system logging and monitoring tools: Nagios and Munin</li>
-		<li>Advanced logging configuration such as remote logging and specialised alerting</li>
-		<li>Managing system logging and monitoring with appropriate tools</li>
-		</ul>
-		</td>
-		<td>No</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Network Backup</td>
-		<td>
-		<ul>
-		<li>Installation and configuration of Bacula Server(s)</li>
-		<li>Configuring Bacula to perform automatic network backups/restores</li>
-		</ul>
-		</td>
-		<td>No</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Server security</td>
-		<td>
-		<ul>
-		<li>Assistance configuring the server in a secure fashion</li>
-		<li>Help configuring and setting up group permissions and password policies</li>
-		<li>Assistance using security tools, for example host vulnerability checking</li>
-		<li>Assistance using AppArmor to partition applications and services from each other</li>
-		<li>Advice on checking for compromise and recovering from a security breach</li>
-		</ul>
-		</td>
-		<td>No</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Advanced Systems Management</td>
-		<td>
-		<ul>
-		<li>Configuration Management tools: puppet and etckeeper</li>
-		<li>Use of remote management capabilities (IPMI) where machines have that capability</li>
-		</ul>
-		</td>
-		<td>No</td>
-		<td>No</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Clustering</td>
-		<td>
-		<ul>
-		<li>Clustered File Systems, Red Hat Cluster Suite, Heartbeat</li>
-		</ul>
-		</td>
-		<td>No</td>
-		<td>No</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Setting up package repositories</td>
-		<td>
-		<ul>
-		<li>Assisting customers who want to maintain their own repositories</li>
-		</ul>
-		</td>
-		<td>No</td>
-		<td>No</td>
-		<td>Yes</td>
-		</tr>
-		</table>
-		<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 Appendix 1.</p>
-		<h3>Installation</h3>
-		<p>This covers all the aspects involved with installing and configuring the Ubuntu Cloud offering.</p>
-		<table>
-		<tr>
-		<th>Server installation scope</th>
-		<th>Description</th>
-		</tr>
-		<tr>
-		<td>Installation</td>
-		<td>
-		<ul>
-		<li>Install Ubuntu Cloud from Ubuntu media or repositories</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Storage Management for Cloud Servers and Image storage.</td>
-		<td>
-		<ul>
-		<li>Set-up <span class="caps">RAID </span>and <span class="caps">LVM </span>for Ubuntu Cloud software usage</li>
-		<li>Assistance recovering debugging and troubleshooting of storage issues. Hardware set-up</li>
-		<li>Assessing hardware compatibility with Ubuntu Cloud</li>
-		<li>Choosing the required versions of Ubuntu Server for Ubuntu Cloud</li>
-		<li>Configuring Ubuntu to use appropriate hardware for Ubuntu Cloud usage</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Networking</td>
-		<td>
-		<ul>
-		<li>Setting network requirements for OpenStack</li>
-		<li>Setting up interface aliases, bonding and vlan tagging for Ubuntu Cloud</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Package and task selection</td>
-		<td>
-		<ul>
-		<li>Recommendation on the specific packages to install for Ubuntu Cloud</li>
-		</ul>
-		</td>
-		</tr>
-		</table>
-		<h2>Applications</h2>
-		<p>This covers the various Ubuntu Cloud software configurations and included applications that are supported.</p>
-		<table>
-		<tr>
-		<th>Server applications scope</th>
-		<th>Description</th>
-		</tr>
-		<tr>
-		<td>Ubuntu Cloud Infrastructure</td>
-		<td>
-		<ul>
-		<li>Configuration of Ubuntu Cloud and sub-systems.</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Cloud Portal</td>
-		<td>
-		<ul>
-		<li>Installation and configuration of Cloud portal</li>
-		<li>Debugging and solving problems with Cloud portal.</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Hypervisor</td>
-		<td>
-		<ul>
-		<li>Installation and configuration of system kvm hypervisor support</li>
-		<li>Installing and setting up supported guest machine images.</li>
-		<li>Troubleshooting and resolving hypervisor issues</li>
-		</ul>
-		</td>
-		</tr>
-		</table>
-		<h2>System administration</h2>
-		<p>System administration of Ubuntu Cloud software. This covers the various system administration and included programs that are supported:</p>
-		<table>
-		<tr>
-		<th>Server system administration scope</th>
-		<th>Description</th>
-		</tr>
-		<tr>
-		<td>Ubuntu Cloud Infrastructure Backup</td>
-		<td>
-		<ul>
-		<li>Installation of an appropriate backup application</li>
-		<li>Assistance configuring and deploying backup system</li>
-		<li>Help restoring from back-ups previously taken</li>
-		<li>Troubleshooting and resolving backup or restore problems</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Machine Image Backup</td>
-		<td>
-		<ul>
-		<li>Backup of cloud machine image</li>
-		<li>Snapshot cloud machine image</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>System updates &amp; upgrades</td>
-		<td>
-		<ul>
-		<li>Assistance installing security or critical fix updates</li>
-		<li>Help planning and undertaking upgrades between Ubuntu Server and Ubuntu Cloud releases</li>
-		<li>Troubleshooting and resolving update problems</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Logging and monitoring</td>
-		<td>
-		<ul>
-		<li>Setting up supported system logging and monitoring for Ubuntu Cloud Server security</li>
-		<li>Assistance configuring the Ubuntu Cloud servers in a secure fashion</li>
-		<li>Help configuring and setting up of supported OpenStack permissions and password policies Setting up Cloud Machine Images repositories</li>
-		<li>Assist with management and maintenance of Cloud Machine Images</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Cloud Instance sizing</td>
-		<td>
-		<ul>
-		<li>Assist with configuration of Cloud Instance sizing, number of system processors and system memory</li>
-		</ul>
-		</td>
-		</tr>
-		</table>
-		<h2>Appendix 3 - Desktop support scope details</h2>
-		<h3>Desktop Standard and Advanced scope table</h3>
-		<p>The table below lists the included support scope for the Desktop Standard and Advanced levels of Ubuntu Advantage Desktop.</p>
-		<table>
-		<tr>
-		<th>Desktop scope</th>
-		<th>Standard</th>
-		<th>Advanced</th>
-		</tr>
-		<tr>
-		<td align="center" colspan="3"><strong>Installation</strong></td>
-		</tr>
-		<tr>
-		<td>Application selection</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>CD-ROM installation</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Graphical desktop</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Hardware compatibility</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Network installation</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>System booting</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Windows migration</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Advanced file-system set-up</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Automated installation</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td align="center" colspan="3"><strong>Applications</strong></td>
-		</tr>
-		<tr>
-		<td>Certified applications</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Desktop environment</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Desktop publishing</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Digital art</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Digital pictures</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Education</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>E-mail</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Messaging</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Movies and music</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Office Applications</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Personal accounting</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Web browser</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Advanced productivity</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Advanced applications</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Developer Tools</td>
-		<td>No</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td align="center" colspan="3"><strong>Configuration</strong></td>
-		</tr>
-		<tr>
-		<td>Backup</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Desktop Security</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Graphics</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Hardware management</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Printers</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Remote desktop</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>System support</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Sound</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Updates &amp; upgrades</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Wireless Internet</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Windows network access</td>
-		<td>Yes</td>
-		<td>Yes</td>
-		</tr>
-		<tr>
-		<td>Desktop virtualization</td>
-		<td>No</td>
-		<td>Yes</td>
-		</tr>
-		</table>
-		<h3>Installation</h3>
-		<p>This covers all the aspects involved with installing Ubuntu. Canonical will support various installation methods, setting up the hardware and loading Ubuntu correctly. The specific categories are as follows:</p>
-		<table>
-		<tr>
-		<th>Desktop installation category</th>
-		<th>Description</th>
-		</tr>
-		<tr>
-		<td>Application selection</td>
-		<td>
-		<ul>
-		<li>Recommendation on the specific packages to install for a particular use.</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>CD-ROM installation</td>
-		<td>
-		<ul>
-		<li>Install Ubuntu from a <span class="caps">CDROM.</span></li>
-		<li>Install of Ubuntu from a <span class="caps">USB </span>connected drive.</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Graphical desktop</td>
-		<td>
-		<ul>
-		<li>Installing and configuring X and the graphical desktop.</li>
-		<li>Configuration for new monitors, or peripherals.</li>
-		<li>Optimising X and setting up dual monitors.</li>
-		<li>X server and graphical desktop problem solving.</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Hardware compatibility</td>
-		<td>
-		<ul>
-		<li>Assessing hardware compatibility with Ubuntu.</li>
-		<li>Choosing the 32 or 64 bit versions of Ubuntu.</li>
-		<li>Configuring Ubuntu to use the systems hardware.</li>
-		<li>Optimising Ubuntu for Certified or Compatible hardware.</li>
-		<li>Configuration of supported peripherals.</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Network installation</td>
-		<td>
-		<ul>
-		<li>Booting from the network for network installation.</li>
-		<li>Install Ubuntu using a local <span class="caps">NFS </span>server.</li>
-		<li>Install Ubuntu using a local <span class="caps">FTP </span>server.</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>System booting</td>
-		<td>
-		<ul>
-		<li>Set-up of system to boot Ubuntu by default.</li>
-		<li>Configuration of Ubuntu to load other operating systems such as Microsoft Windows.</li>
-		<li>Removal of Ubuntu as the boot-loader.</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Windows migration</td>
-		<td>
-		<ul>
-		<li>Partitioning to account for an existing Windows installation.</li>
-		<li>Resizing the file-system to provide free space for the Ubuntu installation.</li>
-		<li>Configuration of Ubuntu to be aware of a legacy operating system.</li>
-		<li>Transfer of settings from the legacy Windows environment using the Migration Assistant.</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Advanced file-system set-up</td>
-		<td>
-		<ul>
-		<li>Recommendation of a specific partitioning scheme depending on the systems tasks.</li>
-		<li>Set-up of Logical Volume Management (LVM) and encryption using the alternative installer.</li>
-		<li>Creation and formatting of file systems so that they can be used by Ubuntu.</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Automated installation</td>
-		<td>
-		<ul>
-		<li>Kickstart and preseed configuration.</li>
-		<li>Network booting and network settings configuration.</li>
-		<li>Troubleshooting and resolving installation issues.</li>
-		</ul>
-		</td>
-		</tr>
-		</table>
-		<h3>Applications</h3>
-		<p>This covers the various programs that are supported as part of the services. Canonical will help the customer to install, configure and use the various applications. The major categories are:</p>
-		<table>
-		<tr>
-		<th>Desktop applications category</th>
-		<th>Description</th>
-		<th>Ubuntu</th>
-		</tr>
-		<tr>
-		<td>Certified applications</td>
-		<td>
-		<ul>
-		<li>Installation applications distributed through the Partner repository</li>
-		<li>Debugging issues that are caused by Ubuntu</li>
-		</ul>
-		</td>
-		<td>
-		<ul>
-		<li>Release dependent</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Desktop environment</td>
-		<td>
-		<ul>
-		<li>Configuring desktop preferences</li>
-		<li>Customising desktop look and feel</li>
-		<li>Managing files and folders</li>
-		<li>Adding and removing applications launchers or menu items</li>
-		<li>Browsing network shares</li>
-		</ul>
-		</td>
-		<td>
-		<ul>
-		<li><span class="caps">GNOME</span> Desktop</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Desktop publishing</td>
-		<td>
-		<ul>
-		<li>Installing and configuring desktop publishing</li>
-		<li>Using basic templates and inserting multimedia content</li>
-		<li>Printing created documents</li>
-		</ul>
-		</td>
-		<td>
-		<ul>
-		<li>Scribus</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Digital art</td>
-		<td>
-		<ul>
-		<li>Installing digital art and graphics applications</li>
-		<li>Configuring and using application functionality</li>
-		<li>Debugging issues with graphical applications</li>
-		</ul>
-		</td>
-		<td>
-		<ul>
-		<li>Gimp</li>
-		<li>Inkscape</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Digital pictures</td>
-		<td>
-		<ul>
-		<li>Setting up cameras for use with Ubuntu</li>
-		<li>Configuring applications to import images</li>
-		<li>Creating and editing photo albums</li>
-		<li>Publish albums on the Internet</li>
-		<li>Debugging and resolving issues</li>
-		</ul>
-		</td>
-		<td>
-		<ul>
-		<li>F-Spot</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Education</td>
-		<td>
-		<ul>
-		<li>Installing specific education applications and games</li>
-		<li>Configuring education applications for children&#39;s use</li>
-		<li>Configuring the desktop environment for particular age groups</li>
-		</ul>
-		</td>
-		<td>
-		<ul>
-		<li>Tux Math</li>
-		<li>Tux Paint</li>
-		<li>Tux Type</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>E-mail</td>
-		<td>
-		<ul>
-		<li>Configuring the default e-mail clients</li>
-		<li>Sending and receiving e-mail</li>
-		<li>Setting up e-mail filtering and anti-spam</li>
-		</ul>
-		</td>
-		<td>
-		<ul>
-		<li>Evolution</li>
-		<li>Thunderbird</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Messaging</td>
-		<td>
-		<ul>
-		<li>Installing instant messaging, internet voice and video conferencing</li>
-		<li>Configuring for major service providers</li>
-		<li>Troubleshooting and resolving application issues</li>
-		</ul>
-		</td>
-		<td>
-		<ul>
-		<li>Pidgin</li>
-		<li>Ekiga</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Movies and music</td>
-		<td>
-		<ul>
-		<li>Using and configuring music and video players</li>
-		<li>Installing proprietary commercially supported codecs</li>
-		<li>Troubleshooting and resolving multimedia problems</li>
-		</ul>
-		</td>
-		<td>
-		<ul>
-		<li>Rhythmbox</li>
-		<li>Totem</li>
-		<li>Sound Juicer</li>
-		<li>Cheese</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Office Applications</td>
-		<td>
-		<ul>
-		<li>Creating word processed documents, spreadsheets or presentations.</li>
-		<li>Configuring the office applications</li>
-		<li>Basic templates and inserting multimedia content</li>
-		<li>Troubleshooting and resolving application issues</li>
-		<li>Does not include advanced usage such programming macros</li>
-		</ul>
-		</td>
-		<td>
-		<ul>
-		<li>LIbreOffice Writer</li>
-		<li>Evince</li>
-		<li>LibreOffice Calc</li>
-		<li>LibreOffice Impress</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Personal accounting</td>
-		<td>
-		<ul>
-		<li>Installing and setting up the personal accounting application.</li>
-		<li>Integrating with supported electronic banking accounts</li>
-		<li>Troubleshooting and resolving application issues</li>
-		</ul>
-		</td>
-		<td>
-		<ul>
-		<li>GnuCash</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Web browser</td>
-		<td>
-		<ul>
-		<li>Using and configuring the web browser</li>
-		<li>Installing common plugins from Ubuntu repositories such as Flash</li>
-		<li>Configuring the browser for live bookmarks</li>
-		</ul>
-		</td>
-		<td>
-		<ul>
-		<li>Firefox</li>
-		<li>Pidgin</li>
-		<li>Adobe Flash</li>
-		<li><span class="caps">JVM</span></li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Advanced productivity</td>
-		<td>
-		<ul>
-		<li>Advanced use of LibreOffice applications</li>
-		<li>Setting up desktop database functionality</li>
-		<li>Using the desktop database application</li>
-		<li>Configuring connections to supported server databases</li>
-		<li>Integrating with other LIbreOfficeapplications.</li>
-		</ul>
-		</td>
-		<td>
-		<ul>
-		<li>LibreOffice Database</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Advanced applications</td>
-		<td>
-		<ul>
-		<li>Installing desktop applications from the maintained repository</li>
-		<li>Configuring and using desktop applications</li>
-		<li>Debugging issues with advanced applications</li>
-		<li>Does not include support for development or command line applications</li>
-		</ul>
-		</td>
-		<td>
-		<ul>
-		<li>X or <span class="caps">GNOME </span>apps</li>
-		</ul>
-		</td>
-		</tr>
-		</table>
-		<h3>System administration</h3>
-		<p>Configuration covers the general configuration, management and maintenance activities. The major categories of support covered are set out below:</p>
-		<table>
-		<tr>
-		<th>Desktop system administration category</th>
-		<th>Description</th>
-		</tr>
-		<tr>
-		<td>Backup</td>
-		<td>
-		<ul>
-		<li>Installation of an appropriate backup application.</li>
-		<li>Configuration and deployment of backup system.</li>
-		<li>Assistance restoring from back-ups previously taken.</li>
-		<li>Troubleshooting and resolving backup or restore problems.</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Desktop Security</td>
-		<td>
-		<ul>
-		<li>Installing the appropriate firewalling application and kernel support.</li>
-		<li>Assistance configuring the firewall to protect and alert against external intrusion.</li>
-		<li>Assistance on checking for compromise and recovering the system from backup following a security breach.</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Desktop virtualization</td>
-		<td>
-		<ul>
-		<li>Installing and setting up desktop virtualization.</li>
-		<li>Assistance configuring networking and local host device access.</li>
-		<li>Assistance installing Microsoft Windows and Ubuntu as a guest.</li>
-		<li>Debugging and resolving issues with desktop virtualization.</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Graphics</td>
-		<td>
-		<ul>
-		<li>Installing software drivers for the graphical Ubuntu desktop.</li>
-		<li>Installing third-party proprietary software drivers for advanced video effects where Ubuntu recommends it.</li>
-		<li>Configuring the graphics or monitor set-up for advanced video effects.</li>
-		<li>Configuring and optimising the graphics set-up for dual-monitors.</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Hardware management</td>
-		<td>
-		<ul>
-		<li>Configuration of Certified systems and &#8220;Works with Ubuntu&#8221; labeled peripherals.</li>
-		<li>Removing hardware and reconfiguring Ubuntu.</li>
-		<li>Optimising Ubuntu performance with specific hardware.</li>
-		<li>Debugging and resolving hardware issues.</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Printers</td>
-		<td>
-		<ul>
-		<li>Installing a serial or <span class="caps">USB </span>printer.</li>
-		<li>Configuration to print to a network printer.</li>
-		<li>Configuring Ubuntu printing options.</li>
-		<li>Resolving printer problems such as driver configuration.</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Remote desktop</td>
-		<td>
-		<ul>
-		<li>Setting up the default remote desktop capability in Ubuntu Desktop Edition.</li>
-		<li>Configuring advanced desktop sharing features.</li>
-		<li>Troubleshooting and resolving issues using the remote desktop.</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Sound</td>
-		<td>
-		<ul>
-		<li>Configuring sound to work with detected sound card.</li>
-		<li>Sound configuration for specific applications.</li>
-		<li>Debugging and resolving sound issues.</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>System support</td>
-		<td>
-		<ul>
-		<li>Assistance configuring Ubuntu system components.</li>
-		<li>Assistance optimising performance of Ubuntu.</li>
-		<li>Problem identification, assessment and bug reporting.</li>
-		<li>Provision of a work-around or complete resolution.</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Updates &amp; upgrades</td>
-		<td>
-		<ul>
-		<li>Assistance installing security or critical fix updates.</li>
-		<li>Assistance undertaking upgrades between Ubuntu releases.</li>
-		<li>Troubleshooting and resolving update problems.</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Windows network access</td>
-		<td>
-		<ul>
-		<li>Setting up Ubuntu to login to a Microsoft Windows Active Directory.</li>
-		<li>Assistance browsing and accessing network resources such as printers and file shares.</li>
-		<li>Debugging issue either configuring or using the Active Directory authentication functionality (Likewise Open).</li>
-		</ul>
-		</td>
-		</tr>
-		<tr>
-		<td>Wireless Internet</td>
-		<td>
-		<ul>
-		<li>Wireless hardware driver detection and configuration</li>
-		<li>Wireless networking set-up</li>
-		<li>Internet configuration and access</li>
-		<li>Wireless roaming set-up and configuration</li>
-		<li>Troubleshooting and resolving networking or Internet access problems</li>
-		</ul>
-		</td>
-		</tr>
-		</table>
-		<p><a href="{{ STATIC_URL }}files/20130802-UbuntuAdvantageSD.pdf" title="PDF of the Ubuntu Advantage Service Description">Download the pdf &gt;</a></p>
-	</div>
-</div><!-- / .row -->
-{% endblock content %}
\ No newline at end of file
diff --git a/templates/ubuntu-ai.txt b/templates/ubuntu-ai.txt
old mode 100644
new mode 100755
index 0f411c99514..8101534033b
--- a/templates/ubuntu-ai.txt
+++ b/templates/ubuntu-ai.txt
@@ -135,12 +135,6 @@ Contact us | Ubuntu Server | Ubuntu	/server/contact-us/
 Server management | Ubuntu	/server/management/
 Thank you | Ubuntu	/server/thank-you/
 Support | Ubuntu	/support/
-Community | Ubuntu | Ubuntu	/support/community/
-Chat (IRC) | Ubuntu | Ubuntu	/support/community/chat/
-Launchpad | Ubuntu | Ubuntu	/support/community/launchpad/
-Local language support | Ubuntu | Ubuntu	/support/community/local-language/
-Web forums | Ubuntu | Ubuntu	/support/community/web-forums/
-Mailing lists | Ubuntu | Ubuntu	/support/community/mailing-lists/
 Privacy Policy | Ubuntu	/privacy-policy/
 Third-party privacy policies | Ubuntu	/privacy-policy/third-parties/
 Ubuntu phone press pack | Ubuntu	/2013/01/press-pack-ubuntu-phone/
diff --git a/ubuntu/settings.py b/ubuntu/settings.py
index a594f2e8bdb..04bb06e225e 100644
--- a/ubuntu/settings.py
+++ b/ubuntu/settings.py
@@ -12,7 +12,6 @@
 import os
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
-
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/
 
@@ -21,14 +20,10 @@
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
-
 TEMPLATE_DEBUG = True
-
 ALLOWED_HOSTS = []
 
-
 # Application definition
-
 INSTALLED_APPS = (
     'django.contrib.admin',
     'django.contrib.auth',
@@ -36,6 +31,7 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'django_extensions',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -51,10 +47,8 @@
 
 WSGI_APPLICATION = 'ubuntu.wsgi.application'
 
-
 # Database
 # https://docs.djangoproject.com/en/1.6/ref/settings/#databases
-
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
@@ -64,25 +58,28 @@
 
 # Internationalization
 # https://docs.djangoproject.com/en/1.6/topics/i18n/
-
 LANGUAGE_CODE = 'en-us'
-
 TIME_ZONE = 'UTC'
-
 USE_I18N = True
-
 USE_L10N = True
-
 USE_TZ = True
 
-
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.6/howto/static-files/
-
 STATIC_URL = '/static/'
+STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")]
 
 # Custom settings
 # ===============
-
-TEMPLATE_DIRS = ( BASE_DIR + "/templates" )
-STATICFILES_DIRS = ( BASE_DIR + "/templates/static", )
\ No newline at end of file
+TEMPLATE_DIRS = [BASE_DIR + "/templates"]
+
+TEMPLATE_CONTEXT_PROCESSORS = (
+    "django.contrib.auth.context_processors.auth",
+    "django.core.context_processors.debug",
+    "django.core.context_processors.i18n",
+    "django.core.context_processors.media",
+    "django.core.context_processors.static",
+    "django.core.context_processors.tz",
+    "django.contrib.messages.context_processors.messages",
+    "django.core.context_processors.request"
+)
diff --git a/ubuntu/urls.py b/ubuntu/urls.py
index e4a2f89df5b..99c6f6d6eee 100644
--- a/ubuntu/urls.py
+++ b/ubuntu/urls.py
@@ -1,6 +1,14 @@
 from django.conf.urls import patterns, url
 from fenchurch import TemplateFinder
 
-urlpatterns = patterns('',
-    url(r'^(?P<template>.*)$', TemplateFinder.as_view()),
+from ubuntu.views import DownloadView, SearchView
+
+urlpatterns = patterns(
+    '',
+    url(
+        r'^(?P<template>download/(desktop|server|cloud)/thank-you)/?$',
+        DownloadView.as_view()
+    ),
+    url('^(?P<template>search)/?$', SearchView.as_view()),
+    url(r'^(?P<template>.*)/?$', TemplateFinder.as_view()),
 )
diff --git a/ubuntu/views.py b/ubuntu/views.py
new file mode 100644
index 00000000000..e602db1090e
--- /dev/null
+++ b/ubuntu/views.py
@@ -0,0 +1,214 @@
+import json
+import sys
+from urllib2 import URLError
+
+from feedparser import parse
+from fenchurch import TemplateFinder
+from lib.gsa import GSAParser
+
+
+class DownloadView(TemplateFinder):
+
+    def get_context_data(self, **kwargs):
+        """
+        Load mirrors data from RSS file
+        and return the list as context
+        """
+
+        context = super(DownloadView, self).get_context_data(**kwargs)
+
+        with open('/tmp/mirrors.rss') as rss:
+            mirrors = parse(rss).entries
+
+        mirror_list = [
+            {'link': mirror['link'], 'bandwidth': mirror['mirror_bandwidth']}
+            for mirror in mirrors
+            if mirror['mirror_countrycode'] == self.request.GET.get(
+                'country', "NO_COUNTRY_CODE"
+            )
+        ]
+        context['mirror_list'] = json.dumps(mirror_list)
+        return context
+
+
+class SearchView(TemplateFinder):
+    '''
+    Return search results from the Google Search Appliance
+
+    Requests should be formatted: <url>?q=<string>&offset=<num>&limit=<num>
+
+    I've used "offset" and "limit" for pagination,
+    following the "Web API Design" standard:
+    https://pages.apigee.com/web-api-design-ebook.html
+
+    This gets results from Canonical's Google Search Appliance,
+    currently located at: tupilaq.internal (10.22.112.9)
+
+    Developing
+    ===
+
+    When running on the development server (runserver),
+    self.gsa_domain will be replaced with "localhost:2000"
+    because unfortunately, development machines won't have
+    permissions to talk to the GSA directly.
+
+    Get SSH access to 10.55.60.86, which does have GSA access
+    and then create a localhost tunnel:
+
+    ssh -f 10.55.60.86 -L 2000:tupilaq.internal:80 -N
+    '''
+
+    def get_context_data(self, **kwargs):
+        """
+        Extend CMSPageView.get_context_data to parse query parameters
+        and return search results from the Google Search Appliance (GSA)
+
+        E.g.: http://example.com/search?q=juju&limit=10&offset=10
+
+        Query parameters:
+        - q: the search query to be passed to the GSA
+        - limit: number of results to return, "page size" (default: 10)
+        - offset: where to start results at (default: 0)
+        """
+
+        # On live the GSA domain will be tupilaq.internal
+        # but on dev, we need to access GSA through localhost
+        # (see GSASearchView docstring above)
+        gsa_domain = 'tupilaq.internal'
+
+        if 'runserver' in sys.argv:
+            gsa_domain = 'localhost:2000'
+
+        parser = GSAParser(gsa_domain)
+
+        # Import context from parent
+        context = super(SearchView, self).get_context_data(**kwargs)
+
+        # defaults + GET params
+        context.update({
+            'query': self.request.GET.get('q', ''),
+            'results': [],
+            'request_succeeded': True,
+            'parse_succeeded': True,
+            'start': 0,
+            'end': 0,
+            'limit': int(self.request.GET.get('limit', '10')),
+            'offset': int(self.request.GET.get('offset', '0')),
+            'total': 0,
+            'nav_items': []
+        })
+
+        # return self.context
+        try:
+            gsa_results = parser.fixed_results(
+                context['query'],
+                start=context['offset'],
+                num=context['limit']
+            )
+
+            nav_url = "{path}?q={query}".format(
+                path=self.request.path,
+                query=context['query']
+            )
+
+            results = self.parse_gsa_results(gsa_results)
+            context.update(results)
+
+            context['nav_items'] = self.build_nav_items(
+                context,
+                nav_url
+            )
+
+        except URLError:
+            context['request_succeeded'] = False
+        except ValueError:
+            context['parse_succeeded'] = False
+
+        return context
+
+    def parse_gsa_results(self, gsa_results):
+
+        results_meta = gsa_results['results_nav']
+
+        data = {}
+
+        # Parse data
+        if 'results' in gsa_results:
+            data['results'] = gsa_results['results']
+
+        if results_meta['total_results'].isdigit():
+            data['total'] = int(results_meta['total_results'])
+
+        if results_meta['results_start'].isdigit():
+            data['start'] = int(results_meta['results_start'])
+
+        if results_meta['results_end'].isdigit():
+            data['end'] = int(results_meta['results_end'])
+
+        data['have_next'] = bool(results_meta.get('have_next', '0'))
+
+        return data
+
+    def build_nav_items(self, data, url):
+        """
+        Create an array of navigational items
+        from results data
+        """
+
+        items = []
+
+        first_offset = 0
+        offset = data['start'] - 1
+        previous_offset = offset - data['limit']
+        next_offset = data['end']
+
+        remainder = data['total'] % data['limit']
+
+        if remainder == 0:
+            last_offset = data['total'] - data['limit']
+        else:
+            last_offset = data['total'] - remainder
+
+        base_item = {
+            "url": url + '&limit=' + str(data['limit'])
+        }
+
+        if first_offset < offset:
+            first = self.build_item(base_item, 'First', first_offset, 'back')
+            first['class'] = 'item-extreme'
+            items.append(first)
+
+        if previous_offset > first_offset and previous_offset < offset:
+            items.append(self.build_item(
+                base_item,
+                'Previous',
+                previous_offset,
+                'back'
+            ))
+
+        if data['have_next'] and next_offset < last_offset:
+            items.append(self.build_item(
+                base_item,
+                'Next',
+                next_offset,
+                'forward'
+            ))
+
+        if data['have_next'] and offset < last_offset:
+            last = self.build_item(base_item, 'Last', last_offset, 'forward')
+            last['class'] = 'item-extreme'
+            items.append(last)
+
+        return items
+
+    def build_item(self, base_item, name, offset, direction):
+        """
+        Build one navigational item
+        """
+
+        item = base_item.copy()
+        item['name'] = name
+        item['url'] = item['url'] + '&offset=' + str(offset)
+        item['direction'] = direction
+
+        return item