diff --git a/conf/apigen/templates/@layout.latte b/conf/apigen/templates/@layout.latte
index 0346626..b397736 100644
--- a/conf/apigen/templates/@layout.latte
+++ b/conf/apigen/templates/@layout.latte
@@ -23,6 +23,27 @@ the file LICENSE.md that was distributed with this source code.
 
 	<title>{include #title}{if 'overview' !== $active && $config->title} | {$config->title}{/if}</title>
 	{var typeKitJS = '//use.typekit.net/emt4dhq.js'}
+
+	<link rel="apple-touch-icon" sizes="57x57" href="/apple-touch-icon-57x57.png">
+	<link rel="apple-touch-icon" sizes="60x60" href="/apple-touch-icon-60x60.png">
+	<link rel="apple-touch-icon" sizes="72x72" href="/apple-touch-icon-72x72.png">
+	<link rel="apple-touch-icon" sizes="76x76" href="/apple-touch-icon-76x76.png">
+	<link rel="apple-touch-icon" sizes="114x114" href="/apple-touch-icon-114x114.png">
+	<link rel="apple-touch-icon" sizes="120x120" href="/apple-touch-icon-120x120.png">
+	<link rel="apple-touch-icon" sizes="144x144" href="/apple-touch-icon-144x144.png">
+	<link rel="apple-touch-icon" sizes="152x152" href="/apple-touch-icon-152x152.png">
+	<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon-180x180.png">
+	<link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32">
+	<link rel="icon" type="image/png" href="/favicon-194x194.png" sizes="194x194">
+	<link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96">
+	<link rel="icon" type="image/png" href="/android-chrome-192x192.png" sizes="192x192">
+	<link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16">
+	<link rel="manifest" href="/manifest.json"> <!-- Controls which icon to use for Android Chrome -->
+	<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
+	<meta name="msapplication-TileColor" content="#005b94">
+	<meta name="msapplication-TileImage" content="/mstile-144x144.png">
+	<meta name="theme-color" content="#1b354c">
+
 	<script type="text/javascript" src="{$typeKitJS|staticFile}"></script>
 	<script type="text/javascript">
 		try{
@@ -77,11 +98,11 @@ the file LICENSE.md that was distributed with this source code.
 
 <body class="theme-theme1">
 
-		<header data-0="background-position: 50% 50%;" data-544="background-position: 50% -30%;">
+		<header class="site-header" data-0="background-position: 50% 50%;" data-544="background-position: 50% -30%;">
 			<div class="global-nav header-mask">
 				<div id="navWrapper">
 					{!$globalNav}
-					<div class="container">
+					<div class="container component-search">
 						<span id="SearchAnchor"><!-- search box anchor --></span>
 						<div class="search-pane search-pane-desktop" id="desktopSearch">
 							<a href="#" class="search-close" title="Close search">
@@ -236,46 +257,16 @@ the file LICENSE.md that was distributed with this source code.
 
 <div id="right">
 	<div id="rightInner">
-	{include #content}
-
-	<div id="comments">
-		<h2>Comments</h2>
-
+		{include #content}
+		
 		<div class="alert alert-block">
-			<strong>Comment policy:</strong> Please use comments for <strong>tips and corrections</strong> about the described
-	functionality. Comments are moderated, we reserve the right to remove comments that are inappropriate or are no longer relevant. <br />
-			Use the <strong><a href="//www.silverstripe.org/community/forums/">Silverstripe Forum</a></strong> to ask questions.
-		</div>
-
-		<div id="disqus_thread"></div>
-		<script type="text/javascript">
-			{ifset $class}
-				{if $class->shortName}
-					{var $classname = $class->shortName}
-				{/if}
-			{/ifset}
-		    var disqus_shortname = 'silverstripe-api';
-			{ifset $classname}
-				var disqus_identifier = '{!$classname}';
-				// TODO Doesnt work on new account (migrated from 'silverstripe-doc' to 'silverstripe-api')
-				//var disqus_url = 'http://api.silverstripe.org/{!$classname}';
-				var disqus_title = "SilverStripe API: {!$classname}";
-			{else}
-				var disqus_identifier = 'global';
-				var disqus_title = "SilverStripe API";
-			{/ifset}
-
-		    (function() {
-		        var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-		        dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-		        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-		    })();
-		</script>
-		<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-		<a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
-
-	 </div>
-
+			[Raise a SilverStripe Framework issue/bug](https://github.com/silverstripe/silverstripe-framework/issues/new)
+			<br/>
+-			[Raise a SilverStripe CMS issue/bug](https://github.com/silverstripe/silverstripe-cms/issues/new)
+			<br/>
+-			Please use the <strong><a href="//www.silverstripe.org/community/forums/">Silverstripe Forums</a></strong> to ask development related questions.
+-		</div>
+		
 	</div>
 
 	<div id="footer">
diff --git a/htdocs/.htaccess b/htdocs/.htaccess
index a7123b5..2f86c2c 100644
--- a/htdocs/.htaccess
+++ b/htdocs/.htaccess
@@ -1,7 +1,7 @@
 RewriteEngine On
 
 # "Symlink" a "current" folder to the latest release
-RewriteRule ^current/?(.*)? /3.1/$1 [R=301]
+RewriteRule ^current/?(.*)? /3.2/$1 [R=301]
 
 # "Symlink" the root to the latest release (with "moved temporarily")
 RewriteRule ^/?$ /3.2/ [R=302,L]
diff --git a/htdocs/android-chrome-144x144.png b/htdocs/android-chrome-144x144.png
new file mode 100644
index 0000000..313181a
Binary files /dev/null and b/htdocs/android-chrome-144x144.png differ
diff --git a/htdocs/android-chrome-192x192.png b/htdocs/android-chrome-192x192.png
new file mode 100644
index 0000000..1998690
Binary files /dev/null and b/htdocs/android-chrome-192x192.png differ
diff --git a/htdocs/android-chrome-36x36.png b/htdocs/android-chrome-36x36.png
new file mode 100644
index 0000000..a917ec6
Binary files /dev/null and b/htdocs/android-chrome-36x36.png differ
diff --git a/htdocs/android-chrome-48x48.png b/htdocs/android-chrome-48x48.png
new file mode 100644
index 0000000..4bf7414
Binary files /dev/null and b/htdocs/android-chrome-48x48.png differ
diff --git a/htdocs/android-chrome-72x72.png b/htdocs/android-chrome-72x72.png
new file mode 100644
index 0000000..baed59b
Binary files /dev/null and b/htdocs/android-chrome-72x72.png differ
diff --git a/htdocs/android-chrome-96x96.png b/htdocs/android-chrome-96x96.png
new file mode 100644
index 0000000..c499c60
Binary files /dev/null and b/htdocs/android-chrome-96x96.png differ
diff --git a/htdocs/apple-touch-icon-114x114.png b/htdocs/apple-touch-icon-114x114.png
new file mode 100644
index 0000000..1650963
Binary files /dev/null and b/htdocs/apple-touch-icon-114x114.png differ
diff --git a/htdocs/apple-touch-icon-120x120.png b/htdocs/apple-touch-icon-120x120.png
new file mode 100644
index 0000000..68d72dc
Binary files /dev/null and b/htdocs/apple-touch-icon-120x120.png differ
diff --git a/htdocs/apple-touch-icon-144x144.png b/htdocs/apple-touch-icon-144x144.png
new file mode 100644
index 0000000..a220fc4
Binary files /dev/null and b/htdocs/apple-touch-icon-144x144.png differ
diff --git a/htdocs/apple-touch-icon-152x152.png b/htdocs/apple-touch-icon-152x152.png
new file mode 100644
index 0000000..5d2dc0a
Binary files /dev/null and b/htdocs/apple-touch-icon-152x152.png differ
diff --git a/htdocs/apple-touch-icon-180x180.png b/htdocs/apple-touch-icon-180x180.png
new file mode 100644
index 0000000..121180b
Binary files /dev/null and b/htdocs/apple-touch-icon-180x180.png differ
diff --git a/htdocs/apple-touch-icon-57x57.png b/htdocs/apple-touch-icon-57x57.png
new file mode 100644
index 0000000..c7710c4
Binary files /dev/null and b/htdocs/apple-touch-icon-57x57.png differ
diff --git a/htdocs/apple-touch-icon-60x60.png b/htdocs/apple-touch-icon-60x60.png
new file mode 100644
index 0000000..1213579
Binary files /dev/null and b/htdocs/apple-touch-icon-60x60.png differ
diff --git a/htdocs/apple-touch-icon-72x72.png b/htdocs/apple-touch-icon-72x72.png
new file mode 100644
index 0000000..baed59b
Binary files /dev/null and b/htdocs/apple-touch-icon-72x72.png differ
diff --git a/htdocs/apple-touch-icon-76x76.png b/htdocs/apple-touch-icon-76x76.png
new file mode 100644
index 0000000..d23069e
Binary files /dev/null and b/htdocs/apple-touch-icon-76x76.png differ
diff --git a/htdocs/apple-touch-icon-precomposed.png b/htdocs/apple-touch-icon-precomposed.png
new file mode 100644
index 0000000..c3f892b
Binary files /dev/null and b/htdocs/apple-touch-icon-precomposed.png differ
diff --git a/htdocs/apple-touch-icon.png b/htdocs/apple-touch-icon.png
new file mode 100644
index 0000000..121180b
Binary files /dev/null and b/htdocs/apple-touch-icon.png differ
diff --git a/htdocs/browserconfig.xml b/htdocs/browserconfig.xml
new file mode 100644
index 0000000..83b318f
--- /dev/null
+++ b/htdocs/browserconfig.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+  <msapplication>
+    <tile>
+      <square70x70logo src="/mstile-70x70.png"/>
+      <square150x150logo src="/mstile-150x150.png"/>
+      <square310x310logo src="/mstile-310x310.png"/>
+      <wide310x150logo src="/mstile-310x150.png"/>
+      <TileColor>#005b94</TileColor>
+    </tile>
+  </msapplication>
+</browserconfig>
diff --git a/htdocs/favicon-16x16.png b/htdocs/favicon-16x16.png
new file mode 100644
index 0000000..5670893
Binary files /dev/null and b/htdocs/favicon-16x16.png differ
diff --git a/htdocs/favicon-194x194.png b/htdocs/favicon-194x194.png
new file mode 100644
index 0000000..edf6271
Binary files /dev/null and b/htdocs/favicon-194x194.png differ
diff --git a/htdocs/favicon-32x32.png b/htdocs/favicon-32x32.png
new file mode 100644
index 0000000..638f753
Binary files /dev/null and b/htdocs/favicon-32x32.png differ
diff --git a/htdocs/favicon-96x96.png b/htdocs/favicon-96x96.png
new file mode 100644
index 0000000..ce2848a
Binary files /dev/null and b/htdocs/favicon-96x96.png differ
diff --git a/htdocs/favicon.ico b/htdocs/favicon.ico
new file mode 100644
index 0000000..9dc29ac
Binary files /dev/null and b/htdocs/favicon.ico differ
diff --git a/htdocs/favicon.png b/htdocs/favicon.png
new file mode 100644
index 0000000..e30fd7f
Binary files /dev/null and b/htdocs/favicon.png differ
diff --git a/htdocs/manifest.json b/htdocs/manifest.json
new file mode 100644
index 0000000..d73b243
--- /dev/null
+++ b/htdocs/manifest.json
@@ -0,0 +1,41 @@
+{
+	"name": "SilverStripe",
+	"icons": [
+		{
+			"src": "\/android-chrome-36x36.png",
+			"sizes": "36x36",
+			"type": "image\/png",
+			"density": "0.75"
+		},
+		{
+			"src": "\/android-chrome-48x48.png",
+			"sizes": "48x48",
+			"type": "image\/png",
+			"density": "1.0"
+		},
+		{
+			"src": "\/android-chrome-72x72.png",
+			"sizes": "72x72",
+			"type": "image\/png",
+			"density": "1.5"
+		},
+		{
+			"src": "\/android-chrome-96x96.png",
+			"sizes": "96x96",
+			"type": "image\/png",
+			"density": "2.0"
+		},
+		{
+			"src": "\/android-chrome-144x144.png",
+			"sizes": "144x144",
+			"type": "image\/png",
+			"density": "3.0"
+		},
+		{
+			"src": "\/android-chrome-192x192.png",
+			"sizes": "192x192",
+			"type": "image\/png",
+			"density": "4.0"
+		}
+	]
+}
diff --git a/htdocs/mstile-144x144.png b/htdocs/mstile-144x144.png
new file mode 100644
index 0000000..1a91db4
Binary files /dev/null and b/htdocs/mstile-144x144.png differ
diff --git a/htdocs/mstile-150x150.png b/htdocs/mstile-150x150.png
new file mode 100644
index 0000000..e1177a5
Binary files /dev/null and b/htdocs/mstile-150x150.png differ
diff --git a/htdocs/mstile-310x150.png b/htdocs/mstile-310x150.png
new file mode 100644
index 0000000..20b5f45
Binary files /dev/null and b/htdocs/mstile-310x150.png differ
diff --git a/htdocs/mstile-310x310.png b/htdocs/mstile-310x310.png
new file mode 100644
index 0000000..f105c9a
Binary files /dev/null and b/htdocs/mstile-310x310.png differ
diff --git a/htdocs/mstile-70x70.png b/htdocs/mstile-70x70.png
new file mode 100644
index 0000000..d027a74
Binary files /dev/null and b/htdocs/mstile-70x70.png differ
diff --git a/htdocs/safari-pinned-tab.svg b/htdocs/safari-pinned-tab.svg
new file mode 100644
index 0000000..0c4cd68
--- /dev/null
+++ b/htdocs/safari-pinned-tab.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="260.000000pt" height="260.000000pt" viewBox="0 0 260.000000 260.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.11, written by Peter Selinger 2001-2013
+</metadata>
+<g transform="translate(0.000000,260.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M1050 2484 c-91 -62 -250 -170 -354 -241 -511 -345 -541 -371 -616
+-514 -58 -111 -80 -210 -76 -334 3 -111 14 -160 58 -254 80 -175 219 -300 398
+-359 126 -41 265 -46 387 -12 252 69 403 242 403 460 0 102 -53 259 -83 247
+-7 -2 -93 -59 -192 -127 -225 -153 -227 -153 -300 -153 -199 0 -297 224 -161
+368 23 24 139 109 260 190 396 266 415 281 466 370 64 114 76 264 31 380 -43
+107 -33 108 -221 -21z"/>
+<path d="M1845 1848 c-297 -39 -494 -231 -495 -483 0 -102 54 -253 85 -241 8
+3 95 60 192 127 98 68 201 131 228 140 172 62 334 -96 284 -275 -16 -57 -82
+-116 -284 -251 -99 -66 -182 -122 -185 -125 -3 -3 -51 -36 -108 -74 -118 -79
+-185 -148 -220 -226 -29 -65 -32 -77 -39 -154 -8 -90 23 -216 69 -273 9 -12
+24 -2 453 290 77 53 225 153 329 224 205 139 292 216 347 309 73 123 100 227
+95 374 -4 109 -23 185 -67 271 -128 254 -407 403 -684 367z"/>
+</g>
+</svg>
diff --git a/makedoc.sh b/makedoc.sh
index b1df141..c0febbe 100755
--- a/makedoc.sh
+++ b/makedoc.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Move to the base folder
 cd $(dirname "$0");
