diff --git a/src/DemoWebsite/DemoWebsite.csproj b/src/DemoWebsite/DemoWebsite.csproj
index 5528291..2c0d4dc 100644
--- a/src/DemoWebsite/DemoWebsite.csproj
+++ b/src/DemoWebsite/DemoWebsite.csproj
@@ -1,5 +1,5 @@
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\UmbracoCms.8.5.5\build\UmbracoCms.props" Condition="Exists('..\..\packages\UmbracoCms.8.5.5\build\UmbracoCms.props')" />
+  <Import Project="..\..\packages\UmbracoCms.8.6.1\build\UmbracoCms.props" Condition="Exists('..\..\packages\UmbracoCms.8.6.1\build\UmbracoCms.props')" />
   <Import Project="..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -53,8 +53,8 @@
     <Reference Include="CSharpTest.Net.Collections, Version=14.906.1403.1082, Culture=neutral, PublicKeyToken=06aee00cce822474, processorArchitecture=MSIL">
       <HintPath>..\..\packages\CSharpTest.Net.Collections.14.906.1403.1082\lib\net40\CSharpTest.Net.Collections.dll</HintPath>
     </Reference>
-    <Reference Include="Examine, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Examine.1.0.1\lib\net452\Examine.dll</HintPath>
+    <Reference Include="Examine, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Examine.1.0.2\lib\net452\Examine.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.8.14.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\HtmlAgilityPack.1.8.14\lib\Net45\HtmlAgilityPack.dll</HintPath>
@@ -243,19 +243,19 @@
     <Reference Include="System.Web.Services" />
     <Reference Include="System.EnterpriseServices" />
     <Reference Include="Umbraco.Core, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\UmbracoCms.Core.8.5.5\lib\net472\Umbraco.Core.dll</HintPath>
+      <HintPath>..\..\packages\UmbracoCms.Core.8.6.1\lib\net472\Umbraco.Core.dll</HintPath>
     </Reference>
     <Reference Include="Umbraco.Examine, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\UmbracoCms.Web.8.5.5\lib\net472\Umbraco.Examine.dll</HintPath>
+      <HintPath>..\..\packages\UmbracoCms.Web.8.6.1\lib\net472\Umbraco.Examine.dll</HintPath>
     </Reference>
     <Reference Include="Umbraco.ModelsBuilder.Embedded, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\UmbracoCms.Web.8.5.5\lib\net472\Umbraco.ModelsBuilder.Embedded.dll</HintPath>
+      <HintPath>..\..\packages\UmbracoCms.Web.8.6.1\lib\net472\Umbraco.ModelsBuilder.Embedded.dll</HintPath>
     </Reference>
     <Reference Include="Umbraco.Web, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\UmbracoCms.Web.8.5.5\lib\net472\Umbraco.Web.dll</HintPath>
+      <HintPath>..\..\packages\UmbracoCms.Web.8.6.1\lib\net472\Umbraco.Web.dll</HintPath>
     </Reference>
     <Reference Include="Umbraco.Web.UI, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\UmbracoCms.Web.8.5.5\lib\net472\Umbraco.Web.UI.dll</HintPath>
+      <HintPath>..\..\packages\UmbracoCms.Web.8.6.1\lib\net472\Umbraco.Web.UI.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -305,14 +305,6 @@
     <Content Include="config\BackOfficeTours\getting-started.json" />
     <None Include="packages.config" />
     <Content Include="Views\Web.config" />
-    <Content Include="Views\Partials\Grid\Editors\Textstring.cshtml" />
-    <Content Include="Views\Partials\Grid\Editors\Rte.cshtml" />
-    <Content Include="Views\Partials\Grid\Editors\Media.cshtml" />
-    <Content Include="Views\Partials\Grid\Editors\Macro.cshtml" />
-    <Content Include="Views\Partials\Grid\Editors\Embed.cshtml" />
-    <Content Include="Views\Partials\Grid\Editors\Base.cshtml" />
-    <Content Include="Views\Partials\Grid\Bootstrap3.cshtml" />
-    <Content Include="Views\Partials\Grid\Bootstrap3-Fluid.cshtml" />
     <Content Include="Views\Shared\_Layout.cshtml" />
     <Content Include="Views\Home.cshtml" />
     <Content Include="Views\_ViewStart.cshtml" />
