diff --git a/ci/azure-pipelines-docfx.yml b/ci/azure-pipelines-docfx.yml
deleted file mode 100644
index db588fe8c..000000000
--- a/ci/azure-pipelines-docfx.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-# .NET Desktop
-# Build and run tests for .NET Desktop or Windows classic desktop solutions.
-# Add steps that publish symbols, save build artifacts, and more:
-# https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net
-
-trigger:
-- master
-pr: none
-
-resources:
-  repositories:
-  - repository: RGBNET
-    type: github
-    endpoint: github.com_SpoinkyNL
-    name: DarthAffe/RGB.NET
-    ref: Development
-
-pool:
-  vmImage: 'windows-latest'
-
-variables:
-  artemisSolution: '**/Artemis.sln'
-  rgbSolution: '**/RGB.NET.sln'
-  pluginProjects: '**/Artemis.Plugins.*.csproj'
-  BuildId: $(Build.BuildId)
-  BuildNumber: $(Build.BuildNumber)
-  SourceBranch: $(Build.SourceBranch)
-  SourceVersion: $(Build.SourceVersion)
-  
-steps:
-- checkout: RGBNET
-  path: s/RGB.NET
-- checkout: self
-  path: s/Artemis
-
-- task: DotNetCoreCLI@2
-  displayName: 'RGB.NET - Build'
-  inputs:
-    command: 'build'
-    projects: '$(rgbSolution)'
-    arguments: '--configuration Release'
-
-- task: DotNetCoreCLI@2
-  displayName: 'dotnet restore Artemis'
-  inputs:
-    command: 'restore'
-    projects: '$(artemisSolution)'
-    feedsToUse: 'config'
-    nugetConfigPath: '$(Pipeline.Workspace)/s/Artemis/src/NuGet.Config'
-
-- task: PowerShell@2
-  displayName: "DockFX build"
-  inputs:
-    targetType: 'inline'
-    script: |
-      choco install docfx -y
-      docfx.exe .\docfx_project\docfx.json
-    workingDirectory: '$(Pipeline.Workspace)/s/Artemis/docfx'
-
-- task: FtpUpload@2
-  displayName: "DockFX FTP upload"
-  inputs:
-    credentialsOption: 'inputs'
-    serverUrl: 'ftp://artemis-rgb.com'
-    username: 'devops'
-    password: '$(ftp_password)'
-    rootDirectory: '$(Pipeline.Workspace)/s/Artemis/docfx/docfx_project/_site'
-    filePatterns: '**'
-    remoteDirectory: '/httpdocs/docs'
-    clean: true
-    preservePaths: true
-    trustSSL: false
\ No newline at end of file
diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
index 4ebae1d56..90999dfa3 100644
--- a/ci/azure-pipelines.yml
+++ b/ci/azure-pipelines.yml
@@ -4,7 +4,7 @@
 # https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net
 
 trigger:
-- master
+- wpf
 pr: none
 
 resources:
@@ -13,7 +13,7 @@ resources:
     type: github
     endpoint: github.com_SpoinkyNL
     name: Artemis-RGB/Artemis.Plugins
-    ref: master
+    ref: wpf
 
 pool:
   vmImage: 'windows-latest'
diff --git a/src/Artemis.Core/Constants.cs b/src/Artemis.Core/Constants.cs
index 7921af0bc..ecae374fc 100644
--- a/src/Artemis.Core/Constants.cs
+++ b/src/Artemis.Core/Constants.cs
@@ -27,7 +27,7 @@ namespace Artemis.Core
         /// <summary>
         ///     The full path to the Artemis data folder
         /// </summary>
-        public static readonly string DataFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Artemis");
+        public static readonly string DataFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Artemis.WPF");
         
         /// <summary>
         ///     The plugin info used by core components of Artemis
diff --git a/src/Artemis.UI/Services/UpdateService.cs b/src/Artemis.UI/Services/UpdateService.cs
index 5e3e481ee..2f6ed7cc4 100644
--- a/src/Artemis.UI/Services/UpdateService.cs
+++ b/src/Artemis.UI/Services/UpdateService.cs
@@ -103,6 +103,8 @@ namespace Artemis.UI.Services
 
         public async Task<bool> AutoUpdate()
         {
+            return false;
+
             if (Constants.BuildInfo.IsLocalBuild)
                 return false;
             if (!_checkForUpdates.Value || SuspendAutoUpdate)
@@ -121,6 +123,8 @@ namespace Artemis.UI.Services
 
         public async Task<bool> OfferUpdateIfFound()
         {
+            return false;
+
             _logger.Information("Checking for updates");
 
             DevOpsBuild buildInfo = await GetBuildInfo(1);
@@ -148,6 +152,8 @@ namespace Artemis.UI.Services
 
         public async Task<bool> IsUpdateAvailable()
         {
+            return false;
+
             DevOpsBuild buildInfo = await GetBuildInfo(1);
             double buildNumber = double.Parse(buildInfo.BuildNumber, CultureInfo.InvariantCulture);
             return buildNumber > Constants.BuildInfo.BuildNumber;
@@ -155,6 +161,8 @@ namespace Artemis.UI.Services
 
         public async Task ApplyUpdate()
         {
+            return;
+
             _logger.Information("ApplyUpdate: Applying update");
 
             // Ensure the installer is up-to-date, get installer build info