diff --git a/content/pages/general/templates/index.html b/content/pages/general/templates/index.html
index 3d24b8e524d7650871fb4b2170e431b5715aa300..a707e870af60826411f73196cae39700f73ccd05 100644
--- a/content/pages/general/templates/index.html
+++ b/content/pages/general/templates/index.html
@@ -45,7 +45,7 @@ Our <a href="//intranet.ebi.ac.uk/sites/intranet.ebi.ac.uk/files/content/outreac
 
 <a href="//intranet.ebi.ac.uk/sites/intranet.ebi.ac.uk/files/content/outreach/EMBL-EBI_letterhead_Aug_2013.docx">Download the letterhead template</a>
 
-<a href="//intranet.ebi.ac.uk/sites/intranet.ebi.ac.uk/files/content/outreach/Documents/EMBL-EBI_letterhead_2016.docx"><img src="//intranet.ebi.ac.uk/sites/intranet.ebi.ac.uk/files/resize/content/outreach/Letterhead_thumbnail-180x252.jpg" width="180" height="252" alt="image" style="border: 0px;" /></a>
+<a href="//intranet.ebi.ac.uk/sites/intranet.ebi.ac.uk/files/content/outreach/Documents/EMBL-EBI_letterhead_2016.docx"><img src="//intranet.ebi.ac.uk/sites/intranet.ebi.ac.uk/files/resize/content/outreach/Letterhead_thumbnail-180x252.jpg" width="180" height="252" alt="image" /></a>
 {{/markdown}}
 
 {{#markdown}}
@@ -59,7 +59,6 @@ For those keenly interested in fonts: Originally designed in 1959 by Max Mieding
 
 For continuous text we recommend 10-point Minion with a 12-point leading. (Leadings in MS Word are shown in the box underneath font size.)
 
-
 #### Fonts in slide presentations
 
 In slide presentations, the font size should never fall below 22 points, as it is very difficult to read smaller fonts comfortably.
@@ -95,15 +94,14 @@ This slide template is created and maintained by Spencer Phillips in External Re
 
 We offer slide templates in PowerPoint and Keynote format.
 
-Gustavo Salazar has kindly shared a <a href="https://github.com/4ndr01d3/EBI-reveal.js-template%20">reveal.js template</a>, which supports live html demos.
+Gustavo Salazar has kindly shared a [reveal.js template](https://github.com/4ndr01d3/EBI-reveal.js-template), which supports live HTML demos.
+
+### How to download the slide template
 
-<h4>How to download the slide template</h4>
-<ol>
-<li>Download the <a href="//tsc.ebi.ac.uk/sites/intranet.ebi.ac.uk/files/content/outreach/Images/EMBL-EBI_fonts_and_icons.zip">EMBL-EBI fonts</a> and install them on your machine.</li>
-<li>Open <a href="//tsc.ebi.ac.uk/sites/tsc.ebi.ac.uk/files/tsc/Graphics/embl-ebi_slide_template_2016.pptx">this slide template file</a> in PowerPoint. A KeyNote version is also available.</li>
-<li>Save the file as PowerPoint <strong>template</strong>.</li>
-<li>Next time you start a new file in PowerPoint, this template will be under "My templates".</li>
-</ol>
+1. Download the [EMBL-EBI fonts]({{root}}general/fonts/) and install them on your machine.
+1. Open <a href="//tsc.ebi.ac.uk/sites/tsc.ebi.ac.uk/files/tsc/Graphics/embl-ebi_slide_template_2016.pptx">this slide template file</a> in PowerPoint. A KeyNote version is also available.
+1. Save the file as a PowerPoint **template**.
+1. Next time you start a new file in PowerPoint, this template will be under "My templates".
 
 #### How to use the slide template
 
@@ -135,7 +133,6 @@ The Training team also maintains a <a href="//intranet.ebi.ac.uk/sites/intranet.
 
 If you want to use <a href="http://www.ebi.ac.uk/training/open-days-and-career-days/embl-ebi-open-day-november-2012">Slides from our Open Days</a>, get in touch directly with the author before you re-use these.
 
-
 ### Scientific poster templates
 
 These poster templates are <strong>scalable</strong>, so you can resize it to A0, A1, A3, etc.
@@ -144,7 +141,7 @@ Fonts: See the <a href="//tsc.ebi.ac.uk/node/290">Logos and branding page</a> fo
 
 Looking for tips on poster design? See this <a href="https://ebiinterfaces.wordpress.com/2016/03/11/designing-our-vizbi-2016-conference-poster/">interesting post on the Interfaces blog</a>.
 
-<table border="0">
+<table>
 <tbody>
  <tr>
   <td>
@@ -185,15 +182,17 @@ You might consider having it printed in Heidelberg, by our colleagues at <a href
 
 ### Ordering your business card
 
-<p>If you're going to a conference or meeting and would like to order business cards, fill in the <a href="http://goo.gl/forms/BYafjl4x1f">business card request form</a>.</p>
-<p>Your EMBL-EBI business card will be put together by External Relations and printed by an outside vendor.</p>
-<p>You will see a proof of the card before it is printed.</p>
+If you're going to a conference or meeting and would like to order business cards, fill in the [business card request form](http://goo.gl/forms/BYafjl4x1f).
+
+Your EMBL-EBI business card will be put together by External Relations and printed by an outside vendor.
+
+You will see a proof of the card before it is printed.
 
 If you do outreach as part of your responsibilities, the cost of the card will be covered by External Relations.
 
 <p>Please be sure to have the approval of your GTL before you complete the order form. If you have any questions, <a href="mailto:comms@ebi.ac.uk">e-mail External Relations</a>.</p>
 
-Sample business card
+### Sample business card
 
 The business card is printed on two sides. The back can be printed in blue-green, or in white.
 
@@ -201,7 +200,7 @@ The business card is printed on two sides. The back can be printed in blue-green
 
 ## E-mail signature
 
-The Systems team has provided instructions about <a href="http://www.ebi.ac.uk/systems-srv/public-wiki/index.php/Email_Basics">how to set up your e-mail signature</a> in a number of e-mail clients.
+The Systems team has provided instructions about [how to set up your e-mail signature](http://tsc.ebi.ac.uk/article/desktop/email/email-basics-0) in a number of e-mail clients.
 
 Your signature should include your name, job title and EMBL-EBI contact details. Here's an example:
 
@@ -214,6 +213,6 @@ Office: +44 (0)1223 494 665<br />
 Mobile: +44 (0)7777 777 777<br />
 E-mail: <a href="mailto:mary@ebi.ac.uk">mary@ebi.ac.uk</a>
 
-Website: <a href="http://www.ebi.ac.uk/about ">www.ebi.ac.uk/about </a>
+Website: [www.ebi.ac.uk/about](https://www.ebi.ac.uk/about)
 
 {{/markdown}}
diff --git a/content/websites/patterns/animation/animation.png b/content/websites/patterns/animation/animation.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/animation/animation.png differ
diff --git a/content/websites/patterns/button-grid/button-grid.png b/content/websites/patterns/button-grid/button-grid.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/button-grid/button-grid.png differ
diff --git a/content/websites/patterns/code-highlighting/code-highlighting.png b/content/websites/patterns/code-highlighting/code-highlighting.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/code-highlighting/code-highlighting.png differ
diff --git a/content/websites/patterns/favicons/favicons.png b/content/websites/patterns/favicons/favicons.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/favicons/favicons.png differ
diff --git a/content/websites/patterns/formatting/formatting.png b/content/websites/patterns/formatting/formatting.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/formatting/formatting.png differ
diff --git a/content/websites/patterns/grid/grid.png b/content/websites/patterns/grid/grid.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/grid/grid.png differ
diff --git a/content/websites/patterns/headlines/headlines.png b/content/websites/patterns/headlines/headlines.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/headlines/headlines.png differ
diff --git a/content/websites/patterns/icons/icons.png b/content/websites/patterns/icons/icons.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/icons/icons.png differ
diff --git a/content/websites/patterns/image-highlight-captions/image-highlight-captions.png b/content/websites/patterns/image-highlight-captions/image-highlight-captions.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b8c4bd327744fa92c658e6f8580a5de68bf04a8
Binary files /dev/null and b/content/websites/patterns/image-highlight-captions/image-highlight-captions.png differ
diff --git a/content/websites/patterns/image-overlays/image-overlays.png b/content/websites/patterns/image-overlays/image-overlays.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/image-overlays/image-overlays.png differ
diff --git a/content/websites/patterns/image-shortcuts/image-shortcuts.png b/content/websites/patterns/image-shortcuts/image-shortcuts.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/image-shortcuts/image-shortcuts.png differ
diff --git a/content/websites/patterns/images/images.png b/content/websites/patterns/images/images.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/images/images.png differ
diff --git a/content/websites/patterns/intro-unit/intro-unit.png b/content/websites/patterns/intro-unit/intro-unit.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/intro-unit/intro-unit.png differ
diff --git a/content/websites/patterns/labels/labels.png b/content/websites/patterns/labels/labels.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/labels/labels.png differ
diff --git a/content/websites/patterns/lists-pulse/lists-pulse.png b/content/websites/patterns/lists-pulse/lists-pulse.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/lists-pulse/lists-pulse.png differ
diff --git a/content/websites/patterns/lists/lists.png b/content/websites/patterns/lists/lists.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/lists/lists.png differ
diff --git a/content/websites/patterns/live-filter/live-filter.png b/content/websites/patterns/live-filter/live-filter.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/live-filter/live-filter.png differ
diff --git a/content/websites/patterns/masthead-compact/masthead-compact.png b/content/websites/patterns/masthead-compact/masthead-compact.png
index bb54a088a832b4838937f18942f93ef2b8981a1a..455b48c8859867f430d1cd6ab867ab0df6840955 100644
Binary files a/content/websites/patterns/masthead-compact/masthead-compact.png and b/content/websites/patterns/masthead-compact/masthead-compact.png differ
diff --git a/content/websites/patterns/masthead-light/masthead-light.png b/content/websites/patterns/masthead-light/masthead-light.png
new file mode 100644
index 0000000000000000000000000000000000000000..369c5e109e042a3513094332de943b5fdd232cf3
Binary files /dev/null and b/content/websites/patterns/masthead-light/masthead-light.png differ
diff --git a/content/websites/patterns/masthead-light/masthead-light.yml b/content/websites/patterns/masthead-light/masthead-light.yml
index 4643b264ec9a7138d27ef7379e3f3007cd5794f9..4db0a1de19af1845f0a0d95bd96d7597a8d00e1d 100644
--- a/content/websites/patterns/masthead-light/masthead-light.yml
+++ b/content/websites/patterns/masthead-light/masthead-light.yml
@@ -1,4 +1,4 @@
-name: 'Compact masthead'
+name: 'Masthead light colour'
 tags:
   - layout
   - masthead
diff --git a/content/websites/patterns/menu/menu.png b/content/websites/patterns/menu/menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9fcfd7817612bcc0b023ea8f78f2c07eb30078e
Binary files /dev/null and b/content/websites/patterns/menu/menu.png differ
diff --git a/content/websites/patterns/meta-copy/meta-copy.png b/content/websites/patterns/meta-copy/meta-copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/meta-copy/meta-copy.png differ
diff --git a/content/websites/patterns/pullquotes/pullquotes.png b/content/websites/patterns/pullquotes/pullquotes.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/pullquotes/pullquotes.png differ
diff --git a/content/websites/patterns/related-links/related-links.png b/content/websites/patterns/related-links/related-links.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/related-links/related-links.png differ
diff --git a/content/websites/patterns/search/search.png b/content/websites/patterns/search/search.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/search/search.png differ
diff --git a/content/websites/patterns/select-box/select-box.png b/content/websites/patterns/select-box/select-box.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/select-box/select-box.png differ
diff --git a/content/websites/patterns/spacing/spacing.png b/content/websites/patterns/spacing/spacing.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/spacing/spacing.png differ
diff --git a/content/websites/patterns/tables-data/tables-data.png b/content/websites/patterns/tables-data/tables-data.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/tables-data/tables-data.png differ
diff --git a/content/websites/patterns/tables-responsive/tables-responsive.png b/content/websites/patterns/tables-responsive/tables-responsive.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/tables-responsive/tables-responsive.png differ
diff --git a/content/websites/patterns/tables-sorting/tables-sorting.png b/content/websites/patterns/tables-sorting/tables-sorting.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/tables-sorting/tables-sorting.png differ
diff --git a/content/websites/patterns/tables/tables.png b/content/websites/patterns/tables/tables.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/tables/tables.png differ
diff --git a/content/websites/patterns/tabs/tabs.png b/content/websites/patterns/tabs/tabs.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/tabs/tabs.png differ
diff --git a/content/websites/patterns/tags/tags.png b/content/websites/patterns/tags/tags.png
new file mode 100644
index 0000000000000000000000000000000000000000..db0b5444167a35e21d09611df4e78af8adc9bbc3
Binary files /dev/null and b/content/websites/patterns/tags/tags.png differ
diff --git a/content/websites/patterns/template/template.png b/content/websites/patterns/template/template.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ed9b063821569a79eaaf98d403b7f1112ca3fa8
Binary files /dev/null and b/content/websites/patterns/template/template.png differ