@@ -323,6 +315,14 @@
     <Content Include="Views\Partials\ExampleHeader\_ExampleHeader.cshtml" />
     <Content Include="Views\Partials\ExampleHeader\Yellow.cshtml" />
     <Content Include="Views\Partials\ExampleHeader\Magenta.cshtml" />
+    <Content Include="Views\Partials\Grid\Editors\Textstring.cshtml" />
+    <Content Include="Views\Partials\Grid\Editors\Rte.cshtml" />
+    <Content Include="Views\Partials\Grid\Editors\Media.cshtml" />
+    <Content Include="Views\Partials\Grid\Editors\Macro.cshtml" />
+    <Content Include="Views\Partials\Grid\Editors\Embed.cshtml" />
+    <Content Include="Views\Partials\Grid\Editors\Base.cshtml" />
+    <Content Include="Views\Partials\Grid\Bootstrap3.cshtml" />
+    <Content Include="Views\Partials\Grid\Bootstrap3-Fluid.cshtml" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>
@@ -367,11 +367,11 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
     <Error Condition="!Exists('..\..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets'))" />
-    <Error Condition="!Exists('..\..\packages\UmbracoCms.8.5.5\build\UmbracoCms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\UmbracoCms.8.5.5\build\UmbracoCms.props'))" />
-    <Error Condition="!Exists('..\..\packages\UmbracoCms.8.5.5\build\UmbracoCms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\UmbracoCms.8.5.5\build\UmbracoCms.targets'))" />
+    <Error Condition="!Exists('..\..\packages\UmbracoCms.8.6.1\build\UmbracoCms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\UmbracoCms.8.6.1\build\UmbracoCms.props'))" />
+    <Error Condition="!Exists('..\..\packages\UmbracoCms.8.6.1\build\UmbracoCms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\UmbracoCms.8.6.1\build\UmbracoCms.targets'))" />
   </Target>
   <Import Project="..\..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets" Condition="Exists('..\..\packages\Umbraco.SqlServerCE.4.0.0.1\build\Umbraco.SqlServerCE.targets')" />
-  <Import Project="..\..\packages\UmbracoCms.8.5.5\build\UmbracoCms.targets" Condition="Exists('..\..\packages\UmbracoCms.8.5.5\build\UmbracoCms.targets')" />
+  <Import Project="..\..\packages\UmbracoCms.8.6.1\build\UmbracoCms.targets" Condition="Exists('..\..\packages\UmbracoCms.8.6.1\build\UmbracoCms.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/DemoWebsite/Views/Partials/Grid/Editors/Embed.cshtml b/src/DemoWebsite/Views/Partials/Grid/Editors/Embed.cshtml
index 393157b..4a915a4 100644
--- a/src/DemoWebsite/Views/Partials/Grid/Editors/Embed.cshtml
+++ b/src/DemoWebsite/Views/Partials/Grid/Editors/Embed.cshtml
@@ -1,7 +1,10 @@
 @model dynamic
 @using Umbraco.Web.Templates
-
+@{
+    string embedValue = Convert.ToString(Model.value);
+    embedValue = embedValue.DetectIsJson() ? Model.value.preview : Model.value;
+}
 
 <div class="video-wrapper">
-	@Html.Raw(Model.value)
+	@Html.Raw(embedValue)
 </div>
diff --git a/src/DemoWebsite/Views/Web.config b/src/DemoWebsite/Views/Web.config
index 1b33af6..97eaa61 100644
--- a/src/DemoWebsite/Views/Web.config
+++ b/src/DemoWebsite/Views/Web.config
@@ -6,7 +6,12 @@
             <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
         </sectionGroup>
     </configSections>
-  <system.web.webPages.razor>
+  
+  
+  
+  
+  
+<system.web.webPages.razor>
         <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
         <pages pageBaseType="System.Web.Mvc.WebViewPage">
             <namespaces>
@@ -23,17 +28,14 @@
                 <add namespace="Umbraco.Web.PublishedModels" />
             </namespaces>
         </pages>
-    </system.web.webPages.razor>
-  <appSettings>
+    </system.web.webPages.razor><appSettings>
         <add key="webpages:Enabled" value="false" />
-    </appSettings>
-  <system.webServer>
+    </appSettings><system.webServer>
         <handlers>
             <remove name="BlockViewHandler" />
             <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler" />
         </handlers>
-    </system.webServer>
-  <system.web>
+    </system.webServer><system.web>
         <compilation targetFramework="4.7.2">
             <assemblies>
                 <add assembly="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
@@ -65,5 +67,4 @@
                 <add assembly="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />                
             </assemblies>
         </compilation>
-    </system.web>
-</configuration>
\ No newline at end of file
+    </system.web></configuration>
\ No newline at end of file
diff --git a/src/DemoWebsite/Web.config b/src/DemoWebsite/Web.config
index bf8e358..4f9f6f0 100644
--- a/src/DemoWebsite/Web.config
+++ b/src/DemoWebsite/Web.config
@@ -30,7 +30,7 @@
     <clientDependency configSource="config\ClientDependency.config" />
 
     <appSettings>
-        <add key="Umbraco.Core.ConfigurationStatus" value="8.5.5" />
+        <add key="Umbraco.Core.ConfigurationStatus" value="8.6.1" />
 	    <add key="Umbraco.Core.ReservedUrls" value="" />
         <add key="Umbraco.Core.ReservedPaths" value="" />
         <add key="Umbraco.Core.Path" value="~/umbraco" />
diff --git a/src/DemoWebsite/config/BackOfficeTours/getting-started.json b/src/DemoWebsite/config/BackOfficeTours/getting-started.json
index e300e65..7b3f2a2 100644
--- a/src/DemoWebsite/config/BackOfficeTours/getting-started.json
+++ b/src/DemoWebsite/config/BackOfficeTours/getting-started.json
@@ -1,4 +1,22 @@
 [
+    {
+        "name": "Email Marketing",
+        "alias": "umbEmailMarketing",
+        "group": "Email Marketing",
+        "groupOrder": 10,
+        "hidden": true,
+        "requiredSections": [
+            "content"
+        ],
+        "steps": [
+            {
+                "title": "Do you want to stay updated on everything Umbraco?",
+                "content": "<p>Thank you for using Umbraco! Would you like to stay up-to-date with Umbraco product updates, security advisories, community news and special offers? Sign up for our newsletter and never miss out on the latest Umbraco news.</p> <p class='notice'>By signing up, you agree that we can use your info according to our <a href='https://umbraco.com/about-us/privacy/'>privacy policy</a>.</p>",
+                "view": "emails",
+                "type": "promotion"
+            }
+        ]
+    },
     {
         "name": "Introduction",
         "alias": "umbIntroIntroduction",
diff --git a/src/DemoWebsite/config/ClientDependency.config b/src/DemoWebsite/config/ClientDependency.config
index 2814119..6b4e2ce 100644
--- a/src/DemoWebsite/config/ClientDependency.config
+++ b/src/DemoWebsite/config/ClientDependency.config
@@ -10,7 +10,7 @@ NOTES:
 * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config
 * A new version will invalidate both client and server cache and create new persisted files
 -->
-<clientDependency version="1" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.CdfLogger, Umbraco.Web">
+<clientDependency version="273777073" fileDependencyExtensions=".js,.css" loggerType="Umbraco.Web.CdfLogger, Umbraco.Web">
 
   <!--
     This section is used for Web Forms only, the enableCompositeFiles="true" is optional and by default is set to true.
@@ -44,22 +44,12 @@ NOTES:
   -->
   <compositeFiles defaultProvider="defaultFileProcessingProvider" compositeFileHandlerPath="~/DependencyHandler.axd">
     <fileProcessingProviders>
-      <add name="CompositeFileProcessor"
-           type="ClientDependency.Core.CompositeFiles.Providers.CompositeFileProcessingProvider, ClientDependency.Core"
-           enableCssMinify="true"
-           enableJsMinify="true"
-           persistFiles="true"
-           compositeFilePath="~/App_Data/TEMP/ClientDependency"
-           bundleDomains="localhost:123456"
-           urlType="Base64QueryStrings"
-           pathUrlFormat="{dependencyId}/{version}/{type}"/>
+      <add name="CompositeFileProcessor" type="ClientDependency.Core.CompositeFiles.Providers.CompositeFileProcessingProvider, ClientDependency.Core" enableCssMinify="true" enableJsMinify="true" persistFiles="true" compositeFilePath="~/App_Data/TEMP/ClientDependency" bundleDomains="localhost:123456" urlType="Base64QueryStrings" pathUrlFormat="{dependencyId}/{version}/{type}" />
     </fileProcessingProviders>
 
     <!-- A file map provider stores references to dependency files by an id to be used in the handler URL when using the MappedId Url type -->
     <fileMapProviders>
-      <add name="XmlFileMap"
-           type="ClientDependency.Core.CompositeFiles.Providers.XmlFileMapper, ClientDependency.Core"
-           mapPath="~/App_Data/TEMP/ClientDependency" />
+      <add name="XmlFileMap" type="ClientDependency.Core.CompositeFiles.Providers.XmlFileMapper, ClientDependency.Core" mapPath="~/App_Data/TEMP/ClientDependency" />
     </fileMapProviders>
 
   </compositeFiles>
diff --git a/src/DemoWebsite/config/umbracoSettings.config b/src/DemoWebsite/config/umbracoSettings.config
index a7f6e1e..1f5aa87 100644
--- a/src/DemoWebsite/config/umbracoSettings.config
+++ b/src/DemoWebsite/config/umbracoSettings.config
@@ -9,7 +9,7 @@
     -->
 
     <backOffice>
-        <tours enable="true"></tours>
+        <tours enable="false"></tours>
     </backOffice>
 
   <content>
@@ -38,7 +38,140 @@
 
     <!-- The html injected into a (x)html page if Umbraco is running in preview mode -->
     <PreviewBadge>
-      <![CDATA[<div id="umbracoPreviewBadge" class="umbraco-preview-badge"><span class="umbraco-preview-badge__header">Preview mode</span><a href="{0}/preview/end?redir={1}" class="umbraco-preview-badge__end"><svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg"><title>Click to end</title><path d="M5273.1 2400.1v-2c0-2.8-5-4-9.7-4s-9.7 1.3-9.7 4v2a7 7 0 002 4.9l5 4.9c.3.3.4.6.4 1v6.4c0 .4.2.7.6.8l2.9.9c.5.1 1-.2 1-.8v-7.2c0-.4.2-.7.4-1l5.1-5a7 7 0 002-4.9zm-9.7-.1c-4.8 0-7.4-1.3-7.5-1.8.1-.5 2.7-1.8 7.5-1.8s7.3 1.3 7.5 1.8c-.2.5-2.7 1.8-7.5 1.8z"/><path d="M5268.4 2410.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1h-4.3zM5272.7 2413.7h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1zM5272.7 2417h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1 0-.5-.4-1-1-1z"/><path d="M78.2 13l-8.7 11.7a32.5 32.5 0 11-51.9 25.8c0-10.3 4.7-19.7 12.9-25.8L21.8 13a47 47 0 1056.4 0z"/><path d="M42.7 2.5h14.6v49.4H42.7z"/></svg></a></div><style type="text/css">.umbraco-preview-badge {{position: absolute;top: 1em;right: 1em;display: inline-flex;background: #1b264f;color: #fff;padding: 1em;font-size: 12px;z-index: 99999999;justify-content: center;align-items: center;box-shadow: 0 10px 50px rgba(0, 0, 0, .1), 0 6px 20px rgba(0, 0, 0, .16);line-height: 1;}}.umbraco-preview-badge__header {{font-weight: bold;}}.umbraco-preview-badge__end {{width: 3em;padding: 1em;margin: -1em -1em -1em 2em;display: flex;flex-shrink: 0;align-items: center;align-self: stretch;}}.umbraco-preview-badge__end:hover,.umbraco-preview-badge__end:focus {{background: #f5c1bc;}}.umbraco-preview-badge__end svg {{fill: #fff;width:1em;}}</style>]]></PreviewBadge>
+        <![CDATA[
+            <div id="umbracoPreviewBadge" class="umbraco-preview-badge">
+                <span class="umbraco-preview-badge__header">Preview mode</span>
+                <a href="{0}/preview/?id={2}" class="umbraco-preview-badge__a open">
+                    …
+                </a>
+                <a href="{0}/preview/end?redir={1}" class="umbraco-preview-badge__a end">
+                    <svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg"><title>Click to end</title><path fill="#fff" d="M5273.1 2400.1v-2c0-2.8-5-4-9.7-4s-9.7 1.3-9.7 4v2a7 7 0 002 4.9l5 4.9c.3.3.4.6.4 1v6.4c0 .4.2.7.6.8l2.9.9c.5.1 1-.2 1-.8v-7.2c0-.4.2-.7.4-1l5.1-5a7 7 0 002-4.9zm-9.7-.1c-4.8 0-7.4-1.3-7.5-1.8.1-.5 2.7-1.8 7.5-1.8s7.3 1.3 7.5 1.8c-.2.5-2.7 1.8-7.5 1.8z"/><path fill="#fff" d="M5268.4 2410.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1h-4.3zM5272.7 2413.7h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1zM5272.7 2417h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1 0-.5-.4-1-1-1z"/><path fill="#fff" d="M78.2 13l-8.7 11.7a32.5 32.5 0 11-51.9 25.8c0-10.3 4.7-19.7 12.9-25.8L21.8 13a47 47 0 1056.4 0z"/><path fill="#fff" d="M42.7 2.5h14.6v49.4H42.7z"/></svg>
+                </a>
+            </div>
+            <style type="text/css">
+                .umbraco-preview-badge {{
+                    position: fixed;
+                    bottom: 0;
+                    display: inline-flex;
+                    background: rgba(27, 38, 79, 0.9);
+                    color: #fff;
+                    font-size: 12px;
+                    z-index: 99999999;
+                    justify-content: center;
+                    align-items: center;
+                    box-shadow: 0 5px 10px rgba(0, 0, 0, .2), 0 1px 2px rgba(0, 0, 0, .2);
+                    line-height: 1;
+                    pointer-events:none;
+                    left: 50%;
+                    transform: translate(-50%, 40px);
+                    animation: umbraco-preview-badge--effect 10s 100ms ease both;
+                    border-radius: 3px 3px 0 0;
+                }}
+                @keyframes umbraco-preview-badge--effect {{
+                    0% {{
+                        transform: translate(-50%, 40px);
+                        animation-timing-function: ease-out;
+                    }}
+                    1.5% {{
+                        transform: translate(-50%, -20px);
+                        animation-timing-function: ease-in;
+                    }}
+                    5.0% {{
+                        transform: translate(-50%, -8px);
+                        animation-timing-function: ease-in;
+                    }}
+                    7.5% {{
+                        transform: translate(-50%, -4px);
+                        animation-timing-function: ease-in;
+                    }}
+                    9.2% {{
+                        transform: translate(-50%, -2px);
+                        animation-timing-function: ease-in;
+                    }}
+                    3.5%,
+                    6.5%,
+                    8.5% {{
+                        transform: translate(-50%, 0px);
+                        animation-timing-function: ease-out;
+                    }}
+                    9.7% {{
+                        transform: translate(-50%, 0px);
+                        animation-timing-function: ease-out;
+                    }}
+                    10.0% {{
+                        transform: translate(-50%, 0px);
+                    }}
+
+
+                    60% {{
+                        transform: translate(-50%, 0px);
+                        animation-timing-function: ease-out;
+                    }}
+                    61.5% {{
+                        transform: translate(-50%, -20px);
+                        animation-timing-function: ease-in;
+                    }}
+                    65.0% {{
+                        transform: translate(-50%, -8px);
+                        animation-timing-function: ease-in;
+                    }}
+                    67.5% {{
+                        transform: translate(-50%, -4px);
+                        animation-timing-function: ease-in;
+                    }}
+                    69.2% {{
+                        transform: translate(-50%, -2px);
+                        animation-timing-function: ease-in;
+                    }}
+                    63.5%,
+                    66.5%,
+                    68.5% {{
+                        transform: translate(-50%, 0px);
+                        animation-timing-function: ease-out;
+                    }}
+                    69.7% {{
+                        transform: translate(-50%, 0px);
+                        animation-timing-function: ease-out;
+                    }}
+                    70.0% {{
+                        transform: translate(-50%, 0px);
+                    }}
+                    100.0% {{
+                        transform: translate(-50%, 0px);
+                    }}
+                }}
+                .umbraco-preview-badge__header {{
+                    padding: 1em;
+                    font-weight: bold;
+                    pointer-events:none;
+                }}
+                .umbraco-preview-badge__a {{
+                    width: 3em;
+                    padding: 1em;
+                    display: flex;
+                    flex-shrink: 0;
+                    align-items: center;
+                    align-self: stretch;
+                    color:white;
+                    text-decoration:none;
+                    font-weight: bold;
+                    border-left: 1px solid hsla(0,0%,100%,.25);
+                    pointer-events:all;
+                }}
+                .umbraco-preview-badge__a svg {{
+                    width: 1em;
+                    height:1em;
+                }}
+                .umbraco-preview-badge__a:hover {{
+                    background: #202d5e;
+                }}
+                .umbraco-preview-badge__end svg {{
+                    fill: #fff;
+                    width:1em;
+                }}
+            </style>
+        ]]>
+    </PreviewBadge>
 
     <!-- How Umbraco should handle errors during macro execution. Can be one of the following values:
          - inline - show an inline error within the macro but allow the page to continue rendering. Historial Umbraco behaviour.
@@ -109,4 +242,17 @@
     umbracoApplicationUrl="">
   </web.routing>
 
+  <!--
+  keepAlive
+    @disableKeepAliveTask
+      Disables the periodic KeepAliveTask when set to "true".
+      Use this setting to disable the KeepAliveTask in case you already have an alternative.
+      For example, Azure App Service has keep alive functionality built-in.
+      Defaults to "false".
+    @keepAlivePingUrl
+      The url of the KeepAlivePing action. By default, the url will use the umbracoApplicationUrl setting as the basis.
+      Change this setting to specify an alternative url to reach the KeepAlivePing action. eg http://localhost/api/keepalive/ping
+      Defaults to "{umbracoApplicationUrl}/api/keepalive/ping".
+  -->
+  <keepAlive disableKeepAliveTask="false" keepAlivePingUrl="{umbracoApplicationUrl}/api/keepalive/ping" />
 </settings>
diff --git a/src/DemoWebsite/packages.config b/src/DemoWebsite/packages.config
index 748d8e6..ed0197e 100644
--- a/src/DemoWebsite/packages.config
+++ b/src/DemoWebsite/packages.config
@@ -3,7 +3,7 @@
   <package id="ClientDependency" version="1.9.9" targetFramework="net472" />
   <package id="ClientDependency-Mvc5" version="1.9.3" targetFramework="net472" />
   <package id="CSharpTest.Net.Collections" version="14.906.1403.1082" targetFramework="net472" />
-  <package id="Examine" version="1.0.1" targetFramework="net472" />
+  <package id="Examine" version="1.0.2" targetFramework="net472" />
   <package id="HtmlAgilityPack" version="1.8.14" targetFramework="net472" />
   <package id="ImageProcessor" version="2.7.0.100" targetFramework="net472" />
   <package id="ImageProcessor.Web" version="4.10.0.100" targetFramework="net472" />
@@ -56,7 +56,7 @@
   <package id="System.Threading.Tasks.Dataflow" version="4.9.0" targetFramework="net472" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
   <package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />
-  <package id="UmbracoCms" version="8.5.5" targetFramework="net472" />
-  <package id="UmbracoCms.Core" version="8.5.5" targetFramework="net472" />
-  <package id="UmbracoCms.Web" version="8.5.5" targetFramework="net472" />
+  <package id="UmbracoCms" version="8.6.1" targetFramework="net472" />
+  <package id="UmbracoCms.Core" version="8.6.1" targetFramework="net472" />
+  <package id="UmbracoCms.Web" version="8.6.1" targetFramework="net472" />
 </packages>
\ No newline at end of file